@lcap/nasl 1.0.0-alpha.5 → 1.0.0-alpha.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",
@@ -34,6 +34,7 @@
     "@types/json-stringify-safe": "^5.0.0",
     "axios": "^0.21.1",
     "faker": "^5.4.0",
+    "fs-extra": "^10.1.0",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.21",
     "module-alias": "^2.2.2",
@@ -43,7 +44,8 @@
     "request-pre": "^0.4.3",
     "socket.io-client": "^2.4.0",
     "uuid": "^8.3.2",
-    "vue-template-compiler": "^2.6.10"
+    "vue": "2.6.14",
+    "vue-template-compiler": "2.6.14"
   },
   "devDependencies": {
     "@types/chai": "^4.2.14",

package/src/automate/engine/index.js

@@ -1,24 +1,26 @@
-import { v4 as uuidv4 } from 'uuid'; 
-import { uniq } from 'lodash';
+import { v4 as uuidv4 } from 'uuid';
+import { uniq, omit } from 'lodash';
 import { BaseNode } from '../../common/BaseNode';
-import { 
+import {
     tracking,
     TRACK_TYPE,
-} from './utils'
-import { 
-    getConceptConstructor, getConceptMeta
+    IGNORE_PROPERTY,
+} from './utils';
+import {
+    getConceptConstructor, getConceptMeta,
 } from '../../decorators/index';
 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 = [];
         this.binds = [];
         this.callees = [];
         this.modules = [];
+        this.rolebinds = [];
     }
 
     addRootBinds(propertyName, templateMeta) {
@@ -26,7 +28,7 @@ class TemplateMeta {
         this.rootBinds.push({
             propertyName,
             value: templateMeta.name,
-        })
+        });
     }
 
     addBinds(type, propertyName, templateMeta) {
@@ -36,53 +38,51 @@ class TemplateMeta {
             type,
             propertyName,
             value: templateMeta.name,
-        })
+        });
     }
 
     addPlainBinds(propertyName, value) {
         // this.node.[propertyName] = value
-        if(typeof value === 'string') {
-            value = `"${value}"`
+        if (typeof value === 'string') {
+            value = `"${value}"`;
         }
-        if(typeof value === 'object') {
+        if (typeof value === 'object') {
             value = JSON.stringify(value);
         }
         this.binds.push({
             type: TRACK_TYPE.PLAIN,
             propertyName,
             value,
-        })
+        });
     }
 
     addModule(m) {
         this.modules.push({
             name: m.name,
             belongs: m.parentKey,
-            data:  m.toTemplateJSON(),
-        })
+            data: m._toJSON(source => {
+                return omit(source, IGNORE_PROPERTY);
+            }),
+        });
     }
 
-    addCallee(
-        propertyName, 
-        relatedPropertyName, 
-        templateMeta
-    ) {
+    addCallee(propertyName,
+        relatedPropertyName,
+        templateMeta) {
         // this.node.[propertyName] = [targetVar].getNamespace();
         // this.node.[relatedPropertyName] = [targetVar].name;
         this.callees.push({
             propertyName,
             relatedPropertyName,
             targetVar: templateMeta.name,
-        })
+        });
     }
 
