@lcap/nasl 1.0.2 → 2.12.0

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;
+                        }
                     }
                 }
 

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> = [];
 
     /**
      * 数据结构列表
@@ -235,143 +235,143 @@ 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;
     }
@@ -1771,46 +1771,46 @@ export class App extends BaseNode {
     }
 
     /**
-    * 删除实体
-    * @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;
             }
@@ -2356,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) {
@@ -2430,7 +2434,7 @@ export class App extends BaseNode {
      * 获取命名空间
      */
     getNamespace() {
-        return `app`;
+        return 'app';
     }
 
     getTsNamespace() {
@@ -2461,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

package/src/concepts/BindAttribute__.ts

@@ -548,9 +548,9 @@ export class BindAttribute extends BaseNode {
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
         if (this.name === 'destination') {
-            code += this.destination.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+            code += this.destination.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         } else if (this.expression) {
-            code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+            code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         }
         return code;
     }

package/src/concepts/BindDirective__.ts

@@ -133,10 +133,6 @@ export class BindDirective extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -208,8 +204,14 @@ export class BindDirective extends BaseNode {
      */
     toVue(options?: ElementToVueOptions) {
         let modifiersString = '';
-        Object.keys(this.modifiers || {}).forEach((key) => {
-            const value = (this.modifiers as any)[key];
+        let modifiers = {};
+        try {
+            modifiers = JSON.parse(this.modifiers || '{}');
+        } catch (err) {
+            modifiers = {};
+        }
+        Object.keys(modifiers).forEach((key) => {
+            const value = (modifiers as any)[key];
             if (value)
                 modifiersString += '.' + key;
         });
@@ -253,7 +255,7 @@ export class BindDirective extends BaseNode {
     //================================================================================
 }
 
-classMap['BindDirective'] = BindDirective;
+classMap.BindDirective = BindDirective;
 export default BindDirective;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindEvent__.ts

@@ -291,6 +291,10 @@ export class BindEvent extends BaseNode {
     //================================================================================
     // 用于logic回填
     get calleewholeKey(): string {
+        if (!this.calleeNamespace && this.calleeName) {
+            // 页面逻辑单独处理
+            return `${this.view.getNamespace()}.${this.view.name}.logics.${this.calleeName}`;
+        }
         return this.calleeNamespace + '.' + this.calleeName;
     }
     get tsCalleeNamespace() {
@@ -338,11 +342,11 @@ export class BindEvent extends BaseNode {
             if (isPageCycle) {
                 return `${this.calleeKey}();`;
             }
-            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
-            code += indent(state.tabSize + 1);
+            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event: any) => [\n`;
+            code += indent((state?.tabSize || 0) + 1);
             code += `() => {${this.calleeKey}()}`;
             code += '\n';
-            code += indent(state.tabSize);
+            code += indent((state?.tabSize || 0));
             code += '],\n';
             return code;
         }
@@ -354,10 +358,10 @@ export class BindEvent extends BaseNode {
     //     let code = '';
     //     if (this.name) {
     //         code = `function ${this.name || '__IDENTIFIER__'} () {\n`;
-    //         code += indent(state.tabSize + 1);
+    //         code += indent((state?.tabSize || 0) + 1);
     //         code += `${this.calleeKey}()`;
     //         code += '\n';
-    //         code += indent(state.tabSize);
+    //         code += indent((state?.tabSize || 0));
     //         code += '};\n';
     //     }
     //     return code;
@@ -367,8 +371,12 @@ export class BindEvent extends BaseNode {
      * 设置callee
      */
     setCallee(logic: Logic) {
+        let calleeNamespace = logic.getNamespace();
+        if (logic.parentNode instanceof View) {
+            calleeNamespace = '';
+        }
         const object = {
-            calleeNamespace: logic.getNamespace(),
+            calleeNamespace,
             calleeName: logic.name,
         };
         this.update({

package/src/concepts/BooleanLiteral__.ts

@@ -72,6 +72,18 @@ export class BooleanLiteral extends LogicItem {
     toEmbeddedTS(state?: TranslatorState) {
         return this.value;
     }
+
+    /**
+     * 设置布尔值内容
+     */
+    setValue(value: string) {
+        const object = {
+            value,
+        };
+        this.update({
+            ...object,
+        });
+    }
     getValue() {
         return this.value;
     }

package/src/concepts/CallFunction__.ts

@@ -421,10 +421,10 @@ export class CallFunction extends LogicItem {
                 code += ', ';
         });
         if (this.typeArguments && this.typeArguments.length) {
-            code += ', ';
+            if (this.arguments?.length) code += ', ';
             this.typeArguments?.forEach((arg, index) => {
                 code += arg?.toJS(shiftState(state, code));
-                if (index !== this.arguments?.length - 1)
+                if (index !== this.typeArguments?.length - 1)
                     code += ', ';
             });
         }
@@ -456,6 +456,10 @@ export class CallFunction extends LogicItem {
             if (param.defaultExpression instanceof Identifier) {
                 argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
             }
+            if (param.defaultExpression instanceof Function) {
+                (param.defaultExpression as Function).returnExpression = null;
+                argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
+            }
             Object.assign(argument, relationOptions);
             return argument;
         });