npm - @lcap/nasl - Versions diffs - 4.5.0-beta.2 → 4.5.0-beta.3 - Mend

@lcap/nasl 4.5.0-beta.2 → 4.5.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (114) hide show

package/out/natural/transforms/transform2Enum.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Enum.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAiC,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAQ1G,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,IAAI,~~CA4CvL~~"}
1	+ {"version":3,"file":"transform2Enum.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAiC,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAQ1G,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAgDvL"}

package/out/natural/transforms/transform2Enum.js CHANGED Viewed

@@ -29,7 +29,11 @@ function transform2Enum(node, leadingComments, parseState) {
             }
             if (item.value.type === "NewExpression") {
                 const args = item.value.arguments;
-                const value = String(args[0].value);
+                // 支持负整数：Babel 将 -1 解析为 UnaryExpression { operator: '-', argument: NumericLiteral }
+                const firstArg = args[0];
+                const value = (firstArg.type === 'UnaryExpression' && firstArg.operator === '-' && firstArg.argument?.type === 'NumericLiteral')
+                    ? String(-firstArg.argument.value)
+                    : String(firstArg.value);
                 const label = args[1].value;
                 if (item.value?.callee?.type === 'Identifier' && item.value.callee.name !== enumeration.name) {
                     (0, utils_1.throwError)(parseState, `类型不匹配：字段 ${value} 期望一个 ${enumeration.name} 的实例，但实际获得了 ${item.value.callee.name}`, item);

package/out/natural/transforms/transform2Enum.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Enum.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":";;;AAAA,oCAA0G;AAC1G,yEAAsE;AACtE,2DAGgC;AAChC,uCAA8D;AAE9D,SAAgB,cAAc,CAAC,IAAiC,EAAE,eAAoE,EAAE,UAA+B;IACnK,MAAM,WAAW,GAAG,IAAI,iBAAS,CAAC,IAAI,EAAE,CAAC;IACzC,UAAU,CAAC,QAAQ,GAAG,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IACtD,IAAA,uBAAa,EAAC,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAClD,WAAW,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,eAAe,CAAC,CAAC;IAC7D,WAAW,CAAC,SAAS,GAAG,IAAA,mDAAwB,EAAE,IAAI,CAAC,mBAA+D,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC;IAE3J,IAAA,0CAAyB,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC,+BAAc,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACtF,IAAI,CAAC,WAAW,CAAC,KAAK;QAAE,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,WAAW,CAAC;IAEpE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,IAAI,iBAAS,CAAC,QAAQ,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAClC,IAAI,GAAG,GAAW,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACnC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YACtB,CAAC;iBAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC7C,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;YACvB,CAAC;iBAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAC9C,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YAED,IAAG,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACvC,MAAM,IAAI,GAAQ,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;gBACvC,MAAM,~~KAAK~~,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;~~gBACpC~~,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC5B,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,KAAG,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;oBAC3F,IAAA,kBAAU,EAAC,UAAU,EAAE,YAAY,KAAK,SAAS,WAAW,CAAC,IAAI,eAAe,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;gBAClH,CAAC;gBACD,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;oBAClB,IAAA,kBAAU,EAAC,UAAU,EAAE,aAAa,GAAG,kBAAkB,KAAK,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC/E,CAAC;gBAED,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;gBACvB,IAAA,4BAAkB,EAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;gBACrD,QAAQ,CAAC,KAAK,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC;oBAC1C,KAAK,EAAE,KAAK;iBACb,CAAC,CAAA;gBACF,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACvB,CAAC;~~AA5CD~~,~~wCA4CC~~"}
1	+ {"version":3,"file":"transform2Enum.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Enum.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2ExportInterface.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { babelTypes, naslTypes, type ParseNaturalTSState } from '../utils';
+export declare function transform2ExportInterface(statements: babelTypes.Statement[], app: naslTypes.App, parseState: ParseNaturalTSState): naslTypes.Interface | undefined;
+//# sourceMappingURL=transform2ExportInterface.d.ts.map

package/out/natural/transforms/transform2ExportInterface.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"transform2ExportInterface.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2ExportInterface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA0C,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAUnH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,UAAU,CAAC,SAAS,EAAE,EAClC,GAAG,EAAE,SAAS,CAAC,GAAG,EAClB,UAAU,EAAE,mBAAmB,GAC9B,SAAS,CAAC,SAAS,GAAG,SAAS,CA2FjC"}

package/out/natural/transforms/transform2ExportInterface.js ADDED Viewed

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transform2ExportInterface = void 0;
+const utils_1 = require("../utils");
+const parseDecorator_1 = require("./utils/parseDecorator");
+const INTERFACE_DECORATOR_KEYS = new Set(['authLogic', 'method', 'description', 'validation', 'retryConfig', 'params']);
+function extractLastSegment(memberExprCode) {
+    const parts = memberExprCode.split('.');
+    return parts[parts.length - 1];
+}
+function transform2ExportInterface(statements, app, parseState) {
+    let decorator;
+    let exportStatement;
+    for (const stmt of statements) {
+        const dec = (0, utils_1.getDecoratorCall)(stmt, 'Interface');
+        if (dec) {
+            decorator = dec;
+            continue;
+        }
+        if (stmt.type === 'ExportNamedDeclaration' || stmt.type === 'VariableDeclaration') {
+            exportStatement = stmt;
+        }
+    }
+    if (!exportStatement)
+        return;
+    let declaration;
+    if (exportStatement.type === 'ExportNamedDeclaration' && exportStatement.declaration?.type === 'VariableDeclaration') {
+        declaration = exportStatement.declaration;
+    }
+    else if (exportStatement.type === 'VariableDeclaration') {
+        declaration = exportStatement;
+    }
+    if (!declaration)
+        return;
+    const declarator = declaration.declarations[0];
+    if (!declarator)
+        return;
+    const name = declarator.id.name;
+    parseState.nodeName = name;
+    let originLogicName = name;
+    if (declarator.init?.type === 'MemberExpression') {
+        originLogicName = (0, utils_1.generate)(declarator.init).code.split('.').pop() || name;
+    }
+    let authLogicName;
+    let method = 'POST';
+    let description = '';
+    let paramsMap = {};
+    if (decorator?.arguments[0]?.type === 'ObjectExpression') {
+        const metadata = (0, parseDecorator_1.pickDecoratorObject)(decorator.arguments[0], INTERFACE_DECORATOR_KEYS, {}, parseState);
+        if (metadata.authLogic)
+            authLogicName = extractLastSegment(metadata.authLogic);
+        if (metadata.method)
+            method = metadata.method;
+        if (metadata.description)
+            description = metadata.description;
+        if (metadata.params)
+            paramsMap = metadata.params;
+    }
+    const interfaceParams = [];
+    const associatedLogic = app.logics?.find((l) => l.name === originLogicName);
+    if (associatedLogic?.params) {
+        associatedLogic.params.forEach((logicParam) => {
+            const position = paramsMap[logicParam.name] || 'body';
+            interfaceParams.push(new utils_1.naslTypes.InterfaceParam({
+                name: logicParam.name,
+                in: position,
+                required: !!logicParam.required,
+                typeAnnotation: logicParam.typeAnnotation,
+            }));
+        });
+    }
+    const path = `/rest/${originLogicName}`;
+    const baseProps = {
+        name,
+        method,
+        path,
+        description,
+        originLogicName,
+        params: interfaceParams,
+    };
+    if (authLogicName) {
+        return utils_1.naslTypes.AuthInterface.from({
+            ...baseProps,
+            concept: 'AuthInterface',
+            authLogic: authLogicName,
+        });
+    }
+    else {
+        return utils_1.naslTypes.Interface.from({
+            ...baseProps,
+            concept: 'Interface',
+        });
+    }
+}
+exports.transform2ExportInterface = transform2ExportInterface;
+//# sourceMappingURL=transform2ExportInterface.js.map

package/out/natural/transforms/transform2ExportInterface.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"transform2ExportInterface.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2ExportInterface.ts"],"names":[],"mappings":";;;AAAA,oCAAmH;AACnH,2DAA6D;AAE7D,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;AAExH,SAAS,kBAAkB,CAAC,cAAsB;IAChD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC;AAED,SAAgB,yBAAyB,CACvC,UAAkC,EAClC,GAAkB,EAClB,UAA+B;IAE/B,IAAI,SAAgD,CAAC;IACrD,IAAI,eAAiD,CAAC;IAEtD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,IAAA,wBAAgB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAChD,IAAI,GAAG,EAAE,CAAC;YACR,SAAS,GAAG,GAAG,CAAC;YAChB,SAAS;QACX,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAClF,eAAe,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IAED,IAAI,CAAC,eAAe;QAAE,OAAO;IAE7B,IAAI,WAAuD,CAAC;IAC5D,IAAI,eAAe,CAAC,IAAI,KAAK,wBAAwB,IAAI,eAAe,CAAC,WAAW,EAAE,IAAI,KAAK,qBAAqB,EAAE,CAAC;QACrH,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;IAC5C,CAAC;SAAM,IAAI,eAAe,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;QAC1D,WAAW,GAAG,eAAe,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,WAAW;QAAE,OAAO;IAEzB,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,MAAM,IAAI,GAAI,UAAU,CAAC,EAA4B,CAAC,IAAI,CAAC;IAC3D,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;IAE3B,IAAI,eAAe,GAAG,IAAI,CAAC;IAC3B,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACjD,eAAe,GAAG,IAAA,gBAAQ,EAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC;IAC5E,CAAC;IAED,IAAI,aAAiC,CAAC;IACtC,IAAI,MAAM,GAAG,MAAM,CAAC;IACpB,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,SAAS,GAA2B,EAAE,CAAC;IAE3C,IAAI,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAA,oCAAmB,EAClC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,wBAAwB,EACxB,EAAE,EACF,UAAU,CACX,CAAC;QACF,IAAI,QAAQ,CAAC,SAAS;YAAE,aAAa,GAAG,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC/E,IAAI,QAAQ,CAAC,MAAM;YAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9C,IAAI,QAAQ,CAAC,WAAW;YAAE,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC7D,IAAI,QAAQ,CAAC,MAAM;YAAE,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC;IACnD,CAAC;IAED,MAAM,eAAe,GAA+B,EAAE,CAAC;IACvD,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;IAC5E,IAAI,eAAe,EAAE,MAAM,EAAE,CAAC;QAC5B,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC;YACtD,eAAe,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,cAAc,CAAC;gBAChD,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,EAAE,EAAE,QAAuC;gBAC3C,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ;gBAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;aAC1C,CAAC,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,eAAe,EAAE,CAAC;IAExC,MAAM,SAAS,GAAG;QAChB,IAAI;QACJ,MAAM;QACN,IAAI;QACJ,WAAW;QACX,eAAe;QACf,MAAM,EAAE,eAAe;KACxB,CAAC;IAEF,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,iBAAS,CAAC,aAAa,CAAC,IAAI,CAAC;YAClC,GAAG,SAAS;YACZ,OAAO,EAAE,eAAe;YACxB,SAAS,EAAE,aAAa;SACzB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,OAAO,iBAAS,CAAC,SAAS,CAAC,IAAI,CAAC;YAC9B,GAAG,SAAS;YACZ,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AA/FD,8DA+FC"}

