typescript-to-lua 1.15.0 → 1.15.1

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

@@ -75,6 +75,9 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         const constructorResult = (0, constructor_1.transformConstructorDeclaration)(context, constructor, localClassName, instanceFields, classDeclaration);
         if (constructorResult)
             result.push(constructorResult);
+        const decoratingExpression = (0, method_1.createConstructorDecoratingExpression)(context, constructor, localClassName);
+        if (decoratingExpression)
+            result.push(decoratingExpression);
     }
     else if (!extendedType) {
         // Generate a constructor if none was defined in a base class

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

@@ -4,4 +4,6 @@ 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 getParameterDecorators(context: TransformationContext, node: ts.FunctionLikeDeclarationBase): lua.CallExpression[];
+export declare function createConstructorDecoratingExpression(context: TransformationContext, node: ts.ConstructorDeclaration, 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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMethodDecoratingExpression = exports.transformMethodDeclaration = exports.transformMethodName = exports.transformMemberExpressionOwnerName = void 0;
+exports.createMethodDecoratingExpression = exports.createConstructorDecoratingExpression = exports.getParameterDecorators = exports.transformMethodDeclaration = exports.transformMethodName = exports.transformMemberExpressionOwnerName = void 0;
 const ts = require("typescript");
 const lua = require("../../../../LuaAST");
 const function_1 = require("../../function");
@@ -32,17 +32,29 @@ function transformMethodDeclaration(context, node, className) {
     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
+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), (0, decorators_1.transformDecoratorExpression)(context, decorator)));
     })
         .filter(utils_2.isNonNull);
+}
+exports.getParameterDecorators = getParameterDecorators;
+function createConstructorDecoratingExpression(context, node, className) {
+    const parameterDecorators = getParameterDecorators(context, node);
+    if (parameterDecorators.length > 0) {
+        const decorateMethod = (0, decorators_1.createDecoratingExpression)(context, node.kind, parameterDecorators, className);
+        return lua.createExpressionStatement(decorateMethod);
+    }
+}
+exports.createConstructorDecoratingExpression = createConstructorDecoratingExpression;
+function createMethodDecoratingExpression(context, node, className) {
+    var _a, _b;
+    const methodTable = transformMemberExpressionOwnerName(node, className);
+    const methodName = transformMethodName(context, node);
+    const parameterDecorators = getParameterDecorators(context, node);
     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);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.15.0",
+    "version": "1.15.1",
     "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/",
@@ -70,6 +70,6 @@
         "prettier": "^2.8.4",
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
-        "typescript": "^5.0.2"
+        "typescript": "^5.0.4"
     }
 }