typescript-to-lua 1.7.2 → 1.8.2

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/LuaLib.d.ts

@@ -42,6 +42,7 @@ export declare enum LuaLibFeature {
     InstanceOf = "InstanceOf",
     InstanceOfObject = "InstanceOfObject",
     Iterator = "Iterator",
+    LuaIteratorSpread = "LuaIteratorSpread",
     Map = "Map",
     MathAtan2 = "MathAtan2",
     MathSign = "MathSign",

package/dist/LuaLib.js

@@ -46,6 +46,7 @@ var LuaLibFeature;
     LuaLibFeature["InstanceOf"] = "InstanceOf";
     LuaLibFeature["InstanceOfObject"] = "InstanceOfObject";
     LuaLibFeature["Iterator"] = "Iterator";
+    LuaLibFeature["LuaIteratorSpread"] = "LuaIteratorSpread";
     LuaLibFeature["Map"] = "Map";
     LuaLibFeature["MathAtan2"] = "MathAtan2";
     LuaLibFeature["MathSign"] = "MathSign";

package/dist/lualib/LuaIteratorSpread.lua

@@ -0,0 +1,9 @@
+local function __TS__LuaIteratorSpread(self, state, firstKey)
+    local results = {}
+    local key, value = self(state, firstKey)
+    while key do
+        results[#results + 1] = {key, value}
+        key, value = self(state, key)
+    end
+    return __TS__Unpack(results)
+end

package/dist/lualib/lualib_bundle.lua

@@ -1207,6 +1207,16 @@ local function __TS__InstanceOfObject(value)
     return valueType == "table" or valueType == "function"
 end
 
+local function __TS__LuaIteratorSpread(self, state, firstKey)
+    local results = {}
+    local key, value = self(state, firstKey)
+    while key do
+        results[#results + 1] = {key, value}
+        key, value = self(state, key)
+    end
+    return __TS__Unpack(results)
+end
+
 local Map
 do
     Map = __TS__Class()
@@ -2448,6 +2458,7 @@ return {
   __TS__InstanceOf = __TS__InstanceOf,
   __TS__InstanceOfObject = __TS__InstanceOfObject,
   __TS__Iterator = __TS__Iterator,
+  __TS__LuaIteratorSpread = __TS__LuaIteratorSpread,
   Map = Map,
   __TS__MathAtan2 = __TS__MathAtan2,
   __TS__MathSign = __TS__MathSign,

package/dist/lualib/lualib_module_info.json

@@ -264,6 +264,14 @@
       "Symbol"
     ]
   },
+  "LuaIteratorSpread": {
+    "exports": [
+      "__TS__LuaIteratorSpread"
+    ],
+    "dependencies": [
+      "Unpack"
+    ]
+  },
   "Map": {
     "exports": [
       "Map"

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/language-extensions.d.ts

@@ -60,5 +60,6 @@ export declare enum IterableExtensionKind {
     Pairs = "Pairs",
     PairsKey = "PairsKey"
 }
+export declare function isLuaIterable(context: TransformationContext, type: ts.Type): boolean;
 export declare function getIterableExtensionTypeForType(context: TransformationContext, type: ts.Type): IterableExtensionKind | undefined;
 export declare function getIterableExtensionKindForNode(context: TransformationContext, node: ts.Node): IterableExtensionKind | undefined;

package/dist/transformation/utils/language-extensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIterableExtensionKindForNode = exports.getIterableExtensionTypeForType = exports.IterableExtensionKind = exports.getExtensionKindForSymbol = exports.getExtensionKindForNode = exports.getExtensionKindForType = exports.ExtensionKind = void 0;
+exports.getIterableExtensionKindForNode = exports.getIterableExtensionTypeForType = exports.isLuaIterable = exports.IterableExtensionKind = exports.getExtensionKindForSymbol = exports.getExtensionKindForNode = exports.getExtensionKindForType = exports.ExtensionKind = void 0;
 const ts = require("typescript");
 var ExtensionKind;
 (function (ExtensionKind) {
@@ -96,6 +96,10 @@ var IterableExtensionKind;
     IterableExtensionKind["Pairs"] = "Pairs";
     IterableExtensionKind["PairsKey"] = "PairsKey";
 })(IterableExtensionKind = exports.IterableExtensionKind || (exports.IterableExtensionKind = {}));
+function isLuaIterable(context, type) {
+    return getPropertyValue(context, type, "__tstlIterable") !== undefined;
+}
+exports.isLuaIterable = isLuaIterable;
 function getIterableExtensionTypeForType(context, type) {
     const value = getPropertyValue(context, type, "__tstlIterable");
     if (value && value in IterableExtensionKind) {

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/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/transformation/visitors/spread.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformSpreadElement = exports.isOptimizedVarArgSpread = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
+const language_extensions_1 = require("../utils/language-extensions");
 const lua_ast_1 = require("../utils/lua-ast");
 const lualib_1 = require("../utils/lualib");
 const scope_1 = require("../utils/scope");
@@ -60,6 +61,9 @@ const transformSpreadElement = (node, context) => {
     if ((0, multi_1.isMultiReturnCall)(context, tsInnerExpression))
         return innerExpression;
     const type = context.checker.getTypeAtLocation(node.expression); // not ts-inner expression, in case of casts
+    if ((0, language_extensions_1.isLuaIterable)(context, type)) {
+        return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.LuaIteratorSpread, node, innerExpression);
+    }
     if ((0, typescript_1.isArrayType)(context, type)) {
         return (0, lua_ast_1.createUnpackCall)(context, innerExpression, node);
     }

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/package.json

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