@lcap/nasl 3.5.0-beta.4 → 3.6.0-alpha.1

package/src/concepts/Frontend__.ts

@@ -9,6 +9,7 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
+import { AssetsInfo } from './App__';
 import type Namespace from './Namespace__';
 import { languageList } from '../utils/i18nInfo';
 
@@ -28,6 +29,7 @@ import type BindEvent from './BindEvent__';
 import type View from './View__';
 import type FrontendVariable from './FrontendVariable__';
 import Theme from './Theme__';
+import type Module from './Module__';
 import type I18nInfo from './I18nInfo__';
 import type App from './App__';
 import type Variable from './Variable__';
@@ -124,6 +126,16 @@ export class Frontend extends BaseNode {
   })
   theme: Theme = new Theme();
 
+  /**
+   * 扩展组件列表（兼容老版）
+   */
+  @property({
+    objectRef: 'Module',
+    isArray: true,
+    defaultValue: [],
+  })
+  componentDependencies: Array<Module> = [];
+
   /**
    * 全局缩放开关
    */
@@ -724,6 +736,162 @@ export class Frontend extends BaseNode {
     return node;
   }
 
+  getModuleExistingNames(excludedList: Array<Module> = []) {
+    const excludedSet = new Set(excludedList);
+    return ((this.componentDependencies as Module[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item?.name);
+  }
+  getModuleUniqueName(name = 'module1') {
+    return utils.unique(name, this.getModuleExistingNames(), undefined, false);
+  }
+
+  /**
+   * 插入模块
+   * @internal
+   * @param name 模块名称，如果不填会自动生成一个唯一名称
+   */
+  _insertModuleAt(name: string, index: number): Module;
+
+  /**
+   * 插入模块
+   * @internal
+   * @param moduleOptions 模块参数
+   */
+  _insertModuleAt(moduleOptions: Partial<Module>, index: number): Module;
+
+  /**
+   * 插入模块
+   * @internal
+   * @param module 已有的模块实例
+   */
+  _insertModuleAt(module: Module, index: number): Module;
+
+  _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(
+        {
+          ...moduleOptions,
+          name: this.getModuleUniqueName(),
+        },
+        this,
+        'componentDependencies',
+      );
+    } else if (typeof options === 'string') {
+      module = Module.from(
+        {
+          ...moduleOptions,
+          name: options,
+        },
+        this,
+        'componentDependencies',
+      );
+    } else if (asserts.isModule(options)) {
+      options.ensureDelete(); // 同一实例不支持多处存在
+      module = options;
+      Object.assign(module, relationOptions);
+    } else {
+      module = Module.from(
+        {
+          ...moduleOptions,
+          ...options,
+        },
+        this,
+        'componentDependencies',
+      );
+    }
+    this.componentDependencies.splice(index, 0, module);
+    return module;
+  }
+
+  /**
+   * 插入模块
+   * @param name 模块名称，如果不填会自动生成一个唯一名称
+   */
+  insertModuleAt(name: string, index: number): Module;
+
+  /**
+   * 插入模块
+   * @param moduleOptions 模块参数
+   */
+  insertModuleAt(moduleOptions: Partial<Module>, index: number): Module;
+
+  /**
+   * 插入模块
+   * @param module 已有的模块实例
+   */
+  insertModuleAt(module: Module, index: number): Module;
+
+  insertModuleAt(options: string | Partial<Module> | Module, index: number) {
+    const node = this._insertModuleAt(options as any, index);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'componentDependencies',
+    });
+    return node;
+  }
+
+  /**
+   * 添加模块
+   * @internal
+   * @param name 模块名称，如果不填会自动生成一个唯一名称
+   */
+  _addModule(name?: string): Module;
+
+  /**
+   * 添加模块
+   * @internal
+   * @param moduleOptions 模块参数
+   */
+  _addModule(moduleOptions: Partial<Module>): Module;
+
+  /**
+   * 添加模块
+   * @internal
+   * @param module 已有的模块实例
+   */
+  _addModule(module: Module): Module;
+
+  _addModule(options?: string | Partial<Module> | Module) {
+    const index = this.componentDependencies.length;
+    return this._insertModuleAt(options as any, index);
+  }
+
+  /**
+   * 添加模块
+   * @internal
+   * @param name 模块名称，如果不填会自动生成一个唯一名称
+   */
+  addModule(name?: string): Module;
+
+  /**
+   * 添加模块
+   * @param moduleOptions 模块参数
+   */
+  addModule(moduleOptions: Partial<Module>): Module;
+
+  /**
+   * 添加模块
+   * @param module 已有的模块实例
+   */
+  addModule(module: Module): Module;
+
+  addModule(options?: string | Partial<Module> | Module) {
+    const node = this._addModule(options as any);
+    const index = this.componentDependencies.indexOf(node);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'componentDependencies',
+    });
+    return node;
+  }
+
   /**
    * 删除元素绑定事件
    * @param name 元素绑定事件名称
@@ -948,6 +1116,62 @@ export class Frontend extends BaseNode {
     return params;
   }
 
+  /**
+   * 删除模块
+   * @param name 模块名称
+   */
+  removeModule(name: string): void;
+
+  /**
+   * 删除模块
+   * @param module 已有的模块实例
+   */
+  removeModule(module: Module): void;
+
+  removeModule(options: string | Module) {
+    let module: Module;
+    if (typeof options === 'string') {
+      module = (this.componentDependencies as Module[]).find((item) => item.name === options);
+      if (!module) {
+        throw new Error('找不到模块 ' + options);
+      }
+    } else {
+      module = options;
+    }
+    return module.delete();
+  }
+
+  __removeModule(module: Module) {
+    const parentKey = module.parentKey;
+    const params: Params = {
+      parentNode: this,
+      parentKey,
+      index: -1,
+      object: null,
+      oldObject: module,
+    };
+    if (parentKey) {
+      params.parentKey = parentKey;
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = module.__v_raw || module;
+      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;
+  }
+
   /**
    * 删除国际化信息
    * @param name 国际化信息名称
@@ -1009,6 +1233,10 @@ export class Frontend extends BaseNode {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
+  findComponentDependencyByName(name: string) {
+    return this.componentDependencies.find((componentDependency) => componentDependency.name === name);
+  }
+
   /**
    * @param path 路径
    * path 为要查找路径：如 /dashboard/student/list、/dashboard/student/list
@@ -1072,9 +1300,7 @@ export class Frontend extends BaseNode {
    * @param name 一般不用传，用于 rename
    */
   getEmbeddedFilePath(name = this.name) {
-    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${
-      this.getAncestor('FrontendType')?.name
-    }/frontends/${name}.ts`;
+    return `/embedded/${this.rootNode?.name || this.parentNode.name}/frontends/${name}.ts`;
   }
 
   @withSourceMapGenerator
@@ -1132,6 +1358,28 @@ export class Frontend extends BaseNode {
     return basePath;
   }
 
+  genCustomAssetsInfo(prefix: string) {
+    const custom: AssetsInfo = {
+      js: [],
+      css: [],
+      names: [],
+    };
+    const existingSet = new Set();
+    this.componentDependencies.forEach((dep) => {
+      const { name, version } = dep;
+      const jsName = `${prefix}/packages/${name}@${version}/dist-theme/index.js`;
+      if (!existingSet.has(jsName)) {
+        existingSet.add(jsName);
+        custom.js.push(jsName);
+        if (utils.shouldLoadCss(name, version)) {
+          custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
+        }
+        custom.names.push(name);
+      }
+    });
+    return custom;
+  }
+
   getExtensionsCallbackLogics() {
     let resultLogics: string[] = [];
     this.views.forEach((item: View) => {

package/src/concepts/Identifier__.ts

@@ -10,9 +10,6 @@ import {
 import { BindAttribute, CallLogic, TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import { findConceptKeyWordByNamespace } from '../utils';
-import type View from './View__';
-import BusinessComponent from './BusinessComponent__';
-import FrontendType from './FrontendType__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -81,20 +78,15 @@ 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';
   }
 
-  get isFrontendVariables() {
-    const frontendType = this.getAncestor('FrontendType') as FrontendType;
-    return this.namespace?.startsWith(`app.frontendTypes.${frontendType?.kind}.frontends`) && this.namespace?.endsWith('variables');
-  }
-
   toVue(options?: ElementToVueOptions): string {
     let { name } = this;
     const { namespace } = this;
@@ -106,7 +98,7 @@ export class Identifier extends LogicItem {
         this.namespace.endsWith('nasl.process')
       ) {
         name = `$global.${this.name}`;
-      } else if (this.isFrontendVariables) {
+      } else if (this.namespace.startsWith('app.frontends') && this.namespace.endsWith('variables')) {
         name = `$global.frontendVariables.${this.name}`;
       } else if (this.isEnum()) {
         let enumName = this.name;
@@ -127,7 +119,7 @@ export class Identifier extends LogicItem {
     if (namespace) {
       if (namespace.startsWith('nasl.')) {
         name = `${namespace}.${this.name}`;
-      } else if (this.isFrontendVariables) {
+      } else if (namespace.startsWith('app.frontends') && namespace.endsWith('variables')) {
         name = `nasl.frontendVariables.${this.name}`;
       } else if (this.isEnum()) {
         let enumName = this.name;
@@ -152,7 +144,7 @@ export class Identifier extends LogicItem {
         this.namespace.endsWith('nasl.process')
       ) {
         name = `$global.${this.name}`;
-      } else if (this.isFrontendVariables) {
+      } else if (namespace.startsWith('app.frontends') && namespace.endsWith('variables')) {
         name = `$global.frontendVariables.${this.name}`;
       } else if (this.isEnum()) {
         let enumName = this.name;
@@ -175,23 +167,19 @@ export class Identifier extends LogicItem {
     return this.isViewOrGlobalDataVariable() ? `this.${name}` : name;
   }
 
-  get likeComponent(): View | BusinessComponent {
-    return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
-  }
-
   // 页面/全局 级别的变量
   isViewOrGlobalDataVariable() {
     const dataMap: {
       [name: string]: boolean;
     } = {};
-    this.likeComponent?.params?.forEach((param) => {
+    this.view?.params?.forEach((param) => {
       dataMap[param.name] = true;
     });
-    this.likeComponent?.variables?.forEach((variable) => {
+    this.view?.variables?.forEach((variable) => {
       dataMap[variable.name] = true;
     });
     // 目前前端逻辑也会被当成可选变量（以datasource为典型）
-    this.likeComponent?.logics?.forEach((logics) => {
+    this.view?.logics?.forEach((logics) => {
       dataMap[logics.name] = true;
     });
     const { parentNode, namespace, jsName: name } = this;
@@ -207,7 +195,7 @@ export class Identifier extends LogicItem {
         namespace?.endsWith('nasl.auth') ||
         namespace?.endsWith('nasl.configuration') ||
         namespace?.endsWith('nasl.process') ||
-        (this.isFrontendVariables) ||
+        (namespace?.startsWith('app.frontends') && namespace?.endsWith('variables')) ||
         this.isEnum()) &&
       !isMemberExpressionProperty
     );
@@ -217,10 +205,6 @@ export class Identifier extends LogicItem {
     return this.name || '-';
   }
 
-  get businessComponent() {
-    return this.getAncestor('BusinessComponent') as BusinessComponent;
-  }
-
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState(), options?: any): TranslatorGenerator {
     const self = this;
@@ -230,7 +214,7 @@ export class Identifier extends LogicItem {
     }
     // 只有data-source可以是函数 ，也可能是属性
     if (asserts.isBindAttribute(self.parentNode) && self.parentNode.name === 'data-source') {
-      const view = self.view || self.getAncestor('BusinessComponent') as BusinessComponent;
+      const { view } = self;
       const viewLogics = view.logics;
       const findLogic = viewLogics.find((item) => item.name === self.name);
       if (findLogic) {
@@ -238,7 +222,7 @@ export class Identifier extends LogicItem {
       }
     }
     // 全局变量在不是页面的地方放置，就会报错
-    if (self.isFrontendVariables && !self.frontend) {
+    if (self.namespace?.startsWith('app.frontends') && self.namespace?.endsWith('variables') && !self.frontend) {
       return '__FRONTENDVARIABLES__';
     }
     // 如果是nasl.util.Enum 的子集里的 Identifier > MemberExpression > Argument > callfunction

package/src/concepts/LogicItem__.ts

@@ -66,7 +66,6 @@ export class LogicItem extends BaseNode {
     | 'Comment'
     | 'CallLogic'
     | 'CallConnector'
-    | 'CallEvent'
     | 'CallFunction'
     | 'CallInterface'
     | 'CallAuthInterface'

package/src/concepts/Logic__.ts

@@ -33,7 +33,6 @@ import type CallInterface from './CallInterface__';
 import type CallLogic from './CallLogic__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
 import type Interface from './Interface__';
-import type BusinessComponent from './BusinessComponent__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -77,7 +76,7 @@ export class Logic extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' | 'BusinessLogic';
+  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface';
 
   /**
    * 逻辑名称
@@ -1546,15 +1545,15 @@ export class Logic extends BaseNode {
     if (Array.isArray(this.variables)) {
       varList.push(...this.variables);
     }
-    if (this.likeComponent) {
-      // 页面/业务组件下，变量名不可以跟逻辑名相同，会有js 翻译问题
+    if (this.view) {
+      // 页面下，变量名不可以跟逻辑名相同，会有js 翻译问题
       varList.push(this);
 
-      if (Array.isArray(this.likeComponent.params)) {
-        varList.push(...this.likeComponent.params);
+      if (Array.isArray(this.view.params)) {
+        varList.push(...this.view.params);
       }
-      if (Array.isArray(this.likeComponent.variables)) {
-        varList.push(...this.likeComponent.variables);
+      if (Array.isArray(this.view.variables)) {
+        varList.push(...this.view.variables);
       }
     }
 
@@ -1806,11 +1805,11 @@ export class Logic extends BaseNode {
     const IDENTIFIERMAP = new Set<Variable | Return>();
 
     if (!prefix) {
-      code += `export function ${self.tsName}`;
+      code += `export function ${self.name}`;
     } else if (prefix === 'noExport') {
-      code += `function ${self.tsName}`;
+      code += `function ${self.name}`;
     } else if (prefix === 'inObject') {
-      code += `${self.tsName}`;
+      code += `${self.name}`;
     }
     if (self.typeParams?.length) {
       code += '<';
@@ -2370,12 +2369,10 @@ ${indent(state.tabSize)} */\n`;
     }
     if (asserts.isFrontendLibrary(this.parentNode)) {
       _path += `/frontends/${this.parentNode.type}`;
-    } else if (this.parentNode.concept === 'BindEvent' && this.getAncestor('Frontend')) {
-      _path += `/frontendTypes/${this.getAncestor('FrontendType')?.name}/frontends/${
-        this.getAncestor('Frontend')?.name
-      }/bindEvents/${name}.ts`;
+    } else if (this.parentNode.concept === 'BindEvent' && this.parentNode?.parentNode.concept === 'Frontend') {
+      _path += `/frontends/${this.parentNode.parentNode.name}/bindEvents/${name}.ts`;
     }
-    return `/embedded/${this.getAncestor('App')?.name}${_path}/logics/${name}.ts`;
+    return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;
   }
 
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
@@ -2493,7 +2490,7 @@ ${indent(state.tabSize)} */\n`;
   }
 
   get pathName(): string {
-    if (this.likeComponent) {
+    if (this.view) {
       return this.getEventLogicName('chinese');
     }
 
@@ -2583,10 +2580,6 @@ ${indent(state.tabSize)} */\n`;
     return this.getAncestor('Integration');
   }
 
