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

package/src/concepts/QueryAggregateExpression__.ts

@@ -12,26 +12,25 @@ 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 QueryFieldExpression from './QueryFieldExpression__';
 import LogicItem from './LogicItem__';
+import type QueryFieldExpression from './QueryFieldExpression__';
 
 /**
  * 查询聚合函数
  */
-@className
 @concept('查询聚合函数')
-// @ts-ignore
 export class QueryAggregateExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QueryAggregateExpression';
+  static readonly ConceptName: string = 'QueryAggregateExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -44,14 +43,12 @@ export class QueryAggregateExpression extends LogicItem {
    * 聚合属性别名
    */
   @property()
-  // @ts-ignore
   asName!: string;
 
   /**
    * 聚合函数名称
    */
   @property()
-  // @ts-ignore
   aggregateName!: 'COUNT' | 'COUNTD' | 'SUM' | 'AVG' | 'MAX' | 'MIN';
 
   /**
@@ -60,7 +57,6 @@ export class QueryAggregateExpression extends LogicItem {
   @property({
     objectRef: 'QueryFieldExpression',
   })
-  // @ts-ignore
   aggregateParam!: QueryFieldExpression;
 
   /**

package/src/concepts/QueryFieldExpression__.ts

@@ -7,31 +7,30 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import CallQueryComponent from './CallQueryComponent__';
+import type CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 LogicItem from './LogicItem__';
 
 /**
  * 查询属性
  */
-@className
 @concept('查询属性')
-// @ts-ignore
 export class QueryFieldExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QueryFieldExpression';
+  static readonly ConceptName: string = 'QueryFieldExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -50,21 +49,18 @@ export class QueryFieldExpression extends LogicItem {
    * asName
    */
   @property()
-  // @ts-ignore
   asName!: string;
 
   /**
    * entityAsName
    */
   @property()
-  // @ts-ignore
   entityAsName!: string;
 
   /**
    * propertyName
    */
   @property()
-  // @ts-ignore
   propertyName!: string;
 
   /**

package/src/concepts/QueryFromExpression__.ts

@@ -15,26 +15,25 @@ import type CallQueryComponent from './CallQueryComponent__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 QueryJoinExpression from './QueryJoinExpression__';
 import LogicItem from './LogicItem__';
+import type QueryJoinExpression from './QueryJoinExpression__';
 
 /**
  * 查询 From 子句
  */
-@className
 @concept('查询 From 子句')
-// @ts-ignore
 export class QueryFromExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QueryFromExpression';
+  static readonly ConceptName: string = 'QueryFromExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,21 +46,18 @@ export class QueryFromExpression extends LogicItem {
    * 实体的命名空间
    */
   @property()
-  // @ts-ignore
   entityNamespace!: string;
 
   /**
    * 实体名称
    */
   @property()
-  // @ts-ignore
   entityName!: string;
 
   /**
    * 别名
    */
   @property()
-  // @ts-ignore
   asName!: string;
 
   /**
@@ -116,8 +112,9 @@ export class QueryFromExpression extends LogicItem {
   _insertJoinPartAt(options: Partial<QueryJoinExpression> | QueryJoinExpression, index: number) {
     const queryJoinExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'joinParts' };
+    const QueryJoinExpression = getConceptConstructor('QueryJoinExpression');
     let queryJoinExpression: QueryJoinExpression;
-    if (options instanceof QueryJoinExpression) {
+    if (asserts.isQueryJoinExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryJoinExpression = options;
       Object.assign(queryJoinExpression, relationOptions);

package/src/concepts/QueryGroupByExpression__.ts

@@ -14,25 +14,24 @@ import type QueryFieldExpression from './QueryFieldExpression__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 QueryGroupByExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QueryGroupByExpression';
+  static readonly ConceptName: string = 'QueryGroupByExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,7 +46,6 @@ export class QueryGroupByExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   groupElement!: LogicItem;
 
   /**

package/src/concepts/QueryJoinExpression__.ts

@@ -9,32 +9,31 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import CallQueryComponent from './CallQueryComponent__';
+import type CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 BinaryExpression from './BinaryExpression__';
 import LogicItem from './LogicItem__';
+import type BinaryExpression from './BinaryExpression__';
 
 /**
  * 查询 Join 子句
  */
