Skip to content

Commit 8378cdf

Browse files
ark120202ark120202
committed
Always import tstl as a namespace in tests
1 parent dc53f26 commit 8378cdf

File tree

8 files changed

+116
-86
lines changed

8 files changed

+116
-86
lines changed

‎test/translation/transformation.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as fs from "fs";
22
import * as path from "path";
3-
import { LuaLibImportKind } from "../../src";
3+
import * as tstl from "../../src";
44
import * as util from "../util";
55

66
const fixturesPath = path.join(__dirname, "./transformation");
@@ -11,6 +11,6 @@ const fixtures = fs
1111
.map(f => [path.parse(f).name, fs.readFileSync(path.join(fixturesPath, f), "utf8")]);
1212

1313
test.each(fixtures)("Transformation (%s)", (_name, content) => {
14-
const result = util.transpileString(content, { luaLibImport: LuaLibImportKind.Require });
14+
const result = util.transpileString(content, { luaLibImport: tstl.LuaLibImportKind.Require });
1515
expect(result).toMatchSnapshot();
1616
});

‎test/unit/assignmentDestructuring.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LuaLibImportKind, LuaTarget } from "../../src";
1+
import * as tstl from "../../src";
22
import * as util from "../util";
33

44
const assignmentDestruturingTs = `
@@ -7,24 +7,24 @@ const assignmentDestruturingTs = `
77

88
test("Assignment destructuring [5.1]", () => {
99
const lua = util.transpileString(assignmentDestruturingTs, {
10-
luaTarget: LuaTarget.Lua51,
11-
luaLibImport: LuaLibImportKind.None,
10+
luaTarget: tstl.LuaTarget.Lua51,
11+
luaLibImport: tstl.LuaLibImportKind.None,
1212
});
1313
expect(lua).toBe(`local a, b = unpack(myFunc())`);
1414
});
1515

1616
test("Assignment destructuring [5.2]", () => {
1717
const lua = util.transpileString(assignmentDestruturingTs, {
18-
luaTarget: LuaTarget.Lua52,
19-
luaLibImport: LuaLibImportKind.None,
18+
luaTarget: tstl.LuaTarget.Lua52,
19+
luaLibImport: tstl.LuaLibImportKind.None,
2020
});
2121
expect(lua).toBe(`local a, b = table.unpack(myFunc())`);
2222
});
2323

2424
test("Assignment destructuring [JIT]", () => {
2525
const lua = util.transpileString(assignmentDestruturingTs, {
26-
luaTarget: LuaTarget.LuaJIT,
27-
luaLibImport: LuaLibImportKind.None,
26+
luaTarget: tstl.LuaTarget.LuaJIT,
27+
luaLibImport: tstl.LuaLibImportKind.None,
2828
});
2929
expect(lua).toBe(`local a, b = unpack(myFunc())`);
3030
});

‎test/unit/conditionals.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LuaTarget } from "../../src";
1+
import * as tstl from "../../src";
22
import { TSTLErrors } from "../../src/TSTLErrors";
33
import * as util from "../util";
44

