typescript-to-lua 1.15.0 → 1.16.0

package/dist/CompilerOptions.js

@@ -9,7 +9,7 @@ var LuaLibImportKind;
     LuaLibImportKind["Inline"] = "inline";
     LuaLibImportKind["Require"] = "require";
     LuaLibImportKind["RequireMinimal"] = "require-minimal";
-})(LuaLibImportKind = exports.LuaLibImportKind || (exports.LuaLibImportKind = {}));
+})(LuaLibImportKind || (exports.LuaLibImportKind = LuaLibImportKind = {}));
 var LuaTarget;
 (function (LuaTarget) {
     LuaTarget["Universal"] = "universal";
@@ -19,12 +19,12 @@ var LuaTarget;
     LuaTarget["Lua53"] = "5.3";
     LuaTarget["Lua54"] = "5.4";
     LuaTarget["LuaJIT"] = "JIT";
-})(LuaTarget = exports.LuaTarget || (exports.LuaTarget = {}));
+})(LuaTarget || (exports.LuaTarget = LuaTarget = {}));
 var BuildMode;
 (function (BuildMode) {
     BuildMode["Default"] = "default";
     BuildMode["Library"] = "library";
-})(BuildMode = exports.BuildMode || (exports.BuildMode = {}));
+})(BuildMode || (exports.BuildMode = BuildMode = {}));
 const isBundleEnabled = (options) => options.luaBundle !== undefined && options.luaBundleEntry !== undefined;
 exports.isBundleEnabled = isBundleEnabled;
 function validateOptions(options) {

package/dist/LuaAST.js

@@ -78,14 +78,14 @@ var SyntaxKind;
     SyntaxKind[SyntaxKind["BitwiseRightShiftOperator"] = 54] = "BitwiseRightShiftOperator";
     SyntaxKind[SyntaxKind["BitwiseLeftShiftOperator"] = 55] = "BitwiseLeftShiftOperator";
     SyntaxKind[SyntaxKind["BitwiseNotOperator"] = 56] = "BitwiseNotOperator";
-})(SyntaxKind = exports.SyntaxKind || (exports.SyntaxKind = {}));
+})(SyntaxKind || (exports.SyntaxKind = SyntaxKind = {}));
 var NodeFlags;
 (function (NodeFlags) {
     NodeFlags[NodeFlags["None"] = 0] = "None";
     NodeFlags[NodeFlags["Inline"] = 1] = "Inline";
     NodeFlags[NodeFlags["Declaration"] = 2] = "Declaration";
     NodeFlags[NodeFlags["TableUnpackCall"] = 4] = "TableUnpackCall";
-})(NodeFlags = exports.NodeFlags || (exports.NodeFlags = {}));
+})(NodeFlags || (exports.NodeFlags = NodeFlags = {}));
 function createNode(kind, tsOriginal) {
     if (tsOriginal === undefined) {
         return { kind, flags: NodeFlags.None };

package/dist/LuaLib.d.ts

@@ -35,6 +35,7 @@ export declare enum LuaLibFeature {
     CloneDescriptor = "CloneDescriptor",
     CountVarargs = "CountVarargs",
     Decorate = "Decorate",
+    DecorateLegacy = "DecorateLegacy",
     DecorateParam = "DecorateParam",
     Delete = "Delete",
     DelegatedYield = "DelegatedYield",

package/dist/LuaLib.js

@@ -40,6 +40,7 @@ var LuaLibFeature;
     LuaLibFeature["CloneDescriptor"] = "CloneDescriptor";
     LuaLibFeature["CountVarargs"] = "CountVarargs";
     LuaLibFeature["Decorate"] = "Decorate";
+    LuaLibFeature["DecorateLegacy"] = "DecorateLegacy";
     LuaLibFeature["DecorateParam"] = "DecorateParam";
     LuaLibFeature["Delete"] = "Delete";
     LuaLibFeature["DelegatedYield"] = "DelegatedYield";
@@ -107,7 +108,7 @@ var LuaLibFeature;
     LuaLibFeature["SymbolRegistry"] = "SymbolRegistry";
     LuaLibFeature["TypeOf"] = "TypeOf";
     LuaLibFeature["Unpack"] = "Unpack";
-})(LuaLibFeature = exports.LuaLibFeature || (exports.LuaLibFeature = {}));
+})(LuaLibFeature || (exports.LuaLibFeature = LuaLibFeature = {}));
 function resolveLuaLibDir(luaTarget) {
     const luaLibDir = luaTarget === CompilerOptions_1.LuaTarget.Lua50 ? "5.0" : "universal";
     return path.resolve(__dirname, path.join("..", "dist", "lualib", luaLibDir));

package/dist/LuaPrinter.js

@@ -675,6 +675,7 @@ class LuaPrinter {
         return map;
     }
 }
