typescript-to-lua 1.21.0 → 1.23.0

package/dist/LuaAST.d.ts

@@ -33,25 +33,25 @@ export declare enum SyntaxKind {
     Identifier = 29,
     TableIndexExpression = 30,
     ParenthesizedExpression = 31,
-    AdditionOperator = 32,
+    AdditionOperator = 32,// Maybe use abbreviations for those add, sub, mul ...
     SubtractionOperator = 33,
     MultiplicationOperator = 34,
     DivisionOperator = 35,
     FloorDivisionOperator = 36,
     ModuloOperator = 37,
     PowerOperator = 38,
-    NegationOperator = 39,
+    NegationOperator = 39,// Unary minus
     ConcatOperator = 40,
-    LengthOperator = 41,
+    LengthOperator = 41,// Unary
     EqualityOperator = 42,
     InequalityOperator = 43,
     LessThanOperator = 44,
     LessEqualOperator = 45,
     GreaterThanOperator = 46,
-    GreaterEqualOperator = 47,
+    GreaterEqualOperator = 47,// Syntax Sugar `x >= y` <=> `not (y < x)`
     AndOperator = 48,
     OrOperator = 49,
-    NotOperator = 50,
+    NotOperator = 50,// Unary
     BitwiseAndOperator = 51,
     BitwiseOrOperator = 52,
     BitwiseExclusiveOrOperator = 53,
@@ -69,8 +69,8 @@ export type SymbolId = number & {
 };
 export declare enum NodeFlags {
     None = 0,
-    Inline = 1,
-    Declaration = 2,
+    Inline = 1,// Keep function body on same line
+    Declaration = 2,// Prefer declaration syntax `function foo()` over assignment syntax `foo = function()`
     TableUnpackCall = 4
 }
 export interface TextRange {

package/dist/LuaLib.d.ts

@@ -60,6 +60,7 @@ export declare enum LuaLibFeature {
     New = "New",
     Number = "Number",
     NumberIsFinite = "NumberIsFinite",
+    NumberIsInteger = "NumberIsInteger",
     NumberIsNaN = "NumberIsNaN",
     NumberParseInt = "ParseInt",
     NumberParseFloat = "ParseFloat",

package/dist/LuaLib.js

@@ -65,6 +65,7 @@ var LuaLibFeature;
     LuaLibFeature["New"] = "New";
     LuaLibFeature["Number"] = "Number";
     LuaLibFeature["NumberIsFinite"] = "NumberIsFinite";
+    LuaLibFeature["NumberIsInteger"] = "NumberIsInteger";
     LuaLibFeature["NumberIsNaN"] = "NumberIsNaN";
     LuaLibFeature["NumberParseInt"] = "ParseInt";
     LuaLibFeature["NumberParseFloat"] = "ParseFloat";

package/dist/lualib/5.0/NumberIsInteger.lua

@@ -0,0 +1,3 @@
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end

package/dist/lualib/5.0/Unpack.lua

@@ -1,6 +1,6 @@
 local function __TS__Unpack(list, i, j)
     if i == 1 and j == nil then
-        return unpack(nil, list)
+        return unpack(list)
     else
         if j == nil then
             j = table.getn(list)

package/dist/lualib/5.0/lualib_bundle.lua

@@ -1241,7 +1241,7 @@ end
 
 local function __TS__Unpack(list, i, j)
     if i == 1 and j == nil then
-        return unpack(nil, list)
+        return unpack(list)
     else
         if j == nil then
             j = table.getn(list)
@@ -1526,6 +1526,10 @@ local function __TS__NumberIsFinite(value)
     return type(value) == "number" and value == value and value ~= 1 / 0 and value ~= -(1 / 0)
 end
 
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end
+
 local function __TS__NumberIsNaN(value)
     return value ~= value
 end
@@ -2627,6 +2631,7 @@ return {
   __TS__New = __TS__New,
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
+  __TS__NumberIsInteger = __TS__NumberIsInteger,
   __TS__NumberIsNaN = __TS__NumberIsNaN,
   __TS__ParseInt = __TS__ParseInt,
   __TS__ParseFloat = __TS__ParseFloat,

package/dist/lualib/5.0/lualib_module_info.json

@@ -381,6 +381,14 @@
       "__TS__NumberIsFinite"
     ]
   },
+  "NumberIsInteger": {
+    "exports": [
+      "__TS__NumberIsInteger"
+    ],
+    "dependencies": [
+      "NumberIsFinite"
+    ]
+  },
   "NumberIsNaN": {
     "exports": [
       "__TS__NumberIsNaN"

package/dist/lualib/universal/NumberIsInteger.lua

@@ -0,0 +1,3 @@
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end

package/dist/lualib/universal/lualib_bundle.lua

@@ -1466,6 +1466,10 @@ local function __TS__NumberIsFinite(value)
     return type(value) == "number" and value == value and value ~= math.huge and value ~= -math.huge
 end
 
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end
+
 local function __TS__NumberIsNaN(value)
     return value ~= value
 end
@@ -2567,6 +2571,7 @@ return {
   __TS__New = __TS__New,
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
+  __TS__NumberIsInteger = __TS__NumberIsInteger,
   __TS__NumberIsNaN = __TS__NumberIsNaN,
   __TS__ParseInt = __TS__ParseInt,
   __TS__ParseFloat = __TS__ParseFloat,

package/dist/lualib/universal/lualib_module_info.json

@@ -387,6 +387,14 @@
       "__TS__NumberIsFinite"
     ]
   },
+  "NumberIsInteger": {
+    "exports": [
+      "__TS__NumberIsInteger"
+    ],
+    "dependencies": [
+      "NumberIsFinite"
+    ]
+  },
   "NumberIsNaN": {
     "exports": [
       "__TS__NumberIsNaN"

package/dist/transformation/builtins/number.js

@@ -74,6 +74,8 @@ function transformNumberConstructorCall(context, node, calledMethod) {
     const parameters = (0, call_1.transformArguments)(context, node.arguments);
     const methodName = calledMethod.name.text;
     switch (methodName) {
+        case "isInteger":
+            return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.NumberIsInteger, node, ...parameters);
         case "isNaN":
             return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.NumberIsNaN, node, ...parameters);
         case "isFinite":

package/dist/transformation/utils/function-context.d.ts

@@ -6,5 +6,5 @@ export declare enum ContextType {
     NonVoid = 2,
     Mixed = 3
 }
-export declare function getDeclarationContextType(context: TransformationContext, signatureDeclaration: ts.SignatureDeclaration): ContextType;
+export declare function getCallContextType(context: TransformationContext, callExpression: ts.CallLikeExpression): ContextType;
 export declare function getFunctionContextType(context: TransformationContext, type: ts.Type): ContextType;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFunctionContextType = exports.getDeclarationContextType = exports.ContextType = void 0;
+exports.getFunctionContextType = exports.getCallContextType = exports.ContextType = void 0;
 const ts = require("typescript");
 const annotations_1 = require("./annotations");
 const typescript_1 = require("./typescript");
@@ -32,8 +32,33 @@ function getExplicitThisParameter(signatureDeclaration) {
         return param;
     }
 }
+const callContextTypes = new WeakMap();
+function getCallContextType(context, callExpression) {
+    const known = callContextTypes.get(callExpression);
+    if (known !== undefined)
+        return known;
+    const signature = context.checker.getResolvedSignature(callExpression);
+    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
+    let contextType = ContextType.None;
+    if (signatureDeclaration) {
+        contextType = computeDeclarationContextType(context, signatureDeclaration);
+    }
+    else {
+        // No signature declaration could be resolved, so instead try to see if the declaration is in a
+        // noSelfInFile file
+        const declarations = findRootDeclarations(context, callExpression);
+        contextType = declarations.some(d => (0, annotations_1.getFileAnnotations)(d.getSourceFile()).has(annotations_1.AnnotationKind.NoSelfInFile))
+            ? ContextType.Void
+            : context.options.noImplicitSelf
+                ? ContextType.Void
+                : ContextType.NonVoid;
+    }
+    callContextTypes.set(callExpression, contextType);
+    return contextType;
+}
+exports.getCallContextType = getCallContextType;
 const signatureDeclarationContextTypes = new WeakMap();
-function getDeclarationContextType(context, signatureDeclaration) {
+function getSignatureContextType(context, signatureDeclaration) {
     const known = signatureDeclarationContextTypes.get(signatureDeclaration);
     if (known !== undefined)
         return known;
@@ -41,7 +66,33 @@ function getDeclarationContextType(context, signatureDeclaration) {
     signatureDeclarationContextTypes.set(signatureDeclaration, contextType);
     return contextType;
 }
-exports.getDeclarationContextType = getDeclarationContextType;
+function findRootDeclarations(context, callExpression) {
+    var _a, _b;
+    const calledExpression = ts.isTaggedTemplateExpression(callExpression)
+        ? callExpression.tag
+        : ts.isJsxSelfClosingElement(callExpression)
+            ? callExpression.tagName
+            : ts.isJsxOpeningElement(callExpression)
+                ? callExpression.tagName
+                : ts.isCallExpression(callExpression)
+                    ? callExpression.expression
+                    : undefined;
+    if (!calledExpression)
+        return [];
+    const calledSymbol = context.checker.getSymbolAtLocation(calledExpression);
+    if (calledSymbol === undefined)
+        return [];
+    return ((_b = (_a = calledSymbol.getDeclarations()) === null || _a === void 0 ? void 0 : _a.flatMap(d => {
+        var _a;
+        if (ts.isImportSpecifier(d)) {
+            const aliasSymbol = context.checker.getAliasedSymbol(calledSymbol);
+            return (_a = aliasSymbol.getDeclarations()) !== null && _a !== void 0 ? _a : [];
+        }
+        else {
+            return [d];
+        }
+    })) !== null && _b !== void 0 ? _b : []);
+}
 function computeDeclarationContextType(context, signatureDeclaration) {
     const thisParameter = getExplicitThisParameter(signatureDeclaration);
     if (thisParameter) {
@@ -140,6 +191,6 @@ function computeFunctionContextType(context, type) {
     if (signatures.length === 0) {
         return ContextType.None;
     }
-    return reduceContextTypes(signatures.flatMap(s => getSignatureDeclarations(context, s)).map(s => getDeclarationContextType(context, s)));
+    return reduceContextTypes(signatures.flatMap(s => getSignatureDeclarations(context, s)).map(s => getSignatureContextType(context, s)));
 }
 //# sourceMappingURL=function-context.js.map

package/dist/transformation/visitors/call.d.ts

@@ -4,6 +4,6 @@ import { FunctionVisitor, TransformationContext } from "../context";
 export declare function validateArguments(context: TransformationContext, params: readonly ts.Expression[], signature?: ts.Signature): void;
 export declare function transformArguments(context: TransformationContext, params: readonly ts.Expression[], signature?: ts.Signature, callContext?: ts.Expression): lua.Expression[];
 export declare function transformCallAndArguments(context: TransformationContext, callExpression: ts.Expression, params: readonly ts.Expression[], signature?: ts.Signature, callContext?: ts.Expression): [lua.Expression, lua.Expression[]];
-export declare function transformContextualCallExpression(context: TransformationContext, node: ts.CallExpression | ts.TaggedTemplateExpression, args: ts.Expression[] | ts.NodeArray<ts.Expression>, signature?: ts.Signature): lua.Expression;
+export declare function transformContextualCallExpression(context: TransformationContext, node: ts.CallExpression | ts.TaggedTemplateExpression, args: ts.Expression[] | ts.NodeArray<ts.Expression>): lua.Expression;
 export declare const transformCallExpression: FunctionVisitor<ts.CallExpression>;
 export declare function getCalledExpression(node: ts.CallExpression): ts.Expression;

package/dist/transformation/visitors/call.js

@@ -78,12 +78,12 @@ function transformElementAccessCall(context, left, transformedArguments, argPrec
     }
     return lua.createCallExpression(index, [selfIdentifier, ...transformedArguments]);
 }
-function transformContextualCallExpression(context, node, args, signature) {
+function transformContextualCallExpression(context, node, args) {
     if (ts.isOptionalChain(node)) {
         return (0, optional_chaining_1.transformOptionalChain)(context, node);
     }
     const left = ts.isCallExpression(node) ? getCalledExpression(node) : node.tag;
-    let { precedingStatements: argPrecedingStatements, result: transformedArguments } = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => transformArguments(context, args, signature));
+    let { precedingStatements: argPrecedingStatements, result: transformedArguments } = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => transformArguments(context, args));
     if (ts.isPropertyAccessExpression(left) &&
         ts.isIdentifier(left.name) &&
         (0, safe_names_1.isValidLuaIdentifier)(left.name.text, context.options) &&
@@ -126,10 +126,9 @@ function transformPropertyCall(context, node, calledMethod) {
         const parameters = transformArguments(context, node.arguments, signature, ts.factory.createThis());
         return lua.createCallExpression(context.transformExpression(node.expression), parameters, node);
     }
-    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    if (!signatureDeclaration || (0, function_context_1.getDeclarationContextType)(context, signatureDeclaration) !== function_context_1.ContextType.Void) {
+    if ((0, function_context_1.getCallContextType)(context, node) !== function_context_1.ContextType.Void) {
         // table:name()
-        return transformContextualCallExpression(context, node, node.arguments, signature);
+        return transformContextualCallExpression(context, node, node.arguments);
     }
     else {
         // table.name()
@@ -138,15 +137,13 @@ function transformPropertyCall(context, node, calledMethod) {
     }
 }
 function transformElementCall(context, node) {
-    const signature = context.checker.getResolvedSignature(node);
-    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    if (!signatureDeclaration || (0, function_context_1.getDeclarationContextType)(context, signatureDeclaration) !== function_context_1.ContextType.Void) {
+    if ((0, function_context_1.getCallContextType)(context, node) !== function_context_1.ContextType.Void) {
         // A contextual parameter must be given to this call expression
-        return transformContextualCallExpression(context, node, node.arguments, signature);
+        return transformContextualCallExpression(context, node, node.arguments);
     }
     else {
         // No context
-        const [expression, parameters] = transformCallAndArguments(context, node.expression, node.arguments, signature);
+        const [expression, parameters] = transformCallAndArguments(context, node.expression, node.arguments);
         return lua.createCallExpression(expression, parameters, node);
     }
 }
@@ -186,7 +183,7 @@ const transformCallExpression = (node, context) => {
     }
     let callPath;
     let parameters;
-    const isContextualCall = isContextualCallExpression(context, signature);
+    const isContextualCall = (0, function_context_1.getCallContextType)(context, node) !== function_context_1.ContextType.Void;
     if (!isContextualCall) {
         [callPath, parameters] = transformCallAndArguments(context, calledExpression, node.arguments, signature);
     }
@@ -203,13 +200,6 @@ const transformCallExpression = (node, context) => {
     return wrapResultInTable ? (0, lua_ast_1.wrapInTable)(callExpression) : callExpression;
 };
 exports.transformCallExpression = transformCallExpression;
-function isContextualCallExpression(context, signature) {
-    const declaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    if (!declaration) {
-        return !context.options.noImplicitSelf;
-    }
-    return (0, function_context_1.getDeclarationContextType)(context, declaration) !== function_context_1.ContextType.Void;
-}
 function getCalledExpression(node) {
     return ts.skipOuterExpressions(node.expression);
 }

package/dist/transformation/visitors/template.js

@@ -66,14 +66,12 @@ const transformTaggedTemplateExpression = (expression, context) => {
     ]);
     expressions.unshift(stringObject);
     // Evaluate if there is a self parameter to be used.
-    const signature = context.checker.getResolvedSignature(expression);
-    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    const useSelfParameter = signatureDeclaration && (0, function_context_1.getDeclarationContextType)(context, signatureDeclaration) !== function_context_1.ContextType.Void;
+    const useSelfParameter = (0, function_context_1.getCallContextType)(context, expression) !== function_context_1.ContextType.Void;
     if (useSelfParameter) {
-        return (0, call_1.transformContextualCallExpression)(context, expression, expressions, signature);
+        return (0, call_1.transformContextualCallExpression)(context, expression, expressions);
     }
     // Argument evaluation.
-    const callArguments = (0, call_1.transformArguments)(context, expressions, signature);
+    const callArguments = (0, call_1.transformArguments)(context, expressions);
     const leftHandSideExpression = context.transformExpression(expression.tag);
     return lua.createCallExpression(leftHandSideExpression, callArguments);
 };

package/dist/transpilation/plugins.d.ts

@@ -29,6 +29,14 @@ export interface Plugin {
      * This function is called after translating the input program to Lua, after resolving dependencies and after bundling.
      */
     beforeEmit?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost, result: EmitFile[]) => ts.Diagnostic[] | void;
+    /**
+     * This function is called after translating the input program to Lua, after resolving dependencies, after bundling and writing files to disk.
+     */
+    afterEmit?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost, result: EmitFile[]) => ts.Diagnostic[] | void;
+    /**
+     * This function is called when trying to resolve the .lua file corresponding to a Lua require statement. Allows you to provide
+     * your own module resolution logic. If return value is undefined, regular module resolution is done.
+     */
     moduleResolution?: (moduleIdentifier: string, requiringFile: string, options: CompilerOptions, emitHost: EmitHost) => string | undefined;
 }
 export declare function getPlugins(program: ts.Program): {

package/dist/transpilation/resolve.js

@@ -13,7 +13,7 @@ const find_lua_requires_1 = require("./find-lua-requires");
 const picomatch = require("picomatch");
 const resolver = resolve.ResolverFactory.createResolver({
     extensions: [".lua"],
-    enforceExtension: true,
+    enforceExtension: true, // Resolved file must be a lua file
     fileSystem: { ...new resolve.CachedInputFileSystem(fs, 0) },
     useSyncFileSystemCalls: true,
     conditionNames: ["require", "node", "tstl", "default"],
@@ -220,10 +220,10 @@ class ResolutionContext {
     }
     searchForFileFromPath(resolvedPath) {
         const possibleProjectFiles = [
-            resolvedPath,
-            resolvedPath + ".ts",
-            path.join(resolvedPath, "index.ts"),
-            resolvedPath + ".tsx",
+            resolvedPath, // JSON files need their extension as part of the import path, caught by this branch,
+            resolvedPath + ".ts", // Regular ts file
+            path.join(resolvedPath, "index.ts"), // Index ts file,
+            resolvedPath + ".tsx", // tsx file
             path.join(resolvedPath, "index.tsx"), // tsx index
         ];
         for (const possibleFile of possibleProjectFiles) {
@@ -233,8 +233,8 @@ class ResolutionContext {
         }
         // Check if this is a lua file in the project sources
         const possibleLuaProjectFiles = [
-            resolvedPath + ".lua",
-            path.join(resolvedPath, "index.lua"),
+            resolvedPath + ".lua", // lua file in sources
+            path.join(resolvedPath, "index.lua"), // lua index file in sources
             path.join(resolvedPath, "init.lua"), // lua looks for <require>/init.lua if it cannot find <require>.lua
         ];
         for (const possibleFile of possibleLuaProjectFiles) {

package/dist/transpilation/transpiler.js

@@ -31,7 +31,7 @@ class Transpiler {
         };
     }
     emitFiles(program, plugins, emitPlan, writeFile) {
-        var _a, _b;
+        var _a, _b, _c;
         performance.startSection("emit");
         const options = program.getCompilerOptions();
         if (options.tstlVerbose) {
@@ -54,6 +54,12 @@ class Transpiler {
                 writeFile(outputPath + ".map", sourceMap, emitBOM, undefined, sourceFiles);
             }
         }
+        for (const plugin of plugins) {
+            if (plugin.afterEmit) {
+                const afterEmitPluginDiagnostics = (_c = plugin.afterEmit(program, options, this.emitHost, emitPlan)) !== null && _c !== void 0 ? _c : [];
+                diagnostics.push(...afterEmitPluginDiagnostics);
+            }
+        }
         if (options.tstlVerbose) {
             console.log("Emit finished!");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.21.0",
+    "version": "1.23.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/",
@@ -42,7 +42,7 @@
         "node": ">=16.10.0"
     },
     "peerDependencies": {
-        "typescript": "5.2.2"
+        "typescript": "5.3.3"
     },
     "dependencies": {
         "@typescript-to-lua/language-extensions": "1.19.0",
@@ -72,6 +72,6 @@
         "prettier": "^2.8.4",
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.3"
     }
 }