@lcap/nasl 3.4.0-beta.3 → 3.4.0-beta.4

package/src/concepts/CallFunction__.ts

@@ -31,6 +31,9 @@ export class CallFunction extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'CallFunction';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -325,7 +328,8 @@ export class CallFunction extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -363,7 +367,8 @@ export class CallFunction extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -384,6 +389,20 @@ export class CallFunction extends LogicItem {
     }
     let code = `$utils['${this.calleeName}']`;
     code += '(';
+    let argTyAnno;
+    if (this.calleeName === 'ToString') {
+      const arg0 = this.arguments[0];
+      argTyAnno = (arg0 as any).typeAnnotation || arg0.__TypeAnnotation;
+    } else if (this.calleeName === 'FromString') {
+      argTyAnno = this.typeArguments?.[0];
+    }
+
+    // 调整 ToString 的 typeKey 到第一个参数，剩下的以后重构。
+    // 事实上，大部分编译器都会选择把 type tag 放到前端来做运行时匹配，而非末位。
+    if (this.calleeName === 'ToString' && argTyAnno) {
+      code += `'${argTyAnno?.sortedTypeKey}', `;
+    }
+
     if (Array.isArray(this.arguments) && this.arguments.length) {
       const needToString = ['Concat'].includes(this.calleeName);
       this.arguments?.forEach((arg: any, index) => {
@@ -399,7 +418,12 @@ export class CallFunction extends LogicItem {
         if (index !== this.arguments?.length - 1) code += ', ';
       });
     }
-    if (this.typeArguments && this.typeArguments.length) {
+    if (this.calleeName === 'FromString' && argTyAnno) {
+      code += `, '${argTyAnno?.sortedTypeKey}'`;
+    }
+    // 用作做语义控制。后面这段代码没完全理解，需要保持进入条件不变。
+    const flagControl = ['ToString', 'FromString'].includes(this.calleeName) && argTyAnno;
+    if (!flagControl && Array.isArray(this.typeArguments) && this.typeArguments.length) {
       if (this.arguments?.length) code += ', ';
       this.typeArguments?.forEach((arg, index) => {
         code += arg?.toJS().replace(/"/g, "'");
@@ -410,19 +434,21 @@ export class CallFunction extends LogicItem {
     return code;
   }
 
-  toUI(): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = this.calleeName;
     code += '(';
-    this.arguments?.forEach((arg, index) => {
-      code += arg?.toUI();
-      if (index !== this.arguments?.length - 1) code += ', ';
-    });
-    if (this.typeArguments && this.typeArguments.length) {
-      if (this.arguments?.length) code += ', ';
-      this.typeArguments?.forEach((arg, index) => {
-        code += arg?.typeName;
-        if (index !== this.typeArguments?.length - 1) code += ', ';
+    if (!hideDetails) {
+      this.arguments?.forEach((arg, index) => {
+        code += arg?.toUI();
+        if (index !== this.arguments?.length - 1) code += ', ';
       });
+      if (this.typeArguments && this.typeArguments.length) {
+        if (this.arguments?.length) code += ', ';
+        this.typeArguments?.forEach((arg, index) => {
+          code += arg?.typeName;
+          if (index !== this.typeArguments?.length - 1) code += ', ';
+        });
+      }
     }
     code += ')';
     return code;
@@ -473,11 +499,11 @@ export class CallFunction extends LogicItem {
       });
     }
 
-    if (this.calleeName === 'fromString' && argTyAnno) {
+    if (this.calleeName === 'FromString' && argTyAnno) {
       code += `, '${argTyAnno?.sortedTypeKey}'`;
     }
     // 用作做语义控制。后面这段代码没完全理解，需要保持进入条件不变。
-    const flagControl = ['ToString', 'fromString'].includes(this.calleeName) && argTyAnno;
+    const flagControl = ['ToString', 'FromString'].includes(this.calleeName) && argTyAnno;
     if (!flagControl && Array.isArray(this.typeArguments) && this.typeArguments.length) {
       if (this.arguments?.length) code += ', ';
 

package/src/concepts/CallInterface__.ts

@@ -32,6 +32,9 @@ export class CallInterface extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'CallInterface';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -216,7 +219,8 @@ export class CallInterface extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -335,13 +339,15 @@ export class CallInterface extends LogicItem {
     return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = this.calleeName;
     code += '(';
-    this.arguments?.forEach((arg, index) => {
-      code += arg?.toUI();
-      if (index !== this.arguments?.length - 1) code += ', ';
-    });
+    if (!hideDetails) {
+      this.arguments?.forEach((arg, index) => {
+        code += arg?.toUI();
+        if (index !== this.arguments?.length - 1) code += ', ';
+      });
+    }
     code += ')';
     return code;
   }
@@ -368,7 +374,7 @@ export class CallInterface extends LogicItem {
       throw new Error(`${_name}下的${_interfaceName}接口未找到`);
     }
     let isSimpleBody = false; // 兼容body只有基本类型的
-    const _params = _interface.params;
+    const _params = (_interface as Interface).params;
     const _queries = _params.filter((item) => item.in === 'query').map((item) => item.name);
     const _headers = _params.filter((item) => item.in === 'header').map((item) => item.name);
     const _body = _params
@@ -626,25 +632,31 @@ export class CallInterface extends LogicItem {
   setCallee(_interface: Interface) {
     const calleeNamespace = _interface.getNamespace();
     const calleeName = _interface.name;
-    const params = _interface.params.map((param) => {
+    // 保留之前的参数
+    const params = _interface.params.reduce((res, param) => {
       const oldArgument = this.arguments.find((node) => node.keyword === param.name);
-      return Argument.from(
-        {
-          keyword: param.name,
-          expression: oldArgument ? oldArgument.expression : undefined,
-        },
-        this,
-        'arguments',
-      );
-    });
+      if (oldArgument && oldArgument.expression) {
+        res.push(
+          Argument.from(
+            {
+              keyword: param.name,
+              expression: oldArgument.expression,
+            },
+            this,
+            'arguments',
+          ),
+        );
+      }
+      return res;
+    }, []);
     const oldArguments = this.arguments.reduce((res, argumentNode) => {
       const targetParam = _interface.params.find((item) => item.name === argumentNode.keyword);
-      if (!targetParam) {
+      if (!targetParam && argumentNode && argumentNode.expression) {
         res.push(
           Argument.from(
             {
               keyword: argumentNode.keyword,
-              expression: argumentNode ? argumentNode.expression : undefined,
+              expression: argumentNode.expression,
             },
             this,
             'arguments',
@@ -797,7 +809,7 @@ export class CallInterface extends LogicItem {
       }
     }
 
-    let targetItf = module.interfaces.find((item) => item.name === itfData.name);
+    let targetItf = module.interfaces.find((item) => item.name === itfData.name) as Interface;
     // 根据 targetItf 是否是AuthInterface 来确定生成什么类型的接口
     let newItf;
     if (targetItf && targetItf.concept === 'AuthInterface') {
@@ -807,7 +819,7 @@ export class CallInterface extends LogicItem {
         concept: targetItf.concept,
       });
     } else {
-      newItf = new Interface(itfData);
+      newItf = new Interface(itfData as Interface);
     }
     if (targetItf) {
       // 更新已有接口

package/src/concepts/CallLogic__.ts

@@ -36,6 +36,9 @@ export class CallLogic extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'CallLogic';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 唯一标识
    */
@@ -386,7 +389,8 @@ export class CallLogic extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -424,7 +428,8 @@ export class CallLogic extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -476,7 +481,8 @@ export class CallLogic extends LogicItem {
       // @ts-ignore
       const n = bindAttribute.__v_raw || bindAttribute;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -731,7 +737,7 @@ export class CallLogic extends LogicItem {
     ) {
       code += '$global.';
     }
-    const completeArguments = this.completeArguments;
+    const { completeArguments } = this;
 
     if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
       if (this.calleeNamespace) {
@@ -751,15 +757,15 @@ export class CallLogic extends LogicItem {
         if (index !== completeArguments.length - 1) code += ', ';
       });
     }
-    code += ')}';
+    code += ')';
     return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = this.calleeName;
     code += '(';
 
-    if (this.arguments?.length) {
+    if (this.arguments?.length && !hideDetails) {
       this.arguments.forEach((arg, index) => {
         code += arg?.toUI();
         if (index !== this.arguments?.length - 1) code += ', ';
@@ -1293,7 +1299,6 @@ export class CallLogic extends LogicItem {
   toNaturalTS(state = createCompilerState()): string {
     const {
       handleError,
-      calleeKey,
       calleeName,
       parentKey,
       typeArguments,
@@ -1306,8 +1311,10 @@ export class CallLogic extends LogicItem {
       arguments: logicArgs,
     } = this;
 
-    let code = calleeKey.replace('__elements', '$refs');
-    if (/^app.+?\.entities\..+?logics/.test(code)) code = code.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1');
+    let code = '';
+    let calleeKey = this.calleeKey.replace('__elements', '$refs');
+    if (/^app.+?\.entities\..+?logics/.test(code))
+      calleeKey = calleeKey.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1');
     /** 设置函数范型参数 */
     const setTypeArguments = () => {
       if (Array.isArray(typeArguments) && typeArguments.length) {
@@ -1332,7 +1339,7 @@ export class CallLogic extends LogicItem {
         code += '(';
         logicArgs.forEach((arg, index) => {
           // 页面逻辑先都非必填
-          code += arg.toNaturalTS(shiftState(state, code), paramRequired);
+          code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }), paramRequired);
           if (index !== logicArgs.length - 1) code += ', ';
         });
         code += ')';
@@ -1340,7 +1347,7 @@ export class CallLogic extends LogicItem {
         code += '(';
         completeArguments.forEach((arg, index) => {
           // 取到是不是必填放入参数中
-          code += arg.toNaturalTS(shiftState(state, code), arg?.paramRequired);
+          code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }), arg?.paramRequired);
           if (index !== logicArgs.length - 1) code += ', ';
         });
         code += ')';
@@ -1453,32 +1460,31 @@ export class CallLogic extends LogicItem {
         line: detail.line + lineOffset,
         offset: characterOffset,
       };
-    } else {
-      let indexOf = 0;
+    }
+    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;
+    // 没有括号，表示括号在外面
+    if (!code.includes('(')) {
+      indexOf = -1;
+    }
+    // 有括号就找到括号的位置
+    else {
+      // 如果有泛型先往前找一找
+      if (code.includes('<')) {
+        indexOf = Math.min(code.indexOf('<'), code.indexOf('('));
+      } else {
+        indexOf = code.indexOf('(');
       }
-
-      return {
-        ...detail,
-        offset: detail.offset + indexOf,
-      };
+      const subStr = code.substring(0, indexOf);
+      const codeArr = subStr?.split('.');
+      const lastLen = codeArr?.[codeArr.length - 1]?.length;
+      indexOf = subStr.length - lastLen;
     }
+
+    return {
+      ...detail,
+      offset: detail.offset + indexOf,
+    };
   }
 
   /**

package/src/concepts/CallQueryComponent__.ts

@@ -35,6 +35,9 @@ export class CallQueryComponent extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'CallQueryComponent';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -740,7 +743,8 @@ export class CallQueryComponent extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -936,7 +940,8 @@ export class CallQueryComponent extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1242,20 +1247,12 @@ export class CallQueryComponent extends LogicItem {
         if (['COUNT', 'COUNTD'].includes(item.aggregateName)) {
           typeName = 'Long';
         } else if (['AVG'].includes(item.aggregateName)) {
-          const { entityAsName, propertyName } = item.aggregateParam;
-          const entity = entities.find((item: Entity) => item.name === entityAsName);
-          const property = entity?.properties.find((item: any) => item.name === propertyName);
-          const propertyTypeName = property?.typeAnnotation?.typeName;
-          if (propertyTypeName === 'Decimal') {
-            typeName = 'Decimal';
-          } else {
-            typeName = 'Decimal';
-          }
+          typeName = 'Decimal';
         } else {
           const { entityAsName, propertyName } = item.aggregateParam;
-          const entity = entities.find((item: Entity) => item.name === entityAsName);
-          const property = entity?.properties.find((item) => item.name === propertyName);
-          typeName = property?.typeAnnotation?.typeName;
+          const entity = entities.find((e: Entity) => e.name === entityAsName);
+          const prop = entity?.properties.find((p) => p.name === propertyName);
+          typeName = prop?.typeAnnotation?.typeName;
         }
         return {
           concept: 'StructureProperty',

package/src/concepts/Comment__.ts

@@ -21,6 +21,9 @@ export class Comment extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'Comment';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */

package/src/concepts/CompletionProperty__.ts

@@ -21,6 +21,9 @@ export class CompletionProperty extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'CompletionProperty';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -217,7 +220,8 @@ export class CompletionProperty extends BaseNode {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/ConfigGroup__.ts

@@ -23,6 +23,9 @@ export class ConfigGroup extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ConfigGroup';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -287,7 +290,8 @@ export class ConfigGroup extends BaseNode {
       // @ts-ignore
       const n = configProperty.__v_raw || configProperty;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/ConfigPropertyValue__.ts

@@ -20,6 +20,9 @@ export class ConfigPropertyValue extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ConfigPropertyValue';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */

package/src/concepts/ConfigProperty__.ts

@@ -27,6 +27,9 @@ export class ConfigProperty extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ConfigProperty';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -317,7 +320,8 @@ export class ConfigProperty extends BaseNode {
       // @ts-ignore
       const n = configPropertyValue.__v_raw || configPropertyValue;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/Configuration__.ts

@@ -22,6 +22,9 @@ export class Configuration extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Configuration';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -265,7 +268,8 @@ export class Configuration extends BaseNode {
       // @ts-ignore
       const n = configGroup.__v_raw || configGroup;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/Connection__.ts

@@ -26,6 +26,9 @@ export class Connection extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Connection';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -346,7 +349,8 @@ export class Connection extends BaseNode {
       // @ts-ignore
       const n = configProperty.__v_raw || configProperty;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/ConnectorTrigger__.ts

@@ -27,6 +27,9 @@ export class ConnectorTrigger extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'ConnectorTrigger';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */