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

package/out/common/BaseNode.js

@@ -37,9 +37,8 @@ exports.BaseNode = void 0;
 const lodash_1 = require("lodash");
 const uuid_1 = require("uuid");
 const map_1 = require("../service/storage/map");
-const EventEmitter_1 = require("./EventEmitter");
 const utils = __importStar(require("../utils"));
-const classMap_1 = __importDefault(require("./classMap"));
+const EventEmitter_1 = require("./EventEmitter");
 const decorators_1 = require("../decorators");
 const sentry_1 = require("../sentry");
 const operations_1 = __importDefault(require("../breakpoint/shared/operations"));
@@ -72,6 +71,7 @@ function ensureDefined(object, concept) {
                 }
             }
         }
+        newObject.concept = actualConcept;
     }
     return newObject;
 }
@@ -80,15 +80,31 @@ function ensureDefined(object, concept) {
  * 属性均为只读，仅在初始化和 load 的情况下可以修改
  */
 let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
+    static ConceptName = 'BaseNode';
     /**
      * 可修改标志，内部属性
      * 标记在构造函数结束后是否可修改
      */
     _mutable = true;
+    /** 节点类别缓存 */
+    _concept;
     /**
      * 概念
      */
-    concept = undefined;
+    get concept() {
+        return this._concept ?? this.constructor.ConceptName;
+    }
+    set concept(val) {
+        console.warn(`[警告] 尽快移除变更 concept 值的操作，下个版本 concept 将会改为只读。\n当前变更：${this.concept} -> ${val}，原始节点类别：${this.constructor.ConceptName}`);
+        if (val !== this.concept) {
+            if (val === this.constructor.ConceptName) {
+                delete this._concept;
+            }
+            else {
+                this._concept = val;
+            }
+        }
+    }
     /**
      * toJSON 时需要去除的键，为了避免出现 CircularJSON
      */
@@ -100,16 +116,16 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
     /**
      * 变动时间
      */
-    changedTime = undefined;
+    changedTime;
     /**
      * 分支名称
      */
-    branchName = undefined;
+    branchName;
     /**
      * 合并代码相关
      */
-    workingCopy = undefined;
-    branch = undefined;
+    workingCopy;
+    branch;
     /**
      * 断点状态
      * undefined ==> 未设置
@@ -117,7 +133,7 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
      * 'ENABLED' ==> 启用断点
      * 'DISABLED' ==> 禁用断点
      */
-    breakpoint = undefined;
+    breakpoint;
     /**
      * 父节点
      */
@@ -127,75 +143,80 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
      * 是否正在编辑
      * 前端 UI 状态
      */
-    editable = undefined;
+    editable;
     /**
      * 是否可以删除
      * 前端 UI 状态
      */
-    removable = undefined;
+    removable;
     /**
      * 是否正在编辑
      * 前端 UI 状态
      */
-    editing = false;
+    editing;
     /**
      * 是否正在请求
      * 前端 UI 状态
      */
-    loading = false;
+    loading;
     /**
      * 节点是否为展开状态
      * 前端 UI 状态
      */
-    expanded = false;
+    expanded;
     /**
      * 节点是否显示
      * 前端 UI 状态
      */
-    hidden = false;
+    hidden;
     /**
      * 页面树节点是否显示
      * 前端 UI 状态
      */
-    pageTreeNodeHidden = false;
+    pageTreeNodeHidden;
     /**
      * 逻辑树节点是否显示
      * 前端 UI 状态
      */
-    logicTreeNodeHidden = false;
+    logicTreeNodeHidden;
     /**
      * 数据树节点是否显示
      * 前端 UI 状态
      */
-    dataTreeNodeHidden = false;
+    dataTreeNodeHidden;
+    /**
+   * 数据树节点是否显示
+   * 前端 UI 状态
+   */
+    processTreeNodeHidden;
     /**
      * 数据树节点是否展开
      * 前端 UI 状态
      */
-    logicTreeNodeExpanded = false;
+    logicTreeNodeExpanded;
     /**
      * 用于挂 embeddedTS 的 sourceMap
      */
-    sourceMap = undefined;
+    sourceMap;
     /**
      * 是否为叶子节点
      * 前端 UI 状态
      */
-    isLeaf = false;
+    isLeaf;
     storageJSON;
     /**
      * 当前节点上报错详细信息
      */
-    tsErrorDetail = undefined;
+    tsErrorDetail;
     name = '';
     /**
      * 当前节点的类型标注
      */
-    __TypeAnnotation = undefined;
+    __TypeAnnotation;
     /**
      * 当前节点的类型标注是不是正确的
      */
-    __isCorrectTypeAnnotation = false;
+    __isCorrectTypeAnnotation;
     /**
      * @param source 需要合并的部分参数
      */
@@ -216,21 +237,24 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
         this.on('delete', () => operations_1.default.delete(this));
         this.on('update', () => operations_1.default.update(this));
     }
