typescript-to-lua 1.24.0 → 1.25.0

package/dist/LuaLib.d.ts

@@ -55,6 +55,7 @@ export declare enum LuaLibFeature {
     Iterator = "Iterator",
     LuaIteratorSpread = "LuaIteratorSpread",
     Map = "Map",
+    MapGroupBy = "MapGroupBy",
     Match = "Match",
     MathAtan2 = "MathAtan2",
     MathModf = "MathModf",
@@ -74,6 +75,7 @@ export declare enum LuaLibFeature {
     ObjectFromEntries = "ObjectFromEntries",
     ObjectGetOwnPropertyDescriptor = "ObjectGetOwnPropertyDescriptor",
     ObjectGetOwnPropertyDescriptors = "ObjectGetOwnPropertyDescriptors",
+    ObjectGroupBy = "ObjectGroupBy",
     ObjectKeys = "ObjectKeys",
     ObjectRest = "ObjectRest",
     ObjectValues = "ObjectValues",

package/dist/LuaLib.js

@@ -60,6 +60,7 @@ var LuaLibFeature;
     LuaLibFeature["Iterator"] = "Iterator";
     LuaLibFeature["LuaIteratorSpread"] = "LuaIteratorSpread";
     LuaLibFeature["Map"] = "Map";
+    LuaLibFeature["MapGroupBy"] = "MapGroupBy";
     LuaLibFeature["Match"] = "Match";
     LuaLibFeature["MathAtan2"] = "MathAtan2";
     LuaLibFeature["MathModf"] = "MathModf";
@@ -79,6 +80,7 @@ var LuaLibFeature;
     LuaLibFeature["ObjectFromEntries"] = "ObjectFromEntries";
     LuaLibFeature["ObjectGetOwnPropertyDescriptor"] = "ObjectGetOwnPropertyDescriptor";
     LuaLibFeature["ObjectGetOwnPropertyDescriptors"] = "ObjectGetOwnPropertyDescriptors";
+    LuaLibFeature["ObjectGroupBy"] = "ObjectGroupBy";
     LuaLibFeature["ObjectKeys"] = "ObjectKeys";
     LuaLibFeature["ObjectRest"] = "ObjectRest";
     LuaLibFeature["ObjectValues"] = "ObjectValues";

package/dist/cli/tsconfig.js

@@ -97,7 +97,7 @@ function createConfigFileUpdater(optionsToExtend) {
         if (!configFile || !configFilePath)
             return [];
         if (!configFileMap.has(configFile)) {
-            const parsedConfigFile = (0, parse_1.updateParsedConfigFile)(ts.parseJsonSourceFileConfigFileContent(configFile, ts.sys, path.dirname(configFilePath), optionsToExtend, configFilePath));
+            const parsedConfigFile = parseConfigFileWithSystem(configFilePath, optionsToExtend, ts.sys);
             configFileMap.set(configFile, parsedConfigFile);
         }
         const parsedConfigFile = configFileMap.get(configFile);

package/dist/lualib/5.0/MapGroupBy.lua

@@ -0,0 +1,15 @@
+local function __TS__MapGroupBy(items, keySelector)
+    local result = __TS__New(Map)
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result:has(key) then
+            local ____temp_0 = result:get(key)
+            ____temp_0[table.getn(____temp_0) + 1] = item
+        else
+            result:set(key, {item})
+        end
+        i = i + 1
+    end
+    return result
+end

package/dist/lualib/5.0/ObjectGroupBy.lua

@@ -0,0 +1,15 @@
+local function __TS__ObjectGroupBy(items, keySelector)
+    local result = {}
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result[key] ~= nil then
+            local ____result_key_0 = result[key]
+            ____result_key_0[table.getn(____result_key_0) + 1] = item
+        else
+            result[key] = {item}
+        end
+        i = i + 1
+    end
+    return result
+end

package/dist/lualib/5.0/lualib_bundle.lua

@@ -1446,6 +1446,22 @@ do
     Map[Symbol.species] = Map
 end
 
+local function __TS__MapGroupBy(items, keySelector)
+    local result = __TS__New(Map)
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result:has(key) then
+            local ____temp_0 = result:get(key)
+            ____temp_0[table.getn(____temp_0) + 1] = item
+        else
+            result:set(key, {item})
+        end
+        i = i + 1
+    end
+    return result
+end
+
 local function __TS__StringSlice(self, start, ____end)
     if start == nil or start ~= start then
         start = 0
@@ -1740,6 +1756,22 @@ local function __TS__ObjectFromEntries(entries)
     return obj
 end
 
+local function __TS__ObjectGroupBy(items, keySelector)
+    local result = {}
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result[key] ~= nil then
+            local ____result_key_0 = result[key]
+            ____result_key_0[table.getn(____result_key_0) + 1] = item
+        else
+            result[key] = {item}
+        end
+        i = i + 1
+    end
+    return result
+end
+
 local function __TS__ObjectKeys(obj)
     local result = {}
     local len = 0
@@ -2623,6 +2655,7 @@ return {
   __TS__Iterator = __TS__Iterator,
   __TS__LuaIteratorSpread = __TS__LuaIteratorSpread,
   Map = Map,
+  __TS__MapGroupBy = __TS__MapGroupBy,
   __TS__Match = __TS__Match,
   __TS__MathAtan2 = __TS__MathAtan2,
   __TS__MathModf = __TS__MathModf,
@@ -2642,6 +2675,7 @@ return {
   __TS__ObjectFromEntries = __TS__ObjectFromEntries,
   __TS__ObjectGetOwnPropertyDescriptor = __TS__ObjectGetOwnPropertyDescriptor,
   __TS__ObjectGetOwnPropertyDescriptors = __TS__ObjectGetOwnPropertyDescriptors,
+  __TS__ObjectGroupBy = __TS__ObjectGroupBy,
   __TS__ObjectKeys = __TS__ObjectKeys,
   __TS__ObjectRest = __TS__ObjectRest,
   __TS__ObjectValues = __TS__ObjectValues,

package/dist/lualib/5.0/lualib_module_info.json

@@ -351,6 +351,16 @@
       "Iterator"
     ]
   },
+  "MapGroupBy": {
+    "exports": [
+      "__TS__MapGroupBy"
+    ],
+    "dependencies": [
+      "Map",
+      "New",
+      "Iterator"
+    ]
+  },
   "Match": {
     "exports": [
       "__TS__Match"
@@ -471,6 +481,14 @@
       "__TS__ObjectGetOwnPropertyDescriptors"
     ]
   },
+  "ObjectGroupBy": {
+    "exports": [
+      "__TS__ObjectGroupBy"
+    ],
+    "dependencies": [
+      "Iterator"
+    ]
+  },
   "ObjectKeys": {
     "exports": [
       "__TS__ObjectKeys"

package/dist/lualib/universal/MapGroupBy.lua

@@ -0,0 +1,15 @@
+local function __TS__MapGroupBy(items, keySelector)
+    local result = __TS__New(Map)
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result:has(key) then
+            local ____temp_0 = result:get(key)
+            ____temp_0[#____temp_0 + 1] = item
+        else
+            result:set(key, {item})
+        end
+        i = i + 1
+    end
+    return result
+end

package/dist/lualib/universal/ObjectGroupBy.lua

@@ -0,0 +1,15 @@
+local function __TS__ObjectGroupBy(items, keySelector)
+    local result = {}
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result[key] ~= nil then
+            local ____result_key_0 = result[key]
+            ____result_key_0[#____result_key_0 + 1] = item
+        else
+            result[key] = {item}
+        end
+        i = i + 1
+    end
+    return result
+end

package/dist/lualib/universal/lualib_bundle.lua

@@ -1417,6 +1417,22 @@ do
     Map[Symbol.species] = Map
 end
 
+local function __TS__MapGroupBy(items, keySelector)
+    local result = __TS__New(Map)
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result:has(key) then
+            local ____temp_0 = result:get(key)
+            ____temp_0[#____temp_0 + 1] = item
+        else
+            result:set(key, {item})
+        end
+        i = i + 1
+    end
+    return result
+end
+
 local __TS__Match = string.match
 
 local __TS__MathAtan2 = math.atan2 or math.atan
@@ -1671,6 +1687,22 @@ local function __TS__ObjectFromEntries(entries)
     return obj
 end
 
+local function __TS__ObjectGroupBy(items, keySelector)
+    local result = {}
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result[key] ~= nil then
+            local ____result_key_0 = result[key]
+            ____result_key_0[#____result_key_0 + 1] = item
+        else
+            result[key] = {item}
+        end
+        i = i + 1
+    end
+    return result
+end
+
 local function __TS__ObjectKeys(obj)
     local result = {}
     local len = 0
@@ -2563,6 +2595,7 @@ return {
   __TS__Iterator = __TS__Iterator,
   __TS__LuaIteratorSpread = __TS__LuaIteratorSpread,
   Map = Map,
+  __TS__MapGroupBy = __TS__MapGroupBy,
   __TS__Match = __TS__Match,
   __TS__MathAtan2 = __TS__MathAtan2,
   __TS__MathModf = __TS__MathModf,
@@ -2582,6 +2615,7 @@ return {
   __TS__ObjectFromEntries = __TS__ObjectFromEntries,
   __TS__ObjectGetOwnPropertyDescriptor = __TS__ObjectGetOwnPropertyDescriptor,
   __TS__ObjectGetOwnPropertyDescriptors = __TS__ObjectGetOwnPropertyDescriptors,
+  __TS__ObjectGroupBy = __TS__ObjectGroupBy,
   __TS__ObjectKeys = __TS__ObjectKeys,
   __TS__ObjectRest = __TS__ObjectRest,
   __TS__ObjectValues = __TS__ObjectValues,

package/dist/lualib/universal/lualib_module_info.json

@@ -361,6 +361,16 @@
       "Iterator"
     ]
   },
+  "MapGroupBy": {
+    "exports": [
+      "__TS__MapGroupBy"
+    ],
+    "dependencies": [
+      "Map",
+      "New",
+      "Iterator"
+    ]
+  },
   "Match": {
     "exports": [
       "__TS__Match"
@@ -477,6 +487,14 @@
       "__TS__ObjectGetOwnPropertyDescriptors"
     ]
   },
+  "ObjectGroupBy": {
+    "exports": [
+      "__TS__ObjectGroupBy"
+    ],
+    "dependencies": [
+      "Iterator"
+    ]
+  },
   "ObjectKeys": {
     "exports": [
       "__TS__ObjectKeys"

package/dist/transformation/builtins/index.js

@@ -20,6 +20,7 @@ const string_1 = require("./string");
 const symbol_1 = require("./symbol");
 const diagnostics_1 = require("../utils/diagnostics");
 const CompilerOptions_1 = require("../../CompilerOptions");
+const map_1 = require("./map");
 function transformBuiltinPropertyAccessExpression(context, node) {
     const ownerType = context.checker.getTypeAtLocation(node.expression);
     if (ts.isIdentifier(node.expression) && (0, typescript_1.isStandardLibraryType)(context, ownerType, undefined)) {
@@ -81,6 +82,9 @@ function tryTransformBuiltinGlobalMethodCall(context, node, calledMethod) {
         case "Console":
             result = (0, console_1.transformConsoleCall)(context, node, calledMethod);
             break;
+        case "MapConstructor":
+            result = (0, map_1.transformMapConstructorCall)(context, node, calledMethod);
+            break;
         case "Math":
             result = (0, math_1.transformMathCall)(context, node, calledMethod);
             break;

package/dist/transformation/builtins/map.d.ts

@@ -0,0 +1,4 @@
+import * as lua from "../../LuaAST";
+import * as ts from "typescript";
+import { TransformationContext } from "../context";
+export declare function transformMapConstructorCall(context: TransformationContext, node: ts.CallExpression, calledMethod: ts.PropertyAccessExpression): lua.Expression | undefined;

package/dist/transformation/builtins/map.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformMapConstructorCall = void 0;
+const diagnostics_1 = require("../utils/diagnostics");
+const call_1 = require("../visitors/call");
+const lualib_1 = require("../utils/lualib");
+function transformMapConstructorCall(context, node, calledMethod) {
+    const args = (0, call_1.transformArguments)(context, node.arguments);
+    const methodName = calledMethod.name.text;
+    switch (methodName) {
+        case "groupBy":
+            return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.MapGroupBy, node, ...args);
+        default:
+            context.diagnostics.push((0, diagnostics_1.unsupportedProperty)(calledMethod.name, "Map", methodName));
+    }
+}
+exports.transformMapConstructorCall = transformMapConstructorCall;
+//# sourceMappingURL=map.js.map

package/dist/transformation/builtins/object.js

@@ -21,6 +21,8 @@ function transformObjectConstructorCall(context, node, calledMethod) {
             return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ObjectGetOwnPropertyDescriptor, node, ...args);
         case "getOwnPropertyDescriptors":
             return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ObjectGetOwnPropertyDescriptors, node, ...args);
+        case "groupBy":
+            return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ObjectGroupBy, node, ...args);
         case "keys":
             return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ObjectKeys, node, ...args);
         case "values":

package/dist/transformation/visitors/access.js

@@ -16,6 +16,7 @@ const call_extension_1 = require("./language-extensions/call-extension");
 const multi_1 = require("./language-extensions/multi");
 const optional_chaining_1 = require("./optional-chaining");
 const typescript_2 = require("typescript");
+const identifier_1 = require("./identifier");
 function addOneToArrayAccessArgument(context, node, index) {
     const type = context.checker.getTypeAtLocation(node.expression);
     const argumentType = context.checker.getTypeAtLocation(node.argumentExpression);
@@ -76,9 +77,14 @@ exports.transformElementAccessExpressionWithCapture = transformElementAccessExpr
 const transformPropertyAccessExpression = (node, context) => transformPropertyAccessExpressionWithCapture(context, node, undefined).expression;
 exports.transformPropertyAccessExpression = transformPropertyAccessExpression;
 function transformPropertyAccessExpressionWithCapture(context, node, thisValueCapture) {
-    const property = node.name.text;
     const type = context.checker.getTypeAtLocation(node.expression);
     const isOptionalLeft = (0, optional_chaining_1.isOptionalContinuation)(node.expression);
+    let property = node.name.text;
+    const symbol = context.checker.getSymbolAtLocation(node.name);
+    const customName = (0, identifier_1.getCustomNameFromSymbol)(symbol);
+    if (customName) {
+        property = customName;
+    }
     const constEnumValue = (0, enum_1.tryGetConstEnumValue)(context, node);
     if (constEnumValue) {
         return { expression: constEnumValue };
@@ -130,9 +136,12 @@ function transformPropertyAccessExpressionWithCapture(context, node, thisValueCa
         };
     }
     if (node.expression.kind === typescript_2.SyntaxKind.SuperKeyword) {
-        return {
-            expression: (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DescriptorGet, node, lua.createIdentifier("self"), table, lua.createStringLiteral(property)),
-        };
+        const symbol = context.checker.getSymbolAtLocation(node);
+        if (symbol && symbol.flags & ts.SymbolFlags.GetAccessor) {
+            return {
+                expression: (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DescriptorGet, node, lua.createIdentifier("self"), table, lua.createStringLiteral(property)),
+            };
+        }
     }
     return { expression: lua.createTableIndexExpression(table, lua.createStringLiteral(property), node) };
 }

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

@@ -57,11 +57,14 @@ lhs, right, rightHasPrecedingStatements, parent) {
     }
     if (ts.isPropertyAccessExpression(lhs) || ts.isElementAccessExpression(lhs)) {
         if (lhs.expression.kind === typescript_1.SyntaxKind.SuperKeyword) {
-            return [
-                lua.createExpressionStatement((0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DescriptorSet, parent, lua.createIdentifier("self"), context.transformExpression(lhs.expression), ts.isPropertyAccessExpression(lhs)
-                    ? lua.createStringLiteral(lhs.name.text)
-                    : context.transformExpression(lhs.argumentExpression), right)),
-            ];
+            const symbol = context.checker.getSymbolAtLocation(lhs);
+            if (symbol && symbol.flags & ts.SymbolFlags.SetAccessor) {
+                return [
+                    lua.createExpressionStatement((0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DescriptorSet, parent, lua.createIdentifier("self"), context.transformExpression(lhs.expression), ts.isPropertyAccessExpression(lhs)
+                        ? lua.createStringLiteral(lhs.name.text)
+                        : context.transformExpression(lhs.argumentExpression), right)),
+                ];
+            }
         }
     }
     const symbol = lhs.parent && ts.isShorthandPropertyAssignment(lhs.parent)

package/dist/transpilation/transpiler.js

@@ -145,7 +145,8 @@ function getSourceDir(program) {
     if (rootDir && rootDir.length > 0) {
         return path.isAbsolute(rootDir) ? rootDir : path.resolve(getProjectRoot(program), rootDir);
     }
-    return program.getCommonSourceDirectory();
+    // If no rootDir is given, source is relative to the project root
+    return getProjectRoot(program);
 }
 exports.getSourceDir = getSourceDir;
 function getEmitOutDir(program) {

package/dist/utils.d.ts

@@ -2,8 +2,8 @@ import * as ts from "typescript";
 export declare function castArray<T>(value: T | T[]): T[];
 export declare function castArray<T>(value: T | readonly T[]): readonly T[];
 export declare const intersperse: <T>(values: readonly T[], separator: T) => T[];
-export declare const union: <T>(...values: Iterable<T>[]) => T[];
-export declare const intersection: <T>(first: readonly T[], ...rest: (readonly T[])[]) => T[];
+export declare const union: <T>(...values: Array<Iterable<T>>) => T[];
+export declare const intersection: <T>(first: readonly T[], ...rest: Array<readonly T[]>) => T[];
 type DiagnosticFactory = (...args: any) => Partial<ts.Diagnostic> & Pick<ts.Diagnostic, "messageText">;
 export declare const createDiagnosticFactoryWithCode: <T extends DiagnosticFactory>(code: number, create: T) => ((...args: Parameters<T>) => ts.Diagnostic) & {
     code: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.24.0",
+    "version": "1.25.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.3.3"
+        "typescript": "5.4.2"
     },
     "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.3.3"
+        "typescript": "^5.4.2"
     }
 }