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

package/src/concepts/NewMap__.ts

@@ -10,33 +10,32 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
-import ForEachStatement from './ForEachStatement__';
-import Logic from './Logic__';
+import type ForEachStatement from './ForEachStatement__';
+import type Logic from './Logic__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } 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 BaseNode from '../common/BaseNode';
-import TypeAnnotation from './TypeAnnotation__';
 import LogicItem from './LogicItem__';
+import type TypeAnnotation from './TypeAnnotation__';
 
 /**
  * Map 构造器
  */
-@className
 @concept('Map 构造器')
-// @ts-ignore
 export class NewMap extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'NewMap';
+  static readonly ConceptName: string = 'NewMap';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -51,7 +50,6 @@ export class NewMap extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -158,6 +156,7 @@ export class NewMap extends LogicItem {
   _insertItemInKeysAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'keys' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
     if (!options) {
       logicItem = LogicItem.from(
@@ -177,7 +176,7 @@ export class NewMap extends LogicItem {
         this,
         'keys',
       );
-    } else if (options instanceof LogicItem) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -303,6 +302,7 @@ export class NewMap extends LogicItem {
   _insertItemInValuesAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'values' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
     if (!options) {
       logicItem = LogicItem.from(
@@ -322,7 +322,7 @@ export class NewMap extends LogicItem {
         this,
         'values',
       );
-    } else if (options instanceof LogicItem) {
+    } else if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -634,9 +634,9 @@ export class NewMap extends LogicItem {
       const key: any = item;
       const value: any = this.values[index];
       code += `k = `;
-      code += `${key ? key.toJS(shiftState(state, code, { inline: true })) : undefined};\n`;
+      code += `${key ? key.toJS(state) : undefined};\n`;
       code += 'obj[k] = ';
-      code += `${value ? value.toJS(shiftState(state, code, { inline: true })) : undefined};\n`;
+      code += `${value ? value.toJS(state) : undefined};\n`;
     });
     code += `return obj;\n`;
     code += '})()';
@@ -651,7 +651,7 @@ export class NewMap extends LogicItem {
     const indent2 = indent((state?.tabSize || 0) + 2);
     const typeCode = function* typeCode(codestr: string) {
       codestr += `nasl.util.New<`;
-      codestr += `${yield * self.typeAnnotation.toEmbeddedTS(shiftState(state, codestr, { inline: true }))}`;
+      codestr += `${yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, codestr, { inline: true }))}`;
       codestr += `>()`;
       return codestr;
     };
@@ -775,7 +775,7 @@ export class NewMap extends LogicItem {
             code += ts;
           }
         }
-      };
+      }
       if (!keyBol) code += 'null';
       code += `, ...[`;
 
@@ -795,6 +795,7 @@ export class NewMap extends LogicItem {
   *getForeachCode(code: string) {
     // ForEachStatement 内部变量需要替换处理，如 item、index
     const forEachStatement = this.getAncestor('ForEachStatement') as ForEachStatement;
+    const Logic = getConceptConstructor('Logic');
     if (forEachStatement && code) {
       code = code.replaceAll('\n', ' ');
       code = yield* new Logic().handleForEachCode(code, forEachStatement);

package/src/concepts/New__.ts

@@ -13,25 +13,24 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } 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 BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
 /**
  * 构造器
  */
-@className
 @concept('构造器')
-// @ts-ignore
 export class New extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'New';
+  static readonly ConceptName: string = 'New';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/NullLiteral__.ts

@@ -14,25 +14,24 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } 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 BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
 /**
  * 空字面量
  */
-@className
 @concept('空字面量')
-// @ts-ignore
 export class NullLiteral extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'NullLiteral';
+  static readonly ConceptName: string = 'NullLiteral';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -66,7 +65,7 @@ export class NullLiteral extends LogicItem {
     return 'null';
   }
 
-  toJS(): string {
+  toJS(state?: TranslatorState): string {
     return 'undefined';
   }
 

package/src/concepts/NumericLiteral__.ts

@@ -14,26 +14,25 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } 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 BaseNode from '../common/BaseNode';
-import TypeAnnotation from './TypeAnnotation__';
 import LogicItem from './LogicItem__';
+import type TypeAnnotation from './TypeAnnotation__';
 
 /**
  * 数字字面量
  */
-@className
 @concept('数字字面量')
-// @ts-ignore
 export class NumericLiteral extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'NumericLiteral';
+  static readonly ConceptName: string = 'NumericLiteral';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -46,7 +45,6 @@ export class NumericLiteral extends LogicItem {
    * 字面量的值
    */
   @property()
-  // @ts-ignore
   value!: string;
 
   /**
@@ -55,7 +53,6 @@ export class NumericLiteral extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -142,7 +139,7 @@ export class NumericLiteral extends LogicItem {
     return code;
   }
 
-  toJS(): string {
+  toJS(state?: TranslatorState): string {
     const code = this.value ? String(this.value) : '';
     return code;
   }
@@ -198,6 +195,7 @@ export class NumericLiteral extends LogicItem {
    * @returns
    */
   public static getDefaultOptions(): any {
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
     return {
       value: '0',
       typeAnnotation: new TypeAnnotation({

package/src/concepts/OqlQueryComponent__.ts

@@ -10,10 +10,10 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
-import StructureProperty from './StructureProperty__';
-import Structure from './Structure__';
-import Identifier from './Identifier__';
-import MemberExpression from './MemberExpression__';
+import type StructureProperty from './StructureProperty__';
+import type Structure from './Structure__';
+import type Identifier from './Identifier__';
+import type MemberExpression from './MemberExpression__';
 import type { Entity } from './Entity__';
 import type { EntityProperty } from './EntityProperty__';
 import logicService from '../service/logic';
@@ -22,26 +22,25 @@ import logicService from '../service/logic';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } 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 BaseNode from '../common/BaseNode';
-import TypeAnnotation from './TypeAnnotation__';
 import LogicItem from './LogicItem__';
+import type TypeAnnotation from './TypeAnnotation__';
 
 /**
  * SQL 查询
  */
-@className
 @concept('SQL 查询')
-// @ts-ignore
 export class OqlQueryComponent extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'OqlQueryComponent';
+  static readonly ConceptName: string = 'OqlQueryComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -60,7 +59,6 @@ export class OqlQueryComponent extends LogicItem {
    * SQL 查询
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**
@@ -69,14 +67,12 @@ export class OqlQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
    * 数据源
    */
   @property()
-  // @ts-ignore
   dataSource!: string;
 
   /**
@@ -188,6 +184,8 @@ export class OqlQueryComponent extends LogicItem {
     this._TsVariables = [];
     const str = this.code;
     const variables: Set<string> = new Set();
+    const Identifier = getConceptConstructor('Identifier');
+    const MemberExpression = getConceptConstructor('MemberExpression');
     let temp: any;
     const re = /\{(.+?)\}/g;
     while ((temp = re.exec(str))) {