-    // static constructorName = 'BaseNode'
-    getClassName() {
-        return 'BaseNode';
-    }
     subConstructor(source) {
-        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.getClassName() || this.constructor.name);
+        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.concept || this.constructor.name);
         const properties = Array.from(new Set([...Object.keys(this), ...Object.keys(source)])).filter((key) => propertyMap.has(key));
         // 测试时用的标记属性
         if (process.env.NODE_ENV === 'testing') {
-            properties.push('__$Selected');
+            properties.push('__$Selected', '__TypeAnnotation');
         }
         properties.forEach((key) => {
-            const property = propertyMap.get(key);
+            if (key === 'concept') {
+                return;
+            }
             const sourceItem = source[key] !== undefined ? source[key] : this[key];
+            let property = propertyMap.get(key);
             let objectRefCtor;
+            // 测试环境下，类型节点由外部注入，所以需要在初始化的时候必须带上类型节点
+            if (process.env.NODE_ENV === 'testing' && key === '__TypeAnnotation' && sourceItem) {
+                property = { objectRef: 'TypeAnnotation' };
+            }
             try {
                 if (property?.objectRef) {
                     const arr = property.objectRef.split(' | ');
@@ -244,8 +268,10 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
                     }
                 }
                 // 数组的情况也在这里做掉了
-                this[key] =
-                    objectRefCtor && sourceItem && !(sourceItem instanceof objectRefCtor) ? this.instantiateSub(sourceItem, key) : sourceItem;
+                const val = objectRefCtor && sourceItem && !(sourceItem instanceof objectRefCtor) ? this.instantiateSub(sourceItem, key) : sourceItem;
+                if (val !== undefined) {
+                    this[key] = val;
+                }
             }
             catch (e) {
                 // Function has non-object prototype 'undefined' in instanceof check
@@ -254,35 +280,13 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
             }
         });
         operations_1.default.create(this);
