@lcap/nasl 3.5.0-beta.1 → 3.5.0-beta.2

package/src/concepts/Variable__.ts

@@ -35,8 +35,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type TypeAnnotation from './TypeAnnotation__';
@@ -56,33 +56,30 @@ import type Process from './Process__';
  * 变量
  */
 @concept('变量')
-// @ts-ignore
 export class Variable extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Variable';
+  static readonly ConceptName: string = 'Variable';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Variable';
+  readonly concept!: 'Variable' | 'FrontendVariable';
 
   /**
    * 变量名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 变量描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -91,7 +88,6 @@ export class Variable extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -100,7 +96,6 @@ export class Variable extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -347,12 +342,20 @@ export class Variable extends BaseNode {
   toJS(state?: TranslatorState): string {
     const context = this.view ? 'this' : 'Vue.prototype';
     const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
     const needGenInitFromSchema =
       typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     let code = `${this.name} = `;
     if (needGenInitFromSchema) {
-      code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
     }
 
     if (this.defaultValue?.expression) {
@@ -462,7 +465,9 @@ export class Variable extends BaseNode {
    * @param name 一般不用传，用于 rename
    */
   getEmbeddedFilePath(name = this.name) {
-    return `/embedded/${this.app.name}/frontends/${this.parentNode.name}/variables/${name}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${
+      this.getAncestor('FrontendType')?.name
+    }/frontends/${this.getAncestor('Frontend')?.name}/variables/${name}.ts`;
   }
 
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
@@ -495,15 +500,13 @@ export class Variable extends BaseNode {
     }
     if (this.typeAnnotation) {
       code += `: `;
-      if (
-        this.defaultValue?.expression &&
-        !(this.typeAnnotation && ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey))
-      ) {
-        code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
-      } else {
+      if (this.defaultValue?.expression) {
         if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
+        } else {
+          code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
         }
+      } else {
         code += 'undefined';
       }
       code += ' as ';

package/src/concepts/ViewBlock__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 
@@ -15,13 +15,12 @@ import BaseNode from '../common/BaseNode';
  * 页面代码块
  */
 @concept('页面代码块')
-// @ts-ignore
 export class ViewBlock extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ViewBlock';
+  static readonly ConceptName: string = 'ViewBlock';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -34,21 +33,18 @@ export class ViewBlock extends BaseNode {
    * 描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * 标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 代码
    */
   @property()
-  // @ts-ignore
   code!: string;
 
   /**

package/src/concepts/ViewComponent__.ts

@@ -6,8 +6,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type Attribute from './Attribute__';
@@ -22,13 +22,12 @@ import type App from './App__';
  * 页面组件
  */
 @concept('页面组件')
-// @ts-ignore
 export class ViewComponent extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ViewComponent';
+  static readonly ConceptName: string = 'ViewComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -41,28 +40,24 @@ export class ViewComponent extends BaseNode {
    * 页面组件名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 页面组件标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 页面组件描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * category
    */
   @property()
-  // @ts-ignore
   category!: string;
 
   /**
@@ -129,7 +124,6 @@ export class ViewComponent extends BaseNode {
    * themes
    */
   @property()
-  // @ts-ignore
   themes!: Array<{ name: string; type: string }>;
 
   /**
@@ -222,7 +216,7 @@ export class ViewComponent extends BaseNode {
         this,
         'attrs',
       );
-    } else if (Assert.isAttribute(options)) {
+    } else if (asserts.isAttribute(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       attribute = options;
       Object.assign(attribute, relationOptions);
@@ -376,7 +370,7 @@ export class ViewComponent extends BaseNode {
         this,
         'events',
       );
-    } else if (Assert.isEvent(options)) {
+    } else if (asserts.isEvent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       event = options;
       Object.assign(event, relationOptions);
@@ -530,7 +524,7 @@ export class ViewComponent extends BaseNode {
         this,
         'slots',
       );
-    } else if (Assert.isSlot(options)) {
+    } else if (asserts.isSlot(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       slot = options;
       Object.assign(slot, relationOptions);
@@ -684,7 +678,7 @@ export class ViewComponent extends BaseNode {
         this,
         'methods',
       );
-    } else if (Assert.isLogic(options)) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -840,7 +834,7 @@ export class ViewComponent extends BaseNode {
         this,
         'children',
       );
-    } else if (Assert.isViewComponent(options)) {
+    } else if (asserts.isViewComponent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       viewComponent = options;
       Object.assign(viewComponent, relationOptions);
@@ -994,7 +988,7 @@ export class ViewComponent extends BaseNode {
         this,
         'blocks',
       );
-    } else if (Assert.isViewBlock(options)) {
+    } else if (asserts.isViewBlock(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       viewBlock = options;
       Object.assign(viewBlock, relationOptions);