typescript-to-lua 1.5.0 → 1.6.0

package/dist/lualib-build/plugin.d.ts

@@ -7,7 +7,7 @@ export declare const lualibDiagnostic: ((message: string, file?: ts.SourceFile |
 };
 declare class LuaLibPlugin implements tstl.Plugin {
     visitors: {
-        303: (file: ts.SourceFile, context: tstl.TransformationContext) => tstl.File;
+        305: (file: ts.SourceFile, context: tstl.TransformationContext) => tstl.File;
     };
     printer: tstl.Printer;
     afterPrint(program: ts.Program, options: tstl.CompilerOptions, emitHost: EmitHost, result: ProcessedFile[]): ts.Diagnostic[];

package/dist/transformation/context/context.d.ts

@@ -16,7 +16,7 @@ export interface EmitResolver {
     moduleExportsSomeValue(moduleReferenceExpression: ts.Expression): boolean;
     getAllAccessorDeclarations(declaration: ts.AccessorDeclaration): AllAccessorDeclarations;
 }
-export interface DiagnosticsProducingTypeChecker extends ts.TypeChecker {
+export interface TypeCheckerWithEmitResolver extends ts.TypeChecker {
     getEmitResolver(sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken): EmitResolver;
 }
 export declare class TransformationContext {
@@ -24,7 +24,7 @@ export declare class TransformationContext {
     sourceFile: ts.SourceFile;
     private visitorMap;
     readonly diagnostics: ts.Diagnostic[];
-    readonly checker: DiagnosticsProducingTypeChecker;
+    readonly checker: TypeCheckerWithEmitResolver;
     readonly resolver: EmitResolver;
     readonly precedingStatementsStack: lua.Statement[][];
     readonly options: CompilerOptions;

package/dist/transformation/context/context.js

@@ -16,7 +16,7 @@ class TransformationContext {
         this.sourceFile = sourceFile;
         this.visitorMap = visitorMap;
         this.diagnostics = [];
-        this.checker = this.program.getDiagnosticsProducingTypeChecker();
+        this.checker = this.program.getTypeChecker();
         this.precedingStatementsStack = [];
         this.options = this.program.getCompilerOptions();
         this.luaTarget = (_a = this.options.luaTarget) !== null && _a !== void 0 ? _a : CompilerOptions_1.LuaTarget.Universal;

package/dist/transformation/utils/export.d.ts

@@ -3,7 +3,7 @@ import * as lua from "../../LuaAST";
 import { TransformationContext } from "../context";
 export declare function hasDefaultExportModifier(node: ts.Node): boolean;
 export declare function hasExportModifier(node: ts.Node): boolean;
-export declare const createDefaultExportStringLiteral: (original?: ts.Node | undefined) => lua.StringLiteral;
+export declare const createDefaultExportStringLiteral: (original?: ts.Node) => lua.StringLiteral;
 export declare function getExportedSymbolDeclaration(symbol: ts.Symbol): ts.Declaration | undefined;
 export declare function getSymbolFromIdentifier(context: TransformationContext, identifier: lua.Identifier): ts.Symbol | undefined;
 export declare function getIdentifierExportScope(context: TransformationContext, identifier: lua.Identifier): ts.SourceFile | ts.ModuleDeclaration | undefined;

package/dist/transformation/utils/function-context.js

@@ -59,7 +59,7 @@ function getDeclarationContextType({ program }, signatureDeclaration) {
     }
     // When using --noImplicitSelf and the signature is defined in a file targeted by the program apply the @noSelf rule.
     const options = program.getCompilerOptions();
-    if (options.noImplicitSelf && program.getRootFileNames().includes(signatureDeclaration.getSourceFile().fileName)) {
+    if (options.noImplicitSelf && program.getSourceFile(signatureDeclaration.getSourceFile().fileName) !== undefined) {
         return ContextType.Void;
     }
     // Walk up to find @noSelf or @noSelfInFile

package/dist/transformation/utils/lua-ast.d.ts

@@ -13,4 +13,4 @@ export declare function wrapInTable(...expressions: lua.Expression[]): lua.Table
 export declare function wrapInToStringForConcat(expression: lua.Expression): lua.Expression;
 export declare function createHoistableVariableDeclarationStatement(context: TransformationContext, identifier: lua.Identifier, initializer?: lua.Expression, tsOriginal?: ts.Node): lua.AssignmentStatement | lua.VariableDeclarationStatement;
 export declare function createLocalOrExportedOrGlobalDeclaration(context: TransformationContext, lhs: lua.Identifier | lua.Identifier[], rhs?: lua.Expression | lua.Expression[], tsOriginal?: ts.Node, overrideExportScope?: ts.SourceFile | ts.ModuleDeclaration): lua.Statement[];
-export declare const createNaN: (tsOriginal?: ts.Node | undefined) => lua.BinaryExpression;
+export declare const createNaN: (tsOriginal?: ts.Node) => lua.BinaryExpression;

package/dist/transformation/visitors/binary-expression/compound.d.ts

@@ -6,7 +6,10 @@ export declare const isCompoundAssignmentToken: (token: ts.BinaryOperator) => to
 export declare const unwrapCompoundAssignmentToken: (token: ts.CompoundAssignmentOperator) => CompoundAssignmentToken;
 export declare function transformCompoundAssignment(context: TransformationContext, expression: ts.Expression, lhs: ts.Expression, rhs: ts.Expression, operator: CompoundAssignmentToken, isPostfix: boolean): {
     statements: lua.Statement[];
-    result: lua.AssignmentLeftHandSideExpression;
+    result: lua.Identifier;
+} | {
+    statements: lua.Statement[];
+    result: lua.TableIndexExpression;
 };
 export declare function transformCompoundAssignmentExpression(context: TransformationContext, expression: ts.Expression, lhs: ts.Expression, rhs: ts.Expression, operator: CompoundAssignmentToken, isPostfix: boolean): lua.Expression;
 export declare function transformCompoundAssignmentStatement(context: TransformationContext, node: ts.Node, lhs: ts.Expression, rhs: ts.Expression, operator: CompoundAssignmentToken): lua.Statement[];

package/dist/transformation/visitors/binary-expression/compound.js

@@ -39,7 +39,7 @@ exports.unwrapCompoundAssignmentToken = unwrapCompoundAssignmentToken;
 function transformCompoundAssignment(context, expression, lhs, rhs, operator, isPostfix) {
     const left = (0, utils_1.cast)(context.transformExpression(lhs), lua.isAssignmentLeftHandSideExpression);
     const [rightPrecedingStatements, right] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(rhs));
-    if (lua.isTableIndexExpression(left) && shouldCacheTableIndexExpressions(left, rightPrecedingStatements)) {
+    if (lua.isTableIndexExpression(left)) {
         // Complex property/element accesses need to cache object/index expressions to avoid repeating side-effects
         // local __obj, __index = ${objExpression}, ${indexExpression};
         const obj = context.createTempNameForLuaExpression(left.table);
@@ -60,6 +60,15 @@ function transformCompoundAssignment(context, expression, lhs, rhs, operator, is
             };
         }
         else {
+            if (isSetterSkippingCompoundAssignmentOperator(operator)) {
+                return {
+                    statements: [
+                        objAndIndexDeclaration,
+                        ...transformSetterSkippingCompoundAssignment(accessExpression, operator, right, rightPrecedingStatements),
+                    ],
+                    result: left,
+                };
+            }
             // local ____tmp = ____obj[____index] ${replacementOperator} ${right};
             // ____obj[____index] = ____tmp;
             // return ____tmp
@@ -83,24 +92,6 @@ function transformCompoundAssignment(context, expression, lhs, rhs, operator, is
         const assignStatements = (0, assignments_1.transformAssignmentWithRightPrecedingStatements)(context, lhs, operatorExpression, rightPrecedingStatements);
         return { statements: [tmpDeclaration, ...precedingStatements, ...assignStatements], result: tmpIdentifier };
     }
-    else if (ts.isPropertyAccessExpression(lhs) || ts.isElementAccessExpression(lhs)) {
-        // Simple property/element access expressions need to cache in temp to avoid double-evaluation
-        // local ____tmp = ${left} ${replacementOperator} ${right};
-        // ${left} = ____tmp;
-        // return ____tmp
-        const tmpIdentifier = context.createTempNameForLuaExpression(left);
-        const [precedingStatements, operatorExpression] = (0, binary_expression_1.transformBinaryOperation)(context, left, right, rightPrecedingStatements, operator, expression);
-        const tmpDeclaration = lua.createVariableDeclarationStatement(tmpIdentifier, operatorExpression);
-        if (isSetterSkippingCompoundAssignmentOperator(operator)) {
-            const statements = [
-                tmpDeclaration,
-                ...transformSetterSkippingCompoundAssignment(tmpIdentifier, operator, right, precedingStatements),
-            ];
-            return { statements, result: tmpIdentifier };
-        }
-        const assignStatements = (0, assignments_1.transformAssignmentWithRightPrecedingStatements)(context, lhs, tmpIdentifier, precedingStatements);
-        return { statements: [tmpDeclaration, ...assignStatements], result: tmpIdentifier };
-    }
     else {
         if (rightPrecedingStatements.length > 0 && isSetterSkippingCompoundAssignmentOperator(operator)) {
             return {

package/dist/transformation/visitors/call.js

@@ -195,7 +195,9 @@ const transformCallExpression = (node, context) => {
         // if is optionalContinuation, context will be handled by transformOptionalChain.
         const useGlobalContext = !context.isStrict && optionalContinuation === undefined;
         const callContext = useGlobalContext ? ts.factory.createIdentifier("_G") : ts.factory.createNull();
-        [callPath, parameters] = transformCallAndArguments(context, calledExpression, node.arguments, signature, callContext);
+        [callPath, parameters] = transformCallAndArguments(context, calledExpression, node.arguments, signature, 
+        // Only pass context if noImplicitSelf is not configured
+        context.options.noImplicitSelf ? undefined : callContext);
     }
     const callExpression = lua.createCallExpression(callPath, parameters, node);
     if (optionalContinuation && isContextualCall) {

package/dist/transpilation/index.js

@@ -19,6 +19,7 @@ const fs = require("fs");
 const path = require("path");
 const ts = require("typescript");
 const tsconfig_1 = require("../cli/tsconfig");
+const utils_1 = require("../utils");
 const output_collector_1 = require("./output-collector");
 const transpiler_1 = require("./transpiler");
 __exportStar(require("./transpile"), exports);
@@ -44,8 +45,12 @@ exports.transpileProject = transpileProject;
 const libCache = {};
 /** @internal */
 function createVirtualProgram(input, options = {}) {
+    const normalizedFiles = {};
+    for (const [path, file] of Object.entries(input)) {
+        normalizedFiles[(0, utils_1.normalizeSlashes)(path)] = file;
+    }
     const compilerHost = {
-        fileExists: fileName => fileName in input || ts.sys.fileExists(fileName),
+        fileExists: fileName => fileName in normalizedFiles || ts.sys.fileExists(fileName),
         getCanonicalFileName: fileName => fileName,
         getCurrentDirectory: () => "",
         getDefaultLibFileName: ts.getDefaultLibFileName,
@@ -54,8 +59,8 @@ function createVirtualProgram(input, options = {}) {
         useCaseSensitiveFileNames: () => false,
         writeFile() { },
         getSourceFile(fileName) {
-            if (fileName in input) {
-                return ts.createSourceFile(fileName, input[fileName], ts.ScriptTarget.Latest, false);
+            if (fileName in normalizedFiles) {
+                return ts.createSourceFile(fileName, normalizedFiles[fileName], ts.ScriptTarget.Latest, false);
             }
             let filePath;
             if (fileName.startsWith("lib.")) {
@@ -75,7 +80,7 @@ function createVirtualProgram(input, options = {}) {
             }
         },
     };
-    return ts.createProgram(Object.keys(input), options, compilerHost);
+    return ts.createProgram(Object.keys(normalizedFiles), options, compilerHost);
 }
 exports.createVirtualProgram = createVirtualProgram;
 function transpileVirtualProject(files, options = {}) {

package/dist/transpilation/resolve.js

@@ -115,8 +115,8 @@ function resolveFileDependencies(file, context) {
     const dependencies = [];
     const diagnostics = [];
     for (const required of findRequiredPaths(file.code)) {
-        // Do no resolve lualib
-        if (required === "lualib_bundle") {
+        // Do no resolve lualib, unless it is included from node_modules
+        if (required === "lualib_bundle" && !isNodeModulesFile(file.fileName)) {
             dependencies.push({ fileName: "lualib_bundle", code: "" });
             continue;
         }

package/dist/transpilation/transpiler.js

@@ -16,9 +16,10 @@ class Transpiler {
     }
     emit(emitOptions) {
         var _a, _b;
-        const { program, writeFile = this.emitHost.writeFile } = emitOptions;
+        const { program, writeFile = this.emitHost.writeFile, plugins: optionsPlugins = [] } = emitOptions;
         const options = program.getCompilerOptions();
-        const { diagnostics: getPluginsDiagnostics, plugins } = (0, plugins_1.getPlugins)(program);
+        const { diagnostics: getPluginsDiagnostics, plugins: configPlugins } = (0, plugins_1.getPlugins)(program);
+        const plugins = [...optionsPlugins, ...configPlugins];
         const { diagnostics, transpiledFiles: freshFiles } = (0, transpile_1.getProgramTranspileResult)(this.emitHost, writeFile, {
             ...emitOptions,
             plugins,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "description": "A generic TypeScript to Lua transpiler. Write your code in TypeScript and publish Lua!",
     "repository": "https://github.com/TypeScriptToLua/TypeScriptToLua",
     "homepage": "https://typescripttolua.github.io/",
@@ -43,7 +43,7 @@
         "node": ">=12.13.0"
     },
     "peerDependencies": {
-        "typescript": "~4.6.2"
+        "typescript": "~4.7.3"
     },
     "dependencies": {
         "enhanced-resolve": "^5.8.2",
@@ -53,14 +53,14 @@
     "devDependencies": {
         "@types/fs-extra": "^8.1.0",
         "@types/glob": "^7.1.1",
-        "@types/jest": "^27.4.1",
+        "@types/jest": "^27.5.2",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.13.0",
-        "@typescript-eslint/parser": "^5.13.0",
-        "eslint": "^8.10.0",
-        "eslint-plugin-import": "^2.25.4",
-        "eslint-plugin-jest": "^26.1.1",
+        "@typescript-eslint/eslint-plugin": "^5.27.0",
+        "@typescript-eslint/parser": "^5.27.0",
+        "eslint": "^8.17.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jest": "^26.4.6",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
         "jest": "^27.3.0",
@@ -70,6 +70,6 @@
         "prettier": "^2.3.2",
         "ts-jest": "^27.1.3",
         "ts-node": "^10.3.0",
-        "typescript": "~4.6.2"
+        "typescript": "~4.7.3"
     }
 }