package/out/natural/transforms/transform2Logic.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Logic.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA+C,KAAK,eAAe,EAAuB,MAAM,UAAU,CAAC;~~AAazI~~,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,gBAAgB,EAAE,MAAM,EACxB,sBAAsB,EAAE,UAAU,CAAC,WAAW,EAC9C,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,~~CA4HjB~~;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,EACxE,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAiBjB;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,GAAG,UAAU,CAAC,mBAAmB,EACzG,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAMjB"}
1	+ {"version":3,"file":"transform2Logic.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAA+C,KAAK,eAAe,EAAuB,MAAM,UAAU,CAAC;AAYzI,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,UAAU,CAAC,mBAAmB,EACpC,gBAAgB,EAAE,MAAM,EACxB,sBAAsB,EAAE,UAAU,CAAC,WAAW,EAC9C,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAkGjB;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,EACxE,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAiBjB;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,UAAU,CAAC,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,GAAG,UAAU,CAAC,mBAAmB,EACzG,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC,KAAK,CAMjB"}

package/out/natural/transforms/transform2Logic.js CHANGED Viewed

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform2Logic = exports.transformFunctionExpression2Logic = exports.transformFunctionDeclaration2Logic = void 0;
 const utils_1 = require("../utils");
-const transform2LogicItem_1 = require("./transform2LogicItem");
 const transform2Param_1 = require("./transform2Param");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
 const parseDecorator_1 = require("./utils/parseDecorator");
