@lcap/nasl 4.4.0-beta.31 → 4.4.0-beta.33

package/out/natural/transforms/checker/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addLint = exports.checkValidationCalleeName = exports.checkDataQueryCalleeNameOrder = exports.checkLcapEntity = exports.checkDefaultValue = exports.validateParentConstraints = exports.validateComponentFeature = exports.checkViewElement = void 0;
+exports.addLint = exports.checkIdentifierName = exports.checkValidationCalleeName = exports.checkDataQueryCalleeNameOrder = exports.checkLcapEntity = exports.checkDefaultValue = exports.validateParentConstraints = exports.validateComponentFeature = exports.checkViewElement = void 0;
 // 统一导出所有校验相关的函数
 var checkViewElement_1 = require("./checkViewElement");
 Object.defineProperty(exports, "checkViewElement", { enumerable: true, get: function () { return checkViewElement_1.checkViewElement; } });
@@ -14,6 +14,8 @@ var checkDataQueryCalleeNameOrder_1 = require("./checkDataQueryCalleeNameOrder")
 Object.defineProperty(exports, "checkDataQueryCalleeNameOrder", { enumerable: true, get: function () { return checkDataQueryCalleeNameOrder_1.checkDataQueryCalleeNameOrder; } });
 var checkValidationCalleeName_1 = require("./checkValidationCalleeName");
 Object.defineProperty(exports, "checkValidationCalleeName", { enumerable: true, get: function () { return checkValidationCalleeName_1.checkValidationCalleeName; } });
+var checkIdentifierName_1 = require("./checkIdentifierName");
+Object.defineProperty(exports, "checkIdentifierName", { enumerable: true, get: function () { return checkIdentifierName_1.checkIdentifierName; } });
 /**
  * 在 strictForTraining 模式下执行 lint 检查逻辑
  * 当 options.strictForTraining 为 true 时，执行传入的检查函数

package/out/natural/transforms/checker/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/natural/transforms/checker/index.ts"],"names":[],"mappings":";;;AAEA,gBAAgB;AAChB,uDAI4B;AAH1B,oHAAA,gBAAgB,OAAA;AAChB,4HAAA,wBAAwB,OAAA;AACxB,6HAAA,yBAAyB,OAAA;AAE3B,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,iFAAgF;AAAvE,8IAAA,6BAA6B,OAAA;AACtC,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAMlC;;;;;;GAMG;AACH,SAAgB,OAAO,CACrB,OAAU,EACV,IAAc,EACd,MAAgC;IAEhC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;AACH,CAAC;AARD,0BAQC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/natural/transforms/checker/index.ts"],"names":[],"mappings":";;;AAEA,gBAAgB;AAChB,uDAI4B;AAH1B,oHAAA,gBAAgB,OAAA;AAChB,4HAAA,wBAAwB,OAAA;AACxB,6HAAA,yBAAyB,OAAA;AAE3B,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,iFAAgF;AAAvE,8IAAA,6BAA6B,OAAA;AACtC,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAClC,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAM5B;;;;;;GAMG;AACH,SAAgB,OAAO,CACrB,OAAU,EACV,IAAc,EACd,MAAgC;IAEhC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;AACH,CAAC;AARD,0BAQC"}

package/out/natural/transforms/transform2Config.d.ts

@@ -0,0 +1,17 @@
+import { babelTypes, naslTypes, type ParseNaturalTSState } from '../utils';
+/**
+ * 处理 app.configuration.groups.{groupName} 命名空间中的一条语句，
+ * 将配置属性解析并挂载到 app.configuration 对应的 ConfigGroup 上。
+ *
+ * 在 parseNaturalTS 的命名空间路由中调用，对应：
+ *   $ConfigProperty({ description, encryptFlag, isPrivate });
+ *   export const ceshi = { dev, online };
+ *
+ * @param app           - 当前正在构建的 App 实例
+ * @param statement     - 当前语句
+ * @param prevStatement - 前一条语句，用于提取 $ConfigProperty 装饰器
+ * @param groupName     - 配置组名称，如 'custom'
+ * @param parseState    - 解析状态，用于错误上下文
+ */
+export declare function transform2Config(app: naslTypes.App, statement: babelTypes.Statement, prevStatement: babelTypes.Statement | undefined, groupName: string, parseState: ParseNaturalTSState): void;
+//# sourceMappingURL=transform2Config.d.ts.map

