@lcap/nasl 3.4.0-alpha.2 → 3.4.0-beta.1

package/out/translator/utils.js

@@ -11,14 +11,12 @@ exports.indent = indent;
  * 创建编译器状态
  */
 function createCompilerState(startCode = '', options) {
-    const state = Object.assign({
-        position: {
+    const state = { position: {
             line: 0,
             character: 0,
             offset: 0,
         },
-        tabSize: 0,
-    }, options);
+        tabSize: 0, ...options };
     if (!state.sourceMap)
         state.sourceMap = new Map();
     return shiftState(state, startCode);
@@ -28,7 +26,7 @@ exports.createCompilerState = createCompilerState;
  * 根据代码移动位置
  */
 function shiftPosition(pos, code = '') {
-    const res = Object.assign({}, pos);
+    const res = { ...pos };
     if (code) {
         const arr = code.split('\n');
         res.offset += code.length;
@@ -47,7 +45,7 @@ exports.shiftPosition = shiftPosition;
  * 根据代码移动状态
  */
 function shiftState(state, code, options) {
-    state = Object.assign({}, state);
+    state = { ...state };
     state.position = shiftPosition(state.position, code);
     Object.assign(state, options); // 优先 options
     return Object.freeze(state);
@@ -69,31 +67,29 @@ function withSourceMap() {
             catch (err) { }
             if (!state) {
                 // 没有状态不生成 SourceMap
-                return oldMethod.call(this);
+                return oldMethod.call(this, state, ...args);
+            }
+            // state = Object.freeze(Object.assign({
+            //   position: { line: 0, character: 0, offset: 0 },
+            //   tabSize: 0,
+            // }, state));
+            let before = '';
+            if (!state.inline) {
+                before = (0, exports.indent)((state?.tabSize || 0));
+                state = shiftState(state, before);
             }
             else {
-                // state = Object.freeze(Object.assign({
-                //   position: { line: 0, character: 0, offset: 0 },
-                //   tabSize: 0,
-                // }, state));
-                let before = '';
-                if (!state.inline) {
-                    before = (0, exports.indent)((state?.tabSize || 0));
-                    state = shiftState(state, before);
-                }
-                else {
-                    state = shiftState(state, before, {
-                        inline: undefined,
-                    });
-                }
-                // 调用真实方法, 可能有剩余参数
-                const code = oldMethod.call(this, state, ...args);
-                state.sourceMap?.set(this, Object.freeze({
-                    start: state.position,
-                    end: shiftPosition(state.position, code),
-                }));
-                return before + code;
+                state = shiftState(state, before, {
+                    inline: undefined,
+                });
             }
+            // 调用真实方法, 可能有剩余参数
+            const code = oldMethod.call(this, state, ...args);
+            state.sourceMap?.set(this, Object.freeze({
+                start: state.position,
+                end: shiftPosition(state.position, code),
+            }));
+            return before + code;
         };
         return descriptor;
     };

package/out/translator/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/translator/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/translator/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.4.0-alpha.2",
+  "version": "3.4.0-beta.1",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "clear": "rimraf ./out",

package/src/common/BaseNode.ts

@@ -11,7 +11,7 @@ import { Diagnostic } from '../manager/diagnostic';
 
 import { sentryMonitorNaslNode } from '../sentry';
 import operations from '../breakpoint/shared/operations';
-import type { SynatxNode, SynatxNodeConcept, ViewElement, TypeAnnotation, App, Namespace } from '../concepts';
+import type { SyntaxNode, SyntaxNodeConcept, ViewElement, TypeAnnotation, App, Namespace } from '../concepts';
 
 // 确保属性都是定义过的
 function ensureDefined(object: any, concept: string) {
@@ -129,7 +129,7 @@ export class BaseNode extends EventEmitter {
    * 父节点
    */
   @circular()
-  parentNode: SynatxNode = null;
+  parentNode: SyntaxNode = null;
 
   parentKey: string = '';
 
@@ -400,9 +400,9 @@ export class BaseNode extends EventEmitter {
     }
   }
 
-  createNode({ parentNode, parentKey, index }: { parentNode: SynatxNode; parentKey: string; index: number }) {
+  createNode({ parentNode, parentKey, index }: { parentNode: SyntaxNode; parentKey: string; index: number }) {
     if (parentNode) {
-      const property = parentNode[parentKey as keyof SynatxNode];
+      const property = parentNode[parentKey as keyof SyntaxNode];
       if (Array.isArray(property) && index !== -1) {
         property.splice(index, 0, this);
       } else {
@@ -534,73 +534,97 @@ export class BaseNode extends EventEmitter {
    */
   update({ field, ...object }: any) {
     const path = this.getNodePath(false);
+    // 更新前的旧的对象
     const oldObject: any = {};
+    // 更新后的新对象
+    const newObject: any = {};
     for (const key in object) {
       if (key === 'concept') {
         continue;
       }
-
       if (Object.prototype.hasOwnProperty.call(object, key)) {
-        const oldProperty = (this as any)[key] ?? null;
-        oldObject[key] = oldProperty;
-        if (Array.isArray(oldProperty)) {
-          oldObject[key] = oldProperty.map((item) => {
+        // 旧对象收集
+        this.collectOldObject(oldObject, key);
+        // 新对象收集
+        this.collectNewObject(newObject, object, key);
+      }
+    }
+
+    // 更新实例上的属性
+    this.updateInstance(object);
+
+    if (process.env.NODE_ENV === 'development') {
+      console.log('更新节点', 'path', path, 'oldObject', oldObject, 'newObject', newObject);
+    }
+    this.emit('update', {
+      action: 'update',
+      path,
+      object: newObject,
+      oldObject,
+      field,
+    });
+  }
+
+  // 旧对象收集
+  collectOldObject(oldObject: any, key: string) {
+    const oldProperty = (this as any)[key] ?? null;
+    oldObject[key] = oldProperty;
+    if (Array.isArray(oldProperty)) {
+        oldObject[key] = oldProperty.map((item) => {
             let propertyItem = item ?? null;
             if (item instanceof BaseNode) {
-              propertyItem = item.toJSON();
-            }
-            return propertyItem;
-          });
-        } else if (oldProperty instanceof BaseNode) {
-          oldObject[key] = oldProperty.toJSON();
-        }
-        const property = object[key] ?? null;
-        (this as any)[key] = property;
-        const objectRefCtor = getConceptConstructor(property?.concept);
-        if (Array.isArray(property)) {
-          (this as any)[key] = property.map((item) => {
-            let propertyItem = item ?? null;
-            const propertyObjectRefCtor = getConceptConstructor(item?.concept);
-            if (propertyObjectRefCtor?.from) {
-              propertyItem = (propertyObjectRefCtor as any).from(item, this, key);
+                propertyItem = item.toJSON();
             }
             return propertyItem;
-          });
-        } else if (objectRefCtor?.from) {
-          (this as any)[key] = (objectRefCtor as any).from(property, this, key);
-        }
-      }
+        });
+    } else if (oldProperty instanceof BaseNode) {
+        oldObject[key] = oldProperty.toJSON();
     }
-    const newObject: any = {};
+  }
+
+  // 新对象收集
+  collectNewObject(newObject: any, object: any, key: string) {
     const propertyMap = getConceptPropertyMap(this.concept ?? this.constructor.name);
-    for (const key in object) {
-      const property = propertyMap.get(key);
-      if (property) {
+    const property = propertyMap.get(key);
+    if (property) {
         const objProperty = object[key] ?? null;
         const propertyConcept = property?.objectRef;
         if (propertyConcept) {
-          if (Array.isArray(objProperty)) {
+        if (Array.isArray(objProperty)) {
             newObject[key] = objProperty.map((objItem: any) => {
-              return ensureDefined(objItem, propertyConcept);
+                return ensureDefined(objItem, propertyConcept);
             });
-          } else {
+        } else {
             newObject[key] = ensureDefined(objProperty, propertyConcept);
-          }
+        }
         } else {
-          newObject[key] = objProperty;
+            newObject[key] = objProperty;
         }
-      }
     }
-    if (process.env.NODE_ENV === 'development') {
-      console.log('更新节点', 'path', path, 'oldObject', oldObject, 'newObject', newObject);
+  }
+
+  // 更新实例上的属性
+  updateInstance(object: any) {
+     for (const key in object) {
+      if (key === 'concept') {
+        continue;
+      }
+      const property = object[key] ?? null;
+      (this as any)[key] = property;
+      const objectRefCtor = getConceptConstructor(property?.concept);
+      if (Array.isArray(property)) {
+        (this as any)[key] = property.map((item) => {
+          let propertyItem = item ?? null;
+          const propertyObjectRefCtor = getConceptConstructor(item?.concept);
+          if (propertyObjectRefCtor?.from) {
+            propertyItem = (propertyObjectRefCtor as any).from(item, this, key);
+          }
+          return propertyItem;
+        });
+      } else if (objectRefCtor?.from) {
+        (this as any)[key] = (objectRefCtor as any).from(property, this, key);
+      }
     }
-    this.emit('update', {
-      action: 'update',
-      path,
-      object: newObject,
-      oldObject,
-      field,
-    });
   }
 
   _delete(): Params {
@@ -699,13 +723,13 @@ export class BaseNode extends EventEmitter {
   /**
    * 上层节点
    */
-  get upperNode(): SynatxNode {
+  get upperNode(): SyntaxNode {
     // eslint-disable-next-line consistent-this
     let _upperNode: BaseNode = this;
     while (!!_upperNode && _upperNode.concept === this.concept) {
       _upperNode = _upperNode.parentNode;
     }
-    return _upperNode as SynatxNode;
+    return _upperNode as SyntaxNode;
   }
 
   /**
@@ -718,9 +742,9 @@ export class BaseNode extends EventEmitter {
   /**
    * 获取祖先节点
    */
-  getAncestor(concept: SynatxNode['concept']): SynatxNode;
-  getAncestor<Node extends SynatxNode>(concept: Node['concept']): Node;
-  getAncestor<Node extends SynatxNode = SynatxNode>(concept: SynatxNode['concept']): Node {
+  getAncestor(concept: SyntaxNode['concept']): SyntaxNode;
+  getAncestor<Node extends SyntaxNode>(concept: Node['concept']): Node;
+  getAncestor<Node extends SyntaxNode = SyntaxNode>(concept: SyntaxNode['concept']): Node {
     let { upperNode } = this;
     while (upperNode && upperNode.concept && upperNode.concept !== concept) {
       upperNode = upperNode.upperNode;
@@ -782,7 +806,7 @@ export class BaseNode extends EventEmitter {
   instantiate(source: any, parentNode: BaseNode, parentKey: string) {
     if (source instanceof BaseNode) {
       if (!source.parentNode || !source.parentKey) {
-        source.parentNode = parentNode as SynatxNode;
+        source.parentNode = parentNode as SyntaxNode;
         source.parentKey = parentKey;
       }
       return source;
@@ -1109,8 +1133,8 @@ export class BaseNode extends EventEmitter {
     return {};
   }
 
-  public traverseChildren(cb: (ele: SynatxNode) => void): void {
-    function traverse(node: SynatxNode) {
+  public traverseChildren(cb: (ele: SyntaxNode) => void): void {
+    function traverse(node: SyntaxNode) {
       cb(node);
 
       const propertyMap = getConceptPropertyMap(node?.concept);
@@ -1119,12 +1143,12 @@ export class BaseNode extends EventEmitter {
       for (const property of propertyMap.keys()) {
         const child = node[property as keyof BaseNode];
         if (!child) continue;
-        else if (Array.isArray(child)) child.forEach((node: SynatxNode) => traverse(node));
+        else if (Array.isArray(child)) child.forEach((node: SyntaxNode) => traverse(node));
         else traverse(child);
       }
     }
 
-    traverse(this as unknown as SynatxNode);
+    traverse(this as unknown as SyntaxNode);
   }
 
   /**
@@ -1218,7 +1242,7 @@ export class BaseNode extends EventEmitter {
   /**
    * 使用新的 concept 在当前节点生成新的数据
    */
-  changeConceptNode(concept: SynatxNodeConcept) {
+  changeConceptNode(concept: SyntaxNodeConcept) {
     return new Proxy(this, {
       get(target, p: keyof BaseNode, receiver) {
           if (p === 'concept') {
@@ -1231,20 +1255,20 @@ export class BaseNode extends EventEmitter {
   }
 
   /** 收集所有节点 */
-  collectNodes(): SynatxNode[];
+  collectNodes(): SyntaxNode[];
   /** 收集特定类型的子节点 */
-  collectNodes(concept: SynatxNodeConcept): SynatxNode[];
+  collectNodes(concept: SyntaxNodeConcept): SyntaxNode[];
   /** 收集断言返回`true`的子节点 */
-  collectNodes(pre: (node: SynatxNode) => boolean): SynatxNode[];
-  collectNodes(input?: SynatxNodeConcept | ((node: SynatxNode) => boolean)) {
+  collectNodes(pre: (node: SyntaxNode) => boolean): SyntaxNode[];
+  collectNodes(input?: SyntaxNodeConcept | ((node: SyntaxNode) => boolean)) {
     const pre =
       typeof input === 'undefined'
-        ? (node: SynatxNode) => typeof node.concept === 'string'
+        ? (node: SyntaxNode) => typeof node.concept === 'string'
         : typeof input === 'string'
-          ? (node: SynatxNode) => node.concept === input
+          ? (node: SyntaxNode) => node.concept === input
           : input;
-    const nodes: SynatxNode[] = [];
-    const self = this as unknown as SynatxNode;
+    const nodes: SyntaxNode[] = [];
+    const self = this as unknown as SyntaxNode;
 
     if (pre(self)) {
       nodes.push(self);

package/src/concepts/Anchor__.ts

@@ -32,7 +32,9 @@ export class Anchor extends LogicItem {
   /**
    * 参数值
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   expression!: LogicItem;
 

package/src/concepts/AnonymousFunction__.ts

@@ -50,20 +50,27 @@ export class AnonymousFunction extends LogicItem {
   /**
    * 输入参数列表
    */
-  @property('Param')
+  @property({
+    objectRef: 'Param',
+    isArray: true,
+  })
   params: Array<Param> = [];
 
   /**
    * 逻辑项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   body!: LogicItem;
 
   /**
    * 类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
   // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 

package/src/concepts/App__.ts

@@ -131,110 +131,161 @@ export class App extends BaseNode {
   /**
    * 数据源列表
    */
-  @property('DataSource')
+  @property({
+    objectRef: 'DataSource',
+    isArray: true,
+  })
   dataSources: Array<DataSource> = [];
 
   /**
    * 数据结构列表
    */
-  @property('Structure')
+  @property({
+    objectRef: 'Structure',
+    isArray: true,
+  })
   structures: Array<Structure> = [];
 
   /**
    * 枚举列表
    */
-  @property('Enum')
+  @property({
+    objectRef: 'Enum',
+    isArray: true,
+  })
   enums: Array<Enum> = [];
 
   /**
    * 逻辑列表
    */
-  @property('Logic')
+  @property({
+    objectRef: 'Logic',
+    isArray: true,
+  })
   logics: Array<Logic> = [];
 
   /**
    * 覆写逻辑列表
    */
-  @property('OverriddenLogic')
+  @property({
+    objectRef: 'OverriddenLogic',
+    isArray: true,
+  })
   overriddenLogics: Array<OverriddenLogic> = [];
 
   /**
    * interfaces
    */
-  @property('Interface | AuthInterface')
+  @property({
+    objectRef: 'Interface | AuthInterface',
+    isArray: true,
+  })
   interfaces: Array<Interface | AuthInterface> = [];
 
   /**
    * 前端列表
    */
-  @property('Frontend')
+  @property({
+    objectRef: 'Frontend',
+    isArray: true,
+  })
   frontends: Array<Frontend> = [];
 
   /**
    * 后端
    */
-  @property('Backend')
+  @property({
+    objectRef: 'Backend',
+  })
   backend: Backend = new Backend();
 
   /**
    * 流程列表
    */
-  @property('Process')
+  @property({
+    objectRef: 'Process',
+    isArray: true,
+  })
   processes: Array<Process> = [];
 
   /**
    * 角色列表
    */
-  @property('Role')
+  @property({
+    objectRef: 'Role',
+    isArray: true,
+  })
   roles: Array<Role> = [];
 
   /**
    * 配置管理
    */
-  @property('Configuration')
+  @property({
+    objectRef: 'Configuration',
+  })
   configuration: Configuration = new Configuration();
 
   /**
    * 扩展模块列表
    */
-  @property('Module | Connector')
+  @property({
+    objectRef: 'Module | Connector',
+    isArray: true,
+  })
   dependencies: Array<Module | Connector> = [];
 
   /**
    * 接口应用列表（兼容老版）
    */
-  @property('Module')
+  @property({
+    objectRef: 'Module',
+    isArray: true,
+  })
   interfaceDependencies: Array<Module> = [];
 
   /**
    * 集成
    */
-  @property('Integration')
+  @property({
+    objectRef: 'Integration',
+  })
   // @ts-ignore
   integration!: Integration;
 
   /**
    * 暴露接口的接口鉴权
    */
-  @property('AuthLogic')
+  @property({
+    objectRef: 'AuthLogic',
+    isArray: true,
+  })
   authLogics: Array<AuthLogic> = [];
 
   /**
    * 调用接口的鉴权模板
    */
-  @property('AuthLogicForCallInterface')
+  @property({
+    objectRef: 'AuthLogicForCallInterface',
+    isArray: true,
+  })
   authLogicsForCallInterface: Array<AuthLogicForCallInterface> = [];
 
   /**
    * 连接
    */
-  @property('Connection')
+  @property({
+    objectRef: 'Connection',
+    isArray: true,
+  })
   connections: Array<Connection> = [];
 
   /**
    * 触发器启动器
    */
-  @property('TriggerLauncher')
+  @property({
+    objectRef: 'TriggerLauncher',
+    isArray: true,
+  })
   triggerLaunchers: Array<TriggerLauncher> = [];
 
   /**

package/src/concepts/Argument__.ts

@@ -50,7 +50,9 @@ export class Argument extends LogicItem {
   /**
    * 参数值
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   expression!: LogicItem;
 

package/src/concepts/Assignee__.ts

@@ -33,31 +33,44 @@ export class Assignee extends LogicItem {
   /**
    * 绑定用户
    */
-  @property()
+  @property({
+    isArray: true,
+  })
   users: Array<string> = [];
 
   /**
    * 动态用户
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   dynamicUsers: Array<LogicItem> = [];
 
   /**
    * 绑定角色
    */
-  @property()
+  @property({
+    isArray: true,
+  })
   roles: Array<string> = [];
 
   /**
    * 动态角色
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   dynamicRoles: Array<LogicItem> = [];
 
   /**
    * 逻辑用户
    */
-  @property('Logic')
+  @property({
+    objectRef: 'Logic',
+    isArray: true,
+  })
   logicUsers: Array<Logic> = [];
 
   /**