@lcap/nasl 3.4.0-beta.8 → 3.4.0-beta.9

package/out/translator/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Position, Range, TranslatorState } from './types';
-import TypeAnnotation from '../concepts/TypeAnnotation__';
-import App from '../concepts/App__';
+import type TypeAnnotation from '../concepts/TypeAnnotation__';
+import type App from '../concepts/App__';
 export declare function lsp2tspNumber(num: number): number;
 export declare const indent: (tabSize: number) => string;
 /**

package/package.json

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

package/src/concepts/BackendVariable__.ts

@@ -321,12 +321,20 @@ export class BackendVariable 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/BinaryExpression__.ts

@@ -1,4 +1,3 @@
-import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
   shiftState,
@@ -9,6 +8,7 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
+import { getCallExpressionQuickInfo, Range, GetCode } from './utils/quick-info';
 
 const operatorMap = {
   '&&': 'and',
@@ -475,6 +475,10 @@ export class BinaryExpression extends LogicItem {
     return code;
   }
 
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getCallExpressionQuickInfo(range, getCode);
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/CallFunction__.ts

@@ -11,6 +11,7 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
+import { getCallExpressionQuickInfo, Range, GetCode } from './utils/quick-info';
 import type Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import type Identifier from './Identifier__';
@@ -526,10 +527,18 @@ export class CallFunction extends LogicItem {
 
     code += ')';
     const tyAnno = (this as any).typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = tyAnno || {};
+    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 =
-      tyAnno && (!['primitive', 'union'].includes(tyAnno.typeKind) || tyAnno.typeName === 'DateTime');
+      tyAnno && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     if (needGenInitFromSchema) {
-      code = `this.$genInitFromSchema('${tyAnno?.sortedTypeKey}', ${code})`;
+      code = `this.$genInitFromSchema('${sortedTypeKey}', ${code})`;
     }
     return code;
   }
@@ -721,6 +730,10 @@ export class CallFunction extends LogicItem {
       fn.checkParamName();
     });
   }
+
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getCallExpressionQuickInfo(range, getCode);
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/CallInterface__.ts

@@ -19,6 +19,7 @@ import type { MemberExpression } from './MemberExpression__';
 import type Frontend from './Frontend__';
 import type Connector from './Connector__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
+import { getCallExpressionQuickInfo, Range, GetCode } from './utils/quick-info';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -722,7 +723,7 @@ export class CallInterface extends LogicItem {
         const idx = logicParam.findIndex((params) => arg.keyword === params.name);
         const param = logicParam[idx];
 
-        arg.paramRequired = Boolean(!param?.defaultValue?.expression);
+        arg.paramRequired = param?.required;
         arg.paramTypeAnnotation = undefined;
         arg.paramDefaultValue = undefined;
         // 取到是不是必填放入参数中
@@ -897,6 +898,10 @@ export class CallInterface extends LogicItem {
   get integration() {
     return this.getAncestor('Integration');
   }
+
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getCallExpressionQuickInfo(range, getCode);
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/CallLogic__.ts

@@ -15,8 +15,7 @@ import type Param from './Param__';
 import type View from './View__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import { findConceptKeyWordIndexFromNamespace } from '../utils';
-import { config } from '../config';
-import type Identifier from './Identifier__';
+import { getCallExpressionQuickInfo, GetCode, Range } from './utils/quick-info';
 import type { ViewElement, ElementToVueOptions } from './ViewElement__';
 import type { MemberExpression } from './MemberExpression__';
 
@@ -1194,11 +1193,17 @@ export class CallLogic extends LogicItem {
       };
     }
     const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
-    const needGenInitFromSchema =
-      typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+    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(typeKind) || typeName === 'DateTime');
     if (needGenInitFromSchema) {
-      code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
+      code = `this.$genInitFromSchema('${sortedTypeKey}', ${code})`;
     }
     code += ')';
     return code;
@@ -1515,41 +1520,21 @@ export class CallLogic extends LogicItem {
   }
 
   /** 获取类型标注时的偏移量 */
-  getQuickInfoOffset(detail: TSPPosition, code: string): TSPPosition {
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
     if (this.useIife) {
       const characterOffset = 8;
+      const code = getCode();
       const lines = code.split('\n');
       const lineOffset = lines.findIndex((item) => item.startsWith('return wrapper'));
 
       return {
-        line: detail.line + lineOffset,
+        line: range.start.line + lineOffset + 1,
         offset: characterOffset,
       };
     }
-    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;
+      return getCallExpressionQuickInfo(range, getCode);
     }
