@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/concepts/CallInterface__.ts

@@ -26,14 +26,15 @@ import { getCallExpressionQuickInfo, Range, GetCode } from './utils/quick-info';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
+import Argument from './Argument__';
 import LogicItem from './LogicItem__';
-import type Argument from './Argument__';
 
 /**
  * 调用接口
@@ -42,7 +43,11 @@ import type Argument from './Argument__';
 export class CallInterface extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'CallInterface';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -52,30 +57,29 @@ export class CallInterface extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'CallInterface' | 'CallAuthInterface';
-
-  /**
-   * 调用接口标题
-   */
-  @property()
-  label: string = '调用接口';
-
   /**
    * calleeNamespace
    */
-  @property()
-  calleeNamespace!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property()
-  calleeName!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeName: string;
 
   /**
    * shortcut
    */
-  @property()
-  shortcut!: boolean;
+  @property({
+    objectRef: '',
+  })
+  shortcut: boolean;
 
   /**
    * 实际参数
@@ -212,37 +216,6 @@ export class CallInterface extends LogicItem {
     return argument.delete();
   }
 
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @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 {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/CallLogic__.ts

@@ -24,16 +24,17 @@ import type { MemberExpression } from './MemberExpression__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
+import TypeAnnotation from './TypeAnnotation__';
+import Argument from './Argument__';
+import BindAttribute from './BindAttribute__';
 import LogicItem from './LogicItem__';
-import type TypeAnnotation from './TypeAnnotation__';
-import type Argument from './Argument__';
-import type BindAttribute from './BindAttribute__';
 
 /**
  * 调用逻辑
@@ -42,15 +43,13 @@ import type BindAttribute from './BindAttribute__';
 export class CallLogic extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'CallLogic';
-
-  /** 继承链 */
-  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
-
   /**
-   * 唯一标识
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
    */
-  @property()
-  uuid: string = uuidv4().replace(/-/g, '');
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -58,36 +57,45 @@ export class CallLogic extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'CallLogic' | 'CallConnector';
-
   /**
-   * 调用逻辑标题
+   * 唯一标识
    */
-  @property()
-  label: string = '调用逻辑';
+  @property({
+    objectRef: '',
+  })
+  uuid: string = uuidv4().replace(/-/g, '');
 
   /**
    * calleeNamespace
    */
-  @property()
-  calleeNamespace!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property()
-  calleeName!: string;
+  @property({
+    objectRef: '',
+  })
+  calleeName: string;
 
   /**
    * shortcut
    */
-  @property()
-  shortcut!: boolean;
+  @property({
+    objectRef: '',
+  })
+  shortcut: boolean;
 
   /**
    * handleError
    */
-  @property()
-  handleError!: boolean;
+  @property({
+    objectRef: '',
+  })
+  handleError: boolean;
 
   /**
    * 类型参数
@@ -115,13 +123,15 @@ export class CallLogic extends LogicItem {
   @property({
     objectRef: 'BindAttribute',
   })
-  validation!: BindAttribute;
+  validation: BindAttribute;
 
   /**
    * 是否被折叠
    */
-  @property()
-  isAdvancedSettingFolded!: boolean;
+  @property({
+    objectRef: '',
+  })
+  isAdvancedSettingFolded: boolean;
 
   /**
    * @param source 需要合并的部分参数
@@ -376,37 +386,6 @@ export class CallLogic extends LogicItem {
     return typeAnnotation.delete();
   }
 
-  __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeAnnotation.__v_raw || typeAnnotation;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @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 {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除实际参数
    * @param argument 已有的实际参数实例
@@ -418,93 +397,6 @@ export class CallLogic extends LogicItem {
     return argument.delete();
   }
 
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @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 {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
-  /**
-   * 删除元素绑定属性
-   * @param name 元素绑定属性名称
-   */
-  removeValidation(name: string): void;
-
-  /**
-   * 删除元素绑定属性
-   * @param validation 已有的元素绑定属性实例
-   */
-  removeValidation(validation: BindAttribute): void;
-
-  removeValidation(options: string | BindAttribute) {
-    let validation: BindAttribute;
-    if (typeof options === 'string') {
-      validation = this.validation;
-      if (!validation) {
-        throw new Error('找不到元素绑定属性 ' + options);
-      }
-    } else {
-      validation = options;
-    }
-    return validation.delete();
-  }
-
-  __removeBindAttribute(bindAttribute: BindAttribute) {
-    const parentKey = bindAttribute.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: bindAttribute,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = bindAttribute.__v_raw || bindAttribute;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @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 {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -589,7 +481,6 @@ export class CallLogic extends LogicItem {
   }
 
   _setCallee(logic: Logic) {
-    const BaseNode = getBaseNode();
     this.calleeNamespace = logic.getNamespace();
     if (asserts.isView(logic.parentNode) || asserts.isBusinessComponent(logic.parentNode)) {
       this.calleeNamespace = '';
@@ -601,7 +492,8 @@ export class CallLogic extends LogicItem {
         keyword: param.name,
       });
       if (param.defaultExpression) {
-        const exp: any = BaseNode.from(param.defaultExpression.toJSON());
+        const Node = getConceptConstructor(param.defaultExpression.concept);
+        const exp: any = Node.from(param.defaultExpression.toJSON());
         argument.setExpression(exp);
       }
     });
@@ -613,7 +505,7 @@ export class CallLogic extends LogicItem {
     }
   }
 
