@lcap/nasl 1.0.2 → 2.12.0-beta

package/out/utils/index.js

@@ -14,12 +14,43 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldLoadCss = exports.specialOfficialCustoms = exports.officialCustoms = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = void 0;
+exports.shouldLoadCss = exports.specialOfficialCustoms = exports.officialCustoms = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = exports.findConceptKeyWordIndexFromNamespace = exports.findConceptKeyWordByNamespace = exports.findClosestModule = void 0;
 __exportStar(require("./string"), exports);
 __exportStar(require("./traverse"), exports);
 __exportStar(require("./logger"), exports);
 const compare_versions_1 = require("compare-versions");
 const traverse_1 = require("./traverse");
+// 查找最近的模块
+function findClosestModule(node) {
+    let moduleNode = node;
+    while (moduleNode && !['App', 'Module'].includes(moduleNode.concept)) {
+        moduleNode = moduleNode.parentNode;
+    }
+    return moduleNode;
+}
+exports.findClosestModule = findClosestModule;
+// 从namespace获取关键字
+function findConceptKeyWordByNamespace(namespace) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const keywordViews = namespaceArr.filter((namespaceItem, index) => index % 2 === mod);
+    return keywordViews.pop();
+}
+exports.findConceptKeyWordByNamespace = findConceptKeyWordByNamespace;
+// 从namespace中查找concept关键字
+function findConceptKeyWordIndexFromNamespace(namespace, keyword) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    return namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+}
+exports.findConceptKeyWordIndexFromNamespace = findConceptKeyWordIndexFromNamespace;
 function getGlobalEnv() {
     return typeof window !== 'undefined' ? window.appInfo.env : global.appInfoEnv;
 }

package/out/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,6CAA2B;AAC3B,2CAAyB;AAEzB,uDAA2C;AAC3C,yCAAsC;AAEtC,SAAgB,YAAY;IACxB,OAAO,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAE,MAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAE,MAAc,CAAC,UAAU,CAAC;AACpG,CAAC;AAFD,oCAEC;AAED;;;;;GAKG;AACI,MAAM,QAAQ,GAAG,CAAC,IAAc,EAAE,IAAY,EAAE,OAAY,EAAE,EAAE,CAAC,IAAI,CAAC;AAAhE,QAAA,QAAQ,YAAwD;AAE7E,SAAgB,WAAW,CAAC,GAAQ;IAChC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI;YAC3C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACP,CAAC;AALD,kCAKC;AAED,SAAgB,eAAe,CAAC,GAAQ;IACpC,IAAA,mBAAQ,EAAC,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI;gBAC1B,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;AAC7C,CAAC;AAPD,0CAOC;AAEM,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAAxF,QAAA,WAAW,eAA6E;AAErG,qBAAqB;AACR,QAAA,eAAe,GAAG;IAC3B,eAAe;IACf,kBAAkB;IAClB,kBAAkB;IAClB,YAAY;IACZ,YAAY;IACZ,eAAe;IACf,eAAe;IACf,kBAAkB;IAClB,mBAAmB;IACnB,kBAAkB;IAClB,aAAa;IACb,kBAAkB;IAClB,YAAY;CACf,CAAC;AACF,8BAA8B;AACjB,QAAA,sBAAsB,GAAG,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC7F,yBAAyB;AAClB,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,OAAe,EAAW,EAAE,CAAC,CAAC,CAAC,uBAAe,CAAC,QAAQ,CAAC,IAAI,CAAC;OACpG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;OACrB,CAAC,8BAAsB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,IAAA,0BAAO,EAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAF/F,QAAA,aAAa,iBAEkF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "1.0.2",
+  "version": "2.12.0-beta",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/automate/engine/index.js

