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

package/src/concepts/WhileStatement__.ts

@@ -1,54 +1,59 @@
-import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
 
 /**
  * While 循环分支
  */
+@className
 @concept('While 循环分支')
+// @ts-ignore
 export class WhileStatement extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'WhileStatement';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'WhileStatement' = 'WhileStatement';
+  // @ts-ignore
+  readonly concept!: 'WhileStatement';
 
   /**
    * 条件表达式
    */
-  @property('LogicItem')
-  test: LogicItem = undefined;
+  @property({
+    objectRef: 'LogicItem',
+  })
+  // @ts-ignore
+  test!: LogicItem;
 
   /**
    * 循环体
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   body: Array<LogicItem> = [];
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<WhileStatement>) {
-    // @ts-ignore
-    source = { ...WhileStatement.getDefaultOptions(), ...source };
+    source = Object.assign({}, WhileStatement.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'WhileStatement';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): WhileStatement {
     return super.from(source, parentNode, parentKey) as WhileStatement;
   }
@@ -97,7 +102,7 @@ export class WhileStatement extends LogicItem {
           ...options,
         },
         this,
-        'body'
+        'body',
       );
     }
     this.body.splice(index, 0, logicItem);
@@ -185,7 +190,7 @@ export class WhileStatement extends LogicItem {
     if (typeof options === 'string') {
       test = this.test;
       if (!test) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       test = options;
@@ -200,12 +205,12 @@ export class WhileStatement extends LogicItem {
   removeItemInBody(logicItem: LogicItem): void;
 
   removeItemInBody(options: LogicItem) {
-    const logicItem: LogicItem = options;
+    let logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -227,10 +232,10 @@ export class WhileStatement extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   public static getDefaultOptions() {
     return {
       label: 'While 循环分支',
@@ -242,10 +247,10 @@ export class WhileStatement extends LogicItem {
     code += 'while (';
     code += this.test
       ? this.test.toJS(
-        shiftState(state, code, {
-          tabSize: 0,
-        })
-      )
+          shiftState(state, code, {
+            tabSize: 0,
+          }),
+        )
       : '';
     code += ') {\n';
 
@@ -254,7 +259,7 @@ export class WhileStatement extends LogicItem {
         code += `${logicItem.toJS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 1,
-          })
+          }),
         )}\n`;
       });
     }
@@ -269,10 +274,10 @@ export class WhileStatement extends LogicItem {
     code += 'while (nasl.core.ensureBoolean(';
     code += this.test
       ? this.test.toEmbeddedTS(
-        shiftState(state, code, {
-          tabSize: 0,
-        })
-      )
+          shiftState(state, code, {
+            tabSize: 0,
+          }),
+        )
       : '__IDENTIFIER__';
     code += ')) {\n';
 
@@ -281,7 +286,7 @@ export class WhileStatement extends LogicItem {
         code += `${logicItem.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 1,
-          })
+          }),
         )};\n`;
       });
     }
@@ -314,12 +319,11 @@ export class WhileStatement extends LogicItem {
   //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.WhileStatement = WhileStatement;
 export default WhileStatement;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/index__.ts

@@ -12,7 +12,6 @@ export * from './Structure__';
 export * from './StructureProperty__';
 export * from './Enum__';
 export * from './EnumItem__';
-export * from './DataElement__';
 export * from './DataSource__';
 export * from './Entity__';
 export * from './EntityProperty__';

package/src/concepts/types__.ts

@@ -12,7 +12,6 @@ import type { Structure } from './Structure__';
 import type { StructureProperty } from './StructureProperty__';
 import type { Enum } from './Enum__';
 import type { EnumItem } from './EnumItem__';
-import type { DataElement } from './DataElement__';
 import type { DataSource } from './DataSource__';
 import type { Entity } from './Entity__';
 import type { EntityProperty } from './EntityProperty__';
@@ -121,128 +120,127 @@ import type { Connector } from './Connector__';
 import type { CallConnector } from './CallConnector__';
 import type { Connection } from './Connection__';
 
-export type SynatxNode =
-  | App
-  | Module
-  | Namespace
-  | Frontend
-  | Backend
-  | Integration
-  | MicroApp
-  | TypeAnnotation
-  | DatabaseTypeAnnotation
-  | TypeParam
-  | Structure
-  | StructureProperty
-  | Enum
-  | EnumItem
-  | DataElement
-  | DataSource
-  | Entity
-  | EntityProperty
-  | EntityIndex
-  | View
-  | ViewElement
-  | BindAttribute
-  | BindDirective
-  | BindEvent
-  | BindStyle
-  | ViewComponent
-  | Attribute
-  | Event
-  | Slot
-  | Theme
-  | Logic
-  | AuthLogic
-  | AuthLogicForCallInterface
-  | OverriddenLogic
-  | Param
-  | Return
-  | Variable
-  | BackendVariable
-  | FrontendVariable
-  | Constant
-  | Function
-  | AnonymousFunction
-  | Interface
-  | InterfaceParam
-  | Transactional
-  | Abort
-  | Start
-  | End
-  | IfStatement
-  | SwitchStatement
-  | SwitchCase
-  | ForEachStatement
-  | WhileStatement
-  | Assignment
-  | BatchAssignment
-  | Comment
-  | CallLogic
-  | CallFunction
-  | CallInterface
-  | Destination
-  | ExternalDestination
-  | ValidationRule
-  | Argument
-  | Anchor
-  | JSBlock
-  | JavaLogic
-  | Identifier
-  | NullLiteral
-  | BooleanLiteral
-  | StringLiteral
-  | StringInterpolation
-  | NumericLiteral
-  | BinaryExpression
-  | MatchCase
-  | Match
-  | UnaryExpression
-  | MemberExpression
-  | Unparsed
-  | New
-  | NewComposite
-  | NewList
-  | NewMap
-  | CallQueryComponent
-  | QueryFromExpression
-  | QueryJoinExpression
-  | QueryFieldExpression
-  | QueryAggregateExpression
-  | QueryOrderByExpression
-  | QueryGroupByExpression
-  | QuerySelectExpression
-  | QueryLimitExpression
-  | SqlQueryComponent
-  | OqlQueryComponent
-  | Process
-  | ProcessElement
-  | ProcessComponent
-  | ProcessOutcome
-  | Assignee
-  | ProcessOutcomes
-  | Role
-  | Configuration
-  | ConfigGroup
-  | ConfigProperty
-  | ConfigPropertyValue
-  | CompletionProperty
-  | UseComponent
-  | Point
-  | Rect
-  | SelectMembers
-  | AssignmentLine
-  | FrontendLibrary
-  | ViewBlock
-  | AuthInterface
-  | CallAuthInterface
-  | TriggerEvent
-  | MsgTriggerEvent
-  | ConnectorTrigger
-  | TriggerLauncher
-  | MsgTriggerLauncher
-  | Connector
-  | CallConnector
-  | Connection;
+export type SyntaxNode =
+    | App
+    | Module
+    | Namespace
+    | Frontend
+    | Backend
+    | Integration
+    | MicroApp
+    | TypeAnnotation
+    | DatabaseTypeAnnotation
+    | TypeParam
+    | Structure
+    | StructureProperty
+    | Enum
+    | EnumItem
+    | DataSource
+    | Entity
+    | EntityProperty
+    | EntityIndex
+    | View
+    | ViewElement
+    | BindAttribute
+    | BindDirective
+    | BindEvent
+    | BindStyle
+    | ViewComponent
+    | Attribute
+    | Event
+    | Slot
+    | Theme
+    | Logic
+    | AuthLogic
+    | AuthLogicForCallInterface
+    | OverriddenLogic
+    | Param
+    | Return
+    | Variable
+    | BackendVariable
+    | FrontendVariable
+    | Constant
+    | Function
+    | AnonymousFunction
+    | Interface
+    | InterfaceParam
+    | Transactional
+    | Abort
+    | Start
+    | End
+    | IfStatement
+    | SwitchStatement
+    | SwitchCase
+    | ForEachStatement
+    | WhileStatement
+    | Assignment
+    | BatchAssignment
+    | Comment
+    | CallLogic
+    | CallFunction
+    | CallInterface
+    | Destination
+    | ExternalDestination
+    | ValidationRule
+    | Argument
+    | Anchor
+    | JSBlock
+    | JavaLogic
+    | Identifier
+    | NullLiteral
+    | BooleanLiteral
+    | StringLiteral
+    | StringInterpolation
+    | NumericLiteral
+    | BinaryExpression
+    | MatchCase
+    | Match
+    | UnaryExpression
+    | MemberExpression
+    | Unparsed
+    | New
+    | NewComposite
+    | NewList
+    | NewMap
+    | CallQueryComponent
+    | QueryFromExpression
+    | QueryJoinExpression
+    | QueryFieldExpression
+    | QueryAggregateExpression
+    | QueryOrderByExpression
+    | QueryGroupByExpression
+    | QuerySelectExpression
+    | QueryLimitExpression
+    | SqlQueryComponent
+    | OqlQueryComponent
+    | Process
+    | ProcessElement
+    | ProcessComponent
+    | ProcessOutcome
+    | Assignee
+    | ProcessOutcomes
+    | Role
+    | Configuration
+    | ConfigGroup
+    | ConfigProperty
+    | ConfigPropertyValue
+    | CompletionProperty
+    | UseComponent
+    | Point
+    | Rect
+    | SelectMembers
+    | AssignmentLine
+    | FrontendLibrary
+    | ViewBlock
+    | AuthInterface
+    | CallAuthInterface
+    | TriggerEvent
+    | MsgTriggerEvent
+    | ConnectorTrigger
+    | TriggerLauncher
+    | MsgTriggerLauncher
+    | Connector
+    | CallConnector
+    | Connection;
 
-export type SynatxNodeConcept = SynatxNode['concept'];
+export type SyntaxNodeConcept = SyntaxNode['concept'];

package/src/decorators/index.ts

@@ -1,5 +1,5 @@
 import BaseNode from '../common/BaseNode';
-import type { SynatxNode, SynatxNodeConcept } from '../concepts';
+import type { SyntaxNode, SyntaxNodeConcept } from '../concepts';
 
 export * from './promise';
 
@@ -23,8 +23,12 @@ type conceptMeta = {
 
 type ConceptMap = Map<string, conceptMeta>;
 
-//
 export const conceptMap: ConceptMap = new Map();
+export const classMap = new Map<string, { new (...args: any[]): any }>;
+
+export function className(target: any) {
+  classMap.set(target.ConceptName, target);
+}
 
 export function getConceptMeta(concept: string): conceptMeta {
   let conceptMeta: conceptMeta = conceptMap.get(concept);
@@ -63,18 +67,19 @@ export function getConceptPropertyMap(concept: string) {
 export function concept(nodeTitle: string) {
   return (target: any) => {
     target.nodeTitle = nodeTitle;
-    const metaMap = getConceptMeta(target.prototype.getClassName() || target.name);
+    const metaMap = getConceptMeta(target.ConceptName ?? target.name);
     metaMap.constructor = target;
   };
 }
 
-export function property(objectRef?: string) {
-  return function handle(target: SynatxNode | BaseNode, key: string) {
-    const { constructor } = target;
-    const metaMap = getConceptPropertyMap(target.getClassName() || constructor.name);
-    const prototypeConstructor = Object.getPrototypeOf(target).constructor;
-    if (prototypeConstructor) {
-      const prototypeMetaMap = getConceptPropertyMap(Object.getPrototypeOf(target).getClassName() || prototypeConstructor.name);
+export function property(params?: any) {
+  const { objectRef, isArray } = params || {};
+  return function handle(target: SyntaxNode | BaseNode, key: string) {
+    const metaMap = getConceptPropertyMap(target.concept ?? target.constructor.name);
+    const prototypeTarget = Object.getPrototypeOf(target);
+    const prototypeConstructor = prototypeTarget.constructor;
+    if (prototypeTarget && prototypeConstructor) {
+      const prototypeMetaMap = getConceptPropertyMap(prototypeTarget.concept ?? prototypeConstructor.name);
       prototypeMetaMap.forEach((prototypeMeta, key: string) => {
         metaMap.set(key, prototypeMeta);
       });
@@ -82,14 +87,15 @@ export function property(objectRef?: string) {
     metaMap.set(key, {
       key,
       objectRef,
+      isArray,
     });
   };
 }
 
-export function ancestor(concept: SynatxNodeConcept) {
+export function ancestor(concept: SyntaxNodeConcept) {
   return function handle(target: any, key: string, descriptor: PropertyDescriptor) {
     descriptor.get = function () {
-      return (this as SynatxNode).getAncestor(concept);
+      return (this as SyntaxNode).getAncestor(concept);
     };
   };
 }

package/src/generator/genBundleFiles.ts

@@ -1,9 +1,10 @@
 import * as JSON5 from 'json5';
 import * as UglifyJS from 'uglify-js-export';
+import * as utils from '../utils';
+
 import { genBreakpoints, clearBreakpoints } from '../breakpoint';
 
 import { App, Module, View, Frontend, Connector } from '../concepts';
-import * as utils from '../utils';
 import { genHash, RawOptions } from '.';
 import { compileComponent } from './compileComponent';
 
@@ -371,7 +372,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
          * 2. 回退时，顶层同步到 iframe，经测试，即便在 iframe 里调用 back 也会先触发顶层回退
          * 3. 前进时，iframe 同步到顶层
          * 原因：顶层永远在 iframe 后面
-        */ 
+        */
         // 自增ID，用于判断路由是否回退
         let incrementID = 0;
         // 当前历史ID，用于判断路由是否回退
@@ -558,6 +559,15 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   return outputs;
 }
 
-export function genFrontendBundleFiles(app: App, frontends: Array<Frontend>, config: Config) {
-  return frontends.map((frontend) => genBundleFiles(app, frontend, config)).reduce((ans, item) => (ans.push(...item), ans), []);
+export async function genFrontendBundleFiles(app: App, frontends: Array<Frontend>, config: Config) {
+  const result: ReturnType<typeof genBundleFiles> = [];
+
+  // 这里逐个处理并且中间还要等待，是为了腾出时间给主线程做垃圾回收
+  for (const frontend of frontends) {
+      const data = await genBundleFiles(app, frontend, config);
+      result.push(...data);
+      await utils.delay(1000);
+  }
+
+  return result;
 }