@lcap/nasl 2.20.0-beta.4 → 2.20.1-beta.1

package/src/concepts/Frontend__.ts

@@ -182,7 +182,7 @@ export class Frontend extends BaseNode {
         });
     }
 
-    getViewExistingNames(excludedList: Array<View> = []) {
+        getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.views as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -323,6 +323,7 @@ export class Frontend extends BaseNode {
         return node;
     }
 
+
     getVarExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.variables as Variable[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -464,6 +465,7 @@ export class Frontend extends BaseNode {
         return node;
     }
 
+
     getModuleExistingNames(excludedList: Array<Module> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.componentDependencies as Module[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -605,6 +607,9 @@ export class Frontend extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -653,6 +658,8 @@ export class Frontend extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -701,6 +708,8 @@ export class Frontend extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除主题
     * @param name 主题名称
@@ -749,6 +758,8 @@ export class Frontend extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除模块
     * @param name 模块名称

package/src/concepts/Identifier__.ts

@@ -39,6 +39,8 @@ export class Identifier extends LogicItem {
     @property()
     name: string = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -52,6 +54,13 @@ export class Identifier extends LogicItem {
         return super.from(source, parentNode, parentKey) as Identifier;
     }
 
+    
+    
+
+    
+
+    
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/Logic__.ts

@@ -1,3 +1,4 @@
+import { FrontendLibrary } from './FrontendLibrary__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
 import Namespace from './Namespace__';
 import CallQueryComponent from './CallQueryComponent__';
@@ -1611,19 +1612,28 @@ export class Logic extends BaseNode {
         const needGetSourceMapOqlList: Promise<any>[] = [];
         this.traverseChildren((el) => {
             if (el && (el instanceof BatchAssignment || (el instanceof Assignment && el.left?.name))) {
-                let jsCode = '';
-                try {
-                    jsCode = el.toJS();
-                } catch (error) {
-
-                }
-                const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && jsCode.startsWith(`${variable.name} = `));
-                if (advanceVar && !advanceMap.get(advanceVar)) {
-                    advanceMap.set(advanceVar, el);
-                }
-                const advanceRn = this.returns?.find((ret) => !ret.typeAnnotation && jsCode.startsWith(`${ret.name} = `));
-                if (advanceRn && !advanceMap.get(advanceRn)) {
-                    advanceMap.set(advanceRn, el);
+                if (el instanceof Assignment) {
+                    const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && (el.left?.name === variable.name));
+                    if (advanceVar && !advanceMap.get(advanceVar)) {
+                        advanceMap.set(advanceVar, el);
+                    }
+                    const advanceRn = this.returns?.find((ret) => !ret.typeAnnotation && el.left?.name === ret.name);
+                    if (advanceRn && !advanceMap.get(advanceRn)) {
+                        advanceMap.set(advanceRn, el);
+                    }
+                } else if (el instanceof BatchAssignment) {
+                    el.assignmentLines.forEach(({ leftIndex }) => {
+                        const leftCode
+                            = leftIndex.length === 1 ? el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true })) : el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                        const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && (leftCode === variable.name));
+                        if (advanceVar && !advanceMap.get(advanceVar)) {
+                            advanceMap.set(advanceVar, el);
+                        }
+                        const advanceRn = this.returns?.find((ret) => !ret.typeAnnotation && leftCode === ret.name);
+                        if (advanceRn && !advanceMap.get(advanceRn)) {
+                            advanceMap.set(advanceRn, el);
+                        }
+                    });
                 }
             }
             // 如果有sql查询组件就需要把他们存起来
@@ -1904,7 +1914,10 @@ export class Logic extends BaseNode {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name = this.name) {
-        const _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
+        let _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
+        if (this.parentNode instanceof FrontendLibrary) {
+            _path += `/frontends/${this.parentNode.type}`;
+        }
         return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;
     }
 

package/src/concepts/Module__.ts

@@ -24,6 +24,7 @@ import Interface from './Interface__';
 import View from './View__';
 import Variable from './Variable__';
 import Process from './Process__';
+import FrontendLibrary from './FrontendLibrary__';
 import ViewComponent from './ViewComponent__';
 import Configuration from './Configuration__';
 import App from './App__';
@@ -130,10 +131,10 @@ export class Module extends BaseNode {
     processes: Array<Process> = [];
 
     /**
-     * 页面组件列表
+     * 端包列表
      */
-    @property('ViewComponent')
-    viewComponents: Array<ViewComponent> = [];
+    @property('FrontendLibrary')
+    frontends: Array<FrontendLibrary> = [];
 
     /**
      * 配置管理
@@ -172,9 +173,8 @@ export class Module extends BaseNode {
         }
         return params;
     }
-    
 
-        getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
+    getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.dataSources as DataSource[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -315,7 +315,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.structures as Structure[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -457,7 +456,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.enums as Enum[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -599,7 +597,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -741,7 +738,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.interfaces as Interface[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -883,7 +879,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.views as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1025,7 +1020,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getVarExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.frontendVariables as Variable[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1167,7 +1161,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.processes as Process[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1309,151 +1302,147 @@ export class Module extends BaseNode {
         return node;
     }
 
-
-    getViewComponentExistingNames(excludedList: Array<ViewComponent> = []) {
+    getFrontendLibraryExistingNames(excludedList: Array<FrontendLibrary> = []) {
         const excludedSet = new Set(excludedList);
-        return ((this.viewComponents as ViewComponent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return ((this.frontends as FrontendLibrary[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
-    getViewComponentUniqueName(name = 'viewComponent1') {
-        return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
+    getFrontendLibraryUniqueName(name = 'frontendLibrary1') {
+        return utils.unique(name, this.getFrontendLibraryExistingNames(), undefined, false);
     }
 
     /**
-    * 插入页面组件
+    * 插入端包
     * @internal
-    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+    * @param name 端包名称，如果不填会自动生成一个唯一名称
     */
-    _insertViewComponentAt(name: string, index: number): ViewComponent;
+    _insertFrontendLibraryAt(name: string, index: number): FrontendLibrary;
 
     /**
-    * 插入页面组件
+    * 插入端包
     * @internal
-    * @param viewComponentOptions 页面组件参数
+    * @param frontendLibraryOptions 端包参数
     */
-    _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+    _insertFrontendLibraryAt(frontendLibraryOptions: Partial<FrontendLibrary>, index: number): FrontendLibrary;
 
     /**
-    * 插入页面组件
+    * 插入端包
     * @internal
-    * @param viewComponent 已有的页面组件实例
+    * @param frontendLibrary 已有的端包实例
     */
-    _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
+    _insertFrontendLibraryAt(frontendLibrary: FrontendLibrary, index: number): FrontendLibrary;
 
-    _insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
-        const viewComponentOptions: any = {};
-        const relationOptions = { parentNode: this, parentKey: 'viewComponents' };
-        let viewComponent: ViewComponent;
+    _insertFrontendLibraryAt(options: string | Partial<FrontendLibrary> | FrontendLibrary, index: number) {
+        const frontendLibraryOptions: any = {};
+        const relationOptions = { parentNode: this, parentKey: 'frontends' };
+        let frontendLibrary: FrontendLibrary;
         if (!options) {
-            viewComponent = ViewComponent.from({
-                ...viewComponentOptions,
-                name: this.getViewComponentUniqueName(),
-            }, this, 'viewComponents');
+            frontendLibrary = FrontendLibrary.from({
+                ...frontendLibraryOptions,
+                name: this.getFrontendLibraryUniqueName(),
+            }, this, 'frontends');
         } else if (typeof options === 'string') {
-            viewComponent = ViewComponent.from({
-                ...viewComponentOptions,
+            frontendLibrary = FrontendLibrary.from({
+                ...frontendLibraryOptions,
                 name: options,
-            }, this, 'viewComponents');
-        } else if (options instanceof ViewComponent) {
+            }, this, 'frontends');
+        } else if (options instanceof FrontendLibrary) {
             options.ensureDelete(); // 同一实例不支持多处存在
-            viewComponent = options;
-            Object.assign(viewComponent, relationOptions);
+            frontendLibrary = options;
+            Object.assign(frontendLibrary, relationOptions);
         } else {
-            viewComponent = ViewComponent.from({
-                ...viewComponentOptions,
+            frontendLibrary = FrontendLibrary.from({
+                ...frontendLibraryOptions,
                 ...options,
-            }, this, 'viewComponents');
+            }, this, 'frontends');
         }
-        this.viewComponents.splice(index, 0, viewComponent);
-        return viewComponent;
+        this.frontends.splice(index, 0, frontendLibrary);
+        return frontendLibrary;
     }
 
     /**
-     * 插入页面组件
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * 插入端包
+     * @param name 端包名称，如果不填会自动生成一个唯一名称
      */
-    insertViewComponentAt(name: string, index: number): ViewComponent;
+    insertFrontendLibraryAt(name: string, index: number): FrontendLibrary;
 
     /**
-     * 插入页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 插入端包
+     * @param frontendLibraryOptions 端包参数
      */
-    insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+    insertFrontendLibraryAt(frontendLibraryOptions: Partial<FrontendLibrary>, index: number): FrontendLibrary;
 
     /**
-     * 插入页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 插入端包
+     * @param frontendLibrary 已有的端包实例
      */
-    insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
+    insertFrontendLibraryAt(frontendLibrary: FrontendLibrary, index: number): FrontendLibrary;
 
-    insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
-        const node = this._insertViewComponentAt(options as any, index);
+    insertFrontendLibraryAt(options: string | Partial<FrontendLibrary> | FrontendLibrary, index: number) {
+        const node = this._insertFrontendLibraryAt(options as any, index);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'viewComponents',
+            parentKey: 'frontends',
         });
         return node;
     }
 
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 端包名称，如果不填会自动生成一个唯一名称
      */
-    _addViewComponent(name?: string): ViewComponent;
+    _addFrontendLibrary(name?: string): FrontendLibrary;
 
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param viewComponentOptions 页面组件参数
+     * @param frontendLibraryOptions 端包参数
      */
-    _addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+    _addFrontendLibrary(frontendLibraryOptions: Partial<FrontendLibrary>): FrontendLibrary;
 
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param viewComponent 已有的页面组件实例
+     * @param frontendLibrary 已有的端包实例
      */
-    _addViewComponent(viewComponent: ViewComponent): ViewComponent;
+    _addFrontendLibrary(frontendLibrary: FrontendLibrary): FrontendLibrary;
 
-    _addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
-        const index = this.viewComponents.length;
-        return this._insertViewComponentAt(options as any, index);
+    _addFrontendLibrary(options?: string | Partial<FrontendLibrary> | FrontendLibrary) {
+        const index = this.frontends.length;
+        return this._insertFrontendLibraryAt(options as any, index);
     }
 
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 端包名称，如果不填会自动生成一个唯一名称
      */
-    addViewComponent(name?: string): ViewComponent;
+    addFrontendLibrary(name?: string): FrontendLibrary;
 
     /**
-     * 添加页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 添加端包
+     * @param frontendLibraryOptions 端包参数
      */
-    addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+    addFrontendLibrary(frontendLibraryOptions: Partial<FrontendLibrary>): FrontendLibrary;
 
     /**
-     * 添加页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 添加端包
+     * @param frontendLibrary 已有的端包实例
      */
-    addViewComponent(viewComponent: ViewComponent): ViewComponent;
+    addFrontendLibrary(frontendLibrary: FrontendLibrary): FrontendLibrary;
 
-    addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
-        const node = this._addViewComponent(options as any);
-        const index = this.viewComponents.indexOf(node);
+    addFrontendLibrary(options?: string | Partial<FrontendLibrary> | FrontendLibrary) {
+        const node = this._addFrontendLibrary(options as any);
+        const index = this.frontends.indexOf(node);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'viewComponents',
+            parentKey: 'frontends',
         });
         return node;
     }
 
