@lcap/nasl 1.0.0-alpha.8 → 1.0.1

package/src/automate/engine/index.js

@@ -1,13 +1,16 @@
-// const { v4: uuidv4 } = require('uuid');
-const { uniq, omit } = require('lodash');
-const { BaseNode } = require('../../common/BaseNode');
-const { tracking, TRACK_TYPE, IGNORE_PROPERTY } = require('./utils');
-const { getConceptConstructor, getConceptMeta } = require('../../decorators/index');
+import { uniq, omit } from 'lodash';
+import { BaseNode } from '../../common/BaseNode';
+import { tracking, TRACK_TYPE, IGNORE_PROPERTY } from './utils';
+import { getConceptConstructor, getConceptMeta } from '../../decorators/index';
+// import { unique, firstUpperCase } from '../../utils/string';
+import uniqueNameModule from './uniqueName';
+import operatorModule from './operators';
+
 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 = [];
@@ -15,6 +18,7 @@ class TemplateMeta {
         this.callees = [];
         this.modules = [];
         this.rolebinds = [];
+        this.templatebinds = [];
     }
 
     addRootBinds(propertyName, templateMeta) {
@@ -38,7 +42,12 @@ class TemplateMeta {
     addPlainBinds(propertyName, value) {
         // this.node.[propertyName] = value
         if (typeof value === 'string') {
-            value = value.split(/\n/).map(c => `"${c}"`).join(" +\n");
+            value = value
+                .split(/\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);
@@ -87,6 +96,12 @@ class TemplateMeta {
         });
     }
 
+    addTemplateBind(propertyName, relatedVar, relatedProperty) {
+        this.templatebinds.push({
+            propertyName, relatedVar, relatedProperty
+        })
+    }
+
     genComment(part) {
         return `/*---------${this.node.concept} ${this.node.name} ${part} -----------*/`;
     }
@@ -98,7 +113,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() {
@@ -106,8 +122,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});`;
             }
@@ -151,18 +168,18 @@ class TemplateMeta {
         if (this.node.concept === 'Role') {
             return '';
         }
-        if (this.node.concept === 'Entity') {
-            return `${this.name}.name = getGenUniqNameFunctionName(${this.name}, "${this.node.concept}")
-        ${this.name}.setTableName(${this.name}.name + app.id.substring(0,5))`;
-        }
-        return `${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", _uniqueName.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; });`;
         });
     }
 
