diff --git a/test/src/util.ts b/test/src/util.ts index 71f8227ac..c4a0f8872 100644 --- a/test/src/util.ts +++ b/test/src/util.ts @@ -3,7 +3,8 @@ import * as ts from "typescript"; import { Expect } from "alsatian"; -import { transpileString } from "../../src/Compiler"; +import { transpileString as _transpileString } from "../../src/Compiler"; +import { CompilerOptions } from "../../src/CompilerOptions"; import { LuaTarget, LuaTranspiler } from "../../src/Transpiler"; import { createTranspiler } from "../../src/TranspilerFactory"; @@ -11,7 +12,9 @@ import {lauxlib, lua, lualib, to_jsstring, to_luastring } from "fengari"; import * as fs from "fs"; -export { transpileString }; +export function transpileString(str: string, options?: CompilerOptions): string { + return _transpileString("/** !NoContext */ declare function JSONStringify(t: any): string;\n" + str, options); +} export function executeLua(luaStr: string, withLib = true): any { if (withLib) { diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts index b515d6749..007127d33 100644 --- a/test/unit/loops.spec.ts +++ b/test/unit/loops.spec.ts @@ -18,7 +18,6 @@ export class LuaLoopTests { arrTest[i] = arrTest[i] + 1; i++; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -53,7 +52,6 @@ export class LuaLoopTests { i++; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -88,7 +86,6 @@ export class LuaLoopTests { i++; } while (i < arrTest.length) - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -108,7 +105,6 @@ export class LuaLoopTests { for (let i = 0; i < arrTest.length; ++i) { arrTest[i] = arrTest[i] + 1; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -137,7 +133,6 @@ export class LuaLoopTests { arrTest[i] = j; } } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest); ` ); @@ -158,7 +153,6 @@ export class LuaLoopTests { for (let i = 0; arrTest.length > i; i++) { arrTest[i] = arrTest[i] + 1; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -179,7 +173,6 @@ export class LuaLoopTests { break; arrTest[i] = arrTest[i] + 1; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -206,7 +199,6 @@ export class LuaLoopTests { for (${header}) { arrTest[i] = arrTest[i] + 1; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -226,7 +218,6 @@ export class LuaLoopTests { for (let key in objTest) { objTest[key] = objTest[key] + 1; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(objTest);` ); @@ -264,7 +255,6 @@ export class LuaLoopTests { obj[i] = 0; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(obj); ` ); @@ -286,7 +276,6 @@ export class LuaLoopTests { for (let value of objTest) { arrResultTest.push(value + 1) } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrResultTest);` ); @@ -318,7 +307,6 @@ export class LuaLoopTests { } a++; } - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(testArr);` ); diff --git a/test/unit/lualib/lualib.spec.ts b/test/unit/lualib/lualib.spec.ts index 5a8b1bb39..b81f83c90 100644 --- a/test/unit/lualib/lualib.spec.ts +++ b/test/unit/lualib/lualib.spec.ts @@ -12,7 +12,6 @@ export class LuaLibArrayTests { arrTest.forEach((elem, index) => { arrTest[index] = arrTest[index] + 1; }) - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(arrTest);` ); @@ -32,8 +31,7 @@ export class LuaLibArrayTests { @Test("array.map") public map(inp: T[], func: string) { // Transpile - const lua = util.transpileString(`/** !NoContext */ declare function JSONStringify(t: any): string; - return JSONStringify([${inp.toString()}].map(${func}))`); + const lua = util.transpileString(`return JSONStringify([${inp.toString()}].map(${func}))`); // Execute const result = util.executeLua(lua); @@ -52,8 +50,7 @@ export class LuaLibArrayTests { @Test("array.filter") public filter(inp: T[], func: string) { // Transpile - const lua = util.transpileString(`/** !NoContext */ declare function JSONStringify(t: any): string; - return JSONStringify([${inp.toString()}].filter(${func}))`); + const lua = util.transpileString(`return JSONStringify([${inp.toString()}].filter(${func}))`); // Execute const result = util.executeLua(lua); @@ -69,8 +66,7 @@ export class LuaLibArrayTests { @Test("array.every") public every(inp: T[], func: string) { // Transpile - const lua = util.transpileString(`/** !NoContext */ declare function JSONStringify(t: any): string; - return JSONStringify([${inp.toString()}].every(${func})))`); + const lua = util.transpileString(`return JSONStringify([${inp.toString()}].every(${func})))`); // Execute const result = util.executeLua(lua); @@ -86,8 +82,7 @@ export class LuaLibArrayTests { @Test("array.some") public some(inp: T[], func: string) { // Transpile - const lua = util.transpileString(`/** !NoContext */ declare function JSONStringify(t: any): string; - return JSONStringify([${inp.toString()}].some(${func})))`); + const lua = util.transpileString(`return JSONStringify([${inp.toString()}].some(${func})))`); // Execute const result = util.executeLua(lua); @@ -106,8 +101,7 @@ export class LuaLibArrayTests { @Test("array.slice") public slice(inp: T[], start: number, end?: number) { // Transpile - const lua = util.transpileString(`/** !NoContext */ declare function JSONStringify(t: any): string; - return JSONStringify([${inp.toString()}].slice(${start}, ${end}))`); + const lua = util.transpileString(`return JSONStringify([${inp.toString()}].slice(${start}, ${end}))`); // Execute const result = util.executeLua(lua); @@ -129,7 +123,6 @@ export class LuaLibArrayTests { const lua = util.transpileString( `let spliceTestTable = [${inp.toString()}]; spliceTestTable.splice(${start}, ${deleteCount}, ${newElements}); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(spliceTestTable);` ); @@ -156,14 +149,12 @@ export class LuaLibArrayTests { lua = util.transpileString( `let spliceTestTable = [${inp.toString()}]; spliceTestTable.splice(${start}, ${deleteCount}, ${newElements}); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(spliceTestTable);` ); } elseĀ { lua = util.transpileString( `let spliceTestTable = [${inp.toString()}]; spliceTestTable.splice(${start}); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(spliceTestTable);` ); } @@ -197,7 +188,6 @@ export class LuaLibArrayTests { // Transpile const lua = util.transpileString( `let concatTestTable = ${JSON.stringify(arr)}; - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(concatTestTable.concat(${argStr}));` ); @@ -288,7 +278,6 @@ export class LuaLibArrayTests { const lua = util.transpileString( `let testArray = [0]; testArray.push(${inp.join(", ")}); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(testArray); ` ); @@ -343,7 +332,6 @@ export class LuaLibArrayTests { const lua = util.transpileString( `let testArray = ${array}; let val = testArray.reverse(); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(testArray)`); // Execute @@ -364,7 +352,6 @@ export class LuaLibArrayTests { const lua = util.transpileString( `let testArray = ${array}; let val = testArray.shift(); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(testArray)`); // Execute @@ -398,7 +385,6 @@ export class LuaLibArrayTests { const lua = util.transpileString( `let testArray = ${array}; testArray.unshift(${toUnshift}); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(testArray)`); // Execute const result = util.executeLua(lua); @@ -418,7 +404,6 @@ export class LuaLibArrayTests { const lua = util.transpileString( `let testArray = ${array}; testArray.sort(); - /** !NoContext */ declare function JSONStringify(t: any): string; return JSONStringify(testArray)`); // Execute diff --git a/test/unit/spreadElement.spec.ts b/test/unit/spreadElement.spec.ts index 89250bc6c..50bf8f2dc 100644 --- a/test/unit/spreadElement.spec.ts +++ b/test/unit/spreadElement.spec.ts @@ -10,8 +10,7 @@ export class SpreadElementTest { @TestCase([1, "test", 3]) @Test("Spread Element Push") public spreadElementPush(inp: any[]) { - const lua = util.transpileString(`/** !NoContext */ declare function JSONStringify(t: any): string; - return JSONStringify([].push(...${JSON.stringify(inp)}));`); + const lua = util.transpileString(`return JSONStringify([].push(...${JSON.stringify(inp)}));`); const result = util.executeLua(lua); Expect(result).toBe([].push(...inp)); } diff --git a/test/unit/string.spec.ts b/test/unit/string.spec.ts index f2f67b004..367ff0442 100644 --- a/test/unit/string.spec.ts +++ b/test/unit/string.spec.ts @@ -274,8 +274,7 @@ export class StringTests { public split(inp: string, separator: string): void { // Transpile const lua = util.transpileString( - `/** !NoContext */ declare function JSONStringify(t: any): string; - return JSONStringify("${inp}".split("${separator}"))` + `return JSONStringify("${inp}".split("${separator}"))` ); // Execute