package/out/natural/transforms/transform2Config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform2Config.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIT,KAAK,mBAAmB,EACzB,MAAM,UAAU,CAAC;AAiGlB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,SAAS,CAAC,GAAG,EAClB,SAAS,EAAE,UAAU,CAAC,SAAS,EAC/B,aAAa,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS,EAC/C,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,mBAAmB,GAC9B,IAAI,CAqBN"}

package/out/natural/transforms/transform2Config.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transform2Config = void 0;
+const utils_1 = require("../utils");
+const parseDecorator_1 = require("./utils/parseDecorator");
+const CONFIG_PROPERTY_DECORATOR_KEYS = new Set(['description', 'isPrivate', 'encryptFlag']);
+/**
+ * 将 VariableDeclaration + 可选的 $ConfigProperty 装饰器转换为 ConfigProperty。
+ *
+ * @param statement  - `export const name = { env: value, ... }` 形式的 VariableDeclaration
+ * @param decorator  - 前一条语句若为 `$ConfigProperty({...})` 则传入其 CallExpression，否则为 undefined
+ * @param parseState - 解析状态，用于错误上下文
+ */
+function transform2ConfigProperty(statement, decorator, parseState) {
+    if (statement.declarations.length !== 1) {
+        return (0, utils_1.throwError)(parseState, '$ConfigProperty 对应的变量声明只能有一个声明符', statement);
+    }
+    const declarator = statement.declarations[0];
+    if (declarator.id.type !== 'Identifier') {
+        return (0, utils_1.throwError)(parseState, '$ConfigProperty 对应的变量名必须是普通标识符', declarator.id);
+    }
+    const name = declarator.id.name;
+    let description;
+    let isPrivate = false;
+    let decoratorsStr = JSON.stringify({
+        priorityStrategy: 'local',
+        encryptFlag: false,
+    });
+    if (decorator && decorator.arguments[0]?.type === 'ObjectExpression') {
+        const meta = (0, parseDecorator_1.pickDecoratorObject)(decorator.arguments[0], CONFIG_PROPERTY_DECORATOR_KEYS, {}, parseState);
+        if (meta.description !== undefined) {
+            description = String(meta.description);
+        }
+        isPrivate = !!meta.isPrivate;
+        decoratorsStr = JSON.stringify({ priorityStrategy: 'local', encryptFlag: !!meta.encryptFlag });
+    }
+    const values = [];
+    if (declarator.init && declarator.init.type === 'ObjectExpression') {
+        const objExpr = declarator.init;
+        objExpr.properties.forEach((prop) => {
+            if (prop.type !== 'ObjectProperty')
+                return;
+            if (prop.key.type !== 'Identifier' && prop.key.type !== 'StringLiteral')
+                return;
+            const env = prop.key.type === 'Identifier'
+                ? prop.key.name
+                : prop.key.value;
+            let value;
+            if (prop.value.type === 'StringLiteral') {
+                value = prop.value.value;
+            }
+            else if (prop.value.type === 'NumericLiteral') {
+                value = String(prop.value.value);
+            }
+            else if (prop.value.type === 'BooleanLiteral') {
+                value = String(prop.value.value);
+            }
+            else if (prop.value.type === 'NullLiteral') {
+                value = '';
+            }
+            else {
+                value = (0, utils_1.generate)(prop.value).code;
+            }
+            values.push(new utils_1.naslTypes.ConfigPropertyValue({ env, value }));
+        });
+    }
+    return new utils_1.naslTypes.ConfigProperty({
+        name,
+        description,
+        isPrivate,
+        decorators: decoratorsStr,
+        values,
+    });
+}
+/**
+ * 处理 app.configuration.groups.{groupName} 命名空间中的一条语句，
+ * 将配置属性解析并挂载到 app.configuration 对应的 ConfigGroup 上。
+ *
+ * 在 parseNaturalTS 的命名空间路由中调用，对应：
+ *   $ConfigProperty({ description, encryptFlag, isPrivate });
+ *   export const ceshi = { dev, online };
+ *
+ * @param app           - 当前正在构建的 App 实例
+ * @param statement     - 当前语句
+ * @param prevStatement - 前一条语句，用于提取 $ConfigProperty 装饰器
+ * @param groupName     - 配置组名称，如 'custom'
+ * @param parseState    - 解析状态，用于错误上下文
+ */
+function transform2Config(app, statement, prevStatement, groupName, parseState) {
+    if (statement.type === 'VariableDeclaration') {
+        const decorator = (0, utils_1.getDecoratorCall)(prevStatement, 'ConfigProperty');
+        const configProperty = transform2ConfigProperty(statement, decorator, parseState);
+        if (!app.configuration) {
+            app.configuration = new utils_1.naslTypes.Configuration();
+        }
+        let group = app.configuration.getGroup(groupName);
+        if (!group) {
+            group = app.configuration._addConfigGroup({ name: groupName });
+        }
+        group.properties.push(configProperty);
+    }
+    else if (statement.type === 'ExpressionStatement') {
+        const isDecorator = (0, utils_1.getDecoratorCall)(statement, 'ConfigProperty');
+        if (!isDecorator) {
+            (0, utils_1.throwError)(parseState, '配置命名空间中不支持的表达式', statement.type, statement);
+        }
+        // $ConfigProperty 装饰器本身：跳过，等待下一条 VariableDeclaration 处理
+    }
+    else {
+        (0, utils_1.throwError)(parseState, '配置命名空间中不支持的节点类型', statement.type, statement);
+    }
+}
+exports.transform2Config = transform2Config;
+//# sourceMappingURL=transform2Config.js.map