@@ -178,8 +195,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; });`;
             }
         });
     }
@@ -190,6 +207,13 @@ class TemplateMeta {
             return `_addModule(app, "${name}", "${belongs}", ${JSON.stringify(data)});`;
         });
     }
+
+    genTemplateBind() {
+        return this.templatebinds.map(meta => {
+            const { propertyName, relatedVar, relatedProperty } = meta;
+            return `_set(${this.name}, "${propertyName}", ${relatedVar}.${relatedProperty})`;
+        })
+    }
 }
 
 function autoScript(stack) {
@@ -203,6 +227,7 @@ function autoScript(stack) {
     let moduleBlock = [];
     let returnBlock = [];
     let roleNASL = [];
+    let templateBlock = [];
 
     stack.forEach((temp) => {
         createBlock.push(temp.genCreate());
@@ -219,102 +244,31 @@ function autoScript(stack) {
         nameBlock.push(temp.genName());
         calleeBlock = calleeBlock.concat(temp.genCallee());
         moduleBlock = moduleBlock.concat(temp.genModule());
+        templateBlock = templateBlock.concat(temp.genTemplateBind());
     });
 
     return `
 (function () {
-    function alphaUpper(name) {
-        if (!name) {
-            return '';
-        }
-        return name[0].toUpperCase() + name.substring(1);
-    }
-
-    function getGenUniqNameFunctionName(item, concept) {
-        if(!item.parentNode) {
-            return item.name;
-        }
-        const p = item.parentNode;
-        const f1 = p["get" + concept + "UniqueName"];
-        const f2 = p["get" + concept + "ExistingNames"]
-        if(f1 && f2) {
-            const names = f2.call(p);
-            const t = names.filter(n => n === item.name);
-            if(t.length > 1) {     
-                return f1.call(p, item.name);
-            }
-        }
-        return item.name;
-    }
-
-    let BaseNodeConstructor;
-    let getConceptConstructor;
-    let getConceptMeta;
-
-    function instanceOfBaseNode(item) {
-        return (item instanceof BaseNodeConstructor);
-    }
-
-    function _set(item, propertyName, value) {
-        if(instanceOfBaseNode(value)) {
-            value.parentNode = item;
-            value.parentKey = propertyName;
-        }
-        item.update({
-            [propertyName]: value,
-        });
-    }
-
-    function _push(item, propertyName, value) {
-        if(!item[propertyName]){
-            item[propertyName] = [];
-        }
-        value.parentNode = item;
-        value.parentKey = propertyName;
-        item[propertyName].push(value);
-        const index = item[propertyName].length;
-        value.create({
-            index,
-            parentNode: item,
-            parentKey: propertyName,
-        });
-    }
-
-    function _create(concept) {
-        const _ctor = getConceptConstructor(concept);
-        const item = new _ctor();
-        const { propertyMap } = getConceptMeta(concept);
-        for(const p of propertyMap) {
-            const [propertyName] = p;
-            const t = item[propertyName];
-            if(Array.isArray(t)) {
-                _set(item, propertyName, []);
-            }
-        }
-        return item;
-    }
-
-    function _addModule(app, name, belongs, data) {
-        const ms = app[belongs];
-        const exist = ms.find(m => m.name === name);
-        if(!exist) {
-            app["addModuleIn" + alphaUpper(belongs)](data);
-        }
-    }
-    
-    function _bindRoles(){ 
-        return Array.prototype.map.call(arguments, r => r.name); 
-    }
-    // let _tempConstructor;
+    const injectModule = {};
     
     const exportRoles = function() {
         return ${JSON.stringify(roleNASL)};
     }
 
-    const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback) {
-        BaseNodeConstructor = base;
-        getConceptConstructor = getCtor;
-        getConceptMeta = getCMeta;
+    const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback, finalCallback) {
+        let _templateObjects = [];
+        const {
+            _set,
+            _push,
+            _create,
+            _addModule,
+            _bindRoles 
+        } = injectModule.operators;
+
+        const _uniqueName = new injectModule.uniqueName();
+
+        _uniqueName.initAppUniqueNames(app);
+
         app.emit('collect:start', {
             actionMsg: '导入页面模板'
         });
@@ -324,14 +278,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')}
@@ -339,8 +293,16 @@ function autoScript(stack) {
         /*---- reset callee ---- */
         ${calleeBlock.join('\n\t\t')}
 
+        /*--- template bind ---- */
+        ${templateBlock.join('\n\t\t')}
+
         /*---- add module ----*/
         ${moduleBlock.join('\n\t\t')}
+
+        /*--- final callback ---*/
+        if(finalCallback) {
+            finalCallback(_templateObjects)
+        }
         app.emit('collect:end');
 
         /*---- return root -----*/
@@ -349,12 +311,15 @@ function autoScript(stack) {
 
     return {
         execTemplate,
-        exportRoles
+        exportRoles,
+        importModule(key, m) {
+            injectModule[key] = m;
+        },
     }
 })();`;
 }
 const i = 0;
-const autoTemplate = (exports.autoTemplate = function autoTemplate(node) {
+export function autoTemplate(node) {
     const visitedMap = new WeakMap();
     const stack = [];
     const startNode = node;
@@ -410,7 +375,16 @@ const autoTemplate = (exports.autoTemplate = function autoTemplate(node) {
                         });
 
                         meta.addRoleTemplate(propertyName, roleMetaNames);
-
+                        break;
+                    case TRACK_TYPE.PROPERTY_TEMPLATE:
+                        const relatedProperty = options.relatedProperty;
+                        const getRelatedVar = options.getRelatedVar;
+                        const t = getRelatedVar();
+                        if(t) {
+                            iterator(t);
+                            const relatedMeta = visitedMap.get(t);
+                            meta.addTemplateBind(propertyName, relatedMeta.name, relatedProperty)
+                        }  
                         break;
                     default:
                         break;
@@ -426,7 +400,7 @@ const autoTemplate = (exports.autoTemplate = function autoTemplate(node) {
 
     iterator(node);
     return autoScript(stack);
-});
+}
 
 /* 使用模板的代码 */
 /*
@@ -442,11 +416,16 @@ const autoTemplate = (exports.autoTemplate = function autoTemplate(node) {
     })
 */
 
-const getRoles = (exports.getRoles = function getRoles(script) {
+export function getRoles(script) {
     const { exportRoles } = eval(script);
     return exportRoles();
-});
-const applyTemplate = (exports.applyTemplate = function applyTemplate(script, app, rootBindCallback, roleCallback) {
-    const { execTemplate } = eval(script);
-    execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback);
-});
+}
+export function applyTemplate(script, app, rootBindCallback, roleCallback, finalCallback) {
+    const { execTemplate, importModule } = eval(script);
+    // 为了兼容 2.11 老模板
+    if(importModule) {
+        importModule('operators', operatorModule);
+        importModule('uniqueName', uniqueNameModule);
+    }
+    execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
+}

package/src/automate/engine/operators.js

@@ -0,0 +1,63 @@
+import { BaseNode } from '../../common/BaseNode';
+import { getConceptConstructor, getConceptMeta } from '../../decorators/index';
+import { firstUpperCase } from '../../utils/string';
+
+function instanceOfBaseNode(item) {
+    return (item instanceof BaseNode);
+}
+const ops = {
+    _set(item, propertyName, value, callback) {
+        if(instanceOfBaseNode(value)) {
+            value.parentNode = item;
+            value.parentKey = propertyName;
+        }
+        if(item[propertyName] !== value) {
+            item.update({
+                [propertyName]: value,
+            });
+            
+            if(instanceOfBaseNode(value) && callback) {
+                callback(item[propertyName]);
+            }
+        }
+    },
+    _push(item, propertyName, value) {
+        if(!item[propertyName]){
+            item[propertyName] = [];
+        }
+        value.parentNode = item;
+        value.parentKey = propertyName;
+        item[propertyName].push(value);
+        const index = item[propertyName].length;
+        value.create({
+            index,
+            parentNode: item,
+            parentKey: propertyName,
+        });
+    },
+    _create(concept) {
+        const _ctor = getConceptConstructor(concept);
+        const item = new _ctor();
+        const { propertyMap } = getConceptMeta(concept);
+        for(const p of propertyMap) {
+            const [propertyName] = p;
+            const t = item[propertyName];
+            if(Array.isArray(t)) {
+                ops._set(item, propertyName, []);
+            }
+        }
+        return item;
+    },
+    _addModule(app, name, belongs, data) {
+        const ms = app[belongs];
+        const exist = ms.find(m => m.name === name);
+        if(!exist) {
+            app["addModuleIn" + firstUpperCase(belongs)](data);
+        }
+    },
+    _bindRoles(){ 
+        return Array.prototype.map.call(arguments, r => r.name); 
+    }
+}
+
+export default ops;

package/src/automate/engine/uniqueName.js

@@ -0,0 +1,36 @@
+import { unique } from '../../utils/string';
+class uniqueName {
+    NamesWeakMap = new Map();
+    initAppUniqueNames(app) {
+        const NamesWeakMap = this.NamesWeakMap;
+        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()));
+    }
+    getGenUniqNameFunctionName(item, concept) {
+        const p = item.parentNode;
+        const NamesWeakMap = this.NamesWeakMap;
+        if(!p) {
+            const nameSet = NamesWeakMap.get(concept);
+            const n = unique(item.name, nameSet, 1, true);
+            nameSet.add(n);
+            return n;
+        }
+        const f1 = p["get" + concept + "UniqueName"];
+        const f2 = p["get" + concept + "ExistingNames"]
+        if(f1 && f2) {
+            const names = f2.call(p);
+            const t = names.filter(n => n === item.name);
+            if(t.length > 1) {     
+                return f1.call(p, item.name);
+            }
+        }
+        return item.name;
+    }
+}
+export default uniqueName;

package/src/automate/engine/utils.js

@@ -2,14 +2,13 @@
 //     BaseNode,
 //     Module
 // } from '../../concepts';
-const { BaseNode } = require('../../concepts');
-const { getConceptMeta } = require('../../decorators/index');
-
+import { BaseNode, uiStructures, collectionStructures } from '../../concepts';
+import { getConceptMeta } from '../../decorators/index';
 /*
     根据 namespace 字符串来获取 node
     link: http://nasl.lcap.group/docs/current/semantics/Basics/Namespaces/
 */
-const getNodeByNodeCallee = (exports.getNodeByNodeCallee = function getNodeByNodeCallee(AppInstance, namespace, callback) {
+export function getNodeByNodeCallee(AppInstance, namespace, callback) {
     const nodePath = namespace.split('.');
     const kind = nodePath.shift();
     let tempPoint;
@@ -21,7 +20,7 @@ const getNodeByNodeCallee = (exports.getNodeByNodeCallee = function getNodeByNod
         tempPoint = AppInstance.dependencies;
         state = 2;
     }
-    if (kind === 'interfaces') {
+    if (kind === 'apis') {
         tempPoint = AppInstance.interfaceDependencies;
         state = 2;
     }
@@ -63,9 +62,19 @@ const getNodeByNodeCallee = (exports.getNodeByNodeCallee = function getNodeByNod
         }
     }
     return tempPoint;
-});
+}
 
-const TRACK_TYPE = (exports.TRACK_TYPE = {
+/**
+ *  根据 namespace 字符串来获取 node，主要是nasl的ui 和 collection
+ */
+export function getNaslNodeByNodeCallee(namespace, typeName) {
+    if (namespace === 'nasl.ui') {
+        return uiStructures.find((item) => item.name === typeName);
+    } else if (namespace === 'nasl.collection') {
+        return collectionStructures.find((item) => item.name === typeName);
+    }
+}
+export const TRACK_TYPE = {
     PLAIN: 'plain',
     PROPERTY: 'property',
     ARRAY: 'array',
@@ -73,8 +82,11 @@ const TRACK_TYPE = (exports.TRACK_TYPE = {
     CALLEE_TEMPLATE: 'callee_template',
     MODULE: 'module',
     ROLE_TEMPLATE: 'role_template',
+    PROPERTY_TEMPLATE: 'property_template',
     // INTERNAL: 'internal'
-});
+};
+
+const ENTITY_AS_NAME = 'entityAsName';
 
 const BACKTACKING_PROPERTY_NS = {
     TYPE_NAMESPACE: 'typeNamespace',
@@ -113,15 +125,16 @@ function isBACKTRACKING_IGNORE_NAMESPACE(ns) {
     return ns.startsWith('nasl') || ns.startsWith('elements');
 }
 
-const IGNORE_PROPERTY = (exports.IGNORE_PROPERTY = [
+export const IGNORE_PROPERTY = [
     'uuid', // View 属性
     'origin', // Entity 属性
     'changedTime',
     'branchName',
     'appId',
     'isIndex',
-    'tableName',
-]);
+    // 'tableName',
+    // 'columnName',
+];
 
 const ROLE_PROPERTY = 'bindRoles';
 
@@ -136,7 +149,7 @@ const ROLE_PROPERTY = 'bindRoles';
 //     'Role',
 // ];
 
-const tracking = (exports.tracking = function tracking(node, startNode, callback) {
+export function tracking(node, startNode, callback) {
     const { propertyMap } = getConceptMeta(node.concept);
     // console.log(propertyMap)
     for (const p of propertyMap) {
@@ -238,7 +251,7 @@ const tracking = (exports.tracking = function tracking(node, startNode, callback
                                     relatedPropertyName,
                                     AppPropertyName: 'processes',
                                 });
-                                return;
+                                break;
                             }
 
                             const entity = rootNode.entities.find((e) => e.name === nodeName);
@@ -252,7 +265,7 @@ const tracking = (exports.tracking = function tracking(node, startNode, callback
                                     relatedPropertyName,
                                     AppPropertyName: 'entities',
                                 });
-                                return;
+                                break;
                             }
                         } else {
                             const nsPath = `${ns}.${calleeN}`;
@@ -275,9 +288,26 @@ const tracking = (exports.tracking = function tracking(node, startNode, callback
                 case BACKTACKING_PROPERTY.ENTITY_NAMESPACE:
                 case BACKTACKING_PROPERTY.RELATION_NAMESPACE:
                     break;
+                case ENTITY_AS_NAME:
+                    // 现在还不存在 asName 先直接当 Entity 名称来用。
+                    callback(TRACK_TYPE.PROPERTY_TEMPLATE, propertyName, property, {
+                        getRelatedVar: () => {
+                            const queryCom = node.getAncestor('CallQueryComponent');
+                            if (queryCom) {
+                                const entities = node.app.entities;
+                                // entityAsName === entity.name
+                                return entities.find((e) => e.name === property);
+                            }
+                            return null;
+                        },
+                        relatedProperty: 'name',
+                    });
+
+                    break;
+
                 default:
-                    if (property !== undefined && property !== null) {
-                        if (objectRef) {
+                    if (property !== undefined) {
+                        if (objectRef && property !== null) {
                             callback(TRACK_TYPE.PROPERTY, propertyName, property);
                         } else {
                             callback(TRACK_TYPE.PLAIN, propertyName, property);
@@ -287,7 +317,7 @@ const tracking = (exports.tracking = function tracking(node, startNode, callback
             }
         }
     }
-});
+}
 
 function getAppPropertyName(node) {
     const { propertyMap } = getConceptMeta('App');
@@ -301,7 +331,7 @@ function getAppPropertyName(node) {
     return undefined;
 }
 
-const backtracking = (exports.backtracking = function backtracking({ node, startNode, calleeNode, propertyName, relatedPropertyName }, callback) {
+export function backtracking({ node, startNode, calleeNode, propertyName, relatedPropertyName }, callback) {
     const m = calleeNode.getAncestor('Module');
     if (m) {
         callback(TRACK_TYPE.PLAIN, propertyName, node[propertyName]);
@@ -332,4 +362,4 @@ const backtracking = (exports.backtracking = function backtracking({ node, start
         relatedPropertyName,
         AppPropertyName,
     });
-});
+}