@lcap/nasl 3.3.3-beta.8 → 3.3.6-beta.1

package/src/concepts/Assignment__.ts

@@ -244,15 +244,15 @@ export class Assignment extends LogicItem {
     });
     const batchObject = this.right
       ? {
-        left: leftSelect,
-        rights: [rightSelect],
-        assignmentLines: [assignmentLine],
-      }
+          left: leftSelect,
+          rights: [rightSelect],
+          assignmentLines: [assignmentLine],
+        }
       : {
-        left: leftSelect,
-        rights: [],
-        assignmentLines: [],
-      };
+          left: leftSelect,
+          rights: [],
+          assignmentLines: [],
+        };
     const batchAssignment = new BatchAssignment({
       ...batchObject,
       offsetX: this.offsetX,
@@ -304,11 +304,29 @@ export class Assignment extends LogicItem {
     code += this.left ? this.left.toJS(shiftState(state, code, { inline: true })) : '';
     if (this.right) {
       code += ' = ';
-      code += this.right.toJS(
-        shiftState(state, code, {
-          inline: true,
-        }),
-      );
+      let isNaslNumber = false;
+      let consName = '';
+      let typeAnnotation = (this.right as any)?.typeAnnotation;
+      if (typeAnnotation) {
+        let { typeKind, typeName, typeNamespace } = typeAnnotation;
+        if (typeNamespace === 'nasl.core' && typeKind === 'primitive' && ['Long', 'Decimal'].includes(typeName)) {
+          isNaslNumber = true;
+          consName = `Nasl${typeName}`;
+        }
+      }
+      if (isNaslNumber) {
+        code += `new ${consName}(${this.right.toJS(
+          shiftState(state, code, {
+            inline: true,
+          }),
+        )})`;
+      } else {
+        code += this.right.toJS(
+          shiftState(state, code, {
+            inline: true,
+          }),
+        );
+      }
     }
     return code;
   }

package/src/concepts/BackendVariable__.ts

@@ -20,7 +20,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) { }
+  } catch (e) {}
 
   return result;
 }
