@lcap/nasl 3.5.0-beta.4 → 3.6.0-alpha.2

package/out/utils/index.js

@@ -14,8 +14,9 @@ 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.attrConvertCamelCase = exports.replaceNode = exports.toBriefExpr = 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;
+exports.hasParamNameOfAnonymousFunction = exports.checkParamNameOfAnonymousFunction = exports.AnonymousFnNode = exports.attrConvertCamelCase = exports.replaceNode = exports.toBriefExpr = 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;
 const compare_versions_1 = require("compare-versions");
+const index_1 = require("../decorators/index");
 const traverse_1 = require("./traverse");
 // import TypeAnnotation from '../concepts/TypeAnnotation__';
 // import App from '../concepts/App__';
@@ -200,4 +201,186 @@ function attrConvertCamelCase(str) {
     return strList.join('');
 }
 exports.attrConvertCamelCase = attrConvertCamelCase;
+class AnonymousFnNode {
+}
+exports.AnonymousFnNode = AnonymousFnNode;
+/**
+ * 收集匿名函数
+ * @param param0
+ * @returns
+ */
+function collectAnonymousFn({ anonymousFnNode, cb }) {
+    const descendantsAnonyList = cb(anonymousFnNode);
+    const { node } = anonymousFnNode;
+    const propertyMap = (0, index_1.getConceptPropertyMap)(node?.concept);
+    if (!propertyMap) {
+        return;
+    }
+    for (const property of propertyMap.keys()) {
+        const child = node[property];
+        if (!child) {
+            continue;
+        }
+        else if (Array.isArray(child)) {
+            child.forEach((node) => collectAnonymousFn({
+                anonymousFnNode: {
+                    node,
+                    descendants: descendantsAnonyList
+                },
+                cb
+            }));
+        }
+        else {
+            collectAnonymousFn({
+                anonymousFnNode: {
+                    node: child,
+                    descendants: descendantsAnonyList
+                },
+                cb
+            });
+        }
+    }
+}
+function getAnonymousFnNodes(node) {
+    const anonymousFnNodes = [];
+    // 1.匿名函数可能在里层，如：ListDistinctBy
+    // 2.存在多级匿名数据结构
+    collectAnonymousFn({
+        anonymousFnNode: {
+            node,
+            descendants: anonymousFnNodes
+        },
+        cb: (anonymousFnNode) => {
+            const { node, descendants } = anonymousFnNode;
+            if (node?.concept === 'AnonymousFunction') {
+                const newAnonymousNode = {
+                    node,
+                    descendants: [],
+                };
+                descendants?.push(newAnonymousNode);
+                return newAnonymousNode.descendants;
+            }
+            return descendants;
+        }
+    });
+    return anonymousFnNodes;
+}
+/**
+ * 父链上存在的参数名字
+ * @returns
+ */
+function getAncestorExistingParamNames(baseNode) {
+    let node = baseNode;
+    const names = new Set();
+    while (node) {
+        node = node.parentNode;
+        switch (node?.concept) {
+            case 'AnonymousFunction':
+                node.params.forEach((param) => {
+                    names.add(param.name);
+                });
+                break;
+            case 'ForEachStatement':
+                names.add(node.item?.name);
+                names.add(node.index?.name);
+                break;
+            case 'Logic':
+            case 'View':
+                const varList = [
+                    ...(node.params || []),
+                    ...(node.returns || []),
+                    ...(node.variables || [])
+                ];
+                varList?.forEach((variable) => {
+                    names.add(variable?.name);
+                });
+                break;
+        }
+    }
+    return names;
+}
+/**
+ * 确保匿名函数的参数名称都是不重复的，且更新内部的引用关系
+ * @param param0
+ */
+function ensureAnonymousFnsParamName({ ancestorParamNames, anonymousFnNodes, }) {
+    const paramInfoMapList = [];
+    anonymousFnNodes.forEach((anonymousFnNode) => {
+        const { node: anonymousFn, descendants } = anonymousFnNode || {};
+        const tempParamInfoMap = anonymousFn?.ensureParamName(ancestorParamNames);
+        paramInfoMapList.push(tempParamInfoMap);
+        if (Array.isArray(descendants)) {
+            const paramNames = new Set([...ancestorParamNames]);
+            tempParamInfoMap.forEach((value) => {
+                paramNames.add(value.newName);
+            });
+            const descendantTempParamInfoMap = ensureAnonymousFnsParamName({
+                ancestorParamNames: paramNames,
+                anonymousFnNodes: descendants,
+            });
+            paramInfoMapList.push(...descendantTempParamInfoMap);
+        }
+    });
+    return paramInfoMapList;
+}
+/**
+ * 校验匿名函数的局部变量是否重名
+ */
+function checkParamNameOfAnonymousFunction(node) {
+    const anonymousFnNodes = getAnonymousFnNodes(node);
+    // 从外到里计算更改的name
+    const paramInfoMapList = ensureAnonymousFnsParamName({
+        ancestorParamNames: getAncestorExistingParamNames(node),
+        anonymousFnNodes
+    });
+    paramInfoMapList?.forEach((paramInfoMap) => {
+        paramInfoMap.forEach((paramInfo) => {
+            const { newName, param, identifiers } = paramInfo || {};
+            param?.update({
+                name: newName,
+            });
+            if (Array.isArray(identifiers)) {
+                identifiers.forEach((identifier) => {
+                    identifier?.update({
+                        name: newName,
+                    });
+                });
+            }
+        });
+    });
+}
+exports.checkParamNameOfAnonymousFunction = checkParamNameOfAnonymousFunction;
+// 获取内部匿名函数的局部变量
+function collectAnonymousFnNodesParams(node) {
+    const paramNames = new Set();
+    const anonymousFnNodes = getAnonymousFnNodes(node);
+    if (Array.isArray(anonymousFnNodes)) {
+        anonymousFnNodes.forEach((anonymousFnNode) => {
+            const { node: anonymousFn, descendants } = anonymousFnNode || {};
+            anonymousFn.params.forEach((param) => {
+                paramNames.add(param.name);
+            });
+            if (Array.isArray(descendants)) {
+                descendants.forEach(({ node: descendantNode }) => {
+                    const descendantParamNames = collectAnonymousFnNodesParams(descendantNode);
+                    descendantParamNames.forEach((descendantParamName) => {
+                        paramNames.add(descendantParamName);
+                    });
+                });
+            }
+        });
+    }
+    return paramNames;
+}
+/**
+ * 新的参数名是否存在同名
+ * @param param0
+ */
+function hasParamNameOfAnonymousFunction({ node, newName, }) {
+    const ancestorParamNames = getAncestorExistingParamNames(node);
+    const anonymousFnNodesParams = collectAnonymousFnNodesParams(node);
+    const paramNames = new Set([...ancestorParamNames.values(), ...anonymousFnNodesParams.values()]);
+    return paramNames.has(newName);
+}
+exports.hasParamNameOfAnonymousFunction = hasParamNameOfAnonymousFunction;
 //# sourceMappingURL=index.js.map

