@lcap/nasl 3.8.2-beta.8 → 3.8.3-beta.1

package/sandbox-natural/stdlib/{nasl.util.ts → nasl.util.d.ts}

@@ -1,19 +1,27 @@
+/** 循环函数ForEach
+* 这是唯一一个可以在逻辑中使用的循环函数，用于遍历列表中的元素，禁止使用for、forEach等其他循环语句。
+*/
+declare function ForEach<T>(list: List<T>, start: Integer, end: Integer, fn: (item: T, index: Integer) => void): void;
+
+/* 基本运算函数，用于数学计算 */
+declare function plus(left: Decimal, right: Decimal): Decimal;
+declare function minus(left: Decimal, right: Decimal): Decimal;
+declare function multiply(left: Decimal, right: Decimal): Decimal;
+declare function divide(left: Decimal, right: Decimal): Decimal;
+declare function remainder(left: Decimal, right: Decimal): Decimal;
+
 declare namespace nasl.util {
-  // 类型转换与格式化函数
+  /* 类型转换与格式化函数 */
   export function Convert(value: null): <T extends never>() => T;
-  export function FormatNumber(doubleValue: Decimal | Integer, digits: Integer, showGroups: Boolean): String;
-  /**
-   * @example nasl.util.FormatDateTime(dataTime1, 'yyyy-MM-dd HH:mm:ss', 'global')
-  */
+  export function FormatNumber(doubleValue: Decimal | Long, digits: Long, showGroups: Boolean): String;
+  // @example nasl.util.FormatDateTime(dataTime1, 'yyyy-MM-dd HH:mm:ss', 'global')
   export function FormatDateTime(dateTime: DateTime, formatter: String, timeZone: string): String;
   export function FormatDate(date: Date, formatter: String): String;
-  /**
-   * @example nasl.util.FromString<Date>(variable1)
-   */
-  export function FromString<T extends Decimal | Date | Time | DateTime | Integer | Boolean>(value: String): T;
+  // @example nasl.util.FromString<Date>(variable1)
+  export function FromString<T extends Decimal | Date | Time | DateTime | Long | Boolean>(value: String): T;
   export function ToString(value: Any): String;
 
-  // 字符串函数
+  /* 字符串函数 */
   export function Length(str1: String): Decimal;
   export function Length<K, V>(str1: Map<K, V>): Decimal;
   export function Length<T>(str1: List<T>): Decimal;
@@ -22,24 +30,28 @@ declare namespace nasl.util {
   export function LastIndexOf(str: String, search: String, ignoreCase: Boolean): Decimal;
   export function Replace(str: String, search: String, replace: String): String;
   export function Split(str: String, seperator: String): List<String>;
-  export function SubString(str: String, start: Decimal, length: Integer): String;
+  export function SubString(str: String, start: Decimal, length: Long): String;
   export function ToLower(str1: String): String;
   export function ToUpper(str1: String): String;
   export function Trim(str1: String): String;
 
-  // 日期与时间函数
+  /* 日期与时间函数 */
   export function CurrDate(): Date;
   export function CurrDateTime(): DateTime;
   export function CurrTime(): Time;
-  export function DateDiff<T extends Date | Time | DateTime>(dateTime1: T, dateTime2: T, calcType: 'd' | 'h' | 'm' | 's', isAbs: Boolean): Decimal;
-  /* 为指定日期时间调整增加（减少）时间 */
+  // 计算两个日期时间之间的差值，calcType 支持年、季度、月、周、天、时分秒，默认为 'd'
+  export function DateDiff<T extends Date | Time | DateTime>(dateTime1: T, dateTime2: T, calcType: 'y' | 'q' | 'M' | 'w' | 'd' | 'h' | 'm' | 's', isAbs: Boolean): Decimal;
+  // 为指定日期时间调整增加（减少）时间
   export function AlterDateTime<T extends Date | DateTime>(dateTime: T, option: 'Increase' | 'Decrease', amount: Long, unit: 'day' | 'week' | 'month' | 'quarter' | 'year'): T;
-  /* 按指定维度计算日期，如“所在年-第几周”。当输入为 DateTime 类型时，会把数据转到提供的时区的当地时间进行计算。*/
-  export function GetDateCount<T extends Date | DateTime>(dateTime: T, metric: 'week-year', timeZone: string): Time;
-  /* 按“星期几”获取指定日期范围内的日子。当输入为 DateTime 类型时，会把数据转到提供的时区的当地时间进行计算。target 取值范围 [1,2,3,4,5,6,7] */
-  export function GetSpecificDaysOfWeek<T extends Date | DateTime>(startDate: T, endDate: T, target: List<Long>, timeZone?: String): List<T>;
+  /** 按指定维度计算日期的序号。当输入为 DateTime 类型时，会把数据转到提供的时区的当地时间进行计算
+  * @param dateTime: 日期或日期时间
+  * @param metric: 计算维度，格式为'小日期单位-大日期单位'。日期单位包括：'year'、'quarter'、'month'、'week'、'day'。如设置 'week-year'，则返回当前日期是所在年的第几周, 'day-week'，则返回当前日期是所在周的第几天。
+  */
+  export function GetDateCount<T extends Date | DateTime>(dateTime: T, metric: 'week-year'): Time;
+  // 按“星期几”获取指定日期范围内的日子。当输入为 DateTime 类型时，会把数据转到提供的时区的当地时间进行计算。target 取值范围 [1,2,3,4,5,6,7]
+  export function GetSpecificDaysOfWeek<T extends Date | DateTime>(startDate: T, endDate: T, target: List<Long>): List<T>;
 
-  // 列表（List）函数
+  /* 列表（List）函数 */
   export function Add<T, K extends T>(list: List<T>, item: K): void;
   export function AddAll<T>(list: List<T>, addList: List<T>): Decimal;
   export function Contains<T, K extends T>(list: List<T>, item: K): Boolean;
@@ -58,15 +70,15 @@ declare namespace nasl.util {
   export function ListReverse<T>(list: List<T>): void;
   export function ListSlice<T>(list: List<T>, start: Decimal, end: Decimal): List<T>;
   export function ListSort<T>(list: List<T>, by: (item: T) => any, sort: Boolean): void;
-  export function ListSum<T extends Integer | Decimal>(list: List<T>): T;
+  export function ListSum<T extends Long | Decimal>(list: List<T>): T;
   export function ListToMap<T, K extends Boolean | Decimal | Decimal | String, V>(map: List<T>, byKey: (elem: T) => K, byVal: (elem: T) => V): Map<K, V>;
   export function ListTransform<T0, T>(list: List<T0>, by: (elem: T0) => T): List<T>;
   export function Get<T>(list: List<T>, index: Decimal): T;
   export function Remove<T, K extends T>(list: List<T>, item: K): void;
-  export function RemoveAt<T>(list: List<T>, index: Integer): T;
+  export function RemoveAt<T>(list: List<T>, index: Long): T;
   export function Set<T, K extends T>(list: List<T>, index: Decimal, item: K): T;
 
-  // 映射（Map）函数
+  /* 映射（Map）函数 */
   export function MapContains<K, V>(map: Map<K, V>, key: K): Boolean;
   export function MapGet<K, V>(map: Map<K, V>, key: K): V;
   export function MapPut<K, V>(map: Map<K, V>, key: K, value: V): void;
@@ -74,62 +86,56 @@ declare namespace nasl.util {
   export function MapRemove<K, V>(map: Map<K, V>, key: K): void;
   export function MapValues<K, V>(map: Map<K, V>): List<V>;
 
-  // 枚举函数
-  /**
-  * @example nasl.util.EnumToList<app.enums.aEnum>();
+  /* 枚举函数，项目中可使用的枚举类型均定义在 app.enums 中 */
+  /** 将指定枚举转换枚举value和text的List集合
+  * @example nasl.util.EnumToList<app.enums.UserSourceEnum>();
   */
   export function EnumToList<T extends Enums>(): List<{ text: String, value: String; }>;
-  // 将指定枚举值转换为文本
+  // 返回枚举指定value的标题字符串
   export function EnumValueToText<T extends Enums>(value: any): String;
   // 在指定枚举中找到与参数相同的枚举值并返回
   export function StringToEnumValue<T extends Enums>(value: String): T;
 
-  // 数学函数
-  /**
-   * 整数/小数 操作
+  /* 数学函数 */
+  /** 整数/小数 操作
    * @param mode: 'HalfUp' | 'TowardsZero' | 'TowardsInfinity' === '四舍五入' | '截断、向零取整，如 -2.6 取整为 -2' | '进位、向正负无穷取整，如 -1.1 取整为 -2'
    */
   export function Round(value: Decimal, mode: 'HalfUp' | 'TowardsZero' | 'TowardsInfinity'): Decimal;
-
-  // 其他函数
+  /* 其他函数 */
   export function Clear<T>(struct: T): T;
   export function Clone<T>(struct: T): T;
+  // 判断参数是否为有效值，null、空字符串、纯空格、长度为0的集合均不被视为有效值，传入多个参数时，判断是否全部都是有效值 */
   export function HasValue(...args: Any[]): Boolean;
   // RandomInt 生成的数字为整数，如果需要指定位数的随机数，需要在数字前按照位数要求补 0
-  export function RandomInt(start: Integer, end: Integer): Integer;
+  export function RandomInt(start: Long, end: Long): Long;
 
   // New 系列函数使用
-  /**
-   * T 类型必填
+  /** 生成新的列表，T 类型必填
    * @example const variable1 = nasl.util.NewList<Boolean | Long>([true, false, 1])
    */
   export function NewList<T>(args: T[]): List<T>;
-  /**
-   * T 类型必填
+  /** 生成新的映射，K、T 类型必填
    * @example const variable1 = nasl.util.NewMap<String, Long>({'123': 456})
    */
   export function NewMap<K, T>(args: any): Map<K, T>;
-  /**
-   * T 类型必填
+  /** 生成新的数据实体，T 类型必填
    * class Entity1 { id: Long; property1: String; property2: String;}
    * @example const variable1 = nasl.util.NewEntity<Entity1>({id: 123, property1: '123', property2: '456'})
    */
   export function NewEntity<T>(arg: T): T;
-  /**
-   * T 类型必填
+  /** 生成新的结构体，T 类型必填
    * class Structure1 { id: Long; property1: String; property2: String;}
    * @example const variable1 = nasl.util.NewStructure<Structure1>({id: 123, property1: '123', property2: '456'})
    */
   export function NewStructure<T>(arg: T): T;
-  /**
+  /** 生成新的匿名结构体, 无需定义类型
    * @example const variable1 = nasl.util.NewAnonymousStructure({property1: '123', property2: '456'})
    */
   export function NewAnonymousStructure(arg: Any): Any;
 
   export function consoleLog(arg: Any): void;
   export function jsonSerialize(arg: Any): String;
-  /**
-   * T 为返回值类型，必填
+  /** JSON 反序列化, T 为返回值类型，必填
    * @example nasl.util.jsonDeserialize<Boolean>(variable1);
    */
   export function jsonDeserialize<T>(arg: String): T;

package/src/common/BaseNode.ts

@@ -812,7 +812,7 @@ export class BaseNode extends EventEmitter {
     const Ctor = classMap.get(source?.concept) || this;
     if (Ctor && source instanceof Ctor) {
       if (utils.isDebugMode) {
-        console.warn('传入的对象已经是一个实例，请确认逻辑是否存在问题！');
+        // console.warn('传入的对象已经是一个实例，请确认逻辑是否存在问题！');
       }
       if (parentNode) {
         source.parentNode = parentNode;
@@ -1729,9 +1729,11 @@ export class BaseNode extends EventEmitter {
     const results: types.SyntaxNode[] = []; // 创建一个数组存储匹配的结果
 
     queue.push(this as unknown as types.SyntaxNode); // 将初始节点加入队列
+    let point = 0; // 创建一个指针，指向当前遍历的节点
 
-    while (queue.length > 0) {
-      const node = queue.shift(); // 从队列中取出一个节点
+    while (queue[point]) {
+      const node = queue[point]; // 从队列中取出一个节点
+      point++; // 指针后移
 
       if (node) {
         let result = false;

package/src/common/ComponentAPI.ts

@@ -103,4 +103,11 @@ export default interface ComponentAPI {
   aria?: Array<AriaAPI>;
 
   tsTypeParams?: string;
+  readablePropsMap?: { [name: string]: {
+    name: string;
+    title: string;
+    state: string;
+    prop: string;
+    icon?: string;
+  } };
 }

package/src/concepts/AuthLogicForCallInterface__.ts

@@ -542,22 +542,39 @@ export class AuthLogicForCallInterface extends AuthLogic {
         ],
         function* warpForEachGenerator({ key, node: itemNode }) {
           if (itemNode) {
-            code += `const __${key}_${node?.name} = `;
+            code += `let __${key}_${node?.name}`;
             let itemCode = '';
+            // 匿名数据结构 / 未设置类型的List/map 才进getInitCode
             if (
-              asserts.isNewComposite(itemNode)
-              || asserts.isNewList(itemNode)
-              || asserts.isNewMap(itemNode)
+              (
+                asserts.isNewComposite(itemNode)
+                && itemNode.typeAnnotation?.typeKind === 'anonymousStructure'
+              )
+              || (
+                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode)) 
+                && !(itemNode?.typeAnnotation)
+              )
             ) {
-              itemCode += yield* itemNode?.getInitCode(shiftState(state, code, {
+              code += ' = ';
+              itemCode += yield* itemNode?.getInitCode?.(shiftState(state, code, {
                 inline: true
               })) ??
               returnOrigin('');
+            } else if (asserts.isNewComposite(itemNode) && itemNode.typeAnnotation?.typeKind === 'generic') { // new 带泛型的数据结构/实体 进这里
+              code += ' = ';
+              itemCode += (yield* itemNode?.getNewCompositeCode?.(shiftState(state, code, { inline: true }))) || 'null';
+            } else if ((itemNode as any)?.typeAnnotation && !(asserts.isCallQueryComponent(itemNode) && !itemNode.isAutoInfer())) {
+              code += ': ';
+              code += yield* (itemNode as any)?.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
+              returnOrigin('');
             } else {
+              code += ' = ';
               itemCode = yield* itemNode?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
                 returnOrigin('');
             }
-            code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            if (itemCode) {
+              code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            }
             code += ';\n';
           }
         },

package/src/concepts/BackendVariable__.ts

@@ -438,7 +438,22 @@ export class BackendVariable extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    return '';
+    let code = this.name;
+    if (state?.needNamespace) {
+      const namespace = this.getNamespace();
+      const prefix = ['Backend']?.includes(this?.parentNode?.concept) ? `${namespace}.` : '';
+      code = `${prefix}${code}`;
+    }
+    if (this?.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation?.toNaturalTS(shiftState(state, code));
+      if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
+        if (this.isEnum()) {
+          code += `= ${this.typeAnnotation?.typeKey}['${this.defaultValue}']`;
+        }
+      }
+    }
+    return code;
   }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/BindAttribute__.ts

@@ -165,7 +165,7 @@ export class BindAttribute extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<BindAttribute>) {
-    source = { ...BindAttribute.getDefaultOptions(), ...source};
+    source = { ...BindAttribute.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
@@ -546,7 +546,7 @@ export class BindAttribute extends BaseNode {
     if (typeof options === 'string') {
       validationRule = (this.rules as ValidationRule[]).find((item) => item.name === options);
       if (!validationRule) {
-        throw new Error(`找不到验证规则 ${  options}`);
+        throw new Error(`找不到验证规则 ${options}`);
       }
     } else {
       validationRule = options;
@@ -938,7 +938,7 @@ export class BindAttribute extends BaseNode {
         transfromUnionTypeAnnotation(expTypeAnnotation, this.app);
         if (expTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
           const referenceNode =
-            this.app.findNodeByCompleteName(`${expTypeAnnotation.typeNamespace  }.${  expTypeAnnotation.typeName}`)
+            this.app.findNodeByCompleteName(`${expTypeAnnotation.typeNamespace}.${expTypeAnnotation.typeName}`)
               ?.typeAnnotation || {};
           value = `$utils['ToString']('${referenceNode?.typeNamespace}.${referenceNode.typeName}', ${value})`;
         } else {
@@ -970,7 +970,7 @@ export class BindAttribute extends BaseNode {
   }
 
   @withSourceMapGenerator
-  *toEmbeddedTS(state = createCompilerState(), options: { carryName: boolean } = { carryName: false }): TranslatorGenerator {
+  *toEmbeddedTS(state = createCompilerState(), options: { carryName: boolean; } = { carryName: false }): TranslatorGenerator {
     const self = this;
     const { name, type, value, rules, expression, playground } = self;
     const humpName = self.toHump(name);
@@ -1037,7 +1037,7 @@ export class BindAttribute extends BaseNode {
 
       'dataSource',
       'converter',
-    ]
+    ];
 
     // @ts-ignore
     if (prop?.implicitToString) {
@@ -1185,19 +1185,24 @@ export class BindAttribute extends BaseNode {
       ) {
         return node.parentNode;
       }
-        return this.findCurrentElementParent(node.parentNode);
+      return this.findCurrentElementParent(node.parentNode);
 
     }
-      return undefined;
+    return undefined;
 
   }
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = `${utils.firstLowerCase(utils.kebab2Camel(this.name))}: `;
-
+    if (['dataSchema'].includes(this.name)) {
+      if (state?.typeMap?.[this.nodePath]) {
+        code += `'${state?.typeMap?.[this.nodePath]}'`;
+        return code;
+      }
+    }
     if (['destination', 'externalDestination'].includes(this.name) && this.type === 'dynamic') {
-      code += (this as any)[this.name].toNaturalTS(
+      code += (this as any)?.[this.name]?.toNaturalTS(
         shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }),
       );
     } else if (this.name === 'rules') {
@@ -1208,9 +1213,9 @@ export class BindAttribute extends BaseNode {
       });
       code += `\n${indent(state.tabSize)}]`;
     } else if (this.type === 'dynamic' && this.sync) {
-      code += 'sync('
-      code += this.expression?.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize, inline: true }));
-      code += ')';
+      const value = this.expression?.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize, inline: true }));
+      if (value) code += `sync(${value})`;
+      else code += value;
     } else {
       if (this.type === 'string') code += `'${this.value?.replace(/'/g, "\\'")}'`;
       else if (this.type === 'static') code += `${this.value}`;
@@ -1275,7 +1280,7 @@ export function attrConvertCamelCase(str: string) {
     if (index === 0) {
       return strItem;
     }
-      return `${strItem.slice(0, 1).toUpperCase()}${strItem.slice(1)}`;
+    return `${strItem.slice(0, 1).toUpperCase()}${strItem.slice(1)}`;
 
   });
   return strList.join('');

package/src/concepts/BindDirective__.ts

@@ -570,7 +570,7 @@ export class BindDirective extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = `${this.name}: `;
+    let code = `_${this.name}: `;
 
     code += this.expression?.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize, inline: true }));
 

package/src/concepts/BindStyle__.ts

@@ -471,7 +471,7 @@ export class BindStyle extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = `${this.name}: `;
+    let code = `_${this.name}: `;
 
     code += this.expression?.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize, inline: true }));
 

package/src/concepts/BusinessComponent__.ts

@@ -15,7 +15,7 @@ import type Match from './Match__';
 import type Logic from './Logic__';
 import type Param from './Param__';
 import { ElementToVueOptions } from './ViewElement__';
-import { ComponentCompletionPropertyMap } from './View__';
+import { config } from '../config';
 import translator from '../bak/translator';
 
 type AttrObject = {
@@ -1903,7 +1903,8 @@ export class BusinessComponent extends BaseNode {
         if (item.tag === 'template' && item.haveScope()) {
           index += 1;
         }
-        if (ComponentCompletionPropertyMap[item.tag]) {
+        if (config?.allNodesAPI && config?.allNodesAPI[item.tag] &&
+          config?.allNodesAPI[item.tag].readablePropsMap) {
           componentList.push(item);
         }
         item.currentIndex = index;
@@ -2145,22 +2146,39 @@ export class BusinessComponent extends BaseNode {
         ],
         function* warpForEachGenerator({ key, node: itemNode }) {
           if (itemNode) {
-            code += `const __${key}_${node?.name} = `;
+            code += `let __${key}_${node?.name}`;
             let itemCode = '';
+            // 匿名数据结构 / 未设置类型的List/map 才进getInitCode
             if (
-              asserts.isNewComposite(itemNode)
-              || asserts.isNewList(itemNode)
-              || asserts.isNewMap(itemNode)
+              (
+                asserts.isNewComposite(itemNode)
+                && itemNode.typeAnnotation?.typeKind === 'anonymousStructure'
+              )
+              || (
+                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode)) 
+                && !(itemNode?.typeAnnotation)
+              )
             ) {
-              itemCode += yield* itemNode?.getInitCode(shiftState(state, code, {
+              code += ' = ';
+              itemCode += yield* itemNode?.getInitCode?.(shiftState(state, code, {
                 inline: true
               })) ??
               returnOrigin('');
+            } else if (asserts.isNewComposite(itemNode) && itemNode.typeAnnotation?.typeKind === 'generic') { // new 带泛型的数据结构/实体 进这里
+              code += ' = ';
+              itemCode += (yield* itemNode?.getNewCompositeCode?.(shiftState(state, code, { inline: true }))) || 'null';
+            } else if ((itemNode as any)?.typeAnnotation && !(asserts.isCallQueryComponent(itemNode) && !itemNode.isAutoInfer())) {
+              code += ': ';
+              code += yield* (itemNode as any)?.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
+              returnOrigin('');
             } else {
+              code += ' = ';
               itemCode = yield* itemNode?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
                 returnOrigin('');
             }
-            code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            if (itemCode) {
+              code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            }
             code += ';\n';
           }
         },

package/src/concepts/BusinessLogic__.ts

@@ -351,22 +351,39 @@ export class BusinessLogic extends Logic {
         ],
         function* warpForEachGenerator({ key, node: itemNode }) {
           if (itemNode) {
-            code += `const __${key}_${node?.name} = `;
+            code += `let __${key}_${node?.name}`;
             let itemCode = '';
+            // 匿名数据结构 / 未设置类型的List/map 才进getInitCode
             if (
-              asserts.isNewComposite(itemNode)
-              || asserts.isNewList(itemNode)
-              || asserts.isNewMap(itemNode)
+              (
+                asserts.isNewComposite(itemNode)
+                && itemNode.typeAnnotation?.typeKind === 'anonymousStructure'
+              )
+              || (
+                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode)) 
+                && !(itemNode?.typeAnnotation)
+              )
             ) {
-              itemCode += yield* itemNode?.getInitCode(shiftState(state, code, {
+              code += ' = ';
+              itemCode += yield* itemNode?.getInitCode?.(shiftState(state, code, {
                 inline: true
               })) ??
               returnOrigin('');
+            } else if (asserts.isNewComposite(itemNode) && itemNode.typeAnnotation?.typeKind === 'generic') { // new 带泛型的数据结构/实体 进这里
+              code += ' = ';
+              itemCode += (yield* itemNode?.getNewCompositeCode?.(shiftState(state, code, { inline: true }))) || 'null';
+            } else if ((itemNode as any)?.typeAnnotation && !(asserts.isCallQueryComponent(itemNode) && !itemNode.isAutoInfer())) {
+              code += ': ';
+              code += yield* (itemNode as any)?.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
+              returnOrigin('');
             } else {
+              code += ' = ';
               itemCode = yield* itemNode?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
                 returnOrigin('');
             }
-            code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            if (itemCode) {
+              code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            }
             code += ';\n';
           }
         },

package/src/concepts/CallInterface__.ts

@@ -716,8 +716,8 @@ export class CallInterface extends LogicItem {
         if (!arg) return;
         const idx = logicParam.findIndex((params) => arg.keyword === params.name);
         const param = logicParam[idx];
-
-        arg.paramRequired = param?.required;
+        const hasDefaultValue = Boolean(param?.defaultValue?.expression);
+        arg.paramRequired = hasDefaultValue ? false : param?.required;
         arg.paramTypeAnnotation = undefined;
         arg.paramDefaultValue = undefined;
         // 取到是不是必填放入参数中