@@ -373,8 +373,8 @@ test("switch dead code after return", () => {
373373

374374
test("switch not allowed in 5.1", () => {
375375
expect(() =>
376-
util.transpileString(`switch ("abc") {}`, { luaTarget: LuaTarget.Lua51 }),
376+
util.transpileString(`switch ("abc") {}`, { luaTarget: tstl.LuaTarget.Lua51 }),
377377
).toThrowExactError(
378-
TSTLErrors.UnsupportedForTarget("Switch statements", LuaTarget.Lua51, util.nodeStub),
378+
TSTLErrors.UnsupportedForTarget("Switch statements", tstl.LuaTarget.Lua51, util.nodeStub),
379379
);
380380
});

‎test/unit/expressions.spec.ts‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as ts from "typescript";
2-
import { LuaLibImportKind, LuaTarget } from "../../src";
2+
import * as tstl from "../../src";
33
import { TSTLErrors } from "../../src/TSTLErrors";
44
import * as util from "../util";
55

@@ -99,8 +99,8 @@ test.each([
9999
// Bit operations not supported in 5.1, expect an exception
100100
expect(() =>
101101
util.transpileString(input, {
102-
luaTarget: LuaTarget.Lua51,
103-
luaLibImport: LuaLibImportKind.None,
102+
luaTarget: tstl.LuaTarget.Lua51,
103+
luaLibImport: tstl.LuaLibImportKind.None,
104104
}),
105105
).toThrow();
106106
});
@@ -120,7 +120,7 @@ test.each([
120120
{ input: "a>>>b", lua: "local ____ = bit.rshift(a, b)" },
121121
{ input: "a>>>=b", lua: "a = bit.rshift(a, b)" },
122122
])("Bitop [JIT] (%p)", ({ input, lua }) => {
123-
const options = { luaTarget: LuaTarget.LuaJIT, luaLibImport: LuaLibImportKind.None };
123+
const options = { luaTarget: tstl.LuaTarget.LuaJIT, luaLibImport: tstl.LuaLibImportKind.None };
124124
expect(util.transpileString(input, options)).toBe(lua);
125125
});
126126

@@ -139,7 +139,7 @@ test.each([
139139
{ input: "a>>>b", lua: "local ____ = bit32.rshift(a, b)" },
140140
{ input: "a>>>=b", lua: "a = bit32.rshift(a, b)" },
141141
])("Bitop [5.2] (%p)", ({ input, lua }) => {
142-
const options = { luaTarget: LuaTarget.Lua52, luaLibImport: LuaLibImportKind.None };
142+
const options = { luaTarget: tstl.LuaTarget.Lua52, luaLibImport: tstl.LuaLibImportKind.None };
143143
expect(util.transpileString(input, options)).toBe(lua);
144144
});
145145

@@ -156,15 +156,15 @@ test.each([
156156
{ input: "a>>>b", lua: "local ____ = a >> b" },
157157
{ input: "a>>>=b", lua: "a = a >> b" },
158158
])("Bitop [5.3] (%p)", ({ input, lua }) => {
159-
const options = { luaTarget: LuaTarget.Lua53, luaLibImport: LuaLibImportKind.None };
159+
const options = { luaTarget: tstl.LuaTarget.Lua53, luaLibImport: tstl.LuaLibImportKind.None };
160160
expect(util.transpileString(input, options)).toBe(lua);
161161
});
162162

163163
test.each(["a>>b", "a>>=b"])("Unsupported bitop 5.3 (%p)", input => {
164164
expect(() =>
165165
util.transpileString(input, {
166-
luaTarget: LuaTarget.Lua53,
167-
luaLibImport: LuaLibImportKind.None,
166+
luaTarget: tstl.LuaTarget.Lua53,
167+
luaLibImport: tstl.LuaLibImportKind.None,
168168
}),
169169
).toThrowExactError(
170170
TSTLErrors.UnsupportedKind(
@@ -232,12 +232,20 @@ test.each([
232232
},
233233
{ input: "true ? undefined : true", options: { strictNullChecks: true } },
234234
{ input: "true ? null : true", options: { strictNullChecks: true } },
235-
{ input: "true ? false : true", expected: false, options: { luaTarget: LuaTarget.Lua51 } },
236-
{ input: "false ? false : true", expected: true, options: { luaTarget: LuaTarget.Lua51 } },
237-
{ input: "true ? undefined : true", options: { luaTarget: LuaTarget.Lua51 } },
238-
{ input: "true ? false : true", expected: false, options: { luaTarget: LuaTarget.LuaJIT } },
239-
{ input: "false ? false : true", expected: true, options: { luaTarget: LuaTarget.LuaJIT } },
240-
{ input: "true ? undefined : true", options: { luaTarget: LuaTarget.LuaJIT } },
235+
{ input: "true ? false : true", expected: false, options: { luaTarget: tstl.LuaTarget.Lua51 } },
236+
{ input: "false ? false : true", expected: true, options: { luaTarget: tstl.LuaTarget.Lua51 } },
237+
{ input: "true ? undefined : true", options: { luaTarget: tstl.LuaTarget.Lua51 } },
238+
{
239+
input: "true ? false : true",
240+
expected: false,
241+
options: { luaTarget: tstl.LuaTarget.LuaJIT },
242+
},
243+
{
244+
input: "false ? false : true",
245+
expected: true,
246+
options: { luaTarget: tstl.LuaTarget.LuaJIT },
247+
},
248+
{ input: "true ? undefined : true", options: { luaTarget: tstl.LuaTarget.LuaJIT } },
241249
])("Ternary operator (%p)", ({ input, expected, options }) => {
242250
const result = util.transpileAndExecute(
243251
`const literalValue = 'literal';
@@ -487,15 +495,19 @@ test("Incompatible fromCodePoint expression error", () => {
487495
expect(() => util.transpileString("const abc = String.fromCodePoint(123);")).toThrowExactError(
488496
TSTLErrors.UnsupportedForTarget(
489497
"string property fromCodePoint",
490-
LuaTarget.Lua53,
498+
tstl.LuaTarget.Lua53,
491499
util.nodeStub,
492500
),
493501
);
494502
});
495503

496504
test("Unknown string expression error", () => {
497505
expect(() => util.transpileString("const abc = String.abcd();")).toThrowExactError(
498-
TSTLErrors.UnsupportedForTarget("string property abcd", LuaTarget.Lua53, util.nodeStub),
506+
TSTLErrors.UnsupportedForTarget(
507+
"string property abcd",
508+
tstl.LuaTarget.Lua53,
509+
util.nodeStub,
510+
),
499511
);
500512
});
501513

‎test/unit/loops.spec.ts‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as ts from "typescript";
2-
import { LuaLibImportKind, LuaTarget } from "../../src";
2+
import * as tstl from "../../src";
33
import { TSTLErrors } from "../../src/TSTLErrors";
44
import * as util from "../util";
55

@@ -418,8 +418,8 @@ test("forof with iterator", () => {
418418
return result;
419419
`;
420420
const compilerOptions = {
421-
luaLibImport: LuaLibImportKind.Require,
422-
luaTarget: LuaTarget.Lua53,
421+
luaLibImport: tstl.LuaLibImportKind.Require,
422+
luaTarget: tstl.LuaTarget.Lua53,
423423
target: ts.ScriptTarget.ES2015,
424424
};
425425
const result = util.transpileAndExecute(code, compilerOptions);
@@ -444,8 +444,8 @@ test("forof with iterator and existing variable", () => {
444444
return result;
445445
`;
446446
const compilerOptions = {
447-
luaLibImport: LuaLibImportKind.Require,
448-
luaTarget: LuaTarget.Lua53,
447+
luaLibImport: tstl.LuaLibImportKind.Require,
448+
luaTarget: tstl.LuaTarget.Lua53,
449449
target: ts.ScriptTarget.ES2015,
450450
};
451451
const result = util.transpileAndExecute(code, compilerOptions);
@@ -469,8 +469,8 @@ test("forof destructuring with iterator", () => {
469469
return result;
470470
`;
471471
const compilerOptions = {
472-
luaLibImport: LuaLibImportKind.Require,
473-
luaTarget: LuaTarget.Lua53,
472+
luaLibImport: tstl.LuaLibImportKind.Require,
473+
luaTarget: tstl.LuaTarget.Lua53,
474474
target: ts.ScriptTarget.ES2015,
475475
};
476476
const result = util.transpileAndExecute(code, compilerOptions);
@@ -496,8 +496,8 @@ test("forof destructuring with iterator and existing variables", () => {
496496
return result;
497497
`;
498498
const compilerOptions = {
499-
luaLibImport: LuaLibImportKind.Require,
500-
luaTarget: LuaTarget.Lua53,
499+
luaLibImport: tstl.LuaLibImportKind.Require,
500+
luaTarget: tstl.LuaTarget.Lua53,
501501
target: ts.ScriptTarget.ES2015,
502502
};
503503
const result = util.transpileAndExecute(code, compilerOptions);
@@ -518,8 +518,8 @@ test("forof lua iterator", () => {
518518
return result;
519519
`;
520520
const compilerOptions = {
521-
luaLibImport: LuaLibImportKind.Require,
522-
luaTarget: LuaTarget.Lua53,
521+
luaLibImport: tstl.LuaLibImportKind.Require,
522+
luaTarget: tstl.LuaTarget.Lua53,
523523
target: ts.ScriptTarget.ES2015,
524524
};
525525
const result = util.transpileAndExecute(code, compilerOptions);
@@ -540,8 +540,8 @@ test("forof array lua iterator", () => {
540540
return result;
541541
`;
542542
const compilerOptions = {
543-
luaLibImport: LuaLibImportKind.Require,
544-
luaTarget: LuaTarget.Lua53,
543+
luaLibImport: tstl.LuaLibImportKind.Require,
544+
luaTarget: tstl.LuaTarget.Lua53,
545545
target: ts.ScriptTarget.ES2015,
546546
};
547547
const result = util.transpileAndExecute(code, compilerOptions);
@@ -563,8 +563,8 @@ test("forof lua iterator with existing variable", () => {
563563
return result;
564564
`;
565565
const compilerOptions = {
566-
luaLibImport: LuaLibImportKind.Require,
567-
luaTarget: LuaTarget.Lua53,
566+
luaLibImport: tstl.LuaLibImportKind.Require,
567+
luaTarget: tstl.LuaTarget.Lua53,
568568
target: ts.ScriptTarget.ES2015,
569569
};
570570
const result = util.transpileAndExecute(code, compilerOptions);
@@ -585,8 +585,8 @@ test("forof lua iterator destructuring", () => {
585585
return result;
586586
`;
587587
const compilerOptions = {
588-
luaLibImport: LuaLibImportKind.Require,
589-
luaTarget: LuaTarget.Lua53,
588+
luaLibImport: tstl.LuaLibImportKind.Require,
589+
luaTarget: tstl.LuaTarget.Lua53,
590590
target: ts.ScriptTarget.ES2015,
591591
};
592592
const result = util.transpileAndExecute(code, compilerOptions);
@@ -609,8 +609,8 @@ test("forof lua iterator destructuring with existing variables", () => {
609609
return result;
610610
`;
611611
const compilerOptions = {
612-
luaLibImport: LuaLibImportKind.Require,
613-
luaTarget: LuaTarget.Lua53,
612+
luaLibImport: tstl.LuaLibImportKind.Require,
613+
luaTarget: tstl.LuaTarget.Lua53,
614614
target: ts.ScriptTarget.ES2015,
615615
};
616616
const result = util.transpileAndExecute(code, compilerOptions);
@@ -634,8 +634,8 @@ test("forof lua iterator tuple-return", () => {
634634
return result;
635635
`;
636636
const compilerOptions = {
637-
luaLibImport: LuaLibImportKind.Require,
638-
luaTarget: LuaTarget.Lua53,
637+
luaLibImport: tstl.LuaLibImportKind.Require,
638+
luaTarget: tstl.LuaTarget.Lua53,
639639
target: ts.ScriptTarget.ES2015,
640640
};
641641
const result = util.transpileAndExecute(code, compilerOptions);
@@ -661,8 +661,8 @@ test("forof lua iterator tuple-return with existing variables", () => {
661661
return result;
662662
`;
663663
const compilerOptions = {
664-
luaLibImport: LuaLibImportKind.Require,
665-
luaTarget: LuaTarget.Lua53,
664+
luaLibImport: tstl.LuaLibImportKind.Require,
665+
luaTarget: tstl.LuaTarget.Lua53,
666666
target: ts.ScriptTarget.ES2015,
667667
};
668668
const result = util.transpileAndExecute(code, compilerOptions);
@@ -678,8 +678,8 @@ test("forof lua iterator tuple-return single variable", () => {
678678
for (let x of luaIter()) {}
679679
`;
680680
const compilerOptions = {
681-
luaLibImport: LuaLibImportKind.Require,
682-
luaTarget: LuaTarget.Lua53,
681+
luaLibImport: tstl.LuaLibImportKind.Require,
682+
luaTarget: tstl.LuaTarget.Lua53,
683683
target: ts.ScriptTarget.ES2015,
684684
};
685685
expect(() => util.transpileString(code, compilerOptions)).toThrowExactError(
@@ -697,8 +697,8 @@ test("forof lua iterator tuple-return single existing variable", () => {
697697
for (x of luaIter()) {}
698698
`;
699699
const compilerOptions = {
700-
luaLibImport: LuaLibImportKind.Require,
701-
luaTarget: LuaTarget.Lua53,
700+
luaLibImport: tstl.LuaLibImportKind.Require,
701+
luaTarget: tstl.LuaTarget.Lua53,
702702
target: ts.ScriptTarget.ES2015,
703703
};
704704
expect(() => util.transpileString(code, compilerOptions)).toThrowExactError(
@@ -725,8 +725,8 @@ test("forof forwarded lua iterator", () => {
725725
return result;
726726
`;
727727
const compilerOptions = {
728-
luaLibImport: LuaLibImportKind.Require,
729-
luaTarget: LuaTarget.Lua53,
728+
luaLibImport: tstl.LuaLibImportKind.Require,
729+
luaTarget: tstl.LuaTarget.Lua53,
730730
target: ts.ScriptTarget.ES2015,
731731
};
732732
const result = util.transpileAndExecute(code, compilerOptions);
@@ -754,8 +754,8 @@ test("forof forwarded lua iterator with tupleReturn", () => {
754754
return result;
755755
`;
756756
const compilerOptions = {
757-
luaLibImport: LuaLibImportKind.Require,
758-
luaTarget: LuaTarget.Lua53,
757+
luaLibImport: tstl.LuaLibImportKind.Require,
758+
luaTarget: tstl.LuaTarget.Lua53,
759759
target: ts.ScriptTarget.ES2015,
760760
};
761761
const result = util.transpileAndExecute(code, compilerOptions);
@@ -769,13 +769,17 @@ test.each([
769769
"for (let a in b) { continue; }",
770770
"for (let a of b) { continue; }",
771771
])("loop continue in different lua versions (%p)", loop => {
772-
const lua51 = { luaTarget: LuaTarget.Lua51 };
773-
const lua52 = { luaTarget: LuaTarget.Lua52 };
774-
const lua53 = { luaTarget: LuaTarget.Lua53 };
775-
const luajit = { luaTarget: LuaTarget.LuaJIT };
772+
const lua51 = { luaTarget: tstl.LuaTarget.Lua51 };
773+
const lua52 = { luaTarget: tstl.LuaTarget.Lua52 };
774+
const lua53 = { luaTarget: tstl.LuaTarget.Lua53 };
775+
const luajit = { luaTarget: tstl.LuaTarget.LuaJIT };
776776

777777
expect(() => util.transpileString(loop, lua51)).toThrowExactError(
778-
TSTLErrors.UnsupportedForTarget("Continue statement", LuaTarget.Lua51, ts.createContinue()),
778+
TSTLErrors.UnsupportedForTarget(
779+
"Continue statement",
780+
tstl.LuaTarget.Lua51,
781+
ts.createContinue(),
782+
),
779783
);
780784
expect(util.transpileString(loop, lua52).indexOf("::__continue1::") !== -1).toBe(true);
781785
expect(util.transpileString(loop, lua53).indexOf("::__continue1::") !== -1).toBe(true);

0 commit comments

Comments
 (0)