@lcap/nasl 2.21.0-beta.2 → 2.21.0-beta.3

package/src/templator/genQueryComponent.ts

@@ -166,11 +166,11 @@ export function genQueryLogic(allEntities: Array<Entity>, nameGroup: NameGroup,
         params: [
             NaslNode.Param({
                 name: 'page',
-                typeAnnotation: NaslCoreTypeAnnotation.Long,
+                typeAnnotation: NaslCoreTypeAnnotation.Integer,
             }),
             NaslNode.Param({
                 name: 'size',
-                typeAnnotation: NaslCoreTypeAnnotation.Long,
+                typeAnnotation: NaslCoreTypeAnnotation.Integer,
             }),
         ],
         returns: [
@@ -276,10 +276,10 @@ export async function joinEntity(callQueryComponent: CallQueryComponent, entity:
             typeName: entity.name,
         }),
     }), recordStructure, 'properties');
-
-    if (recordStructure instanceof Structure)
+    
+    if(recordStructure instanceof Structure)
         recordStructure.addProperty(structureProperty);
-    else if (recordStructure instanceof TypeAnnotation)
+    else if(recordStructure instanceof TypeAnnotation)
         recordStructure.properties.push(structureProperty);
 
     const newJoinPartLogicItem = QueryJoinExpression.from(queryJoinExpression, callQueryComponent, 'joinParts');

package/src/templator/genSelectBlock.ts

@@ -186,7 +186,15 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
         callLogics.push(NaslLogicItem.Assignment({
             left: itemExpression.expression,
             right: NaslLogicItem.Identifier({
-                name: view.getVariableUniqueName('itemInputVariable'),
+                name: nameGroup.itemInputVariableName,
+            }),
+        }));
+        callLogics.push(NaslLogicItem.Assignment({
+            left: NaslLogicItem.Identifier({
+                name: nameGroup.itemInputVariableName,
+            }),
+            right: NaslLogicItem.StringLiteral({
+                value: '',
             }),
         }));
         callLogics.push(NaslLogicItem.Assignment({

package/src/templator/utils.ts

@@ -189,17 +189,17 @@ function genNaslUIGenericTypeAnnotation(typeName: string) {
 
 export const NaslCoreTypeAnnotation = {
     Boolean: genNaslCoreTypeAnnotation('Boolean'),
-    // Integer: genNaslCoreTypeAnnotation('Integer', 'Integer 整数'),
-    // Double: genNaslCoreTypeAnnotation('Double'),
+    Integer: genNaslCoreTypeAnnotation('Integer', 'Integer 整数'),
+    Double: genNaslCoreTypeAnnotation('Double'),
     Decimal: genNaslCoreTypeAnnotation('Decimal'),
-    Long: genNaslCoreTypeAnnotation('Long', ' Integer 整数'),
-    String: genNaslCoreTypeAnnotation('String', 'String 文本'),
-    // Text: genNaslCoreTypeAnnotation('Text'),
+    Long: genNaslCoreTypeAnnotation('Long', 'Long 长整数'),
+    String: genNaslCoreTypeAnnotation('String', 'String 字符串'),
+    Text: genNaslCoreTypeAnnotation('Text'),
     Binary: genNaslCoreTypeAnnotation('Binary'),
     Date: genNaslCoreTypeAnnotation('Date'),
     Time: genNaslCoreTypeAnnotation('Time'),
     DateTime: genNaslCoreTypeAnnotation('DateTime'),
-    // Email: genNaslCoreTypeAnnotation('Email'),
+    Email: genNaslCoreTypeAnnotation('Email'),
 };
 
 export const NaslUITypeAnnotation = {
@@ -262,7 +262,7 @@ export const NaslTypeAnnotation = {
                 concept: 'TypeAnnotation',
                 typeKind: 'primitive',
                 typeNamespace: 'nasl.core',
-                typeName: 'Long',
+                typeName: 'Integer',
             },
         }],
     }),

package/ts-worker/lib/Messager.js

@@ -138,7 +138,6 @@ class Messager {
      * @override
      */
     onMessageReceived(e) {
-        console.log('onMessageReceived: ', e);
         if (!e.data)
             return;
         this.onDataReceived(e.data);
@@ -148,7 +147,6 @@ class Messager {
      * @override
      */
     onDataReceived(data) {
-        console.log('onDataReceived: ', data);
         if (data.protocol !== this.options.protocol)
             return;
         if (data.type === 'response') {
@@ -160,7 +158,6 @@ class Messager {
         }
         if (data.command) {
             const func = this.options.context[data.command];
-            console.log('func: ', this.options.context, func);
             if (!func)
                 // 函数不存在时不 response
                 return;

package/ts-worker/src/index.js

@@ -141,7 +141,6 @@ const context = {
     },
     // 在初始化之前添加文件
     addFile(file) {
-        console.log('ts-worker addFile');
         this.system.writeFile(file.file, file.fileContent);
     },
     /**

package/src/concepts/DatabaseTypeAnnotation__.ts

@@ -1,88 +0,0 @@
-//================================================================================
-// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
-// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
-import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
-
-import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
-
-
-/**
- * 数据库存储类型
- */
-@concept('数据库存储类型')
-export class DatabaseTypeAnnotation extends BaseNode {
-    /**
-     * 产品概念
-     */
-    @property()
-    concept: 'DatabaseTypeAnnotation' = 'DatabaseTypeAnnotation';
-
-    /**
-     * 类型名
-     */
-    @property()
-    typeName: string = undefined;
-
-    /**
-     * arguments
-     */
-    @property()
-    arguments: Map<string, string> = undefined;
-
-    
-
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source?: Partial<DatabaseTypeAnnotation>) {
-        source = Object.assign({}, DatabaseTypeAnnotation.getDefaultOptions(), source);
-        super(source);
-        super.subConstructor(source);
-    }
-    getClassName() {
-        return 'DatabaseTypeAnnotation';
-    }
-
-    static from(source: any, parentNode?: any, parentKey?: string): DatabaseTypeAnnotation {
-        return super.from(source, parentNode, parentKey) as DatabaseTypeAnnotation;
-    }
-
-    /**
-     * 从父级删除该节点
-     * @internal
-     */
-    _delete() {
-        let params: Params = null;
-        if (this.parentNode) {
-            params = (this.parentNode as any)?.__removeDatabaseTypeAnnotation?.(this);
-        }
-        return params;
-    }
-    
-
-    
-
-    
-
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-
-    //================================================================================
-    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
-    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-    //================================================================================
-}
-
-classMap.DatabaseTypeAnnotation = DatabaseTypeAnnotation;
-export default DatabaseTypeAnnotation;
-//================================================================================
-// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-// 自动生成的代码已结束。下面可以手动编写。
-//================================================================================