-
-    
-
     /**
     * 删除数据源
     * @param name 数据源名称
@@ -1502,8 +1491,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1552,8 +1539,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1602,8 +1587,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1652,8 +1635,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除接口
     * @param name 接口名称
@@ -1702,8 +1683,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -1752,8 +1731,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1802,8 +1779,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除流程
     * @param name 流程名称
@@ -1852,49 +1827,47 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除页面组件
-    * @param name 页面组件名称
+    * 删除端包
+    * @param name 端包名称
     */
-    removeViewComponent(name: string): void;
+    removeFrontendLibrary(name: string): void;
 
     /**
-     * 删除页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 删除端包
+     * @param frontendLibrary 已有的端包实例
      */
-    removeViewComponent(viewComponent: ViewComponent): void;
+    removeFrontendLibrary(frontendLibrary: FrontendLibrary): void;
 
-    removeViewComponent(options: string | ViewComponent) {
-        let viewComponent: ViewComponent;
+    removeFrontendLibrary(options: string | FrontendLibrary) {
+        let frontendLibrary: FrontendLibrary;
         if (typeof options === 'string') {
-            viewComponent = (this.viewComponents as ViewComponent[]).find((item) => item.name === options);
-            if (!viewComponent) {
-                throw new Error('找不到页面组件 ' + options);
+            frontendLibrary = (this.frontends as FrontendLibrary[]).find((item) => item.name === options);
+            if (!frontendLibrary) {
+                throw new Error('找不到端包 ' + options);
             }
         } else {
-            viewComponent = options;
+            frontendLibrary = options;
         }
-        return viewComponent.delete();
+        return frontendLibrary.delete();
     }
 
-    __removeViewComponent(viewComponent: ViewComponent) {
-        const parentKey = viewComponent.parentKey;
+    __removeFrontendLibrary(frontendLibrary: FrontendLibrary) {
+        const parentKey = frontendLibrary.parentKey;
         const params: Params = {
             parentNode: this,
             parentKey,
             index: -1,
             object: null,
-            oldObject: viewComponent,
+            oldObject: frontendLibrary,
         };
         if (parentKey) {
             params.parentKey = parentKey;
             if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(viewComponent);
+                const index = (this as any)[parentKey].indexOf(frontendLibrary);
                 ~index && (this as any)[parentKey].splice(index, 1);
                 params.index = index;
-            } else if ((this as any)[parentKey] === viewComponent) {
+            } else if ((this as any)[parentKey] === frontendLibrary) {
                 params.index = 0;
                 (this as any)[parentKey] = undefined;
             }
@@ -1902,8 +1875,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除配置管理
     * @param name 配置管理名称

package/src/concepts/Param__.ts

@@ -195,6 +195,10 @@ export class Param extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 删除类型标注
     * @param name 类型标注名称