+exports.LuaPrinter = LuaPrinter;
 LuaPrinter.operatorMap = {
     [lua.SyntaxKind.AdditionOperator]: "+",
     [lua.SyntaxKind.SubtractionOperator]: "-",
@@ -731,5 +732,4 @@ LuaPrinter.operatorPrecedence = {
 };
 LuaPrinter.rightAssociativeOperators = new Set([lua.SyntaxKind.ConcatOperator, lua.SyntaxKind.PowerOperator]);
 LuaPrinter.sourceMapTracebackPlaceholder = "{#SourceMapTraceback}";
-exports.LuaPrinter = LuaPrinter;
 //# sourceMappingURL=LuaPrinter.js.map

package/dist/cli/tsconfig.js

@@ -47,8 +47,21 @@ function parseConfigFileWithSystem(configFileName, commandLineOptions, system =
     return (0, parse_1.updateParsedConfigFile)(parsedConfigFile);
 }
 exports.parseConfigFileWithSystem = parseConfigFileWithSystem;
+function resolveNpmModuleConfig(moduleName, configRootDir, host) {
+    const resolved = ts.nodeNextJsonConfigResolver(moduleName, path.join(configRootDir, "tsconfig.json"), host);
+    if (resolved.resolvedModule) {
+        return resolved.resolvedModule.resolvedFileName;
+    }
+}
 function getExtendedTstlOptions(configFilePath, configRootDir, cycleCache, system) {
-    const absolutePath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(configRootDir, configFilePath);
+    const absolutePath = ts.pathIsAbsolute(configFilePath)
+        ? configFilePath
+        : ts.pathIsRelative(configFilePath)
+            ? path.resolve(configRootDir, configFilePath)
+            : resolveNpmModuleConfig(configFilePath, configRootDir, system); // if a path is neither relative nor absolute, it is probably a npm module
+    if (!absolutePath) {
+        return {};
+    }
     const newConfigRoot = path.dirname(absolutePath);
     if (cycleCache.has(absolutePath)) {
         return {};

package/dist/lualib/5.0/Decorate.lua

@@ -1,33 +1,15 @@
-local function __TS__Decorate(decorators, target, key, desc)
-    local result = target
+local function __TS__Decorate(self, originalValue, decorators, context)
+    local result = originalValue
     do
         local i = table.getn(decorators)
         while i >= 0 do
             local decorator = decorators[i + 1]
             if decorator ~= nil then
-                local oldResult = result
-                if key == nil then
-                    result = decorator(nil, result)
-                elseif desc == true then
-                    local value = rawget(target, key)
-                    local descriptor = __TS__ObjectGetOwnPropertyDescriptor(target, key) or ({configurable = true, writable = true, value = value})
-                    local desc = decorator(nil, target, key, descriptor) or descriptor
-                    local isSimpleValue = desc.configurable == true and desc.writable == true and not desc.get and not desc.set
-                    if isSimpleValue then
-                        rawset(target, key, desc.value)
-                    else
-                        __TS__SetDescriptor(
-                            target,
-                            key,
-                            __TS__ObjectAssign({}, descriptor, desc)
-                        )
-                    end
-                elseif desc == false then
-                    result = decorator(nil, target, key, desc)
-                else
-                    result = decorator(nil, target, key)
+                local ____decorator_result_0 = decorator(self, result, context)
+                if ____decorator_result_0 == nil then
+                    ____decorator_result_0 = result
                 end
-                result = result or oldResult
+                result = ____decorator_result_0
             end
             i = i - 1
         end

package/dist/lualib/5.0/DecorateLegacy.lua

@@ -0,0 +1,36 @@
+local function __TS__DecorateLegacy(decorators, target, key, desc)
+    local result = target
+    do
+        local i = table.getn(decorators)
+        while i >= 0 do
+            local decorator = decorators[i + 1]
+            if decorator ~= nil then
+                local oldResult = result
+                if key == nil then
+                    result = decorator(nil, result)
+                elseif desc == true then
+                    local value = rawget(target, key)
+                    local descriptor = __TS__ObjectGetOwnPropertyDescriptor(target, key) or ({configurable = true, writable = true, value = value})
+                    local desc = decorator(nil, target, key, descriptor) or descriptor
+                    local isSimpleValue = desc.configurable == true and desc.writable == true and not desc.get and not desc.set
+                    if isSimpleValue then
+                        rawset(target, key, desc.value)
+                    else
+                        __TS__SetDescriptor(
+                            target,
+                            key,
+                            __TS__ObjectAssign({}, descriptor, desc)
+                        )
+                    end
+                elseif desc == false then
+                    result = decorator(nil, target, key, desc)
+                else
+                    result = decorator(nil, target, key)
+                end
+                result = result or oldResult
+            end
+            i = i - 1
+        end
+    end
+    return result
+end

package/dist/lualib/5.0/Map.lua

@@ -29,6 +29,7 @@ do
             end
         end
     end
+    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -136,5 +137,4 @@ do
             end
         }
     end
-    Map[Symbol.species] = Map
 end

package/dist/lualib/5.0/Set.lua

@@ -27,6 +27,7 @@ do
             end
         end
     end
+    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -126,5 +127,4 @@ do
             end
         }
     end
-    Set[Symbol.species] = Set
 end

package/dist/lualib/5.0/WeakMap.lua

@@ -26,6 +26,7 @@ do
             end
         end
     end
+    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -41,5 +42,4 @@ do
         self.items[key] = value
         return self
     end
-    WeakMap[Symbol.species] = WeakMap
 end

package/dist/lualib/5.0/WeakSet.lua

@@ -25,6 +25,7 @@ do
             end
         end
     end
+    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -37,5 +38,4 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
-    WeakSet[Symbol.species] = WeakSet
 end

package/dist/lualib/5.0/lualib_bundle.lua

@@ -858,6 +858,25 @@ local function __TS__CloneDescriptor(____bindingPattern0)
     return descriptor
 end
 
+local function __TS__Decorate(self, originalValue, decorators, context)
+    local result = originalValue
+    do
+        local i = table.getn(decorators)
+        while i >= 0 do
+            local decorator = decorators[i + 1]
+            if decorator ~= nil then
+                local ____decorator_result_0 = decorator(self, result, context)
+                if ____decorator_result_0 == nil then
+                    ____decorator_result_0 = result
+                end
+                result = ____decorator_result_0
+            end
+            i = i - 1
+        end
+    end
+    return result
+end
+
 local function __TS__ObjectAssign(target, ...)
     local sources = arg
     for i = 1, table.getn(sources) do
@@ -959,7 +978,7 @@ do
     end
 end
 
-local function __TS__Decorate(decorators, target, key, desc)
+local function __TS__DecorateLegacy(decorators, target, key, desc)
     local result = target
     do
         local i = table.getn(decorators)
@@ -1259,6 +1278,7 @@ do
             end
         end
     end
+    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -1366,7 +1386,6 @@ do
             end
         }
     end
-    Map[Symbol.species] = Map
 end
 
 local function __TS__StringSlice(self, start, ____end)
@@ -1883,6 +1902,7 @@ do
             end
         end
     end
+    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -1982,7 +2002,6 @@ do
             end
         }
     end
-    Set[Symbol.species] = Set
 end
 
 local function __TS__SparseArrayNew(...)
@@ -2033,6 +2052,7 @@ do
             end
         end
     end
+    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -2048,7 +2068,6 @@ do
         self.items[key] = value
         return self
     end
-    WeakMap[Symbol.species] = WeakMap
 end
 
 local WeakSet
@@ -2078,6 +2097,7 @@ do
             end
         end
     end
+    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -2090,7 +2110,6 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
-    WeakSet[Symbol.species] = WeakSet
 end
 
 local function __TS__SourceMapTraceBack(fileName, sourceMap)