-
-    return {
-      ...detail,
-      offset: detail.offset + indexOf,
-    };
   }
 
   /**

package/src/concepts/Logic__.ts

@@ -1787,7 +1787,6 @@ export class Logic extends BaseNode {
 
   get tsName() {
     // 来自集成中心，且是连接内部的逻辑，则认为是编辑态的，需要加上后缀
-    console.log(this.connector && this.integration)
     if (this.connector && this.integration) {
       return `${this.name}${CUSTOM_CONNECTOR_EDITABLE_SUFFIX}`;
     }

package/src/concepts/MemberExpression__.ts

@@ -276,7 +276,7 @@ export class MemberExpression extends LogicItem {
       (this.object as Identifier)?.isEnum() &&
       this.property?.concept === 'Identifier'
     ) {
-      return this.isDefaultValueExpression() ? this.property?.name : `"${this.property?.name}"`;
+      return this.isDefaultValueExpression(!!state?.getVuePrototype) ? this.property?.name : `"${this.property?.name}"`;
     }
     if (
       this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') &&
@@ -379,8 +379,8 @@ export class MemberExpression extends LogicItem {
     return (this.object as Identifier)?.isEnum?.();
   }
 
-  isDefaultValueExpression() {
-    return this.parentNode instanceof DefaultValue;
+  isDefaultValueExpression(getVuePrototype: boolean) {
+    return this.parentNode instanceof DefaultValue && getVuePrototype;
   }
 
   // 方便快速取值,遍历获取value

package/src/concepts/NewComposite__.ts

@@ -9,13 +9,9 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import { ElementToVueOptions } from './ViewElement__';
 import type MemberExpression from './MemberExpression__';
-import type StructureProperty from './StructureProperty__';
-import type App from './App__';
-import { genHash } from '../generator';
 import type ForEachStatement from './ForEachStatement__';
-import type Logic from './Logic__';
+import { getNewCompositeQuickInfo, GetCode, Range } from './utils/quick-info';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -1607,6 +1603,10 @@ export class NewComposite extends LogicItem {
     }
     return code;
   }
+
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getNewCompositeQuickInfo(this.concept, range, getCode);
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/NewList__.ts

@@ -1,4 +1,4 @@
-import { wrapForEachToGenerator as wrapForEach, runGeneratorSync as runSync } from '../utils/time-slicing';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
   shiftState,
@@ -10,7 +10,7 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import type ForEachStatement from './ForEachStatement__';
-import type Logic from './Logic__';
+import { getNewCompositeQuickInfo, GetCode, Range } from './utils/quick-info';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -558,6 +558,10 @@ export class NewList extends LogicItem {
     }
     return code;
   }
+
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getNewCompositeQuickInfo(this.concept, range, getCode);
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/NewMap__.ts

@@ -1,4 +1,4 @@
-import { wrapForEachToGenerator as wrapForEach, runGeneratorSync as runSync } from '../utils/time-slicing';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
   shiftState,
@@ -9,9 +9,8 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import { ElementToVueOptions } from './ViewElement__';
 import type ForEachStatement from './ForEachStatement__';
-import type Logic from './Logic__';
+import { getNewCompositeQuickInfo, GetCode, Range } from './utils/quick-info';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -802,6 +801,10 @@ export class NewMap extends LogicItem {
     }
     return code;
   }
+
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getNewCompositeQuickInfo(this.concept, range, getCode);
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Param__.ts

@@ -361,17 +361,25 @@ export class Param extends BaseNode {
   toJS(state?: TranslatorState): string {
     if (this.view) {
       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 += `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+        code += `this.$genInitFromSchema('${sortedTypeKey}',`;
       }
 
       const expressionJS = this.defaultValue?.toJS?.();
 
-      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
+      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
       if (needGenInitFromSchema) {
         code += `)`;
       }

package/src/concepts/Return__.ts

@@ -322,12 +322,20 @@ export class Return 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/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/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/server/naslServer.ts

@@ -4090,7 +4090,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 +4098,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 +4123,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;
       }

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/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();
+    });
+  });
+});