-const flattenStatementsWithComments_1 = require("./utils/flattenStatementsWithComments");
+const parseLogicBody_1 = require("./utils/parseLogicBody");
 function getLogicType(options) {
     if (options?.nodeNamespace?.includes('app.logics'))
         return 'global_logic';
@@ -29,7 +28,6 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
         statements = statements.filter((stat) => stat.start > currentPositionComment.start);
     }
     logic.description = (0, utils_1.fetchFromComments)(func.leadingComments);
-    statements = (0, flattenStatementsWithComments_1.flattenStatementsWithComments)(statements, { nodeBeforeTrailing: true });
     if (parameters?.length === 1 && parameters?.[0]?.type === 'ObjectPattern') {
         // interface 特殊处理
         const properties = parameters?.[0]?.typeAnnotation?.typeAnnotation?.members;
@@ -42,31 +40,9 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
         param = (0, transform2Param_1.transform2Param)(node, { ...options, transformType: 'attr' }, undefined, true) || undefined;
         param && logic.params.push(param);
     });
-    let returnDecorator;
-    statements.forEach((node, index) => {
-        // 跳过 $Variable 装饰器调用语句
-        if ((0, utils_1.getDecoratorCall)(node, 'Variable')) {
-            return;
-        }
-        // 跳过 $Return 装饰器调用语句，同时记录（位置无关，函数级别注解）
-        const returnDecoratorCall = (0, utils_1.getDecoratorCall)(node, 'Return');
-        if (returnDecoratorCall) {
-            returnDecorator = returnDecoratorCall;
-            return;
-        }
-        // 检查当前节点是否是 VariableDeclaration，如果是，检查前一个语句是否是 $Variable 装饰器调用
-        let variableDecorator;
-        if (node.type === 'VariableDeclaration') {
-            variableDecorator = (0, utils_1.getDecoratorCall)(statements[index - 1], 'Variable');
-        }
-        const item = (0, transform2LogicItem_1.transform2LogicItem)(node, {
-            ...options,
-            transformType: 'logic',
-            logic,
-            logicType: options?.logicType || getLogicType(options),
-            decorator: variableDecorator,
-        });
-        item && logic.body.push(item);
+    const { returnDecorator } = (0, parseLogicBody_1.parseLogicBody)(statements, logic, {
+        ...options,
+        logicType: options?.logicType || getLogicType(options),
     });
     const lastItem = logic.body[logic.body.length - 1];
     if (lastItem && lastItem.concept !== 'End') {

package/out/natural/transforms/transform2Logic.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2Logic.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":";;;AAAA,oCAAyI;AACzI~~,+DAA4D;AAC5D~~,uDAAoD;AACpD,yEAAsE;AACtE,2DAAsH;AACtH,~~yFAAsF~~;~~AAEtF~~,SAAS,YAAY,CAAC,OAAyC;IAC7D,IAAI,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC;QAAE,OAAO,cAAc,CAAC;IAC1E,IAAI,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,YAAY,CAAC;IACpE,IAAK,OAA0B,EAAE,SAAS;QAAE,OAAO,aAAa,CAAC;AACnE,CAAC;AAED,SAAgB,kCAAkC,CAChD,IAAoC,EACpC,gBAAwB,EACxB,sBAA8C,EAC9C,SAAgD,EAChD,OAAwB;IAExB,MAAM,KAAK,GAAG,IAAI,iBAAS,CAAC,KAAK,EAAE,CAAC;IACpC,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,gBAAgB,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;IAClE,KAAK,CAAC,IAAI,GAAG;QACX,IAAI,iBAAS,CAAC,KAAK,EAAE;KACtB,CAAC;IAEF,IAAI,UAAU,GAA6D,EAAE,CAAC;IAC9E,IAAI,UAAU,GAA2B,EAAE,CAAC;IAE5C,UAAU,GAAG,IAAI,CAAC,MAAkE,CAAC;IACrF,UAAU,GAAG,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,UAAU,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAQ,CAAC;IAEjF,IAAI,sBAAsB,EAAE,CAAC;QAC3B,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACtF,CAAC;IACD,KAAK,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5D,~~UAAU,GAAG,IAAA,6DAA6B,EAAC,UAAU,EAAE,EAAE,kBAAkB,EAAE,~~IAAI,~~EAAE,CAAC,CAAC;IAErF,IAAI,~~UAAU,EAAE,MAAM,KAAK,CAAC,IAAK,UAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,eAAe,EAAE,CAAC;QACnF,iBAAiB;QACjB,MAAM,UAAU,GAAI,UAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,CAAC;QACrF,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;YACvB,UAAU,GAAG,UAAU,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1B,IAAI,KAAkC,CAAC;QACvC,KAAK,GAAG,IAAA,iCAAe,EAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC;QACnG,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,~~IAAI,eAAsD,CAAC;IAC3D,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACjC,uBAAuB;QACvB,IAAI,IAAA,wBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QACD,uCAAuC;QACvC,~~MAAM,~~mBAAmB,GAAG,IAAA,wBAAgB,EAAC,IAAI,~~EAAE,~~QAAQ,CAAC,CAAC;QAC7D,IAAI,mBAAmB,EAAE,CAAC;YACxB,~~eAAe,~~GAAG,mBAAmB,CAAC;YACtC,OAAO;QACT,CAAC;QAED,+DAA+D;QAC/D,IAAI,iBAAwD,CAAC;QAC7D,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,~~EAAE,~~CAAC;YACxC,iBAAiB,~~GAAG,IAAA,~~wBAAgB,~~EAAC,UAAU,~~CAAC~~,KAAK,~~GAAG,CAAC,CAAC,~~EAAE~~,UAAU,CAAC,CAAC~~;~~QAC1E~~,~~CAAC;QAED,MAAM,IAAI,~~GAAG,~~IAAA,yCAAmB,EAAC,IAAI,EAAE;YACrC,GAAG,~~OAAO;~~YACV~~,~~aAAa,EAAE,OAAO;YACtB,KAAK;YACL,~~SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC;~~YACtD~~,~~SAAS,EAAE,iBAAiB;SAC7B,~~CAAC,CAAC;~~QACH,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;~~IAEH,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnD,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/F,IAAI,KAAK,IAAI,CAAC;YACZ,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC;YACxD,MAAM,cAAc,GAAG,IAAA,mDAAwB,EAAE,IAAI,CAAC,UAA0C,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;YAC1H,IAAI,cAAc;gBAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,cAAc,CAAA;QACtE,CAAC;QACD,IAAI,eAAe,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACjF,MAAM,cAAc,GAAG,IAAA,oCAAmB,EACxC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAC5B,iCAAgB,CAAC,WAAW,EAC5B,iCAAgB,CAAC,QAAQ,IAAI,EAAE,EAC/B,OAAO,CACR,CAAC;YACF,IAAI,cAAc,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC1C,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,UAAU,EAAE,CAAC;QAChD,MAAM,cAAc,GAAI,IAAI,CAAC,UAA0C,EAAE,cAAc,CAAC;QACxF,IAAI,cAAc,EAAE,IAAI,KAAK,eAAe,EAAE,CAAC;YAC7C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,MAAM,CAAC;gBACtC,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,IAAA,mDAAwB,EAAC,cAAc,EAAE,OAAO,CAAC,IAAI,SAAS;aAC/E,CAAC,CAAC,CAAC;QACN,CAAC;IACH,CAAC;IAED,gBAAgB;IAChB,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACrE,0BAA0B;QAC1B,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,KAAK,YAAY,IAAI,OAAO,CAAC,SAAS,KAAK,aAAa,CAAC;QAC9F,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC,qCAAoB,CAAC,CAAC,CAAC,gCAAe,CAAC;QAE7E,MAAM,aAAa,GAAG,IAAA,oCAAmB,EACvC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,eAAe,CAAC,WAAW,EAC3B,eAAe,CAAC,QAAQ,IAAI,EAAE,EAC9B,OAAO,CACR,CAAC;QAEF,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;YAC9B,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAChD,CAAC;QACD,IAAI,aAAa,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAC9C,KAAK,CAAC,aAAa,GAAG,IAAI,iBAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACzC,KAAa,CAAC,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC;QAC1D,CAAC;QACD,IAAI,aAAa,CAAC,iBAAiB,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,aAAa,CAAC,iBAAiB,CAAC;QACjE,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;~~AAlID~~,~~gFAkIC~~;AAED,SAAgB,iCAAiC,CAC/C,IAAwE,EACxE,gBAAwB,EACxB,SAAgD,EAChD,OAAwB;IAExB,IAAI,IAAI,GAAG,gBAAgB,IAAI,SAAS,IAAA,cAAM,GAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IAC/D,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QACvC,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,IAAI,IAAI,IAAI,CAAC;IAC/B,CAAC;IAED,OAAO,kCAAkC,CAAC;QACxC,IAAI,EAAE,qBAAqB;QAC3B,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,KAAK;QACZ,EAAE,EAAE;YACF,IAAI,EAAE,YAAY;YAClB,IAAI;SACL;QACD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,IAAI,EAAE,IAAI,CAAC,IAAiC;KAC7C,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAtBD,8EAsBC;AAED,SAAgB,eAAe,CAC7B,IAAyG,EACzG,gBAAwB,EACxB,SAAgD,EAChD,OAAwB;IAExB,IAAI,IAAI,CAAC,IAAI,KAAK,yBAAyB,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAClF,OAAO,iCAAiC,CAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;SAAM,CAAC;QACN,OAAO,kCAAkC,CAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACnG,CAAC;AACH,CAAC;AAXD,0CAWC"}
1	+ {"version":3,"file":"transform2Logic.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2LogicItem.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { babelTypes, naslTypes, type ParseNaturalTSState } from '../utils';
 export interface LogicTransformOptions {
     transformType: 'logic';
     logicType: 'global_logic' | 'view_logic' | 'event_logic';
-    logic: naslTypes.Logic;
+    logic: naslTypes.Logic | naslTypes.OverriddenLogic;
     /**
      * 是否是默认值或属性中的受限表达式
      *
@@ -13,6 +13,10 @@ export interface LogicTransformOptions {
      * 在前端不能使用数据查询组件
      */
     isInFrontend?: boolean;
+    /**
+     * 鉴权逻辑中禁止数据查询
+     */
+    restrictDataQuery?: boolean;
     entityAsNames?: Array<string>;
     typeAnnotation?: naslTypes.TypeAnnotation;
     logicNames?: Array<string>;
@@ -102,6 +106,7 @@ export declare function transform2StringInterpolation(node: babelTypes.TemplateL
 export declare function transform2Comment(node: any, options: TransformOptions): naslTypes.Comment;
 export declare function transform2PartialNewComposite(node: babelTypes.ObjectExpression, options: TransformOptions): naslTypes.NewComposite;
 export declare function transform2NewRegex(node: babelTypes.NewExpression | babelTypes.RegExpLiteral, options: TransformOptions): naslTypes.NewRegex;
+export declare function transform2ExcelField(node: babelTypes.NewExpression, options: TransformOptions): naslTypes.NewStructure;
 export declare function transformNewExpression(node: babelTypes.NewExpression, options: TransformOptions): naslTypes.LogicItemNode;
 export declare function transformMemberExpression(node: babelTypes.MemberExpression | babelTypes.OptionalMemberExpression, options: TransformOptions): naslTypes.CallFunction | naslTypes.QueryFieldExpression | naslTypes.MemberExpression | naslTypes.Identifier | void;
 /**
@@ -130,7 +135,7 @@ export declare function transform2ForEachStatement(node: babelTypes.CallExpressi
 export declare function transformForOf2ForEachStatement(node: babelTypes.ForOfStatement, options: TransformOptions): naslTypes.ForEachStatement;
 export declare function transformForEach2ForEachStatement(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.ForEachStatement;
 export declare function transformAlert2ShowMessage(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
-export declare function transformCall2Interface(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallInterface | void;
+export declare function transformCall2Interface(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallInterface | naslTypes.CallAuthInterface | void;
 export declare function transformCall2Connector(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallConnector | void;
 export declare function transformCall2Extension(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
 export declare function transformCall2CallViewLogic(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;

package/out/natural/transforms/transform2LogicItem.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAmF,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAU5J,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,cAAc,GAAG,YAAY,GAAG,aAAa,CAAC;IACzD,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC;IACvB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC;IAC1C,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAGnD,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACtE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;KAEC;IACD,SAAS,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;CACvC;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC;IAC1C,qBAAqB,CAAC,EAAE,OAAO,mBAAmB,CAAC;IACnD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,qBAAqB,GAAG,oBAAoB,CAAC,GAAG,mBAAmB,CAAC;AAEpG,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,SAAS,CAAC,aAAa,IAAI;IACxF,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;IAClC,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,gBAAgB,KAAK,CAAC,GAAG,IAAI;CACjD,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;IACtG,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,KAAK,SAAS,CAAC,aAAa,GAAG,IAAI;CAC9I,CAAC;AAEF,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAsE;IACxF,OAAO,CAAC,wBAAwB,CAA0C;IAE1E,QAAQ,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAGtI,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC,CAAC;IAItG,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB;CAqCvD;AA4ED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,gBAAgB,EAAE,eAAe,GAAE,OAAe,OA6BlG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAIlF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EACnC,OAAO,EAAE,gBAAgB,EACzB,gBAAgB,CAAC,EAAE,SAAS,CAAC,gBAAgB,EAC7C,SAAS,CAAC,EAAE,MAAM,GACjB,SAAS,CAAC,gBAAgB,CAwC5B;AAcD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAKjG;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAkB7E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAa5F;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQxD;AAED,wBAAgB,yCAAyC,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,0DA+BlK;AA8CD,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,kBAAkB,CAWxI;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,GAAG,UAAU,CAAC,iBAAiB,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAC,kBAAkB,GAAG,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,KAAK,GAAG,IAAI,CAmCtP;AAyBD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,eAAe,EAAE,OAAO,EAAE,gBAAgB,qBAWnG;AA4QD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,WAAW,CAyBhJ;AAED,wBAAgB,kBAAkB,IAAI,SAAS,CAAC,QAAQ,CAEvD;AAED,wBAAgB,eAAe,IAAI,SAAS,CAAC,KAAK,CAEjD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,cAAc,CAO7H;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,UAAU,CAAC,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,KAAK,CA0B3H;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,WAAW,CA+BtM;AAqDD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,uBAAuB,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,iBAAiB,GAAG,IAAI,CASnJ;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,oBAAoB,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,gBAAgB,CA6BxJ;AAED,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,UAAU,CAgBvI;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,cAAc,CAI7H;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,aAAa,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,aAAa,CAI1H;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,aAAa,CAIzH;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,cAAc,CAa7H;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,WAAW,CAEpH;AAED,wBAAgB,wCAAwC,CAAC,IAAI,EAAE,UAAU,CAAC,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,GAAG,CAqC1J;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,mBAAmB,GAAG,SAAS,CAAC,YAAY,CA+BjK;AAQD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAgBzF;AAWD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,YAAY,CA0FlI;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,UAAU,CAAC,aAAa,GAAG,UAAU,CAAC,aAAa,EACzD,OAAO,EAAE,gBAAgB,GACxB,SAAS,CAAC,QAAQ,CAoBpB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,aAAa,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,aAAa,CAiBzH;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,GAAG,UAAU,CAAC,wBAAwB,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAC,UAAU,GAAG,IAAI,CAkIhQ;AAED;;;;;;;;GAQG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,KAAK,GAAG,IAAI,CAgHvL;AAED,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAkC5O;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAanL;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CA6FvL;AAoBD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAW9K;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAkB3K;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAe1K;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAQvK;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAU3K;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,gBAAgB,GAAG,IAAI,CA4K9M;AAkCD,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAC,OAAO,GAAG,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAqB7S;AAID,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,mBAAmB,GAAG,IAAI,CAyElO;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,YAAY,CAU5K;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAoBhL;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CA+CtI;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAmBvL;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAahL;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,aAAa,GAAG,IAAI,CAWjL;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,aAAa,GAAG,IAAI,CAiCjL;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAU7K;AAgBD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAUjL;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAuBxP;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAUjL;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,SAAS,GAAG,IAAI,CAsBnL;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAQpK;AAED,KAAK,2BAA2B,GAAG;IACjC,UAAU,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,GAAG,YAAY,GAAG,YAAY,CAAC;IAC9E,SAAS,EAAE,CAAC,UAAU,CAAC,gBAAgB,EAAE,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,gBAAgB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;CAC7H,GAAG;IACF,UAAU,EAAE,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,aAAa,CAAC;IACpF,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;CACzC,CAAC;AA+XF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,CAAC,SAAS,CAK5F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,UAAU,CAAC,UAAU,GAAG,IAAI,GAAG,SAAS,EAC9C,OAAO,EAAE,gBAAgB,GACxB,SAAS,CAAC,YAAY,CAaxB;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC,aAAa,GAAG,SAAS,CA2GzH"}
1	+ {"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2LogicItem.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformAlert2ShowMessage = exports.transformForEach2ForEachStatement = exports.transformForOf2ForEachStatement = exports.transform2ForEachStatement = exports.transformMap2ListTransform = exports.transform2UIFunction = exports.transformCall2CallFunction = exports.transform2CallFunction = exports.transform2CallOtherNASLLogic = exports.transform2CallEventLogic = exports.transformCall2JSONFunctions = exports.transformCall2Logging = exports.transformCall2ConsoleLog = exports.transformCall2CallDataSourceLogic = exports.transformCall2CallEntityLogic = exports.transformCall2CallViewElementLogic = exports.transformCallFunctionExpression2Match = exports.transformMemberExpression = exports.transformNewExpression = exports.transform2NewRegex = exports.transform2PartialNewComposite = exports.transform2Comment = exports.transform2StringInterpolation = exports.transformReturnStatement2AssignmentOrEnd = exports.transform2NullLiteral = exports.transform2NumericLiteral = exports.transform2DirectiveLiteral = exports.transform2StringLiteral = exports.transform2BooleanLiteral = exports.transformUpdateExpression2Assignment = exports.transform2Assignment = exports.transform2AnonymousFunction = exports.transformIdentifier = exports.transformSwitchStatement2Match = exports.transform2WhileStatement = exports.transform2Break = exports.transform2Continue = exports.transform2IfStatement = exports.transformArrayExpression = exports.transform2BinaryExpression = exports.transform2VariadicExpression = exports.transformCallExpressionToBinaryExpression = exports.fixLogicNode = exports.flatIfStatementForMatch = exports.flatMatchPatternsExpression = exports.getSelectMembers = exports.unflatMemberExpression = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
-exports.transform2LogicItem = exports.transform2DefaultValue = exports.transformNode2Directory = exports.transformCall2Paginate = exports.transformCall2GetCustomConfig = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = exports.transformCall2Interface = void 0;
+exports.transformForEach2ForEachStatement = exports.transformForOf2ForEachStatement = exports.transform2ForEachStatement = exports.transformMap2ListTransform = exports.transform2UIFunction = exports.transformCall2CallFunction = exports.transform2CallFunction = exports.transform2CallOtherNASLLogic = exports.transform2CallEventLogic = exports.transformCall2JSONFunctions = exports.transformCall2Logging = exports.transformCall2ConsoleLog = exports.transformCall2CallDataSourceLogic = exports.transformCall2CallEntityLogic = exports.transformCall2CallViewElementLogic = exports.transformCallFunctionExpression2Match = exports.transformMemberExpression = exports.transformNewExpression = exports.transform2ExcelField = exports.transform2NewRegex = exports.transform2PartialNewComposite = exports.transform2Comment = exports.transform2StringInterpolation = exports.transformReturnStatement2AssignmentOrEnd = exports.transform2NullLiteral = exports.transform2NumericLiteral = exports.transform2DirectiveLiteral = exports.transform2StringLiteral = exports.transform2BooleanLiteral = exports.transformUpdateExpression2Assignment = exports.transform2Assignment = exports.transform2AnonymousFunction = exports.transformIdentifier = exports.transformSwitchStatement2Match = exports.transform2WhileStatement = exports.transform2Break = exports.transform2Continue = exports.transform2IfStatement = exports.transformArrayExpression = exports.transform2BinaryExpression = exports.transform2VariadicExpression = exports.transformCallExpressionToBinaryExpression = exports.fixLogicNode = exports.flatIfStatementForMatch = exports.flatMatchPatternsExpression = exports.getSelectMembers = exports.unflatMemberExpression = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
+exports.transform2LogicItem = exports.transform2DefaultValue = exports.transformNode2Directory = exports.transformCall2Paginate = exports.transformCall2GetCustomConfig = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = exports.transformCall2Interface = exports.transformAlert2ShowMessage = void 0;
 const utils_1 = require("../utils");
 const misc_1 = require("./utils/misc");
 const flattenStatementsWithComments_1 = require("./utils/flattenStatementsWithComments");
@@ -65,7 +65,7 @@ exports.TransformManager = TransformManager;
 function transformTSCode2SubLogic(node, options) {
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
     const logic = new utils_1.naslTypes.SubLogic();
-    logic.name = options.transformType === 'logic' && options.logic?.getSubLogicUniqueName ? options.logic.getSubLogicUniqueName() : `subLogic_${(0, utils_1.uuidv4)().slice(0, 2)}`;
+    logic.name = options.transformType === 'logic' && 'getSubLogicUniqueName' in (options.logic ?? {}) && options.logic?.getSubLogicUniqueName ? options.logic.getSubLogicUniqueName() : `subLogic_${(0, utils_1.uuidv4)().slice(0, 2)}`;
     logic.body = logic.body.slice(0, 1);
     let parameters = [];
     let statements = [];
@@ -1145,6 +1145,27 @@ function transform2NewRegex(node, options) {
     });
 }
 exports.transform2NewRegex = transform2NewRegex;
+function transform2ExcelField(node, options) {
+    const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
+    const objExpr = node.arguments[0];
+    const properties = (objExpr?.properties || []).map((prop) => {
+        const propName = prop.key?.name ?? prop.key?.value;
+        const propValue = prop.value;
+        if (propName === 'format' && (propValue.type === 'ArrowFunctionExpression' || propValue.type === 'FunctionExpression')) {
+            const firstParam = propValue.params?.[0];
+            if (!firstParam || !firstParam.typeAnnotation) {
+                return (0, utils_1.throwError)(options, 'nasl.io.ExcelField 的 format 函数参数必须声明类型，例如：(item: app.dataSources.defaultDS.entities.MyEntity) => ...', propValue);
+            }
+        }
+        const expression = transformNodeFunction(propValue, options);
+        return new utils_1.naslTypes.StructureProperty({
+            name: propName,
+            defaultValue: new utils_1.naslTypes.DefaultValue({ expression }),
+        });
+    });
+    return new utils_1.naslTypes.NewStructure({ properties });
+}
+exports.transform2ExcelField = transform2ExcelField;
 function transformNewExpression(node, options) {
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
     const calleeName = (0, utils_1.generate)(node.callee).code;
@@ -1157,6 +1178,9 @@ function transformNewExpression(node, options) {
     else if (calleeName === 'RegExp') {
         return transform2NewRegex(node, options);
     }
+    else if (calleeName === 'nasl.io.ExcelField') {
+        return transform2ExcelField(node, options);
+    }
     else if (calleeName.includes('.entities.') || calleeName.includes('.structures.')) {
         if (options?.inCallQueryComponentField) {
             return (0, utils_1.throwError)(options, `数据查询中不支持使用 new ${calleeName}，请将对应操作放在数据查询外部进行处理`, node);
@@ -1572,6 +1596,8 @@ function transformCall2OQLQuery(node, calleeName, callee, options) {
         return (0, utils_1.throwError)(options, 'OQL组件不支持在前端使用', node);
     if (options?.isRestricted)
         return (0, utils_1.throwError)(options, 'OQL组件不支持在组件或默认值表达式中使用', node);
+    if (options?.restrictDataQuery)
+        return (0, utils_1.throwError)(options, '鉴权逻辑中不支持使用数据查询', node);
     if (options.transformType === 'logic' && options?.logicType === 'global_logic') {
         // const _typeAnnotation = node?.typeParameters?.params?.length > 0 ? naslTypes.TypeAnnotation.createGeneric('List', {
         //   typeArguments: node?.typeParameters?.params.map((curType: any) => transform2TypeAnnotation({ ...curType })),
@@ -1671,13 +1697,16 @@ function transform2CallFunction(node, calleeName, argument, options) {
             keyword: func && func?.params[index]?.name || `param${index + 1}`,
         });
     });
-    let newTypeArguments = node?.typeParameters?.params.map((curType) => (0, transform2TypeAnnotation_1.transform2TypeAnnotation)({ ...curType }, options)).filter(Boolean);
+    let newTypeArguments = node?.typeParameters?.params?.map((curType) => (0, transform2TypeAnnotation_1.transform2TypeAnnotation)({ ...curType }, options)).filter(Boolean);
     // 补齐场景下补充类型参数
     if (options?.source !== 'creator' && calleeName === 'ListRepeat') {
         newTypeArguments = [
             new utils_1.naslTypes.TypeAnnotation()
         ];
     }
+    else if (options?.source === 'creator' && calleeName === 'ListRepeat' && !newTypeArguments?.length) {
+        return (0, utils_1.throwError)(options, 'ListRepeat 必须指定类型参数。函数签名: ListRepeat<T>(item: T, length: Integer): List<T>', node);
+    }
     if (calleeName === 'Convert' && !newTypeArguments) {
         newTypeArguments = [
             new utils_1.naslTypes.TypeAnnotation()
@@ -2078,13 +2107,33 @@ exports.transformAlert2ShowMessage = transformAlert2ShowMessage;
 function transformCall2Interface(node, calleeName, callee, options) {
     if (options?.isRestricted)
         return (0, utils_1.throwError)(options, '调用接口不支持在组件或默认值表达式中使用', node);
+    const calleeNamespace = (0, utils_1.generate)(node.callee.object).code;
+    const interfaceName = callee[callee.length - 1].name;
+    const firstArg = node.arguments[0];
+    const interfaceArguments = firstArg?.properties?.map((item) => new utils_1.naslTypes.Argument({
+        keyword: item?.key?.name?.replace('_r_', '-'),
+        expression: fixExpression(item?.value, options),
+    })) || [];
+    const secondArg = node.arguments[1];
+    if (secondArg?.type === 'CallExpression') {
+        const authCalleeName = (0, utils_1.generate)(secondArg.callee).code;
+        if (authCalleeName.includes('authLogicsForCallInterface')) {
+            const authArguments = secondArg.arguments[0]?.properties?.map((item) => new utils_1.naslTypes.Argument({
+                keyword: item?.key?.name,
+                expression: fixExpression(item?.value, options),
+            })) || [];
+            return new utils_1.naslTypes.CallAuthInterface({
+                calleeNamespace,
+                calleeName: interfaceName,
+                arguments: interfaceArguments,
+                authArguments,
+            });
+        }
+    }
     return new utils_1.naslTypes.CallInterface({
-        calleeNamespace: (0, utils_1.generate)(node.callee.object).code,
-        calleeName: callee[callee.length - 1].name,
-        arguments: node?.arguments?.map((arg) => arg?.properties?.map((item) => new utils_1.naslTypes.Argument({
-            keyword: item?.key?.name?.replace('_r_', '-'),
-            expression: fixExpression(item?.value, options),
-        })) || []).flat() || [],
+        calleeNamespace,
+        calleeName: interfaceName,
+        arguments: interfaceArguments,
     });
 }
 exports.transformCall2Interface = transformCall2Interface;
@@ -2323,6 +2372,8 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
         return (0, utils_1.throwError)(options, '数据查询组件不支持在前端使用', node);
     if (options?.isRestricted)
         return (0, utils_1.throwError)(options, '数据查询组件不支持在组件或默认值表达式中使用', node);
+    if (options?.restrictDataQuery)
+        return (0, utils_1.throwError)(options, '鉴权逻辑中不支持使用数据查询', node);
     if (options?.inCallQueryComponentField)
         return (0, utils_1.throwError)(options, '数据查询组件不支持嵌套使用，请将内层数据查询提取为独立的逻辑变量，再在外层查询中引用', node);
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;