-@className
 @concept('查询 Join 子句')
-// @ts-ignore
 export class QueryJoinExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QueryJoinExpression';
+  static readonly ConceptName: string = 'QueryJoinExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,28 +46,24 @@ export class QueryJoinExpression extends LogicItem {
    * 实体的命名空间
    */
   @property()
-  // @ts-ignore
   entityNamespace!: string;
 
   /**
    * 实体名称
    */
   @property()
-  // @ts-ignore
   entityName!: string;
 
   /**
    * 别名
    */
   @property()
-  // @ts-ignore
   asName!: string;
 
   /**
    * joinType
    */
   @property()
-  // @ts-ignore
   joinType!: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL';
 
   /**
@@ -156,6 +151,7 @@ export class QueryJoinExpression extends LogicItem {
   ) {
     const binaryExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'onExpressions' };
+    const BinaryExpression = getConceptConstructor('BinaryExpression');
     let binaryExpression: BinaryExpression;
     if (!options) {
       binaryExpression = BinaryExpression.from(
@@ -175,7 +171,7 @@ export class QueryJoinExpression extends LogicItem {
         this,
         'onExpressions',
       );
-    } else if (options instanceof BinaryExpression) {
+    } else if (asserts.isBinaryExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       binaryExpression = options;
       Object.assign(binaryExpression, relationOptions);
@@ -303,8 +299,9 @@ export class QueryJoinExpression extends LogicItem {
   _insertJoinPartInJoinPartsAt(options: Partial<QueryJoinExpression> | QueryJoinExpression, index: number) {
     const queryJoinExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'joinParts' };
+    const QueryJoinExpression = getConceptConstructor('QueryJoinExpression');
     let queryJoinExpression: QueryJoinExpression;
-    if (options instanceof QueryJoinExpression) {
+    if (asserts.isQueryJoinExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryJoinExpression = options;
       Object.assign(queryJoinExpression, relationOptions);

package/src/concepts/QueryLimitExpression__.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 QueryLimitExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QueryLimitExpression';
+  static readonly ConceptName: string = 'QueryLimitExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -46,7 +45,6 @@ export class QueryLimitExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   pageElement!: LogicItem;
 
   /**
@@ -55,7 +53,6 @@ export class QueryLimitExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   pageSizeElement!: LogicItem;
 
   /**

package/src/concepts/QueryOrderByExpression__.ts

@@ -14,25 +14,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 QueryOrderByExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QueryOrderByExpression';
+  static readonly ConceptName: string = 'QueryOrderByExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,7 +46,6 @@ export class QueryOrderByExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   orderElement!: LogicItem;
 
   /**
@@ -56,7 +54,6 @@ export class QueryOrderByExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   order!: LogicItem;
 
   /**

package/src/concepts/QuerySelectExpression__.ts

@@ -3,27 +3,26 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 QueryAggregateExpression from './QueryAggregateExpression__';
-import QueryFieldExpression from './QueryFieldExpression__';
 import LogicItem from './LogicItem__';
+import type QueryAggregateExpression from './QueryAggregateExpression__';
+import type QueryFieldExpression from './QueryFieldExpression__';
 
 /**
  * 查询选择子句
  */
-@className
 @concept('查询选择子句')
-// @ts-ignore
 export class QuerySelectExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'QuerySelectExpression';
+  static readonly ConceptName: string = 'QuerySelectExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -122,6 +121,7 @@ export class QuerySelectExpression extends LogicItem {
   ) {
     const queryAggregateExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'selectElements' };