@@ -284,6 +284,8 @@ export class BackendVariable extends BaseNode {
     const { defaultValue } = this;
     const defaultValueType = Object.prototype.toString.call(defaultValue);
     const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
+    const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
+    const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
     if (
@@ -297,10 +299,27 @@ export class BackendVariable extends BaseNode {
       if ([''].includes(defaultValue)) {
         parsedValue = undefined;
       } else {
-        parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
+        function parseNumberValue(defaultValue: any, typeAnnotation: any) {
+          const { typeKind, typeName } = typeAnnotation;
+          const isNaslNumber = typeKind === 'primitive' && ['Decimal', 'Long', 'Double', 'Int'].includes(typeName);
+          if (isNaslNumber) {
+            return String(defaultValue);
+          } else {
+            return tryJSONParse(defaultValue) ?? defaultValue;
+          }
+        }
+        parsedValue = parseNumberValue(defaultValue, typeAnnotation);
       }
     }
-    code += JSON.stringify(parsedValue);
+    if (isDecimal) {
+      parsedValue = `new NaslDecimal('${defaultValue}')`;
+      code += `${parsedValue}`;
+    } else if (isInteger) {
+      parsedValue = `new NaslLong('${defaultValue}')`;
+      code += `${parsedValue}`;
+    } else {
+      code += `${JSON.stringify(parsedValue)}`;
+    }
     if (needGenInitFromSchema) {
       code += `)`;
     }

package/src/concepts/BinaryExpression__.ts

@@ -10,6 +10,24 @@ import {
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
+const operatorMap = {
+  '&&': 'and',
+  '||': 'or',
+  '+': 'add',
+  '-': 'minus',
+  '*': 'multiply',
+  '/': 'divide',
+  '%': 'remainder',
+  // '==': 'equal',
+  // '!=': 'notEqual',
+  '==': 'isEqual',
+  '!=': 'isNotEqual',
+  '>': 'greaterThan',
+  '<': 'lessThan',
+  '>=': 'greaterThanOrEqual',
+  '<=': 'lessThanOrEqual',
+};
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -322,22 +340,25 @@ export class BinaryExpression extends LogicItem {
     //    code += right;
     //    code += ')';
     //    return code;
-
-    if (['+', '-', '*', '/'].includes(this.operator)) {
-      const operatorMap: any = {
-        '+': 'add',
-        '-': 'minus',
-        '*': 'multiply',
-        '/': 'divide',
-      };
+    const getOperatorCode = (code: string) => {
       code += `this.$global.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
       code += left;
       code += `,`;
       code += right;
       code += ')';
       return code;
+    };
+    if (['+', '-', '*', '/', '%'].includes(this.operator)) {
+      // 之前一年都没有 % 取模 操作符的处理 本次补上
+      // code += `this.$global.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
+      // code += left;
+      // code += `,`;
+      // code += right;
+      // code += ')';
+      // return code
+      return getOperatorCode(code);
     }
-    if (['>', '>=', '<', '<='].includes(this.operator)) {
+    if (['>', '>=', '<', '<=', '=='].includes(this.operator)) {
       const leftType = this.left?.getCurrentAnnotatedJSON();
       const rightType = this.right?.getCurrentAnnotatedJSON();
       // 如果两边类型一致可以做一些特殊比较
@@ -350,15 +371,20 @@ export class BinaryExpression extends LogicItem {
           code += `Date.parse(${left})`;
           code += ` ${this.operator} `;
           code += `Date.parse(${right})`;
+        } else {
+          // code += `(${left})`;
+          // code += ` ${this.operator} `;
+          // code += `(${right})`;
+          code = getOperatorCode(code);
+        }
+      } else {
+        if (['==', '!='].includes(this.operator)) {
+          code = getOperatorCode(code);
         } else {
           code += `(${left})`;
           code += ` ${this.operator} `;
           code += `(${right})`;
         }
-      } else {
-        code += `(${left})`;
-        code += ` ${this.operator} `;
-        code += `(${right})`;
       }
 
       return code;

package/src/concepts/CallLogic__.ts

@@ -743,8 +743,8 @@ export class CallLogic extends LogicItem {
       code += '$global.';
     }
     const { completeArguments } = this;
-
     if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
+      let code = '';
       if (this.calleeNamespace) {
         const currentElement = this.getAncestor('ViewElement') as ViewElement;
         code += `__${currentElement.name}_dataSourceLoad`;
@@ -755,15 +755,15 @@ export class CallLogic extends LogicItem {
         return code;
       }
     } else {
-      code += this.calleeName;
-      code += '(';
-      completeArguments.forEach((arg, index) => {
-        code += arg?.toVue(options);
-        if (index !== completeArguments.length - 1) code += ', ';
-      });
+        code += this.calleeName;
+        code += '(';
+        completeArguments.forEach((arg, index) => {
+          code += arg?.toVue(options);
+          if (index !== completeArguments.length - 1) code += ', ';
+        });
+      code += ')';
+      return code;
     }
-    code += ')';
-    return code;
   }
 
   toUI(state?: TranslatorState): string {
@@ -1211,9 +1211,13 @@ export class CallLogic extends LogicItem {
         code += `>`;
       }
     };
+    const currThis = this;
     /** 设置输入参数 */
     const setInputParam = function* setTypeArguments() {
       const paramRequired = ['showMessage', 'consoleLog', 'jsonDeserialize', 'jsonSerialize'].includes(calleeName);
+      if (['expression'].includes(parentKey) && currThis.getAncestor('BindAttribute')?.name === 'data-source' && (state as any)?.noNeedParams) {
+        return;
+      }
       if (
         (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) ||
         tsCalleeNamespace.startsWith('nasl.')
@@ -1227,13 +1231,6 @@ export class CallLogic extends LogicItem {
           });
         code += ')';
       } else if (completeArguments.length) {
-        if (
-          ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
-          (state as any)?.noNeedParams
-        ) {
-          return;
-        }
         code += '(';
         yield *
           wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
@@ -1243,13 +1240,6 @@ export class CallLogic extends LogicItem {
           });
         code += ')';
       } else {
-        if (
-          ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
-          (state as any)?.noNeedParams
-        ) {
-          return;
-        }
         if (completeArguments.length) {
           code += '(';
           yield *

package/src/concepts/CountersignPolicy__.ts

@@ -0,0 +1,77 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, className } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+import MultiApprovalPolicy from './MultiApprovalPolicy__';
+
+/**
+ * 会签
+ */
+@className
+@concept('会签')
+// @ts-ignore
+export class CountersignPolicy extends MultiApprovalPolicy {
+  /** 类名 */
+  static readonly ConceptName = 'CountersignPolicy';
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'CountersignPolicy';
+
+  /**
+   * passPercent
+   */
+  @property()
+  // @ts-ignore
+  passPercent!: number;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<CountersignPolicy>) {
+    source = Object.assign({}, CountersignPolicy.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): CountersignPolicy {
+    return super.from(source, parentNode, parentKey) as CountersignPolicy;
+  }
+
+  /**
+   * 设置passPercent
+   */
+  setPassPercent(passPercent: number) {
+    const object = {
+      passPercent,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default CountersignPolicy;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/ForEachStatement__.ts

@@ -593,43 +593,34 @@ export class ForEachStatement extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = '';
+    let code = 'ForEach(';
     code += this.each
-      ? this.each.toNaturalTS(
-          shiftState(state, code, {
-            tabSize: 0,
-          }),
-        )
+      ? this.each?.toNaturalTS(
+        shiftState(state, code, {
+          tabSize: 0,
+        }),
+      )
       : '__IDENTIFIER__';
-    if (['NewList', 'NewMap'].includes(this.each?.concept)) code += '\n';
-    code += '.__slice(';
-    code += this.start ? this.start.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
     code += ', ';
-    let virtualEnd: LogicItem = this.end;
-    if (!virtualEnd && this.each) {
-      // if (['List', 'String', 'Email', 'Text', 'Map'].includes(this.each.__TypeAnnotation?.typeName)) {
-      virtualEnd = new MemberExpression({
-        object: BaseNode.from({ ...this.each.toJSON(), name: this.each.name }) as LogicItem,
-        property: new Identifier({ name: 'length' }),
-      });
-      // }
-    }
-    code += virtualEnd ? virtualEnd.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
-    code += ').__forEach((';
-    code += this.item ? this.item.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += this.start ? this.start?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) : '__IDENTIFIER__';
     code += ', ';
-    code += this.index ? this.index.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
-    code += ') => {\n';
+    code += this.end ? this.end?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) : '__IDENTIFIER__';
+    code += ', (';
+    code += this.item ? this.item?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) : '__IDENTIFIER__';
+    code += ', ';
+    code += this.index ? this.index?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) : '__IDENTIFIER__';
+    code += ') => {\n ';
+
     if (Array.isArray(this.body)) {
       this.body.forEach((logicItem) => {
-        code += `${logicItem.toNaturalTS(
+        code += `${logicItem?.toNaturalTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 1,
           }),
         )};\n`;
       });
-      if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
-        code += `${indent(state.tabSize + 1)}// 当前位置\n`;
+      if (state?.focusedNodePath === `${this?.nodePath}.body[${this.body?.length}]`)
+        code += `${indent(state?.tabSize + 1)}// 当前位置\n`;
     }
     code += `${indent(state?.tabSize || 0)}})\n`;
 

package/src/concepts/Identifier__.ts

@@ -90,6 +90,9 @@ export class Identifier extends LogicItem {
   toVue(options?: ElementToVueOptions): string {
     let { name } = this;
     const { namespace } = this;
+    if (this?.parentNode?.parentKey === 'bindAttrs' && ["decimalLength", "decimal-length"].includes(this?.parentNode?.name) && name === 'undefined') {
+      name = undefined
+    }
     if (namespace) {
       if (
         this.namespace.endsWith('nasl.browser') ||
@@ -209,7 +212,7 @@ export class Identifier extends LogicItem {
   *toEmbeddedTS(state = createCompilerState(), options?: any): TranslatorGenerator {
     const self = this;
     // new实体，连线修改实体字段，无法同步到new实体的字段上，因为解构赋值后的property查找不回去，所以改成obj.
-    if (options?.isNewcomposite) {
+    if (options?.isNewcomposite){
       return `__obj.${this.name}`;
     }
     // 只有data-source可以是函数 ，也可能是属性

package/src/concepts/JSBlock__.ts

@@ -83,8 +83,66 @@ export class JSBlock extends LogicItem {
     /**
      * 生成 JS 脚本
      */
+    let boxVariablesCode = '\n';
+    let logicVariableList: any[] = [];
+    let viewVariableList: any[] = [];
+    let currentLogic = this.logic;
+    let currentView;
+    if (currentLogic) {
+      // logic能使用的所有变量: View.variables params  Logic.variables params returns
+      let { variables, params, returns } = currentLogic;
+      logicVariableList = [...variables, ...params, ...returns];
+      currentView = currentLogic.view;
+      if (currentView) {
+        let { variables, params } = currentView;
+        viewVariableList = [...variables, ...params];
+      }
+    }
+    const getBoxCode = (variable: any, context?: string) => {
+      let boxClass = '';
+      const defaultValue = variable.defaultValue;
+      const typeAnnotation = variable?.typeAnnotation || variable?.__TypeAnnotation;
+      if (typeAnnotation) {
+        const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
+        const defaultValueType = Object.prototype.toString.call(defaultValue);
+
+        // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
+        let parsedValue = defaultValue ?? undefined;
+        const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
+        const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
+        // typeKind： 'union'
+        // typeName： 'Union'
+        // typeKey： 'nasl.core.Long | nasl.core.Decimal'
+        if (isInteger) {
+          boxClass = 'NaslLong';
+        }
+        if (isDecimal) {
+          boxClass = 'NaslDecimal';
+        }
+        if (!isInteger && !isDecimal) {
+          // 不是数值类型就不用做box转换 但是有可能 字符串类型被代码块使用并强行赋值 这个情况暂时不考虑
+          return '';
+        }
+        let variableName = context ? `${context}.${variable.name}` : variable.name;
+        return `${variableName} = new ${boxClass}(${variableName});`;
+      }
+    };
+    logicVariableList.map((variable) => {
+      let variableCode = getBoxCode(variable);
+      if (variableCode && variableCode?.length > 0) {
+        boxVariablesCode += `${variableCode}\n`;
+      }
+    });
+    viewVariableList.map((variable) => {
+      let variableCode = getBoxCode(variable, 'this');
+      if (variableCode && variableCode?.length > 0) {
+        boxVariablesCode += `${variableCode}\n`;
+      }
+    });
+
     return `await (async () => {
             ${this.code}
+            ${boxVariablesCode}
         })();`;
   }
 

package/src/concepts/LogicItem__.ts

@@ -1,4 +1,4 @@
-import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import { runGeneratorSync as runSync } from '../utils/time-slicing';
 import {
   TranslatorState,
   createCompilerState,
@@ -342,7 +342,7 @@ export class LogicItem extends BaseNode {
    * @returns 生成的代码
    */
   toNaturalTS(state = createCompilerState()): string {
-    return this.toTS(state);
+    return runSync(this.toEmbeddedTS(state));
   }
 
   delete() {

package/src/concepts/Logic__.ts

@@ -2108,6 +2108,7 @@ ${indent(state.tabSize)} */\n`;
       if ($1.includes(`,${variable},`)) fnCode = $1.replaceAll(`,${variable},`, `,${replaceCode},`);
       if ($1.includes(`,${variable}.`)) fnCode = $1.replaceAll(`,${variable}.`, `,${replaceCode}.`);
       if ($1.includes(`,${variable})`)) fnCode = $1.replaceAll(`,${variable})`, `,${replaceCode})`);
+      if ($1.includes(`...[${variable}.`)) fnCode = $1.replaceAll(`...[${variable}.`, `...[${replaceCode}.`);
       return fnCode;
     });
   }

package/src/concepts/Match__.ts

@@ -775,7 +775,7 @@ export class Match extends LogicItem {
       code += item.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }), index, parentCode);
     });
     code += indent(state.tabSize);
-    code += `})(${this.expression.toNaturalTS(shiftState(state, code, { inline: true }))})`;
+    code += `})(${this.expression?.toNaturalTS(shiftState(state, code, { inline: true }))})`;
 
     if (
       this.parentNode?.concept !== 'Argument' &&

package/src/concepts/MultiApprovalPolicy__.ts

@@ -0,0 +1,69 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, className } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+
+/**
+ * 多人审批任务
+ */
+@className
+@concept('多人审批任务')
+// @ts-ignore
+export class MultiApprovalPolicy extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'MultiApprovalPolicy';
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'MultiApprovalPolicy' | 'SequentialPolicy' | 'CountersignPolicy';
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<MultiApprovalPolicy>) {
+    source = Object.assign({}, MultiApprovalPolicy.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): MultiApprovalPolicy {
+    return super.from(source, parentNode, parentKey) as MultiApprovalPolicy;
+  }
+
+  /**
+   * 从父级删除该节点
+   * @internal
+   */
+  _delete() {
+    let params: Params = null;
+    if (this.parentNode) {
+      params = (this.parentNode as any)?.__removeMultiApprovalPolicy?.(this);
+    }
+    return params;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default MultiApprovalPolicy;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/NewComposite__.ts

@@ -1361,21 +1361,30 @@ export class NewComposite extends LogicItem {
         });
         code += right.members.length ? '\n' : '';
       });
-      // 方便ts报错检查
-      code += `${indent1}function __newComposite() {\n`;
+      // 先把连线的变量定义出来，否则匿名数据结构属性名称与变量名称相同时会报错,
       yield* wrapForEach(self.properties, function* warpForEachGenerator(property, index) {
-        const temp = `temp${index}`;
-        const propertyType = self.typeAnnotation.properties[index]?.typeAnnotation;
+        const temp = `temp${index}__`;
         const { name } = property;
         const rightItem = nameMap.get(name);
         const ts = rightMap.get(rightItem);
         if (ts !== undefined) {
           if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
-            code += `${indent2}let ${temp}: void = null; `;
+            code += `${indent1}let ${temp}: void = null; \n`;
           } else {
-            code += `${indent2}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; `;
+            code += `${indent1}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; \n`;
           }
-          code += `let `;
+        }
+      });
+      // 方便ts报错检查
+      code += `${indent1}function __newComposite() {\n`;
+      yield* wrapForEach(self.properties, function* warpForEachGenerator(property, index) {
+        const temp = `temp${index}__`;
+        const propertyType = self.typeAnnotation.properties[index]?.typeAnnotation;
+        const { name } = property;
+        const rightItem = nameMap.get(name);
+        const ts = rightMap.get(rightItem);
+        if (ts !== undefined) {
+          code += `${indent2}let `;
           code += `${yield* property.toEmbeddedTS(shiftState(state, code, { inline: true }))}: `;
           if (propertyType) {
             const typeTs = yield* propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }));
@@ -1403,7 +1412,7 @@ export class NewComposite extends LogicItem {
       yield* wrapForEach(self.properties, function* warpForEachGenerator(property) {
         code += `${indent3}${property.name},\n`;
       });
-      code += `${indent3}__name: "AStructure_${genHash(JSON.stringify(this))}" as const,\n`;
+      code += `${indent3}__name: "AStructure_AAAAAAAA" as const,\n`;
       code += `${indent2}}\n`;
       code += `${indent1}};\n`;
       code += `${indent1}return __newComposite();\n`;
@@ -1482,7 +1491,7 @@ export class NewComposite extends LogicItem {
     this.properties.forEach((property) => {
       code += `${indent4}${property.name},\n`;
     });
-    code += `${indent4}__name: "AStructure_${genHash(JSON.stringify(this))}" as const,\n`;
+    code += `${indent4}__name: "AStructure_AAAAAAAA" as const,\n`;
     code += `${indent3}}\n`;
 
     code += `${indent2}};\n`;

package/src/concepts/NumericLiteral__.ts

@@ -138,7 +138,7 @@ export class NumericLiteral extends LogicItem {
   }
 
   toJS(): string {
-    const code = this.value ? String(this.value) : '';
+    const code = this.value ? `"${String(this.value)}"` : '';
     return code;
   }