@lcap/nasl 2.22.0-beta.5 → 3.0.0-beta.1

package/src/concepts/LogicItem__.ts

@@ -14,7 +14,10 @@ import * as utils from '../utils';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
+import OverriddenLogic from './OverriddenLogic__';
 import Logic from './Logic__';
+import AuthLogic from './AuthLogic__';
+import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
 import Module from './Module__';
 import App from './App__';
 import View from './View__';
@@ -31,7 +34,7 @@ export class LogicItem extends BaseNode {
      * 产品概念
      */
     @property()
-    concept: 'LogicItem' | 'Abort' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'JavaLogic' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes' = 'LogicItem';
+    concept: 'LogicItem' | 'Abort' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'CallAuthInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'JavaLogic' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes' = 'LogicItem';
 
     /**
      * 逻辑项标题
@@ -64,10 +67,10 @@ export class LogicItem extends BaseNode {
     offsetY: number = undefined;
 
     /**
-     * 祖先 Logic
+     * 祖先 OverriddenLogic
      */
-    get logic() {
-        return this.getAncestor('Logic') as Logic;
+    get OverriddenLogic() {
+        return this.getAncestor('OverriddenLogic') as OverriddenLogic;
     }
     /**
      * 祖先 Module
@@ -105,6 +108,24 @@ export class LogicItem extends BaseNode {
     get process() {
         return this.getAncestor('Process') as Process;
     }
+    /**
+     * 祖先 Logic
+     */
+    get logic() {
+        return this.getAncestor('Logic') as Logic;
+    }
+    /**
+     * 祖先 AuthLogic
+     */
+    get AuthLogic() {
+        return this.getAncestor('AuthLogic') as AuthLogic;
+    }
+    /**
+     * 祖先 AuthLogicForCallInterface
+     */
+    get AuthLogicForCallInterface() {
+        return this.getAncestor('AuthLogicForCallInterface') as AuthLogicForCallInterface;
+    }
 
     /**
      * @param source 需要合并的部分参数
@@ -177,7 +198,6 @@ export class LogicItem extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
     get completeName() {
         return this.name;
     }
@@ -254,7 +274,7 @@ export class LogicItem extends BaseNode {
         this.traverseChildren((el) => {
             if (el?.concept === 'CallQueryComponent')
                 (el as CallQueryComponent).removeStructure();
-            else if (el?.concept === 'CallInterface')
+            else if (['CallInterface', 'CallAuthInterface'].includes(el?.concept))
                 (el as CallInterface).deleteCallNode();
         });
         this.app?.emit('collect:end');

package/src/concepts/Logic__.ts

@@ -47,7 +47,7 @@ export class Logic extends BaseNode {
      * 产品概念
      */
     @property()
-    concept: 'Logic' = 'Logic';
+    concept: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' = 'Logic';
 
     /**
      * 逻辑名称
@@ -73,6 +73,12 @@ export class Logic extends BaseNode {
     @property()
     cron: string = undefined;
 
+    /**
+     * overridable
+     */
+    @property()
+    overridable: boolean = undefined;
+
     /**
      * 事务
      */
@@ -234,6 +240,18 @@ export class Logic extends BaseNode {
         });
     }
 
+    /**
+     * 设置overridable
+     */
+    setOverridable(overridable: boolean) {
+        const object = {
+            overridable,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     /**
      * 设置事务
      */
@@ -249,7 +267,7 @@ export class Logic extends BaseNode {
         });
     }
 
