@lcap/nasl 3.8.0-beta.3 → 3.8.0-beta.5

package/src/concepts/ProcessElement__.ts

@@ -21,6 +21,7 @@ import type Namespace from './Namespace__';
 import type View from './View__';
 import Process from './Process__';
 import Module from './Module__';
+import type SubLogic from './SubLogic__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -1476,6 +1477,9 @@ export class ProcessElement extends BaseNode {
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
+    // 获取所有子节点用于树上填充
+    self.getSubLogics();
+
     // this.syncLogic();
     const tab0 = indent(state?.tabSize || 0);
     const tab1 = indent((state?.tabSize || 0) + 1);
@@ -1723,22 +1727,18 @@ export class ProcessElement extends BaseNode {
   //     });
   //     this.app.emit('collect:end');
   // }
-  get subLogic() {
-    // 只有自动任务需要， 其他的UI展示上均在其下面的 Logic 中
-    if (this.type === 'ServiceTask') {
-      const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
-        if (asserts.isSubLogic(node)) {
-          return true;
-        }
-      });
-      return subLogics;
-    }
-    return [];
-  }
-
-  genActionListener($event: EventPayload): void {
-    super.genActionListener($event);
-    invokeCommand('logic.update', this);
+  subLogics: Array<SubLogic> = [];
+
+  getSubLogics() {
+    // 只有 AutoTask 才需要在他的节点下找子逻辑
+    // 其他直接在 BindEvent 下找
+    if (this.type !== 'AutoTask') return [] as SubLogic[];
+    const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
+      if (asserts.isSubLogic(node)) {
+        return true;
+      }
+    });
+    this.subLogics = subLogics as Array<SubLogic>;
   }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/ProcessV2__.ts

@@ -8,6 +8,10 @@ import Logic from './Logic__';
 import Entity from './Entity__';
 import { genLaunchProcess, genProcessOperate } from '../server/getProcessesV2';
 import { createUniqueKey } from '../utils/create';
+import type SubLogic from './SubLogic__';
+import type Param from './Param__';
+
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -24,7 +28,6 @@ import ProcessElementV2 from './ProcessElementV2__';
 import HistoryProcessV2 from './HistoryProcessV2__';
 import ProcessBindV2 from './ProcessBindV2__';
 import BindEvent from './BindEvent__';
-
 /**
  * 流程
  */
