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

package/src/concepts/Frontend__.ts

@@ -10,7 +10,7 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { AssetsInfo } from './App__';
-import Namespace from './Namespace__';
+import type Namespace from './Namespace__';
 import { languageList } from '../utils/i18nInfo';
 
 //================================================================================
@@ -18,32 +18,32 @@ import { languageList } from '../utils/i18nInfo';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 BindEvent from './BindEvent__';
-import View from './View__';
-import FrontendVariable from './FrontendVariable__';
+import type BindEvent from './BindEvent__';
+import type View from './View__';
+import type FrontendVariable from './FrontendVariable__';
 import Theme from './Theme__';
-import Module from './Module__';
-import I18nInfo from './I18nInfo__';
-import App from './App__';
-import Variable from './Variable__';
+import type Module from './Module__';
+import type I18nInfo from './I18nInfo__';
+import type App from './App__';
+import type Variable from './Variable__';
 
 /**
  * 前端
  */
-@className
 @concept('前端')
-// @ts-ignore
 export class Frontend extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Frontend';
+  static readonly ConceptName: string = 'Frontend';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -56,42 +56,36 @@ export class Frontend extends BaseNode {
    * 前端标识
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * pc端
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * PC/H5 端
    */
   @property()
-  // @ts-ignore
   type!: 'pc' | 'h5';
 
   /**
    * 基础路径
    */
   @property()
-  // @ts-ignore
   path!: string;
 
   /**
    * 制品应用标题
    */
   @property()
-  // @ts-ignore
   documentTitle!: string;
 
   /**
    * 制品应用图标
    */
   @property()
-  // @ts-ignore
   documentIcon!: string;
 
   /**
@@ -160,7 +154,6 @@ export class Frontend extends BaseNode {
   @property({
     objectRef: 'I18nInfo',
   })
-  // @ts-ignore
   i18nInfo!: I18nInfo;
 
   /**
@@ -311,6 +304,7 @@ export class Frontend extends BaseNode {
   _insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
     const bindEventOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'bindEvents' };
+    const BindEvent = getConceptConstructor('BindEvent');
     let bindEvent: BindEvent;
     if (!options) {
       bindEvent = BindEvent.from(
@@ -330,7 +324,7 @@ export class Frontend extends BaseNode {
         this,
         'bindEvents',
       );
-    } else if (options instanceof BindEvent) {
+    } else if (asserts.isBindEvent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       bindEvent = options;
       Object.assign(bindEvent, relationOptions);
@@ -464,6 +458,7 @@ export class Frontend extends BaseNode {
   _insertViewAt(options: string | Partial<View> | View, index: number) {
     const viewOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'views' };
+    const View = getConceptConstructor('View');
     let view: View;
     if (!options) {
       view = View.from(
@@ -483,7 +478,7 @@ export class Frontend extends BaseNode {
         this,
         'views',
       );
-    } else if (options instanceof View) {
+    } else if (asserts.isView(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       view = options;
       Object.assign(view, relationOptions);
@@ -619,6 +614,7 @@ export class Frontend extends BaseNode {
   _insertFrontendVariableAt(options: string | Partial<FrontendVariable> | FrontendVariable, index: number) {
     const frontendVariableOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'variables' };
+    const FrontendVariable = getConceptConstructor('FrontendVariable');
     let frontendVariable: FrontendVariable;
     if (!options) {
       frontendVariable = FrontendVariable.from(
@@ -638,7 +634,7 @@ export class Frontend extends BaseNode {
         this,
         'variables',
       );
-    } else if (options instanceof FrontendVariable) {
+    } else if (asserts.isFrontendVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       frontendVariable = options;
       Object.assign(frontendVariable, relationOptions);
@@ -774,6 +770,7 @@ export class Frontend extends BaseNode {
   _insertModuleAt(options: string | Partial<Module> | Module, index: number) {
     const moduleOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'componentDependencies' };
+    const Module = getConceptConstructor('Module');
     let module: Module;
     if (!options) {
       module = Module.from(
@@ -793,7 +790,7 @@ export class Frontend extends BaseNode {
         this,
         'componentDependencies',
       );
-    } else if (options instanceof Module) {
+    } else if (asserts.isModule(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       module = options;
       Object.assign(module, relationOptions);
@@ -1467,11 +1464,29 @@ export class Frontend extends BaseNode {
           node.update({
             i18nKey: uuidv4().replace(/-/g, ''),
           });
-        } else if (node.concept === 'StringLiteral') {
+        } else if (node.concept === 'StaticString') {
+          node.update({
+            i18nKey: uuidv4().replace(/-/g, ''),
+          });
+        } else if (node.concept === 'StringLiteral' && !node.getAncestor('StringInterpolation')) {
           node.update({
             i18nKey: uuidv4().replace(/-/g, ''),
           });
         }
+      } else if ((node as any).i18nKey) {
+        if (node.concept === 'BindAttribute' && node.type !== 'string') {
+          node.update({
+            i18nKey: null,
+          });
+        } else if (node.concept === 'BindDirective' && node.type !== 'string') {
+          node.update({
+            i18nKey: null,
+          });
+        } else if (node.concept === 'StringLiteral' && node.getAncestor('StringInterpolation')) {
+          node.update({
+            i18nKey: null,
+          });
+        }
       }
     });
     this.app?.emit('collect:end');
@@ -1496,11 +1511,14 @@ export class Frontend extends BaseNode {
     return languageList;
   }
   getCurrentLanguageList() {
-    const langKeys = Object.keys(this.i18nInfo?.messages || {});
-    const currentLanguageList = this.allLanguageList.filter((item) => {
-      return langKeys.includes(item.id);
-    });
-    return currentLanguageList;
+    const list = [];
+    for (let key in this.i18nInfo?.messages || {}) {
+      const lang = languageList.find((item) => item.id === key);
+      if (lang) {
+        list.push(lang);
+      }
+    }
+    return list;
   }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/Function__.ts

@@ -1,5 +1,5 @@
 import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
-import Namespace from './Namespace__';
+import type Namespace from './Namespace__';
 import {
   TranslatorState,
   shiftState,
@@ -18,31 +18,31 @@ import asyncFuncMap from '../common/asyncFuncMap';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 TypeParam from './TypeParam__';
-import Param from './Param__';
-import Return from './Return__';
-import Variable from './Variable__';
-import LogicItem from './LogicItem__';
-import Module from './Module__';
-import App from './App__';
+import type TypeParam from './TypeParam__';
+import type Param from './Param__';
+import type Return from './Return__';
+import type Variable from './Variable__';
+import type LogicItem from './LogicItem__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 函数
  */
-@className
 @concept('函数')
-// @ts-ignore
 export class Function extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Function';
+  static readonly ConceptName: string = 'Function';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -55,14 +55,12 @@ export class Function extends BaseNode {
    * 函数名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 函数描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -111,7 +109,6 @@ export class Function extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   returnExpression!: LogicItem;
 
   /**
@@ -223,6 +220,7 @@ export class Function extends BaseNode {
   _insertTypeParamAt(options: string | Partial<TypeParam> | TypeParam, index: number) {
     const typeParamOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'typeParams' };
+    const TypeParam = getConceptConstructor('TypeParam');
     let typeParam: TypeParam;
     if (!options) {
       typeParam = TypeParam.from(
@@ -242,7 +240,7 @@ export class Function extends BaseNode {
         this,
         'typeParams',
       );
-    } else if (options instanceof TypeParam) {
+    } else if (asserts.isTypeParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeParam = options;
       Object.assign(typeParam, relationOptions);
@@ -372,6 +370,7 @@ export class Function extends BaseNode {
   _insertParamAt(options: string | Partial<Param> | Param, index: number) {
     const paramOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'params' };
+    const Param = getConceptConstructor('Param');
     let param: Param;
     if (!options) {
       param = Param.from(
@@ -391,7 +390,7 @@ export class Function extends BaseNode {
         this,
         'params',
       );
-    } else if (options instanceof Param) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -521,6 +520,7 @@ export class Function extends BaseNode {
   _insertReturnAt(options: string | Partial<Return> | Return, index: number) {
     const retOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'returns' };
+    const Return = getConceptConstructor('Return');
     let ret: Return;
     if (!options) {
       ret = Return.from(
@@ -540,7 +540,7 @@ export class Function extends BaseNode {
         this,
         'returns',
       );
-    } else if (options instanceof Return) {
+    } else if (asserts.isReturn(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       ret = options;
       Object.assign(ret, relationOptions);
@@ -670,6 +670,7 @@ export class Function extends BaseNode {
   _insertVariableAt(options: string | Partial<Variable> | Variable, index: number) {
     const variableOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'variables' };
+    const Variable = getConceptConstructor('Variable');
     let variable: Variable;
     if (!options) {
       variable = Variable.from(
@@ -689,7 +690,7 @@ export class Function extends BaseNode {
         this,
         'variables',
       );
-    } else if (options instanceof Variable) {
+    } else if (asserts.isVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       variable = options;
       Object.assign(variable, relationOptions);
@@ -1088,7 +1089,7 @@ export class Function extends BaseNode {
     code += ')';
     code += ' => (';
     if (this.returnExpression) {
-      code += this.returnExpression.toJS(shiftState(state, code));
+      code += this.returnExpression.toJS(state);
     }
     code += ')';
     let resultCode = '';
@@ -1132,7 +1133,8 @@ export class Function extends BaseNode {
       code += `)`;
       if (self.returns.length) {
         code += ': ';
-        code += yield* self.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
+        code += yield* self.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
+          returnOrigin('');
       }
       code += ` => (`;
       if (self.returnExpression?.toEmbeddedTS) {
@@ -1216,7 +1218,8 @@ export class Function extends BaseNode {
     });
     code += `) => (`;
     if (self.returns.length) {
-      code += yield* self.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
+      code += yield* self.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
+        returnOrigin('');
     } else {
       code += 'any';
     }

package/src/concepts/I18nInfo__.ts

@@ -3,24 +3,24 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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';
 
 /**
  * 国际化信息
  */
-@className
 @concept('国际化信息')
-// @ts-ignore
 export class I18nInfo extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'I18nInfo';
+  static readonly ConceptName: string = 'I18nInfo';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -33,21 +33,18 @@ export class I18nInfo extends BaseNode {
    * 是否开启
    */
   @property()
-  // @ts-ignore
   enabled!: boolean;
 
   /**
    * locale
    */
   @property()
-  // @ts-ignore
   locale!: string;
 
   /**
    * 国际化配置列表
    */
   @property()
-  // @ts-ignore
   messages!: Map<String, Map<String, String>>;
 
   /**

package/src/concepts/Identifier__.ts

@@ -16,25 +16,24 @@ import { findConceptKeyWordByNamespace } from '../utils';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 Identifier extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Identifier';
+  static readonly ConceptName: string = 'Identifier';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,14 +46,12 @@ export class Identifier extends LogicItem {
    * 命名空间
    */
   @property()
-  // @ts-ignore
   namespace!: string;
 
   /**
    * 标识符名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -81,10 +78,10 @@ export class Identifier extends LogicItem {
   globalDataMap: {
     [name: string]: boolean;
   } = {
-      $route: true,
-      $global: true,
-      $refs: true,
-    };
+    $route: true,
+    $global: true,
+    $refs: true,
+  };
 
   isEnum() {
     return findConceptKeyWordByNamespace(this.namespace) === 'enums';
@@ -165,7 +162,7 @@ export class Identifier extends LogicItem {
     return name;
   }
 
-  toJS(): string {
+  toJS(state?: TranslatorState): string {
     const name = this.jsName;
     return this.isViewOrGlobalDataVariable() ? `this.${name}` : name;
   }
@@ -216,7 +213,7 @@ export class Identifier extends LogicItem {
       return `__obj.${this.name}`;
     }
     // 只有data-source可以是函数 ，也可能是属性
-    if (self.parentNode instanceof BindAttribute && self.parentNode.name === 'data-source') {
+    if (asserts.isBindAttribute(self.parentNode) && self.parentNode.name === 'data-source') {
       const { view } = self;
       const viewLogics = view.logics;
       const findLogic = viewLogics.find((item) => item.name === self.name);
@@ -231,7 +228,7 @@ export class Identifier extends LogicItem {
     // 如果是nasl.util.Enum 的子集里的 Identifier > MemberExpression > Argument > callfunction
     // nasl.util.Enum 的 右侧是转成字符串的
     // 如果是identifier 而且枚举
-    // if (this.parentNode?.parentNode?.parentNode instanceof CallFunction) {
+    // if (this.parentNode?.parentNode?asserts.isCallFunction(.parentNode)) {
     //     const calleeNamespace = this.parentNode.parentNode.parentNode.calleeNamespace;
     //     const calleeName = this.parentNode.parentNode.parentNode.calleeName;
     //     if (calleeNamespace + '.' + calleeName === 'nasl.util.Enum') {

package/src/concepts/IfStatement__.ts

@@ -15,25 +15,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 IfStatement extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'IfStatement';
+  static readonly ConceptName: string = 'IfStatement';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -48,7 +47,6 @@ export class IfStatement extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   test!: LogicItem;
 
   /**
@@ -140,8 +138,9 @@ export class IfStatement extends LogicItem {
   _insertItemInConsequentAt(options: Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'consequent' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (options instanceof LogicItem) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -240,8 +239,9 @@ export class IfStatement extends LogicItem {
   _insertItemInAlternateAt(options: Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'alternate' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (options instanceof LogicItem) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);

package/src/concepts/ImportedInterface__.ts

@@ -3,31 +3,29 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 AbstractInterface from './AbstractInterface__';
 
 /**
  * 由JSON生成接口
  */
-@className
 @concept('由JSON生成接口')
-// @ts-ignore
 export abstract class ImportedInterface extends AbstractInterface {
   /** 类名 */
-  static readonly ConceptName = 'ImportedInterface';
+  static readonly ConceptName: string = 'ImportedInterface';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['AbstractInterface', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['AbstractInterface', 'BaseNode'];
 
   /**
    * exampleMap
    */
   @property()
-  // @ts-ignore
   exampleMap!: Map<'responseBody' | 'requestBody', string>;
 
   /**