xray16 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xray16",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "Neloreck",
   "repository": "https://github.com/stalker-xrts/xray-16-types",
   "private": false,
@@ -16,10 +16,10 @@
     "lint": "eslint . --ext .ts,.tsx,.js"
   },
   "peerDependencies": {
-    "typescript-to-lua": "1.16.3"
+    "typescript-to-lua": "^1.28.1"
   },
   "devDependencies": {
-    "@types/node": "20.3.1",
+    "@types/node": "22.10.2",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.54.0",
     "@typescript-to-lua/language-extensions": "1.0.0",
@@ -29,9 +29,9 @@
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-jsdoc": "^46.8.0",
     "eslint-plugin-sort-keys-fix": "^1.1.2",
-    "prettier": "^3.0.1",
-    "typedoc": "^0.24.8",
-    "typescript": "5.1.6"
+    "prettier": "^3.4.2",
+    "typedoc": "^0.27.5",
+    "typescript": "^5.7.2"
   },
   "files": [
     "plugins/**/*",

package/plugins/transform_luabind_class/transformation/class_declaration.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformClassLikeDeclaration = exports.transformClassAsExpression = exports.transformLuabindClassDeclaration = void 0;
+exports.transformLuabindClassDeclaration = void 0;
+exports.transformClassAsExpression = transformClassAsExpression;
+exports.transformClassLikeDeclaration = transformClassLikeDeclaration;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const typescript_to_lua_1 = require("typescript-to-lua");
@@ -37,7 +39,6 @@ function transformClassAsExpression(expression, context) {
     context.addPrecedingStatements(statements);
     return name;
 }
-exports.transformClassAsExpression = transformClassAsExpression;
 function transformClassLikeDeclaration(classDeclaration, context, nameOverride) {
     let className;
     if (nameOverride !== undefined) {
@@ -101,7 +102,7 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     for (const member of classDeclaration.members) {
         if (!(0, typescript_1.isAccessor)(member))
             continue;
-        const accessors = context.resolver.getAllAccessorDeclarations(member);
+        const accessors = getAllAccessorDeclarations(classDeclaration);
         if (accessors.firstAccessor !== member)
             continue;
         const accessorsResult = (0, accessors_1.transformAccessorDeclarations)(context, accessors, localClassName);
@@ -144,4 +145,14 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     context.classSuperInfos.pop();
     return { statements: result, name: className };
 }
-exports.transformClassLikeDeclaration = transformClassLikeDeclaration;
+function getAllAccessorDeclarations(classDeclaration) {
+    const getAccessor = classDeclaration.members.find(typescript_1.isGetAccessor);
+    const setAccessor = classDeclaration.members.find(typescript_1.isSetAccessor);
+    // Get the first of the two (that is not undefined)
+    const firstAccessor = getAccessor && (!setAccessor || getAccessor.pos < setAccessor.pos) ? getAccessor : setAccessor;
+    return {
+        firstAccessor,
+        setAccessor,
+        getAccessor,
+    };
+}

package/plugins/transform_luabind_class/transformation/decorators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkLuabindClassDecoratorExpression = void 0;
+exports.checkLuabindClassDecoratorExpression = checkLuabindClassDecoratorExpression;
 const constants_1 = require("./constants");
 const errors_1 = require("./errors");
 /**
@@ -13,4 +13,3 @@ function checkLuabindClassDecoratorExpression(context, decorator) {
         context.diagnostics.push((0, errors_1.unsupportedClassDecorator)(expression));
     }
 }
-exports.checkLuabindClassDecoratorExpression = checkLuabindClassDecoratorExpression;

package/plugins/transform_luabind_class/transformation/members/accessors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformAccessorDeclarations = void 0;
+exports.transformAccessorDeclarations = transformAccessorDeclarations;
 const typescript_to_lua_1 = require("typescript-to-lua");
 const lua = require("typescript-to-lua");
 const lua_ast_1 = require("typescript-to-lua/dist/transformation/utils/lua-ast");
@@ -36,4 +36,3 @@ function transformAccessorDeclarations(context, { firstAccessor, getAccessor, se
     const call = (0, lualib_1.transformLuaLibFunction)(context, feature, undefined, ...parameters);
     return lua.createExpressionStatement(call);
 }
-exports.transformAccessorDeclarations = transformAccessorDeclarations;

package/plugins/transform_luabind_class/transformation/members/constructor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformConstructorDeclaration = exports.createConstructorName = void 0;
+exports.createConstructorName = createConstructorName;
+exports.transformConstructorDeclaration = transformConstructorDeclaration;
 const typescript_1 = require("typescript");
 const lua = require("typescript-to-lua");
 const lua_ast_1 = require("typescript-to-lua/dist/transformation/utils/lua-ast");
@@ -12,7 +13,6 @@ const fields_1 = require("./fields");
 function createConstructorName(className) {
     return lua.createTableIndexExpression(lua.cloneIdentifier(className), lua.createStringLiteral(constants_1.LUABIND_CONSTRUCTOR_METHOD));
 }
-exports.createConstructorName = createConstructorName;
 function transformConstructorDeclaration(context, statement, className, instanceFields, classDeclaration) {
     // Don't transform methods without body (overload declarations)
     if (!statement.body) {
@@ -58,4 +58,3 @@ function transformConstructorDeclaration(context, statement, className, instance
     context.popScope();
     return lua.createAssignmentStatement(createConstructorName(className), lua.createFunctionExpression(block, params, dotsLiteral, lua.NodeFlags.Declaration), constructorWasGenerated ? classDeclaration : statement);
 }
-exports.transformConstructorDeclaration = transformConstructorDeclaration;

package/plugins/transform_luabind_class/transformation/members/fields.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformClassInstanceFields = exports.verifyPropertyDecoratingExpression = void 0;
+exports.verifyPropertyDecoratingExpression = verifyPropertyDecoratingExpression;
+exports.transformClassInstanceFields = transformClassInstanceFields;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const lua_ast_1 = require("typescript-to-lua/dist/transformation/utils/lua-ast");
@@ -20,7 +21,6 @@ function verifyPropertyDecoratingExpression(context, node) {
         context.diagnostics.push((0, errors_1.unsupportedPropertyDecorator)(decorator));
     });
 }
-exports.verifyPropertyDecoratingExpression = verifyPropertyDecoratingExpression;
 function transformClassInstanceFields(context, instanceFields) {
     const statements = [];
     for (const f of instanceFields) {
@@ -38,4 +38,3 @@ function transformClassInstanceFields(context, instanceFields) {
     }
     return statements;
 }
-exports.transformClassInstanceFields = transformClassInstanceFields;

package/plugins/transform_luabind_class/transformation/members/method.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyMethodDecoratingExpression = exports.transformMethodDeclaration = exports.transformMethodName = exports.transformMemberExpressionOwnerName = void 0;
+exports.transformMemberExpressionOwnerName = transformMemberExpressionOwnerName;
+exports.transformMethodName = transformMethodName;
+exports.transformMethodDeclaration = transformMethodDeclaration;
+exports.verifyMethodDecoratingExpression = verifyMethodDecoratingExpression;
 const typescript_1 = require("typescript");
 const lua = require("typescript-to-lua");
 const function_1 = require("typescript-to-lua/dist/transformation/visitors/function");
@@ -10,7 +13,6 @@ const utils_1 = require("../utils");
 function transformMemberExpressionOwnerName(node, className) {
     return lua.cloneIdentifier(className);
 }
-exports.transformMemberExpressionOwnerName = transformMemberExpressionOwnerName;
 function transformMethodName(context, node) {
     const methodName = (0, literal_1.transformPropertyName)(context, node.name);
     if (lua.isStringLiteral(methodName) && methodName.value === "toString") {
@@ -18,7 +20,6 @@ function transformMethodName(context, node) {
     }
     return methodName;
 }
-exports.transformMethodName = transformMethodName;
 function transformMethodDeclaration(context, node, className) {
     // Don't transform methods without body (overload declarations)
     if (!node.body)
@@ -33,7 +34,6 @@ function transformMethodDeclaration(context, node, className) {
     const [functionExpression] = (0, function_1.transformFunctionToExpression)(context, node);
     return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression, node);
 }
-exports.transformMethodDeclaration = transformMethodDeclaration;
 /**
  * Verify that method statement is not using decorators for methods/parameters.
  */
@@ -53,4 +53,3 @@ function verifyMethodDecoratingExpression(context, node) {
         });
     }
 }