-        // if (config.storage.protocol === 'http' && loadThen[source.concept as 'App' | 'View']) {
-        //     const { childNodes } = loadThen[source.concept as 'App' | 'View'] || {};
-        //     const queryList = childNodes.map(({ field, concept }) => {
-        //         const path = [this.nodePath, field].join('.');
-        //         return {
-        //             path,
-        //             excludes: loadThen[concept as 'App' | 'View'].childNodes.map(({ field }) => field),
-        //         };
-        //     });
-        //     storageService
-        //         .batchQuery({
-        //             body: queryList,
-        //             headers: {
-        //                 appId: this.rootNode?.id || this.id,
-        //             },
-        //         })
-        //         .then((data: any) =>
-        //             data.forEach((sourceItem: any, index: number) => {
-        //                 const { field, concept } = childNodes[index];
-        //                 if (!sourceItem || (Array.isArray((this as any)[field]) && !Array.isArray(sourceItem))) {
-        //                     return;
-        //                 }
-        //                 const objectRefCtor = getConceptConstructor(concept);
-        //                 (this as any)[field] = objectRefCtor ? this.instantiateSub(sourceItem, field) : sourceItem;
-        //             }));
-        // }
+        // node 环境下需要删除当前节点的 concept 属性
+        if (utils.isNode && ('concept' in this) && !this.concept) {
+            Reflect.deleteProperty(this, 'concept');
+        }
     }
     fixInstantiate() {
-        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.getClassName() || this.constructor.name);
+        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.concept ?? this.constructor.name);
         const properties = Object.keys(this).filter((key) => propertyMap.has(key));
         properties.forEach((key) => {
             const property = propertyMap.get(key);
@@ -446,11 +450,18 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
             const node = this.parentNode;
             node.changeLinesLocation(this);
         }
+        // 自定义连接器下的namespace删除的时候需要同时删除对应的logic
+        if (this.concept === 'Namespace' && this.parentNode.concept === 'Connector') {
+            this.logics.forEach(logic => logic?.delete());
+        }
         const useIndex = ['BindEvent', 'Identifier'].includes(this.concept);
         const path = this.getNodePath(useIndex);
         const parentParams = this._delete();
         if (parentParams && parentParams.index !== -1) {
             if (Array.isArray(this.parentNode[this.parentKey])) {
+                if (process.env.NODE_ENV === 'development') {
+                    console.log('删除节点', this);
+                }
                 this.emit('delete', {
                     action: 'delete',
                     path,
@@ -478,62 +489,25 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
      */
     update({ field, ...object }) {
         const path = this.getNodePath(false);
+        // 更新前的旧的对象
         const oldObject = {};
+        // 更新后的新对象
+        const newObject = {};
         for (const key in object) {
+            if (key === 'concept') {
+                continue;
+            }
             if (Object.prototype.hasOwnProperty.call(object, key)) {
-                const oldProperty = this[key] ?? null;
-                oldObject[key] = oldProperty;
-                if (Array.isArray(oldProperty)) {
-                    oldObject[key] = oldProperty.map((item) => {
-                        let propertyItem = item ?? null;
-                        if (item instanceof BaseNode_1) {
-                            propertyItem = item.toJSON();
-                        }
-                        return propertyItem;
-                    });
-                }
-                else if (oldProperty instanceof BaseNode_1) {
-                    oldObject[key] = oldProperty.toJSON();
-                }
-                const property = object[key] ?? null;
-                this[key] = property;
-                const objectRefCtor = (0, decorators_1.getConceptConstructor)(property?.concept);
-                if (Array.isArray(property)) {
-                    this[key] = property.map((item) => {
-                        let propertyItem = item ?? null;
-                        const propertyObjectRefCtor = (0, decorators_1.getConceptConstructor)(item?.concept);
-                        if (propertyObjectRefCtor?.from) {
-                            propertyItem = propertyObjectRefCtor.from(item, this, key);
-                        }
-                        return propertyItem;
-                    });
-                }
-                else if (objectRefCtor?.from) {
-                    this[key] = objectRefCtor.from(property, this, key);
-                }
+                // 旧对象收集
+                this.collectOldObject(oldObject, key);
+                // 新对象收集
+                this.collectNewObject(newObject, object, key);
             }
         }
-        const newObject = {};
-        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.getClassName() || this.constructor.name);
-        for (const key in object) {
-            const property = propertyMap.get(key);
-            if (property) {
-                const objProperty = object[key] ?? null;
-                const propertyConcept = property?.objectRef;
-                if (propertyConcept) {
-                    if (Array.isArray(objProperty)) {
-                        newObject[key] = objProperty.map((objItem) => {
-                            return ensureDefined(objItem, propertyConcept);
-                        });
-                    }
-                    else {
-                        newObject[key] = ensureDefined(objProperty, propertyConcept);
-                    }
-                }
-                else {
-                    newObject[key] = objProperty;
-                }
-            }
+        // 更新实例上的属性
+        this.updateInstance(object);
+        if (process.env.NODE_ENV === 'development') {
+            console.log('更新节点', 'path', path, 'oldObject', oldObject, 'newObject', newObject);
         }
         this.emit('update', {
             action: 'update',
@@ -543,6 +517,69 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
             field,
         });
     }
+    // 旧对象收集
+    collectOldObject(oldObject, key) {
+        const oldProperty = this[key] ?? null;
+        oldObject[key] = oldProperty;
+        if (Array.isArray(oldProperty)) {
+            oldObject[key] = oldProperty.map((item) => {
+                let propertyItem = item ?? null;
+                if (item instanceof BaseNode_1) {
+                    propertyItem = item.toJSON();
+                }
+                return propertyItem;
+            });
+        }
+        else if (oldProperty instanceof BaseNode_1) {
+            oldObject[key] = oldProperty.toJSON();
+        }
+    }
+    // 新对象收集
+    collectNewObject(newObject, object, key) {
+        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.concept ?? this.constructor.name);
+        const property = propertyMap.get(key);
+        if (property) {
+            const objProperty = object[key] ?? null;
+            const propertyConcept = property?.objectRef;
+            if (propertyConcept) {
+                if (Array.isArray(objProperty)) {
+                    newObject[key] = objProperty.map((objItem) => {
+                        return ensureDefined(objItem, propertyConcept);
+                    });
+                }
+                else {
+                    newObject[key] = ensureDefined(objProperty, propertyConcept);
+                }
+            }
+            else {
+                newObject[key] = objProperty;
+            }
+        }
+    }
+    // 更新实例上的属性
+    updateInstance(object) {
+        for (const key in object) {
+            if (key === 'concept') {
+                continue;
+            }
+            const property = object[key] ?? null;
+            this[key] = property;
+            const objectRefCtor = (0, decorators_1.getConceptConstructor)(property?.concept);
+            if (Array.isArray(property)) {
+                this[key] = property.map((item) => {
+                    let propertyItem = item ?? null;
+                    const propertyObjectRefCtor = (0, decorators_1.getConceptConstructor)(item?.concept);
+                    if (propertyObjectRefCtor?.from) {
+                        propertyItem = propertyObjectRefCtor.from(item, this, key);
+                    }
+                    return propertyItem;
+                });
+            }
+            else if (objectRefCtor?.from) {
+                this[key] = objectRefCtor.from(property, this, key);
+            }
+        }
+    }
     _delete() {
         /* override */
         return {
@@ -554,7 +591,7 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
     }
     static from(source, parentNode, parentKey) {
         // 有一些继承的情况
-        const Ctor = classMap_1.default?.[source?.concept] || this;
+        const Ctor = decorators_1.classMap.get(source?.concept) || this;
         if (Ctor && source instanceof Ctor) {
             if (parentNode) {
                 source.parentNode = parentNode;
@@ -574,7 +611,7 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
             }
             instance.subConstructor({
                 ...source,
-                concept: source.concept || this?.prototype?.getClassName() || Ctor.name,
+                concept: source?.concept ?? this?.prototype?.concept ?? Ctor.ConceptName ?? Ctor.name,
                 parentNode,
             });
             return instance;
@@ -609,7 +646,12 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
                         })
                         : null;
                     if (siblingNode || !name || (useIndex && isNodeSelf) || useIndexKeys.includes(node.concept)) {
-                        const index = parentProperty.indexOf(node);
+                        const index = parentProperty.findIndex((item) => {
+                            if (item === node) {
+                                return true;
+                            }
+                            return item?.id && item?.id === node?.id;
+                        });
                         path += `[${index}]`;
                     }
                     else {
@@ -704,8 +746,8 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
             }
             return source;
         }
-        if (source && source.concept && classMap_1.default[source.concept]) {
-            const Ctor = classMap_1.default[source.concept];
+        if (source && source.concept && decorators_1.classMap.get(source.concept)) {
+            const Ctor = decorators_1.classMap.get(source.concept);
             const instance = Ctor.from(source, parentNode, parentKey);
             if (instance && instance.toStorageJSON)
                 instance.storageJSON = instance.toStorageJSON();
@@ -722,7 +764,7 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
             return;
         }
         const completeList = [];
-        let isArray = false;
+        let isArray;
         // 暂时通过是否有name判断数据是否全
         if (Array.isArray(source)) {
             isArray = true;
@@ -790,7 +832,7 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
         return this._toJSON();
     }
     _toJSON(filerFn) {
-        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.getClassName() || this.constructor.name);
+        const propertyMap = (0, decorators_1.getConceptPropertyMap)(this.concept || this.constructor.name);
         const source = {};
         propertyMap.forEach((property, key) => {
             if (property) {
@@ -804,6 +846,8 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
                 }
             }
         });
+        // @ts-ignore
+        source.concept = this.concept;
         return filerFn ? filerFn(source) : source;
     }
     /**
@@ -1097,8 +1141,25 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
         }
         return null;
     }
+    /**
+     * 使用新的 concept 在当前节点生成新的数据
+     */
+    changeConceptNode(concept) {
+        return new Proxy(this, {
+            get(target, p, receiver) {
+                if (p === 'concept') {
+                    return concept;
+                }
+                return target[p];
+            },
+        });
+    }
     collectNodes(input) {
-        const pre = typeof input === 'string' ? (node) => node.concept === input : input;
+        const pre = typeof input === 'undefined'
+            ? (node) => typeof node.concept === 'string'
+            : typeof input === 'string'
+                ? (node) => node.concept === input
+                : input;
         const nodes = [];
         const self = this;
         if (pre(self)) {
@@ -1115,9 +1176,12 @@ let BaseNode = BaseNode_1 = class BaseNode extends EventEmitter_1.EventEmitter {
 __decorate([
     (0, decorators_1.excludedInJSON)()
 ], BaseNode.prototype, "_mutable", void 0);
+__decorate([
+    (0, decorators_1.excludedInJSON)()
+], BaseNode.prototype, "_concept", void 0);
 __decorate([
     (0, decorators_1.property)()
-], BaseNode.prototype, "concept", void 0);
+], BaseNode.prototype, "concept", null);
 __decorate([
     (0, decorators_1.property)()
 ], BaseNode.prototype, "changedTime", void 0);
@@ -1163,6 +1227,9 @@ __decorate([
 __decorate([
     (0, decorators_1.excludedInJSON)()
 ], BaseNode.prototype, "dataTreeNodeHidden", void 0);
+__decorate([
+    (0, decorators_1.excludedInJSON)()
+], BaseNode.prototype, "processTreeNodeHidden", void 0);
 __decorate([
     (0, decorators_1.excludedInJSON)()
 ], BaseNode.prototype, "logicTreeNodeExpanded", void 0);