package/out/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uDAA2C;AAI3C,+CAA4D;AAC5D,yCAAsC;AACtC,6DAA6D;AAC7D,uCAAuC;AAEvC,2CAAyB;AACzB,6CAA2B;AAC3B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,wCAAsB;AACtB,iDAA+B;AAE/B,UAAU;AACV,SAAgB,iBAAiB,CAAC,IAAc;IAC9C,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,OAAO,UAAU,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACpE,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;KACpC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAND,8CAMC;AAED,kBAAkB;AAClB,SAAgB,6BAA6B,CAAC,SAAiB;IAC7D,MAAM,YAAY,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACjD,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;IACtF,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC;AAC5B,CAAC;AAND,sEAMC;AAED,0BAA0B;AAC1B,SAAgB,oCAAoC,CAAC,SAAiB,EAAE,OAAe;IACrF,MAAM,YAAY,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACjD,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;QACrD,IAAI,KAAK,GAAG,CAAC,KAAK,GAAG,EAAE;YACrB,OAAO,aAAa,KAAK,OAAO,CAAC;SAClC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,oFAUC;AAED,kCAAkC;AAClC,8DAA8D;AAC9D,eAAe;AACf,SAAgB,6BAA6B,CAAC,SAAiB,EAAE,OAAe;IAC9E,MAAM,YAAY,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACjD,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;QAChE,IAAI,KAAK,GAAG,CAAC,KAAK,GAAG,EAAE;YACrB,OAAO,aAAa,KAAK,OAAO,CAAC;SAClC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,IAAI,SAAS;QAAE,OAAO,YAAY,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;IAClD,OAAO,EAAE,CAAC;AACZ,CAAC;AAbD,sEAaC;AAED,SAAgB,YAAY;IAC1B,OAAO,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAE,MAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAE,MAAc,CAAC,UAAU,CAAC;AAClG,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;IAClC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI;YAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,kCAIC;AAED,SAAgB,eAAe,CAAC,GAAQ;IACtC,IAAA,mBAAQ,EACN,CAAC,OAAO,EAAE,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI;gBAAE,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,EACD,EAAE,IAAI,EAAE,GAAG,EAAE,EACb,EAAE,IAAI,EAAE,WAAW,EAAE,CACtB,CAAC;AACJ,CAAC;AAVD,0CAUC;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;IAC7B,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;CACb,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,CACtE,CAAC,uBAAe,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC/B,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;IACrB,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;AAH3F,QAAA,aAAa,iBAG8E;AAmBxG,SAAgB,WAAW,CAAC,UAAqB;IAC/C,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,IACE;QACE,gBAAgB;QAChB,eAAe;QACf,YAAY;QACZ,kBAAkB;QAClB,sBAAsB;QACtB,gBAAgB;QAChB,aAAa;QACb,UAAU;QACV,kBAAkB;QAClB,iBAAiB;KAClB,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,EAC/B;QACA,IAAI,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;KAC7B;SAAM,IACL,CAAC,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5I;QACA,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC;KACzB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAvBD,kCAuBC;AAED,SAAgB,WAAW,CAAC,OAAY,EAAE,OAAY;IACpD,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACjE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE;QACzC,UAAU,CAAC,MAAM,CAAC;YAChB,CAAC,SAAS,CAAC,EAAE,OAAO;SACrB,CAAC,CAAC;KACJ;SAAM;QACL,4BAA4B;QAC5B,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE;YACxB,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;QACH,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE;YAClC,IAAI,SAAS,KAAK,MAAM,EAAE;gBACxB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;gBACvE,KAAK,CAAC,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aAC7C;iBAAM;gBACL,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;gBAC7E,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC7C,KAAK,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACnD;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;YAClF,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YACzF,IAAI,UAAU,CAAC,eAAe,cAAc,IAAI,CAAC;gBAAE,UAAU,CAAC,eAAe,cAAc,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;;gBAC/G,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;SACjD;QACD,OAAO,CAAC,MAAM,EAAE,CAAC;QACjB,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KACzB;AACH,CAAC;AA9BD,kCA8BC;AAED,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,IAAI,OAAO,GAAa,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACvC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACvC,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,OAAO,OAAO,CAAC;SAChB;aAAM;YACL,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE;IACH,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC1B,CAAC;AAVD,oDAUC;AAED,MAAa,eAAe;CAG3B;AAHD,0CAGC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,EAC1B,eAAe,EACf,EAAE,EAIH;IACC,MAAM,oBAAoB,GAAQ,EAAE,CAAC,eAAe,CAAC,CAAC;IACtD,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,6BAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IACD,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,QAA0B,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,EAAE;YACV,SAAS;SACV;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAsB,EAAE,EAAE,CAAC,kBAAkB,CAAC;gBAC3D,eAAe,EAAE;oBACf,IAAI;oBACJ,WAAW,EAAE,oBAAoB;iBAClC;gBACD,EAAE;aACH,CAAC,CAAC,CAAC;SACL;aAAM;YACL,kBAAkB,CAAC;gBACjB,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,WAAW,EAAE,oBAAoB;iBAClC;gBACD,EAAE;aACH,CAAC,CAAC;SACJ;KACF;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAsB;IACjD,MAAM,gBAAgB,GAAsB,EAAE,CAAC;IAC/C,+BAA+B;IAC/B,eAAe;IACf,kBAAkB,CAAC;QACjB,eAAe,EAAE;YACf,IAAI;YACJ,WAAW,EAAE,gBAAgB;SAC9B;QACD,EAAE,EAAE,CAAC,eAAe,EAAE,EAAE;YACtB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC;YAC9C,IAAI,IAAI,EAAE,OAAO,KAAK,mBAAmB,EAAE;gBACzC,MAAM,gBAAgB,GAAQ;oBAC5B,IAAI;oBACJ,WAAW,EAAE,EAAE;iBAChB,CAAC;gBACF,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBACpC,OAAO,gBAAgB,CAAC,WAAW,CAAC;aACrC;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;KACF,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;GAGG;AACH,SAAS,6BAA6B,CAAC,QAA0B;IAC/D,IAAI,IAAI,GAAa,QAAQ,CAAC;IAC9B,MAAM,KAAK,GAAgB,IAAI,GAAG,EAAE,CAAC;IACrC,OAAO,IAAI,EAAE;QACX,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;QACvB,QAAQ,IAAI,EAAE,OAAO,EAAE;YACrB,KAAK,mBAAmB;gBACrB,IAA0B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAY,EAAE,EAAE;oBAC1D,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,kBAAkB;gBACrB,KAAK,CAAC,GAAG,CAAE,IAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACjD,KAAK,CAAC,GAAG,CAAE,IAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM;YACR,KAAK,OAAO,CAAC;YACb,KAAK,MAAM;gBACT,MAAM,OAAO,GAAG;oBACd,GAAG,CAAE,IAAqB,CAAC,MAAM,IAAI,EAAE,CAAC;oBACxC,GAAG,CAAE,IAAc,CAAC,OAAO,IAAI,EAAE,CAAC;oBAClC,GAAG,CAAE,IAAqB,CAAC,SAAS,IAAI,EAAE,CAAC;iBAC5C,CAAC;gBACF,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBAC5B,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC;gBACH,MAAM;SACT;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CAAC,EACnC,kBAAkB,EAClB,gBAAgB,GAIjB;IACC,MAAM,gBAAgB,GAAuB,EAAE,CAAC;IAChD,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;QAC3C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,eAAe,IAAI,EAAE,CAAC;QACjE,MAAM,gBAAgB,GAAI,WAAiC,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACjG,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC9B,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC;YACpD,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,MAAM,0BAA0B,GAAG,2BAA2B,CAAC;gBAC7D,kBAAkB,EAAE,UAAU;gBAC9B,gBAAgB,EAAE,WAAW;aAC9B,CAAC,CAAC;YACH,gBAAgB,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAAC,CAAC;SACtD;IACH,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,SAAgB,iCAAiC,CAAC,IAAsB;IACtE,MAAM,gBAAgB,GAAQ,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACxD,gBAAgB;IAChB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;QACnD,kBAAkB,EAAE,6BAA6B,CAAC,IAAI,CAAC;QACvD,gBAAgB;KACjB,CAAC,CAAC;IACH,gBAAgB,EAAE,OAAO,CAAC,CAAC,YAA8B,EAAE,EAAE;QAC3D,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACjC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC;YACxD,KAAK,EAAE,MAAM,CAAC;gBACZ,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC9B,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACjC,UAAU,EAAE,MAAM,CAAC;wBACjB,IAAI,EAAE,OAAO;qBACd,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAtBD,8EAsBC;AAED,gBAAgB;AAChB,SAAS,6BAA6B,CAAC,IAAsB;IAC3D,MAAM,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC1C,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QACnC,gBAAgB,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YAC3C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,eAAe,IAAI,EAAE,CAAC;YAChE,WAAiC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAY,EAAE,EAAE;gBACjE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC9B,WAAW,CAAC,OAAO,CAAC,CAAC,EACnB,IAAI,EAAE,cAAc,EACrB,EAAE,EAAE;oBACH,MAAM,oBAAoB,GAAG,6BAA6B,CAAC,cAAc,CAAC,CAAC;oBAC3E,oBAAoB,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE;wBACnD,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;oBACtC,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,SAAgB,+BAA+B,CAAC,EAC9C,IAAI,EACJ,OAAO,GAIR;IACC,MAAM,kBAAkB,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,sBAAsB,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAE,GAAG,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACjG,OAAO,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAXD,0EAWC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.5.0-beta.4",
+  "version": "3.6.0-alpha.2",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "clear": "rimraf ./out",