-  get likeComponent(): View | BusinessComponent {
-    return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
-  }
-
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/MemberExpression__.ts

@@ -276,7 +276,7 @@ export class MemberExpression extends LogicItem {
       (this.object as Identifier)?.isEnum() &&
       this.property?.concept === 'Identifier'
     ) {
-      return this.isDefaultValueExpression(!!state?.getVuePrototype) ? this.property?.name : `"${this.property?.name}"`;
+      return this.isDefaultValueExpression() ? this.property?.name : `"${this.property?.name}"`;
     }
     if (
       this.object?.__TypeAnnotation?.sortedTypeKey?.startsWith('nasl.collection.Map') &&
@@ -379,8 +379,8 @@ export class MemberExpression extends LogicItem {
     return (this.object as Identifier)?.isEnum?.();
   }
 
-  isDefaultValueExpression(getVuePrototype: boolean) {
-    return this.parentNode instanceof DefaultValue && getVuePrototype;
+  isDefaultValueExpression() {
+    return this.parentNode instanceof DefaultValue;
   }
 
   // 方便快速取值,遍历获取value

package/src/concepts/NewComposite__.ts

@@ -1179,11 +1179,13 @@ export class NewComposite extends LogicItem {
     } else if (typeAnnotation.typeKind !== 'anonymousStructure') {
       // 实体、数据结构默认值使用new时需要改成vue.prototype才能获取到方法
       if (state?.getVuePrototype) {
-        code += `const obj = Vue.prototype.$genInitFromSchema('${typeAnnotation.sortedTypeKey
-          }', Vue.prototype.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
+        code += `const obj = Vue.prototype.$genInitFromSchema('${
+          typeAnnotation.sortedTypeKey
+        }', Vue.prototype.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
       } else {
-        code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey
-          }', this.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
+        code += `const obj = this.$genInitFromSchema('${
+          typeAnnotation.sortedTypeKey
+        }', this.$utils['New'](${typeAnnotation.toJS(state)}));\n`;
       }
       const rightMap = new Map();
       this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {

package/src/concepts/Param__.ts

@@ -361,25 +361,17 @@ export class Param extends BaseNode {
   toJS(state?: TranslatorState): string {
     if (this.view) {
       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(typeKind) || typeName === 'DateTime');
+        (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
       let code = `${this.name} = `;
       if (needGenInitFromSchema) {
-        code += `this.$genInitFromSchema('${sortedTypeKey}',`;
+        code += `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
       }
 
       const expressionJS = this.defaultValue?.toJS?.();
 
-      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
+      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
       if (needGenInitFromSchema) {
         code += `)`;
       }

package/src/concepts/ProcessElement__.ts

@@ -1915,14 +1915,7 @@ export class ProcessElement extends BaseNode {
         if (Array.isArray(self.bindEvents)) {
           yield* wrapForEach(self.bindEvents, function* warpForEachGenerator(bindEvent) {
             // 任务完成时可以拿到输出参数
-            let currentPrevCode: any;
-            if(bindEvent.name !== 'OnClose') {
-              currentPrevCode = prevCode;
-              // 除了任务完成时的逻辑，其他逻辑拿不到自己任务下的输出参数，所以不需要__ProcessIdentification__标注
-              currentPrevCode = currentPrevCode.replace('__ProcessIdentification__', '');
-            } else {
-              currentPrevCode = prevCodeClose;
-            }
+            const currentPrevCode = bindEvent.name === 'OnClose' ? prevCodeClose : prevCode;
             code += `${tab1}${bindEvent.name}: () => [\n`;
             yield* wrapForEach(bindEvent.logics, function* warpForEachGenerator(logic) {
               code += `${yield* logic.toEmbeddedTSInProcess(

package/src/concepts/Return__.ts

@@ -322,20 +322,12 @@ export class Return 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(typeKind) || typeName === 'DateTime');
+      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
     let code = `${this.name} = `;
     if (needGenInitFromSchema) {
-      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
     }
 
     if (this.defaultValue?.expression) {
@@ -409,13 +401,18 @@ export class Return extends BaseNode {
     let code = this.name;
     if (this.typeAnnotation) {
       code += `: `;
-      if (this.defaultValue?.expression) {
-        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)) {
+      if (
+        this.defaultValue?.expression &&
+        !(
+          this.typeAnnotation &&
+          ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)
+        )
+      ) {
+        code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
+      } else {
+        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation?.typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
-        } else {
-          code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
         }
-      } else {
         code += 'undefined';
       }
       code += ' as ';