-    getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
+        getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -390,6 +408,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -527,6 +546,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -664,6 +684,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -801,6 +822,11 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
+
+
+
     /**
     * 插入逻辑项
     * @internal
@@ -833,6 +859,8 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
+
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -855,6 +883,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
     /**
      * 添加逻辑项
      * @internal
@@ -874,6 +904,8 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
+
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -897,6 +929,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
     /**
     * 插入逻辑项
     * @internal
@@ -929,6 +963,8 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
+
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -951,6 +987,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
     /**
      * 添加逻辑项
      * @internal
@@ -970,6 +1008,8 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
+
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -993,6 +1033,9 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
+
     /**
     * 删除事务
     * @param name 事务名称
@@ -1041,6 +1084,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除类型参数
     * @param name 类型参数名称
@@ -1089,6 +1134,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1137,6 +1184,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1185,6 +1234,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -1233,6 +1284,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1240,10 +1293,12 @@ export class Logic extends BaseNode {
     removeItemInBody(logicItem: LogicItem): void;
 
     removeItemInBody(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
+
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1251,7 +1306,7 @@ export class Logic extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -1784,7 +1839,7 @@ export class Logic extends BaseNode {
             return _interface ? `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})` : null;
         }
 
-        // 调用全局逻辑，参数替换成 null
+        // 调用服务端逻辑，参数替换成 null
         if (rightNode instanceof CallLogic && rightNode.calleeNamespace === 'app.logics') {
             const calleeName = rightNode?.calleeName;
             const calleeLogic = this.app.logics.find((l) => l.name === calleeName);
@@ -1922,6 +1977,8 @@ export class Logic extends BaseNode {
         let _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
         if (this.parentNode instanceof FrontendLibrary) {
             _path += `/frontends/${this.parentNode.type}`;
+        } else if (this.parentNode.concept === 'BindEvent' && this.parentNode?.parentNode.concept === 'Frontend') {
+            _path += `/frontends/${this.parentNode.parentNode.name}/bindEvents/${name}.ts`;
         }
         return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;
     }
@@ -1933,7 +1990,7 @@ export class Logic extends BaseNode {
         try {
             code += this.toEmbeddedTS(state);
         } catch (err) {
-            console.log(err, '有问题翻译失败');
+            console.log(err, `有问题翻译失败:${this.getTsNamespace()}.${this.name}`);
             code += '';
             console.log(err);
         }
@@ -1945,7 +2002,11 @@ export class Logic extends BaseNode {
         };
     }
 
-    public static getDefaultOptions() {
+    public static getDefaultOptions(): Partial<{
+        body: Array<any>,
+        params: Array<any>,
+        returns: Array<any>,
+    }> {
         return {
             body: [
                 {
@@ -2015,7 +2076,24 @@ export class Logic extends BaseNode {
     get pathName() {
         if (this.view) {
             return this.getEventLogicName('chinese');
+        } else if (this.parentNode.concept === 'BindEvent' && this.parentNode.parentNode.concept === 'Frontend') {
+            const frontEndEventNameMap = {
+                rendered: '应用进入后',
+                preRequest: '调用服务端逻辑前',
+                postRequest: '调用服务端逻辑后',
+                beforeRouter: '页面切换前',
+                afterRouter: '页面切换后',
+            };
+            const pathName = [this.name];
+            let parentNode = this.parentNode;
+            while (parentNode && parentNode.concept !== 'Frontend') {
+                const name = (frontEndEventNameMap as any)[parentNode.name] || parentNode.name;
+                pathName.unshift(name);
+                parentNode = parentNode.parentNode;
+            }
+            return pathName.join('-');
         }
+
         const nameMap = {
             OnProcessStart: '流程开始时',
             OnTasksCreate: '任务创建时',
@@ -2040,7 +2118,7 @@ export class Logic extends BaseNode {
             if (type === 'chinese') {
                 const bindEvent = this.parentNode;
                 const bindChineseName = bindEvent.getPageViewEventChineseName();
-                return `${bindChineseName}-${this.name}`;
+                return `${bindChineseName} -${this.name} `;
             }
         }
         return this.name;

package/src/concepts/Module__.ts

@@ -86,7 +86,7 @@ export class Module extends BaseNode {
      * 外部语言依赖
      */
     @property()
