@lcap/nasl 1.0.2 → 2.12.0

package/src/concepts/Logic__.ts

@@ -227,7 +227,7 @@ export class Logic extends BaseNode {
         });
     }
 
-        getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
+    getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
         return (this.typeParams || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -368,7 +368,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -506,7 +505,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -644,7 +642,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -782,11 +779,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -819,8 +811,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -843,8 +833,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -864,8 +852,6 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -889,8 +875,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -923,8 +907,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -947,8 +929,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -968,8 +948,6 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -993,9 +971,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除事务
     * @param name 事务名称
@@ -1044,8 +1019,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除类型参数
     * @param name 类型参数名称
@@ -1094,8 +1067,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1144,8 +1115,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1194,8 +1163,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除局部变量
     * @param name 局部变量名称
@@ -1244,8 +1211,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1253,12 +1218,10 @@ export class Logic extends BaseNode {
     removeItemInBody(logicItem: LogicItem): void;
 
     removeItemInBody(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
-    
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1266,7 +1229,7 @@ export class Logic extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -1391,7 +1354,7 @@ export class Logic extends BaseNode {
         // params
         if (Array.isArray(this.params)) {
             this.params.forEach((param) => {
-                code += indent(state.tabSize + 1) + '';
+                code += indent((state?.tabSize || 0) + 1) + '';
                 code += param.toJS(shiftState(state, code, { inline: true }));
                 code += ';\n';
             });
@@ -1399,7 +1362,7 @@ export class Logic extends BaseNode {
         // variables
         if (Array.isArray(this.variables)) {
             this.variables.forEach((variable) => {
-                code += indent(state.tabSize + 1) + 'let ';
+                code += indent((state?.tabSize || 0) + 1) + 'let ';
                 code += variable.toJS(shiftState(state, code, { inline: true }));
                 code += ';\n';
             });
@@ -1408,19 +1371,19 @@ export class Logic extends BaseNode {
         // returns
         if (Array.isArray(this.returns)) {
             this.returns.forEach((ret) => {
-                code += indent(state.tabSize + 1) + 'let ';
+                code += indent((state?.tabSize || 0) + 1) + 'let ';
                 code += ret.toJS(shiftState(state, code, { inline: true }));
                 code += ';\n';
             });
         }
         if (Array.isArray(this.body)) {
             this.body.forEach((item) => {
-                code += item.toJS && item.toJS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+                code += item.toJS && item.toJS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
                 code += '\n';
             });
         }
 
-        code += indent(state.tabSize) + '}\n';
+        code += indent((state?.tabSize || 0)) + '}\n';
 
         return code;
     }
@@ -1448,10 +1411,15 @@ export class Logic extends BaseNode {
             path = `/api/${entityName.replace('-', '_')}/${logicName}`;
         } else if (concept === 'Namespace') {
             serviceType = 'entity';
-            const entityPath = entityName.replace(/[A-Z]/g, (char, index) => {
+            let entityPath = entityName.replace(/[A-Z]/g, (char, index) => {
                 const lowerChar = char.toLowerCase();
                 return index === 0 ? lowerChar : `-${lowerChar}`;
             });
+            const dataSource = parentNode.getAncestor('DataSource');
+            // 默认数据源不动，其他数据源需要拼接数据源信息
+            if (dataSource && dataSource.name !== 'defaultDS') {
+                entityPath = dataSource.name + '/' + entityPath;
+            }
             path = `/api/${entityPath}`;
             switch (this.name) {
                 case 'get':
@@ -1513,33 +1481,33 @@ export class Logic extends BaseNode {
         code += prependCode || '';
         code += '\n';
         this.variables.forEach((variable) => {
-            code += indent(state.tabSize + 1) + 'let ';
+            code += indent((state?.tabSize || 0) + 1) + 'let ';
             code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
             code += ';\n';
         });
 
         this.returns.forEach((ret) => {
-            code += indent(state.tabSize + 1) + 'let ';
+            code += indent((state?.tabSize || 0) + 1) + 'let ';
             code += ret.toEmbeddedTS(shiftState(state, code, { inline: true }));
             code += ';\n';
         });
 
         if (!this.body.length && this.returns.length) {
-            code += indent(state.tabSize + 1) + `return ${this.returns[0].name};\n`;
+            code += indent((state?.tabSize || 0) + 1) + `return ${this.returns[0].name};\n`;
         } else {
             this.body.forEach((item) => {
-                code += item.toEmbeddedTS && item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+                code += item.toEmbeddedTS && item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
                 code += '\n';
             });
         }
 
         // 在body渲染完成之后把其余的节点放到下面
         this.playground.forEach((item) => {
-            code += item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+            code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
             code += '\n';
         });
 
-        code += indent(state.tabSize) + '}';
+        code += indent((state?.tabSize || 0)) + '}';
         code += '\n';
         return code;
     }
@@ -1572,33 +1540,33 @@ export class Logic extends BaseNode {
         code += '{\n';
 
         this.variables.forEach((variable) => {
-            code += indent(state.tabSize + 1) + 'let ';
+            code += indent((state?.tabSize || 0) + 1) + 'let ';
             code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
             code += ';\n';
         });
 
         this.returns.forEach((ret) => {
-            code += indent(state.tabSize + 1) + 'let ';
+            code += indent((state?.tabSize || 0) + 1) + 'let ';
             code += ret.toEmbeddedTS(shiftState(state, code, { inline: true }));
             code += ';\n';
         });
 
         if (!this.body.length && this.returns.length) {
-            code += indent(state.tabSize + 1) + `return ${this.returns[0].name};\n`;
+            code += indent((state?.tabSize || 0) + 1) + `return ${this.returns[0].name};\n`;
         } else {
             this.body.forEach((item) => {
-                code += item.toEmbeddedTS && item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+                code += item.toEmbeddedTS && item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
                 code += '\n';
             });
         }
 
         // 在body渲染完成之后把其余的节点放到下面
         this.playground.forEach((item) => {
-            code += item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+            code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
             code += '\n';
         });
 
-        code += indent(state.tabSize) + '}';
+        code += indent((state?.tabSize || 0)) + '}';
         if (prefix === 'inObject') {
             code += `,`;
         }
@@ -1608,36 +1576,34 @@ export class Logic extends BaseNode {
 
     getNamespace(): string {
         if (this.parentNode) {
-            let parentNodeNamespace = '';
-            if (this.parentNode instanceof Namespace || this.parentNode instanceof App || this.parentNode instanceof Module) {
-                parentNodeNamespace = this.parentNode.getNamespace();
+            const parentNamespace = (this.parentNode as any)?.getNamespace();
+            const parentName = this.parentNode.name;
+            const arr = [parentNamespace];
+            if (this.parentNode.concept !== 'App' && parentName) {
+                arr.push(parentName);
             }
-
-            parentNodeNamespace
-                = ['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration'].includes(parentNodeNamespace) || parentNodeNamespace.includes('.logics') ? parentNodeNamespace : `${parentNodeNamespace}.logics`;
-            if (this.parentNode instanceof View) {
-                return (parentNodeNamespace = '');
+            let namespace = arr.join('.');
+            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process'].includes(namespace) && !namespace.includes('.logics')) {
+                namespace = `${namespace}.logics`;
             }
-            return parentNodeNamespace;
+            return namespace;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
 
     getTsNamespace(): string {
         if (this.parentNode) {
-            let parentNodeNamespace = '';
-            if (this.parentNode instanceof Namespace || this.parentNode instanceof App) {
-                parentNodeNamespace = this.parentNode.getNamespace();
-            } else if (this.parentNode instanceof Module) {
-                parentNodeNamespace = this.parentNode.getTsNamespace();
+            const parentNamespace = (this.parentNode as any)?.getTsNamespace();
+            const parentName = this.parentNode.tsName || this.parentNode.name;
+            const arr = [parentNamespace];
+            if (this.parentNode.concept !== 'App' && parentName) {
+                arr.push(parentName);
             }
-
-            parentNodeNamespace
-                = ['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration'].includes(parentNodeNamespace) || parentNodeNamespace.includes('.logics') ? parentNodeNamespace : `${parentNodeNamespace}.logics`;
-            if (this.parentNode instanceof View) {
-                return (parentNodeNamespace = '');
+            let namespace = arr.join('.');
+            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process'].includes(namespace) && !namespace.includes('.logics')) {
+                namespace = `${namespace}.logics`;
             }
-            return parentNodeNamespace;
+            return namespace;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
@@ -1736,7 +1702,7 @@ export class Logic extends BaseNode {
     //================================================================================
 }
 
-classMap['Logic'] = Logic;
+classMap.Logic = Logic;
 export default Logic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