@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/out/utils/index.js

@@ -14,12 +14,61 @@ 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.findConceptValueFromNamespace = 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;
+// 从namespace中查找concept，返回找到类型对应的值
+// 如 namespace : app.datasource.defaultDS  keyword: datasource
+// 返回 defaultDS
+function findConceptValueFromNamespace(namespace, keyword) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const findIndex = namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+    if (findIndex)
+        return namespaceArr[findIndex + 1];
+    return '';
+}
+exports.findConceptValueFromNamespace = findConceptValueFromNamespace;
 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.1",
+  "version": "2.12.0-beta.1",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",
@@ -38,7 +38,6 @@
     "fs-extra": "^10.1.0",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.21",
-    "module-alias": "^2.2.2",
     "pluralize": "^8.0.0",
     "postcss": "^8.4.14",
     "qs": "^6.10.1",

package/src/automate/engine/index.js

@@ -3,8 +3,9 @@ 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';
+import {uniqueName, componentUniqueName} from './uniqueName';
+import { ops as operatorModule, ComponentOps } from './operators';
+import { processComponent } from '../template/process';
 
 let id = 0;
 class TemplateMeta {
@@ -23,10 +24,12 @@ class TemplateMeta {
 
     addRootBinds(propertyName, templateMeta) {
         // App.[propertyName].push(templateMeta.name)
-        this.rootBinds.push({
-            propertyName,
-            value: templateMeta.name,
-        });
+        if(!this.rootBinds.find(b => b.propertyName === propertyName)) {
+            this.rootBinds.push({
+                propertyName,
+                value: templateMeta.name,
+            });
+        }
     }
 
     addBinds(type, propertyName, templateMeta) {
@@ -324,6 +327,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 +345,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 +412,7 @@ export function autoTemplate(node) {
     }
 
     iterator(node);
+    finalOps.forEach(f => { f(); });
     return autoScript(stack);
 }
 
@@ -425,7 +439,18 @@ export function applyTemplate(script, app, rootBindCallback, roleCallback, final
     // 为了兼容 2.11 老模板
     if(importModule) {
         importModule('operators', operatorModule);
-        importModule('uniqueName', uniqueNameModule);
+        importModule('uniqueName', uniqueName);
     }
     execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
 }
+
+export function applyDropComponent(app, view, element) {
+    const { execTemplate, importModule } = processComponent;
+    // 为了兼容 2.11 老模板
+    if (importModule) {
+        importModule('operators', ComponentOps);
+        importModule('uniqueName', componentUniqueName);
+    }
+    view.collectExistingViewElementName();
+    return execTemplate(app, view, element);
+}

package/src/automate/engine/operators.js

@@ -1,28 +1,76 @@
 import { BaseNode } from '../../common/BaseNode';
 import { getConceptConstructor, getConceptMeta } from '../../decorators/index';
-import { firstUpperCase } from '../../utils/string';
+import { firstUpperCase, unique } from '../../utils/string';
 
 function instanceOfBaseNode(item) {
     return (item instanceof BaseNode);
 }
-const ops = {
+export const ops = {
     _set(item, propertyName, value, callback) {
-        if(instanceOfBaseNode(value)) {
+        if (instanceOfBaseNode(value)) {
             value.parentNode = item;
             value.parentKey = propertyName;
         }
-        if(item[propertyName] !== value) {
+        if (item[propertyName] !== value) {
             item.update({
                 [propertyName]: value,
             });
-            
-            if(instanceOfBaseNode(value) && callback) {
+
+            if (instanceOfBaseNode(value) && callback) {
                 callback(item[propertyName]);
             }
         }
     },
     _push(item, propertyName, value) {
-        if(!item[propertyName]){
+        if (propertyName === 'dataSources' && value.concept === 'DataSource') {
+            // 合并策略
+            const exsitDataSource = item.dataSources.find((d) => d.name === value.name);
+            if (exsitDataSource) {
+                const nameSet = new Set(exsitDataSource.getEntityExistingNames());
+                value.entities.forEach((e) => {
+                    const n = unique(e.name, nameSet, 1, true);
+                    nameSet.add(n);
+                    e.update({
+                        name: n,
+                    });
+                    e.parentNode = exsitDataSource;
+                    exsitDataSource.entities.push(e);
+                    const index = exsitDataSource.entities.length;
+                    e.create({
+                        index,
+                        parentNode: exsitDataSource,
+                        parentKey: 'entities',
+                    });
+                });
+                return;
+            } else {
+                const dataSourceGroup = item.configuration?.getGroup('dataSource');
+                dataSourceGroup.addConfigProperty({
+                    name: value.name,
+                    description: '',
+                    values: [
+                        { env: 'dev', value: '', concept: 'ConfigPropertyValue' },
+                        { env: 'online', value: '', concept: 'ConfigPropertyValue' },
+                    ],
+                });
+            }
+        }
+        if (item.concept === 'App' && propertyName === 'entities' && value.concept === 'Entity') {
+            // 兼容 2.11之前无 datasource 模板
+            const defaultDS = item.dataSources.find((d) => d.name === 'defaultDS');
+            // defaultDS.addEntity(value);
+            value.parentNode = defaultDS;
+            value.parentKey = 'entities';
+            defaultDS.entities.push(value);
+            const index = defaultDS.entities.length;
+            value.create({
+                index,
+                parentNode: defaultDS,
+                parentKey: 'entities',
+            });
+            return;
+        }
+        if (!item[propertyName]) {
             item[propertyName] = [];
         }
         value.parentNode = item;
@@ -39,10 +87,10 @@ const ops = {
         const _ctor = getConceptConstructor(concept);
         const item = new _ctor();
         const { propertyMap } = getConceptMeta(concept);
-        for(const p of propertyMap) {
+        for (const p of propertyMap) {
             const [propertyName] = p;
             const t = item[propertyName];
-            if(Array.isArray(t)) {
+            if (Array.isArray(t)) {
                 ops._set(item, propertyName, []);
             }
         }
@@ -50,14 +98,63 @@ const ops = {
     },
     _addModule(app, name, belongs, data) {
         const ms = app[belongs];
-        const exist = ms.find(m => m.name === name);
-        if(!exist) {
-            app["addModuleIn" + firstUpperCase(belongs)](data);
+        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); 
-    }
-}
+    _bindRoles() {
+        return Array.prototype.map.call(arguments, (r) => r.name);
+    },
+};
+//组件模板的导入有些不同
+let handleDatas = [];
+let dynamicNames = {};
+export const ComponentOps = {
+    ...ops,
+    _set(item, propertyName, value, callback) {
+        if (instanceOfBaseNode(value)) {
+            value.parentNode = item;
+            value.parentKey = propertyName;
+        }
+        if (item[propertyName] !== value) {
+            //指view的全局逻辑或全局变量名称修改
+            if (propertyName === 'name' && dynamicNames[item.name]) {
+                dynamicNames[item.name] = value;
+            }
+            item.update({
+                [propertyName]: value,
+            });
+            //有函数或者组件引用了view的全局逻辑或全局变量名称
+            if ((propertyName === 'name' || propertyName === 'calleeName') && dynamicNames[value]
+                && item.parentKey !== 'property' && item.concept !== 'StructureProperty') {
+                handleDatas.push({
+                    item,
+                    propertyName,
+                });
+            }
+
+            if (instanceOfBaseNode(value) && callback) {
+                callback(item[propertyName]);
+            }
+        }
+    },
+    _rename() {
+        handleDatas.forEach(({ item, propertyName }) => {
+            const changeName = item[propertyName];
+            if (dynamicNames[changeName] && changeName !== dynamicNames[changeName])
+                item.update({
+                    [propertyName]: dynamicNames[changeName],
+                });
+        });
+        handleDatas = [];
+        dynamicNames = {};
+    },
+    _startNames(...initialNames) {
+        initialNames.forEach((name) => {
+            dynamicNames[name] = name;
+        });
+    },
+};
 
-export default ops;
+export default ops;

package/src/automate/engine/uniqueName.js

@@ -1,9 +1,12 @@
 import { unique } from '../../utils/string';
-class uniqueName {
+export class uniqueName {
     NamesWeakMap = new Map();
     initAppUniqueNames(app) {
         const NamesWeakMap = this.NamesWeakMap;
-        NamesWeakMap.set('Entity', new Set(app.getEntityExistingNames()));
+        const defaultDS = app.dataSources.find(d => d.name === 'defaultDS');
+        NamesWeakMap.set('defaultDS', new Set(defaultDS.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()));
@@ -15,22 +18,87 @@ class uniqueName {
     getGenUniqNameFunctionName(item, concept) {
         const p = item.parentNode;
         const NamesWeakMap = this.NamesWeakMap;
-        if(!p) {
+        if (!p) {
+            // 添加至顶层 App 的对象
+            if(concept === 'DataSource') {
+                return item.name;
+            }
+            if(concept === 'Entity') {
+                // Entity 是为了兼容 2.11 及之前的模板
+                concept = 'defaultDS';
+            }
+            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 class componentUniqueName {
+    NamesWeakMap = new Map();
+    view = null;
+    initAppUniqueNames(app, view) {
+        const NamesWeakMap = this.NamesWeakMap;
+        this.view = view;
+        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()));
+        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()));
+        // .... 这里要补一下 view 下面 variable, logics的名字
+        NamesWeakMap.set('Variable', new Set(view.getVarExistingNames()));
+        NamesWeakMap.set('Logic', new Set(view.getLogicExistingNames()));
+    }
+    getGenUniqNameFunctionName(item, concept) {
+        const p = concept === 'ViewElement' ? this.view : 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 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) {     
+            const t = names.filter((n) => n === item.name);
+            if (t.length > 1) {
+                return f1.call(p, item.name);
+            }
+            if (concept === 'ViewElement' && t.length)
+                return f1.call(p, item.name);
+        }
+        // 逻辑里面的变量也需要再判断
+        if (concept === 'Variable' && f1) {
+            const variables = p.getVarExistingNames();
+            if (Array.isArray(this.view.params)) {
+                variables.push(...this.view.params.map((item) => item.name));
+            }
+            if (Array.isArray(this.view.variables)) {
+                variables.push(...this.view.variables.map((item) => item.name));
+            }
+            const t = variables.filter((n) => n === item.name);
+            if (t.length > 1) {
                 return f1.call(p, item.name);
             }
         }
         return item.name;
     }
 }
-export default uniqueName;
+
+export default uniqueName;