@@ -324,6 +324,7 @@ export function autoTemplate(node) {
     const stack = [];
     const startNode = node;
     let rootNode = true;
+    const finalOps = [];
     function iterator(node) {
         if (node && !visitedMap.has(node)) {
             const meta = new TemplateMeta(node);
@@ -341,12 +342,21 @@ export function autoTemplate(node) {
                         break;
                     case TRACK_TYPE.PROPERTY:
                     case TRACK_TYPE.ARRAY:
-                        iterator(property);
+                        iterator(property);                  
                         const pmeta = visitedMap.get(property);
                         meta.addBinds(type, propertyName, pmeta);
                         break;
+                    case TRACK_TYPE.ARRAY_NO_FURTHER: 
+                        finalOps.push(() => {
+                            const pmeta = visitedMap.get(property);
+                            if(pmeta) {
+                                meta.addBinds(TRACK_TYPE.ARRAY, propertyName, pmeta);
+                            }
+                        })
+                        break;
                     case TRACK_TYPE.CALLEE:
                         iterator(rootNode);
+                        iterator(calleeNode);
                         const cmeta = visitedMap.get(calleeNode);
                         if (AppPropertyName) {
                             meta.addRootBinds(AppPropertyName, visitedMap.get(rootNode));
@@ -399,6 +409,7 @@ export function autoTemplate(node) {
     }
 
     iterator(node);
+    finalOps.forEach(f => { f(); });
     return autoScript(stack);
 }
 

package/src/automate/engine/uniqueName.js

@@ -3,7 +3,7 @@ class uniqueName {
     NamesWeakMap = new Map();
     initAppUniqueNames(app) {
         const NamesWeakMap = this.NamesWeakMap;
-        NamesWeakMap.set('Entity', new Set(app.getEntityExistingNames()));
+        NamesWeakMap.set('DataSource', new Set(app.getDataSourceExistingNames()));
         NamesWeakMap.set('Structure', new Set(app.getStructureExistingNames()));
         NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
         NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));

package/src/automate/engine/utils.js

@@ -80,6 +80,7 @@ export const TRACK_TYPE = {
     PLAIN: 'plain',
     PROPERTY: 'property',
     ARRAY: 'array',
+    ARRAY_NO_FURTHER: 'array_no_further',
     CALLEE: 'callee',
     CALLEE_TEMPLATE: 'callee_template',
     MODULE: 'module',
@@ -118,6 +119,10 @@ function getRelatedProperyName(nspropertyname) {
     return '';
 }
 
+const TRACKING_ONLY_ONE_LAYER = [
+    'DataSource'
+]
+
 const BACKTRACKING_IGNORE_NAMESPACE = [
     'nasl.core',
     '',
@@ -154,7 +159,6 @@ const ROLE_PROPERTY = 'bindRoles';
 
 export function tracking(node, startNode, callback) {
     const { propertyMap } = getConceptMeta(node.concept);
-    // console.log(propertyMap)
     for (const p of propertyMap) {
         // console.log(p)
         const [propertyName, _data] = p;
@@ -166,13 +170,20 @@ export function tracking(node, startNode, callback) {
             }
             continue;
         }
+        const isOnlyOneLayerTracking = TRACKING_ONLY_ONE_LAYER.includes(node.concept);
         const property = node[propertyName];
         if (Array.isArray(property)) {
             if (property.length > 0) {
                 if (property[0] instanceof BaseNode) {
-                    property.forEach((p) => {
-                        callback(TRACK_TYPE.ARRAY, propertyName, p);
-                    });
+                    if (!isOnlyOneLayerTracking) {
+                        property.forEach((p) => {
+                            callback(TRACK_TYPE.ARRAY, propertyName, p);
+                        }); 
+                    } else {
+                        property.forEach((p) => {
+                            callback(TRACK_TYPE.ARRAY_NO_FURTHER, propertyName, p);
+                        }); 
+                    }
                 } else {
                     if (ROLE_PROPERTY === propertyName) {
                         const rootNode = node.rootNode;
@@ -208,7 +219,7 @@ export function tracking(node, startNode, callback) {
 
                     const rootNode = node.rootNode;
                     const ns = node[propertyName];
-                    if (!ns) {
+                    if (!ns || !node[relatedPropertyName]) {
                         callback(TRACK_TYPE.PLAIN, propertyName, property);
                         callback(TRACK_TYPE.PLAIN, relatedPropertyName, node[relatedPropertyName]);
                         break;
@@ -218,71 +229,84 @@ export function tracking(node, startNode, callback) {
                         callback(TRACK_TYPE.PLAIN, propertyName, property);
                         callback(TRACK_TYPE.PLAIN, relatedPropertyName, node[relatedPropertyName]);
                     } else {
-                        const r1 = /app\.(?:entities|processes)\.([^.]+)\.logics/.exec(ns);
-                        const r2 = /app\.processes\.([^.]+)\.elements\.([^.]+)\.logics/.exec(ns);
                         const calleeN = node[relatedPropertyName];
-                        if (r2) {
-                            const nodeName = r2[1];
-                            const subNodename = r2[2];
-                            if (subNodename) {
-                                // 目前只有 userTask
-                                const process = rootNode.processes.find((p) => p.name === nodeName);
-                                if (process) {
-                                    const usertask = process.elements.find((e) => e.name === subNodename);
-                                    if (usertask) {
-                                        callback(TRACK_TYPE.CALLEE_TEMPLATE, propertyName, node[propertyName], {
-                                            rootNode: process,
-                                            metaNodes: [process, usertask],
-                                            nstemplate: `function(meta, meta2){ return "app.processes" + meta.name + ".elements." + meta2.name + ".logics"; }`,
-                                            nametemplate: `function(meta, meta2){ return "complete"; }`,
-                                            relatedPropertyName,
-                                            AppPropertyName: 'processes',
-                                        });
+
+                        const r1 = /app\.processes\.([^.]+)\.logics/.exec(ns);
+                        const r2 = /app\.processes\.([^.]+)\.elements\.([^.]+)\.logics/.exec(ns);
+                        if(r1 || r2) {
+                            // Process 处理
+                            if (r2) {
+                                const nodeName = r2[1];
+                                const subNodename = r2[2];
+                                if (subNodename) {
+                                    // 目前只有 userTask
+                                    const process = rootNode.processes.find((p) => p.name === nodeName);
+                                    if (process) {
+                                        const usertask = process.elements.find((e) => e.name === subNodename);
+                                        if (usertask) {
+                                            callback(TRACK_TYPE.CALLEE_TEMPLATE, propertyName, node[propertyName], {
+                                                rootNode: process,
+                                                metaNodes: [process, usertask],
+                                                nstemplate: `function(meta, meta2){ return "app.processes" + meta.name + ".elements." + meta2.name + ".logics"; }`,
+                                                nametemplate: `function(meta, meta2){ return "complete"; }`,
+                                                relatedPropertyName,
+                                                AppPropertyName: 'processes',
+                                            });
+                                            break;
+                                        }
                                     }
                                 }
+                            } else if (r1){
+                                const nodeName = r1[1];
+                                const process = rootNode.processes.find((p) => p.name === nodeName);
+                                if (/launch/.test(calleeN) && process) {
+                                    // const prefix = /(launch|complete).+/.exec(calleeN)[1];
+                                    callback(TRACK_TYPE.CALLEE_TEMPLATE, propertyName, node[propertyName], {
+                                        rootNode: process,
+                                        metaNodes: [process],
+                                        nstemplate: `function(meta){ return "app.processes" + meta.name + ".logics"; }`,
+                                        nametemplate: `function(){ return "${calleeN}"; }`,
+                                        relatedPropertyName,
+                                        AppPropertyName: 'processes',
+                                    });
+                                    break;
+                                }
                             }
-                        } else if (r1) {
-                            const nodeName = r1[1];
-                            const process = rootNode.processes.find((p) => p.name === nodeName);
-                            if (/launch/.test(calleeN) && process) {
-                                // const prefix = /(launch|complete).+/.exec(calleeN)[1];
-                                callback(TRACK_TYPE.CALLEE_TEMPLATE, propertyName, node[propertyName], {
-                                    rootNode: process,
-                                    metaNodes: [process],
-                                    nstemplate: `function(meta){ return "app.processes" + meta.name + ".logics"; }`,
-                                    nametemplate: `function(){ return "${calleeN}"; }`,
-                                    relatedPropertyName,
-                                    AppPropertyName: 'processes',
-                                });
-                                break;
-                            }
+                        }
 
-                            const entity = rootNode.entities.find((e) => e.name === nodeName);
-                            if (/get|create|update|delete|batchCreate|batchUpdate|batchDelete|import/.test(calleeN) && entity) {
+                        const r3 = /app\.dataSources\.([^.]+)\.entities\.([^.]+)\.logics/.exec(ns);
+                        if(r3) {
+                            const datasourceName = r3[1];
+                            const entityName = r3[2];
+                            
+                            if (/get|create|update|delete|batchCreate|batchUpdate|batchDelete|import/.test(calleeN)) {
                                 // const prefix = /(get|create|update|delete|batchCreate|batchUpdate|batchDelete|import)/.exec(calleeN)[1];
-                                callback(TRACK_TYPE.CALLEE_TEMPLATE, propertyName, node[propertyName], {
-                                    rootNode: entity,
-                                    metaNodes: [entity],
-                                    nstemplate: `function(meta){ return "app.entities." + meta.name + ".logics"; }`,
-                                    nametemplate: `function(){ return "${calleeN}"; }`,
-                                    relatedPropertyName,
-                                    AppPropertyName: 'entities',
-                                });
-                                break;
-                            }
-                        } else {
-                            const nsPath = `${ns}.${calleeN}`;
-                            const calleeNode = getNodeByNodeCallee(rootNode, nsPath);
-                            if (calleeNode) {
-                                backtracking({
-                                    node,
-                                    startNode,
-                                    calleeNode,
-                                    propertyName,
-                                    relatedPropertyName,
-                                }, callback);
+                                const datasource = rootNode.dataSources.find(d => d.name === datasourceName);
+                                if (datasource) {
+                                    const entity = datasource.entities.find((e) => e.name === entityName);
+                                    callback(TRACK_TYPE.CALLEE_TEMPLATE, propertyName, node[propertyName], {
+                                        rootNode: datasource,
+                                        metaNodes: [datasource, entity],
+                                        nstemplate: `function(meta, meta2){ return "app.dataSources" + meta.name + ".entities." + meta2.name + ".logics"; }`,
+                                        nametemplate: `function(){ return "${calleeN}"; }`,
+                                        relatedPropertyName,
+                                        AppPropertyName: 'dataSources',
+                                    });
+                                    break;
+                                }
                             }
                         }
+                        const nsPath = `${ns}.${calleeN}`;
+                        const calleeNode = getNodeByNodeCallee(rootNode, nsPath);
+                        if (calleeNode) {
+                            backtracking({
+                                node,
+                                startNode,
+                                calleeNode,
+                                propertyName,
+                                relatedPropertyName,
+                            }, callback);
+                        }
                     }
                     break;
 
@@ -296,10 +320,11 @@ export function tracking(node, startNode, callback) {
                     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);
+                            const entityNamespace = queryCom?.from?.entityNamespace;
+                            if (queryCom && entityNamespace && property) {
+                                const rootNode = queryCom.rootNode;
+                                const entity = getNodeByNodeCallee(rootNode, `${entityNamespace}.${property}`);
+                                return entity;
                             }
                             return null;
                         },
@@ -361,7 +386,7 @@ export function backtracking({ node, startNode, calleeNode, propertyName, relate
     while (t) {
         const pnode = t.parentNode;
         if (pnode === approot) {
-            AppPropertyName = getAppPropertyName(calleeNode);
+            AppPropertyName = getAppPropertyName(t);
         }
         if (pnode !== approot && pnode !== startNode) {
             t = pnode;