package/out/natural/transforms/transform2Config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform2Config.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Config.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2GlobalLogicDeclaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform2GlobalLogicDeclaration.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAqB,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAK9F,wBAAgB,gCAAgC,CAC5C,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAClC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,UAAU,EAAE,mBAAmB,GAChC,SAAS,CAAC,KAAK,CAsCjB"}
+{"version":3,"file":"transform2GlobalLogicDeclaration.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAqB,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAK9F,wBAAgB,gCAAgC,CAC5C,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAClC,SAAS,EAAE,UAAU,CAAC,cAAc,GAAG,SAAS,EAChD,UAAU,EAAE,mBAAmB,GAChC,SAAS,CAAC,KAAK,CAyCjB"}

package/out/natural/transforms/transform2GlobalLogicDeclaration.js

@@ -13,7 +13,7 @@ function transform2GlobalLogicDeclaration(node, decorator, parseState) {
         new utils_1.naslTypes.Start(),
         new utils_1.naslTypes.End(),
     ];
-    logic.params = node.params.map((param) => (0, transform2Param_1.transform2Param)(param, { ...parseState, transformType: 'attr' })).filter(Boolean);
+    logic.params = node.params.map((param) => (0, transform2Param_1.transform2Param)(param, { ...parseState, transformType: 'attr' }, undefined, true)).filter(Boolean);
     if (node.returnType && node.returnType.typeAnnotation.type !== 'TSVoidKeyword') {
         logic.returns.push(new utils_1.naslTypes.Return({
             name: 'result',
@@ -32,6 +32,9 @@ function transform2GlobalLogicDeclaration(node, decorator, parseState) {
         if (logicMetadata.directory !== undefined) {
             logic._directoryInfo = logicMetadata.directory;
         }
+        if (logicMetadata.returnDescription && logic.returns[0]) {
+            logic.returns[0].description = logicMetadata.returnDescription;
+        }
     }
     return logic;
 }

package/out/natural/transforms/transform2GlobalLogicDeclaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform2GlobalLogicDeclaration.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":";;;AAAA,oCAA8F;AAC9F,yEAAsE;AACtE,uDAAoD;AACpD,2DAA8E;AAE9E,SAAgB,gCAAgC,CAC5C,IAAkC,EAClC,SAAgD,EAChD,UAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,iBAAS,CAAC,KAAK,EAAE,CAAC;IACpC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAChD,KAAK,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5D,KAAK,CAAC,IAAI,GAAG;QACT,IAAI,iBAAS,CAAC,KAAK,EAAE;QACrB,IAAI,iBAAS,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iCAAe,EAAC,KAA6D,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAsB,CAAC;IACzM,IAAI,IAAI,CAAC,UAAU,IAAK,IAAI,CAAC,UAA0C,CAAC,cAAc,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC9G,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,cAAc,EAAE,IAAA,mDAAwB,EAAE,IAAI,CAAC,UAA0C,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS;SACrI,CAAC,CAAC,CAAC;IACR,CAAC;IAED,gBAAgB;IAChB,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,IAAA,oCAAmB,EACrC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,gCAAe,CAAC,WAAW,EAC3B,gCAAe,CAAC,QAAQ,IAAI,EAAE,EAC9B,UAAU,CACb,CAAC;QAEF,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;YAC5B,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAClD,CAAC;QACD,IAAI,aAAa,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,CAAC,aAAa,GAAG,IAAI,iBAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACvC,KAAa,CAAC,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC;QAC5D,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AA1CD,4EA0CC"}
+{"version":3,"file":"transform2GlobalLogicDeclaration.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2GlobalLogicDeclaration.ts"],"names":[],"mappings":";;;AAAA,oCAA8F;AAC9F,yEAAsE;AACtE,uDAAoD;AACpD,2DAA8E;AAE9E,SAAgB,gCAAgC,CAC5C,IAAkC,EAClC,SAAgD,EAChD,UAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,iBAAS,CAAC,KAAK,EAAE,CAAC;IACpC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;IAChD,KAAK,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5D,KAAK,CAAC,IAAI,GAAG;QACT,IAAI,iBAAS,CAAC,KAAK,EAAE;QACrB,IAAI,iBAAS,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iCAAe,EAAC,KAA6D,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAsB,CAAC;IAC1N,IAAI,IAAI,CAAC,UAAU,IAAK,IAAI,CAAC,UAA0C,CAAC,cAAc,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC9G,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,iBAAS,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,cAAc,EAAE,IAAA,mDAAwB,EAAE,IAAI,CAAC,UAA0C,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,SAAS;SACrI,CAAC,CAAC,CAAC;IACR,CAAC;IAED,gBAAgB;IAChB,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,IAAA,oCAAmB,EACrC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EACtB,gCAAe,CAAC,WAAW,EAC3B,gCAAe,CAAC,QAAQ,IAAI,EAAE,EAC9B,UAAU,CACb,CAAC;QAEF,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;YAC5B,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAClD,CAAC;QACD,IAAI,aAAa,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,CAAC,aAAa,GAAG,IAAI,iBAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACvC,KAAa,CAAC,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC;QAC5D,CAAC;QACD,IAAI,aAAa,CAAC,iBAAiB,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,aAAa,CAAC,iBAAiB,CAAC;QACnE,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AA7CD,4EA6CC"}

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

@@ -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;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,CAmIjB;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"}
+{"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"}

package/out/natural/transforms/transform2Logic.js

@@ -6,6 +6,7 @@ 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");
 function getLogicType(options) {
     if (options?.nodeNamespace?.includes('app.logics'))
         return 'global_logic';
@@ -28,17 +29,7 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
         statements = statements.filter((stat) => stat.start > currentPositionComment.start);
     }
     logic.description = (0, utils_1.fetchFromComments)(func.leadingComments);
-    const newStatements = [];
-    statements.forEach((node, index) => {
-        if (node?.leadingComments?.length) {
-            newStatements.push(...node?.leadingComments);
-        }
-        newStatements.push(node);
-        if (node?.trailingComments?.length && index === statements.length - 1) {
-            newStatements.push(...node?.trailingComments);
-        }
-    });
-    statements = newStatements;
+    statements = (0, flattenStatementsWithComments_1.flattenStatementsWithComments)(statements, { nodeBeforeTrailing: true });
     if (parameters?.length === 1 && parameters?.[0]?.type === 'ObjectPattern') {
         // interface 特殊处理
         const properties = parameters?.[0]?.typeAnnotation?.typeAnnotation?.members;
@@ -48,7 +39,7 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
     }
     parameters.forEach((node) => {
         let param;
-        param = (0, transform2Param_1.transform2Param)(node, { ...options, transformType: 'attr' }) || undefined;
+        param = (0, transform2Param_1.transform2Param)(node, { ...options, transformType: 'attr' }, undefined, true) || undefined;
         param && logic.params.push(param);
     });
     let returnDecorator;
@@ -121,6 +112,9 @@ function transformFunctionDeclaration2Logic(func, contextLogicName, currentPosit
         if (logicMetadata.directory !== undefined) {
             logic._directoryInfo = logicMetadata.directory;
         }
+        if (logicMetadata.returnDescription && logic.returns[0]) {
+            logic.returns[0].description = logicMetadata.returnDescription;
+        }
     }
     return logic;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"transform2Logic.js","sourceRoot":"","sources":["../../../src/natural/transforms/transform2Logic.ts"],"names":[],"mappings":"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"}
+{"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

@@ -135,6 +135,7 @@ export declare function transformCall2Extension(node: babelTypes.CallExpression,
 export declare function transformCall2CallViewLogic(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
 export declare function transformCall2Logic(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | naslTypes.CallFunction | naslTypes.CallFunction | naslTypes.MemberExpression | void;
 export declare function transformCall2LogicWithAuth(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
+export declare function transformCall2GetCustomConfig(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.CallLogic | void;
 export declare function transformCall2Paginate(node: babelTypes.CallExpression, calleeName: string, callee: babelTypes.Node[], options: TransformOptions): naslTypes.Paginate;
 type CallQueryComponentChainNode = {
     calleeName: 'FROM' | 'INNER_JOIN' | 'LEFT_JOIN' | 'RIGHT_JOIN' | 'OUTER_JOIN';

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

@@ -1 +1 @@
-{"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}
+{"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

@@ -4,10 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformCall2Interface = 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.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.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = void 0;
+exports.transform2LogicItem = exports.transform2DefaultValue = exports.transformNode2Directory = exports.transformCall2Paginate = exports.transformCall2GetCustomConfig = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = void 0;
 const utils_1 = require("../utils");
 const misc_1 = require("./utils/misc");
+const flattenStatementsWithComments_1 = require("./utils/flattenStatementsWithComments");
 const checkDataQueryCalleeNameOrder_1 = require("./checker/checkDataQueryCalleeNameOrder");
+const checkIdentifierName_1 = require("./checker/checkIdentifierName");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
 const transform2Param_1 = require("./transform2Param");
 const server_1 = __importDefault(require("../../server"));
@@ -80,23 +82,13 @@ function transformTSCode2SubLogic(node, options) {
         statements = [...node?.body?.directives, ...node?.body?.body];
     }
     parameters.forEach((node) => {
-        const param = (0, transform2Param_1.transform2Param)(node, options);
+        const param = (0, transform2Param_1.transform2Param)(node, options, undefined, true);
         if (param && !param?.typeAnnotation) {
             param.typeAnnotation = null;
         }
         param && logic.addParam(param);
     });
-    const newStatements = [];
-    statements.forEach((node, index) => {
-        if (node?.leadingComments?.length) {
-            newStatements.push(...node?.leadingComments);
-        }
-        if (node?.trailingComments?.length && index === statements.length - 1) {
-            newStatements.push(...node?.trailingComments);
-        }
-        newStatements.push(node);
-    });
-    statements = newStatements;
+    statements = (0, flattenStatementsWithComments_1.flattenStatementsWithComments)(statements);
     const body = statements.map((node) => transformNodeFunction(node, {
         ...options,
         logic,
@@ -592,6 +584,7 @@ function transform2ArrayPattern(decl, options) {
         if (element.type === 'Identifier') {
             const varTypeAnnotation = element.typeAnnotation?.typeAnnotation;
             if (options.transformType === 'logic') {
+                (0, checkIdentifierName_1.checkIdentifierName)(element.name, '变量', options, element);
                 options.logic.variables.push(new utils_1.naslTypes.Variable({
                     name: element.name,
                     typeAnnotation: varTypeAnnotation && (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(varTypeAnnotation, options) || undefined,
@@ -636,6 +629,7 @@ function transform2VariableAndAddAssignment(node, options) {
         }
         let typeAnnotation;
         if (options.transformType === 'logic' && ![...options.logic.variables, ...options.logic.returns].some((variable) => variable.name === variableName)) {
+            (0, checkIdentifierName_1.checkIdentifierName)(variableName, '变量', options, decl.id);
             const varTypeAnnotation = decl.id.typeAnnotation?.typeAnnotation;
             typeAnnotation = varTypeAnnotation && (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(varTypeAnnotation, options) || undefined;
             const variable = new utils_1.naslTypes.Variable({
@@ -680,15 +674,7 @@ function flatCommentWithNode(node) {
         newNodeList = [...node?.innerComments];
     }
     if (node?.body?.length) {
-        node?.body.forEach((item, index) => {
-            if (item?.leadingComments?.length) {
-                newNodeList.push(...item?.leadingComments);
-            }
-            if (item?.trailingComments?.length && index === node?.body.length - 1) {
-                newNodeList.push(...item?.trailingComments);
-            }
-            newNodeList.push(item);
-        });
+        newNodeList.push(...(0, flattenStatementsWithComments_1.flattenStatementsWithComments)(node.body));
     }
     return newNodeList;
 }
@@ -1005,16 +991,24 @@ function transform2StringInterpolation(node, options) {
     });
 }
 exports.transform2StringInterpolation = transform2StringInterpolation;
+function transformRequire2JSBlock(node, calleeName, callee, options) {
+    const arg0 = node.arguments[0].value;
+    const filename = arg0.replace('./tmp/', '');
+    return new utils_1.naslTypes.JSBlock({ code: options.externalFiles?.get(filename) ?? '' });
+}
 function transform2Comment(node, options) {
     if (node.type === 'EmptyStatement') {
         if (node?.leadingComments) {
-            const newValue = node?.leadingComments?.[0]?.value?.replace(/\n/g, '<br>');
+            // trim() 防止 Babel 解析 /* ... */ 时将内侧空格存入 value，
+            // 导致每次 files2nasl → nasl2files 轮回后注释空格累积 +1
+            const newValue = node?.leadingComments?.[0]?.value?.trim().replace(/\n/g, '<br>');
             return new utils_1.naslTypes.Comment({
                 value: String(newValue),
             });
         }
     }
-    const newValue = node?.value?.replace(/\n/g, '<br>');
+    // trim() 同上，防止空格在每次 prepare-src 轮回中递增
+    const newValue = node?.value?.trim().replace(/\n/g, '<br>');
     return new utils_1.naslTypes.Comment({
         value: String(newValue || ''),
     });
@@ -1258,6 +1252,14 @@ function transformMemberExpression(node, options) {
             return newNode;
         }
     }
+    const configPropertyRegex = /^(app|extensions\.\w+)\.configuration\.(?:groups\.)?(\w+)\.(?:properties\.)?(\w+)$/;
+    if (configPropertyRegex.test(calleeName)) {
+        const [, prefix, groupName, propName] = calleeName.match(configPropertyRegex);
+        return new utils_1.naslTypes.Identifier({
+            namespace: `${prefix}.configuration.groups.${groupName}.properties`,
+            name: propName,
+        });
+    }
     if (node.property.type === 'NumericLiteral' || node?.property?.type === 'BinaryExpression') {
         return new utils_1.naslTypes.CallFunction({
             calleeNamespace: 'nasl.util',
@@ -1470,6 +1472,7 @@ function transformCall2CallDataSourceLogic(node, calleeName, callee, options) {
             if (newArguments?.[0])
                 newArguments[0].keyword = 'body';
             if (newArguments?.[1]) {
+                newArguments[1].keyword = 'properties';
                 if (newArguments[1]?.expression.concept === 'AnonymousFunction' && newArguments[1]?.expression?.params?.[0]?.name) {
                     newArguments[1].expression.params[0].typeAnnotation = utils_1.naslTypes.TypeAnnotation.createReference(entityName, {
                         typeNamespace: calleeNamespace,
@@ -1497,6 +1500,7 @@ function transformCall2CallDataSourceLogic(node, calleeName, callee, options) {
             }
             const expressionJson = expression?.toJSON();
             const argument2 = newArguments?.[1];
+            const argument3 = newArguments?.[2];
             newArguments = [new utils_1.naslTypes.Argument({
                     expression: new utils_1.naslTypes.Function({
                         name: "filter",
@@ -1523,6 +1527,10 @@ function transformCall2CallDataSourceLogic(node, calleeName, callee, options) {
                 else {
                     newArguments.push(new utils_1.naslTypes.Argument({}));
                 }
+                if (argument3?.expression?.concept === 'AnonymousFunction') {
+                    argument3.keyword = 'properties';
+                    newArguments.push(argument3);
+                }
             }
         }
         return new utils_1.naslTypes.CallLogic({
@@ -1674,11 +1682,6 @@ function transform2CallFunction(node, calleeName, argument, options) {
             });
         }
     }
-    if (calleeName === 'Convert' && !newTypeArguments) {
-        newTypeArguments = [
-            new utils_1.naslTypes.TypeAnnotation()
-        ];
-    }
     if (calleeName === 'FromString') {
         if (newTypeArguments?.[0]?.typeName === 'Time' && newArguments?.[0]?.expression?.concept === 'StringLiteral') {
             const timeValue = newArguments?.[0]?.expression?.value;
@@ -1772,16 +1775,16 @@ function transform2CallFunction(node, calleeName, argument, options) {
     else {
         // 最后判断一下参数数量是否匹配
         // 这两个参数比较特殊，可以无限加参数，不再判断参数数量
-        const excludes = ['HasValue', 'ListSort'];
-        if (func.params?.length !== newArguments?.length && !excludes.includes(calleeName)) {
-            return (0, utils_1.throwError)(options, `函数${calleeName}生成不符合标准的函数调用，参数数量不匹配`, node.callee, node);
-        }
-        else {
-            newArguments?.forEach((arg, idx) => {
-                if (func?.params[idx]?.name)
-                    arg.keyword = func?.params[idx]?.name;
-            });
-        }
+        // 走LS检查，不在transform中判断了
+        // const excludes = ['HasValue', 'ListSort']
+        // if (func.params?.length !== newArguments?.length && !excludes.includes(calleeName)) {
+        //   return throwError(options, `函数${calleeName}生成不符合标准的函数调用，参数数量不匹配`, node.callee, node);
+        // } else {
+        // }
+        newArguments?.forEach((arg, idx) => {
+            if (func?.params[idx]?.name)
+                arg.keyword = func?.params[idx]?.name;
+        });
     }
     const nodeElement = new utils_1.naslTypes.CallFunction({
         calleeNamespace: 'nasl.util',
@@ -2171,6 +2174,30 @@ function transformCall2LogicWithAuth(node, calleeName, callee, options) {
     });
 }
 exports.transformCall2LogicWithAuth = transformCall2LogicWithAuth;
+function transformCall2GetCustomConfig(node, calleeName, callee, options) {
+    const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
+    const arg = node.arguments?.[0];
+    if (!arg || arg.type !== 'MemberExpression') {
+        return (0, utils_1.throwError)(options, 'nasl.configuration.getCustomConfig 的参数必须是 {app|extensions.xxx}.configuration.{group}.{name} 形式的成员访问', node);
+    }
+    const flatCallee = flatMemberExpression(arg);
+    const argName = flatCallee.map((n) => n.name).join('.');
+    const configPropertyRegex = /^(app|extensions\.\w+)\.configuration\.(\w+)\.(\w+)$/;
+    if (!configPropertyRegex.test(argName)) {
+        return (0, utils_1.throwError)(options, `nasl.configuration.getCustomConfig 参数路径格式不正确，期望 {app|extensions.xxx}.configuration.{group}.{name}，实际为 ${argName}`, node);
+    }
+    return new utils_1.naslTypes.CallLogic({
+        calleeNamespace: 'nasl.configuration',
+        calleeName: 'getCustomConfig',
+        arguments: [
+            new utils_1.naslTypes.Argument({
+                keyword: 'name',
+                expression: transformNodeFunction(arg, options),
+            }),
+        ],
+    });
+}
+exports.transformCall2GetCustomConfig = transformCall2GetCustomConfig;
 function transformCall2Paginate(node, calleeName, callee, options) {
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
     const newCallee = node.arguments || [];
@@ -2648,10 +2675,12 @@ function transform2LogicItem(node, options) {
     });
     transformManager.register('MemberExpression', transformMemberExpression);
     transformManager.register('OptionalMemberExpression', transformMemberExpression);
+    transformManager.registerCallExpression((node, calleeName) => calleeName === 'require' && node.arguments[0]?.value?.startsWith('./tmp/'), transformRequire2JSBlock);
     transformManager.registerCallExpression((node, calleeName, callee) => callee.length === 1 && (node.callee.type === 'FunctionExpression' && node.callee.id?.name === 'match' || node.callee.type === 'ArrowFunctionExpression'), transformCallFunctionExpression2Match);
     transformManager.registerCallExpression((node, calleeName) => /^\$refs\./.test(calleeName), transformCall2CallViewElementLogic);
     transformManager.registerCallExpression((node, calleeName, callee) => callee.length === 2 && callee[0].type === 'Identifier' && callee[0].name.endsWith('Entity'), transformCall2CallEntityLogic);
     transformManager.registerCallExpression('nasl.oql.query', transformCall2OQLQuery);
+    transformManager.registerCallExpression('nasl.configuration.getCustomConfig', transformCall2GetCustomConfig);
     transformManager.registerCallExpression('nasl.util.consoleLog', transformCall2ConsoleLog);
     transformManager.registerCallExpression('console.log', transformCall2ConsoleLog);
     transformManager.registerCallExpression((node, calleeName) => calleeName.startsWith('nasl.logging.'), transformCall2Logging);