@lcap/nasl 3.5.0-beta.1 → 3.5.0-beta.2

package/out/concepts/LogicItem__.js

@@ -18,41 +18,19 @@ const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 /**
  * 逻辑项
  */
-let LogicItem = LogicItem_1 = 
-// @ts-ignore
-class LogicItem extends BaseNode_1.default {
-    /** 类名 */
-    static ConceptName = 'LogicItem';
-    /** 继承链 */
-    static inheritanceChain = ['BaseNode'];
+let LogicItem = LogicItem_1 = class LogicItem extends BaseNode_1.default {
     /**
-     * 产品概念
-     */
-    concept;
-    /**
-     * 逻辑项标题
-     */
-    // @ts-ignore
-    label;
-    /**
-     * 逻辑项描述
-     */
-    // @ts-ignore
-    description;
-    /**
-     * 是否折叠
-     */
-    folded = false;
-    /**
-     * offsetX
-     */
-    // @ts-ignore
-    offsetX;
-    /**
-     * offsetY
+     * @param source 需要合并的部分参数
      */
-    // @ts-ignore
-    offsetY;
+    constructor(source) {
+        source = Object.assign({}, LogicItem_1.getDefaultOptions(), source);
+        super(source);
+        /**
+         * 是否折叠
+         */
+        this.folded = false;
+        super.subConstructor(source);
+    }
     /**
      * 祖先 OverriddenLogic
      */
@@ -119,14 +97,6 @@ class LogicItem extends BaseNode_1.default {
     get AuthLogicForCallInterface() {
         return this.getAncestor('AuthLogicForCallInterface');
     }
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source) {
-        source = Object.assign({}, LogicItem_1.getDefaultOptions(), source);
-        super(source);
-        super.subConstructor(source);
-    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -277,6 +247,10 @@ class LogicItem extends BaseNode_1.default {
         this.delete();
     }
 };
+/** 类名 */
+LogicItem.ConceptName = 'LogicItem';
+/** 继承链 */
+LogicItem.inheritanceChain = ['BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], LogicItem.prototype, "concept", void 0);
@@ -300,7 +274,6 @@ __decorate([
 ], LogicItem.prototype, "toEmbeddedTS", null);
 LogicItem = LogicItem_1 = __decorate([
     (0, decorators_1.concept)('逻辑项')
-    // @ts-ignore
 ], LogicItem);
 exports.LogicItem = LogicItem;
 exports.default = LogicItem;

package/out/concepts/LogicItem__.js.map

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

package/out/concepts/Logic__.d.ts

@@ -4,8 +4,9 @@ import type ForEachStatement from './ForEachStatement__';
 import type Assignment from './Assignment__';
 import type BatchAssignment from './BatchAssignment__';
 import type MatchCase from './MatchCase__';
+import type BusinessComponent from './BusinessComponent__';
 import { EventPayload, Params } from '../common/EventEmitter';
-import * as Type from './utils/types';
+import * as types from './utils/types';
 import BaseNode from '../common/BaseNode';
 import type Transactional from './Transactional__';
 import type TypeParam from './TypeParam__';
@@ -25,13 +26,13 @@ import type Process from './Process__';
  */
 export declare class Logic extends BaseNode {
     /** 类名 */
-    static readonly ConceptName = "Logic";
+    static readonly ConceptName: string;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**
      * 产品概念
      */
-    readonly concept: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface';
+    readonly concept: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' | 'BusinessLogic';
     /**
      * 逻辑名称
      */
@@ -641,6 +642,7 @@ export declare class Logic extends BaseNode {
     virtualParams: Array<Param>;
     get getLogicBelongTo(): string;
     static checkLogicReturnTypeHasError(logic: Logic): boolean;
-    get integration(): Type.SyntaxNode;
+    get integration(): types.SyntaxNode;
+    get likeComponent(): View | BusinessComponent;
 }
 export default Logic;

package/out/concepts/Logic__.js

@@ -40,81 +40,50 @@ const translator_1 = require("../translator");
 const constants_1 = require("./basics/constants");
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
-const Assert = __importStar(require("./utils/asserts"));
+const asserts = __importStar(require("./utils/asserts"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 /**
  * 逻辑
  */
-let Logic = Logic_1 = 
-// @ts-ignore
-class Logic extends BaseNode_1.default {
-    /** 类名 */
-    static ConceptName = 'Logic';
-    /** 继承链 */
-    static inheritanceChain = ['BaseNode'];
+let Logic = Logic_1 = class Logic extends BaseNode_1.default {
     /**
-     * 产品概念
-     */
-    concept;
-    /**
-     * 逻辑名称
-     */
-    // @ts-ignore
-    name;
-    /**
-     * 逻辑标题
-     */
-    // @ts-ignore
-    title;
-    /**
-     * 逻辑描述
-     */
-    // @ts-ignore
-    description;
-    /**
-     * 触发方式
-     */
-    // @ts-ignore
-    triggerType;
-    /**
-     * 定时任务表达式
-     */
-    // @ts-ignore
-    cron;
-    /**
-     * 是否可覆写
-     */
-    // @ts-ignore
-    overridable;
-    /**
-     * 事务
-     */
-    // @ts-ignore
-    transactional;
-    /**
-     * 类型参数列表
-     */
-    typeParams = null;
-    /**
-     * 输入参数列表
-     */
-    params = [];
-    /**
-     * 输出参数列表
-     */
-    returns = [];
-    /**
-     * 变量列表
-     */
-    variables = [];
-    /**
-     * 逻辑项列表
-     */
-    body = [];
-    /**
-     * 逻辑项列表
+     * @param source 需要合并的部分参数
      */
-    playground = [];
+    constructor(source) {
+        source = Object.assign({}, Logic_1.getDefaultOptions(), source);
+        super(source);
+        /**
+         * 类型参数列表
+         */
+        this.typeParams = null;
+        /**
+         * 输入参数列表
+         */
+        this.params = [];
+        /**
+         * 输出参数列表
+         */
+        this.returns = [];
+        /**
+         * 变量列表
+         */
+        this.variables = [];
+        /**
+         * 逻辑项列表
+         */
+        this.body = [];
+        /**
+         * 逻辑项列表
+         */
+        this.playground = [];
+        // 是不是内部有错误
+        this.haveError = false;
+        // 是否body为空
+        this.isSmpty = false;
+        // 虚拟输入参数列表
+        this.virtualParams = [];
+        super.subConstructor(source);
+    }
     /**
      * 祖先 Module
      */
@@ -157,14 +126,6 @@ class Logic extends BaseNode_1.default {
     get process() {
         return this.getAncestor('Process');
     }
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source) {
-        source = Object.assign({}, Logic_1.getDefaultOptions(), source);
-        super(source);
-        super.subConstructor(source);
-    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -284,7 +245,7 @@ class Logic extends BaseNode_1.default {
                 name: options,
             }, this, 'typeParams');
         }
-        else if (Assert.isTypeParam(options)) {
+        else if (asserts.isTypeParam(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             typeParam = options;
             Object.assign(typeParam, relationOptions);
@@ -341,7 +302,7 @@ class Logic extends BaseNode_1.default {
                 name: options,
             }, this, 'params');
         }
-        else if (Assert.isParam(options)) {
+        else if (asserts.isParam(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             param = options;
             Object.assign(param, relationOptions);
@@ -398,7 +359,7 @@ class Logic extends BaseNode_1.default {
                 name: options,
             }, this, 'returns');
         }
-        else if (Assert.isReturn(options)) {
+        else if (asserts.isReturn(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             ret = options;
             Object.assign(ret, relationOptions);
@@ -455,7 +416,7 @@ class Logic extends BaseNode_1.default {
                 name: options,
             }, this, 'variables');
         }
-        else if (Assert.isVariable(options)) {
+        else if (asserts.isVariable(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
@@ -497,7 +458,7 @@ class Logic extends BaseNode_1.default {
         const relationOptions = { parentNode: this, parentKey: 'body' };
         const LogicItem = (0, decorators_1.getConceptConstructor)('LogicItem');
         let logicItem;
-        if (Assert.isLogicItem(options)) {
+        if (asserts.isLogicItem(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
@@ -539,7 +500,7 @@ class Logic extends BaseNode_1.default {
         const relationOptions = { parentNode: this, parentKey: 'playground' };
         const LogicItem = (0, decorators_1.getConceptConstructor)('LogicItem');
         let logicItem;
-        if (Assert.isLogicItem(options)) {
+        if (asserts.isLogicItem(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
@@ -894,14 +855,14 @@ class Logic extends BaseNode_1.default {
         if (Array.isArray(this.variables)) {
             varList.push(...this.variables);
         }
-        if (this.view) {
-            // 页面下，变量名不可以跟逻辑名相同，会有js 翻译问题
+        if (this.likeComponent) {
+            // 页面/业务组件下，变量名不可以跟逻辑名相同，会有js 翻译问题
             varList.push(this);
-            if (Array.isArray(this.view.params)) {
-                varList.push(...this.view.params);
+            if (Array.isArray(this.likeComponent.params)) {
+                varList.push(...this.likeComponent.params);
             }
-            if (Array.isArray(this.view.variables)) {
-                varList.push(...this.view.variables);
+            if (Array.isArray(this.likeComponent.variables)) {
+                varList.push(...this.likeComponent.variables);
             }
         }
         this.traverseChildren((el) => {
@@ -1095,7 +1056,9 @@ class Logic extends BaseNode_1.default {
                     code += 'const __LogicEmpty: any = null;';
                 }
             }
-            else if (self.body.length <= 2 && !Assert.isNamespace(self.parentNode) && !Assert.isProcess(self.parentNode)) {
+            else if (self.body.length <= 2 &&
+                !asserts.isNamespace(self.parentNode) &&
+                !asserts.isProcess(self.parentNode)) {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
                 code += `${(0, translator_1.indent)(state?.tabSize || 0 + 4)}const __LogicEmpty: any = null;`;
             }
@@ -1134,13 +1097,13 @@ class Logic extends BaseNode_1.default {
         // 用来储存默认值翻译结构是__IDENTIFIER__或者__IDENTIFIER__()的节点
         const IDENTIFIERMAP = new Set();
         if (!prefix) {
-            code += `export function ${self.name}`;
+            code += `export function ${self.tsName}`;
         }
         else if (prefix === 'noExport') {
-            code += `function ${self.name}`;
+            code += `function ${self.tsName}`;
         }
         else if (prefix === 'inObject') {
-            code += `${self.name}`;
+            code += `${self.tsName}`;
         }
         if (self.typeParams?.length) {
             code += '<';
@@ -1169,8 +1132,8 @@ class Logic extends BaseNode_1.default {
         const advanceMap = new Map();
         // const needGetSourceMapOqlList: Promise<any>[] = [];
         yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
-            if (el && (Assert.isBatchAssignment(el) || (Assert.isAssignment(el) && el.left?.name))) {
-                if (Assert.isAssignment(el)) {
+            if (el && (asserts.isBatchAssignment(el) || (asserts.isAssignment(el) && el.left?.name))) {
+                if (asserts.isAssignment(el)) {
                     const advanceVar = self.variables?.find((variable) => !variable.typeAnnotation && el.left?.name === variable.name);
                     if (advanceVar && !advanceMap.get(advanceVar)) {
                         advanceMap.set(advanceVar, el);
@@ -1180,7 +1143,7 @@ class Logic extends BaseNode_1.default {
                         advanceMap.set(advanceRn, el);
                     }
                 }
-                else if (Assert.isBatchAssignment(el)) {
+                else if (asserts.isBatchAssignment(el)) {
                     yield* (0, time_slicing_1.wrapForEachToGenerator)(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
                         const leftCode = leftIndex.length === 1
                             ? yield* el.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
@@ -1245,7 +1208,7 @@ class Logic extends BaseNode_1.default {
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}// @ts-ignore\n`;
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
             code += yield* node.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
-            if (Assert.isBatchAssignment(assignment)) {
+            if (asserts.isBatchAssignment(assignment)) {
                 yield* (0, time_slicing_1.wrapForEachToGenerator)(assignment.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
                     const leftCode = leftIndex.length === 1
                         ? yield* assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
@@ -1256,7 +1219,7 @@ class Logic extends BaseNode_1.default {
                             ? assignment.rights[rightIndex[0]]?.expression
                             : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
                         // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
-                        if (rightNode?.typeAnnotation && !(Assert.isCallQueryComponent(rightNode) && !rightNode.isAutoInfer())) {
+                        if (rightNode?.typeAnnotation && !(asserts.isCallQueryComponent(rightNode) && !rightNode.isAutoInfer())) {
                             if (rightNode.concept === 'NewComposite' && rightNode.typeAnnotation?.typeKind === 'anonymousStructure') {
                                 code += '= ';
                                 code += (yield* rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }))) || 'null';
@@ -1301,7 +1264,7 @@ class Logic extends BaseNode_1.default {
             else {
                 const rightNode = assignment.right;
                 // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
-                if (rightNode?.typeAnnotation && !(Assert.isCallQueryComponent(rightNode) && !rightNode.isAutoInfer())) {
+                if (rightNode?.typeAnnotation && !(asserts.isCallQueryComponent(rightNode) && !rightNode.isAutoInfer())) {
                     code += ': ';
                     code += yield* rightNode.typeAnnotation?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ??
                         (0, time_slicing_1.returnOrigin)('null');
@@ -1311,7 +1274,7 @@ class Logic extends BaseNode_1.default {
                     let rightCode = '';
                     // 因为右侧枚举要赋值就得new 一下；
                     if (rightNode &&
-                        Assert.isIdentifier(rightNode) &&
+                        asserts.isIdentifier(rightNode) &&
                         rightNode.namespace &&
                         rightNode.namespace.endsWith('enums')) {
                         rightCode += 'new ';
@@ -1338,7 +1301,7 @@ class Logic extends BaseNode_1.default {
         }
         else {
             // 如果长度小于2 并且不是虚拟节点就 加 报错，
-            if (self.body.length <= 2 && !Assert.isNamespace(self.parentNode)) {
+            if (self.body.length <= 2 && !asserts.isNamespace(self.parentNode)) {
                 if (self.body.length && self.body[0].concept === 'JavaLogic') {
                     code += '';
                 }
@@ -1430,7 +1393,7 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         // 需要类型推导的局部变量/返回值需要调整申明顺序
         const advanceMap = new Map();
         this.traverseChildren((el) => {
-            if (el && (Assert.isBatchAssignment(el) || (Assert.isAssignment(el) && el.left?.name))) {
+            if (el && (asserts.isBatchAssignment(el) || (asserts.isAssignment(el) && el.left?.name))) {
                 const jsCode = el.toJS();
                 const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && jsCode.includes(`${variable.name} = `));
                 if (advanceVar && !advanceMap.get(advanceVar)) {
@@ -1494,17 +1457,17 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
     }
     *getRightCode(code, assignment, rightNode) {
         code = code.replaceAll('\n', ' ');
-        if (Assert.isAssignment(assignment) && !assignment.right)
+        if (asserts.isAssignment(assignment) && !assignment.right)
             return code;
         // 调用接口，参数替换成 null
-        if (Assert.isCallInterface(rightNode)) {
+        if (asserts.isCallInterface(rightNode)) {
             const { _interface } = rightNode.getModuleInterface();
             return _interface
                 ? `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})`
                 : null;
         }
         // 调用服务端逻辑，参数替换成 null
-        if (Assert.isCallLogic(rightNode) && rightNode.calleeNamespace === 'app.logics') {
+        if (asserts.isCallLogic(rightNode) && rightNode.calleeNamespace === 'app.logics') {
             const calleeName = rightNode?.calleeName;
             const calleeLogic = this.app.logics.find((l) => l.name === calleeName);
             return calleeLogic ? `app.logics.${calleeName}(${calleeLogic.params.map(() => 'null').join(',')})` : null;
@@ -1570,7 +1533,7 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         if (code.includes(expressionTsCode)) {
             let typeCode = '';
             yield* (0, time_slicing_1.wrapForEachToGenerator)(matchCase.patterns, function* wrapForEach(pattern, index) {
-                if (Assert.isTypeAnnotation(pattern)) {
+                if (asserts.isTypeAnnotation(pattern)) {
                     if (index === 0) {
                         typeCode += yield* pattern.toEmbeddedTS();
                     }
@@ -1681,13 +1644,13 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
                 _path = `/${this.connector.parentKey}/${this.connector.name}`;
             }
         }
-        if (Assert.isFrontendLibrary(this.parentNode)) {
+        if (asserts.isFrontendLibrary(this.parentNode)) {
             _path += `/frontends/${this.parentNode.type}`;
         }
-        else if (this.parentNode.concept === 'BindEvent' && this.parentNode?.parentNode.concept === 'Frontend') {
-            _path += `/frontends/${this.parentNode.parentNode.name}/bindEvents/${name}.ts`;
+        else if (this.parentNode.concept === 'BindEvent' && this.getAncestor('Frontend')) {
+            _path += `/frontendTypes/${this.getAncestor('FrontendType')?.name}/frontends/${this.getAncestor('Frontend')?.name}/bindEvents/${name}.ts`;
         }
-        return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;
+        return `/embedded/${this.getAncestor('App')?.name}${_path}/logics/${name}.ts`;
     }
     *toEmbeddedTSFile() {
         let code = `namespace ${this.getTsNamespace()} {\n`;
@@ -1730,7 +1693,7 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
             root = this;
         const set = new Set();
         utils.traverse(({ node }) => {
-            if (Assert.isCallQueryComponent(node)) {
+            if (asserts.isCallQueryComponent(node)) {
                 set.add(node);
             }
         }, { node: root }, {
@@ -1748,8 +1711,6 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
             enabled: flag,
         }));
     }
-    fake;
-    getPath;
     delete() {
         let actionMsg = '删除逻辑项';
         if (this.name)
@@ -1778,15 +1739,11 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         });
         this.app?.emit('collect:end');
     }
-    // 是不是内部有错误
-    haveError = false;
-    // 是否body为空
-    isSmpty = false;
     get exportInterface() {
         return this.rootNode?.interfaces?.find((item) => item.originLogicName === this.name);
     }
     get pathName() {
-        if (this.view) {
+        if (this.likeComponent) {
             return this.getEventLogicName('chinese');
         }
         let { parentNode } = this;
@@ -1826,7 +1783,7 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
     }
     // 获取bindEvent下的logic的名称
     getEventLogicName(type) {
-        if (Assert.isBindEvent(this.parentNode)) {
+        if (asserts.isBindEvent(this.parentNode)) {
             if (type === 'chinese') {
                 const bindEvent = this.parentNode;
                 const bindChineseName = bindEvent.getPageViewEventChineseName();
@@ -1835,8 +1792,6 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         }
         return this.name;
     }
-    // 虚拟输入参数列表
-    virtualParams = [];
     get getLogicBelongTo() {
         const [, belongTo] = this.calleewholeKey.split('.');
         return belongTo;
@@ -1864,7 +1819,14 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
     get integration() {
         return this.getAncestor('Integration');
     }
+    get likeComponent() {
+        return this.view || this?.getAncestor('BusinessComponent');
+    }
 };
+/** 类名 */
+Logic.ConceptName = 'Logic';
+/** 继承链 */
+Logic.inheritanceChain = ['BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], Logic.prototype, "concept", void 0);
@@ -1944,7 +1906,6 @@ __decorate([
 ], Logic.prototype, "toNaturalTS", null);
 Logic = Logic_1 = __decorate([
     (0, decorators_1.concept)('逻辑')
-    // @ts-ignore
 ], Logic);
 exports.Logic = Logic;
 exports.default = Logic;