@lcap/nasl 3.7.3-beta.1 → 3.8.0-beta.2

package/src/concepts/EnumItem__.ts

@@ -8,8 +8,8 @@ import {
   TranslatorGenerator,
   indent,
   createDecoratorCode,
-  createDescriptionComment,
 } from '../translator';
+import type Namespace from './Namespace__';
 import Enum from './Enum__';
 import Module from './Module__';
 
@@ -106,62 +106,6 @@ export class EnumItem extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-  /**
-   * 删除静态字符串
-   * @param name 静态字符串名称
-   */
-  removeLabel(name: string): void;
-
-  /**
-   * 删除静态字符串
-   * @param label 已有的静态字符串实例
-   */
-  removeLabel(label: StaticString): void;
-
-  removeLabel(options: string | StaticString) {
-    let label: StaticString;
-    if (typeof options === 'string') {
-      label = this.label;
-      if (!label) {
-        throw new Error('找不到静态字符串 ' + options);
-      }
-    } else {
-      label = options;
-    }
-    return label.delete();
-  }
-
-  __removeStaticString(staticString: StaticString) {
-    const parentKey = staticString.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: staticString,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = staticString.__v_raw || staticString;
-      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;
-  }
-
   /**
    * 祖先 Enum
    */
@@ -186,6 +130,19 @@ export class EnumItem extends BaseNode {
    */
   isLeaf: boolean = true;
 
+  getNamespace() {
+    if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
+      const parentNamespace = (this.parentNode as Namespace).getNamespace();
+      const parentName = this.parentNode.name;
+      const arr = [parentNamespace];
+      if (this.parentNode.concept !== 'App' && parentName) {
+        arr.push(parentName);
+      }
+      return `${arr.join('.')}.structures`;
+    }
+    throw new Error('无法获取命名空间，请设置 parentNode！');
+  }
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
@@ -194,13 +151,7 @@ export class EnumItem extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = '';
-    
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['label']);
-    code += `'${this.value}' = '${this.label?.value}'`;
-
-    return code;
+    return `'${this.value}' = '${this.label?.value}'`;
   }
 
   @withSourceMap()
@@ -233,7 +184,7 @@ export class EnumItem extends BaseNode {
    * 设置枚举值标题
    */
   setLabelValue(label: string) {
-    this.label?.setValue?.(label);
+    (this.label as any)?.setValue?.(label);
   }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/EnumSelectSetter__.ts

@@ -44,6 +44,12 @@ export class EnumSelectSetter extends BaseSetter {
   })
   options: Array<SetterOption> = [];
 
+  /**
+   * 是否多选
+   */
+  @property()
+  multiple: boolean = false;
+
   /**
    * @param source 需要合并的部分参数
    */

package/src/concepts/Enum__.ts