-    addCalleeTemplate(
-        propertyName, 
-        relatedPropertyName, 
+    addCalleeTemplate(propertyName,
+        relatedPropertyName,
         nstemplate,
         nametemplate,
-        arguVars,
-    ) {
+        arguVars) {
         // this.node.[propertyName] = nstemplate([arguVars]);
         // this.node.[relatedPropertyName] = nametemplate([arguVars]);
         this.callees.push({
@@ -90,36 +90,44 @@ class TemplateMeta {
             relatedPropertyName,
             nstemplate,
             nametemplate,
+            arguVars,
+        });
+    }
+
+    addRoleTemplate(
+        propertyName,
+        arguVars
+    ) {
+        this.rolebinds.push({
+            propertyName,
             arguVars
         })
     }
 
     genComment(part) {
-        return `/*---------${this.node.concept} ${this.node.name} ${part} -----------*/`
+        return `/*---------${this.node.concept} ${this.node.name} ${part} -----------*/`;
     }
 
     genCreate() {
         // [this.name] = create[this.node.concept]();
-        
+
         // return `${this.genComment('create')}
         // _tempConstructor = getConceptConstructor("${this.node.concept}");
         // const ${this.name} = new _tempConstructor();`
         return `${this.genComment('create')}
-        const ${this.name} = _create("${this.node.concept}");`
+        let ${this.name} = _create("${this.node.concept}");`;
     }
 
-    genBind() { 
-        return this.binds.map(bind => {
+    genBind() {
+        return this.binds.map((bind) => {
             const {
-                type, propertyName, value
+                type, propertyName, value,
             } = bind;
-            switch(type) {
+            switch (type) {
                 case TRACK_TYPE.PROPERTY:
                 case TRACK_TYPE.PLAIN:
-                    // return `${this.name}.${propertyName} = ${value}`;
-                    return `_set(${this.name}, "${propertyName}", ${value})`
+                    return `_set(${this.name}, "${propertyName}", ${value})`;
                 case TRACK_TYPE.ARRAY:
-                    // return `${this.name}.${propertyName}.push(${value});
                     return `_push(${this.name}, "${propertyName}", ${value});`;
             }
             return '';
@@ -127,61 +135,94 @@ class TemplateMeta {
     }
 
     genRootBind() {
-        return this.rootBinds.map(bind => {
-            const { 
-                propertyName, value
+        return this.rootBinds.map((bind) => {
+            const {
+                propertyName, value,
             } = bind;
+            if(propertyName === 'roles') {
+                return `
+        if(roleCallback) {
+            ${value} = roleCallback(${value})
+        } else {
+            _push(app, "roles", ${value});
+        }`
+            }
             // return `app.${propertyName}.push(${value});
             return `_push(app, "${propertyName}", ${value});`;
-        })
+        });
     }
 
     genEntryBind() {
-        if(this.isRoot) {
-            return `rootBindCallback(${this.name})`
+        if (this.isRoot) {
+            return `rootBindCallback(${this.name})`;
         }
         return '';
     }
- 
+
+    genRootReturn() {
+        if (this.isRoot) {
+            return `return ${this.name};`;
+        }
+        return '';
+    }
+
     genName() {
         // [this.name].name = this.parent.genUniqueXXXName();
         // return `${this.name}.name = (${this.name}.parentNode.gen${this.node.concept}UniqueName ? ${this.name}.parentNode.gen${this.node.concept}UniqueName() : ${this.name}.name)`
+        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}")`;
     }
 
+    genRoleBind() {
+        return this.rolebinds.map(role => {
+            const {
+                propertyName,
+                arguVars
+            } = role;
+            
+            return `_set(${this.name}, "${propertyName}", _bindRoles(${arguVars}));`
+        })
+    }
+
     genCallee() {
-        return this.callees.map(callee => {
+        return this.callees.map((callee) => {
             const {
-                propertyName, 
-                relatedPropertyName, 
+                propertyName,
+                relatedPropertyName,
                 targetVar,
                 nstemplate,
                 nametemplate,
-                arguVars
+                arguVars,
             } = callee;
 
-            if(arguVars && nstemplate && nametemplate) {
-        //         return `${this.name}.${propertyName} = (${nstemplate}(${arguVars}));
-        // ${this.name}.${relatedPropertyName} = (${nametemplate}(${arguVars}))`
+            if (arguVars && nstemplate && nametemplate) {
+                //         return `${this.name}.${propertyName} = (${nstemplate}(${arguVars}));
+                // ${this.name}.${relatedPropertyName} = (${nametemplate}(${arguVars}))`
                 return `_set(${this.name}, "${propertyName}", (${nstemplate}(${arguVars})));
-        _set(${this.name}, "${relatedPropertyName}", (${nametemplate}(${arguVars})))`
-
-            } else  {
-        //         return `${this.name}.${propertyName} = ${targetVar}.getNamespace();
-        // ${this.name}.${relatedPropertyName} = ${targetVar}.name;`
+        _set(${this.name}, "${relatedPropertyName}", (${nametemplate}(${arguVars})))`;
+            } 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);`
+        _set(${this.name}, "${relatedPropertyName}", ${targetVar}.name);`;
             }
-        })
+        });
     }
 
     genModule() {
-        return this.modules.map(meta => {
-            const { 
+        return this.modules.map((meta) => {
+            const {
                 name, belongs, data,
             } = meta;
             return `_addModule(app, "${name}", "${belongs}", ${JSON.stringify(data)});`;
-        })
+        });
     }
 }
 
@@ -189,16 +230,27 @@ function autoScript(stack) {
     const createBlock = [];
     let rootBindBlock = [];
     let bindBlock = [];
+    let rolebindBlock = [];
     let appBindBlock = [];
     const nameBlock = [];
     let calleeBlock = [];
     let moduleBlock = [];
+    let returnBlock = [];
+    let roleNASL = []
+    
 
-    stack.forEach(temp => {
+    stack.forEach((temp) => {
         createBlock.push(temp.genCreate());
-        if(temp.isRoot) {
+        if (temp.isRoot) {
             rootBindBlock = rootBindBlock.concat(temp.genEntryBind());
+            returnBlock = returnBlock.concat(temp.genRootReturn());
         }
+        if (temp.node.concept === 'Role') {
+            roleNASL = roleNASL.concat(temp.node._toJSON(source => {
+                return omit(source, IGNORE_PROPERTY);
+            }))
+        }
+        rolebindBlock = rolebindBlock.concat(temp.genRoleBind());
         bindBlock = bindBlock.concat(temp.genBind());
         appBindBlock = uniq(appBindBlock.concat(temp.genRootBind()));
         nameBlock.push(temp.genName());
@@ -287,13 +339,22 @@ function autoScript(stack) {
         }
     }
     
+    function _bindRoles(){ 
+        return Array.prototype.map.call(arguments, r => r.name); 
+    }
     // let _tempConstructor;
     
-    return function(app, getCtor, getCMeta, base, rootBindCallback) {
+    const exportRoles = function() {
+        return ${JSON.stringify(roleNASL)};
+    }
+
+    const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback) {
         BaseNodeConstructor = base;
         getConceptConstructor = getCtor;
         getConceptMeta = getCMeta;
-        app.emit('collect:start');
+        app.emit('collect:start', {
+            actionMsg: '导入页面模板'
+        });
         /*---- create ---- */
         ${createBlock.join('\n\t\t')}
 
@@ -309,39 +370,50 @@ function autoScript(stack) {
         /*---- reset name ---- */
         ${nameBlock.join('\n\t\t')}
 
+        /*--- role bind ---*/
+        ${rolebindBlock.join('\n\t\t')}
+
         /*---- reset callee ---- */
         ${calleeBlock.join('\n\t\t')}
 
         /*---- add module ----*/
         ${moduleBlock.join('\n\t\t')}
         app.emit('collect:end');
+
+        /*---- return root -----*/
+        ${returnBlock.join('\n\t\t')}
     }
-})();`
 
+    return {
+        execTemplate,
+        exportRoles
+    }
+})();`;
 }
-let i = 0;
+const i = 0;
 export function autoTemplate(node) {
     const visitedMap = new WeakMap();
     const stack = [];
-    let startNode = node;
-    let rootNode = true;;
+    const startNode = node;
+    let rootNode = true;
     function iterator(node) {
-        if(node && !visitedMap.has(node)) {
+        if (node && !visitedMap.has(node)) {
             const meta = new TemplateMeta(node);
-            if(rootNode) {
+            if (rootNode) {
                 meta.isRoot = true;
             }
             rootNode = false;
             stack.push(meta);
-            visitedMap.set(node, meta)
-            tracking(node, startNode, function(type, propertyName, property, options = {}) {
+            visitedMap.set(node, meta);
+            tracking(node, startNode, (type, propertyName, property, options = {}) => {
                 const {
                     rootNode,
                     calleeNode,
                     relatedPropertyName,
                     AppPropertyName,
+                    metaNodes,
                 } = options;
-                switch(type) {
+                switch (type) {
                     case TRACK_TYPE.PLAIN:
                         meta.addPlainBinds(propertyName, property);
                         break;
@@ -351,17 +423,13 @@ export function autoTemplate(node) {
                         const pmeta = visitedMap.get(property);
                         meta.addBinds(type, propertyName, pmeta);
                         break;
-                    case TRACK_TYPE.CALLEE: 
+                    case TRACK_TYPE.CALLEE:
                         iterator(rootNode);
-                        const cmeta = visitedMap.get(calleeNode)
-                        if(AppPropertyName) {
+                        const cmeta = visitedMap.get(calleeNode);
+                        if (AppPropertyName) {
                             meta.addRootBinds(AppPropertyName, visitedMap.get(rootNode));
                         }
-                        meta.addCallee(
-                            propertyName,
-                            relatedPropertyName,
-                            cmeta,
-                        );
+                        meta.addCallee(propertyName, relatedPropertyName, cmeta);
                         break;
                     case TRACK_TYPE.MODULE:
                         meta.addModule(property);
@@ -370,29 +438,36 @@ export function autoTemplate(node) {
                         const {
                             nstemplate,
                             nametemplate,
-                            metaNodes,
                         } = options;
                         iterator(rootNode);
-                        const arguVars = metaNodes.map(n => visitedMap.get(n).name).join(',')
-                        if(AppPropertyName) {
+                        const arguVars = metaNodes.map((n) => visitedMap.get(n).name).join(',');
+                        if (AppPropertyName) {
                             meta.addRootBinds(AppPropertyName, visitedMap.get(rootNode));
                         }
-                        meta.addCalleeTemplate(
+                        meta.addCalleeTemplate(propertyName, relatedPropertyName, nstemplate, nametemplate, arguVars);
+                        break;
+                    case TRACK_TYPE.ROLE_TEMPLATE: 
+                        let roleMetaNames = [];
+                        metaNodes.forEach(node => {
+                            iterator(node);
+                            const m = visitedMap.get(node);
+                            m.addRootBinds('roles', m);
+                            roleMetaNames.push(m.name);
+                        })
+
+                        meta.addRoleTemplate(
                             propertyName,
-                            relatedPropertyName,
-                            nstemplate,
-                            nametemplate,
-                            arguVars,
+                            roleMetaNames
                         )
+
                         break;
-                        
                     default: 
                         break;
                 }
             });
             return meta;
-        } else if(node){
-            return visitedMap.get(node)
+        } else if (node) {
+            return visitedMap.get(node);
         } else {
             return null;
         }
@@ -402,21 +477,25 @@ export function autoTemplate(node) {
     return autoScript(stack);
 }
 
-
 /* 使用模板的代码 */
-/* 
+/*
     const view = this.view;
     const app = view.rootNode;
     applyTemplate(script, app, (rootNode) => {
         const names = app.getViewExistingNames();
-        if(names.includes(rootNode.name)) {     
+        if(names.includes(rootNode.name)) {
             const name = app.getViewUniqueName();
             rootNode.name = name;
         }
         app.addView(rootNode);
-    }) 
+    })
 */
-export function applyTemplate(script, app, rootBindCallback) {
-    const rebuild = eval(script);
-    rebuild(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback);
-}
+
+export function getRoles(script) {
+    const { exportRoles } = eval(script);
+    return exportRoles();
+}
+export function applyTemplate(script, app, rootBindCallback, roleCallback) {
+    const { execTemplate } = eval(script);
+    execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback);
+}