@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.16

package/src/automate/engine/index.js

@@ -6,7 +6,7 @@ let id = 0;
 class TemplateMeta {
     constructor(node) {
         // this.name = `t_${uuidv4().replace(/-/g, '')}`;
-        this.name = `t_${node.concept}_${node.name ? node.name.replace(/-/g, '') : 'unknown'}_${id++}`;
+        this.name = `t_${node.concept}_${node.name ? node.name.replace(/[-\.]/g, '') : 'unknown'}_${id++}`;
         this.node = node;
         this.isRoot = false;
         this.rootBinds = [];
@@ -39,8 +39,10 @@ class TemplateMeta {
         if (typeof value === 'string') {
             value = value
                 .split(/\n/)
-                .map((c) => `"${c.replaceAll(/"/g, "\\\"")}"`)
-                .join(' +\n');
+                .map((c) => `"${c.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`)
+                // .map((c) => `"${c.replace(/([^\\])"/g, '$1\\"')}"`)
+                // .map((c) => `decodeURIComponent("${c.encodeURIComponent}")`)
+                .join(' + "\\n" +\n');
         }
         if (typeof value === 'object') {
             value = JSON.stringify(value);
@@ -100,7 +102,8 @@ class TemplateMeta {
         // _tempConstructor = getConceptConstructor("${this.node.concept}");
         // const ${this.name} = new _tempConstructor();`
         return `${this.genComment('create')}
-        let ${this.name} = _create("${this.node.concept}");`;
+        let ${this.name} = _create("${this.node.concept}");
+    _templateObjects.push(${this.name})`;
     }
 
     genBind() {
@@ -108,8 +111,9 @@ class TemplateMeta {
             const { type, propertyName, value } = bind;
             switch (type) {
                 case TRACK_TYPE.PROPERTY:
+                    return `_set(${this.name}, "${propertyName}", ${value}, (updatedObj) => { ${value} = updatedObj; })`;
                 case TRACK_TYPE.PLAIN:
-                    return `_set(${this.name}, "${propertyName}", ${value})`;
+                    return `_set(${this.name}, "${propertyName}", ${value});`;
                 case TRACK_TYPE.ARRAY:
                     return `_push(${this.name}, "${propertyName}", ${value});`;
             }
@@ -153,18 +157,18 @@ class TemplateMeta {
         if (this.node.concept === 'Role') {
             return '';
         }
-        if (this.node.concept === 'Entity') {
-            return `_set(${this.name}, "name", getGenUniqNameFunctionName(${this.name}, "${this.node.concept}"))
-        ${this.name}.setTableName(${this.name}.name + '_' + app.id.slice(0,6))`;
-        }
-        return `_set(${this.name}, "name", getGenUniqNameFunctionName(${this.name}, "${this.node.concept}"))`;
+        // if (this.node.concept === 'Entity') {
+        // return `_set(${this.name}, "name", getGenUniqNameFunctionName(${this.name}, "${this.node.concept}"));`;
+        // _setTableName(${this.name}, ${this.name}.name + '_' + app.id.slice(0,6));`;
+        // }
+        return `_set(${this.name}, "name", getGenUniqNameFunctionName(${this.name}, "${this.node.concept}", app),  (updatedObj) => { ${this.name} = updatedObj; })`;
     }
 
     genRoleBind() {
         return this.rolebinds.map((role) => {
             const { propertyName, arguVars } = role;
 
-            return `_set(${this.name}, "${propertyName}", _bindRoles(${arguVars}));`;
+            return `_set(${this.name}, "${propertyName}", _bindRoles(${arguVars}),  (updatedObj) => { ${this.name} = updatedObj; });`;
         });
     }
 
@@ -180,8 +184,8 @@ class TemplateMeta {
             } else {
                 //         return `${this.name}.${propertyName} = ${targetVar}.getNamespace();
                 // ${this.name}.${relatedPropertyName} = ${targetVar}.name;`
-                return `_set(${this.name}, "${propertyName}", ${targetVar}.getNamespace());
-        _set(${this.name}, "${relatedPropertyName}", ${targetVar}.name);`;
+                return `_set(${this.name}, "${propertyName}", ${targetVar}.getNamespace(), (updatedObj) => { ${this.name} = updatedObj; });
+        _set(${this.name}, "${relatedPropertyName}", ${targetVar}.name,  (updatedObj) => { ${this.name} = updatedObj; });`;
             }
         });
     }
@@ -225,6 +229,21 @@ function autoScript(stack) {
 
     return `
 (function () {
+    function unique(key, set, start = 1) {
+        const has = (_key) => {
+            if (set instanceof Set || set instanceof Map)
+                return set.has(_key);
+            else if (Array.isArray(set))
+                return set.includes(_key);
+            else
+                return set[_key];
+        };
+    
+        while (has(key))
+            key = key.replace(/\\d*$/, (m) => String(m === '' ? start : (+m) + 1));
+        return key;
+    }
+
     function alphaUpper(name) {
         if (!name) {
             return '';
@@ -232,11 +251,27 @@ function autoScript(stack) {
         return name[0].toUpperCase() + name.substring(1);
     }
 
-    function getGenUniqNameFunctionName(item, concept) {
-        if(!item.parentNode) {
-            return item.name;
-        }
+    const NamesWeakMap = new Map();
+
+    function initAppUniqueNames(app) {
+        NamesWeakMap.set('Entity', new Set(app.getEntityExistingNames()));
+        NamesWeakMap.set('Structure', new Set(app.getStructureExistingNames()));
+        NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
+        NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));
+        NamesWeakMap.set('Interface', new Set(app.getInterfaceExistingNames()));
+        NamesWeakMap.set('View', new Set(app.getViewExistingNames()));
+        NamesWeakMap.set('Process', new Set(app.getProcessExistingNames()));
+        NamesWeakMap.set('Role', new Set(app.getRoleExistingNames()));
+    }
+
+    function getGenUniqNameFunctionName(item, concept, app) {
         const p = item.parentNode;
+        if(!p) {
+            const nameSet = NamesWeakMap.get(concept);
+            const n = unique(item.name, nameSet);
+            nameSet.add(n);
+            return n;
+        }
         const f1 = p["get" + concept + "UniqueName"];
         const f2 = p["get" + concept + "ExistingNames"]
         if(f1 && f2) {
@@ -257,7 +292,7 @@ function autoScript(stack) {
         return (item instanceof BaseNodeConstructor);
     }
 
-    function _set(item, propertyName, value) {
+    function _set(item, propertyName, value, callback) {
         if(instanceOfBaseNode(value)) {
             value.parentNode = item;
             value.parentKey = propertyName;
@@ -266,6 +301,10 @@ function autoScript(stack) {
             item.update({
                 [propertyName]: value,
             });
+            
+            if(instanceOfBaseNode(value) && callback) {
+                callback(item[propertyName]);
+            }
         }
     }
 
@@ -315,10 +354,14 @@ function autoScript(stack) {
         return ${JSON.stringify(roleNASL)};
     }
 
-    const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback) {
+    const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback, finalCallback) {
+        let _templateObjects = [];
         BaseNodeConstructor = base;
         getConceptConstructor = getCtor;
         getConceptMeta = getCMeta;
+
+        initAppUniqueNames(app);
+
         app.emit('collect:start', {
             actionMsg: '导入页面模板'
         });
@@ -328,14 +371,14 @@ function autoScript(stack) {
         /*---- bind ---- */
         ${bindBlock.join('\n\t\t')}
 
-        /*---- appbind ---- */
-        ${appBindBlock.join('\n\t\t')}
+        /*---- reset name ---- */
+        ${nameBlock.join('\n\t\t')}
 
         /*--- root bind ---*/
         ${rootBindBlock.join('\n\t\t')}
 
-        /*---- reset name ---- */
-        ${nameBlock.join('\n\t\t')}
+        /*---- appbind ---- */
+        ${appBindBlock.join('\n\t\t')}
 
         /*--- role bind ---*/
         ${rolebindBlock.join('\n\t\t')}
@@ -345,6 +388,11 @@ function autoScript(stack) {
 
         /*---- add module ----*/
         ${moduleBlock.join('\n\t\t')}
+
+        /*--- final callback ---*/
+        if(finalCallback) {
+            finalCallback(_templateObjects)
+        }
         app.emit('collect:end');
 
         /*---- return root -----*/
@@ -450,7 +498,7 @@ export function getRoles(script) {
     const { exportRoles } = eval(script);
     return exportRoles();
 }
-export function applyTemplate(script, app, rootBindCallback, roleCallback) {
+export function applyTemplate(script, app, rootBindCallback, roleCallback, finalCallback) {
     const { execTemplate } = eval(script);
-    execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback);
+    execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
 }

package/src/automate/engine/utils.js

@@ -69,9 +69,9 @@ export function getNodeByNodeCallee(AppInstance, namespace, callback) {
  */
 export function getNaslNodeByNodeCallee(namespace, typeName) {
     if (namespace === 'nasl.ui') {
-        return uiStructures.find(item => item.name === typeName);
+        return uiStructures.find((item) => item.name === typeName);
     } else if (namespace === 'nasl.collection') {
-        return collectionStructures.find(item => item.name === typeName);
+        return collectionStructures.find((item) => item.name === typeName);
     }
 }
 export const TRACK_TYPE = {
@@ -129,7 +129,8 @@ export const IGNORE_PROPERTY = [
     'branchName',
     'appId',
     'isIndex',
-    'tableName',
+    // 'tableName',
+    // 'columnName',
 ];
 
 const ROLE_PROPERTY = 'bindRoles';
@@ -247,7 +248,7 @@ export function tracking(node, startNode, callback) {
                                     relatedPropertyName,
                                     AppPropertyName: 'processes',
                                 });
-                                return;
+                                break;
                             }
 
                             const entity = rootNode.entities.find((e) => e.name === nodeName);
@@ -261,7 +262,7 @@ export function tracking(node, startNode, callback) {
                                     relatedPropertyName,
                                     AppPropertyName: 'entities',
                                 });
-                                return;
+                                break;
                             }
                         } else {
                             const nsPath = `${ns}.${calleeN}`;
@@ -285,7 +286,7 @@ export function tracking(node, startNode, callback) {
                 case BACKTACKING_PROPERTY.RELATION_NAMESPACE:
                     break;
                 default:
-                    if (property !== undefined && property !== null) {
+                    if (property !== undefined) {
                         if (objectRef) {
                             callback(TRACK_TYPE.PROPERTY, propertyName, property);
                         } else {

package/src/common/BaseNode.ts

@@ -12,22 +12,6 @@ import * as utils from '../utils';
 import classMap from '../common/classMap';
 import { action, circular, excludedInJSON, property, getConceptConstructor, getConceptPropertyMap } from '../decorators';
 import { Diagnostic } from '../manager/diagnostic';
-import { CallQueryComponent } from '..';
-
-/**
- * 分割数组
- * @param array 原数组
- * @param subGroupLength 长度
- * @returns
- */
-function group(array: Array<any>, subGroupLength: number) {
-    let index = 0;
-    const newArray = [];
-    while (index < array.length) {
-        newArray.push(array.slice(index, (index += subGroupLength)));
-    }
-    return newArray;
-}
 
 /**
  * 顶点类
@@ -183,6 +167,7 @@ export class BaseNode extends EventEmitter {
                         sourceItem.parentKey = key;
                     }
                 }
+
                 (this as any)[key] = objectRefCtor && sourceItem && !(sourceItem instanceof objectRefCtor) ? this.activeInside(sourceItem, objectRefCtor, this, key) : sourceItem;
             } catch (e) {
                 // Function has non-object prototype 'undefined' in instanceof check
@@ -237,27 +222,28 @@ export class BaseNode extends EventEmitter {
      * @returns
      */
     genActionListener($event: EventPayload) {
+        if (!$event.eventList) {
+            $event.eventList = [];
+        }
+        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')) {
+                $event.eventStop = true;
+            }
+        }
+        $event.originEvent = $event.originEvent || $event;
         this.onChange($event);
         if (this.concept === 'App') {
             this.emit('storage', $event);
         } else {
-            if (!$event.eventList) {
-                $event.eventList = [];
-            }
-            if (!$event.eventStop) {
-                $event.eventList.push($event);
-                // 页面逻辑需要冒泡到页面
-                if (['Process', 'View', 'Interface', 'Entity', 'Structure', 'Enum', 'ConfigProperty'].includes(this.concept) || (this.concept === 'Logic' && this.parentNode?.concept !== 'View')) {
-                    $event.eventStop = true;
-                }
-            }
             const event: EventPayload = {
                 action: 'update',
                 path: this.parentNode?.getNodePath(false),
                 object: {},
                 oldObject: {},
-                originEvent: $event.originEvent || $event,
-                eventList: $event.eventList || [],
+                originEvent: $event.originEvent,
+                eventList: $event.eventList,
                 eventStop: $event.eventStop,
             };
             this.parentNode?.emit('update', event);
@@ -301,6 +287,38 @@ export class BaseNode extends EventEmitter {
         });
     }
 
+    /**
+     * 如果有父节点，则删除节点，在添加时调用
+     */
+    ensureDelete() {
+        if (this.parentNode && this.parentKey) {
+            const path = this.getNodePath(false);
+            const parentParams = this._delete();
+            if (parentParams && parentParams.index !== -1) {
+                if (Array.isArray((this.parentNode as any)[this.parentKey])) {
+                    this.emit('delete', {
+                        action: 'delete',
+                        path,
+                        object: null,
+                        ...parentParams,
+                    });
+                } else {
+                    const parentPath = this.parentNode.getNodePath(false);
+                    this.parentNode.emit('update', {
+                        action: 'update',
+                        path: parentPath,
+                        object: {
+                            [this.parentKey]: null,
+                        },
+                        oldObject: {
+                            [this.parentKey]: this.toJSON(),
+                        },
+                    });
+                }
+            }
+        }
+    }
+
     /**
      * 删除节点
      */
@@ -329,13 +347,6 @@ export class BaseNode extends EventEmitter {
                 });
             }
         }
-
-        // if(this.concept === 'Logic') {
-        //     this.traverseChildren((ele: BaseNode) => {
-        //         if(ele.concept === 'CallQueryComponent')
-        //             (ele as CallQueryComponent).removeStructure();
-        //     });
-        // }
     }
 
     /**
@@ -669,6 +680,10 @@ export class BaseNode extends EventEmitter {
         /* override */
     }
 
+    async findReadOnlyLogicUsage(): Promise<any> {
+        /* override */
+    }
+
     /**
      * 重命名
      */
@@ -692,13 +707,7 @@ export class BaseNode extends EventEmitter {
     async addParamsPrepare(): Promise<any> {
         /* override */
     }
-    /**
-     * 添加参数准备
-     */
-    @action('页面删除')
-    async viewPrepareDelete(): Promise<any> {
-        /* override */
-    }
+
     /**
      * 销毁
      * 从 Map 中删除点和子节点