package/src/breakpoint/shared/utils.ts

@@ -16,6 +16,7 @@ import {
 } from './constants';
 
 type Callback = (node: BaseNode) => void;
+type Condition = (node: BaseNode) => boolean;
 
 type HistoryInApp = {
   _historyIndex?: number,
@@ -117,30 +118,7 @@ const isBreakableByCurrent = (node: BaseNode): Boolean => {
   return BREAKPOINT_CONCEPTS.includes(concept);
 };
 
-const queryComponents = [
-  'CallQueryComponent',
-  'OqlQueryComponent',
-];
-
-const conditions = [
-  (node: BaseNode) => {
-    if (!node) {
-      return;
-    }
-
-    const { concept } = node;
-    const included = queryComponents.includes(concept);
-
-    if (!included) {
-      return;
-    }
-
-    const concpet = 'Paginate' as any;
-    const ancestor = node.getAncestor(concpet);
-
-    return !ancestor;
-  },
-];
+const conditions: Condition[] = [];
 
 const isBreakableByConditions = (node: BaseNode): Boolean => {
   if (!node) {

package/src/breakpoint/store/core.ts

@@ -138,7 +138,7 @@ const isFrontend = (node: BaseNode) => {
 
   const { getAncestor } = node;
 
-  return getAncestor && getAncestor.call(node, 'View');
+  return getAncestor && getAncestor.call(node, 'FrontendType');
 };
 
 const updateToBackend = (node: BaseNode) => {

package/src/common/BaseNode.ts

@@ -210,6 +210,13 @@ export class BaseNode extends EventEmitter {
   @property()
   name: string = '';
 
+  /**
+   * 应用内节点的分组管理机制
+   * 暂无明确的名称定义要求，只要求唯一即可，建议使用时第一个分组给一个root分组
+   */
+  @property()
+  composedBy?: Array<string>;
+
   /**
    * 当前节点的类型标注
    */
@@ -300,6 +307,10 @@ export class BaseNode extends EventEmitter {
     if (utils.isNode && ('concept' in this) && !this.concept) {
       Reflect.deleteProperty(this, 'concept');
     }
+
+    if (this?.composedBy) {
+      (this as any)?.app && (this as any).app.addComposeNodes(this.composedBy, this);
+     }
   }
 
   fixInstantiate() {
@@ -1102,6 +1113,14 @@ export class BaseNode extends EventEmitter {
     /* override */
   }
 
+  /**
+   * 移除绑定实体元素的页面元素
+   */
+  @action('移除绑定实体元素的页面元素')
+  async removeBindEntityPropertyViewEelment(): Promise<any> {
+    /* override */
+  }
+
   /**
    * 准备删除
    */

package/src/common/Command.ts

@@ -47,6 +47,7 @@ export function unregisterCommand(command: string, execute?: CommandExecute) {
     }
     _commands.delete(command);
   }
+  _commands.delete(command);
 }
 
 export function invokeCommand(command: string, ...args: any[]) {

package/src/common/EventEmitter.ts

@@ -27,12 +27,7 @@ export class EventEmitter {
    * @param eventName 事件名
    * @param listener 监听器
    */
-  off(eventName?: string, listener?: EventListener) {
-    if (!eventName) {
-      (this as any)._events = {};
-      return;
-    }
-
+  off(eventName: string, listener: EventListener) {
     const listeners = this._events[eventName];
     if (listeners) {
       const index = listeners.indexOf(listener);

package/src/concepts/AnonymousFunction__.ts

@@ -649,27 +649,45 @@ export class AnonymousFunction extends LogicItem {
     return code;
   }
 
-  checkParamName() {
-    let node: types.SyntaxNode = this;
-    const names: Set<string> = new Set();
-    while (node && node.concept !== 'Logic') {
-      node = node.parentNode;
-      if (asserts.isAnonymousFunction(node)) {
-        node.params.forEach((param) => {
-          names.add(param.name);
-        });
+  /**
+   * 确保参数名称都是不重复的，且更新内部的引用关系
+   * @param paramNames
+   * @returns
+   */
+  ensureParamName(paramNames: Set<string>) {
+    const paramInfoMap = new Map<string, any>();
+    this.params.forEach((param) => {
+      const name = utils.unique(param.name, paramNames);
+      if (!paramInfoMap.get(param.name)) {
+        paramInfoMap.set(param.name, {});
       }
-
-      if (asserts.isForEachStatement(node)) {
-        names.add(node.item.name);
-        names.add(node.index.name);
+      const paramInfo = paramInfoMap.get(param.name);
+      // 即使没有修改，也需要把名字塞进去
+      paramInfo.newName = name;
+      if (name !== param.name) {
+        paramInfo.param = param;
+      }
+    });
+    this.traverseChildren((node) => {
+      if (node?.concept === 'Identifier') {
+        const parentNode = node.parentNode;
+        if (
+          parentNode?.concept !== 'MemberExpression'
+          || (parentNode.parentNode?.concept !== 'MemberExpression' && (parentNode as any).object === node)
+        ) {
+          if (node) {
+            const paramInfo = paramInfoMap.get(node.name);
+            if (paramInfo?.param) {
+              if (!Array.isArray(paramInfo?.identifiers)) {
+                paramInfo.identifiers = [];
+              }
+              paramInfo.identifiers.push(node);
+            }
+          }
+        }
       }
-    }
-
-    this.params.forEach((param) => {
-      const name = utils.unique(param.name, names);
-      param.name = name;
     });
+    return paramInfoMap;
   }
 
   //================================================================================

package/src/concepts/App__.ts

@@ -33,6 +33,13 @@ interface compilerInfoMapProps {
   js?: { prefix: string };
 }
 
+type composeCacheType = {
+  [key: string]: composeCacheType,
+} & {
+  nodes?: any[];
+};
+
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -3926,6 +3933,116 @@ export class App extends BaseNode {
   @property()
   preferenceMap: Record<string, string> = {};
 
+  /**
+   * 组合节点缓存
+   */
+  composeCache: composeCacheType = {};
+
+
+  /**
+   * 获取组合节点
+   */
+  getCompose(path: string[]) {
+    let compose = this.composeCache;
+    path.forEach((key) => {
+      compose = compose?.[key];
+    });
+    return compose || null;
+  }
+
+  /**
+   * 获取组合节点
+   */
+  getComposeNodes(path: string[]) {
+    let compose = this.composeCache;
+    path.forEach((key) => {
+      compose = compose?.[key];
+    });
+    return compose?.nodes || [];
+  }
+
+  /**
+   * 往组合内添加节点
+   */
+  addComposeNodes(path: string[], node: BaseNode | BaseNode[]) {
+    let compose = this.composeCache;
+    path.forEach((key, index) => {
+      if (index === path.length - 1) {
+        if (compose?.[key]?.nodes) {
+          if (Array.isArray(node)) {
+            compose[key].nodes.push(...node);
+          } else {
+            compose[key].nodes.push(node);
+          }
+        } else {
+          if (!compose?.[key]) {
+            compose[key] = {};
+          }
+          compose[key].nodes = Array.isArray(node) ? node : [node];
+        }
+      } else {
+        if (!compose?.[key]) {
+          compose[key] = {};
+        }
+        compose = compose[key];
+      }
+    });
+  }
+
+  /**
+   * 删除分组, 包括子集
+   */
+  deleteCompose(path: string[]) {
+    if (!Array.isArray(path)) return;
+    let compose = this.composeCache;
+
+    const delNodes = (_compose: composeCacheType) => {
+      if (_compose?.nodes) {
+        for(let key in _compose) {
+          if (key !== 'nodes') {
+            delNodes(_compose[key]);
+          }
+        }
+        _compose.nodes.forEach((node) => {
+          node.delete();
+        })
+        _compose.nodes = [];
+      }
+    }
+
+    this.emit('collect:start', {
+      actionMsg: '删除同一分组节点',
+    });
+    path.forEach((key, index) => {
+      if (index === path.length - 1) {
+        delNodes(compose?.[key]);
+      } else {
+        compose = compose[key];
+      }
+    });
+    this.emit('collect:end');
+  }
+
+  /**
+   * 释放分组内所有节点
+   */
+  releaseComposeNode(path: string[]) {
+    if (!Array.isArray(path)) return;
+    let compose = this.composeCache;
+    path.forEach((key, index) => {
+      if (index === path.length - 1) {
+        const nodes = compose?.[key]?.nodes || [];
+        nodes.forEach((node) => {
+          node.update({
+            composedBy: [],
+          });
+        })
+      } else {
+        compose = compose[key];
+      }
+    });
+  }
+
   /**
    * 获取命名空间
    */
@@ -3998,21 +4115,23 @@ export class App extends BaseNode {
   }
 
   loadPackageInfo(scope: string) {
-    const dependencyMap = (window as any).globalData.ideVersionDetail.dependencies;
+    const materialConfig = (window as any).globalData.materialConfig || {};
+    const { framework, ui } = materialConfig;
+
     const packageInfo = {
       template: { name: '', version: '', scope },
       ui: { name: '', version: '', scope },
       scope,
     };
 
-    packageInfo.template.name = scope === 'h5' ? '@lcap/mobile-template' : 'lcap-pc-template';
-    packageInfo.template.version =
-      scope === 'h5' ? dependencyMap.FrontendArchH5.version : dependencyMap.FrontendArchPC.version;
-    packageInfo.ui.name = scope === 'h5' ? '@lcap/mobile-ui' : 'cloud-ui.vusion';
-    packageInfo.ui.version =
-      scope === 'h5'
-        ? dependencyMap.FrontendComponentLibraryH5.version
-        : dependencyMap.FrontendComponentLibraryPC.version;
+    packageInfo.template.name = scope === 'h5' ? framework.h5 : framework.pc;
+    packageInfo.template.version = framework.version;
+
+    packageInfo.ui.name = scope === 'h5' ? ui.h5.name : ui.pc.name;
+    packageInfo.ui.version = scope === 'h5'
+        ? ui.h5.version
+        : ui.pc.version;
+
     return packageInfo;
   }
 
@@ -4047,21 +4166,13 @@ export class App extends BaseNode {
           `${prefix}/packages/vue@2/dist/vue.min.js`,
           // `${prefix}/packages/vue-router@3/dist/vue-router.min.js`,
 
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.js`
-            : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.js`,
+          `${prefix}/packages/${packageInfo.ui.name}@${packageInfo.ui.version}/dist-theme/index.js`,
 
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`
-            : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`,
+          `${prefix}/packages/${packageInfo.template.name}@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`,
         ],
         css: [
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.css`
-            : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.css`,
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-template@${packageInfo.template.version}/cloudAdminDesigner.css`
-            : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.css`,
+          `${prefix}/packages/${packageInfo.ui.name}@${packageInfo.ui.version}/dist-theme/index.css`,
+          `${prefix}/packages/${packageInfo.template.name}@${packageInfo.template.version}/cloudAdminDesigner.css`,
         ],
       },
       custom: {

package/src/concepts/BindAttribute__.ts

@@ -1080,7 +1080,6 @@ export class BindAttribute extends BaseNode {
     return str;
   }
 
-
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;

package/src/concepts/BindEvent__.ts

@@ -774,7 +774,7 @@ export class BindEvent extends BaseNode {
     let code = '';
     if (!Object.keys(elementsEventsMap).length) return;
     // 业务组件
-    const businessComponent = this.element.correspondingBusinessComponent;
+    const businessComponent = this.element?.correspondingBusinessComponent;
     // 已有的点击事件，已知类型的，就直接取值
     if (
       [
@@ -1092,7 +1092,7 @@ export class BindEvent extends BaseNode {
     const newName = this.name.replace(/-/g, '');
     if (asserts.isViewElement(parentNode)) {
       return `${parentNode.name}_${newName}`;
-    } else if (asserts.isView(parentNode)) {
+    } else if (asserts.isView(parentNode) || asserts.isBusinessComponent(parentNode)) {
       return `${this.likeComponent.name}_${newName}`;
     } else {
       // 这里编译成这个名字了 后续pctemplate 里也得按这个调用？