-exports.verifyMethodDecoratingExpression = verifyMethodDecoratingExpression;

package/plugins/transform_luabind_class/transformation/new.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformNewCallExpression = void 0;
+exports.transformNewCallExpression = transformNewCallExpression;
 const tstl = require("typescript-to-lua");
 const call_1 = require("typescript-to-lua/dist/transformation/visitors/call");
 /**
@@ -9,4 +9,3 @@ const call_1 = require("typescript-to-lua/dist/transformation/visitors/call");
 function transformNewCallExpression(expression, context) {
     return tstl.createCallExpression(context.transformExpression(expression.expression), (0, call_1.transformArguments)(context, expression.arguments ?? []));
 }
-exports.transformNewCallExpression = transformNewCallExpression;

package/plugins/transform_luabind_class/transformation/setup.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReflectionClassName = exports.createClassSetup = void 0;
+exports.createClassSetup = createClassSetup;
+exports.getReflectionClassName = getReflectionClassName;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const export_1 = require("typescript-to-lua/dist/transformation/utils/export");
@@ -41,7 +42,6 @@ function createClassSetup(context, statement, className, localClassName) {
     result.push(tstl.createAssignmentStatement(tstl.createTableIndexExpression(tstl.cloneIdentifier(localClassName), tstl.createStringLiteral(constants_1.LUABIND_NAME_FIELD)), getReflectionClassName(statement, className), statement));
     return result;
 }
-exports.createClassSetup = createClassSetup;
 function getReflectionClassName(declaration, className) {
     if (declaration.name) {
         return tstl.createStringLiteral(declaration.name.text);
@@ -57,7 +57,6 @@ function getReflectionClassName(declaration, className) {
     }
     return tstl.createStringLiteral("");
 }
-exports.getReflectionClassName = getReflectionClassName;
 /**
  * Creates class("Name")(base) expression for luabind classes.
  */