@@ -10,7 +10,6 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
-  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 import type Identifier from './Identifier__';
@@ -318,11 +317,7 @@ export class Enum extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = '';
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['label', 'description']);
-
-    code += `enum ${this.name} {\n`;
+    let code = `enum ${this.name} {\n`;
     this.enumItems.forEach((item) => {
       code += indent(state.tabSize + 1);
       code += item.toNaturalTS(shiftState(state, code, { tabSize: 0 }));

package/src/concepts/ForEachStatement__.ts

@@ -472,7 +472,7 @@ export class ForEachStatement extends LogicItem {
     if (state?.focusedNodePath === `${this?.nodePath}.body[${this.body?.length}]`)
       code += `${indent((state?.tabSize || 0) + 1)}/* 当前位置 */\n`;
 
-    code += `${indent(state.tabSize)}}\n`;
+    code += `${indent(state.tabSize)}\n}\n`;
 
     return code;
   }

package/src/concepts/FrontendLibrary__.ts

@@ -13,7 +13,7 @@ import { createUUID } from '../utils/create';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import BaseNode from '../common/BaseNode';
-import Logic from './Logic__';
+import LogicDeclaration from './LogicDeclaration__';
 import ViewComponentDeclaration from './ViewComponentDeclaration__';
 
 /**
@@ -50,17 +50,23 @@ export class FrontendLibrary extends BaseNode {
   type: 'pc' | 'h5';
 
   /**
-   * 逻辑列表
+   * 框架标识
+   */
+  @property()
+  frameworkKind: 'react' | 'vue2' = 'vue2';
+
+  /**
+   * 依赖库逻辑声明列表
    */
   @property({
-    objectRef: 'Logic',
+    objectRef: 'LogicDeclaration',
     isArray: true,
     defaultValue: [],
   })
-  logics: Array<Logic> = [];
+  logics: Array<LogicDeclaration> = [];
 
   /**
-   * 页面组件列表
+   * 依赖库组件声明列表
    */
   @property({
     objectRef: 'ViewComponentDeclaration',
@@ -82,96 +88,98 @@ export class FrontendLibrary extends BaseNode {
     return super.from(source, parentNode, parentKey) as FrontendLibrary;
   }
 
-  getLogicExistingNames(excludedList: Array<Logic> = []) {
+  getLogicDeclarationExistingNames(excludedList: Array<LogicDeclaration> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.logics as LogicDeclaration[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-  getLogicUniqueName(name = 'logic1') {
-    return utils.unique(name, this.getLogicExistingNames(), undefined, true);
+  getLogicDeclarationUniqueName(name = 'logicDeclaration1') {
+    return utils.unique(name, this.getLogicDeclarationExistingNames(), undefined, true);
   }
 
   /**
-   * 插入逻辑
+   * 插入逻辑声明
    * @internal
-   * @param name 逻辑名称，如果不填会自动生成一个唯一名称
+   * @param name 逻辑声明名称，如果不填会自动生成一个唯一名称
    */
-  _insertLogicAt(name: string, index: number): Logic;
+  _insertLogicDeclarationAt(name: string, index: number): LogicDeclaration;
 
   /**
-   * 插入逻辑
+   * 插入逻辑声明
    * @internal
-   * @param logicOptions 逻辑参数
+   * @param logicDeclarationOptions 逻辑声明参数
    */
-  _insertLogicAt(logicOptions: Partial<Logic>, index: number): Logic;
+  _insertLogicDeclarationAt(logicDeclarationOptions: Partial<LogicDeclaration>, index: number): LogicDeclaration;
 
   /**
-   * 插入逻辑
+   * 插入逻辑声明
    * @internal
-   * @param logic 已有的逻辑实例
+   * @param logicDeclaration 已有的逻辑声明实例
    */
-  _insertLogicAt(logic: Logic, index: number): Logic;
+  _insertLogicDeclarationAt(logicDeclaration: LogicDeclaration, index: number): LogicDeclaration;
 
-  _insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
-    const logicOptions: any = {};
+  _insertLogicDeclarationAt(options: string | Partial<LogicDeclaration> | LogicDeclaration, index: number) {
+    const logicDeclarationOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'logics' };
-    const Logic = getConceptConstructor('Logic');
-    let logic: Logic;
+    const LogicDeclaration = getConceptConstructor('LogicDeclaration');
+    let logicDeclaration: LogicDeclaration;
     if (!options) {
-      logic = Logic.from(
+      logicDeclaration = LogicDeclaration.from(
         {
-          ...logicOptions,
-          name: this.getLogicUniqueName(),
+          ...logicDeclarationOptions,
+          name: this.getLogicDeclarationUniqueName(),
         },
         this,
         'logics',
       );
     } else if (typeof options === 'string') {
-      logic = Logic.from(
+      logicDeclaration = LogicDeclaration.from(
         {
-          ...logicOptions,
+          ...logicDeclarationOptions,
           name: options,
         },
         this,
         'logics',
       );
-    } else if (asserts.isLogic(options)) {
+    } else if (asserts.isLogicDeclaration(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
-      logic = options;
-      Object.assign(logic, relationOptions);
+      logicDeclaration = options;
+      Object.assign(logicDeclaration, relationOptions);
     } else {
-      logic = Logic.from(
+      logicDeclaration = LogicDeclaration.from(
         {
-          ...logicOptions,
+          ...logicDeclarationOptions,
           ...options,
         },
         this,
         'logics',
       );
     }
-    this.logics.splice(index, 0, logic);
-    return logic;
+    this.logics.splice(index, 0, logicDeclaration);
+    return logicDeclaration;
   }
 
   /**
-   * 插入逻辑
-   * @param name 逻辑名称，如果不填会自动生成一个唯一名称
+   * 插入逻辑声明
+   * @param name 逻辑声明名称，如果不填会自动生成一个唯一名称
    */
-  insertLogicAt(name: string, index: number): Logic;
+  insertLogicDeclarationAt(name: string, index: number): LogicDeclaration;
 
   /**
-   * 插入逻辑
-   * @param logicOptions 逻辑参数
+   * 插入逻辑声明
+   * @param logicDeclarationOptions 逻辑声明参数
    */
-  insertLogicAt(logicOptions: Partial<Logic>, index: number): Logic;
+  insertLogicDeclarationAt(logicDeclarationOptions: Partial<LogicDeclaration>, index: number): LogicDeclaration;
 
   /**
-   * 插入逻辑
-   * @param logic 已有的逻辑实例
+   * 插入逻辑声明
+   * @param logicDeclaration 已有的逻辑声明实例
    */
-  insertLogicAt(logic: Logic, index: number): Logic;
+  insertLogicDeclarationAt(logicDeclaration: LogicDeclaration, index: number): LogicDeclaration;
 
-  insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
-    const node = this._insertLogicAt(options as any, index);
+  insertLogicDeclarationAt(options: string | Partial<LogicDeclaration> | LogicDeclaration, index: number) {
+    const node = this._insertLogicDeclarationAt(options as any, index);
     node.create({
       index,
       parentNode: this,
@@ -181,52 +189,52 @@ export class FrontendLibrary extends BaseNode {
   }
 
   /**
-   * 添加逻辑
+   * 添加逻辑声明
    * @internal
-   * @param name 逻辑名称，如果不填会自动生成一个唯一名称
+   * @param name 逻辑声明名称，如果不填会自动生成一个唯一名称
    */
-  _addLogic(name?: string): Logic;
+  _addLogicDeclaration(name?: string): LogicDeclaration;
 
   /**
-   * 添加逻辑
+   * 添加逻辑声明
    * @internal
-   * @param logicOptions 逻辑参数
+   * @param logicDeclarationOptions 逻辑声明参数
    */
-  _addLogic(logicOptions: Partial<Logic>): Logic;
+  _addLogicDeclaration(logicDeclarationOptions: Partial<LogicDeclaration>): LogicDeclaration;
 
   /**
-   * 添加逻辑
+   * 添加逻辑声明
    * @internal
-   * @param logic 已有的逻辑实例
+   * @param logicDeclaration 已有的逻辑声明实例
    */
-  _addLogic(logic: Logic): Logic;
+  _addLogicDeclaration(logicDeclaration: LogicDeclaration): LogicDeclaration;
 
-  _addLogic(options?: string | Partial<Logic> | Logic) {
+  _addLogicDeclaration(options?: string | Partial<LogicDeclaration> | LogicDeclaration) {
     const index = this.logics.length;
-    return this._insertLogicAt(options as any, index);
+    return this._insertLogicDeclarationAt(options as any, index);
   }
 
   /**
-   * 添加逻辑
+   * 添加逻辑声明
    * @internal
-   * @param name 逻辑名称，如果不填会自动生成一个唯一名称
+   * @param name 逻辑声明名称，如果不填会自动生成一个唯一名称
    */
-  addLogic(name?: string): Logic;
+  addLogicDeclaration(name?: string): LogicDeclaration;
 
   /**
-   * 添加逻辑
-   * @param logicOptions 逻辑参数
+   * 添加逻辑声明
+   * @param logicDeclarationOptions 逻辑声明参数
    */
-  addLogic(logicOptions: Partial<Logic>): Logic;
+  addLogicDeclaration(logicDeclarationOptions: Partial<LogicDeclaration>): LogicDeclaration;
 
   /**
-   * 添加逻辑
-   * @param logic 已有的逻辑实例
+   * 添加逻辑声明
+   * @param logicDeclaration 已有的逻辑声明实例
    */
-  addLogic(logic: Logic): Logic;
+  addLogicDeclaration(logicDeclaration: LogicDeclaration): LogicDeclaration;
 
-  addLogic(options?: string | Partial<Logic> | Logic) {
-    const node = this._addLogic(options as any);
+  addLogicDeclaration(options?: string | Partial<LogicDeclaration> | LogicDeclaration) {
+    const node = this._addLogicDeclaration(options as any);
     const index = this.logics.indexOf(node);
     node.create({
       index,
@@ -415,28 +423,28 @@ export class FrontendLibrary extends BaseNode {
   }
 
   /**
-   * 删除逻辑
-   * @param name 逻辑名称
+   * 删除逻辑声明
+   * @param name 逻辑声明名称
    */
-  removeLogic(name: string): void;
+  removeLogicDeclaration(name: string): void;
 
   /**
-   * 删除逻辑
-   * @param logic 已有的逻辑实例
+   * 删除逻辑声明
+   * @param logicDeclaration 已有的逻辑声明实例
    */
-  removeLogic(logic: Logic): void;
+  removeLogicDeclaration(logicDeclaration: LogicDeclaration): void;
 
-  removeLogic(options: string | Logic) {
-    let logic: Logic;
+  removeLogicDeclaration(options: string | LogicDeclaration) {
+    let logicDeclaration: LogicDeclaration;
     if (typeof options === 'string') {
-      logic = (this.logics as Logic[]).find((item) => item.name === options);
-      if (!logic) {
-        throw new Error('找不到逻辑 ' + options);
+      logicDeclaration = (this.logics as LogicDeclaration[]).find((item) => item.name === options);
+      if (!logicDeclaration) {
+        throw new Error('找不到逻辑声明 ' + options);
       }
     } else {
-      logic = options;
+      logicDeclaration = options;
     }
-    return logic.delete();
+    return logicDeclaration.delete();
   }
 
   /**

package/src/concepts/FrontendType__.ts

@@ -82,6 +82,12 @@ export class FrontendType extends BaseNode {
   })
   componentDependencies: Array<Module> = [];
 
+  /**
+   * 框架语言标识
+   */
+  @property()
+  frameworkKind: 'vue2' | 'react' = 'vue2';
+
   /**
    * @param source 需要合并的部分参数
    */

package/src/concepts/Frontend__.ts

@@ -12,7 +12,7 @@ import {
 import type Namespace from './Namespace__';
 import { languageList } from '../utils/i18nInfo';
 import type BusinessComponent from './BusinessComponent__';
-import type FrontendType from './FrontendType__';
+import type { FrontendType } from './FrontendType__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -813,8 +813,23 @@ export class Frontend extends BaseNode {
   }
 
   genThemeCSS() {
-    const keys = Object.keys(this.theme?.variableMap || {});
-    if (!keys.length) return;
+    if (!this.theme) {
+      return
+    }
+    const { variableMap, scopeVariableMap } = this.theme;
+    const scopeKeys = Object.keys(scopeVariableMap || {});
+    const keys = Object.keys(variableMap || {});
+
+    if (!keys.length && !scopeKeys.length) {
+      return;
+    }
+
+    if (scopeKeys.length > 0) {
+      return scopeKeys.map((selector) => {
+        const varMap = scopeVariableMap[selector];
+        return `${selector} {${Object.keys(varMap).map((varName) => `${varName}:${varMap[varName]};`).join('')}}`;
+      }).join('\n');
+    }
 
     return `:root {
             ${keys.map((key) => `    ${key}: ${this.theme?.variableMap[key]};`).join('\n')}
@@ -886,6 +901,14 @@ export class Frontend extends BaseNode {
     };
   }
 
+  get frameworkKind(): FrontendType['frameworkKind'] {
+    const node = this.getAncestor('FrontendType');
+    if (asserts.isFrontendType(node)) {
+      return node.frameworkKind ?? 'vue2';
+    }
+    return 'vue2';
+  }
+
   getPath() {
     const { path } = this;
     const finalPath = path && path !== '/' ? path : '';

package/src/concepts/HistoryProcessV2__.ts

@@ -531,11 +531,16 @@ export class HistoryProcessV2 extends BaseNode {
 
     // 流程逻辑提示错误信息
     if (Array.isArray(self.bindEvents)) {
+      // 当前范围的变量声明
+      let variDeclCodeWithSelf = `let processSystem: nasl.processV2.ProcessVariable;\n`;
+      variDeclCodeWithSelf += 'let custom: typeof bindData;\n';
       yield* wrapForEach(self.bindEvents, function* warpForEachGenerator(event) {
         code += yield* event.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: state?.tabSize || 0,
           }),
+          false,
+          variDeclCodeWithSelf,
         );
         code += '\n';
       });

package/src/concepts/I18nInfo__.ts

@@ -92,11 +92,6 @@ export class I18nInfo extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-  @withSourceMap()
-  toNaturalTS(state = createCompilerState()): string {
-    return '';
-  }
-
   get messagesLanguageList() {
     return Object.keys(this.messageMap || {});
   }

package/src/concepts/Identifier__.ts

@@ -14,6 +14,8 @@ import { findConceptKeyWordByNamespace } from '../utils';
 import type View from './View__';
 import BusinessComponent from './BusinessComponent__';
 import FrontendType from './FrontendType__';
+import { getNodeByNodeCallee } from '../automate/engine/utils';
+import type Logic from './Logic__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -409,6 +411,36 @@ export class Identifier extends LogicItem {
     });
   }
 
+  // 如果绑定的是函数引用，通过内容过去节点
+  // 从 calllogic复制过来的，用于获取函数节点
+  // 因为这里只会出现全局逻辑的引用，所以先不考虑其他情况有的话 在逐步加
+  getFunctionCallNode(): Logic | undefined {
+    let node;
+    // 如果不是函数就return
+    if (!this.namespace || !this.namespace.endsWith('logics')) {
+      return node;
+    }
+    const calleewholeKey = `${this.namespace}.${this.name}`;
+    // 如果是其余app下自定义逻辑
+    try {
+      node = getNodeByNodeCallee(this.app, calleewholeKey, (key: any, tempPoint: any) => {
+        // 处理 NASL 中未定义的假的节点
+        if (key === tempPoint.name) {
+          return {
+            tempPoint,
+            state: 1,
+          };
+        }
+        const t = tempPoint[key];
+        return {
+          tempPoint: t,
+          state: Array.isArray(t) ? 2 : 1,
+        };
+      });
+    } catch (err) {}
+    return node;
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/IfStatement__.ts

@@ -468,7 +468,7 @@ export class IfStatement extends LogicItem {
     });
     if (state.focusedNodePath === `${this.nodePath}.alternate[${this.alternate.length}]`)
       code += `${indent((state?.tabSize || 0) + 1)}/* 当前位置 */\n`;
-    code += `${indent(state?.tabSize || 0)}}`;
+    code += `${indent(state?.tabSize || 0)}}\n`;
     return code;
   }
 
@@ -506,7 +506,7 @@ export class IfStatement extends LogicItem {
     });
     if (state.focusedNodePath === `${this.nodePath}.alternate[${this.alternate.length}]`)
       code += `${indent((state?.tabSize || 0) + 1)}/* 当前位置 */\n`;
-    code += `${indent(state?.tabSize || 0)}}`;
+    code += `${indent(state?.tabSize || 0)}}\n`;
     return code;
   }
 

package/src/concepts/Interface__.ts

@@ -9,7 +9,6 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
-  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 import type TypeAnnotation from './TypeAnnotation__';
@@ -979,11 +978,7 @@ export class Interface extends ImportedInterface {
   @withSourceMap()
   toNaturalTS(state = createCompilerState(), interfaceName: string): string {
     const { name, params, returns } = this || {};
-
-    let code = '';
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['description']);
-    code = `declare function ${interfaceName || name}(`;
+    let code = `declare function ${interfaceName || name}(`;
     if (params?.length) {
       code += '{';
       params?.forEach((param, index) => {

package/src/concepts/LogicItem__.ts

@@ -57,6 +57,7 @@ export abstract class LogicItem extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!:
+    | 'SubLogic'
     | 'AnonymousFunction'
     | 'Abort'
     | 'Start'