@@ -2453,6 +2472,7 @@ return {
   __TS__CloneDescriptor = __TS__CloneDescriptor,
   __TS__CountVarargs = __TS__CountVarargs,
   __TS__Decorate = __TS__Decorate,
+  __TS__DecorateLegacy = __TS__DecorateLegacy,
   __TS__DecorateParam = __TS__DecorateParam,
   __TS__Delete = __TS__Delete,
   __TS__DelegatedYield = __TS__DelegatedYield,

package/dist/lualib/5.0/lualib_module_info.json

@@ -193,6 +193,11 @@
   "Decorate": {
     "exports": [
       "__TS__Decorate"
+    ]
+  },
+  "DecorateLegacy": {
+    "exports": [
+      "__TS__DecorateLegacy"
     ],
     "dependencies": [
       "ObjectAssign",
@@ -203,6 +208,9 @@
   "DecorateParam": {
     "exports": [
       "__TS__DecorateParam"
+    ],
+    "dependencies": [
+      "DecorateLegacy"
     ]
   },
   "Delete": {

package/dist/lualib/universal/Decorate.lua

@@ -1,33 +1,15 @@
-local function __TS__Decorate(decorators, target, key, desc)
-    local result = target
+local function __TS__Decorate(self, originalValue, decorators, context)
+    local result = originalValue
     do
         local i = #decorators
         while i >= 0 do
             local decorator = decorators[i + 1]
             if decorator ~= nil then
-                local oldResult = result
-                if key == nil then
-                    result = decorator(nil, result)
-                elseif desc == true then
-                    local value = rawget(target, key)
-                    local descriptor = __TS__ObjectGetOwnPropertyDescriptor(target, key) or ({configurable = true, writable = true, value = value})
-                    local desc = decorator(nil, target, key, descriptor) or descriptor
-                    local isSimpleValue = desc.configurable == true and desc.writable == true and not desc.get and not desc.set
-                    if isSimpleValue then
-                        rawset(target, key, desc.value)
-                    else
-                        __TS__SetDescriptor(
-                            target,
-                            key,
-                            __TS__ObjectAssign({}, descriptor, desc)
-                        )
-                    end
-                elseif desc == false then
-                    result = decorator(nil, target, key, desc)
-                else
-                    result = decorator(nil, target, key)
+                local ____decorator_result_0 = decorator(self, result, context)
+                if ____decorator_result_0 == nil then
+                    ____decorator_result_0 = result
                 end
-                result = result or oldResult
+                result = ____decorator_result_0
             end
             i = i - 1
         end

package/dist/lualib/universal/DecorateLegacy.lua

@@ -0,0 +1,36 @@
+local function __TS__DecorateLegacy(decorators, target, key, desc)
+    local result = target
+    do
+        local i = #decorators
+        while i >= 0 do
+            local decorator = decorators[i + 1]
+            if decorator ~= nil then
+                local oldResult = result
+                if key == nil then
+                    result = decorator(nil, result)
+                elseif desc == true then
+                    local value = rawget(target, key)
+                    local descriptor = __TS__ObjectGetOwnPropertyDescriptor(target, key) or ({configurable = true, writable = true, value = value})
+                    local desc = decorator(nil, target, key, descriptor) or descriptor
+                    local isSimpleValue = desc.configurable == true and desc.writable == true and not desc.get and not desc.set
+                    if isSimpleValue then
+                        rawset(target, key, desc.value)
+                    else
+                        __TS__SetDescriptor(
+                            target,
+                            key,
+                            __TS__ObjectAssign({}, descriptor, desc)
+                        )
+                    end
+                elseif desc == false then
+                    result = decorator(nil, target, key, desc)
+                else
+                    result = decorator(nil, target, key)
+                end
+                result = result or oldResult
+            end
+            i = i - 1
+        end
+    end
+    return result
+end

package/dist/lualib/universal/Map.lua

@@ -29,6 +29,7 @@ do
             end
         end
     end
+    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -136,5 +137,4 @@ do
             end
         }
     end
-    Map[Symbol.species] = Map
 end

package/dist/lualib/universal/Set.lua

@@ -27,6 +27,7 @@ do
             end
         end
     end
+    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -126,5 +127,4 @@ do
             end
         }
     end
-    Set[Symbol.species] = Set
 end

package/dist/lualib/universal/WeakMap.lua

@@ -26,6 +26,7 @@ do
             end
         end
     end
+    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -41,5 +42,4 @@ do
         self.items[key] = value
         return self
     end
-    WeakMap[Symbol.species] = WeakMap
 end

package/dist/lualib/universal/WeakSet.lua

@@ -25,6 +25,7 @@ do
             end
         end
     end
+    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -37,5 +38,4 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
-    WeakSet[Symbol.species] = WeakSet
 end

package/dist/lualib/universal/lualib_bundle.lua

@@ -859,6 +859,25 @@ local function __TS__CloneDescriptor(____bindingPattern0)
     return descriptor
 end
 
+local function __TS__Decorate(self, originalValue, decorators, context)
+    local result = originalValue
+    do
+        local i = #decorators
+        while i >= 0 do
+            local decorator = decorators[i + 1]
+            if decorator ~= nil then
+                local ____decorator_result_0 = decorator(self, result, context)
+                if ____decorator_result_0 == nil then
+                    ____decorator_result_0 = result
+                end
+                result = ____decorator_result_0
+            end
+            i = i - 1
+        end
+    end
+    return result
+end
+
 local function __TS__ObjectAssign(target, ...)
     local sources = {...}
     for i = 1, #sources do
@@ -960,7 +979,7 @@ do
     end
 end
 
-local function __TS__Decorate(decorators, target, key, desc)
+local function __TS__DecorateLegacy(decorators, target, key, desc)
     local result = target
     do
         local i = #decorators
@@ -1235,6 +1254,7 @@ do
             end
         end
     end
+    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -1342,7 +1362,6 @@ do
             end
         }
     end
-    Map[Symbol.species] = Map
 end
 
 local __TS__Match = string.match
@@ -1819,6 +1838,7 @@ do
             end
         end
     end
+    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -1918,7 +1938,6 @@ do
             end
         }
     end
-    Set[Symbol.species] = Set
 end
 
 local function __TS__SparseArrayNew(...)
@@ -1970,6 +1989,7 @@ do
             end
         end
     end
+    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -1985,7 +2005,6 @@ do
         self.items[key] = value
         return self
     end
-    WeakMap[Symbol.species] = WeakMap
 end
 
 local WeakSet
@@ -2015,6 +2034,7 @@ do
             end
         end
     end
+    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -2027,7 +2047,6 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
-    WeakSet[Symbol.species] = WeakSet
 end
 
 local function __TS__SourceMapTraceBack(fileName, sourceMap)
