@lcap/nasl 3.3.0-alpha.3 → 3.3.0-beta.0

package/out/concepts/CallLogic__.js

@@ -35,7 +35,6 @@ var CallLogic_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CallLogic = void 0;
 const JSON5 = __importStar(require("json5"));
-const uuid_1 = require("uuid");
 const translator_1 = require("../translator");
 const Logic__1 = __importDefault(require("./Logic__"));
 const View__1 = __importDefault(require("./View__"));
@@ -43,23 +42,28 @@ const utils_1 = require("../automate/engine/utils");
 const utils_2 = require("../utils");
 const Identifier__1 = __importDefault(require("./Identifier__"));
 const decorators_1 = require("../decorators");
+const uuid_1 = require("uuid");
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
-const classMap_1 = __importDefault(require("../common/classMap"));
 const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
 const Argument__1 = __importDefault(require("./Argument__"));
 const LogicItem__1 = __importDefault(require("./LogicItem__"));
 /**
  * 调用逻辑
  */
-let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
+let CallLogic = CallLogic_1 = 
+// @ts-ignore
+class CallLogic extends LogicItem__1.default {
+    /** 类名 */
+    static ConceptName = 'CallLogic';
     /**
-     * uuid
+     * 唯一标识
      */
     uuid = (0, uuid_1.v4)().replace(/-/g, '');
     /**
      * 产品概念
      */
-    concept = 'CallLogic';
+    // @ts-ignore
+    concept;
     /**
      * 调用逻辑标题
      */
@@ -67,19 +71,23 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
     /**
      * calleeNamespace
      */
-    calleeNamespace = undefined;
+    // @ts-ignore
+    calleeNamespace;
     /**
      * calleeName
      */
-    calleeName = undefined;
+    // @ts-ignore
+    calleeName;
     /**
      * shortcut
      */
-    shortcut = undefined;
+    // @ts-ignore
+    shortcut;
     /**
      * handleError
      */
-    handleError = undefined;
+    // @ts-ignore
+    handleError;
     /**
      * 类型参数
      */
@@ -91,23 +99,21 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
     /**
      * 验证规则
      */
-    validation = undefined;
+    // @ts-ignore
+    validation;
     /**
      * 是否被折叠
      */
-    isAdvancedSettingFolded = undefined;
+    // @ts-ignore
+    isAdvancedSettingFolded;
     /**
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        // @ts-ignore
-        source = { ...CallLogic_1.getDefaultOptions(), ...source };
+        source = Object.assign({}, CallLogic_1.getDefaultOptions(), source);
         super(source);
         super.subConstructor(source);
     }
-    getClassName() {
-        return 'CallLogic';
-    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -219,11 +225,11 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         return node;
     }
     removeTypeAnnotation(options) {
-        const typeAnnotation = options;
+        let typeAnnotation = options;
         return typeAnnotation.delete();
     }
     __removeTypeAnnotation(typeAnnotation) {
-        const { parentKey } = typeAnnotation;
+        const parentKey = typeAnnotation.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -246,11 +252,11 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         return params;
     }
     removeArgument(options) {
-        const argument = options;
+        let argument = options;
         return argument.delete();
     }
     __removeLogicItem(logicItem) {
-        const { parentKey } = logicItem;
+        const parentKey = logicItem.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -277,7 +283,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         if (typeof options === 'string') {
             validation = this.validation;
             if (!validation) {
-                throw new Error(`找不到元素绑定属性 ${options}`);
+                throw new Error('找不到元素绑定属性 ' + options);
             }
         }
         else {
@@ -286,7 +292,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         return validation.delete();
     }
     __removeBindAttribute(bindAttribute) {
-        const { parentKey } = bindAttribute;
+        const parentKey = bindAttribute.parentKey;
         const params = {
             parentNode: this,
             parentKey,
@@ -308,10 +314,10 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         }
         return params;
     }
-    //= ===============================================================================
+    //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //= ===============================================================================
+    //================================================================================
     get tsCalleeNamespace() {
         if (this.calleeNamespace) {
             let tsCalleeNamespace = this.calleeNamespace;
@@ -395,7 +401,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                 keyword: param.name,
             });
             if (param.defaultExpression) {
-                const exp = BaseNode_1.default.from({ ...param.defaultExpression.toJSON() });
+                const exp = BaseNode_1.default.from(param.defaultExpression.toJSON());
                 argument.setExpression(exp);
             }
         });
@@ -531,53 +537,60 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         }
         const completeArguments = this.completeArguments;
         if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
-            const currentElement = this.getAncestor('ViewElement');
-            code += '(params) => {\n';
-            code += `this['__${currentElement.name}_params'] = {...params};\n`;
-            code += `return this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName}']`;
-            code += `({
+            if (this.calleeNamespace) {
+                const currentElement = this.getAncestor('ViewElement');
+                code += '(params) => {\n';
+                code += `this['__${currentElement.name}_params'] = {...params};\n`;
+                code += `return this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName}']`;
+                code += `({
             config: {
                 download: false,
             },
             query: {},`;
-            code += `
+                code += `
             headers: {
                 "lcap-calllogic-uuid": "${this.uuid}",
             },
         `;
-            code += `path: {},
+                code += `path: {},
         body: {`;
-            const logic = (0, utils_1.getNodeByNodeCallee)(this.app, this.calleewholeKey, (key, tempPoint) => {
-                // 处理 NASL 中未定义的假的节点
-                if (key === tempPoint?.name) {
+                const logic = (0, utils_1.getNodeByNodeCallee)(this.app, this.calleewholeKey, (key, tempPoint) => {
+                    // 处理 NASL 中未定义的假的节点
+                    if (key === tempPoint?.name) {
+                        return {
+                            tempPoint,
+                            state: 1,
+                        };
+                    }
+                    const t = tempPoint?.[key];
+                    return {
+                        tempPoint: t,
+                        state: Array.isArray(t) ? 2 : 1,
+                    };
+                });
+                const args = logic?.params || [];
+                const argsStr = args
+                    .map((arg, index) => {
+                    const actualArg = completeArguments[index];
                     return {
-                        tempPoint,
-                        state: 1,
+                        keyword: arg?.name,
+                        arg: actualArg,
                     };
+                })
+                    .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toVue(options)}`)
+                    .join(', ');
+                code += argsStr;
+                if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                    code += `,\n__typeArguments: ${JSON5.stringify(this.typeArguments)}`;
                 }
-                const t = tempPoint?.[key];
-                return {
-                    tempPoint: t,
-                    state: Array.isArray(t) ? 2 : 1,
-                };
-            });
-            const args = logic?.params || [];
-            const argsStr = args
-                .map((arg, index) => {
-                const actualArg = completeArguments[index];
-                return {
-                    keyword: arg?.name,
-                    arg: actualArg,
-                };
-            })
-                .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toVue(options)}`)
-                .join(', ');
-            code += argsStr;
-            if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
-                code += `,\n__typeArguments: ${JSON5.stringify(this.typeArguments)}`;
+                code += '\n}';
+                code += '}';
+            }
+            else {
+                // 前端逻辑的calleeNamespace一直为空字符串
+                code += this.calleeName;
+                return code;
             }
-            code += '\n}';
-            code += '}';
         }
         else {
             code += this.calleeName;
@@ -952,7 +965,8 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             };
         }
         const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+        const needGenInitFromSchema = typeAnnotation &&
+            (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
         if (needGenInitFromSchema) {
             code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
         }
@@ -969,7 +983,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
     get useIife() {
         return Boolean(this.handleError || this.useValidation);
     }
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+    toEmbeddedTS(state) {
         let code = '';
         const { handleError, calleeKey, calleeName, parentKey, typeArguments, tsCalleeNamespace, completeArguments, parentNode, validation, useIife, useValidation, arguments: logicArgs, } = this;
         /** 设置函数范型参数 */
@@ -989,7 +1003,8 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         /** 设置输入参数 */
         const setInputParam = () => {
             const paramRequired = ['showMessage', 'consoleLog'].includes(calleeName);
-            if ((tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) || tsCalleeNamespace.startsWith('nasl.')) {
+            if ((tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) ||
+                tsCalleeNamespace.startsWith('nasl.')) {
                 code += '(';
                 logicArgs.forEach((arg, index) => {
                     // 页面逻辑先都非必填
@@ -1000,7 +1015,9 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                 code += ')';
             }
             else if (completeArguments.length) {
-                if (['expression'].includes(parentKey) && this.getAncestor('BindAttribute')?.name === 'data-source' && state?.noNeedParams) {
+                if (['expression'].includes(parentKey) &&
+                    this.getAncestor('BindAttribute')?.name === 'data-source' &&
+                    state?.noNeedParams) {
                     return;
                 }
                 code += '(';
@@ -1013,7 +1030,24 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                 code += ')';
             }
             else {
-                code += '()';
+                if (['expression'].includes(parentKey) &&
+                    this.getAncestor('BindAttribute')?.name === 'data-source' &&
+                    state?.noNeedParams) {
+                    return;
+                }
+                if (completeArguments.length) {
+                    code += '(';
+                    completeArguments.forEach((arg, index) => {
+                        // 取到是不是必填放入参数中
+                        code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code), arg?.paramRequired);
+                        if (index !== logicArgs.length - 1)
+                            code += ', ';
+                    });
+                    code += ')';
+                }
+                else {
+                    code += '()';
+                }
             }
         };
         /** 设置表达式末尾分号 */
@@ -1067,103 +1101,6 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         setEndSemi();
         return code;
     }
-    toNaturalTS(state = (0, translator_1.createCompilerState)()) {
-        const { handleError, calleeKey, calleeName, parentKey, typeArguments, tsCalleeNamespace, completeArguments, parentNode, validation, useIife, useValidation, arguments: logicArgs, } = this;
-        let code = calleeKey.replace('__elements', '$refs');
-        if (/^app.+?\.entities\..+?logics/.test(code))
-            code = code.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1');
-        /** 设置函数范型参数 */
-        const setTypeArguments = () => {
-            if (Array.isArray(typeArguments) && typeArguments.length) {
-                // 如果有内容
-                code += `<`;
-                typeArguments.forEach((arg, i, arr) => {
-                    code += arg.toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
-                    if (i !== arr.length - 1) {
-                        code += ', ';
-                    }
-                });
-                code += `>`;
-            }
-        };
-        /** 设置输入参数 */
-        const setInputParam = () => {
-            const paramRequired = ['showMessage', 'consoleLog'].includes(calleeName);
-            if ((tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) || tsCalleeNamespace.startsWith('nasl.')) {
-                code += '(';
-                logicArgs.forEach((arg, index) => {
-                    // 页面逻辑先都非必填
-                    code += arg.toNaturalTS((0, translator_1.shiftState)(state, code), paramRequired);
-                    if (index !== logicArgs.length - 1)
-                        code += ', ';
-                });
-                code += ')';
-            }
-            else if (completeArguments.length) {
-                code += '(';
-                completeArguments.forEach((arg, index) => {
-                    // 取到是不是必填放入参数中
-                    code += arg.toNaturalTS((0, translator_1.shiftState)(state, code), arg?.paramRequired);
-                    if (index !== logicArgs.length - 1)
-                        code += ', ';
-                });
-                code += ')';
-            }
-            else {
-                code += '()';
-            }
-        };
-        /** 设置表达式末尾分号 */
-        const setEndSemi = () => {
-            const { concept: parentConcept } = parentNode ?? {};
-            if (!['test', 'patterns', 'returnExpression'].includes(parentKey) &&
-                ![
-                    'Argument',
-                    'Assignment',
-                    'ForEachStatement',
-                    'SelectMembers',
-                    'UnaryExpression',
-                    'BinaryExpression',
-                    'StringInterpolation',
-                    'MemberExpression',
-                    'NewMap',
-                    'NewList',
-                ].includes(parentConcept)) {
-                code += ';';
-            }
-        };
-        if (useIife) {
-            code += '(() =>{\nconst wrapper = ';
-            if (handleError) {
-                code += 'nasl.util.autoHandleError(';
-            }
-            if (useValidation) {
-                code += 'nasl.util.callLogicWithChecker(';
-            }
-            code += calleeKey;
-            setTypeArguments();
-            if (useValidation) {
-                code += ', (';
-                code += completeArguments.map((item) => item.keyword).join(', ');
-                code += ') => {\n';
-                code += validation.toNaturalTS((0, translator_1.shiftState)(state, code));
-                code += ';\n})';
-            }
-            if (handleError) {
-                code += ')';
-            }
-            code += ';\nreturn wrapper';
-            setInputParam();
-            code += ';\n})()';
-        }
-        else {
-            code += calleeKey;
-            setTypeArguments();
-            setInputParam();
-        }
-        setEndSemi();
-        return code;
-    }
     // 通过内容过去节点
     getCallNode() {
         let node;
@@ -1199,17 +1136,40 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
     }
     /** 获取类型标注时的偏移量 */
     getQuickInfoOffset(detail, code) {
-        if (!this.useIife) {
-            return { ...detail };
+        if (this.useIife) {
+            const characterOffset = 8;
+            const lines = code.split('\n');
+            const lineOffset = lines.findIndex((item) => item.startsWith('return wrapper'));
+            return {
+                line: detail.line + lineOffset,
+                offset: characterOffset,
+            };
+        }
+        else {
+            let indexOf = 0;
+            // 没有括号，表示括号在外面
+            if (!code.includes('(')) {
+                indexOf = -1;
+            }
+            // 有括号就找到括号的位置
+            else {
+                // 如果有泛型先往前找一找
+                if (code.includes('<')) {
+                    indexOf = Math.min(code.indexOf('<'), code.indexOf('('));
+                }
+                else {
+                    indexOf = code.indexOf('(');
+                }
+                const subStr = code.substring(0, indexOf);
+                const codeArr = subStr?.split('.');
+                const lastLen = codeArr?.[codeArr.length - 1]?.length;
+                indexOf = subStr.length - lastLen;
+            }
+            return {
+                ...detail,
+                offset: detail.offset + indexOf,
+            };
         }
-        const characterOffset = 8;
-        const lines = code.split('\n');
-        // @ts-ignore
-        const lineOffset = lines.findLastIndex((item) => item.startsWith('return wrapper'));
-        return {
-            line: detail.line + lineOffset,
-            offset: characterOffset,
-        };
     }
     /**
      * 是否允许验证规则
@@ -1255,9 +1215,6 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
 __decorate([
     (0, decorators_1.property)()
 ], CallLogic.prototype, "uuid", void 0);
-__decorate([
-    (0, decorators_1.property)()
-], CallLogic.prototype, "concept", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], CallLogic.prototype, "label", void 0);
@@ -1288,17 +1245,15 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], CallLogic.prototype, "toEmbeddedTS", null);
-__decorate([
-    (0, translator_1.withSourceMap)()
-], CallLogic.prototype, "toNaturalTS", null);
 CallLogic = CallLogic_1 = __decorate([
+    decorators_1.className,
     (0, decorators_1.concept)('调用逻辑')
+    // @ts-ignore
 ], CallLogic);
 exports.CallLogic = CallLogic;
-classMap_1.default.CallLogic = CallLogic;
 exports.default = CallLogic;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================
 //# sourceMappingURL=CallLogic__.js.map