@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/src/bak/translator.js

@@ -113,6 +113,7 @@ export default function (definition) {
             title: ${JSON.stringify(definition.title)},
             crumb: ${JSON.stringify(definition.crumb)},
             first: ${JSON.stringify(definition.first)},
+            auth: ${JSON.stringify(definition.auth)},
         });
 
         ${events.join('\n\n')}

package/src/common/BaseNode.ts

@@ -48,6 +48,13 @@ export class BaseNode extends EventEmitter {
      */
     @property()
     branchName: string = undefined;
+    /**
+     * 合并代码相关
+     */
+     @property()
+     workingCopy: object = undefined;
+     @property()
+     branch: object = undefined;
     /**
      * 父节点
      */
@@ -159,13 +166,23 @@ export class BaseNode extends EventEmitter {
             const property = propertyMap.get(key);
             const sourceItem = (source as any)[key] !== undefined ? (source as any)[key] : (this as any)[key];
             const { objectRef: propertyObjectRef } = property;
-            let objectRefCtor;
+            let objectRefCtor: any;
             try {
                 if (propertyObjectRef) {
                     objectRefCtor = getConceptConstructor(propertyObjectRef);
-                    if (objectRefCtor && sourceItem instanceof objectRefCtor) {
-                        sourceItem.parentNode = this;
-                        sourceItem.parentKey = key;
+                    if (objectRefCtor) {
+                        // if (Array.isArray(sourceItem)) {
+                        //     sourceItem.forEach((item) => {
+                        //         if (item instanceof objectRefCtor) {
+                        //             item.parentNode = this;
+                        //             item.parentKey = key;
+                        //         }
+                        //     });
+                        // } else
+                        if (sourceItem instanceof objectRefCtor) {
+                            sourceItem.parentNode = this;
+                            sourceItem.parentKey = key;
+                        }
                     }
                 }
 
@@ -324,7 +341,8 @@ export class BaseNode extends EventEmitter {
      * 删除节点
      */
     delete() {
-        const path = this.getNodePath(false);
+        const useIndex = ['BindEvent', 'Identifier'].includes(this.concept);
+        const path = this.getNodePath(useIndex);
         const parentParams = this._delete();
         if (parentParams && parentParams.index !== -1) {
             if (Array.isArray((this.parentNode as any)[this.parentKey])) {
@@ -410,6 +428,16 @@ export class BaseNode extends EventEmitter {
     static from(source: any, parentNode?: BaseNode, parentKey?: string): BaseNode {
         // 有一些继承的情况
         const Ctor = classMap[source.concept] || this;
+        if (Ctor && source instanceof Ctor) {
+            if (parentNode) {
+                source.parentNode = parentNode;
+            }
+            if (parentKey) {
+                source.parentKey = parentKey;
+            }
+            return source;
+        }
+
         if (Ctor) {
             const instance = new Ctor();
             if (parentNode) {
@@ -431,7 +459,7 @@ export class BaseNode extends EventEmitter {
         return this.getNodePath(false);
     }
 
-    getNodePath(isCreate: boolean) {
+    getNodePath(useIndex: boolean) {
         let node: BaseNode = this;
         let isNodeSelf = true;
         const pathArr = [];
@@ -444,7 +472,7 @@ export class BaseNode extends EventEmitter {
                 const parentProperty = parentNode[parentKey as keyof BaseNode];
                 if (Array.isArray(parentProperty)) {
                     const name = node.name;
-                    if (!name || (isCreate && isNodeSelf)) {
+                    if (!name || (useIndex && isNodeSelf)) {
                         const index = parentProperty.indexOf(node);
                         path += `[${index}]`;
                     } else {

package/src/concepts/App__.ts

@@ -14,7 +14,7 @@ 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 DataSource from './DataSource__';
 import Structure from './Structure__';
 import Enum from './Enum__';
 import Logic from './Logic__';
@@ -110,10 +110,10 @@ export class App extends BaseNode {
     hasAuth: boolean = undefined;
 
     /**
-     * 实体列表
+     * 数据源列表
      */
-    @property('Entity')
-    entities: Array<Entity> = [];
+    @property('DataSource')
+    dataSources: Array<DataSource> = [];
 
     /**
      * 数据结构列表
@@ -187,8 +187,6 @@ export class App extends BaseNode {
     @property('Module')
     componentDependencies: Array<Module> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -237,148 +235,147 @@ export class App extends BaseNode {
         });
     }
 
-        getEntityExistingNames(excludedList: Array<Entity> = []) {
+    getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
         const excludedSet = new Set(excludedList);
-        return (this.entities || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.dataSources || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
-    getEntityUniqueName(name = 'Entity1') {
-        return utils.unique(name, this.getEntityExistingNames(), undefined, true);
+    getDataSourceUniqueName(name = 'dataSource1') {
+        return utils.unique(name, this.getDataSourceExistingNames(), undefined, true);
     }
 
     /**
-    * 插入实体
+    * 插入数据源
     * @internal
-    * @param name 实体名称，如果不填会自动生成一个唯一名称
+    * @param name 数据源名称，如果不填会自动生成一个唯一名称
     */
-    _insertEntityAt(name: string, index: number): Entity;
+    _insertDataSourceAt(name: string, index: number): DataSource;
 
     /**
-    * 插入实体
+    * 插入数据源
     * @internal
-    * @param entityOptions 实体参数
+    * @param dataSourceOptions 数据源参数
     */
-    _insertEntityAt(entityOptions: Partial<Entity>, index: number): Entity;
+    _insertDataSourceAt(dataSourceOptions: Partial<DataSource>, index: number): DataSource;
 
     /**
-    * 插入实体
+    * 插入数据源
     * @internal
-    * @param entity 已有的实体实例
+    * @param dataSource 已有的数据源实例
     */
-    _insertEntityAt(entity: Entity, index: number): Entity;
+    _insertDataSourceAt(dataSource: DataSource, index: number): DataSource;
 
-    _insertEntityAt(options: string | Partial<Entity> | Entity, index: number) {
-        const entityOptions: any = {};
-        const relationOptions = { parentNode: this, parentKey: 'entities' };
-        let entity: Entity;
+    _insertDataSourceAt(options: string | Partial<DataSource> | DataSource, index: number) {
+        const dataSourceOptions: any = {};
+        const relationOptions = { parentNode: this, parentKey: 'dataSources' };
+        let dataSource: DataSource;
         if (!options) {
-            entity = Entity.from({
-                ...entityOptions,
-                name: this.getEntityUniqueName(),
-            }, this, 'entities');
+            dataSource = DataSource.from({
+                ...dataSourceOptions,
+                name: this.getDataSourceUniqueName(),
+            }, this, 'dataSources');
         } else if (typeof options === 'string') {
-            entity = Entity.from({
-                ...entityOptions,
+            dataSource = DataSource.from({
+                ...dataSourceOptions,
                 name: options,
-            }, this, 'entities');
-        } else if (options instanceof Entity) {
+            }, this, 'dataSources');
+        } else if (options instanceof DataSource) {
             options.ensureDelete(); // 同一实例不支持多处存在
-            entity = options;
-            Object.assign(entity, relationOptions);
+            dataSource = options;
+            Object.assign(dataSource, relationOptions);
         } else {
-            entity = Entity.from({
-                ...entityOptions,
+            dataSource = DataSource.from({
+                ...dataSourceOptions,
                 ...options,
-            }, this, 'entities');
+            }, this, 'dataSources');
         }
-        this.entities.splice(index, 0, entity);
-        return entity;
+        this.dataSources.splice(index, 0, dataSource);
+        return dataSource;
     }
 
     /**
-     * 插入实体
-     * @param name 实体名称，如果不填会自动生成一个唯一名称
+     * 插入数据源
+     * @param name 数据源名称，如果不填会自动生成一个唯一名称
      */
-    insertEntityAt(name: string, index: number): Entity;
+    insertDataSourceAt(name: string, index: number): DataSource;
 
     /**
-     * 插入实体
-     * @param entityOptions 实体参数
+     * 插入数据源
+     * @param dataSourceOptions 数据源参数
      */
-    insertEntityAt(entityOptions: Partial<Entity>, index: number): Entity;
+    insertDataSourceAt(dataSourceOptions: Partial<DataSource>, index: number): DataSource;
 
     /**
-     * 插入实体
-     * @param entity 已有的实体实例
+     * 插入数据源
+     * @param dataSource 已有的数据源实例
      */
-    insertEntityAt(entity: Entity, index: number): Entity;
+    insertDataSourceAt(dataSource: DataSource, index: number): DataSource;
 
-    insertEntityAt(options: string | Partial<Entity> | Entity, index: number) {
-        const node = this._insertEntityAt(options as any, index);
+    insertDataSourceAt(options: string | Partial<DataSource> | DataSource, index: number) {
+        const node = this._insertDataSourceAt(options as any, index);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'entities',
+            parentKey: 'dataSources',
         });
         return node;
     }
 
     /**
-     * 添加实体
+     * 添加数据源
      * @internal
-     * @param name 实体名称，如果不填会自动生成一个唯一名称
+     * @param name 数据源名称，如果不填会自动生成一个唯一名称
      */
-    _addEntity(name?: string): Entity;
+    _addDataSource(name?: string): DataSource;
 
     /**
-     * 添加实体
+     * 添加数据源
      * @internal
-     * @param entityOptions 实体参数
+     * @param dataSourceOptions 数据源参数
      */
-    _addEntity(entityOptions: Partial<Entity>): Entity;
+    _addDataSource(dataSourceOptions: Partial<DataSource>): DataSource;
 
     /**
-     * 添加实体
+     * 添加数据源
      * @internal
-     * @param entity 已有的实体实例
+     * @param dataSource 已有的数据源实例
      */
-    _addEntity(entity: Entity): Entity;
+    _addDataSource(dataSource: DataSource): DataSource;
 
-    _addEntity(options?: string | Partial<Entity> | Entity) {
-        const index = 0;
-        return this._insertEntityAt(options as any, index);
+    _addDataSource(options?: string | Partial<DataSource> | DataSource) {
+        const index = this.dataSources.length;
+        return this._insertDataSourceAt(options as any, index);
     }
 
     /**
-     * 添加实体
+     * 添加数据源
      * @internal
-     * @param name 实体名称，如果不填会自动生成一个唯一名称
+     * @param name 数据源名称，如果不填会自动生成一个唯一名称
      */
-    addEntity(name?: string): Entity;
+    addDataSource(name?: string): DataSource;
 
     /**
-     * 添加实体
-     * @param entityOptions 实体参数
+     * 添加数据源
+     * @param dataSourceOptions 数据源参数
      */
-    addEntity(entityOptions: Partial<Entity>): Entity;
+    addDataSource(dataSourceOptions: Partial<DataSource>): DataSource;
 
     /**
-     * 添加实体
-     * @param entity 已有的实体实例
+     * 添加数据源
+     * @param dataSource 已有的数据源实例
      */
-    addEntity(entity: Entity): Entity;
+    addDataSource(dataSource: DataSource): DataSource;
 
-    addEntity(options?: string | Partial<Entity> | Entity) {
-        const node = this._addEntity(options as any);
-        const index = this.entities.indexOf(node);
+    addDataSource(options?: string | Partial<DataSource> | DataSource) {
+        const node = this._addDataSource(options as any);
+        const index = this.dataSources.indexOf(node);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'entities',
+            parentKey: 'dataSources',
         });
         return node;
     }
 
-
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -520,7 +517,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
         return (this.enums || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -662,7 +658,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -804,7 +799,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
         return (this.interfaces || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -946,7 +940,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return (this.views || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1088,7 +1081,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
         return (this.processes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1230,7 +1222,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getRoleExistingNames(excludedList: Array<Role> = []) {
         const excludedSet = new Set(excludedList);
         return (this.roles || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1372,7 +1363,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getModuleExistingNames(excludedList: Array<Module> = []) {
         const excludedSet = new Set(excludedList);
         return (this.dependencies || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1780,50 +1770,47 @@ export class App extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
-    * 删除实体
-    * @param name 实体名称
+    * 删除数据源
+    * @param name 数据源名称
     */
-    removeEntity(name: string): void;
+    removeDataSource(name: string): void;
 
     /**
-     * 删除实体
-     * @param entity 已有的实体实例
+     * 删除数据源
+     * @param dataSource 已有的数据源实例
      */
-    removeEntity(entity: Entity): void;
+    removeDataSource(dataSource: DataSource): void;
 
-    removeEntity(options: string | Entity) {
-        let entity: Entity;
+    removeDataSource(options: string | DataSource) {
+        let dataSource: DataSource;
         if (typeof options === 'string') {
-            entity = this.entities.find((item) => item.name === options);
-            if (!entity) {
-                throw new Error('找不到实体 ' + options);
+            dataSource = this.dataSources.find((item) => item.name === options);
+            if (!dataSource) {
+                throw new Error('找不到数据源 ' + options);
             }
         } else {
-            entity = options;
+            dataSource = options;
         }
-        return entity.delete();
+        return dataSource.delete();
     }
 
-    __removeEntity(entity: Entity) {
-        const parentKey = entity.parentKey;
+    __removeDataSource(dataSource: DataSource) {
+        const parentKey = dataSource.parentKey;
         const params: Params = {
             parentNode: this,
             parentKey,
             index: -1,
             object: null,
-            oldObject: entity,
+            oldObject: dataSource,
         };
         if (parentKey) {
             params.parentKey = parentKey;
             if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(entity);
+                const index = (this as any)[parentKey].indexOf(dataSource);
                 ~index && (this as any)[parentKey].splice(index, 1);
                 params.index = index;
-            } else if ((this as any)[parentKey] === entity) {
+            } else if ((this as any)[parentKey] === dataSource) {
                 params.index = 0;
                 (this as any)[parentKey] = undefined;
             }
@@ -1831,8 +1818,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1881,8 +1866,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1931,8 +1914,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1981,8 +1962,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除接口
     * @param name 接口名称
@@ -2031,8 +2010,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -2081,8 +2058,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除流程
     * @param name 流程名称
@@ -2131,8 +2106,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除角色
     * @param name 角色名称
@@ -2181,8 +2154,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除主题
     * @param name 主题名称
@@ -2231,8 +2202,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除配置管理
     * @param name 配置管理名称
@@ -2281,8 +2250,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2308,8 +2275,6 @@ export class App extends BaseNode {
         return module.delete();
     }
 
-    
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2335,8 +2300,6 @@ export class App extends BaseNode {
         return module.delete();
     }
 
-    
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2393,8 +2356,12 @@ export class App extends BaseNode {
         return this.componentDependencies.find((componentDependency) => componentDependency.name === name);
     }
 
-    findEntityByName(name: string) {
-        return this.entities.find((entity) => entity.name === name);
+    findDataSourceByName(name: string) {
+        return this.dataSources.find((dataSourceItem) => dataSourceItem.name === name);
+    }
+
+    get defaultDS() {
+        return this.dataSources?.find((dataSource) => dataSource.name === 'defaultDS');
     }
 
     findEnumByName(name: string) {
@@ -2467,6 +2434,10 @@ export class App extends BaseNode {
      * 获取命名空间
      */
     getNamespace() {
+        return 'app';
+    }
+
+    getTsNamespace() {
         return `app`;
     }
 
@@ -2494,6 +2465,36 @@ export class App extends BaseNode {
         return node;
     }
 
+    findNodeByCompleteName(completeName: string) {
+        const nameArr = completeName?.split('.') || [];
+        const start = nameArr.shift();
+        let node: any = this;
+        const mod = 0;
+        const modulesMap: any = {
+            extensions: node.dependencies,
+            apis: node.interfaceDependencies,
+            components: node.componentDependencies,
+        };
+        const modules = modulesMap[start];
+        if (Array.isArray(modules)) {
+            const moduleName = nameArr.shift();
+            node = modules.find((moduleItem) => moduleItem.name === moduleName);
+        }
+        for (let index = 0; index < nameArr.length; index++) {
+            if (!node) {
+                return null;
+            }
+            const nameItem = nameArr[index];
+            const isKeyword = index % 2 === mod;
+            if (!isKeyword && Array.isArray(node)) {
+                node = node.find(({ name }) => name === nameItem);
+            } else {
+                node = node[nameItem];
+            }
+        }
+        return node;
+    }
+
     /**
      * @param path 路径
      * path 为要查找路径：如 /dashboard/student/list、/dashboard/student/list
@@ -2600,7 +2601,7 @@ ${keys.map((key) => `    ${key}: ${this.theme?.variableMap[key]};`).join('\n')}
     //================================================================================
 }
 
-classMap['App'] = App;
+classMap.App = App;
 export default App;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Assignee__.ts

@@ -1,3 +1,6 @@
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
+import { ProcessElement, Process,  } from '..';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -422,7 +425,34 @@ export class Assignee extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    /**
+     * 祖先 ProcessElement
+     */
+        get processElement() {
+        return this.getAncestor('ProcessElement') as ProcessElement;
+    }
+    /**
+     * 祖先 Process
+     */
+    get process() {
+        return this.getAncestor('Process') as Process;
+    }
 
+    @withSourceMap()
+    toEmbeddedTSInProcess(state: TranslatorState, prevCode: string): string {
+        // const tab = indent(state.tabSize);
+        // let code = `const plainuser = [];\n`
+        // code += `const dynamicuser = [];\n`
+        let code = prevCode;
+        code += `return nasl.util.concatString(`;
+        this.dynamicUsers.forEach(u => {
+            code += u.toEmbeddedTS(shiftState(state, code));
+            code += ',\n';
+        })
+        code += ')\n';
+        // code += `${this.dynamicUsers.map(u => u.toEmbeddedTS(shiftState(state, code))).join(',\n')})\n`;
+        return code;
+}
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