@@ -2398,6 +2417,7 @@ return {
   __TS__CloneDescriptor = __TS__CloneDescriptor,
   __TS__CountVarargs = __TS__CountVarargs,
   __TS__Decorate = __TS__Decorate,
+  __TS__DecorateLegacy = __TS__DecorateLegacy,
   __TS__DecorateParam = __TS__DecorateParam,
   __TS__Delete = __TS__Delete,
   __TS__DelegatedYield = __TS__DelegatedYield,

package/dist/lualib/universal/lualib_module_info.json

@@ -193,6 +193,11 @@
   "Decorate": {
     "exports": [
       "__TS__Decorate"
+    ]
+  },
+  "DecorateLegacy": {
+    "exports": [
+      "__TS__DecorateLegacy"
     ],
     "dependencies": [
       "ObjectAssign",
@@ -203,6 +208,9 @@
   "DecorateParam": {
     "exports": [
       "__TS__DecorateParam"
+    ],
+    "dependencies": [
+      "DecorateLegacy"
     ]
   },
   "Delete": {

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: {
-        308: (file: ts.SourceFile, context: tstl.TransformationContext) => tstl.File;
+        311: (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/utils/annotations.js

@@ -9,7 +9,7 @@ var AnnotationKind;
     AnnotationKind["NoResolution"] = "noResolution";
     AnnotationKind["NoSelf"] = "noSelf";
     AnnotationKind["NoSelfInFile"] = "noSelfInFile";
-})(AnnotationKind = exports.AnnotationKind || (exports.AnnotationKind = {}));
+})(AnnotationKind || (exports.AnnotationKind = AnnotationKind = {}));
 const annotationValues = new Map(Object.values(AnnotationKind).map(k => [k.toLowerCase(), k]));
 function collectAnnotations(source, annotationsMap) {
     var _a, _b;

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

@@ -101,3 +101,6 @@ export declare const invalidSpreadInCallExtension: ((node: ts.Node, ...args: any
 export declare const cannotAssignToNodeOfKind: ((node: ts.Node, kind: lua.SyntaxKind) => ts.Diagnostic) & {
     code: number;
 };
+export declare const incompleteFieldDecoratorWarning: ((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.cannotAssignToNodeOfKind = exports.invalidSpreadInCallExtension = exports.invalidMethodCallExtensionUse = exports.undefinedInArrayLiteral = exports.unsupportedOptionalCompileMembersOnly = exports.unsupportedBuiltinOptionalCall = exports.awaitMustBeInAsyncFunction = exports.notAllowedOptionalAssignment = exports.truthyOnlyConditionalValue = exports.annotationDeprecated = exports.invalidCallExtensionUse = exports.invalidMultiReturnAccess = 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.incompleteFieldDecoratorWarning = exports.cannotAssignToNodeOfKind = exports.invalidSpreadInCallExtension = exports.invalidMethodCallExtensionUse = exports.undefinedInArrayLiteral = exports.unsupportedOptionalCompileMembersOnly = exports.unsupportedBuiltinOptionalCall = exports.awaitMustBeInAsyncFunction = exports.notAllowedOptionalAssignment = exports.truthyOnlyConditionalValue = exports.annotationDeprecated = exports.invalidCallExtensionUse = exports.invalidMultiReturnAccess = 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 lua = require("../../LuaAST");
 const CompilerOptions_1 = require("../../CompilerOptions");
@@ -63,4 +63,5 @@ exports.undefinedInArrayLiteral = createErrorDiagnosticFactory("Array literals m
 exports.invalidMethodCallExtensionUse = createErrorDiagnosticFactory("This language extension must be called as a method.");
 exports.invalidSpreadInCallExtension = createErrorDiagnosticFactory("Spread elements are not supported in call extensions.");
 exports.cannotAssignToNodeOfKind = createErrorDiagnosticFactory((kind) => `Cannot create assignment assigning to a node of type ${lua.SyntaxKind[kind]}.`);
+exports.incompleteFieldDecoratorWarning = createWarningDiagnosticFactory("You are using a class field decorator, note that tstl ignores returned value initializers!");
 //# sourceMappingURL=diagnostics.js.map

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

@@ -10,7 +10,7 @@ var ContextType;
     ContextType[ContextType["Void"] = 1] = "Void";
     ContextType[ContextType["NonVoid"] = 2] = "NonVoid";
     ContextType[ContextType["Mixed"] = 3] = "Mixed";
-})(ContextType = exports.ContextType || (exports.ContextType = {}));
+})(ContextType || (exports.ContextType = ContextType = {}));
 function hasNoSelfAncestor(declaration) {
     const scopeDeclaration = (0, typescript_1.findFirstNodeAbove)(declaration, (node) => ts.isSourceFile(node) || ts.isModuleDeclaration(node));
     if (!scopeDeclaration) {
@@ -28,7 +28,7 @@ function hasNoSelfAncestor(declaration) {
 }
 function getExplicitThisParameter(signatureDeclaration) {
     const param = signatureDeclaration.parameters[0];
-    if (param && ts.isIdentifier(param.name) && param.name.originalKeywordKind === ts.SyntaxKind.ThisKeyword) {
+    if (param && ts.isIdentifier(param.name) && ts.identifierToKeywordKind(param.name) === ts.SyntaxKind.ThisKeyword) {
         return param;
     }
 }

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

@@ -55,7 +55,7 @@ var ExtensionKind;
     ExtensionKind["TableSetMethodType"] = "TableSetMethod";
     ExtensionKind["TableAddKeyType"] = "TableAddKey";
     ExtensionKind["TableAddKeyMethodType"] = "TableAddKeyMethod";
-})(ExtensionKind = exports.ExtensionKind || (exports.ExtensionKind = {}));
+})(ExtensionKind || (exports.ExtensionKind = ExtensionKind = {}));
 const extensionValues = new Set(Object.values(ExtensionKind));
 function getExtensionKindForType(context, type) {
     const value = getPropertyValue(context, type, "__tstlExtension");
@@ -96,7 +96,7 @@ var IterableExtensionKind;
     IterableExtensionKind["Iterable"] = "Iterable";
     IterableExtensionKind["Pairs"] = "Pairs";
     IterableExtensionKind["PairsKey"] = "PairsKey";
-})(IterableExtensionKind = exports.IterableExtensionKind || (exports.IterableExtensionKind = {}));
+})(IterableExtensionKind || (exports.IterableExtensionKind = IterableExtensionKind = {}));
 function isLuaIterable(context, type) {
     return getPropertyValue(context, type, "__tstlIterable") !== undefined;
 }

package/dist/transformation/utils/scope.js

@@ -17,7 +17,7 @@ var ScopeType;
     ScopeType[ScopeType["Try"] = 64] = "Try";
     ScopeType[ScopeType["Catch"] = 128] = "Catch";
     ScopeType[ScopeType["LoopInitializer"] = 256] = "LoopInitializer";
