@lcap/nasl 3.8.0-beta.3 → 3.8.0-beta.5

package/sandbox/stdlib/nasl.ui.ts

@@ -125,6 +125,16 @@ declare namespace nasl.ui {
         dirty: nasl.core.Boolean;
         firstError: nasl.core.String;
     }
+    export class ValidateResult {
+        rawValue: nasl.core.String;
+        value: nasl.core.String;
+        trigger: nasl.core.String;
+        muted: nasl.core.String;
+        valid: nasl.core.Boolean;
+        touched: nasl.core.Boolean;
+        dirty: nasl.core.Boolean;
+        firstError: nasl.core.String;
+    }
     export class PaginationEvent {
         page: nasl.core.Long;
         oldPage: nasl.core.Long;

package/sandbox/stdlib/nasl.util.ts

@@ -147,4 +147,15 @@ declare namespace nasl.util {
   export function callLogicWithChecker<T extends (...args: any[]) => any>(func: T, checker: (...args: Parameters<T>) => any): T;
   // 分页组件函数
   export function paginateLimit<T>(list: nasl.collection.List<T>, page: nasl.core.Long, size: nasl.core.Long): { list: nasl.collection.List<T>, total: nasl.core.Long };
+
+  // 判断ReturnType是否包含‘enums’, 只给组件属性校验使用
+  export function bindAttrWrap<T extends (...args: any[]) => any, I extends boolean>(func: T, ignore: I): I extends true
+    ? any
+    : ReturnType<T> extends nasl.core.Enums<any>
+      ? any
+      : ReturnType<T> extends nasl.collection.List<infer E>
+        ? E extends nasl.core.Enums<any>
+          ? any
+          : ReturnType<T>
+        : ReturnType<T>;
 }

package/sandbox/stdlib/nasl.validation.ts

@@ -5,7 +5,7 @@ declare namespace nasl.validation {
     export function min(min: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
     export function max(min: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
     export function range(min: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime, max: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
-    export function pattern(re: nasl.core.String | RegExp): nasl.core.Boolean;
+    export function pattern(re: nasl.core.String | RegExp, strict?: nasl.core.Boolean, matchCase?: nasl.core.Boolean): nasl.core.Boolean;
     export function is(arg: nasl.core.Any): nasl.core.Boolean;
     export function isNot(arg: nasl.core.Any): nasl.core.Boolean;
     export function equals(arg: nasl.core.Any): nasl.core.Boolean;
@@ -26,7 +26,8 @@ declare namespace nasl.validation {
     export function hash(algorithm?: nasl.core.String): nasl.core.Boolean;
     export function isbn(version: nasl.core.String): nasl.core.Boolean;
     export function iso8601(strict: nasl.core.Boolean): nasl.core.Boolean;
-    export function mobile(locale?: nasl.core.String | nasl.collection.List<nasl.core.String>, strict?: nasl.core.Boolean): nasl.core.Boolean;
+    export function creditCard(types: nasl.collection.List<nasl.core.String>): nasl.core.Boolean;
+    export function mobile(locale: nasl.core.String | nasl.collection.List<nasl.core.String>, strict: nasl.core.Boolean): nasl.core.Boolean;
     export function postalCode(locale: nasl.core.String | nasl.collection.List<nasl.core.String>): nasl.core.Boolean;
     export function uuid(version?: nasl.core.String): nasl.core.Boolean;
     export function errorMessage(message?: nasl.core.Any): nasl.core.String;

package/sandbox-natural/stdlib/nasl.ui.pre.d.ts

@@ -67,7 +67,7 @@ declare namespace nasl.ui {
     which: nasl.core.Integer;
   }
 
-  export interface ValidateEvent {
+  export interface ValidateResult {
     rawValue: nasl.core.String;
     value: nasl.core.String;
     trigger: nasl.core.String;

package/sandbox-natural/stdlib/nasl.ui.ts

@@ -1,7 +1,7 @@
 declare namespace nasl.ui {
   export interface MouseEvent { }
 
-  export interface ValidateEvent { valid: Boolean; }
+  export interface ValidateResult { valid: Boolean; }
 
   export class Button {
     constructor(options?: {
@@ -14,7 +14,7 @@ declare namespace nasl.ui {
   export class Form {
     constructor(options?: {});
 
-    validate(): ValidateEvent;
+    validate(): ValidateResult;
   }
 
   export class Modal {

package/sandbox-natural/stdlib/nasl.util.ts

@@ -36,8 +36,8 @@ declare namespace nasl.util {
   export function AlterDateTime<T extends Date | DateTime>(dateTime: T, option: 'Increase' | 'Decrease', amount: Long, unit: 'day' | 'week' | 'month' | 'quarter' | 'year'): T;
   /* 按指定维度计算日期，如“所在年-第几周”。当输入为 DateTime 类型时，会把数据转到提供的时区的当地时间进行计算。*/
   export function GetDateCount<T extends Date | DateTime>(dateTime: T, metric: 'week-year', timeZone: string): Time;
-  /* 按“星期几”获取指定日期范围内的日子。当输入为 DateTime 类型时，会把数据转到提供的时区的当地时间进行计算。*/
-  export function GetSpecificDaysOfWeek<T extends Date | DateTime>(startDate: T, endDate: T, target: List<Long>, timeZone: string): Time;
+  /* 按“星期几”获取指定日期范围内的日子。当输入为 DateTime 类型时，会把数据转到提供的时区的当地时间进行计算。target 取值范围 [1,2,3,4,5,6,7] */
+  export function GetSpecificDaysOfWeek<T extends Date | DateTime>(startDate: T, endDate: T, target: List<Long>, timeZone?: String): List<T>;
 
   // 列表（List）函数
   export function Add<T, K extends T>(list: List<T>, item: K): void;

package/src/automate/engine/utils.js

@@ -82,8 +82,7 @@ export function getNaslNodeByNodeCallee(namespace, typeName) {
         return interfaceStructures.find((item) => item.name === typeName);
     } else if (namespace === 'nasl.process') {
         return processStructures.find((item) => item.name === typeName);
-    } else if (namespace === 'nasl.processV2') {
-        console.log(123)
+    } else if (namespace?.includes('nasl.processV2')) {
         const findStructure = processV2Structures.find((item) => item.name === typeName);
         if(findStructure) {
             return findStructure;

package/src/bak/translator.js

@@ -29,7 +29,7 @@ function genVarInitialVal(variable, URLParamRetrieval) {
     code += `this.$genInitFromSchema('${sortedTypeKey}', `;
   }
   if (variable.concept === 'Param' && URLParamRetrieval) {
-    code += `this.$route.query.hasOwnProperty('${variable.name}') ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${variable.name}) :`;
+    code += `this.$route.query.hasOwnProperty('${variable.name}') && !['undefined', 'null'].includes(this.$route.query.${variable.name}) ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${variable.name}) :`;
   }
   const { defaultValue } = variable;
   // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态

package/src/common/BaseNode.ts

@@ -30,7 +30,6 @@ const patchCompose = (node: BaseNode, type = 'add') => {
   }
 }
 
-
 type NodePathOption = {
   useName?: boolean,
 }
@@ -328,7 +327,10 @@ export class BaseNode extends EventEmitter {
         (app?.getDefaultOnAnno()?.[source.concept] as any)?.map((anno:any)=>{
           if((this as any)?.applyAnnotations?.length>0){
             // (this as any)?._addApplyAnnotation(anno?.transToApplyAnno())
-            (this as any)?.applyAnnotations.push(anno?.transToApplyAnno())
+            let aanno = anno?.transToApplyAnno()
+            if(!(this as any)?.applyAnnotations?.find((aa:any)=>aa.annotationName===aanno.annotationName)){
+              (this as any)?.applyAnnotations.push(aanno)
+            }
           }else{
             (this as any).applyAnnotations = [anno?.transToApplyAnno()]
             // this.update({
@@ -809,7 +811,9 @@ export class BaseNode extends EventEmitter {
     // 有一些继承的情况
     const Ctor = classMap.get(source?.concept) || this;
     if (Ctor && source instanceof Ctor) {
-      console.warn('传入的对象已经是一个实例，请确认逻辑是否存在问题！')
+      if (utils.isDebugMode) {
+        console.warn('传入的对象已经是一个实例，请确认逻辑是否存在问题！');
+      }
       if (parentNode) {
         source.parentNode = parentNode;
       }

package/src/concepts/App__.ts

@@ -3644,7 +3644,7 @@ export class App extends BaseNode {
       if (dep?.annotations?.length > 0) {
         dep.annotations.forEach((anno) => {
           let useAnno:any = anno?.properties?.find((p) => p?.name === 'useAnno');
-          if (useAnno && useAnno.defaultValue?.expression?.value === 'true') {
+          if (useAnno && ['true',true].includes(useAnno.defaultValue?.expression?.value) ) {
             anno.applyTo.map((concept) => {
               result[concept].push(anno);
             });
@@ -4131,9 +4131,14 @@ export class App extends BaseNode {
             const jsName = `${prefix}/packages/${
               prefixPath ? `${prefixPath}/` : ''
             }${name}@${version}/dist-theme/index.js`;
+            const cssName = `${prefix}/packages/${
+              prefixPath ? `${prefixPath}/` : ''
+            }${name}@${version}/dist-theme/index.css`;
+
             if (!existingSet.has(jsName)) {
               existingSet.add(jsName);
               result.custom.js.push(jsName);
+              result.custom.css.push(cssName);
               result.custom.names.push(dep.name);
             }
           }
@@ -4408,6 +4413,9 @@ export class App extends BaseNode {
       frontendType?.frontends?.forEach((frontend) => {
         resultLogics = [...resultLogics, ...frontend.getExtensionsCallbackLogics()];
       });
+      frontendType?.businessComponents?.forEach((businessComponent) => {
+        resultLogics = [...resultLogics, ...(businessComponent?.getViewCallLogics?.() || [])];
+      });
     });
     return Array.from(new Set(resultLogics));
   }

package/src/concepts/Argument__.ts

@@ -150,9 +150,8 @@ export class Argument extends LogicItem {
 
   toJS(state?: TranslatorState): string {
     let code = this.spread ? '...' : '';
-    if (this.expression) {
-      const resultCode = this.expression.toJS(state);
-      const { typeName, typeNamespace } = (this.expression as any)?.__nodeType || {};
+    if (this.expression || this.paramDefaultValue) {
+      const resultCode = this.expression?.toJS?.(state) || this.paramDefaultValue?.toJS(state);
       code += resultCode;
     } else {
       code += 'undefined';
@@ -309,6 +308,7 @@ export class Argument extends LogicItem {
   fromSubLogicBySignature(typeAnnotation: TypeAnnotation): SubLogic {
     if (!asserts.isTypeAnnotation(typeAnnotation)) return;
     const parentLogic = this.getAncestor('Logic');
+    const parentView = this.getAncestor('View');
     const callLogic = this.getAncestor('CallLogic');
     if (!asserts.isCallLogic(callLogic)) return;
 
@@ -344,8 +344,13 @@ export class Argument extends LogicItem {
       }
     )
 
-    if (!asserts.isLogic(parentLogic)) return;
-    const uniqueName = parentLogic.getSubLogicUniqueName();
+    let uniqueName = '';
+    if (asserts.isLogic(parentLogic)) {
+      uniqueName = parentLogic.getSubLogicUniqueName();
+    } else if (asserts.isView(parentView)) {
+      uniqueName = parentView.getSubLogicUniqueName();
+    }
+    if (!uniqueName) return;
     return this.createSubLogic({
       name: uniqueName,
       params: paramTypes,

package/src/concepts/AuthLogicForCallInterface__.ts

@@ -362,6 +362,9 @@ export class AuthLogicForCallInterface extends AuthLogic {
           // 内置函数对集合类型的推导
           (asserts.isCallFunction(el) && el.derivablecollection?.name))
       ) {
+        if (el?.getAncestor('SubLogic')) {
+          return;
+        }
         if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
             (variable) => !variable.typeAnnotation && el.left?.name === variable.name,

package/src/concepts/BinaryExpression__.ts

@@ -210,6 +210,9 @@ export class BinaryExpression extends LogicItem {
   }
 
   toVue(options?: ElementToVueOptions) {
+    if (options?.finalCode === false) {
+      return this.toUI(options);
+    }
     if (['startwith', 'endwith'].includes(this.operator)) {
       const operatorMap = {
         startwith: 'startsWith',
@@ -224,9 +227,50 @@ export class BinaryExpression extends LogicItem {
       return code;
     }
     let code = '';
-    code += `(${this.left?.toVue(options) || ''})`;
+    const left = this.left?.toVue(options) || '';
+    const right = this.right?.toVue(options) || '';
+    if (['+', '-', '*', '/'].includes(this.operator)) {
+      const operatorMap: any = {
+        '+': 'add',
+        '-': 'minus',
+        '*': 'multiply',
+        '/': 'divide',
+      };
+      code += `$global.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
+      code += left;
+      code += `,`;
+      code += right;
+      code += ')';
+      return code;
+    }
+    if (['>', '>=', '<', '<='].includes(this.operator)) {
+      const leftType = this.left?.getCurrentAnnotatedJSON();
+      const rightType = this.right?.getCurrentAnnotatedJSON();
+      // 如果两边类型一致可以做一些特殊比较
+      if (leftType?.typeKey === rightType?.typeKey) {
+        if (leftType?.typeName === 'Time') {
+          code += `Date.parse('2000-01-01T' + ${left})`;
+          code += ` ${this.operator} `;
+          code += `Date.parse('2000-01-01T' + ${right})`;
+        } else if (leftType?.typeName === 'Date' || leftType?.typeName === 'DateTime') {
+          code += `Date.parse(${left})`;
+          code += ` ${this.operator} `;
+          code += `Date.parse(${right})`;
+        } else {
+          code += `(${left})`;
+          code += ` ${this.operator} `;
+          code += `(${right})`;
+        }
+      } else {
+        code += `(${left})`;
+        code += ` ${this.operator} `;
+        code += `(${right})`;
+      }
+      return code;
+    }
+    code += `(${left})`;
     code += ` ${this.operator} `;
-    code += `(${this.right?.toVue(options) || ''})`;
+    code += `(${right})`;
     return code;
   }
 

package/src/concepts/BindAttribute__.ts

@@ -1,3 +1,4 @@
+import * as json5 from 'json5';
 import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
@@ -10,17 +11,18 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import { ElementToVueOptions } from './ViewElement__';
+import ViewElement, { ElementToVueOptions } from './ViewElement__';
 import type Namespace from './Namespace__';
 import type MemberExpression from './MemberExpression__';
+import CallFunction from './CallFunction__';
 
-import ViewElement from './ViewElement__';
 import View from './View__';
 import Module from './Module__';
 import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 import { kebab2Camel } from '../utils';
+import { config } from '../config';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -47,11 +49,13 @@ import AssigneeV2 from './AssigneeV2__';
 export class BindAttribute extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'BindAttribute';
+
   /**
    * 是否为抽象类
    * 抽象类不能产生 concept: string
    */
   static isAbstract: boolean = false;
+
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -61,6 +65,7 @@ export class BindAttribute extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'BindAttribute';
+
   /**
    * 元素绑定属性名称
    */
@@ -161,7 +166,7 @@ export class BindAttribute extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<BindAttribute>) {
-    source = Object.assign({}, BindAttribute.getDefaultOptions(), source);
+    source = { ...BindAttribute.getDefaultOptions(), ...source};
     super(source);
     super.subConstructor(source);
   }
@@ -273,6 +278,7 @@ export class BindAttribute extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.rules as ValidationRule[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getValidationRuleUniqueName(name = 'validationRule1') {
     return utils.unique(name, this.getValidationRuleExistingNames(), undefined, false);
   }
@@ -541,7 +547,7 @@ export class BindAttribute extends BaseNode {
     if (typeof options === 'string') {
       validationRule = (this.rules as ValidationRule[]).find((item) => item.name === options);
       if (!validationRule) {
-        throw new Error('找不到验证规则 ' + options);
+        throw new Error(`找不到验证规则 ${  options}`);
       }
     } else {
       validationRule = options;
@@ -556,7 +562,7 @@ export class BindAttribute extends BaseNode {
   removeItem(logicItem: LogicItem): void;
 
   removeItem(options: LogicItem) {
-    let logicItem: LogicItem = options;
+    const logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
@@ -570,30 +576,35 @@ export class BindAttribute extends BaseNode {
   get viewElement() {
     return this.getAncestor('ViewElement') as ViewElement;
   }
+
   /**
    * 祖先 View
    */
   get view() {
     return this.getAncestor('View') as View;
   }
+
   /**
    * 祖先 Module
    */
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 Frontend
    */
   get frontend() {
     return this.getAncestor('Frontend') as Frontend;
   }
+
   /**
    * 祖先 ProcessElement
    */
   get processElement() {
     return this.getAncestor('ProcessElement') as ProcessElement;
   }
+
   /**
    * 祖先 Process
    */
@@ -929,7 +940,7 @@ export class BindAttribute extends BaseNode {
         transfromUnionTypeAnnotation(expTypeAnnotation, this.app);
         if (expTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
           const referenceNode =
-            this.app.findNodeByCompleteName(expTypeAnnotation.typeNamespace + '.' + expTypeAnnotation.typeName)
+            this.app.findNodeByCompleteName(`${expTypeAnnotation.typeNamespace  }.${  expTypeAnnotation.typeName}`)
               ?.typeAnnotation || {};
           value = `$utils['ToString']('${referenceNode?.typeNamespace}.${referenceNode.typeName}', ${value})`;
         } else {
@@ -961,10 +972,12 @@ export class BindAttribute extends BaseNode {
   }
 
   @withSourceMapGenerator
-  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+  *toEmbeddedTS(state = createCompilerState(), options: { carryName: boolean } = { carryName: false }): TranslatorGenerator {
     const self = this;
     const { name, type, value, rules, expression, playground } = self;
     const humpName = self.toHump(name);
+    const { allNodesAPI = {} } = config;
+    const { carryName } = options;
 
     let code = '';
     if (!name) {
@@ -977,44 +990,84 @@ export class BindAttribute extends BaseNode {
     }
 
     // 不翻译的属性
-    const excludeProps = ['dataSchema', 'key'];
+    const excludeProps = [
+      'dataSchema',
+      'key',
+    ];
     if (excludeProps.includes(humpName)) {
       return code;
     }
 
-    // feild属性需要特殊处理
-    if (['valueField', 'textField', 'parentField', 'childrenField'].includes(humpName)) {
-      if (type !== 'dynamic') {
-        code += `item => item.${value}`;
-      }
-      return code;
+    if (carryName) {
+      code += `${humpName}: `;
     }
 
-    // 特殊处理dataSource
-    if (['dataSource'].includes(humpName)) {
-      code += `(()`;
-
-      // if (!expression) {
-      code += ': any';
-      // }
+    // 从allNodesAPI中找到对应的属性
+    let prop;
+    if (allNodesAPI && self.parentNode.concept === 'ViewElement') {
+      prop = allNodesAPI[self.parentNode.tag]?.props?.find((item) => item.name === humpName);
+    }
 
-      code += ' => {\n';
+    // feild属性需要特殊处理
+    if (self.parentNode.concept === 'ViewElement') {
+      // allNodesAPI中找到对应的属性
+      if (/\(\s*item\s*:\s*T\s*\)\s*=>\s*.+/.test(prop?.tsType)) {
+        if (type === 'dynamic') {
+          code += `((): any => {})()`;
+        } else {
+          code += `item => item${value ? `.${value}` : ''}`;
+        }
 
-      if (expression) {
-        code += `return `;
-        code += yield* expression.toEmbeddedTS(
-          shiftState(state, code, {
-            tabSize: (state?.tabSize || 0) + 1,
-          }),
-        );
-        code += ';\n';
+        return code;
       }
+    }
 
-      code += `})()`;
-      return code;
+    // 不校验类型的属性
+    const ignoreCheckProps = [
+      'sorting',
+      'advancedFormat',
+      'unit',
+      'decimalPlaces',
+      'autosize',
+
+      'destination',
+      'externalDestination',
+      'rules',
+      'url',
+
+      'dataSource',
+      'converter',
+    ]
+
+    // @ts-ignore
+    if (prop?.implicitToString) {
+      ignoreCheckProps.push(humpName);
     }
+    // 数据源是Enum的value属性
+    if (name === 'value' && self.parentNode.concept === 'ViewElement') {
+      // 向上查找ViewElement
+      const dataSourceAttr = self.parentNode.bindAttrs.find((attr) => attr.name === 'dataSource');
+      // @ts-ignore
+      if (dataSourceAttr?.expression && (/Enum/.test(dataSourceAttr?.expression?.name) || /Enum/.test(dataSourceAttr?.expression?.calleeName))) {
+        ignoreCheckProps.push(humpName);
+      }
+    }
+    if (type === 'dynamic' && !expression) {
+      ignoreCheckProps.push(humpName);
+    }
+    if (['string', 'static'].includes(type) && ['', undefined, null].includes(value)) {
+      ignoreCheckProps.push(humpName);
+    }
+    if (['string', 'static'].includes(type) && /^\[.*\]$/.test(value)) {
+      ignoreCheckProps.push(humpName);
+    }
+
+    const ignore = ignoreCheckProps.includes(humpName);
+    const start = `nasl.util.bindAttrWrap(() => {\n`;
+    const end = `}, ${ignore ? 'true' : 'false'})`;
+
+    code += start;
 
-    code += `((): any => {\n`;
     code += `return `;
 
     if (['destination', 'externalDestination'].includes(name) && type === 'dynamic') {
@@ -1053,12 +1106,56 @@ export class BindAttribute extends BaseNode {
         code += ';\n';
       }
     } else if (['static', 'string'].includes(type)) {
-      code +=
-        typeof value === 'boolean'
-          ? value
-          : ['true', 'false'].includes(value)
-            ? value.replace(/'/g, '')
-            : JSON.stringify(value);
+      if (ignore) {
+        code += `new nasl.core.StringLiteral<\`\`>()`;
+      } else {
+        const formattedValue = typeof value === 'string'
+          ? value.trim()
+          : value;
+
+        // 普通string类型的属性
+        if (type === 'string') {
+          // 存在特殊字符的情况
+          if (/(<|>|\\r|\\n)/g.test(formattedValue)) {
+            code += `new nasl.core.StringLiteral<\`StringLiteral\`>()`;
+          } else {
+            code += `new nasl.core.StringLiteral<\`${formattedValue}\`>()`;
+          }
+        }
+
+        // 普通static类型的属性
+        if (type === 'static') {
+          let t = 'string';
+
+          try {
+            const val = json5.parse(formattedValue);
+            // @ts-ignore
+            t = typeof val || 'string';
+          } catch (error) {
+
+          }
+
+          switch (t) {
+            case 'string':
+              code += `new nasl.core.StringLiteral<\`StringLiteral\`>()`;
+              break;
+            case 'number':
+              if (String(formattedValue).includes('.')) {
+                code += `new nasl.core.Decimal(${formattedValue})`;
+              } else {
+                code += `new nasl.core.Long(${formattedValue})`;
+              }
+              break;
+            case 'boolean':
+              code += [true, 'true'].includes(formattedValue) ? `new nasl.core.BooleanTrue()` : `new nasl.core.BooleanFalse()`;
+              break;
+            default:
+              code += `new nasl.core.StringLiteral<\`\`>()`;
+              break;
+          }
+        }
+      }
+
       code += ';\n';
     }
 
@@ -1069,7 +1166,7 @@ export class BindAttribute extends BaseNode {
       });
     }
 
-    code += `})()`;
+    code += end;
     return code;
   }
 
@@ -1087,13 +1184,14 @@ export class BindAttribute extends BaseNode {
         ].includes(node.parentNode.tag)
       ) {
         return node.parentNode;
-      } else {
-        return this.findCurrentElementParent(node.parentNode);
       }
-    } else {
-      return undefined;
+        return this.findCurrentElementParent(node.parentNode);
+
     }
+      return undefined;
+
   }
+
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = `${kebab2Camel(this.name)}: `;
@@ -1176,9 +1274,9 @@ export function attrConvertCamelCase(str: string) {
   strList = strList.map((strItem, index) => {
     if (index === 0) {
       return strItem;
-    } else {
-      return `${strItem.slice(0, 1).toUpperCase()}${strItem.slice(1)}`;
     }
+      return `${strItem.slice(0, 1).toUpperCase()}${strItem.slice(1)}`;
+
   });
   return strList.join('');
 }