-    compilerInfoMap: { java?: Array<{ packageName: string, className:string, naslName: string, type: string, javaTypes:any }> } = undefined;
+    compilerInfoMap: { java?: Array<{ packageName: string,className:string,naslName: string, type: string,javaTypes:any }> } = undefined;
 
     /**
      * 数据源列表
@@ -182,8 +182,9 @@ 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);
     }
@@ -324,6 +325,7 @@ 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);
@@ -465,6 +467,7 @@ 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);
@@ -606,6 +609,7 @@ 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);
@@ -747,6 +751,7 @@ 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);
@@ -888,6 +893,7 @@ 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);
@@ -1029,6 +1035,7 @@ 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);
@@ -1170,6 +1177,7 @@ 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);
@@ -1311,6 +1319,7 @@ export class Module extends BaseNode {
         return node;
     }
 
+
     getFrontendLibraryExistingNames(excludedList: Array<FrontendLibrary> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.frontends as FrontendLibrary[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1452,6 +1461,9 @@ export class Module extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除数据源
     * @param name 数据源名称
@@ -1500,6 +1512,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1548,6 +1562,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1596,6 +1612,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1644,6 +1662,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除接口
     * @param name 接口名称
@@ -1692,6 +1712,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -1740,6 +1762,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -1788,6 +1812,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除流程
     * @param name 流程名称
@@ -1836,6 +1862,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除端包
     * @param name 端包名称
@@ -1884,6 +1912,8 @@ export class Module extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除配置管理
     * @param name 配置管理名称

package/src/concepts/Namespace__.ts

@@ -116,7 +116,7 @@ export class Namespace extends BaseNode {
     variables: Array<Variable> = [];
 
     /**
-     * 页面组件列表
+     * 平台类型列表
      */
     @property('ViewComponent')
     viewComponents: Array<ViewComponent> = [];
@@ -1578,23 +1578,23 @@ export class Namespace extends BaseNode {
     }
 
     /**
-    * 插入页面组件
+    * 插入平台类型
     * @internal
-    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+    * @param name 平台类型名称，如果不填会自动生成一个唯一名称
     */
     _insertViewComponentAt(name: string, index: number): ViewComponent;
 
     /**
-    * 插入页面组件
+    * 插入平台类型
     * @internal
-    * @param viewComponentOptions 页面组件参数
+    * @param viewComponentOptions 平台类型参数
     */
     _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
 
     /**
-    * 插入页面组件
+    * 插入平台类型
     * @internal
-    * @param viewComponent 已有的页面组件实例
+    * @param viewComponent 已有的平台类型实例
     */
     _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
 
@@ -1627,20 +1627,20 @@ export class Namespace extends BaseNode {
     }
 
     /**
-     * 插入页面组件
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * 插入平台类型
+     * @param name 平台类型名称，如果不填会自动生成一个唯一名称
      */
     insertViewComponentAt(name: string, index: number): ViewComponent;
 
     /**
-     * 插入页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 插入平台类型
+     * @param viewComponentOptions 平台类型参数
      */
     insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
 
     /**
-     * 插入页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 插入平台类型
+     * @param viewComponent 已有的平台类型实例
      */
     insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
 
@@ -1655,23 +1655,23 @@ export class Namespace extends BaseNode {
     }
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 平台类型名称，如果不填会自动生成一个唯一名称
      */
     _addViewComponent(name?: string): ViewComponent;
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param viewComponentOptions 页面组件参数
+     * @param viewComponentOptions 平台类型参数
      */
     _addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param viewComponent 已有的页面组件实例
+     * @param viewComponent 已有的平台类型实例
      */
     _addViewComponent(viewComponent: ViewComponent): ViewComponent;
 
@@ -1681,21 +1681,21 @@ export class Namespace extends BaseNode {
     }
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 平台类型名称，如果不填会自动生成一个唯一名称
      */
     addViewComponent(name?: string): ViewComponent;
 
     /**
-     * 添加页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 添加平台类型
+     * @param viewComponentOptions 平台类型参数
      */
     addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
 
     /**
-     * 添加页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 添加平台类型
+     * @param viewComponent 已有的平台类型实例
      */
     addViewComponent(viewComponent: ViewComponent): ViewComponent;
 
@@ -2333,14 +2333,14 @@ export class Namespace extends BaseNode {
 
 
     /**
-    * 删除页面组件
-    * @param name 页面组件名称
+    * 删除平台类型
+    * @param name 平台类型名称
     */
     removeViewComponent(name: string): void;
 
     /**
-     * 删除页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 删除平台类型
+     * @param viewComponent 已有的平台类型实例
      */
     removeViewComponent(viewComponent: ViewComponent): void;
 
@@ -2349,7 +2349,7 @@ export class Namespace extends BaseNode {
         if (typeof options === 'string') {
             viewComponent = (this.viewComponents as ViewComponent[]).find((item) => item.name === options);
             if (!viewComponent) {
-                throw new Error('找不到页面组件 ' + options);
+                throw new Error('找不到平台类型 ' + options);
             }
         } else {
             viewComponent = options;