@lcap/nasl 3.6.0-alpha.1 → 3.6.0-alpha.2

package/src/templator/utils.ts

@@ -1,5 +1,5 @@
 import { utils } from '..';
-import { App, Module, Entity, EntityProperty, Logic, View, Namespace, TypeAnnotation } from '../concepts';
+import { App, Module, Entity, EntityProperty, Logic, View, Namespace, TypeAnnotation, BusinessComponent } from '../concepts';
 
 export const filterProperty = (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') => (property: EntityProperty) => {
   if (property.display) {
@@ -131,7 +131,7 @@ function capFirstLetter(word: string) {
  */
 export function genUniqueQueryNameGroup(
   scope: App | Module | Namespace,
-  view: View,
+  view: View | BusinessComponent,
   componentName: string = '',
   defaultInView: boolean = true,
   suffix: string = ''

package/src/translator/utils.ts

@@ -180,8 +180,19 @@ export function withSourceMapGenerator(target: any, key: string, descriptor: Pro
     const code = yield* oldMethod.call(this, state, ...args);
     yield;
 
+    const start = {
+      ...state.position
+    };
+    if (this.concept === 'BusinessComponent') {
+      const lines: string[] = code.split('\n');
+      const lineOffset = lines.findIndex((item) => item.startsWith('export class '));
+      if (lineOffset) {
+        start.line = start.line + lineOffset + 1;
+        start.offset = 13;
+      }
+    }
     state.sourceMap?.set(this, {
-      start: state.position,
+      start,
       end: shiftPosition(state.position, code),
     });
 

package/src/utils/i18nInfo.ts

@@ -1,14 +1,19 @@
 export const languageList = [
   {
     id: 'en-US',
-    name: 'English (United States)',
-    title: '英语（美国）',
+    name: 'English',
+    title: '英语',
   },
   {
     id: 'fr-FR',
     name: 'Français',
     title: '法语',
   },
+  {
+    id: 'ko-KR',
+    name: '한국어',
+    title: '韩语',
+  },
   {
     id: 'zh-CN',
     name: '中文 (简体)',

package/src/utils/index.ts

@@ -1,5 +1,8 @@
 import { compare } from 'compare-versions';
-import { BaseNode, LogicItem } from '..';
+import { BaseNode, LogicItem, AnonymousFunction, Param } from '..';
+import type { ForEachStatement, Logic, View } from '..';
+import * as types from '../concepts/utils/types';
+import { getConceptPropertyMap } from '../decorators/index';
 import { traverse } from './traverse';
 // import TypeAnnotation from '../concepts/TypeAnnotation__';
 // import App from '../concepts/App__';
@@ -202,3 +205,210 @@ export function attrConvertCamelCase(str: string) {
   });
   return strList.join('');
 }
+
+export class AnonymousFnNode {
+  node: types.SyntaxNode;
+  descendants: AnonymousFnNode[];
+}
+
+/**
+ * 收集匿名函数
+ * @param param0
+ * @returns
+ */
+function collectAnonymousFn({
+  anonymousFnNode,
+  cb
+}: {
+  anonymousFnNode: AnonymousFnNode;
+  cb: (anonymousFnNode: AnonymousFnNode) => void
+}) {
+  const descendantsAnonyList: any = cb(anonymousFnNode);
+  const { node } = anonymousFnNode;
+  const propertyMap = getConceptPropertyMap(node?.concept);
+  if (!propertyMap) {
+    return;
+  }
+  for (const property of propertyMap.keys()) {
+    const child = node[property as keyof BaseNode];
+    if (!child) {
+      continue;
+    } else if (Array.isArray(child)) {
+      child.forEach((node: types.SyntaxNode) => collectAnonymousFn({
+        anonymousFnNode: {
+          node,
+          descendants: descendantsAnonyList
+        },
+        cb
+      }));
+    } else {
+      collectAnonymousFn({
+        anonymousFnNode: {
+          node: child,
+          descendants: descendantsAnonyList
+        },
+        cb
+      });
+    }
+  }
+}
+
+function getAnonymousFnNodes(node: types.SyntaxNode) {
+  const anonymousFnNodes: AnonymousFnNode[] = [];
+  // 1.匿名函数可能在里层，如：ListDistinctBy
+  // 2.存在多级匿名数据结构
+  collectAnonymousFn({
+    anonymousFnNode: {
+      node,
+      descendants: anonymousFnNodes
+    },
+    cb: (anonymousFnNode) => {
+      const { node, descendants } = anonymousFnNode;
+      if (node?.concept === 'AnonymousFunction') {
+        const newAnonymousNode: any = {
+          node,
+          descendants: [],
+        };
+        descendants?.push(newAnonymousNode);
+        return newAnonymousNode.descendants;
+      }
+      return descendants;
+    }
+  });
+  return anonymousFnNodes;
+}
+
+/**
+ * 父链上存在的参数名字
+ * @returns
+ */
+function getAncestorExistingParamNames(baseNode: types.SyntaxNode) {
+  let node: BaseNode = baseNode;
+  const names: Set<string> = new Set();
+  while (node) {
+    node = node.parentNode;
+    switch (node?.concept) {
+      case 'AnonymousFunction':
+        (node as AnonymousFunction).params.forEach((param: Param) => {
+          names.add(param.name);
+        });
+        break;
+      case 'ForEachStatement':
+        names.add((node as ForEachStatement).item?.name);
+        names.add((node as ForEachStatement).index?.name);
+        break;
+      case 'Logic':
+      case 'View':
+        const varList = [
+          ...((node as Logic | View).params || []),
+          ...((node as Logic).returns || []),
+          ...((node as Logic | View).variables || [])
+        ];
+        varList?.forEach((variable) => {
+          names.add(variable?.name);
+        });
+        break;
+    }
+  }
+  return names;
+}
+
+/**
+ * 确保匿名函数的参数名称都是不重复的，且更新内部的引用关系
+ * @param param0
+ */
+function ensureAnonymousFnsParamName({
+  ancestorParamNames,
+  anonymousFnNodes,
+}: {
+  ancestorParamNames: Set<string>;
+  anonymousFnNodes: AnonymousFnNode[];
+}) {
+  const paramInfoMapList: Map<string, any>[] = [];
+  anonymousFnNodes.forEach((anonymousFnNode) => {
+    const { node: anonymousFn, descendants } = anonymousFnNode || {};
+    const tempParamInfoMap = (anonymousFn as AnonymousFunction)?.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;
+}
+
+/**
+ * 校验匿名函数的局部变量是否重名
+ */
+export function checkParamNameOfAnonymousFunction(node: types.SyntaxNode) {
+  const anonymousFnNodes: any = getAnonymousFnNodes(node);
+  // 从外到里计算更改的name
+  const paramInfoMapList = ensureAnonymousFnsParamName({
+    ancestorParamNames: getAncestorExistingParamNames(node),
+    anonymousFnNodes
+  });
+  paramInfoMapList?.forEach((paramInfoMap: Map<string, any>) => {
+    paramInfoMap.forEach((paramInfo) => {
+      const { newName, param, identifiers } = paramInfo || {};
+      param?.update({
+        name: newName,
+      });
+      if (Array.isArray(identifiers)) {
+        identifiers.forEach((identifier) => {
+          identifier?.update({
+            name: newName,
+          });
+        });
+      }
+    });
+  });
+}
+
+// 获取内部匿名函数的局部变量
+function collectAnonymousFnNodesParams(node: types.SyntaxNode) {
+  const paramNames: Set<string> = new Set();
+  const anonymousFnNodes = getAnonymousFnNodes(node);
+  if (Array.isArray(anonymousFnNodes)) {
+    anonymousFnNodes.forEach((anonymousFnNode) => {
+      const { node: anonymousFn, descendants } = anonymousFnNode || {};
+      (anonymousFn as AnonymousFunction).params.forEach((param: 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
+ */
+export function hasParamNameOfAnonymousFunction({
+  node,
+  newName,
+}: {
+  node: types.SyntaxNode,
+  newName: string
+}) {
+  const ancestorParamNames = getAncestorExistingParamNames(node);
+  const anonymousFnNodesParams = collectAnonymousFnNodesParams(node);
+  const paramNames = new Set([...ancestorParamNames.values(), ...anonymousFnNodesParams.values()]);
+  return paramNames.has(newName);
+}

package/test/concepts/call-function/fixtures/from-string.json

@@ -14,77 +14,86 @@
     "enums": [],
     "logics": [],
     "interfaces": [],
-    "frontends": [
+    "frontendTypes": [
         {
-            "concept": "Frontend",
+            "concept": "FrontendType",
             "name": "pc",
-            "title": "PC端",
-            "type": "pc",
-            "path": "/",
-            "documentTitle": null,
-            "documentIcon": null,
-            "views": [
+            "kind": "pc",
+            "frontends": [
                 {
-                    "concept": "View",
-                    "changedTime": 1691568444284,
-                    "name": "test",
-                    "title": "测试",
-                    "crumb": null,
-                    "auth": false,
-                    "isIndex": true,
-                    "script": "",
-                    "params": [],
-                    "variables": [],
-                    "logics": [
+                    "concept": "Frontend",
+                    "name": "pc",
+                    "title": "PC端",
+                    "type": "pc",
+                    "path": "/",
+                    "documentTitle": null,
+                    "documentIcon": null,
+                    "views": [
                         {
-                            "__$Selected": true,
-                            "concept": "CallFunction",
-                            "name": "",
-                            "label": "内置函数",
-                            "folded": false,
-                            "offsetX": 361.90234375,
-                            "offsetY": 198.10546875,
-                            "calleeNamespace": "nasl.util",
-                            "calleeName": "FromString",
-                            "typeArguments": [
+                            "concept": "View",
+                            "changedTime": 1691568444284,
+                            "name": "test",
+                            "title": "测试",
+                            "crumb": null,
+                            "auth": false,
+                            "isIndex": true,
+                            "script": "",
+                            "params": [],
+                            "variables": [],
+                            "logics": [
                                 {
-                                    "concept": "TypeAnnotation",
-                                    "name": "",
-                                    "typeKind": "primitive",
-                                    "typeNamespace": "nasl.core",
-                                    "typeName": "Boolean",
-                                    "typeArguments": null,
-                                    "returnType": null,
-                                    "properties": null
-                                }
-                            ],
-                            "arguments": [
-                                {
-                                    "concept": "Argument",
+                                    "__$Selected": true,
+                                    "concept": "CallFunction",
                                     "name": "",
+                                    "label": "内置函数",
                                     "folded": false,
-                                    "keyword": "value",
-                                    "expression": {
-                                        "concept": "Identifier",
-                                        "name": "str",
-                                        "folded": false
-                                    }
+                                    "offsetX": 361.90234375,
+                                    "offsetY": 198.10546875,
+                                    "calleeNamespace": "nasl.util",
+                                    "calleeName": "FromString",
+                                    "typeArguments": [
+                                        {
+                                            "concept": "TypeAnnotation",
+                                            "name": "",
+                                            "typeKind": "primitive",
+                                            "typeNamespace": "nasl.core",
+                                            "typeName": "Boolean",
+                                            "typeArguments": null,
+                                            "returnType": null,
+                                            "properties": null
+                                        }
+                                    ],
+                                    "arguments": [
+                                        {
+                                            "concept": "Argument",
+                                            "name": "",
+                                            "folded": false,
+                                            "keyword": "value",
+                                            "expression": {
+                                                "concept": "Identifier",
+                                                "name": "str",
+                                                "folded": false
+                                            }
+                                        }
+                                    ]
                                 }
-                            ]
+                            ],
+                            "bindEvents": [],
+                            "bindRoles": [],
+                            "children": []
                         }
                     ],
-                    "bindEvents": [],
-                    "bindRoles": [],
-                    "children": []
+                    "variables": [],
+                    "theme": {
+                        "concept": "Theme",
+                        "name": "",
+                        "title": "默认主题样式",
+                        "variableMap": {}
+                    },
+                    "componentDependencies": []
                 }
             ],
-            "variables": [],
-            "theme": {
-                "concept": "Theme",
-                "name": "",
-                "title": "默认主题样式",
-                "variableMap": {}
-            },
+            "businessComponents": [],
             "componentDependencies": []
         }
     ],

package/test/concepts/call-function/fixtures/to-string-global-tz.json

@@ -14,76 +14,85 @@
     "enums": [],
     "logics": [],
     "interfaces": [],
-    "frontends": [
+    "frontendTypes": [
         {
-            "concept": "Frontend",
+            "concept": "FrontendType",
             "name": "pc",
-            "title": "PC端",
-            "type": "pc",
-            "path": "/",
-            "documentTitle": null,
-            "documentIcon": null,
-            "views": [
+            "kind": "pc",
+            "frontends": [
                 {
-                    "concept": "View",
-                    "changedTime": 1691568444284,
-                    "name": "test",
-                    "title": "测试",
-                    "crumb": null,
-                    "auth": false,
-                    "isIndex": true,
-                    "script": "",
-                    "params": [],
-                    "variables": [],
-                    "logics": [
+                    "concept": "Frontend",
+                    "name": "pc",
+                    "title": "PC端",
+                    "type": "pc",
+                    "path": "/",
+                    "documentTitle": null,
+                    "documentIcon": null,
+                    "views": [
                         {
-                            "__$Selected": true,
-                            "concept": "CallFunction",
-                            "name": "",
-                            "label": "内置函数",
-                            "folded": false,
-                            "calleeNamespace": "nasl.util",
-                            "calleeName": "ToString",
-                            "typeArguments": [],
-                            "arguments": [
+                            "concept": "View",
+                            "changedTime": 1691568444284,
+                            "name": "test",
+                            "title": "测试",
+                            "crumb": null,
+                            "auth": false,
+                            "isIndex": true,
+                            "script": "",
+                            "params": [],
+                            "variables": [],
+                            "logics": [
                                 {
-                                    "concept": "Argument",
+                                    "__$Selected": true,
+                                    "concept": "CallFunction",
                                     "name": "",
+                                    "label": "内置函数",
                                     "folded": false,
-                                    "keyword": "value",
-                                    "expression": {
-                                        "concept": "Identifier",
-                                        "name": "dt",
-                                        "folded": false
-                                    }
-                                },
-                                {
-                                    "concept": "Argument",
-                                    "name": "",
-                                    "folded": false,
-                                    "keyword": "时区",
-                                    "expression": {
-                                        "concept": "StringLiteral",
-                                        "name": "ToStringTimeZoneDefaultExpression",
-                                        "folded": false,
-                                        "value": "global"
-                                    }
+                                    "calleeNamespace": "nasl.util",
+                                    "calleeName": "ToString",
+                                    "typeArguments": [],
+                                    "arguments": [
+                                        {
+                                            "concept": "Argument",
+                                            "name": "",
+                                            "folded": false,
+                                            "keyword": "value",
+                                            "expression": {
+                                                "concept": "Identifier",
+                                                "name": "dt",
+                                                "folded": false
+                                            }
+                                        },
+                                        {
+                                            "concept": "Argument",
+                                            "name": "",
+                                            "folded": false,
+                                            "keyword": "时区",
+                                            "expression": {
+                                                "concept": "StringLiteral",
+                                                "name": "ToStringTimeZoneDefaultExpression",
+                                                "folded": false,
+                                                "value": "global"
+                                            }
+                                        }
+                                    ]
                                 }
-                            ]
+                            ],
+                            "bindEvents": [],
+                            "bindRoles": [],
+                            "children": []
                         }
                     ],
-                    "bindEvents": [],
-                    "bindRoles": [],
-                    "children": []
+                    "variables": [],
+                    "theme": {
+                        "concept": "Theme",
+                        "name": "",
+                        "title": "默认主题样式",
+                        "variableMap": {}
+                    },
+                    "componentDependencies": []
                 }
             ],
-            "variables": [],
-            "theme": {
-                "concept": "Theme",
-                "name": "",
-                "title": "默认主题样式",
-                "variableMap": {}
-            },
+            "businessComponents": [],
             "componentDependencies": []
         }
     ],