package/plugins/transform_luabind_class/transformation/super.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformLuabindConstructorSuperCall = exports.isLuabindClassSuperMethodCall = exports.isLuabindClassSuperCall = exports.transformClassSuperMethodExpression = void 0;
+exports.transformClassSuperMethodExpression = transformClassSuperMethodExpression;
+exports.isLuabindClassSuperCall = isLuabindClassSuperCall;
+exports.isLuabindClassSuperMethodCall = isLuabindClassSuperMethodCall;
+exports.transformLuabindConstructorSuperCall = transformLuabindConstructorSuperCall;
 const typescript_1 = require("typescript");
 const tstl = require("typescript-to-lua");
 const export_1 = require("typescript-to-lua/dist/transformation/utils/export");
@@ -34,7 +37,6 @@ function transformClassSuperMethodExpression(expression, context) {
     }
     return baseClassName;
 }
-exports.transformClassSuperMethodExpression = transformClassSuperMethodExpression;
 /**
  * Check if super() call is in luabind class target.
  */
@@ -50,7 +52,6 @@ function isLuabindClassSuperCall(expression, context) {
         return superInfo?.classDeclaration ? (0, utils_1.isLuabindClassType)(superInfo.classDeclaration, context) : false;
     }
 }
-exports.isLuabindClassSuperCall = isLuabindClassSuperCall;
 /**
  * Check if super.method() call is in luabind class target.
  */
@@ -60,7 +61,6 @@ function isLuabindClassSuperMethodCall(expression, context) {
     // Handle super calls properly for luabind classes.
     return superInfo?.classDeclaration ? (0, utils_1.isLuabindClassType)(superInfo.classDeclaration, context) : false;
 }
-exports.isLuabindClassSuperMethodCall = isLuabindClassSuperMethodCall;
 /**
  * Transform super() call in luabind classes to base_class.__init(self, param).
  */
