@lcap/nasl 2.12.0 → 2.13.0-beta

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.12.0",
+  "version": "2.13.0-beta",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/bak/translator.js

@@ -88,13 +88,18 @@ export default function (definition) {
     const events = Array.from(eventMap).map(([name, bindEvents]) => `
         const old${name} = componentOptions['${name}'];
         componentOptions['${name}'] = function () {
-            ${bindEvents.map((event) => `old${name} && old${name}.call(this);this.${event.calleeName}();`).join('\n')}
+            ${bindEvents.map((event) => `old${name} && old${name}.call(this);this.${event.view.name}_${event.name}();`).join('\n')}
         }`);
 
     const methods = (definition.logics || []).map((logic) =>
         logic.toJS({
             tabSize: 1,
         }));
+    const eventLogic = (definition.viewBindEvents || []).map((bindEvent) =>
+        bindEvent.toJS({
+            tabSize: 1,
+        }));
+
 
     const output = `
         const methods = componentOptions.methods = componentOptions.methods || {};
@@ -119,6 +124,8 @@ export default function (definition) {
         ${events.join('\n\n')}
 
         ${methods.join('\n\n')}
+        ${eventLogic.join('\n\n')}
+
     `;
 
     return output;

package/src/common/BaseNode.ts

@@ -246,7 +246,7 @@ export class BaseNode extends EventEmitter {
         if (!$event.eventStop) {
             $event.eventList.push($event);
             // 页面逻辑需要冒泡到页面
-            if (['App', 'Process', 'View', 'Interface', 'Entity', 'Structure', 'Enum', 'ConfigProperty'].includes(this.concept) || (this.concept === 'Logic' && this.parentNode?.concept !== 'View')) {
+            if (['App', 'Process', 'View', 'Interface', 'Entity', 'Structure', 'Enum', 'ConfigProperty'].includes(this.concept) || (this.concept === 'Logic' && !(this.getAncestor('View') || this.getAncestor('Process')))) {
                 $event.eventStop = true;
             }
         }

package/src/concepts/App__.ts

@@ -187,6 +187,8 @@ export class App extends BaseNode {
     @property('Module')
     componentDependencies: Array<Module> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -235,7 +237,7 @@ export class App extends BaseNode {
         });
     }
 
-    getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
+        getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
         const excludedSet = new Set(excludedList);
         return (this.dataSources || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -376,6 +378,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -517,6 +520,7 @@ 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);
@@ -658,6 +662,7 @@ 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);
@@ -799,6 +804,7 @@ 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);
@@ -940,6 +946,7 @@ 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);
@@ -1081,6 +1088,7 @@ 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);
@@ -1222,6 +1230,7 @@ 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);
@@ -1363,6 +1372,7 @@ 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);
@@ -1770,6 +1780,9 @@ export class App extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除数据源
     * @param name 数据源名称
@@ -1818,6 +1831,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1866,6 +1881,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1914,6 +1931,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1962,6 +1981,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除接口
     * @param name 接口名称
@@ -2010,6 +2031,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -2058,6 +2081,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除流程
     * @param name 流程名称
@@ -2106,6 +2131,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除角色
     * @param name 角色名称
@@ -2154,6 +2181,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除主题
     * @param name 主题名称
@@ -2202,6 +2231,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除配置管理
     * @param name 配置管理名称
@@ -2250,6 +2281,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2275,6 +2308,8 @@ export class App extends BaseNode {
         return module.delete();
     }
 
+    
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2300,6 +2335,8 @@ export class App extends BaseNode {
         return module.delete();
     }
 
+    
+
     /**
     * 删除模块
     * @param name 模块名称

package/src/concepts/Argument__.ts

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

package/src/concepts/Assignee__.ts

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

package/src/concepts/Assignment__.ts

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

package/src/concepts/Attribute__.ts

@@ -244,7 +244,7 @@ export class Attribute extends BaseNode {
     //================================================================================
 }
 
-classMap['Attribute'] = Attribute;
+classMap.Attribute = Attribute;
 export default Attribute;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BinaryExpression__.ts

@@ -231,9 +231,26 @@ export class BinaryExpression extends LogicItem {
             return code;
         }
         let code = '';
-        code += '(' + (this.left?.toJS(shiftState(state, code, { inline: true })) || '') + ')';
-        code += ` ${this.operator} `;
-        code += '(' + (this.right?.toJS(shiftState(state, code, { inline: true })) || '') + ')';
+        const left = this.left?.toJS(shiftState(state, code, { inline: true })) || '';
+        const right = (this.right?.toJS(shiftState(state, code, { inline: true })) || '');
+        if (['+', '-', '*', '/'].includes(this.operator)) {
+            const operatorMap: any = {
+                '+': 'add',
+                '-': 'minus',
+                '*': 'multiply',
+                '/': 'divide',
+            };
+            code += `this.$global.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
+            code += left;
+            code += `,`;
+            code += right;
+            code += ')';
+            return code;
+        } else {
+            code += `(${left})`;
+            code += ` ${this.operator} `;
+            code += `(${right})`;
+        }
         return code;
     }
 
@@ -281,7 +298,7 @@ export class BinaryExpression extends LogicItem {
     //================================================================================
 }
 
-classMap['BinaryExpression'] = BinaryExpression;
+classMap.BinaryExpression = BinaryExpression;
 export default BinaryExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindAttribute__.ts

@@ -560,7 +560,7 @@ export class BindAttribute extends BaseNode {
     //================================================================================
 }
 
-classMap['BindAttribute'] = BindAttribute;
+classMap.BindAttribute = BindAttribute;
 export default BindAttribute;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindDirective__.ts

@@ -133,6 +133,10 @@ export class BindDirective extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称