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

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/out/utils/i18nInfo.js

@@ -4,14 +4,19 @@ exports.languageList = void 0;
 exports.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/out/utils/i18nInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"i18nInfo.js","sourceRoot":"","sources":["../../src/utils/i18nInfo.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,yBAAyB;QAC/B,KAAK,EAAE,QAAQ;KAChB;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,IAAI;KACZ;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,QAAQ;KAChB;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,QAAQ;KAChB;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,IAAI;KACZ;CACF,CAAC"}
+{"version":3,"file":"i18nInfo.js","sourceRoot":"","sources":["../../src/utils/i18nInfo.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,IAAI;KACZ;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,IAAI;KACZ;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,IAAI;KACZ;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,QAAQ;KAChB;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,QAAQ;KAChB;IACD;QACE,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,IAAI;KACZ;CACF,CAAC"}

package/package.json

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

package/src/automate/engine/utils.js

@@ -1,8 +1,4 @@
-// import {
-//     BaseNode,
-//     Module
-// } from '../../concepts';
-import { BaseNode, uiStructures, collectionStructures, interfaceStructures, processStructures, getStdlibNamespace, coreStructures, httpStructures } from '../../concepts';
+import { BaseNode, uiStructures, collectionStructures, interfaceStructures, processStructures, getStdlibNamespace, coreStructures, authStructures, httpStructures } from '../../concepts';
 import { getConceptMeta } from '../../decorators/index';
 /*
     根据 namespace 字符串来获取 node

package/src/common/BaseNode.ts

@@ -1085,7 +1085,27 @@ export class BaseNode extends EventEmitter {
     });
     return JSON.parse(JSON.stringify(temp));
   }
-
+  // 给国际化展示用
+  getNodeChinesePath(useIndex: boolean | string[] | NodePathOption) {
+    let node: BaseNode = this;
+    const pathArr: string[] = [];
+    while (node && node.concept) {
+      let pathText = '';
+      const { parentNode } = node;
+      if (parentNode) {
+        const { name, title, label } = parentNode as any;
+        pathText = `${(parentNode.constructor as any)?.nodeTitle || ''}${name || ''}`;
+        if (title && label) {
+          pathText += `(${title} | ${label})`;
+        } else if (title || label) {
+          pathText += `(${title || label})`;
+        }
+        pathArr.unshift(pathText);
+      }
+      node = parentNode;
+    }
+    return pathArr.join('/');
+  }
   /**
    * 查找引用
    */
@@ -1311,6 +1331,7 @@ export class BaseNode extends EventEmitter {
    * 迭代所有属性
    *
    * @description 是所有属性！！不是所有子节点！！
+   * @deprecated 请使用`traverseStrictChildren`方法
    */
   traverseChildren(cb: (el: any) => void): void {
     function traverse(node: any) {
@@ -1518,7 +1539,7 @@ export class BaseNode extends EventEmitter {
       nodes.push(self);
     }
 
-    this.traverseChildren((current) => {
+    this.traverseStrictChildren((current) => {
       if (pre(current)) {
         nodes.push(current);
       }

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/BindAttribute__.ts

@@ -1168,6 +1168,8 @@ export class BindAttribute extends BaseNode {
         type = `${self.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
       } else if (typeof self.value === 'boolean') {
         type = 'nasl.core.Boolean';
+      } else if (['page-size', 'page-number'].includes(self.name) && self.value === null) {
+        type = 'nasl.core.Long'
       }
       code += `${type}`;
     } else {

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__';
 
@@ -774,23 +773,23 @@ export class CallLogic extends LogicItem {
           code += calleeName;
         }
         return code;
-      } else if (bindAttr?.name === 'text') {
-        if (calleeName === 'jsonSerialize') {
-          if (
-            this.arguments[0]?.expression?.__TypeAnnotation?.typeName === 'String' &&
-            this.arguments[0]?.expression?.__TypeAnnotation?.typeNamespace === 'nasl.core'
-          ) {
-            code += options?.finalCode === false ? 'JSON 序列化' : 'JSON.stringify';
-          } else {
-            code += options?.finalCode === false ? 'JSON 序列化' : `$utils['JsonSerialize']`;
-          }
-          setArguments();
-          return code;
-        } else if (calleeName === 'jsonDeserialize') {
-          code += options?.finalCode === false ? 'JSON 反序列化' : 'JSON.parse';
-          setArguments();
-          return code;
+      }
+      if (calleeName === 'jsonSerialize') {
+        if (
+          this.arguments[0]?.expression?.__TypeAnnotation?.typeName === 'String' &&
+          this.arguments[0]?.expression?.__TypeAnnotation?.typeNamespace === 'nasl.core'
+        ) {
+          code += options?.finalCode === false ? 'JSON 序列化' : 'JSON.stringify';
+        } else {
+          code += options?.finalCode === false ? 'JSON 序列化' : `$utils['JsonSerialize']`;
         }
+        setArguments();
+        return code;
+      }
+      if (calleeName === 'jsonDeserialize') {
+        code += options?.finalCode === false ? 'JSON 反序列化' : 'JSON.parse';
+        setArguments();
+        return code;
       }
     }
 
@@ -816,12 +815,11 @@ export class CallLogic extends LogicItem {
 
       if (bindAttr?.name === 'data-source') {
         return this.calleeName;
-      } else if (bindAttr?.name === 'text') {
-        if (calleeName === 'jsonSerialize') {
-          return 'JSON 序列化';
-        } else if (calleeName === 'jsonDeserialize') {
-          return 'JSON 反序列化';
-        }
+      }
+      if (calleeName === 'jsonSerialize') {
+        return 'JSON 序列化';
+      } if (calleeName === 'jsonDeserialize') {
+        return 'JSON 反序列化';
       }
     }
 
@@ -1194,11 +1192,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 +1519,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/Destination__.ts

@@ -697,13 +697,13 @@ export class Destination extends LogicItem {
   }
 
   @withSourceMapGenerator
-  *toEmbeddedTSInProcess(state = createCompilerState(), prependCode: string): TranslatorGenerator {
+  *toEmbeddedTSInProcess(state = createCompilerState(), prevCode: string): TranslatorGenerator {
     const self = this;
     // const tab = indent((state?.tabSize || 0));
     if (self.tsCalleeNamespace && self.tsName) {
       const destinationName = self.parentNode.name.replace('-', '_');
       let code = `${destinationName}: function() {\n`;
-      code += prependCode;
+      code += prevCode;
       code += '\n';
       if (self.tsCalleeNamespace && self.viewName) {
         code += `${self.tsCalleeNamespace}.${self.viewName}.$destination({`;

package/src/concepts/Logic__.ts

@@ -1832,15 +1832,16 @@ export class Logic extends BaseNode {
       // 没有参数的
       code += '()';
     }
-    // 需要类型推导的局部变量/返回值需要调整申明顺序
+    // 需要类型推导的局部变量/返回值需要进行变量提升，声明在前
     const advanceMap: Map<Return | Variable, Assignment | BatchAssignment> = new Map();
-    // const needGetSourceMapOqlList: Promise<any>[] = [];
     yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
-      if (el && (asserts.isBatchAssignment(el) || (asserts.isAssignment(el) && el.left?.name))) {
+      if (isInPlayground(el)) {
+        // 若当前节点在草稿中，无须提升并忽略
+        return;
+      }
+      if ((asserts.isBatchAssignment(el) || (asserts.isAssignment(el) && el.left?.name))) {
         if (asserts.isAssignment(el)) {
-          const advanceVar = self.variables?.find(
-            (variable) => !variable.typeAnnotation && el.left?.name === variable.name,
-          );
+          const advanceVar = self.variables?.find((variable) => !variable.typeAnnotation && el.left?.name === variable.name);
           if (advanceVar && !advanceMap.get(advanceVar)) {
             advanceMap.set(advanceVar, el);
           }
@@ -1849,23 +1850,35 @@ export class Logic extends BaseNode {
             advanceMap.set(advanceRn, el);
           }
         } else if (asserts.isBatchAssignment(el)) {
-          yield* wrapForEach(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
-            const leftCode =
-              leftIndex.length === 1
-                ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
-                : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-                    returnOrigin('');
-            const advanceVar = self.variables?.find(
-              (variable) => !variable.typeAnnotation && leftCode === variable.name,
-            );
-            if (advanceVar && !advanceMap.get(advanceVar)) {
-              advanceMap.set(advanceVar, el);
-            }
-            const advanceRn = self.returns?.find((ret) => !ret.typeAnnotation && leftCode === ret.name);
-            if (advanceRn && !advanceMap.get(advanceRn)) {
-              advanceMap.set(advanceRn, el);
+          yield *
+            wrapForEach(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
+              const leftCode =
+                leftIndex.length === 1
+                  ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
+                  : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
+              const advanceVar = self.variables?.find((variable) => !variable.typeAnnotation && leftCode === variable.name);
+              if (advanceVar && !advanceMap.get(advanceVar)) {
+                advanceMap.set(advanceVar, el);
+              }
+              const advanceRn = self.returns?.find((ret) => !ret.typeAnnotation && leftCode === ret.name);
+              if (advanceRn && !advanceMap.get(advanceRn)) {
+                advanceMap.set(advanceRn, el);
+              }
+            });
+        }
+      }
+
+      function isInPlayground(node: types.SyntaxNode) {
+        while (node) {
+          const parent = node.parentNode;
+          if (parent) {
+            if (asserts.isLogic(parent) && node.parentKey === 'playground') {
+              return true;
             }
-          });
+            node = node.parentNode;
+          } else {
+            return false;
+          }
         }
       }
     });

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/ProcessElement__.ts

@@ -1915,7 +1915,14 @@ export class ProcessElement extends BaseNode {
         if (Array.isArray(self.bindEvents)) {
           yield* wrapForEach(self.bindEvents, function* warpForEachGenerator(bindEvent) {
             // 任务完成时可以拿到输出参数
-            const currentPrevCode = bindEvent.name === 'OnClose' ? prevCodeClose : prevCode;
+            let currentPrevCode: any;
+            if(bindEvent.name !== 'OnClose') {
+              currentPrevCode = prevCode;
+              // 除了任务完成时的逻辑，其他逻辑拿不到自己任务下的输出参数，所以不需要__ProcessIdentification__标注
+              currentPrevCode = currentPrevCode.replace('__ProcessIdentification__', '');
+            } else {
+              currentPrevCode = prevCodeClose;
+            }
             code += `${tab1}${bindEvent.name}: () => [\n`;
             yield* wrapForEach(bindEvent.logics, function* warpForEachGenerator(logic) {
               code += `${yield* logic.toEmbeddedTSInProcess(

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) {