-})(ScopeType = exports.ScopeType || (exports.ScopeType = {}));
+})(ScopeType || (exports.ScopeType = ScopeType = {}));
 function* walkScopesUp(context) {
     const scopeStack = context.scopeStack;
     for (let i = scopeStack.length - 1; i >= 0; --i) {

package/dist/transformation/visitors/class/decorators.d.ts

@@ -2,4 +2,8 @@ import * as ts from "typescript";
 import * as lua from "../../../LuaAST";
 import { TransformationContext } from "../../context";
 export declare function transformDecoratorExpression(context: TransformationContext, decorator: ts.Decorator): lua.Expression;
-export declare function createDecoratingExpression(context: TransformationContext, kind: ts.SyntaxKind, decorators: lua.Expression[], targetTableName: lua.Expression, targetFieldExpression?: lua.Expression): lua.Expression;
+export declare function createClassDecoratingExpression(context: TransformationContext, classDeclaration: ts.ClassDeclaration | ts.ClassExpression, className: lua.Expression): lua.Expression;
+export declare function createClassMethodDecoratingExpression(context: TransformationContext, methodDeclaration: ts.MethodDeclaration, originalMethod: lua.Expression, className: lua.Identifier): lua.Expression;
+export declare function createClassAccessorDecoratingExpression(context: TransformationContext, accessor: ts.AccessorDeclaration, originalAccessor: lua.Expression, className: lua.Identifier): lua.Expression;
+export declare function createClassPropertyDecoratingExpression(context: TransformationContext, property: ts.PropertyDeclaration, className: lua.Identifier): lua.Expression;
+export declare function createConstructorDecoratingExpression(context: TransformationContext, node: ts.ConstructorDeclaration, className: lua.Identifier): lua.Statement | undefined;

package/dist/transformation/visitors/class/decorators.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDecoratingExpression = exports.transformDecoratorExpression = void 0;
+exports.createConstructorDecoratingExpression = exports.createClassPropertyDecoratingExpression = exports.createClassAccessorDecoratingExpression = exports.createClassMethodDecoratingExpression = exports.createClassDecoratingExpression = exports.transformDecoratorExpression = void 0;
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
 const diagnostics_1 = require("../../utils/diagnostics");
 const function_context_1 = require("../../utils/function-context");
 const lualib_1 = require("../../utils/lualib");
+const utils_1 = require("../../../utils");
+const method_1 = require("./members/method");
+const literal_1 = require("../literal");
+const utils_2 = require("./utils");
 function transformDecoratorExpression(context, decorator) {
     const expression = decorator.expression;
     const type = context.checker.getTypeAtLocation(expression);
@@ -16,7 +20,95 @@ function transformDecoratorExpression(context, decorator) {
     return context.transformExpression(expression);
 }
 exports.transformDecoratorExpression = transformDecoratorExpression;
-function createDecoratingExpression(context, kind, decorators, targetTableName, targetFieldExpression) {
+function createClassDecoratingExpression(context, classDeclaration, className) {
+    var _a, _b, _c, _d;
+    const classDecorators = (_b = (_a = ts.getDecorators(classDeclaration)) === null || _a === void 0 ? void 0 : _a.map(d => transformDecoratorExpression(context, d))) !== null && _b !== void 0 ? _b : [];
+    // If experimentalDecorators flag is set, decorate with legacy decorator logic
+    if (context.options.experimentalDecorators) {
+        return createLegacyDecoratingExpression(context, classDeclaration.kind, classDecorators, className);
+    }
+    // Else: TypeScript 5.0 decorator
+    return createDecoratingExpression(context, className, className, classDecorators, {
+        kind: lua.createStringLiteral("class"),
+        name: lua.createStringLiteral((_d = (_c = classDeclaration.name) === null || _c === void 0 ? void 0 : _c.getText()) !== null && _d !== void 0 ? _d : ""),
+    });
+}
+exports.createClassDecoratingExpression = createClassDecoratingExpression;
+function createClassMethodDecoratingExpression(context, methodDeclaration, originalMethod, className) {
+    var _a, _b;
+    const parameterDecorators = getParameterDecorators(context, methodDeclaration);
+    const methodDecorators = (_b = (_a = ts.getDecorators(methodDeclaration)) === null || _a === void 0 ? void 0 : _a.map(d => transformDecoratorExpression(context, d))) !== null && _b !== void 0 ? _b : [];
+    const methodName = (0, method_1.transformMethodName)(context, methodDeclaration);
+    // If experimentalDecorators flag is set, decorate with legacy decorator logic
+    if (context.options.experimentalDecorators) {
+        const methodTable = (0, method_1.transformMemberExpressionOwnerName)(methodDeclaration, className);
+        return createLegacyDecoratingExpression(context, methodDeclaration.kind, [...methodDecorators, ...parameterDecorators], methodTable, methodName);
+    }
+    // Else: TypeScript 5.0 decorator
+    return createDecoratingExpression(context, className, originalMethod, methodDecorators, {
+        kind: lua.createStringLiteral("method"),
+        name: methodName,
+        private: lua.createBooleanLiteral((0, utils_2.isPrivateNode)(methodDeclaration)),
+        static: lua.createBooleanLiteral((0, utils_2.isStaticNode)(methodDeclaration)),
+    });
+}
+exports.createClassMethodDecoratingExpression = createClassMethodDecoratingExpression;
+function createClassAccessorDecoratingExpression(context, accessor, originalAccessor, className) {
+    var _a, _b;
+    const accessorDecorators = (_b = (_a = ts.getDecorators(accessor)) === null || _a === void 0 ? void 0 : _a.map(d => transformDecoratorExpression(context, d))) !== null && _b !== void 0 ? _b : [];
+    const propertyName = (0, literal_1.transformPropertyName)(context, accessor.name);
+    // If experimentalDecorators flag is set, decorate with legacy decorator logic
+    if (context.options.experimentalDecorators) {
+        const propertyOwnerTable = (0, method_1.transformMemberExpressionOwnerName)(accessor, className);
+        return createLegacyDecoratingExpression(context, accessor.kind, accessorDecorators, propertyOwnerTable, propertyName);
+    }
+    // Else: TypeScript 5.0 decorator
+    return createDecoratingExpression(context, className, originalAccessor, accessorDecorators, {
+        kind: lua.createStringLiteral(accessor.kind === ts.SyntaxKind.SetAccessor ? "setter" : "getter"),
+        name: propertyName,
+        private: lua.createBooleanLiteral((0, utils_2.isPrivateNode)(accessor)),
+        static: lua.createBooleanLiteral((0, utils_2.isStaticNode)(accessor)),
+    });
+}
+exports.createClassAccessorDecoratingExpression = createClassAccessorDecoratingExpression;
+function createClassPropertyDecoratingExpression(context, property, className) {
+    var _a;
+    const decorators = (_a = ts.getDecorators(property)) !== null && _a !== void 0 ? _a : [];
+    const propertyDecorators = decorators.map(d => transformDecoratorExpression(context, d));
+    // If experimentalDecorators flag is set, decorate with legacy decorator logic
+    if (context.options.experimentalDecorators) {
+        const propertyName = (0, literal_1.transformPropertyName)(context, property.name);
+        const propertyOwnerTable = (0, method_1.transformMemberExpressionOwnerName)(property, className);
+        return createLegacyDecoratingExpression(context, property.kind, propertyDecorators, propertyOwnerTable, propertyName);
+    }
+    // Else: TypeScript 5.0 decorator
+    // Add a diagnostic when something is returned from a field decorator
+    for (const decorator of decorators) {
+        const signature = context.checker.getResolvedSignature(decorator);
+        const decoratorReturnType = signature === null || signature === void 0 ? void 0 : signature.getReturnType();
+        // If return type of decorator is NOT void
+        if (decoratorReturnType && (decoratorReturnType.flags & ts.TypeFlags.Void) === 0) {
+            context.diagnostics.push((0, diagnostics_1.incompleteFieldDecoratorWarning)(property));
+        }
+    }
+    return createDecoratingExpression(context, className, lua.createNilLiteral(), propertyDecorators, {
+        kind: lua.createStringLiteral("field"),
+        name: lua.createStringLiteral(property.name.getText()),
+        private: lua.createBooleanLiteral((0, utils_2.isPrivateNode)(property)),
+        static: lua.createBooleanLiteral((0, utils_2.isStaticNode)(property)),
+    });
+}
+exports.createClassPropertyDecoratingExpression = createClassPropertyDecoratingExpression;
+function createDecoratingExpression(context, className, originalValue, decorators, decoratorContext) {
+    const decoratorTable = lua.createTableExpression(decorators.map(d => lua.createTableFieldExpression(d)));
+    const decoratorContextTable = objectToLuaTableLiteral(decoratorContext);
+    return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.Decorate, undefined, className, originalValue, decoratorTable, decoratorContextTable);
+}
+function objectToLuaTableLiteral(obj) {
+    return lua.createTableExpression(Object.entries(obj).map(([key, value]) => lua.createTableFieldExpression(value, lua.createStringLiteral(key))));
+}
+// Legacy decorators:
+function createLegacyDecoratingExpression(context, kind, decorators, targetTableName, targetFieldExpression) {
     const decoratorTable = lua.createTableExpression(decorators.map(e => lua.createTableFieldExpression(e)));
     const trailingExpressions = [decoratorTable, targetTableName];
     if (targetFieldExpression) {
@@ -26,7 +118,23 @@ function createDecoratingExpression(context, kind, decorators, targetTableName,
             kind === ts.SyntaxKind.SetAccessor;
         trailingExpressions.push(isMethodOrAccessor ? lua.createBooleanLiteral(true) : lua.createNilLiteral());
     }
-    return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.Decorate, undefined, ...trailingExpressions);
+    return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DecorateLegacy, undefined, ...trailingExpressions);
+}
+function getParameterDecorators(context, node) {
+    return node.parameters
+        .flatMap((parameter, index) => {
+        var _a;
+        return (_a = ts
+            .getDecorators(parameter)) === null || _a === void 0 ? void 0 : _a.map(decorator => (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DecorateParam, node, lua.createNumericLiteral(index), transformDecoratorExpression(context, decorator)));
+    })
+        .filter(utils_1.isNonNull);
+}
+function createConstructorDecoratingExpression(context, node, className) {
+    const parameterDecorators = getParameterDecorators(context, node);
+    if (parameterDecorators.length > 0) {
+        const decorateMethod = createLegacyDecoratingExpression(context, node.kind, parameterDecorators, className);
+        return lua.createExpressionStatement(decorateMethod);
+    }
 }
-exports.createDecoratingExpression = createDecoratingExpression;
+exports.createConstructorDecoratingExpression = createConstructorDecoratingExpression;
 //# sourceMappingURL=decorators.js.map

package/dist/transformation/visitors/class/index.js

@@ -16,6 +16,7 @@ const utils_1 = require("./utils");
 const setup_1 = require("./setup");
 const CompilerOptions_1 = require("../../../CompilerOptions");
 const preceding_statements_1 = require("../../utils/preceding-statements");
+const decorators_2 = require("./decorators");
 const transformClassDeclaration = (declaration, context) => {
     // If declaration is a default export, transform to export variable assignment instead
     if ((0, export_1.hasDefaultExportModifier)(declaration)) {
@@ -39,7 +40,7 @@ function transformClassAsExpression(expression, context) {
 }
 exports.transformClassAsExpression = transformClassAsExpression;
 function transformClassLikeDeclaration(classDeclaration, context, nameOverride) {
-    var _a, _b;
+    var _a;
     let className;
     if (nameOverride !== undefined) {
         className = nameOverride;
@@ -75,6 +76,10 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         const constructorResult = (0, constructor_1.transformConstructorDeclaration)(context, constructor, localClassName, instanceFields, classDeclaration);
         if (constructorResult)
             result.push(constructorResult);
+        // Legacy constructor decorator
+        const decoratingExpression = (0, decorators_1.createConstructorDecoratingExpression)(context, constructor, localClassName);
+        if (decoratingExpression)
+            result.push(decoratingExpression);
     }
     else if (!extendedType) {
         // Generate a constructor if none was defined in a base class
@@ -96,50 +101,49 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         const constructorFunction = lua.createFunctionExpression(lua.createBlock(constructorBody), [(0, lua_ast_1.createSelfIdentifier)()], lua.createDotsLiteral(), lua.NodeFlags.Declaration);
         result.push(lua.createAssignmentStatement((0, constructor_1.createConstructorName)(localClassName), constructorFunction, classDeclaration));
     }
-    // Transform accessors
-    for (const member of classDeclaration.members) {
-        if (!ts.isAccessor(member))
-            continue;
-        const accessors = context.resolver.getAllAccessorDeclarations(member);
-        if (accessors.firstAccessor !== member)
-            continue;
-        const accessorsResult = (0, accessors_1.transformAccessorDeclarations)(context, accessors, localClassName);
-        if (accessorsResult) {
-            result.push(accessorsResult);
-        }
-    }
-    const decorationStatements = [];
+    // Transform class members
     for (const member of classDeclaration.members) {
         if (ts.isAccessor(member)) {
-            const expression = (0, fields_1.createPropertyDecoratingExpression)(context, member, localClassName);
-            if (expression)
-                decorationStatements.push(lua.createExpressionStatement(expression));
+            // Accessors
+            const accessors = context.resolver.getAllAccessorDeclarations(member);
+            if (accessors.firstAccessor !== member)
+                continue;
+            const accessorsResult = (0, accessors_1.transformAccessorDeclarations)(context, accessors, localClassName);
+            if (accessorsResult) {
+                result.push(accessorsResult);
+            }
         }
         else if (ts.isMethodDeclaration(member)) {
+            // Methods
             const statement = (0, method_1.transformMethodDeclaration)(context, member, localClassName);
             if (statement)
                 result.push(statement);
-            if (member.body) {
-                const statement = (0, method_1.createMethodDecoratingExpression)(context, member, localClassName);
-                if (statement)
-                    decorationStatements.push(statement);
-            }
         }
         else if (ts.isPropertyDeclaration(member)) {
+            // Properties
             if ((0, utils_1.isStaticNode)(member)) {
                 const statement = (0, fields_1.transformStaticPropertyDeclaration)(context, member, localClassName);
                 if (statement)
-                    decorationStatements.push(statement);
+                    result.push(statement);
+            }
+            if ((_a = ts.getDecorators(member)) === null || _a === void 0 ? void 0 : _a.length) {
+                result.push(lua.createExpressionStatement((0, decorators_2.createClassPropertyDecoratingExpression)(context, member, className)));
+            }
+        }
+        else if (ts.isClassStaticBlockDeclaration(member)) {
+            if (member.body.statements.length > 0) {
+                const bodyStatements = context.transformStatements(member.body.statements);
+                const iif = lua.createFunctionExpression(lua.createBlock(bodyStatements), [
+                    lua.createIdentifier("self"),
+                ]);
+                const iife = lua.createCallExpression(iif, [className]);
+                result.push(lua.createExpressionStatement(iife, member));
             }
-            const expression = (0, fields_1.createPropertyDecoratingExpression)(context, member, localClassName);
-            if (expression)
-                decorationStatements.push(lua.createExpressionStatement(expression));
         }
     }
-    result.push(...decorationStatements);
     // Decorate the class
     if (ts.canHaveDecorators(classDeclaration) && ts.getDecorators(classDeclaration)) {
-        const decoratingExpression = (0, decorators_1.createDecoratingExpression)(context, classDeclaration.kind, (_b = (_a = ts.getDecorators(classDeclaration)) === null || _a === void 0 ? void 0 : _a.map(d => (0, decorators_1.transformDecoratorExpression)(context, d))) !== null && _b !== void 0 ? _b : [], localClassName);
+        const decoratingExpression = (0, decorators_1.createClassDecoratingExpression)(context, classDeclaration, localClassName);
         const decoratingStatement = lua.createAssignmentStatement(localClassName, decoratingExpression);
         result.push(decoratingStatement);
         if ((0, export_1.hasExportModifier)(classDeclaration)) {

package/dist/transformation/visitors/class/members/accessors.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformAccessorDeclarations = void 0;
+const ts = require("typescript");
 const lua = require("../../../../LuaAST");
 const lua_ast_1 = require("../../../utils/lua-ast");
 const lualib_1 = require("../../../utils/lualib");
@@ -8,20 +9,28 @@ const function_1 = require("../../function");
 const literal_1 = require("../../literal");
 const utils_1 = require("../utils");
 const constructor_1 = require("./constructor");
-function transformAccessor(context, node) {
+const decorators_1 = require("../decorators");
+function transformAccessor(context, node, className) {
+    var _a;
     const [params, dot, restParam] = (0, function_1.transformParameters)(context, node.parameters, (0, lua_ast_1.createSelfIdentifier)());
     const body = node.body ? (0, function_1.transformFunctionBody)(context, node.parameters, node.body, restParam)[0] : [];
-    return lua.createFunctionExpression(lua.createBlock(body), params, dot, lua.NodeFlags.Declaration);
+    const accessorFunction = lua.createFunctionExpression(lua.createBlock(body), params, dot, lua.NodeFlags.Declaration);
+    if ((_a = ts.getDecorators(node)) === null || _a === void 0 ? void 0 : _a.length) {
+        return (0, decorators_1.createClassAccessorDecoratingExpression)(context, node, accessorFunction, className);
+    }
+    else {
+        return accessorFunction;
+    }
 }
 function transformAccessorDeclarations(context, { firstAccessor, getAccessor, setAccessor }, className) {
     const propertyName = (0, literal_1.transformPropertyName)(context, firstAccessor.name);
     const descriptor = lua.createTableExpression([]);
     if (getAccessor) {
-        const getterFunction = transformAccessor(context, getAccessor);
+        const getterFunction = transformAccessor(context, getAccessor, className);
         descriptor.fields.push(lua.createTableFieldExpression(getterFunction, lua.createStringLiteral("get")));
     }
     if (setAccessor) {
-        const setterFunction = transformAccessor(context, setAccessor);
+        const setterFunction = transformAccessor(context, setAccessor, className);
         descriptor.fields.push(lua.createTableFieldExpression(setterFunction, lua.createStringLiteral("set")));
     }
     const isStatic = (0, utils_1.isStaticNode)(firstAccessor);

package/dist/transformation/visitors/class/members/fields.d.ts

@@ -1,6 +1,5 @@
 import * as ts from "typescript";
 import * as lua from "../../../../LuaAST";
 import { TransformationContext } from "../../../context";
-export declare function createPropertyDecoratingExpression(context: TransformationContext, node: ts.PropertyDeclaration | ts.AccessorDeclaration, className: lua.Identifier): lua.Expression | undefined;
 export declare function transformClassInstanceFields(context: TransformationContext, instanceFields: ts.PropertyDeclaration[]): lua.Statement[];
 export declare function transformStaticPropertyDeclaration(context: TransformationContext, field: ts.PropertyDeclaration, className: lua.Identifier): lua.AssignmentStatement | undefined;

package/dist/transformation/visitors/class/members/fields.js

@@ -1,24 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformStaticPropertyDeclaration = exports.transformClassInstanceFields = exports.createPropertyDecoratingExpression = void 0;
-const ts = require("typescript");
+exports.transformStaticPropertyDeclaration = exports.transformClassInstanceFields = void 0;
 const lua = require("../../../../LuaAST");
 const lua_ast_1 = require("../../../utils/lua-ast");
 const preceding_statements_1 = require("../../../utils/preceding-statements");
 const literal_1 = require("../../literal");
-const decorators_1 = require("../decorators");
-const method_1 = require("./method");
-function createPropertyDecoratingExpression(context, node, className) {
-    if (!ts.canHaveDecorators(node))
-        return;
-    const decorators = ts.getDecorators(node);
-    if (!decorators)
-        return;
-    const propertyName = (0, literal_1.transformPropertyName)(context, node.name);
-    const propertyOwnerTable = (0, method_1.transformMemberExpressionOwnerName)(node, className);
-    return (0, decorators_1.createDecoratingExpression)(context, node.kind, decorators.map(d => (0, decorators_1.transformDecoratorExpression)(context, d)), propertyOwnerTable, propertyName);
-}
-exports.createPropertyDecoratingExpression = createPropertyDecoratingExpression;
 function transformClassInstanceFields(context, instanceFields) {
     const statements = [];
     for (const f of instanceFields) {

package/dist/transformation/visitors/class/members/method.d.ts

@@ -4,4 +4,3 @@ import { TransformationContext } from "../../../context";
 export declare function transformMemberExpressionOwnerName(node: ts.PropertyDeclaration | ts.MethodDeclaration | ts.AccessorDeclaration, className: lua.Identifier): lua.Expression;
 export declare function transformMethodName(context: TransformationContext, node: ts.MethodDeclaration): lua.Expression;
 export declare function transformMethodDeclaration(context: TransformationContext, node: ts.MethodDeclaration, className: lua.Identifier): lua.Statement | undefined;
-export declare function createMethodDecoratingExpression(context: TransformationContext, node: ts.MethodDeclaration, className: lua.Identifier): lua.Statement | undefined;

package/dist/transformation/visitors/class/members/method.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMethodDecoratingExpression = exports.transformMethodDeclaration = exports.transformMethodName = exports.transformMemberExpressionOwnerName = void 0;
+exports.transformMethodDeclaration = exports.transformMethodName = exports.transformMemberExpressionOwnerName = void 0;
 const ts = require("typescript");
 const lua = require("../../../../LuaAST");
 const function_1 = require("../../function");
 const literal_1 = require("../../literal");
 const utils_1 = require("../utils");
-const decorators_1 = require("../decorators");
 const constructor_1 = require("./constructor");
-const lualib_1 = require("../../../utils/lualib");
-const utils_2 = require("../../../../utils");
+const decorators_1 = require("../decorators");
 function transformMemberExpressionOwnerName(node, className) {
     return (0, utils_1.isStaticNode)(node) ? lua.cloneIdentifier(className) : (0, constructor_1.createPrototypeName)(className);
 }
@@ -23,31 +21,27 @@ function transformMethodName(context, node) {
 }
 exports.transformMethodName = transformMethodName;
 function transformMethodDeclaration(context, node, className) {
+    var _a, _b;
     // Don't transform methods without body (overload declarations)
     if (!node.body)
         return;
     const methodTable = transformMemberExpressionOwnerName(node, className);
     const methodName = transformMethodName(context, node);
     const [functionExpression] = (0, function_1.transformFunctionToExpression)(context, node);
-    return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression, node);
-}
-exports.transformMethodDeclaration = transformMethodDeclaration;
-function createMethodDecoratingExpression(context, node, className) {
-    var _a, _b;
-    const methodTable = transformMemberExpressionOwnerName(node, className);
-    const methodName = transformMethodName(context, node);
-    const parameterDecorators = node.parameters
-        .flatMap((parameter, index) => {
-        var _a;
-        return (_a = ts
-            .getDecorators(parameter)) === null || _a === void 0 ? void 0 : _a.map(decorator => (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DecorateParam, node, lua.createNumericLiteral(index), (0, decorators_1.transformDecoratorExpression)(context, decorator)));
-    })
-        .filter(utils_2.isNonNull);
-    const methodDecorators = (_b = (_a = ts.getDecorators(node)) === null || _a === void 0 ? void 0 : _a.map(d => (0, decorators_1.transformDecoratorExpression)(context, d))) !== null && _b !== void 0 ? _b : [];
-    if (methodDecorators.length > 0 || parameterDecorators.length > 0) {
-        const decorateMethod = (0, decorators_1.createDecoratingExpression)(context, node.kind, [...methodDecorators, ...parameterDecorators], methodTable, methodName);
-        return lua.createExpressionStatement(decorateMethod);
+    const methodHasDecorators = ((_b = (_a = ts.getDecorators(node)) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
+    const methodHasParameterDecorators = node.parameters.some(p => { var _a, _b; return ((_b = (_a = ts.getDecorators(p)) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0; }); // Legacy decorators
+    if (methodHasDecorators || methodHasParameterDecorators) {
+        if (context.options.experimentalDecorators) {
+            // Legacy decorator statement
+            return lua.createExpressionStatement((0, decorators_1.createClassMethodDecoratingExpression)(context, node, functionExpression, className));
+        }
+        else {
+            return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), (0, decorators_1.createClassMethodDecoratingExpression)(context, node, functionExpression, className), node);
+        }
+    }
+    else {
+        return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression, node);
     }
 }
-exports.createMethodDecoratingExpression = createMethodDecoratingExpression;
+exports.transformMethodDeclaration = transformMethodDeclaration;
 //# sourceMappingURL=method.js.map

package/dist/transformation/visitors/class/utils.d.ts

@@ -1,5 +1,6 @@
 import * as ts from "typescript";
 import { TransformationContext } from "../../context";
+export declare function isPrivateNode(node: ts.HasModifiers): boolean;
 export declare function isStaticNode(node: ts.HasModifiers): boolean;
 export declare function getExtendsClause(node: ts.ClassLikeDeclarationBase): ts.HeritageClause | undefined;
 export declare function getExtendedNode(node: ts.ClassLikeDeclarationBase): ts.ExpressionWithTypeArguments | undefined;

package/dist/transformation/visitors/class/utils.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtendedType = exports.getExtendedNode = exports.getExtendsClause = exports.isStaticNode = void 0;
+exports.getExtendedType = exports.getExtendedNode = exports.getExtendsClause = exports.isStaticNode = exports.isPrivateNode = void 0;
 const ts = require("typescript");
+function isPrivateNode(node) {
+    var _a;
+    return ((_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.some(m => m.kind === ts.SyntaxKind.PrivateKeyword)) === true;
+}
+exports.isPrivateNode = isPrivateNode;
 function isStaticNode(node) {
     var _a;
     return ((_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.some(m => m.kind === ts.SyntaxKind.StaticKeyword)) === true;

package/dist/transformation/visitors/function.js

@@ -139,7 +139,7 @@ function transformParameters(context, parameters, functionContext) {
     let identifierIndex = 0;
     // Only push parameter name to paramName array if it isn't a spread parameter
     for (const param of parameters) {
-        if (ts.isIdentifier(param.name) && param.name.originalKeywordKind === ts.SyntaxKind.ThisKeyword) {
+        if (ts.isIdentifier(param.name) && ts.identifierToKeywordKind(param.name) === ts.SyntaxKind.ThisKeyword) {
             continue;
         }
         // Binding patterns become ____bindingPattern0, ____bindingPattern1, etc as function parameters

package/dist/transformation/visitors/identifier.js

@@ -73,7 +73,7 @@ function transformIdentifierWithSymbol(context, node, symbol) {
 }
 exports.transformIdentifierWithSymbol = transformIdentifierWithSymbol;
 const transformIdentifierExpression = (node, context) => {
-    if (node.originalKeywordKind === ts.SyntaxKind.UndefinedKeyword) {
+    if (ts.identifierToKeywordKind(node) === ts.SyntaxKind.UndefinedKeyword) {
         return lua.createNilLiteral(node);
     }
     const symbol = context.checker.getSymbolAtLocation(node);

package/dist/transformation/visitors/modules/export.js

@@ -65,8 +65,8 @@ function transformExportAll(context, node) {
     // Wrap this in a DoStatement to prevent polluting the scope.
     return lua.createDoStatement(result, node);
 }
-const isDefaultExportSpecifier = (node) => (node.name && node.name.originalKeywordKind === ts.SyntaxKind.DefaultKeyword) ||
-    (node.propertyName && node.propertyName.originalKeywordKind === ts.SyntaxKind.DefaultKeyword);
+const isDefaultExportSpecifier = (node) => (node.name && ts.identifierToKeywordKind(node.name) === ts.SyntaxKind.DefaultKeyword) ||
+    (node.propertyName && ts.identifierToKeywordKind(node.propertyName) === ts.SyntaxKind.DefaultKeyword);
 function transformExportSpecifier(context, node) {
     const exportedSymbol = context.checker.getExportSpecifierLocalTargetSymbol(node);
     const exportedIdentifier = node.propertyName ? node.propertyName : node.name;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.15.0",
+    "version": "1.16.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.0.2"
+        "typescript": "~5.1.3"
     },
     "dependencies": {
         "@typescript-to-lua/language-extensions": "1.0.0",
@@ -70,6 +70,6 @@
         "prettier": "^2.8.4",
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
-        "typescript": "^5.0.2"
+        "typescript": "~5.1.3"
     }
 }