@lcap/nasl 3.4.0-beta.8 → 3.4.1-beta.1

package/src/concepts/Variable__.ts

@@ -342,12 +342,20 @@ export class Variable extends BaseNode {
   toJS(state?: TranslatorState): string {
     const context = this.view ? 'this' : 'Vue.prototype';
     const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
     const needGenInitFromSchema =
       typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     let code = `${this.name} = `;
     if (needGenInitFromSchema) {
-      code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
     }
 
     if (this.defaultValue?.expression) {

package/src/concepts/ViewElement__.ts

@@ -1718,7 +1718,7 @@ export class ViewElement extends BaseNode {
         }>`;
       } else {
         let targetNode: any = _this;
-        while (!targetNode.__tsVariableDataSourceTypeName && asserts.isViewElement(targetNode?.parentNode)) {
+        while ((!targetNode.__tsVariableDataSourceTypeName || targetNode.__tsVariableDataSourceTypeName === 'any') && asserts.isViewElement(targetNode?.parentNode)) {
           targetNode = targetNode.parentNode;
         }
         genericity += `<${(targetNode as any).__tsVariableDataSourceTypeName ?? 'any'}>`;
@@ -2861,7 +2861,16 @@ export class ViewElement extends BaseNode {
       { node: this },
     );
   }
-
+  // 查找element下有没有某个类型的元素，有就返回
+  findElementItem(conceptName: string): ViewElement {
+    return utils.traverse(
+      (current) => {
+        if (current.node.concept === conceptName) return current.node;
+      },
+      { node: this },
+      { mode: 'anyObject', excludedKeySet: this.JSON_EXCLUDED_KEYS }
+    );
+  }
   @excludedInJSON()
   computedStyle: object = {};
   getCurrentName() {

package/src/concepts/View__.ts

@@ -1867,7 +1867,7 @@ export class View extends BaseNode {
               logics: [newLogic],
             },
             this,
-            'events',
+            'bindEvents',
           );
           this.addBindEvent(event);
         } else {

package/src/concepts/utils/quick-info.ts

@@ -0,0 +1,64 @@
+import { Range } from '../../translator';
+
+export { Range } from '../../translator';
+
+/** 获取当前代码 */
+export type GetCode = () => string;
+
+export interface QuickInfoData {
+  /** 行 */
+  line: number;
+  /** 列 */
+  offset: number;
+}
+
+export type GetQuickInfoOffset = (range: Range, getCode: GetCode) => QuickInfoData;
+
+export function getCallExpressionQuickInfo(range: Range, getCode: GetCode) {
+  const code = getCode();
+  const data: QuickInfoData = {
+    line: range.start.line + 1,
+    offset: range.start.character + 1,
+  };
+
+  // 如果没有括号 ，括号就在外面，就 -1
+  // 有括号就找到括号的位置 然后 -1
+  let indexOf = 0;
+  if (!code.includes('(')) {
+    indexOf = -1;
+  }
+  // 如果有泛型先往前找一找
+  else {
+    if (code.includes('<')) {
+      indexOf = Math.min(code.indexOf('<'), code.indexOf('('));
+    } else {
+      indexOf = code.indexOf('(');
+    }
+    const subStr = code.substring(0, indexOf);
+    const codeArr = subStr?.split('.');
+    const lastLen = codeArr?.[codeArr.length - 1]?.length;
+    indexOf = subStr.length - lastLen;
+  }
+  data.offset += indexOf;
+  return data;
+}
+
+export function getNewCompositeQuickInfo(concept: 'NewComposite' | 'NewList' | 'NewMap', range: Range, getCode: GetCode): QuickInfoData {
+  const type = {
+    'NewComposite': '__newComposite',
+    'NewList': '__newList',
+    'NewMap': '__newMap',
+  }[concept];
+  const code = getCode();
+  const data: QuickInfoData = {
+    line: range.end.line,
+    offset: range.end.character,
+  };
+
+  const indexOf = code.lastIndexOf(`return ${type}`);
+  let newCode = code.substring(0, indexOf);
+  newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
+  data.offset = newCode.length + 'return '.length;
+
+  return data;
+}

package/src/generator/genBundleFiles.ts

@@ -32,6 +32,7 @@ interface Config {
   tenantType: any;
   tenantLevel: any;
   appid: string;
+  isExport?:string;
   devDnsAddr: string;
   miniEnable: boolean;
 }
@@ -44,7 +45,7 @@ function stringifyMetaData(obj: any) {
       // 处理数组类型
       const elements: string[] = obj.map(element => stringifyMetaData(element));
       return `[${elements.join(',')}]`;
-    } 
+    }
     let newObj = obj;
     const properties: string[] = [];
     if (obj instanceof FrontendVariable) {
@@ -64,7 +65,7 @@ function stringifyMetaData(obj: any) {
     return `{
       ${properties.join(',')}
     }`;
-  } 
+  }
   return JSON5.stringify(obj);
 }
 
@@ -596,7 +597,11 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
          `;
     content += str;
   }
-  const baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
+  let baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
+
+  if((config.isExport)as any){
+     baseUrl = '';
+  }
   let bundleMinPath = `${baseUrl}/bundle.${genHash(content)}.min.js`;
   if (frontend.basePath) {
     bundleMinPath = `${baseUrl}${frontend.basePath}/bundle.${genHash(content)}.min.js`;

package/src/server/getProcesses.ts

@@ -267,7 +267,7 @@ export function syncMemberExpression(elem: ProcessElement | Process, callback: (
         }
       });
     }
-    if (el.type === 'ExclusiveGateway' || el.type === 'AutoTask') {
+    if (['ExclusiveGateway', 'AutoTask', 'InclusiveGateway'].includes(el.type)) {
       travelDown(el.logic, (node) => {
         if (node instanceof MemberExpression) {
           callback(node);
@@ -435,7 +435,7 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
     ],
   });
   processVariables.icon = 'Process';
-  if (processElem.type === 'ExclusiveGateway') {
+  if (['ExclusiveGateway', 'InclusiveGateway'].includes(processElem.type)) {
     const scopeVariable = new CompletionProperty({
       name: processElem.name,
       value: processElem.name,
@@ -589,7 +589,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement, exitConst
   });
   processVariables.expanded = true;
   processVariables.icon = 'Process';
-  if (processElem.type === 'ExclusiveGateway') {
+  if (['ExclusiveGateway', 'AutoTask', 'InclusiveGateway'].includes(processElem.type)) {
     const scopeVariable = new CompletionProperty({
       name: processElem.name,
       value: processElem.name,

package/src/server/naslServer.ts

@@ -108,6 +108,7 @@ import { EventEmitter } from '../common/EventEmitter';
 import { traverse, FileNode } from '../utils';
 import { withQueueExecute } from '../decorators';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
+import { isConnection, isConnector } from '../concepts/utils/asserts';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
   Entity: 3,
@@ -3121,6 +3122,9 @@ class NaslServer {
         );
         const results = await Promise.all(promises);
         results.forEach((constRefs) => {
+          if(constRefs.symbolDisplayString.includes('(parameter)')) {
+            return;
+          }
           refsList = [...refsList, ...constRefs.refs];
         });
       }
@@ -4090,7 +4094,7 @@ class NaslServer {
 
       // 位置计算偏移
       if ('getQuickInfoOffset' in node) {
-        Object.assign(fileDetail, (node as any).getQuickInfoOffset(fileDetail, getCode(item)));
+        Object.assign(fileDetail, (node as any).getQuickInfoOffset(item, () => getCode(item)));
       }
 
       yield;
@@ -4098,30 +4102,6 @@ class NaslServer {
       // 位置计算偏移2
       // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
       if (
-        node.concept === 'BinaryExpression' ||
-        node.concept === 'CallFunction' ||
-        node.concept === 'CallInterface'
-      ) {
-        const code = getCode(item);
-        // 如果没有括号 ，括号就在外面，就 -1
-        // 有括号就找到括号的位置 然后 -1
-        let indexOf = 0;
-        if (!code.includes('(')) {
-          indexOf = -1;
-        } else {
-          // 如果有泛型先往前找一找
-          if (code.includes('<')) {
-            indexOf = Math.min(code.indexOf('<'), code.indexOf('('));
-          } else {
-            indexOf = code.indexOf('(');
-          }
-          const subStr = code.substring(0, indexOf);
-          const codeArr = subStr?.split('.');
-          const lastLen = codeArr?.[codeArr.length - 1]?.length;
-          indexOf = subStr.length - lastLen;
-        }
-        fileDetail.offset += indexOf;
-      } else if (
         node.concept === 'MemberExpression' ||
         node.concept === 'Identifier' ||
         node.concept === 'QueryFieldExpression' ||
@@ -4147,26 +4127,6 @@ class NaslServer {
         let newCode = code.substring(0, indexOf);
         newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
         fileDetail.offset = newCode.length + 'return '.length;
-      } else if (['NewComposite', 'NewList', 'NewMap'].includes(node.concept)) {
-        let type;
-        switch (node.concept) {
-          case 'NewComposite':
-            type = '__newComposite';
-            break;
-          case 'NewList':
-            type = '__newList';
-            break;
-          case 'NewMap':
-            type = '__newMap';
-            break;
-          default:
-        }
-        const code = getCode(item);
-        fileDetail.line = item.end.line;
-        const indexOf = code.indexOf(`return ${type}`);
-        let newCode = code.substring(0, indexOf);
-        newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
-        fileDetail.offset = newCode.length + 'return '.length;
       } else if (['OqlQueryComponent'].includes(node.concept)) {
         fileDetail.offset += 10;
       }
@@ -4416,14 +4376,14 @@ class NaslServer {
         }
       }
       // 特殊处理param有类型错误的
-      if (node instanceof Param && value) {
+      if (value && (node instanceof Param)) {
         // index在nasl foreach上有脏数据
         if (node.parentKey === 'index' && node.parentNode instanceof ForEachStatement) {
           const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
           jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
         }
       }
-      if (node instanceof NewComposite && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
+      if (value && (node instanceof NewComposite) && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
         const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
         jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
       }
@@ -4977,6 +4937,9 @@ class NaslServer {
    */
   static getPropertyNames(fileNode: Connection|Connector) {
     const names: string[] = [];
+    if (!isConnection(fileNode) && !isConnector(fileNode)) {
+      return names;
+    }
     // TODO 如果不存在对应的 Connector 时，应该提示错误
     if (fileNode) {
       fileNode.properties.forEach((property) => {

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;

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/getQuickInfoOffset.spec.ts

@@ -0,0 +1,19 @@
+import { expect } from 'chai';
+import type { CallFunction } 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<CallFunction>(data);
+      const tsCode = runSync(node.toEmbeddedTS());
+      expect({
+        code: tsCode,
+        ...node.getQuickInfoOffset(getCodeRange(tsCode), () => tsCode),
+      }).toMatchSnapshot();
+    });
+  });
+});

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

@@ -0,0 +1,86 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`call-interface:getQuickInfoOffset only-interface 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.only_interface();
+",
+  "line": 1,
+  "offset": 25,
+}
+`;
+
+exports[`call-interface:getQuickInfoOffset with-body-complex-argument 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.with_body({param1:new nasl.core.String('StringLiteral'), param2:new nasl.core.Long(123), Body:(() => { 
+    new nasl.core.Long(1);
+    new nasl.core.String('StringLiteral');
+    new nasl.core.String('StringLiteral');
+    function __newComposite() {
+        let __obj = nasl.util.New<apis.a123456.structures.With_bodyBody>();
+        const { id, value, property1 } = __obj;
+        __obj.id = new nasl.core.Long(1);
+        __obj.value = new nasl.core.String('StringLiteral');
+        __obj.property1 = new nasl.core.String('StringLiteral');
+        return __obj;
+    };
+    return __newComposite();
+})()});
+",
+  "line": 1,
+  "offset": 25,
+}
+`;
+
+exports[`call-interface:getQuickInfoOffset with-body-no-argument 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.with_body({param1:undefined});
+",
+  "line": 1,
+  "offset": 25,
+}
+`;
+
+exports[`call-interface:getQuickInfoOffset with-body-simple-argument 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.with_body({param1:new nasl.core.String('StringLiteral'), param2:new nasl.core.String('StringLiteral')});
+",
+  "line": 1,
+  "offset": 25,
+}
+`;
+
+exports[`call-interface:getQuickInfoOffset with-headers 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.with_headers({param1:new nasl.core.String('StringLiteral')});
+",
+  "line": 1,
+  "offset": 25,
+}
+`;
+
+exports[`call-interface:getQuickInfoOffset with-headers-no-argument 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.with_headers({param1:__IDENTIFIER__, param2:undefined});
+",
+  "line": 1,
+  "offset": 25,
+}
+`;
+
+exports[`call-interface:getQuickInfoOffset with-query 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.with_query({param1:new nasl.core.String('StringLiteral')});
+",
+  "line": 1,
+  "offset": 25,
+}
+`;
+
+exports[`call-interface:getQuickInfoOffset with-query-no-argument 1`] = `
+Object {
+  "code": "apis.a123456.interfaces.with_query({param1:__IDENTIFIER__, param2:undefined});
+",
+  "line": 1,
+  "offset": 25,
+}
+`;

package/test/concepts/call-interface/__snapshots__/toEmbeddedTS.spec.ts.snap

@@ -28,7 +28,7 @@ exports[`call-interface:toEmbeddedTS with-body-complex-argument 1`] = `
 `;
 
 exports[`call-interface:toEmbeddedTS with-body-no-argument 1`] = `
-"apis.a123456.interfaces.with_body({ param1: __IDENTIFIER__ });
+"apis.a123456.interfaces.with_body({ param1: undefined });
 "
 `;
 
@@ -50,7 +50,7 @@ exports[`call-interface:toEmbeddedTS with-headers 1`] = `
 exports[`call-interface:toEmbeddedTS with-headers-no-argument 1`] = `
 "apis.a123456.interfaces.with_headers({
   param1: __IDENTIFIER__,
-  param2: __IDENTIFIER__,
+  param2: undefined,
 });
 "
 `;
@@ -65,7 +65,7 @@ exports[`call-interface:toEmbeddedTS with-query 1`] = `
 exports[`call-interface:toEmbeddedTS with-query-no-argument 1`] = `
 "apis.a123456.interfaces.with_query({
   param1: __IDENTIFIER__,
-  param2: __IDENTIFIER__,
+  param2: undefined,
 });
 "
 `;

package/test/concepts/call-interface/getQuickInfoOffset.spec.ts

@@ -0,0 +1,19 @@
+import { expect } from 'chai';
+import type { CallInterface } 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<CallInterface>(data);
+      const tsCode = runSync(node.toEmbeddedTS());
+      expect({
+        code: tsCode,
+        ...node.getQuickInfoOffset(getCodeRange(tsCode), () => tsCode),
+      }).toMatchSnapshot();
+    });
+  });
+});

package/test/concepts/call-logic/getQuickInfoOffset.spec.ts

@@ -1,15 +1,10 @@
 import { expect } from 'chai';
 import type { CallLogic } from '../../../src';
 import { runGeneratorSync as runSync } from '../../../src/utils';
-import { getNodeByData, readFixture } from '../utils';
+import { getNodeByData, readFixture, getCodeRange } from '../utils';
 import { ConceptName, cases } from './constant';
 
 describe(`${ConceptName}:getQuickInfoOffset`, () => {
-  const fakeInputOffset = {
-    line: 1,
-    offset: 1,
-  };
-
   cases.forEach((name) => {
     it(name, () => {
       const data = readFixture(ConceptName, name);
@@ -17,7 +12,7 @@ describe(`${ConceptName}:getQuickInfoOffset`, () => {
       const tsCode = runSync(node.toEmbeddedTS());
       expect({
         code: tsCode,
-        ...node.getQuickInfoOffset(fakeInputOffset, tsCode),
+        ...node.getQuickInfoOffset(getCodeRange(tsCode), () => tsCode),
       }).toMatchSnapshot();
     });
   });