-  setCallee(logic: Logic) {
+  setCallee(logic: Logic, argument?: Argument) {
     let calleeNamespace = logic?.getNamespace() || '';
     if (asserts.isView(logic.parentNode) || asserts.isBusinessComponent(logic.parentNode)) {
       calleeNamespace = '';
@@ -623,18 +515,20 @@ export class CallLogic extends LogicItem {
     const Identifier = getConceptConstructor('Identifier');
     const Argument = getConceptConstructor('Argument');
     const TypeAnnotation = getConceptConstructor('TypeAnnotation');
-    const params = logic?.params?.map((param) => {
-      const relationOptions = { parentNode: this, parentKey: 'arguments' };
-      const argument = Argument.from(
-        {
-          keyword: param.name,
-          expression: param.isFunction ? new Identifier() : param.defaultExpression,
-        },
-        this,
-      );
-      Object.assign(argument, relationOptions);
-      return argument;
-    });
+    const params =
+      argument ??
+      logic?.params?.map((param) => {
+        const relationOptions = { parentNode: this, parentKey: 'arguments' };
+        const argument = Argument.from(
+          {
+            keyword: param.name,
+            expression: param.isFunction ? new Identifier() : param.defaultExpression,
+          },
+          this,
+        );
+        Object.assign(argument, relationOptions);
+        return argument;
+      });
     let typeArguments = null;
     if (logic.typeParams) {
       typeArguments = logic.typeParams.map(() => {
@@ -748,6 +642,8 @@ export class CallLogic extends LogicItem {
   toVue(options?: ElementToVueOptions): string {
     const { completeArguments, calleeNamespace, calleeName, concept } = this;
 
+    let code = '';
+
     const setArguments = () => {
       code += '(';
       completeArguments.forEach((arg, index) => {
@@ -759,12 +655,10 @@ export class CallLogic extends LogicItem {
       code += ')';
     };
 
-    let code = '';
-
     if (concept === 'CallLogic') {
       const bindAttr = this.getAncestor('BindAttribute');
 
-      if (bindAttr?.name === 'data-source') {
+      if (['data-source', 'dataSource'].includes(bindAttr?.name)) {
         if (calleeNamespace) {
           const currentElement = this.getAncestor('ViewElement') as ViewElement;
           code += `__${currentElement.name}_dataSourceLoad`;
@@ -813,12 +707,13 @@ export class CallLogic extends LogicItem {
     if (concept === 'CallLogic') {
       const bindAttr = this.getAncestor('BindAttribute');
 
-      if (bindAttr?.name === 'data-source') {
+      if (bindAttr?.name === 'dataSource') {
         return this.calleeName;
       }
       if (calleeName === 'jsonSerialize') {
         return 'JSON 序列化';
-      } if (calleeName === 'jsonDeserialize') {
+      }
+      if (calleeName === 'jsonDeserialize') {
         return 'JSON 反序列化';
       }
     }
@@ -875,7 +770,11 @@ export class CallLogic extends LogicItem {
 
   toJS(state?: TranslatorState): string {
     let code = '';
-    code += 'await (';
+    if (this.getAncestor?.('DefaultValue')) {
+      code += '(';
+    } else {
+      code += 'await (';
+    }
     let refName = '';
     let extensionName = '';
 
@@ -906,8 +805,9 @@ export class CallLogic extends LogicItem {
       const args = logic?.params || [];
       const keywordEntitiesIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'entities');
 
-      code += `this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
-        }']`;
+      code += `this.$logics['${
+        this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
+      }']`;
       code += `({
                 config: {
                     download: false,
@@ -1199,7 +1099,8 @@ export class CallLogic extends LogicItem {
       typeKind = typeAn.typeKind;
       typeName = typeAn.typeName;
     }
-    const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
+    const needGenInitFromSchema =
+      typeAnnotation && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     if (needGenInitFromSchema) {
       code = `this.$genInitFromSchema('${sortedTypeKey}', ${code})`;
     }
@@ -1262,7 +1163,7 @@ export class CallLogic extends LogicItem {
       const paramRequired = ['showMessage', 'consoleLog', 'jsonDeserialize', 'jsonSerialize'].includes(calleeName);
       if (
         ['expression'].includes(parentKey) &&
-        self.getAncestor('BindAttribute')?.name === 'data-source' &&
+        self.getAncestor('BindAttribute')?.name === 'dataSource' &&
         (state as any)?.noNeedParams
       ) {
         return;
@@ -1281,7 +1182,7 @@ export class CallLogic extends LogicItem {
       } else if (completeArguments.length) {
         if (
           ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
+          self.getAncestor('BindAttribute')?.name === 'dataSource' &&
           (state as any)?.noNeedParams
         ) {
           return;
@@ -1296,7 +1197,7 @@ export class CallLogic extends LogicItem {
       } else {
         if (
           ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
+          self.getAncestor('BindAttribute')?.name === 'dataSource' &&
           (state as any)?.noNeedParams
         ) {
           return;
@@ -1335,7 +1236,7 @@ export class CallLogic extends LogicItem {
         code += ';';
       }
     };
-    if (useIife) {
+    if (!state.callLogicNoIife && useIife) {
       code += '(() =>{\nconst wrapper = ';
       if (handleError) {
         code += 'nasl.util.autoHandleError(';
@@ -1359,6 +1260,11 @@ export class CallLogic extends LogicItem {
       yield* setInputParam();
       code += ';\n})()';
     } else {
+      // 对__elements.下逻辑的处理
+      const isElementMethod = /__elements\..*/.test(calleeKey);
+      if (isElementMethod) {
+        code += `(() =>`;
+      }
       // 属于业务组件
       const belongBusinessComponent = !!this.businessComponent;
       if (belongBusinessComponent && !self.calleeNamespace) {
@@ -1367,6 +1273,10 @@ export class CallLogic extends LogicItem {
       code += calleeKey;
       yield* setTypeArguments();
       yield* setInputParam();
+
+      if (isElementMethod) {
+        code += `)()`;
+      }
     }
     setEndSemi();
     return code;
@@ -1504,6 +1414,15 @@ export class CallLogic extends LogicItem {
     } else if (this.calleeNamespace?.startsWith('nasl.')) {
       // 如果是页面组件
       node = getNaslNodeByNodeCallee(this.calleeNamespace, this.calleeName);
+    } else if (this.calleeNamespace?.startsWith('elements.')) {
+      // 查找组件的逻辑，用于展示默认值
+      const elementsLogic = (this.app as any)?.naslServer?.elementsLogic || {};
+      let elementName: string = this.calleeNamespace.split('.')[1];
+      // eslint-disable-next-line prefer-destructuring
+      elementName = elementName.split('_')[0];
+      elementName = elementName[0].toUpperCase() + elementName.slice(1);
+      const logics = elementsLogic[`U${elementName}`] || elementsLogic[`Van${elementName}`] || [];
+      node = logics.find((l: any) => l.name === this.calleeName);
     } else {
       // 如果是其余app下自定义逻辑
       try {
@@ -1521,7 +1440,7 @@ export class CallLogic extends LogicItem {
             state: Array.isArray(t) ? 2 : 1,
           };
         });
-      } catch (err) { }
+      } catch (err) {}
     }
     return node;
   }
@@ -1538,8 +1457,7 @@ export class CallLogic extends LogicItem {
         line: range.start.line + lineOffset + 1,
         offset: characterOffset,
       };
-    }
-    else {
+    } else {
       return getCallExpressionQuickInfo(range, getCode);
     }
   }