@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/concepts/BindDirective__.ts

@@ -10,24 +10,23 @@ import {
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import type MemberExpression from './MemberExpression__';
+import ViewElement from './ViewElement__';
+import View from './View__';
+import Module from './Module__';
+import Frontend from './Frontend__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import type LogicItem from './LogicItem__';
-import type ViewElement from './ViewElement__';
-import type View from './View__';
-import type Module from './Module__';
-import type App from './App__';
-import type Frontend from './Frontend__';
+import LogicItem from './LogicItem__';
 
 /**
  * 元素指令
@@ -36,7 +35,11 @@ import type Frontend from './Frontend__';
 export class BindDirective extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'BindDirective';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -46,30 +49,37 @@ export class BindDirective extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'BindDirective';
-
   /**
    * 元素指令名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 原始名称
    */
-  @property()
-  rawName!: string;
+  @property({
+    objectRef: '',
+  })
+  rawName: string;
 
   /**
    * type
    */
-  @property()
-  type!: 'string' | 'static' | 'dynamic';
+  @property({
+    objectRef: '',
+  })
+  type: 'string' | 'static' | 'dynamic';
 
   /**
    * 指令值
    */
-  @property()
-  value!: string;
+  @property({
+    objectRef: '',
+  })
+  value: string;
 
   /**
    * 属性表达式
@@ -77,19 +87,23 @@ export class BindDirective extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  expression!: LogicItem;
+  expression: LogicItem;
 
   /**
    * 指令参数
    */
-  @property()
-  arg!: string;
+  @property({
+    objectRef: '',
+  })
+  arg: string;
 
   /**
    * 指令修饰器
    */
-  @property()
-  modifiers!: string;
+  @property({
+    objectRef: '',
+  })
+  modifiers: string;
 
   /**
    * 草稿态
@@ -102,41 +116,12 @@ export class BindDirective extends BaseNode {
   playground: Array<LogicItem> = [];
 
   /**
-   * i18nKey
-   */
-  @property()
-  i18nKey!: string;
-
-  /**
-   * 祖先 ViewElement
-   */
-  get element() {
-    return this.getAncestor('ViewElement') as ViewElement;
-  }
-  /**
-   * 祖先 View
-   */
-  get view() {
-    return this.getAncestor('View') as View;
-  }
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
-  /**
-   * 祖先 Frontend
+   * 国际化键
    */
-  get frontend() {
-    return this.getAncestor('Frontend') as Frontend;
-  }
+  @property({
+    objectRef: '',
+  })
+  i18nKey: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -151,17 +136,6 @@ export class BindDirective extends BaseNode {
     return super.from(source, parentNode, parentKey) as BindDirective;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeBindDirective?.(this);
-    }
-    return params;
-  }
   /**
    * 设置属性表达式
    */
@@ -278,31 +252,6 @@ export class BindDirective extends BaseNode {
     return node;
   }
 
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeExpression(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param expression 已有的逻辑项实例
-   */
-  removeExpression(expression: LogicItem): void;
-
-  removeExpression(options: string | LogicItem) {
-    let expression: LogicItem;
-    if (typeof options === 'string') {
-      expression = this.expression;
-      if (!expression) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      expression = options;
-    }
-    return expression.delete();
-  }
-
   /**
    * 删除逻辑项
    * @param logicItem 已有的逻辑项实例
@@ -314,41 +263,35 @@ export class BindDirective extends BaseNode {
     return logicItem.delete();
   }
 
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  /**
+   * 祖先 ViewElement
+   */
+  get element() {
+    return this.getAncestor('ViewElement') as ViewElement;
+  }
+  /**
+   * 祖先 View
+   */
+  get view() {
+    return this.getAncestor('View') as View;
+  }
+  /**
+   * 祖先 Module
+   */
+  get module() {
+    return this.getAncestor('Module') as Module;
+  }
+  /**
+   * 祖先 Frontend
+   */
+  get frontend() {
+    return this.getAncestor('Frontend') as Frontend;
+  }
+
   onChange($event?: EventPayload): void {
     this.emit('change', $event);
   }
@@ -636,29 +579,31 @@ export class BindDirective extends BaseNode {
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
-    // 业务组件
-    const isBusinessComponent = self.viewElement?.correspondingBusinessComponent;
+    let { name } = self;
     let code = '';
-    if (!isBusinessComponent) {
-      code += '()=>{';
+    if (!name) {
+      return code;
     }
+    name = `_${name}`;
+
+    code += `${name}: ((): any => {\n`;
+
     if (self.expression) {
+      code += 'return ';
       code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      code += '\n';
+      code += ';\n';
     }
+
+    // 草稿区
     if (self.type === 'dynamic') {
       yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         if (index !== self.playground.length - 1) code += '\n';
       });
     }
-    if (isBusinessComponent) {
-      if (code) {
-        code = `${self.name === 'if' ? '__NASLIF' : self.name}: ${code}`;
-      }
-    } else {
-      code += '}';
-    }
+
+    code += `})()`;
+
     return code;
   }
 

package/src/concepts/BindEvent__.ts

@@ -18,26 +18,24 @@ import type TypeAnnotation from './TypeAnnotation__';
 import type Process from './Process__';
 import type BusinessComponent from './BusinessComponent__';
 
+import ViewElement from './ViewElement__';
+import View from './View__';
+import Module from './Module__';
+import Frontend from './Frontend__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import type Logic from './Logic__';
-import type Argument from './Argument__';
-import type ViewElement from './ViewElement__';
-import type View from './View__';
-import type Module from './Module__';
-import type App from './App__';
-import type Frontend from './Frontend__';
-import type LogicItem from './LogicItem__';
+import Logic from './Logic__';
+import Argument from './Argument__';
 
 /**
  * 元素绑定事件
@@ -46,7 +44,11 @@ import type LogicItem from './LogicItem__';
 export class BindEvent extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'BindEvent';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -56,12 +58,13 @@ export class BindEvent extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'BindEvent';
-
   /**
    * 元素绑定事件名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 逻辑列表
@@ -76,14 +79,18 @@ export class BindEvent extends BaseNode {
   /**
    * calleeNamespace
    */
-  @property()
-  calleeNamespace!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property()
-  calleeName!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeName: string;
 
   /**
    * 实际参数
@@ -95,37 +102,6 @@ export class BindEvent extends BaseNode {
   })
   arguments: Array<Argument> = [];
 
-  /**
-   * 祖先 ViewElement
-   */
-  get element() {
-    return this.getAncestor('ViewElement') as ViewElement;
-  }
-  /**
-   * 祖先 View
-   */
-  get view() {
-    return this.getAncestor('View') as View;
-  }
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
-  /**
-   * 祖先 Frontend
-   */
-  get frontend() {
-    return this.getAncestor('Frontend') as Frontend;
-  }
-
   /**
    * @param source 需要合并的部分参数
    */
@@ -139,17 +115,6 @@ export class BindEvent extends BaseNode {
     return super.from(source, parentNode, parentKey) as BindEvent;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeBindEvent?.(this);
-    }
-    return params;
-  }
   /**
    * 设置元素绑定事件名称
    */
@@ -189,7 +154,7 @@ export class BindEvent extends BaseNode {
 
   getLogicExistingNames(excludedList: Array<Logic> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, true);
@@ -467,37 +432,6 @@ export class BindEvent extends BaseNode {
     return logic.delete();
   }
 
-  __removeLogic(logic: Logic) {
-    const parentKey = logic.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logic,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logic.__v_raw || logic;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除实际参数
    * @param argument 已有的实际参数实例
@@ -509,41 +443,35 @@ export class BindEvent extends BaseNode {
     return argument.delete();
   }
 
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  /**
+   * 祖先 ViewElement
+   */
+  get element() {
+    return this.getAncestor('ViewElement') as ViewElement;
+  }
+  /**
+   * 祖先 View
+   */
+  get view() {
+    return this.getAncestor('View') as View;
+  }
+  /**
+   * 祖先 Module
+   */
+  get module() {
+    return this.getAncestor('Module') as Module;
+  }
+  /**
+   * 祖先 Frontend
+   */
+  get frontend() {
+    return this.getAncestor('Frontend') as Frontend;
+  }
+
   get process() {
     return this.getAncestor('Process') as Process;
   }
@@ -660,9 +588,16 @@ export class BindEvent extends BaseNode {
       }
       return code;
     }
-    code = `${self.toHump(self.name) || '__IDENTIFIER__'}: (event: `;
+    code = `on${utils.kebab2Pascal(self.name) || '__IDENTIFIER__'}: (event`;
     // event的类型
-    code += yield* self.getEventTypeString(state);
+
+    // 业务组件
+    const businessComponent = this.element?.correspondingBusinessComponent;
+    if (businessComponent) {
+      code += `: `;
+      code += yield* self.getEventTypeString(state);
+    }
+
     code += ') => [\n';
     yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
       // 一些默认的逻辑不翻译 排除掉
@@ -1162,8 +1097,9 @@ export class BindEvent extends BaseNode {
         parent = parent.parentNode;
       }
     }
-    return `/embedded/${this.getAncestor('App')?.name}/frontends/${this.getAncestor('FrontendType')?.name
-      }/bindEvents/${pathName}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontends/${
+      this.getAncestor('FrontendType')?.name
+    }/bindEvents/${pathName}.ts`;
   }
 
   //================================================================================