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

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,6 +37,22 @@ 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
@@ -77,7 +93,7 @@ export class TypeAnnotation extends BaseNode {
      * 类型种类
      */
     @property()
-    typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure' = undefined;
+    typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'union' | 'anonymousStructure' | 'function' = undefined;
 
     /**
      * 类型命名空间
@@ -131,6 +147,9 @@ export class TypeAnnotation extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'TypeAnnotation';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): TypeAnnotation {
         return super.from(source, parentNode, parentKey) as TypeAnnotation;
@@ -640,6 +659,9 @@ 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;
@@ -674,6 +696,9 @@ 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;
@@ -926,7 +951,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('Email');
+                return this.createPrimitive('String');
             } else if (TimeReg.test(code)) {
                 return this.createPrimitive('Time');
             } else if (BooleanReg.test(code)) {
@@ -937,19 +962,19 @@ export class TypeAnnotation extends BaseNode {
                 return this.createPrimitive('DateTime');
             } else if (!isNaN(Number(code))) {
                 if (code.indexOf('.') !== -1) {
-                    return this.createPrimitive('Double');
+                    return this.createPrimitive('Decimal');
                     // return this.createPrimitive('Decimal');
                 }
                 if (code.length > 8) {
                     return this.createPrimitive('Long');
                 }
-                return this.createPrimitive('Integer');
+                return this.createPrimitive('Long');
             } else if (code.length > 255) {
-                return this.createPrimitive('Text');
+                return this.createPrimitive('String');
             }
             return this.createPrimitive('String');
         } else {
-            return this.createPrimitive('Integer');
+            return this.createPrimitive('Long');
         }
     }
     // 增加插入泛型子类型

package/src/concepts/TypeParam__.ts

@@ -40,6 +40,9 @@ export class TypeParam extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'TypeParam';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): TypeParam {
         return super.from(source, parentNode, parentKey) as TypeParam;

package/src/concepts/UnaryExpression__.ts

@@ -47,6 +47,9 @@ export class UnaryExpression extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'UnaryExpression';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): UnaryExpression {
         return super.from(source, parentNode, parentKey) as UnaryExpression;

package/src/concepts/Unparsed__.ts

@@ -40,6 +40,9 @@ export class Unparsed extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Unparsed';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Unparsed {
         return super.from(source, parentNode, parentKey) as Unparsed;

package/src/concepts/UseComponent__.ts

@@ -44,6 +44,9 @@ export class UseComponent extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'UseComponent';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): UseComponent {
         return super.from(source, parentNode, parentKey) as UseComponent;

package/src/concepts/ValidationRule__.ts

@@ -70,6 +70,9 @@ export class ValidationRule extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ValidationRule';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ValidationRule {
         return super.from(source, parentNode, parentKey) as ValidationRule;

package/src/concepts/Variable__.ts

@@ -122,6 +122,9 @@ export class Variable extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Variable';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Variable {
         return super.from(source, parentNode, parentKey) as Variable;

package/src/concepts/ViewBlock__.ts

@@ -50,6 +50,9 @@ export class ViewBlock extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ViewBlock';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ViewBlock {
         return super.from(source, parentNode, parentKey) as ViewBlock;

package/src/concepts/ViewComponent__.ts

@@ -109,6 +109,9 @@ export class ViewComponent extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ViewComponent';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ViewComponent {
         return super.from(source, parentNode, parentKey) as ViewComponent;

package/src/concepts/ViewElement__.ts

@@ -322,6 +322,9 @@ export class ViewElement extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ViewElement';
+    }
 
 
 
@@ -1079,7 +1082,7 @@ export class ViewElement extends BaseNode {
     }
 
 
-
+    
 
     /**
     * 删除元素绑定属性
@@ -1341,6 +1344,11 @@ export class ViewElement extends BaseNode {
         return this.view.parentNode.concept === 'App' ? this.view.auth : this.frontend.views.find((item) => item.name === mainViewName)?.auth;
     }
 
+    // IDE内展示需要屏蔽掉“系统统一路径前缀”
+    get uiPath() {
+        return `${this.view.uiPath}/${this.name}`;
+    }
+
     /**
      * 权限领域的资源路径
      */
@@ -1423,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.Integer>';
+                    code += '<nasl.core.Long>';
                 } else {
                     code += '<any>';
                 }
@@ -1632,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 });
@@ -1793,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,
@@ -1850,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',
@@ -1860,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,
@@ -1879,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) {
@@ -1890,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/View__.ts

@@ -177,6 +177,9 @@ export class View extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'View';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): View {
         return super.from(source, parentNode, parentKey) as View;
@@ -1938,7 +1941,8 @@ export class View extends BaseNode {
         };
     }
 
-    get path() {
+    // IDE内展示需要屏蔽掉“系统统一路径前缀”
+    get uiPath() {
         const basePath = this.frontend.basePath;
         const _path = [];
         let view: View = this;
@@ -1953,6 +1957,21 @@ export class View extends BaseNode {
         return `${basePath}${path}`;
     }
 
+    get path() {
+        const prefixPath = this.frontend.prefixPath;
+        const _path = [];
+        let view: View = this;
+        while (view.concept === 'View') {
+            _path.push(view.name);
+            view = view.parentNode as View;
+        }
+        let path = '/';
+        if (_path.length) {
+            path += `${_path.reverse().join('/')}`;
+        }
+        return `${prefixPath}${path}`;
+    }
+
     /**
      * 权限领域的资源路径
      */

package/src/concepts/WhileStatement__.ts

@@ -45,6 +45,9 @@ export class WhileStatement extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'WhileStatement';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): WhileStatement {
         return super.from(source, parentNode, parentKey) as WhileStatement;