@lcap/nasl 3.5.0-alpha.1 → 3.5.0-beta.2

package/src/translator/utils.ts

@@ -1,7 +1,7 @@
 import type { SourceMapItem, Position, Range, TranslatorMethod, TranslatorState } from './types';
 import type { BaseNode } from '../concepts';
-import TypeAnnotation from '../concepts/TypeAnnotation__';
-import App from '../concepts/App__';
+import type TypeAnnotation from '../concepts/TypeAnnotation__';
+import type App from '../concepts/App__';
 
 export function lsp2tspNumber(num: number) {
   return num + 1;
@@ -58,22 +58,6 @@ export function isSameRange(rangeA: Range, rangeB : Range) {
   return rangeA.start.offset === rangeB.start.offset && rangeA.end.offset === rangeB.end.offset;
 }
 
-const statementMap = [
-  "Assignment",
-  "BatchAssignment",
-  "IfStatement",
-  "ForEachStatement",
-  "SwitchStatement",
-  "WhileStatement",
-  "Match",
-  "Comment",
-  "CallLogic",
-  "CallInterface",
-  "Destination",
-  "JSBlock",
-  'JavaLogic'
-];
-
 /**
  * 翻译方法修饰器
  *
@@ -131,10 +115,6 @@ export function withSourceMap() {
           end: shiftPosition(state.position, code),
         });
 
-        if (isNatural && statementMap?.includes(this.concept) && code) {
-          before += `// nodePath: '${this.nodePath}' \n`;
-        }
-
         return before + 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/test/concepts/binary-expression/__snapshots__/getQuickInfoOffset.spec.ts.snap

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`binary-expression:getQuickInfoOffset constant-nested 1`] = `
+Object {
+  "code": "nasl.core.and(nasl.core.isEqual(new nasl.core.String('StringLiteral').length,new nasl.core.Long(3)),new nasl.core.Boolean(false))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`binary-expression:getQuickInfoOffset constant-simple 1`] = `
+Object {
+  "code": "nasl.core.and(new nasl.core.Boolean(true),new nasl.core.Boolean(false))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`binary-expression:getQuickInfoOffset variable-nested 1`] = `
+Object {
+  "code": "nasl.core.or(nasl.core.isEqual(param1.length,new nasl.core.Long(3)),nasl.core.isNotEqual(param3.updatedBy.length,new nasl.core.Long(0)))",
+  "line": 1,
+  "offset": 11,
+}
+`;

package/test/concepts/binary-expression/getQuickInfoOffset.spec.ts

@@ -0,0 +1,19 @@
+import { expect } from 'chai';
+import type { BinaryExpression } from '../../../src';
+import { runGeneratorSync as runSync } from '../../../src/utils';
+import { getNodeByData, readFixture, getCodeRange } from '../utils';
+import { ConceptName, cases } from './constant';
+
+describe(`${ConceptName}:getQuickInfoOffset`, () => {
+  cases.forEach((name) => {
+    it(name, () => {
+      const data = readFixture(ConceptName, name);
+      const node = getNodeByData<BinaryExpression>(data);
+      const tsCode = runSync(node.toEmbeddedTS());
+      expect({
+        code: tsCode,
+        ...node.getQuickInfoOffset(getCodeRange(tsCode), () => tsCode),
+      }).toMatchSnapshot();
+    });
+  });
+});

package/test/concepts/call-function/__snapshots__/getQuickInfoOffset.spec.ts.snap

@@ -0,0 +1,41 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`call-function:getQuickInfoOffset from-string 1`] = `
+Object {
+  "code": "nasl.util.FromString(str)<nasl.core.Boolean>()",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-global-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(dt, new nasl.core.String('StringLiteral'))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-no-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(str)",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-user-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(dt, new nasl.core.String('StringLiteral'))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-utc-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(dt, new nasl.core.String('StringLiteral'))",
+  "line": 1,
+  "offset": 11,
+}
+`;

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": []
         }
     ],

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

@@ -14,66 +14,75 @@
     "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": 215.03330293808474,
-                            "offsetY": 675.8272728600609,
-                            "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": "str",
-                                        "folded": false
-                                    }
+                                    "offsetX": 215.03330293808474,
+                                    "offsetY": 675.8272728600609,
+                                    "calleeNamespace": "nasl.util",
+                                    "calleeName": "ToString",
+                                    "typeArguments": [],
+                                    "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": []
         }
     ],