@@ -820,6 +823,8 @@ export class ProcessV2 extends BaseNode {
     // 获取虚拟logic的参数和内容
     // 用作展示和tots查找引用
     self.getElementLogicRoot();
+    // 获取所有子节点用于树上填充
+    self.getSubLogics();
     const tab1 = indent((state?.tabSize || 0) + 1);
     let code = `export namespace ${self.uniqueKey} {\n`;
     const bind = self.bind;
@@ -960,7 +965,7 @@ export class ProcessV2 extends BaseNode {
           bounds: {
             concept: 'Rect',
             x: 0,
-            y: 0,
+            y: 200,
           },
           bindAttrs: [
             {
@@ -1019,7 +1024,7 @@ export class ProcessV2 extends BaseNode {
           bounds: {
             concept: 'Rect',
             x: 0,
-            y: 500,
+            y: 400,
           },
         },
         {
@@ -1037,6 +1042,37 @@ export class ProcessV2 extends BaseNode {
     };
   }
 
+  // TODO need reset when process support hoc & spread param & type annotation
+  subLogics: Array<SubLogic> = [];
+
+  getSubLogics() {
+    const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
+      if (asserts.isSubLogic(node)) {
+        return true;
+      }
+    });
+    this.subLogics = subLogics as Array<SubLogic>;
+  }
+
+
+  get includeSpreadCallLogic() {
+    return !!this.findNode((node) => {
+      if (asserts.isCallLogic(node)) {
+        const logic = node.getCallNode();
+        const args = logic?.params || [];
+        return args.some((arg: Param) => arg.spread);
+      }
+    });
+  }
+
+  get includeTypeArgs() {
+    return !!this.findNode((node) => {
+      if (asserts.isCallLogic(node)) {
+        return (node?.needCompleteTypeArguments?.length || 0) > 0;
+      }
+    });
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Process__.ts

@@ -17,6 +17,8 @@ import type Logic from './Logic__';
 import type Variable from './Variable__';
 import type Identifier from './Identifier__';
 import Module from './Module__';
+import type SubLogic from './SubLogic__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -1220,6 +1222,9 @@ export class Process extends BaseNode {
     // 获取虚拟logic的参数和内容
     // 用作展示和tots查找引用
     self.getElementLogicRoot();
+    // 获取所有子节点用于树上填充
+    self.getSubLogics();
+
     let code = `export namespace ${self.name} {\n`;
     const tab0 = indent(state?.tabSize || 0);
     const tab1 = indent((state?.tabSize || 0) + 1);
@@ -1487,6 +1492,37 @@ export class Process extends BaseNode {
       ],
     };
   }
+
+  // TODO need reset when process support hoc & spread param & type annotation
+  subLogics: Array<SubLogic> = [];
+
+  getSubLogics() {
+    const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
+      if (asserts.isSubLogic(node)) {
+        return true;
+      }
+    });
+    this.subLogics = subLogics as Array<SubLogic>;
+  }
+
+
+  get includeSpreadCallLogic() {
+    return !!this.findNode((node) => {
+      if (asserts.isCallLogic(node)) {
+        const logic = node.getCallNode();
+        const args = logic?.params || [];
+        return args.some((arg: Param) => arg.spread);
+      }
+    });
+  }
+
+  get includeTypeArgs() {
+    return !!this.findNode((node) => {
+      if (asserts.isCallLogic(node)) {
+        return (node?.needCompleteTypeArguments?.length || 0) > 0;
+      }
+    });
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/QueryFromExpression__.ts

@@ -262,12 +262,12 @@ export class QueryFromExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const simpleEntityKey = this.entityName + 'Entity';
+    const simpleEntityKey = this.entityKey + 'Entity';
     let code = `FROM(${simpleEntityKey}, ${this.asName || this.entityName} => $`;
 
     if (this.joinParts.length) {
       this.joinParts.forEach((joinPart) => {
-        code += '\n';
+        code += `\n${indent(state.tabSize)}`;
         code += joinPart.toNaturalTS(state);
       });
     }

package/src/concepts/QueryJoinExpression__.ts

@@ -466,7 +466,7 @@ export class QueryJoinExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const simpleEntityKey = this.entityName + 'Entity';
+    const simpleEntityKey = this.entityKey + 'Entity';
     let code = `.${this.joinType}_JOIN(${simpleEntityKey}, ${this.asName || this.entityName} => ON(() => `;
     this.onExpressions.forEach((on) => {
       code += on.toNaturalTS(shiftState(state, code, { inline: true }));
@@ -475,7 +475,7 @@ export class QueryJoinExpression extends LogicItem {
 
     if (this.joinParts.length) {
       this.joinParts.forEach((joinPart) => {
-        code += '\n';
+        code += `\n${indent(state.tabSize)}`;
         code += joinPart.toNaturalTS(state);
       });
     }

package/src/concepts/Return__.ts

@@ -372,7 +372,8 @@ export class Return extends BaseNode {
   get __isVirtual() {
     const processV2 = this.getAncestor('ProcessV2') as ProcessV2;
     const process = this.getAncestor('Process') as Process;
-    return processV2?.__isVirtual || process?.__isVirtual || false;
+    const isDisabled = !!this.getAncestor('HistoryProcessV2') || ['enabled', 'history'].includes(processV2?.status)
+    return isDisabled || process?.__isVirtual || false;
   }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/StaticString__.ts

@@ -65,6 +65,18 @@ export class StaticString extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+
+  /**
+   * 设置字符串的值
+   */
+  setValue(value: string) {
+    const object = {
+      value,
+    };
+    this.update({
+      ...object,
+    });
+  }
   /**
    * 祖先 View
    */

package/src/concepts/StructureProperty__.ts

@@ -9,6 +9,7 @@ import {
   TranslatorGenerator,
   indent,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 
@@ -203,7 +204,11 @@ export class StructureProperty extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = this.name;
+    let code = '';
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['label', 'description']);
+    
+    code += this.name;
     if (this.typeAnnotation) {
       code += ': ';
       code += this.typeAnnotation.toNaturalTS(shiftState(state, code, { inline: true }));
@@ -300,7 +305,7 @@ export class StructureProperty extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || (this.parentNode as Structure).origin === 'CallQueryComponent' || this.isConnector;
+    return !!this.module || this.isConnector;
   }
 
   //================================================================================

package/src/concepts/Structure__.ts

@@ -10,6 +10,7 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
+  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
@@ -523,7 +524,7 @@ export class Structure extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || this.origin === 'CallQueryComponent' || this.isConnector;
+    return !!this.module || this.isConnector;
   }
 
   /* 删除空数据模块 */
@@ -561,7 +562,10 @@ export class Structure extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = `class ${this.name}`;
+    let code = '';
+    if (state.descriptionComment)
+      code += createDescriptionComment(state, this, ['description']);
+    code = `class ${this.name}`;
 
     if (this.typeParams?.length) {
       code += `<${this.typeParams
@@ -569,7 +573,11 @@ export class Structure extends BaseNode {
         .join(', ')}>`;
     }
 
-    code += ` {\n`;
+    code += ` {`;
+    if (state.descriptionComment && this.description)
+      code += `/* ${this.description} */`;
+    code += '\n';
+
     // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
     this.properties.forEach((property) => {
       code += indent(state.tabSize + 1);

package/src/concepts/SubLogic__.ts

@@ -923,9 +923,9 @@ export class SubLogic extends LogicItem {
 
   completionChildren: Array<SubLogic> = [];
 
-  getVarExistingNames(excludedList: Array<Param> = []) {
+  getVarExistingNames(excludedList: Array<Param | Variable | Return> = []) {
     const excludedSet = new Set(excludedList);
-    return [...this.params].filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return [...this.params, ...this.variables, ...this.returns].filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
 
   toJSContent(code: string, state?: TranslatorState): string {
@@ -1030,6 +1030,10 @@ export class SubLogic extends LogicItem {
       const calleeLogic = this.app.logics.find((l) => l.name === calleeName);
       return calleeLogic ? `app.logics.${calleeName}(${calleeLogic.params.map(() => 'null').join(',')})` : null;
     }
+    // 调用依赖库逻辑可能会有子逻辑，子逻辑拼接可能有ts忽略先去掉
+    if (asserts.isCallLogic(rightNode) && rightNode.calleeNamespace?.startsWith('extensions.')) {
+      code = code.replaceAll('// @ts-ignore', '');
+    }
 
     // ForEachStatement 内部变量需要替换处理，如 item、index
     const forEachStatement = assignment.getAncestor('ForEachStatement') as ForEachStatement;
@@ -1040,7 +1044,9 @@ export class SubLogic extends LogicItem {
     const callFunction = assignment.getAncestor('CallFunction') as CallFunction;
     if (callFunction && callFunction.isLoopCollection) {
       const anonymousFunction = assignment.getAncestor('AnonymousFunction') as AnonymousFunction;
-      code = yield* this.handleCollectionCode(code, anonymousFunction, callFunction);
+      if (anonymousFunction) {
+        code = yield* this.handleCollectionCode(code, anonymousFunction, callFunction);
+      }
     }
     // Match 需要针对分支缩小类型范围
     const matchCase = assignment.getAncestor('MatchCase') as MatchCase;
@@ -1099,7 +1105,9 @@ export class SubLogic extends LogicItem {
     const parentCallFunction = callFunction.getAncestor('CallFunction') as CallFunction;
     if (parentCallFunction?.isLoopCollection) {
       const parentAnonymousFunction = callFunction.getAncestor('AnonymousFunction') as AnonymousFunction;
-      code = yield* this.handleCollectionCode(code, parentAnonymousFunction, parentCallFunction);
+      if (parentAnonymousFunction) {
+        code = yield* this.handleCollectionCode(code, parentAnonymousFunction, parentCallFunction);
+      }
     }
     return code;
   }
@@ -1183,6 +1191,9 @@ export class SubLogic extends LogicItem {
           // 内置函数对集合类型的推导
           (asserts.isCallFunction(el) && el.derivablecollection?.name))
       ) {
+        if (el?.getAncestor('SubLogic') !== self) {
+          return;
+        }
         if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
             (variable) => !variable.typeAnnotation && el.left?.name === variable.name,
@@ -1493,11 +1504,6 @@ export class SubLogic extends LogicItem {
     this.subLogics = subLogics as SubLogic[];
   }
 
-  genActionListener($event: EventPayload): void {
-    super.genActionListener($event);
-    invokeCommand('logic.update', this);
-  }
-
   // 用于展示的名称
   get __name__() {
     const callLogic = this.getAncestor('CallLogic') as CallLogic;

package/src/concepts/Transactional__.ts

@@ -111,6 +111,11 @@ export class Transactional extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    return '';
+  }
+
   /**
    * 祖先 Logic
    */

package/src/concepts/TypeParam__.ts

@@ -48,6 +48,12 @@ export class TypeParam extends BaseNode {
   @property()
   name: string = '';
 
+  /**
+   * 展示名称
+   */
+  @property()
+  displayName?: string;
+
   /**
    * @param source 需要合并的部分参数
    */

package/src/concepts/ValidationRule__.ts

@@ -270,12 +270,7 @@ export class ValidationRule extends LogicItem {
   //================================================================================
 
   public static getDefaultOptions() {
-    return {
-      target: {
-        concept: 'Identifier',
-        name: '',
-      },
-    };
+    return {};
   }
 
   toInViewMethod() {
@@ -287,6 +282,8 @@ export class ValidationRule extends LogicItem {
       code += `validate: 'excluded',`;
     } else if (this.calleeName === 'confirmed') {
       code += `validate: 'is',`;
+    } else if (this.calleeName === 'object') {
+      code += `validate: 'plainObject',`;
     } else {
       code += `validate: '${this.calleeName}',`;
     }
@@ -337,6 +334,8 @@ export class ValidationRule extends LogicItem {
       code += `validate: 'excluded',`;
     } else if (this.calleeName === 'confirmed') {
       code += `validate: 'is',`;
+    } else if (this.calleeName === 'object') {
+      code += `validate: 'plainObject',`;
     } else {
       code += `validate: '${this.calleeName}',`;
     }
@@ -547,6 +546,8 @@ export class ValidationRule extends LogicItem {
       const argument = Argument.from(
         {
           keyword: param.name,
+          expression: param.defaultValue?.expression,
+          required: param.required,
         },
         this,
       );

package/src/concepts/Variable__.ts

@@ -208,7 +208,8 @@ export class Variable extends BaseNode {
   get __isVirtual() {
     const processV2 = this.getAncestor('ProcessV2') as ProcessV2;
     const process = this.getAncestor('Process') as Process;
-    return processV2?.__isVirtual || process?.__isVirtual || false;
+    const isDisabled = !!this.getAncestor('HistoryProcessV2') || ['enabled', 'history'].includes(processV2?.status)
+    return isDisabled || process?.__isVirtual || false;
   }
 
   toVue(options?: ElementToVueOptions): string {
@@ -465,7 +466,11 @@ export class Variable extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module;
+    // 不在可编辑态的连接器下
+    const isInConnector = this.connector;
+    const isInIntegration = this.getAncestor('Integration');
+    const isInEditableConnector = isInIntegration && isInConnector;
+    return !!(this.module && !isInEditableConnector);
   }
 
   //================================================================================