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

package/src/concepts/TypeAnnotation__.ts

@@ -24,10 +24,10 @@ export enum PRIMITIVE_TYPE {
 export const PRIMITIVE_TITLE: Record<string, string> = {
     Boolean: '布尔值',
     Integer: '整数',
-    Long: '整数',
+    Long: '长整数',
     Double: '小数',
-    Decimal: '小数',
-    String: '文本',
+    Decimal: '精确小数',
+    String: '字符串',
     Text: '长文本',
     Binary: '二进制流',
     Date: '日期',
@@ -37,22 +37,6 @@ export const PRIMITIVE_TITLE: Record<string, string> = {
     Union: '联合类型',
 };
 
-export const PRIMITIVE_DESC: Record<string, string> = {
-    Boolean: '包含真（true）、假（false）两个值',
-    Long: '可表示最大长度约 19 个数字的正负整数',
-    Decimal: '可表示 31 个有效数字以内的小数',
-    String: '表示汉语、英语、数字等文本内容',
-    Date: '通常用于仅日期处理和数据存储',
-    Time: '通常用于仅时间处理和数据存储',
-    DateTime: '通常用于日期和时间的处理和数据存储',
-};
-
-export const GENERIC_DESC: Record<string, string> = {
-    List: 'T类型的数据构成的列表',
-    Map: '从K类型到V类型的映射',
-};
-
-
 /**
  * 判断是否是联合类型
  * @param typeAnnotation
@@ -93,7 +77,7 @@ export class TypeAnnotation extends BaseNode {
      * 类型种类
      */
     @property()
-    typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'union' | 'anonymousStructure' | 'function' = undefined;
+    typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure' = undefined;
 
     /**
      * 类型命名空间
@@ -137,8 +121,6 @@ export class TypeAnnotation extends BaseNode {
     @property()
     ruleMap: Object = undefined;
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -178,10 +160,6 @@ export class TypeAnnotation extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -214,8 +192,6 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -238,8 +214,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -259,8 +233,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInTypeArgumentsAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -284,8 +256,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -318,8 +288,6 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -342,8 +310,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -363,8 +329,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInReturnTypeAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -388,11 +352,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入数据结构属性
     * @internal
@@ -425,8 +384,6 @@ export class TypeAnnotation extends BaseNode {
         return structureProperty;
     }
 
-    
-
     /**
      * 插入数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -449,8 +406,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加数据结构属性
      * @internal
@@ -470,8 +425,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertStructurePropertyAt(options as any, index);
     }
 
-    
-
     /**
      * 添加数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -495,9 +448,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -505,12 +455,10 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInTypeArguments(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInTypeArguments(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -518,7 +466,7 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInReturnType(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInReturnType(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -545,8 +493,6 @@ export class TypeAnnotation extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除数据结构属性
      * @param structureProperty 已有的数据结构属性实例
@@ -554,7 +500,7 @@ export class TypeAnnotation extends BaseNode {
     removeStructureProperty(structureProperty: StructureProperty): void;
 
     removeStructureProperty(options: StructureProperty) {
-        let structureProperty: StructureProperty = options;
+        const structureProperty: StructureProperty = options;
         return structureProperty.delete();
     }
 
@@ -659,9 +605,6 @@ export class TypeAnnotation extends BaseNode {
      */
     get headTitle(): string {
         if (this.typeKind === 'primitive') {
-            if (this.typeName === 'Long') {
-                return `Integer ${PRIMITIVE_TITLE[this.typeName] || ''}`;
-            }
             return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName] || ''}`;
         } else if (this.typeKind === 'reference') {
             const typeNamespace = this?.typeNamespace;
@@ -696,9 +639,6 @@ export class TypeAnnotation extends BaseNode {
      */
     get typeTitle(): string {
         if (this.typeKind === 'primitive') {
-            if (this.typeName === 'Long') {
-                return `Integer ${PRIMITIVE_TITLE[this.typeName] || ''}`;
-            }
             return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName] || ''}`;
         } else if (this.typeKind === 'reference') {
             return this.typeName;
@@ -951,7 +891,7 @@ export class TypeAnnotation extends BaseNode {
             const DateTimeReg = /^\d{1,4}(\/|-)\d{1,2}(\/|-)\d{1,2}\s(\d{1,2})(:\d{1,2})?:(\d{1,2})$/;
             const BooleanReg = /(false|true|\u662f|\u5426)/i;
             if (EmailReg.test(code)) {
-                return this.createPrimitive('String');
+                return this.createPrimitive('Email');
             } else if (TimeReg.test(code)) {
                 return this.createPrimitive('Time');
             } else if (BooleanReg.test(code)) {
@@ -962,19 +902,19 @@ export class TypeAnnotation extends BaseNode {
                 return this.createPrimitive('DateTime');
             } else if (!isNaN(Number(code))) {
                 if (code.indexOf('.') !== -1) {
-                    return this.createPrimitive('Decimal');
+                    return this.createPrimitive('Double');
                     // return this.createPrimitive('Decimal');
                 }
                 if (code.length > 8) {
                     return this.createPrimitive('Long');
                 }
-                return this.createPrimitive('Long');
+                return this.createPrimitive('Integer');
             } else if (code.length > 255) {
-                return this.createPrimitive('String');
+                return this.createPrimitive('Text');
             }
             return this.createPrimitive('String');
         } else {
-            return this.createPrimitive('Long');
+            return this.createPrimitive('Integer');
         }
     }
     // 增加插入泛型子类型

package/src/concepts/Variable__.ts

@@ -386,7 +386,7 @@ export class Variable extends BaseNode {
 
             // 处理下拉属性
             try {
-                this.completionChildren = this.getSelectRef(typeAnnotation);
+                this.completionChildren = this.getSelectRef(typeAnnotation, true);
             } catch (err) {
                 this.completionChildren = [];
                 console.log(err);
@@ -417,63 +417,6 @@ export class Variable extends BaseNode {
     get readonly() {
         return !!this.module;
     }
-    get hasChildren() {
-        if (!this.typeAnnotation)
-            return null;
-        const { typeKind, typeName, typeNamespace } = this.typeAnnotation;
-        if (typeKind === 'reference' || typeKind === 'generic') {
-            if (typeNamespace.endsWith('.enums'))
-                return null;
-            return [{}];
-        } else if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {
-            return [{}];
-        }
-        return null;
-    }
-    get isTreeLeaf() {
-        return !this.hasChildren;
-    }
-    getSelectRef(newTypeAnnotation: TypeAnnotation) {
-        try {
-            const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
-            let completionChildren;
-            if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process' || typeNamespace === 'nasl.auth') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                    const properties = (node as Structure)?.properties || [];
-                    completionChildren = properties;
-                } else if (typeNamespace.endsWith('.enums')) {
-                    completionChildren = [];
-                } else {
-                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
-                    const properties = node?.properties || [];
-                    completionChildren = properties;
-                }
-            } else if (typeKind === 'generic') {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
-                for (let i = 0; i < properties.length; i++) {
-                    const item = properties[i];
-                    if (item?.typeAnnotation?.typeKind === 'typeParam') {
-                        const newItem = StructureProperty.from(item.toJSON());
-                        newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
-                        newItem.parentNode = this;
-                        properties[i] = newItem;
-                    }
-                }
-                completionChildren = properties;
-            } else if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
-                completionChildren = properties;
-            } else {
-                completionChildren = [];
-            }
-            return completionChildren;
-        } catch (err) {
-            console.log(err);
-        }
-    }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/ViewComponent__.ts

@@ -88,6 +88,12 @@ export class ViewComponent extends BaseNode {
     @property('ViewBlock')
     blocks: Array<ViewBlock> = [];
 
+    /**
+     * themes
+     */
+    @property()
+    themes: Array<{ value: string, title: string}> = undefined;
+
     /**
      * 祖先 Module
      */

package/src/concepts/ViewElement__.ts

@@ -1431,7 +1431,7 @@ export class ViewElement extends BaseNode {
                 if (tag === 'u-input') {
                     code += '<nasl.core.String>';
                 } else if (tag === 'u-input-number') {
-                    code += '<nasl.core.Long>';
+                    code += '<nasl.core.Integer>';
                 } else {
                     code += '<any>';
                 }
@@ -1640,7 +1640,7 @@ export class ViewElement extends BaseNode {
         const oldName = element.name;
         element.deepRenameElements(this);
         if (element.tag === 'u-modal' || element.tag === 'u-drawer') {
-            const cancelNode = traverse(({ node }: { node: any }) => {
+            const cancelNode = traverse(({ node }: { node: any}) => {
                 if (node?.bindAttrs?.find((bindAttr: any) => bindAttr.value === '取消'))
                     return node;
             }, { node: element });
@@ -1801,7 +1801,7 @@ export class ViewElement extends BaseNode {
                         }
                         attr = new BindAttribute(source);
                     } catch (e) {
-                        const expression = <any>this._parseExpression(oldAttr.value);
+                        const expression = <any> this._parseExpression(oldAttr.value);
                         attr = new BindAttribute({
                             type: 'dynamic',
                             name: oldAttr.name,
@@ -1858,7 +1858,7 @@ export class ViewElement extends BaseNode {
                     if (directive.name === 'model') {
                         const valueAttr = astNode.attrs && astNode.attrs.find((attr) => attr.name === 'value');
                         if (!valueAttr) {
-                            const expression = <any>this._parseExpression(directive.value);
+                            const expression = <any> this._parseExpression(directive.value);
                             element.addBindAttribute(new BindAttribute({
                                 type: 'dynamic',
                                 name: 'value',
@@ -1868,7 +1868,7 @@ export class ViewElement extends BaseNode {
                             }));
                         }
                     } else {
-                        const expression = <any>this._parseExpression(directive.value);
+                        const expression = <any> this._parseExpression(directive.value);
                         element.addBindDirective(new BindDirective({
                             type: expression ? 'string' : 'dynamic',
                             name: directive.name,
@@ -1887,7 +1887,7 @@ export class ViewElement extends BaseNode {
                     name: 'if',
                     rawName: 'v-if',
                     value: '',
-                    expression: <any>this._parseExpression(astNode.if),
+                    expression: <any> this._parseExpression(astNode.if),
                 }));
             }
         } else if (astNode.type === 2) {
@@ -1898,7 +1898,7 @@ export class ViewElement extends BaseNode {
                 name: view.getViewElementUniqueName(`${baseName}1`),
             });
             const value = astNode.text?.match(/{{(.*?)}}/)[1].trim();
-            const expression = <any>this._parseExpression(value);
+            const expression = <any> this._parseExpression(value);
             element.addBindAttribute(new BindAttribute({
                 type: 'dynamic',
                 name: 'text',

package/src/concepts/basics/stdlib/nasl.collection.ts

@@ -16,7 +16,7 @@ export const collectionStructures = [
         properties: [
             new StructureProperty({
                 name: 'length',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
         ],
     }),
@@ -33,7 +33,7 @@ export const collectionStructures = [
         properties: [
             new StructureProperty({
                 name: 'length',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
         ],
     }),

package/src/concepts/basics/stdlib/nasl.core.ts

@@ -9,7 +9,7 @@ export const coreStructures = [
         properties: [
             new StructureProperty({
                 name: 'length',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
         ],
     }),
@@ -18,7 +18,7 @@ export const coreStructures = [
         properties: [
             new StructureProperty({
                 name: 'length',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
         ],
     }),
@@ -27,7 +27,7 @@ export const coreStructures = [
         properties: [
             new StructureProperty({
                 name: 'length',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
         ],
     }),

package/src/concepts/basics/stdlib/nasl.interface.ts

@@ -25,7 +25,7 @@ export const interfaceStructures = [
             }),
             new StructureProperty({
                 name: 'Code',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
             new StructureProperty({
                 name: 'Message',

package/src/concepts/basics/stdlib/nasl.process.ts

@@ -96,11 +96,11 @@ const logics = [
             }),
             new Param({
                 name: 'page',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
             new Param({
                 name: 'size',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
             new Param({
                 name: 'sort',
@@ -123,7 +123,7 @@ const logics = [
                     }),
                     new StructureProperty({
                         name: 'total',
-                        typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                        typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
                     }),
                 ]),
             }),
@@ -235,11 +235,11 @@ const logics = [
             }),
             new Param({
                 name: 'page',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
             new Param({
                 name: 'size',
-                typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
             }),
             new Param({
                 name: 'sort',
@@ -262,7 +262,7 @@ const logics = [
                     }),
                     new StructureProperty({
                         name: 'total',
-                        typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+                        typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
                     }),
                 ]),
             }),