typescript-to-lua 1.8.0 → 1.9.0

package/dist/CompilerOptions.js

@@ -39,6 +39,9 @@ function validateOptions(options) {
     if (options.jsx && options.jsx !== typescript_1.JsxEmit.React) {
         diagnostics.push(diagnosticFactories.unsupportedJsxEmit());
     }
+    if (options.paths && !options.baseUrl) {
+        diagnostics.push(diagnosticFactories.pathsWithoutBaseUrl());
+    }
     return diagnostics;
 }
 exports.validateOptions = validateOptions;

package/dist/transformation/builtins/index.js

@@ -67,9 +67,7 @@ function transformBuiltinCallExpression(context, node) {
 exports.transformBuiltinCallExpression = transformBuiltinCallExpression;
 function tryTransformBuiltinGlobalMethodCall(context, node, calledMethod) {
     const ownerType = context.checker.getTypeAtLocation(calledMethod.expression);
-    if (!(0, typescript_1.isStandardLibraryType)(context, ownerType, undefined))
-        return;
-    const ownerSymbol = ownerType.symbol;
+    const ownerSymbol = tryGetStandardLibrarySymbolOfType(context, ownerType);
     if (!ownerSymbol || ownerSymbol.parent)
         return;
     let result;
@@ -106,11 +104,10 @@ function tryTransformBuiltinGlobalMethodCall(context, node, calledMethod) {
     return result;
 }
 function tryTransformBuiltinPropertyCall(context, node, calledMethod) {
-    var _a;
-    const signatureDeclaration = (_a = context.checker.getResolvedSignature(node)) === null || _a === void 0 ? void 0 : _a.declaration;
-    if (!signatureDeclaration || !(0, typescript_1.isStandardLibraryDeclaration)(context, signatureDeclaration))
+    const functionType = context.checker.getTypeAtLocation(node.expression);
+    const callSymbol = tryGetStandardLibrarySymbolOfType(context, functionType);
+    if (!callSymbol)
         return;
-    const callSymbol = context.checker.getTypeAtLocation(signatureDeclaration).symbol;
     const ownerSymbol = callSymbol.parent;
     if (!ownerSymbol || ownerSymbol.parent)
         return;
@@ -187,4 +184,17 @@ function checkForLuaLibType(context, type) {
     }
 }
 exports.checkForLuaLibType = checkForLuaLibType;
+function tryGetStandardLibrarySymbolOfType(context, type) {
+    if (type.isUnionOrIntersection()) {
+        for (const subType of type.types) {
+            const symbol = tryGetStandardLibrarySymbolOfType(context, subType);
+            if (symbol)
+                return symbol;
+        }
+    }
+    else if ((0, typescript_1.isStandardLibraryType)(context, type, undefined)) {
+        return type.symbol;
+    }
+    return undefined;
+}
 //# sourceMappingURL=index.js.map

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

@@ -83,6 +83,9 @@ export declare const annotationRemoved: ((node: ts.Node, kind: AnnotationKind) =
 export declare const annotationDeprecated: ((node: ts.Node, kind: AnnotationKind) => ts.Diagnostic) & {
     code: number;
 };
+export declare const truthyOnlyConditionalValue: ((node: ts.Node, ...args: any[]) => ts.Diagnostic) & {
+    code: number;
+};
 export declare const notAllowedOptionalAssignment: ((node: ts.Node, ...args: any[]) => ts.Diagnostic) & {
     code: number;
 };

package/dist/transformation/utils/diagnostics.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.undefinedInArrayLiteral = exports.unsupportedOptionalCompileMembersOnly = exports.unsupportedBuiltinOptionalCall = exports.awaitMustBeInAsyncFunction = exports.notAllowedOptionalAssignment = exports.annotationDeprecated = exports.annotationRemoved = exports.invalidCallExtensionUse = exports.invalidMultiReturnAccess = exports.invalidMultiTypeToEmptyPatternOrArrayLiteral = exports.invalidMultiTypeToNonArrayLiteral = exports.invalidMultiFunctionReturnType = exports.invalidMultiFunctionUse = exports.unsupportedVarDeclaration = exports.invalidAmbientIdentifierName = exports.unsupportedProperty = exports.unsupportedForTargetButOverrideAvailable = exports.unsupportedForTarget = exports.unsupportedRightShiftOperator = exports.unsupportedAccessorInObjectLiteral = exports.invalidPairsIterableWithoutDestructuring = exports.invalidMultiIterableWithoutDestructuring = exports.invalidRangeControlVariable = exports.invalidVarargUse = exports.invalidRangeUse = exports.annotationInvalidArgumentCount = exports.decoratorInvalidContext = exports.unsupportedOverloadAssignment = exports.unsupportedSelfFunctionConversion = exports.unsupportedNoSelfFunctionConversion = exports.forbiddenForIn = exports.unsupportedNodeKind = void 0;
+exports.undefinedInArrayLiteral = exports.unsupportedOptionalCompileMembersOnly = exports.unsupportedBuiltinOptionalCall = exports.awaitMustBeInAsyncFunction = exports.notAllowedOptionalAssignment = exports.truthyOnlyConditionalValue = exports.annotationDeprecated = exports.annotationRemoved = exports.invalidCallExtensionUse = exports.invalidMultiReturnAccess = exports.invalidMultiTypeToEmptyPatternOrArrayLiteral = exports.invalidMultiTypeToNonArrayLiteral = exports.invalidMultiFunctionReturnType = exports.invalidMultiFunctionUse = exports.unsupportedVarDeclaration = exports.invalidAmbientIdentifierName = exports.unsupportedProperty = exports.unsupportedForTargetButOverrideAvailable = exports.unsupportedForTarget = exports.unsupportedRightShiftOperator = exports.unsupportedAccessorInObjectLiteral = exports.invalidPairsIterableWithoutDestructuring = exports.invalidMultiIterableWithoutDestructuring = exports.invalidRangeControlVariable = exports.invalidVarargUse = exports.invalidRangeUse = exports.annotationInvalidArgumentCount = exports.decoratorInvalidContext = exports.unsupportedOverloadAssignment = exports.unsupportedSelfFunctionConversion = exports.unsupportedNoSelfFunctionConversion = exports.forbiddenForIn = exports.unsupportedNodeKind = void 0;
 const ts = require("typescript");
 const CompilerOptions_1 = require("../../CompilerOptions");
 const utils_1 = require("../../utils");
@@ -57,6 +57,7 @@ exports.annotationRemoved = createErrorDiagnosticFactory((kind) => `'@${kind}' h
     `See https://typescripttolua.github.io/docs/advanced/compiler-annotations#${kind.toLowerCase()} for more information.`);
 exports.annotationDeprecated = createWarningDiagnosticFactory((kind) => `'@${kind}' is deprecated and will be removed in a future update. Please update your code before upgrading to the next release, otherwise your project will no longer compile. ` +
     `See https://typescripttolua.github.io/docs/advanced/compiler-annotations#${kind.toLowerCase()} for more information.`);
+exports.truthyOnlyConditionalValue = createWarningDiagnosticFactory("Numbers and strings will always evaluate to true in Lua. Explicitly check the value with ===.");
 exports.notAllowedOptionalAssignment = createErrorDiagnosticFactory("The left-hand side of an assignment expression may not be an optional property access.");
 exports.awaitMustBeInAsyncFunction = createErrorDiagnosticFactory("Await can only be used inside async functions.");
 exports.unsupportedBuiltinOptionalCall = createErrorDiagnosticFactory("Optional calls are not supported for builtin or language extension functions.");

package/dist/transformation/visitors/access.js

@@ -6,11 +6,13 @@ const lua = require("../../LuaAST");
 const builtins_1 = require("../builtins");
 const annotations_1 = require("../utils/annotations");
 const diagnostics_1 = require("../utils/diagnostics");
+const language_extensions_1 = require("../utils/language-extensions");
 const lua_ast_1 = require("../utils/lua-ast");
 const lualib_1 = require("../utils/lualib");
 const typescript_1 = require("../utils/typescript");
 const enum_1 = require("./enum");
 const expression_list_1 = require("./expression-list");
+const call_extension_1 = require("./language-extensions/call-extension");
 const multi_1 = require("./language-extensions/multi");
 const optional_chaining_1 = require("./optional-chaining");
 function addOneToArrayAccessArgument(context, node, index) {
@@ -108,6 +110,15 @@ function transformPropertyAccessExpressionWithCapture(context, node, thisValueCa
         // If this assumption is no longer true, this may need to be updated.
         return { expression: builtinResult };
     }
+    if (ts.isIdentifier(node.expression) &&
+        node.parent &&
+        (!ts.isCallExpression(node.parent) || node.parent.expression !== node)) {
+        // Check if this is a method call extension that is not used as a call
+        const extensionType = (0, language_extensions_1.getExtensionKindForNode)(context, node);
+        if (extensionType && call_extension_1.callExtensions.has(extensionType)) {
+            context.diagnostics.push((0, diagnostics_1.invalidCallExtensionUse)(node));
+        }
+    }
     const table = context.transformExpression(node.expression);
     if (thisValueCapture) {
         const thisValue = (0, optional_chaining_1.captureThisValue)(context, table, thisValueCapture, node.expression);

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

@@ -3,3 +3,4 @@ import * as lua from "../../LuaAST";
 import { FunctionVisitor, TransformationContext } from "../context";
 export declare const transformConditionalExpression: FunctionVisitor<ts.ConditionalExpression>;
 export declare function transformIfStatement(statement: ts.IfStatement, context: TransformationContext): lua.IfStatement;
+export declare function checkOnlyTruthyCondition(condition: ts.Expression, context: TransformationContext): void;

package/dist/transformation/visitors/conditional.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformIfStatement = exports.transformConditionalExpression = void 0;
+exports.checkOnlyTruthyCondition = exports.transformIfStatement = exports.transformConditionalExpression = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
 const preceding_statements_1 = require("../utils/preceding-statements");
 const scope_1 = require("../utils/scope");
 const block_1 = require("./block");
 const typescript_1 = require("../utils/typescript");
+const diagnostics_1 = require("../utils/diagnostics");
 function transformProtectedConditionalExpression(context, expression, condition, whenTrue, whenFalse) {
     const tempVar = context.createTempNameForNode(expression.condition);
     const trueStatements = whenTrue[0].concat(lua.createAssignmentStatement(lua.cloneIdentifier(tempVar), whenTrue[1], expression.whenTrue));
@@ -19,6 +20,8 @@ function transformProtectedConditionalExpression(context, expression, condition,
     return lua.cloneIdentifier(tempVar);
 }
 const transformConditionalExpression = (expression, context) => {
+    // Check if we need to add diagnostic about Lua truthiness
+    checkOnlyTruthyCondition(expression.condition, context);
     const condition = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.condition));
     const whenTrue = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenTrue));
     const whenFalse = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenFalse));
@@ -35,6 +38,8 @@ const transformConditionalExpression = (expression, context) => {
 exports.transformConditionalExpression = transformConditionalExpression;
 function transformIfStatement(statement, context) {
     context.pushScope(scope_1.ScopeType.Conditional);
+    // Check if we need to add diagnostic about Lua truthiness
+    checkOnlyTruthyCondition(statement.expression, context);
     const condition = context.transformExpression(statement.expression);
     const statements = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, statement.thenStatement));
     context.popScope();
@@ -70,4 +75,10 @@ function transformIfStatement(statement, context) {
     return lua.createIfStatement(condition, ifBlock);
 }
 exports.transformIfStatement = transformIfStatement;
+function checkOnlyTruthyCondition(condition, context) {
+    if (!(0, typescript_1.canBeFalsy)(context, context.checker.getTypeAtLocation(condition))) {
+        context.diagnostics.push((0, diagnostics_1.truthyOnlyConditionalValue)(condition));
+    }
+}
+exports.checkOnlyTruthyCondition = checkOnlyTruthyCondition;
 //# sourceMappingURL=conditional.js.map

package/dist/transformation/visitors/identifier.js

@@ -28,7 +28,10 @@ function transformNonValueIdentifier(context, identifier, symbol) {
         : (0, language_extensions_1.getExtensionKindForNode)(context, identifier);
     if (extensionKind) {
         if (call_extension_1.callExtensions.has(extensionKind)) {
-            context.diagnostics.push((0, diagnostics_1.invalidCallExtensionUse)(identifier));
+            // Avoid putting duplicate diagnostic on the name of a variable declaration, due to the inferred type
+            if (!(ts.isVariableDeclaration(identifier.parent) && identifier.parent.name === identifier)) {
+                context.diagnostics.push((0, diagnostics_1.invalidCallExtensionUse)(identifier));
+            }
             // fall through
         }
         else if ((0, identifier_1.isIdentifierExtensionValue)(symbol, extensionKind)) {

package/dist/transformation/visitors/language-extensions/multi.js

@@ -11,7 +11,9 @@ function isMultiReturnType(type) {
 }
 exports.isMultiReturnType = isMultiReturnType;
 function canBeMultiReturnType(type) {
-    return isMultiReturnType(type) || (type.isUnion() && type.types.some(t => canBeMultiReturnType(t)));
+    return ((type.flags & ts.TypeFlags.Any) !== 0 ||
+        isMultiReturnType(type) ||
+        (type.isUnion() && type.types.some(t => canBeMultiReturnType(t))));
 }
 exports.canBeMultiReturnType = canBeMultiReturnType;
 function isMultiFunctionCall(context, expression) {

package/dist/transformation/visitors/loops/do-while.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformDoStatement = exports.transformWhileStatement = void 0;
 const lua = require("../../../LuaAST");
 const preceding_statements_1 = require("../../utils/preceding-statements");
+const conditional_1 = require("../conditional");
 const utils_1 = require("./utils");
 const transformWhileStatement = (statement, context) => {
+    // Check if we need to add diagnostic about Lua truthiness
+    (0, conditional_1.checkOnlyTruthyCondition)(statement.expression, context);
     const body = (0, utils_1.transformLoopBody)(context, statement);
     let [conditionPrecedingStatements, condition] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(statement.expression));
     // If condition has preceding statements, ensure they are executed every iteration by using the form:
@@ -25,6 +28,8 @@ const transformWhileStatement = (statement, context) => {
 };
 exports.transformWhileStatement = transformWhileStatement;
 const transformDoStatement = (statement, context) => {
+    // Check if we need to add diagnostic about Lua truthiness
+    (0, conditional_1.checkOnlyTruthyCondition)(statement.expression, context);
     const body = lua.createDoStatement((0, utils_1.transformLoopBody)(context, statement));
     let [conditionPrecedingStatements, condition] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => (0, utils_1.invertCondition)(context.transformExpression(statement.expression)));
     // If condition has preceding statements, ensure they are executed every iteration by using the form:

package/dist/transformation/visitors/return.js

@@ -12,28 +12,33 @@ const diagnostics_1 = require("../utils/diagnostics");
 const typescript_1 = require("../utils/typescript");
 function transformExpressionsInReturn(context, node, insideTryCatch) {
     const expressionType = context.checker.getTypeAtLocation(node);
-    if (ts.isCallExpression(node)) {
+    // skip type assertions
+    // don't skip parenthesis as it may arise confusion with lua behavior (where parenthesis are significant)
+    const innerNode = ts.skipOuterExpressions(node, ts.OuterExpressionKinds.Assertions);
+    if (ts.isCallExpression(innerNode)) {
         // $multi(...)
-        if ((0, multi_1.isMultiFunctionCall)(context, node)) {
+        if ((0, multi_1.isMultiFunctionCall)(context, innerNode)) {
             // Don't allow $multi to be implicitly cast to something other than LuaMultiReturn
             const type = context.checker.getContextualType(node);
             if (type && !(0, multi_1.canBeMultiReturnType)(type)) {
-                context.diagnostics.push((0, diagnostics_1.invalidMultiFunctionReturnType)(node));
+                context.diagnostics.push((0, diagnostics_1.invalidMultiFunctionReturnType)(innerNode));
             }
-            let returnValues = (0, call_1.transformArguments)(context, node.arguments);
+            let returnValues = (0, call_1.transformArguments)(context, innerNode.arguments);
             if (insideTryCatch) {
                 returnValues = [(0, lua_ast_1.wrapInTable)(...returnValues)]; // Wrap results when returning inside try/catch
             }
             return returnValues;
         }
         // Force-wrap LuaMultiReturn when returning inside try/catch
-        if (insideTryCatch && (0, multi_1.returnsMultiType)(context, node) && !(0, multi_1.shouldMultiReturnCallBeWrapped)(context, node)) {
+        if (insideTryCatch &&
+            (0, multi_1.returnsMultiType)(context, innerNode) &&
+            !(0, multi_1.shouldMultiReturnCallBeWrapped)(context, innerNode)) {
             return [(0, lua_ast_1.wrapInTable)(context.transformExpression(node))];
         }
     }
-    else if ((0, multi_1.isInMultiReturnFunction)(context, node) && (0, multi_1.isMultiReturnType)(expressionType)) {
+    else if ((0, multi_1.isInMultiReturnFunction)(context, innerNode) && (0, multi_1.isMultiReturnType)(expressionType)) {
         // Unpack objects typed as LuaMultiReturn
-        return [(0, lua_ast_1.createUnpackCall)(context, context.transformExpression(node), node)];
+        return [(0, lua_ast_1.createUnpackCall)(context, context.transformExpression(innerNode), innerNode)];
     }
     return [context.transformExpression(node)];
 }

package/dist/transpilation/bundle.js

@@ -66,14 +66,16 @@ function printStackTraceBundleOverride(rootNode) {
 }
 exports.printStackTraceBundleOverride = printStackTraceBundleOverride;
 function getBundleResult(program, files) {
+    var _a, _b, _c;
     const diagnostics = [];
     const options = program.getCompilerOptions();
     const bundleFile = (0, utils_1.cast)(options.luaBundle, utils_1.isNonNull);
     const entryModule = (0, utils_1.cast)(options.luaBundleEntry, utils_1.isNonNull);
     // Resolve project settings relative to project file.
-    const resolvedEntryModule = path.resolve((0, transpiler_1.getSourceDir)(program), entryModule);
+    const resolvedEntryModule = path.resolve((0, transpiler_1.getProjectRoot)(program), entryModule);
     const outputPath = path.resolve((0, transpiler_1.getEmitOutDir)(program), bundleFile);
-    if (program.getSourceFile(resolvedEntryModule) === undefined && program.getSourceFile(entryModule) === undefined) {
+    const entryModuleFilePath = (_b = (_a = program.getSourceFile(entryModule)) === null || _a === void 0 ? void 0 : _a.fileName) !== null && _b !== void 0 ? _b : (_c = program.getSourceFile(resolvedEntryModule)) === null || _c === void 0 ? void 0 : _c.fileName;
+    if (entryModuleFilePath === undefined) {
         diagnostics.push((0, diagnostics_1.couldNotFindBundleEntryPoint)(entryModule));
     }
     // For each file: ["<module path>"] = function() <lua content> end,
@@ -81,7 +83,7 @@ function getBundleResult(program, files) {
     // Create ____modules table containing all entries from moduleTableEntries
     const moduleTable = createModuleTableNode(moduleTableEntries);
     // return require("<entry module path>")
-    const entryPoint = `return require(${createModulePath(entryModule, program)}, ...)\n`;
+    const entryPoint = `return require(${createModulePath(entryModuleFilePath !== null && entryModuleFilePath !== void 0 ? entryModuleFilePath : entryModule, program)}, ...)\n`;
     const footers = [];
     if (options.sourceMapTraceback) {
         // Generates SourceMapTraceback for the entire file

package/dist/transpilation/diagnostics.d.ts

@@ -32,3 +32,6 @@ export declare const cannotBundleLibrary: (() => ts.Diagnostic) & {
 export declare const unsupportedJsxEmit: (() => ts.Diagnostic) & {
     code: number;
 };
+export declare const pathsWithoutBaseUrl: (() => ts.Diagnostic) & {
+    code: number;
+};

package/dist/transpilation/diagnostics.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unsupportedJsxEmit = exports.cannotBundleLibrary = exports.usingLuaBundleWithInlineMightGenerateDuplicateCode = exports.luaBundleEntryIsRequired = exports.couldNotFindBundleEntryPoint = exports.transformerShouldBeATsTransformerFactory = exports.shouldHaveAExport = exports.couldNotResolveFrom = exports.toLoadItShouldBeTranspiled = exports.couldNotReadDependency = exports.couldNotResolveRequire = void 0;
+exports.pathsWithoutBaseUrl = exports.unsupportedJsxEmit = exports.cannotBundleLibrary = exports.usingLuaBundleWithInlineMightGenerateDuplicateCode = exports.luaBundleEntryIsRequired = exports.couldNotFindBundleEntryPoint = exports.transformerShouldBeATsTransformerFactory = exports.shouldHaveAExport = exports.couldNotResolveFrom = exports.toLoadItShouldBeTranspiled = exports.couldNotReadDependency = exports.couldNotResolveRequire = void 0;
 const ts = require("typescript");
 const utils_1 = require("../utils");
 const createDiagnosticFactory = (getMessage, category = ts.DiagnosticCategory.Error) => (0, utils_1.createSerialDiagnosticFactory)((...args) => ({ messageText: getMessage(...args), category }));
@@ -19,4 +19,5 @@ exports.usingLuaBundleWithInlineMightGenerateDuplicateCode = (0, utils_1.createS
 }));
 exports.cannotBundleLibrary = createDiagnosticFactory(() => 'Cannot bundle probjects with"buildmode": "library". Projects including the library can still bundle (which will include external library files).');
 exports.unsupportedJsxEmit = createDiagnosticFactory(() => 'JSX is only supported with "react" jsx option.');
+exports.pathsWithoutBaseUrl = createDiagnosticFactory(() => "When configuring 'paths' in tsconfig.json, the option 'baseUrl' must also be provided.");
 //# sourceMappingURL=diagnostics.js.map

package/language-extensions/index.d.ts

@@ -631,7 +631,7 @@ declare const LuaMap: (new <K extends AnyNotNil = AnyNotNil, V = any>() => LuaMa
  * @param V The type of the values stored in the table.
  */
 declare interface ReadonlyLuaMap<K extends AnyNotNil = AnyNotNil, V = any> extends LuaPairsIterable<K, V> {
-    get: LuaTableGetMethod<K, V>;
+    get: LuaTableGetMethod<K, V | undefined>;
     has: LuaTableHasMethod<K>;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.8.0",
+    "version": "1.9.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/",