xray16 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xray16",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "author": "Neloreck",
   "repository": "https://github.com/stalker-xrts/xray-16-types",
   "private": false,

package/plugins/inject_tracy_zones.js

@@ -18,10 +18,10 @@ const plugin = {
                     filename = filename.slice(0, -3) + ".script";
                 }
                 if (filename.startsWith("index.")) {
-                    filename = `${path.basename(path.dirname(node.fileName))}::${filename}`;
+                    filename = `${path.basename(path.dirname(node.fileName))}@${filename}`;
                 }
                 return (0, sourceFile_1.transformSourceFileNode)(typescript_1.factory.updateSourceFile(node, [
-                    (0, tracy_1.createTraceZoneBeginNExpression)(`file::${filename}@lua`),
+                    (0, tracy_1.createTraceZoneBeginNExpression)(`lua::file::${filename}`),
                     ...node.statements,
                     (0, tracy_1.createTraceZoneEndExpression)(),
                 ], node.isDeclarationFile, node.referencedFiles, node.typeReferenceDirectives, node.hasNoDefaultLib, node.libReferenceDirectives), context);

package/plugins/utils/tracy.d.ts

@@ -1,4 +1,4 @@
-import { ArrowFunction, ConstructorDeclaration, ExpressionStatement, FunctionDeclaration, MethodDeclaration, Node, NodeArray, Statement } from "typescript";
+import { ArrowFunction, ExpressionStatement, FunctionDeclaration, MethodDeclaration, Node, NodeArray, Statement } from "typescript";
 export declare function isTraceBeginExpression(node: Node): boolean;
 export declare function isTraceEndExpression(node: Node): boolean;
 export declare function createTraceZoneBeginExpression(): ExpressionStatement;
@@ -9,5 +9,5 @@ export declare function remapStatementsWithZoneEnd<T extends {
     statements: NodeArray<Statement>;
 }>(target: T): Array<Statement>;
 export declare function transformNestedStatementsToInjectEndZones(statement?: Statement): Statement;
-export declare function transformWithInjectedZones<T extends FunctionDeclaration | MethodDeclaration | ConstructorDeclaration>(node: T, parentName?: string): T;
+export declare function transformWithInjectedZones<T extends FunctionDeclaration | MethodDeclaration>(node: T, parentName?: string): T;
 export declare function transformArrowFunctionWithInjectedZones<T extends ArrowFunction>(node: T, name: string): T;

package/plugins/utils/tracy.js

@@ -120,7 +120,7 @@ function transformWithInjectedZones(node, parentName) {
     }
     const statements = remapStatementsWithZoneEnd(node.body).map(transformNestedStatementsToInjectEndZones);
     // Zone start declaration.
-    statements.unshift(createTraceZoneBeginNExpression(`${parentName ? `${parentName}::` : ""}${name}@lua`));
+    statements.unshift(createTraceZoneBeginNExpression(`lua::${(0, typescript_1.isMethodDeclaration)(node) ? "method" : "function"}::${parentName ? `${parentName}::` : ""}${name}`));
     // Zone end declaration without explicit return.
     if (!hasReturnStatement) {
         statements.push(createTraceZoneEndExpression());
@@ -128,9 +128,6 @@ function transformWithInjectedZones(node, parentName) {
     if ((0, typescript_1.isMethodDeclaration)(node)) {
         return typescript_1.factory.updateMethodDeclaration(node, node.modifiers, node.asteriskToken, node.name, node.questionToken, node.typeParameters, node.parameters, node.type, typescript_1.factory.updateBlock(node.body, statements));
     }
-    else if ((0, typescript_1.isConstructorDeclaration)(node)) {
-        return typescript_1.factory.updateConstructorDeclaration(node, node.modifiers, node.parameters, typescript_1.factory.updateBlock(node.body, statements));
-    }
     else {
         return typescript_1.factory.updateFunctionDeclaration(node, node.modifiers, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, typescript_1.factory.updateBlock(node.body, statements));
     }
@@ -146,7 +143,7 @@ function transformArrowFunctionWithInjectedZones(node, name) {
     }
     const statements = remapStatementsWithZoneEnd(node.body).map(transformNestedStatementsToInjectEndZones);
     // Zone start declaration.
-    statements.unshift(createTraceZoneBeginNExpression(`${name}@lua`));
+    statements.unshift(createTraceZoneBeginNExpression(`lua::function::${name}`));
     // Zone end declaration without explicit return.
     if (!hasReturnStatement) {
         statements.push(createTraceZoneEndExpression());