@@ -69,4 +69,3 @@ function transformLuabindConstructorSuperCall(expression, context) {
     const parameters = (0, call_1.transformArguments)(context, expression.arguments, signature, typescript_1.factory.createThis());
     return tstl.createCallExpression(tstl.createTableIndexExpression(context.transformExpression(typescript_1.factory.createSuper()), tstl.createStringLiteral(constants_1.LUABIND_CONSTRUCTOR_METHOD)), parameters, expression);
 }
-exports.transformLuabindConstructorSuperCall = transformLuabindConstructorSuperCall;

package/plugins/transform_luabind_class/transformation/utils.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLuabindClassType = exports.markTypeAsLuabind = exports.isLuabindDecoratedClass = exports.getExtendedType = exports.getExtendedNode = exports.getExtendsClause = exports.isStaticNode = void 0;
+exports.isStaticNode = isStaticNode;
+exports.getExtendsClause = getExtendsClause;
+exports.getExtendedNode = getExtendedNode;
+exports.getExtendedType = getExtendedType;
+exports.isLuabindDecoratedClass = isLuabindDecoratedClass;
+exports.markTypeAsLuabind = markTypeAsLuabind;
+exports.isLuabindClassType = isLuabindClassType;
 const typescript_1 = require("typescript");
 const constants_1 = require("./constants");
 /**
@@ -9,14 +15,12 @@ const constants_1 = require("./constants");
 function isStaticNode(node) {
     return node.modifiers?.some((m) => m.kind === typescript_1.SyntaxKind.StaticKeyword) === true;
 }
-exports.isStaticNode = isStaticNode;
 /**
  * Get class extends node.
  */
 function getExtendsClause(node) {
     return node.heritageClauses?.find((clause) => clause.token === typescript_1.SyntaxKind.ExtendsKeyword);
 }
-exports.getExtendsClause = getExtendsClause;
 /**
  * Get class extended node.
  */
@@ -26,7 +30,6 @@ function getExtendedNode(node) {
         return;
     return extendsClause.types[0];
 }
-exports.getExtendedNode = getExtendedNode;
 /**
  * Get class extended node.
  */
@@ -34,7 +37,6 @@ function getExtendedType(context, node) {
     const extendedNode = getExtendedNode(node);
     return extendedNode && context.checker.getTypeAtLocation(extendedNode);
 }
-exports.getExtendedType = getExtendedType;
 /**
  * Check if class is decorated with provided decorator name.
  */
@@ -45,7 +47,6 @@ function isLuabindDecoratedClass(declaration) {
     }
     return decorators.some((it) => it.expression.expression?.escapedText === constants_1.LUABIND_DECORATOR);
 }
-exports.isLuabindDecoratedClass = isLuabindDecoratedClass;
 /**
  * Mark provided class as Luabind target.
  */
@@ -54,7 +55,6 @@ function markTypeAsLuabind(declaration, context) {
     const typeSymbol = typeAtLocation.symbol || typeAtLocation.aliasSymbol;
     typeSymbol[constants_1.LUABIND_SYMBOL] = true;
 }
-exports.markTypeAsLuabind = markTypeAsLuabind;
 /**
  * Check if provided class is specified as LuaBind.
  */
@@ -74,4 +74,3 @@ function isLuabindClassType(declaration, context) {
         return false;
     }
 }
-exports.isLuabindClassType = isLuabindClassType;

package/plugins/utils/diagnostics.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createErrorDiagnosticFactory = exports.createDiagnosticFactory = void 0;
+exports.createDiagnosticFactory = createDiagnosticFactory;
+exports.createErrorDiagnosticFactory = createErrorDiagnosticFactory;
 const typescript_1 = require("typescript");
 const utils_1 = require("typescript-to-lua/dist/utils");
 /**
@@ -15,8 +16,6 @@ function createDiagnosticFactory(category, message) {
         category,
     }));
 }
-exports.createDiagnosticFactory = createDiagnosticFactory;
 function createErrorDiagnosticFactory(message) {
     return createDiagnosticFactory(typescript_1.DiagnosticCategory.Error, message);
 }
-exports.createErrorDiagnosticFactory = createErrorDiagnosticFactory;