+    const QueryAggregateExpression = getConceptConstructor('QueryAggregateExpression');
     let queryAggregateExpression: QueryAggregateExpression;
     if (!options) {
       queryAggregateExpression = QueryAggregateExpression.from(
@@ -141,7 +141,7 @@ export class QuerySelectExpression extends LogicItem {
         this,
         'selectElements',
       );
-    } else if (options instanceof QueryAggregateExpression) {
+    } else if (asserts.isQueryAggregateExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryAggregateExpression = options;
       Object.assign(queryAggregateExpression, relationOptions);
@@ -297,6 +297,7 @@ export class QuerySelectExpression extends LogicItem {
   ) {
     const queryFieldExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'selectElements' };
+    const QueryFieldExpression = getConceptConstructor('QueryFieldExpression');
     let queryFieldExpression: QueryFieldExpression;
     if (!options) {
       queryFieldExpression = QueryFieldExpression.from(
@@ -316,7 +317,7 @@ export class QuerySelectExpression extends LogicItem {
         this,
         'selectElements',
       );
-    } else if (options instanceof QueryFieldExpression) {
+    } else if (asserts.isQueryFieldExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryFieldExpression = options;
       Object.assign(queryFieldExpression, relationOptions);

package/src/concepts/Rect__.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 Rect extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Rect';
+  static readonly ConceptName: string = 'Rect';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -33,28 +33,24 @@ export class Rect extends BaseNode {
    * x
    */
   @property()
-  // @ts-ignore
   x!: number;
 
   /**
    * y
    */
   @property()
-  // @ts-ignore
   y!: number;
 
   /**
    * width
    */
   @property()
-  // @ts-ignore
   width!: number;
 
   /**
    * height
    */
   @property()
-  // @ts-ignore
   height!: number;
 
   /**

package/src/concepts/Return__.ts

@@ -8,8 +8,8 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import EntityProperty from './EntityProperty__';
-import StructureProperty from './StructureProperty__';
+import type EntityProperty from './EntityProperty__';
+import type StructureProperty from './StructureProperty__';
 import { Diagnostic } from '../manager/diagnostic';
 
 function tryJSONParse(str: string) {
@@ -17,7 +17,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) { }
+  } catch (e) {}
 
   return result;
 }
@@ -27,34 +27,34 @@ function tryJSONParse(str: string) {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 DefaultValue from './DefaultValue__';
-import Logic from './Logic__';
-import View from './View__';
-import Module from './Module__';
-import App from './App__';
-import Connector from './Connector__';
-import Frontend from './Frontend__';
-import ProcessElement from './ProcessElement__';
-import Process from './Process__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type DefaultValue from './DefaultValue__';
+import type Logic from './Logic__';
+import type View from './View__';
+import type Module from './Module__';
+import type App from './App__';
+import type Connector from './Connector__';
+import type Frontend from './Frontend__';
+import type ProcessElement from './ProcessElement__';
+import type Process from './Process__';
 
 /**
  * 输出参数
  */
-@className
 @concept('输出参数')
-// @ts-ignore
 export class Return extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Return';
+  static readonly ConceptName: string = 'Return';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -67,14 +67,12 @@ export class Return extends BaseNode {
    * 输出参数名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 输出参数描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -83,7 +81,6 @@ export class Return extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -92,7 +89,6 @@ export class Return extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  // @ts-ignore
   defaultValue!: DefaultValue;
 
   /**
@@ -335,8 +331,7 @@ export class Return extends BaseNode {
     }
 
     if (this.defaultValue?.expression) {
-      const expressionJS = this.defaultValue.expression?.toJS?.() || `""`;
-      const { typeKind, typeName } = typeAnnotation || {};
+      const expressionJS = this.defaultValue?.toJS?.();
       code += expressionJS;
     } else {
       code += 'undefined';
@@ -352,15 +347,24 @@ export class Return extends BaseNode {
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     let code = self.name || '__return';
+    const { typeNamespace, typeName } = self.typeAnnotation || {};
+    let typeKey = self.typeAnnotation?.typeKey;
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app?.findNodeByCompleteName(typeNamespace + '.' + typeName);
+      const { typeAnnotation } = referenceNode || {};
+      typeKey = `${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
+    }
     if (self.typeAnnotation) {
       code += ': ';
       code += yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code));
     }
     if (
       self.defaultValue?.expression &&
-      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(yield* self.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''))
+      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(
+        yield* self.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin(''),
+      )
     ) {
-      if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(self.typeAnnotation?.typeKey)) {
+      if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
         code += yield* self.defaultValue.toEmbeddedTS(shiftState(state, code), true);
       } else {
         code += ` = `;