@lcap/nasl 1.0.2 → 2.12.0-beta

package/src/concepts/Logic__.ts

@@ -1391,7 +1391,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 +1399,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 +1408,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 +1448,14 @@ 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}`;
             });
+            // 默认数据源不动，其他数据源需要拼接数据源信息
+            if (parentNode.parentNode.parentNode.concept === 'DataSource' && parentNode.parentNode.parentNode.name !== 'defaultDS') {
+                entityPath = parentNode.parentNode.parentNode.name + '/' + entityPath;
+            }
             path = `/api/${entityPath}`;
             switch (this.name) {
                 case 'get':
@@ -1513,33 +1517,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 +1576,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 +1612,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'].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'].includes(namespace) && !namespace.includes('.logics')) {
+                namespace = `${namespace}.logics`;
             }
-            return parentNodeNamespace;
+            return namespace;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
@@ -1736,7 +1738,7 @@ export class Logic extends BaseNode {
     //================================================================================
 }
 
-classMap['Logic'] = Logic;
+classMap.Logic = Logic;
 export default Logic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/MemberExpression__.ts

@@ -279,7 +279,7 @@ export class MemberExpression extends LogicItem {
     //================================================================================
 }
 
-classMap['MemberExpression'] = MemberExpression;
+classMap.MemberExpression = MemberExpression;
 export default MemberExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Module__.ts

@@ -16,7 +16,6 @@ import * as utils from '../utils';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
-import Entity from './Entity__';
 import Structure from './Structure__';
 import Enum from './Enum__';
 import Logic from './Logic__';
@@ -73,12 +72,6 @@ export class Module extends BaseNode {
     @property()
     externalDependencyMap: { maven?: Array<{ groupId: string, artifactId: string, version: string }> } = undefined;
 
-    /**
-     * 实体列表
-     */
-    @property('Entity')
-    entities: Array<Entity> = [];
-
     /**
      * 数据结构列表
      */
@@ -154,149 +147,7 @@ export class Module extends BaseNode {
     }
     
 
-        getEntityExistingNames(excludedList: Array<Entity> = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.entities || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
-    }
-    getEntityUniqueName(name = 'Entity1') {
-        return utils.unique(name, this.getEntityExistingNames(), undefined, false);
-    }
-
-    /**
-    * 插入实体
-    * @internal
-    * @param name 实体名称，如果不填会自动生成一个唯一名称
-    */
-    _insertEntityAt(name: string, index: number): Entity;
-
-    /**
-    * 插入实体
-    * @internal
-    * @param entityOptions 实体参数
-    */
-    _insertEntityAt(entityOptions: Partial<Entity>, index: number): Entity;
-
-    /**
-    * 插入实体
-    * @internal
-    * @param entity 已有的实体实例
-    */
-    _insertEntityAt(entity: Entity, index: number): Entity;
-
-    _insertEntityAt(options: string | Partial<Entity> | Entity, index: number) {
-        const entityOptions: any = {};
-        const relationOptions = { parentNode: this, parentKey: 'entities' };
-        let entity: Entity;
-        if (!options) {
-            entity = Entity.from({
-                ...entityOptions,
-                name: this.getEntityUniqueName(),
-            }, this, 'entities');
-        } else if (typeof options === 'string') {
-            entity = Entity.from({
-                ...entityOptions,
-                name: options,
-            }, this, 'entities');
-        } else if (options instanceof Entity) {
-            options.ensureDelete(); // 同一实例不支持多处存在
-            entity = options;
-            Object.assign(entity, relationOptions);
-        } else {
-            entity = Entity.from({
-                ...entityOptions,
-                ...options,
-            }, this, 'entities');
-        }
-        this.entities.splice(index, 0, entity);
-        return entity;
-    }
-
-    /**
-     * 插入实体
-     * @param name 实体名称，如果不填会自动生成一个唯一名称
-     */
-    insertEntityAt(name: string, index: number): Entity;
-
-    /**
-     * 插入实体
-     * @param entityOptions 实体参数
-     */
-    insertEntityAt(entityOptions: Partial<Entity>, index: number): Entity;
-
-    /**
-     * 插入实体
-     * @param entity 已有的实体实例
-     */
-    insertEntityAt(entity: Entity, index: number): Entity;
-
-    insertEntityAt(options: string | Partial<Entity> | Entity, index: number) {
-        const node = this._insertEntityAt(options as any, index);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'entities',
-        });
-        return node;
-    }
-
-    /**
-     * 添加实体
-     * @internal
-     * @param name 实体名称，如果不填会自动生成一个唯一名称
-     */
-    _addEntity(name?: string): Entity;
-
-    /**
-     * 添加实体
-     * @internal
-     * @param entityOptions 实体参数
-     */
-    _addEntity(entityOptions: Partial<Entity>): Entity;
-
-    /**
-     * 添加实体
-     * @internal
-     * @param entity 已有的实体实例
-     */
-    _addEntity(entity: Entity): Entity;
-
-    _addEntity(options?: string | Partial<Entity> | Entity) {
-        const index = 0;
-        return this._insertEntityAt(options as any, index);
-    }
-
-    /**
-     * 添加实体
-     * @internal
-     * @param name 实体名称，如果不填会自动生成一个唯一名称
-     */
-    addEntity(name?: string): Entity;
-
-    /**
-     * 添加实体
-     * @param entityOptions 实体参数
-     */
-    addEntity(entityOptions: Partial<Entity>): Entity;
-
-    /**
-     * 添加实体
-     * @param entity 已有的实体实例
-     */
-    addEntity(entity: Entity): Entity;
-
-    addEntity(options?: string | Partial<Entity> | Entity) {
-        const node = this._addEntity(options as any);
-        const index = this.entities.indexOf(node);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'entities',
-        });
-        return node;
-    }
-
-
-    getStructureExistingNames(excludedList: Array<Structure> = []) {
+        getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -1292,56 +1143,6 @@ export class Module extends BaseNode {
 
     
 
-    /**
-    * 删除实体
-    * @param name 实体名称
-    */
-    removeEntity(name: string): void;
-
-    /**
-     * 删除实体
-     * @param entity 已有的实体实例
-     */
-    removeEntity(entity: Entity): void;
-
-    removeEntity(options: string | Entity) {
-        let entity: Entity;
-        if (typeof options === 'string') {
-            entity = this.entities.find((item) => item.name === options);
-            if (!entity) {
-                throw new Error('找不到实体 ' + options);
-            }
-        } else {
-            entity = options;
-        }
-        return entity.delete();
-    }
-
-    __removeEntity(entity: Entity) {
-        const parentKey = entity.parentKey;
-        const params: Params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: entity,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(entity);
-                ~index && (this as any)[parentKey].splice(index, 1);
-                params.index = index;
-            } else if ((this as any)[parentKey] === entity) {
-                params.index = 0;
-                (this as any)[parentKey] = undefined;
-            }
-        }
-        return params;
-    }
-
-
-
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1707,11 +1508,15 @@ export class Module extends BaseNode {
      * 暂时不考虑 Module 嵌套的情况
      */
     getNamespace() {
-        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}.${this.name}`;
+        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
     }
 
     getTsNamespace() {
-        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}.${this.tsName}`;
+        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
+    }
+
+    findEnumByName(name: string) {
+        return this.enums.find((enumItem) => enumItem.name === name);
     }
 
     /**
@@ -1719,7 +1524,7 @@ export class Module extends BaseNode {
      */
 
     findProperty(name: string, propertyType: PropertyType): any {
-        return (this[propertyType] as Array<any>).find((item) => item.name === name);
+        return ((this as any)[propertyType] as Array<any>).find((item) => item.name === name);
     }
 
     //================================================================================
@@ -1728,7 +1533,7 @@ export class Module extends BaseNode {
     //================================================================================
 }
 
-classMap['Module'] = Module;
+classMap.Module = Module;
 export default Module;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