@nasl/types 0.1.0 → 0.1.1

package/nasl.ui.ast.d.ts

@@ -153,29 +153,50 @@ export interface LogicDeclaration {
     title: string;
     description: string;
     typeParams?: Array<TypeParam>;
-    params: Array<ParamDeclaration>;
+    params: Array<Param>;
     returns: Array<Return>;
 }
 
 /**
- * 输入参数声明
+ * 空字面量
  */
-export interface ParamDeclaration {
-    concept: 'ParamDeclaration';
-    name: string;
-    title: string;
-    description: string;
-    tsType: string;
+export interface NullLiteral {
+    concept: 'NullLiteral';
+
 }
 
 /**
- * 输出参数声明
+ * 布尔型字面量
  */
-export interface ReturnDeclaration {
-    concept: 'ReturnDeclaration';
-    name: string;
-    description: string;
-    tsType: string;
+export interface BooleanLiteral {
+    concept: 'BooleanLiteral';
+    value: string;
+}
+
+/**
+ * 字符串字面量
+ */
+export interface StringLiteral {
+    concept: 'StringLiteral';
+    value: string;
+}
+
+/**
+ * 数字字面量
+ */
+export interface NumericLiteral {
+    concept: 'NumericLiteral';
+    value: string;
+    typeAnnotation: TypeAnnotation;
+}
+
+/**
+ * 列表构造器
+ */
+export interface NewList {
+    concept: 'NewList';
+    typeAnnotation: TypeAnnotation;
+    items: Array<LogicItem>;
 }
 
 /**
@@ -230,14 +251,14 @@ export interface TypeParam {
 }
 
 /**
- * 输出参数
+ * 输入参数
  */
-export interface Return {
-    concept: 'Return';
+export interface Param {
+    concept: 'Param';
     name: string;
     description: string;
     typeAnnotation: TypeAnnotation;
-    defaultValue: DefaultValue;
+    defaultValue?: DefaultValue;
 }
 
 /**
@@ -264,7 +285,6 @@ export interface StructureProperty {
     label: string;
     description: string;
     typeAnnotation: TypeAnnotation;
-    required: boolean;
     defaultValue: DefaultValue;
     jsonName: string;
 }
@@ -279,15 +299,19 @@ export interface DefaultValue {
 }
 
 /**
- * 逻辑项
+* 设置器基类
+*/
+export type LogicItem = NullLiteral | BooleanLiteral | StringLiteral | NumericLiteral | NewList;
+
+/**
+ * 输出参数
  */
-export interface LogicItem {
-    concept: 'LogicItem';
-    label?: string;
-    description?: string;
-    folded?: boolean;
-    offsetX?: number;
-    offsetY?: number;
+export interface Return {
+    concept: 'Return';
+    name: string;
+    description: string;
+    typeAnnotation: TypeAnnotation;
+    defaultValue?: DefaultValue;
 }
 
 export type UILib = Array<ViewComponentDeclaration>;

package/nasl.ui.ast.schema.json

@@ -527,7 +527,7 @@
                 "params": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/ParamDeclaration"
+                        "$ref": "#/definitions/Param"
                     }
                 },
                 "returns": {
@@ -566,42 +566,12 @@
             "additionalProperties": false,
             "description": "类型参数"
         },
-        "ParamDeclaration": {
+        "Param": {
             "type": "object",
             "properties": {
                 "concept": {
                     "type": "string",
-                    "const": "ParamDeclaration"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "title": {
-                    "type": "string"
-                },
-                "description": {
-                    "type": "string"
-                },
-                "tsType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "concept",
-                "name",
-                "title",
-                "description",
-                "tsType"
-            ],
-            "additionalProperties": false,
-            "description": "输入参数声明"
-        },
-        "Return": {
-            "type": "object",
-            "properties": {
-                "concept": {
-                    "type": "string",
-                    "const": "Return"
+                    "const": "Param"
                 },
                 "name": {
                     "type": "string"
@@ -620,11 +590,10 @@
                 "concept",
                 "name",
                 "description",
-                "typeAnnotation",
-                "defaultValue"
+                "typeAnnotation"
             ],
             "additionalProperties": false,
-            "description": "输出参数"
+            "description": "输入参数"
         },
         "TypeAnnotation": {
             "type": "object",
@@ -715,9 +684,6 @@
                 "typeAnnotation": {
                     "$ref": "#/definitions/TypeAnnotation"
                 },
-                "required": {
-                    "type": "boolean"
-                },
                 "defaultValue": {
                     "$ref": "#/definitions/DefaultValue"
                 },
@@ -731,7 +697,6 @@
                 "label",
                 "description",
                 "typeAnnotation",
-                "required",
                 "defaultValue",
                 "jsonName"
             ],
@@ -764,33 +729,150 @@
             "description": "默认值"
         },
         "LogicItem": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/NullLiteral"
+                },
+                {
+                    "$ref": "#/definitions/BooleanLiteral"
+                },
+                {
+                    "$ref": "#/definitions/StringLiteral"
+                },
+                {
+                    "$ref": "#/definitions/NumericLiteral"
+                },
+                {
+                    "$ref": "#/definitions/NewList"
+                }
+            ],
+            "description": "设置器基类"
+        },
+        "NullLiteral": {
             "type": "object",
             "properties": {
                 "concept": {
                     "type": "string",
-                    "const": "LogicItem"
+                    "const": "NullLiteral"
+                }
+            },
+            "required": [
+                "concept"
+            ],
+            "additionalProperties": false,
+            "description": "空字面量"
+        },
+        "BooleanLiteral": {
+            "type": "object",
+            "properties": {
+                "concept": {
+                    "type": "string",
+                    "const": "BooleanLiteral"
                 },
-                "label": {
+                "value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "concept",
+                "value"
+            ],
+            "additionalProperties": false,
+            "description": "布尔型字面量"
+        },
+        "StringLiteral": {
+            "type": "object",
+            "properties": {
+                "concept": {
+                    "type": "string",
+                    "const": "StringLiteral"
                 },
-                "description": {
+                "value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "concept",
+                "value"
+            ],
+            "additionalProperties": false,
+            "description": "字符串字面量"
+        },
+        "NumericLiteral": {
+            "type": "object",
+            "properties": {
+                "concept": {
+                    "type": "string",
+                    "const": "NumericLiteral"
                 },
-                "folded": {
-                    "type": "boolean"
+                "value": {
+                    "type": "string"
                 },
-                "offsetX": {
-                    "type": "number"
+                "typeAnnotation": {
+                    "$ref": "#/definitions/TypeAnnotation"
+                }
+            },
+            "required": [
+                "concept",
+                "value",
+                "typeAnnotation"
+            ],
+            "additionalProperties": false,
+            "description": "数字字面量"
+        },
+        "NewList": {
+            "type": "object",
+            "properties": {
+                "concept": {
+                    "type": "string",
+                    "const": "NewList"
                 },
-                "offsetY": {
-                    "type": "number"
+                "typeAnnotation": {
+                    "$ref": "#/definitions/TypeAnnotation"
+                },
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/LogicItem"
+                    }
                 }
             },
             "required": [
-                "concept"
+                "concept",
+                "typeAnnotation",
+                "items"
             ],
             "additionalProperties": false,
-            "description": "逻辑项"
+            "description": "列表构造器"
+        },
+        "Return": {
+            "type": "object",
+            "properties": {
+                "concept": {
+                    "type": "string",
+                    "const": "Return"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "typeAnnotation": {
+                    "$ref": "#/definitions/TypeAnnotation"
+                },
+                "defaultValue": {
+                    "$ref": "#/definitions/DefaultValue"
+                }
+            },
+            "required": [
+                "concept",
+                "name",
+                "description",
+                "typeAnnotation"
+            ],
+            "additionalProperties": false,
+            "description": "输出参数"
         },
         "ThemeVariable": {
             "type": "object",

package/nasl.ui.options.d.ts

@@ -4,7 +4,7 @@ declare namespace nasl.ui {
     /**
      * 设置器基类
      */
-    export type BaseSetter = InputSetter | SwitchSetter | EnumSelectSetter | CapsulesSetter | NumberInputSetter | IconSetter | ImageSetter | PropertySelectSetter;
+    export type BaseSetter<T, K> = InputSetter | SwitchSetter | EnumSelectSetter<T, K> | CapsulesSetter<T, K> | NumberInputSetter | IconSetter | ImageSetter | PropertySelectSetter;
 
     /**
      * 输入框设置器
@@ -25,17 +25,17 @@ declare namespace nasl.ui {
     /**
      * 枚举选择设置器
      */
-    export interface EnumSelectSetter {
+    export interface EnumSelectSetter<T, K> {
         concept: 'EnumSelectSetter';
-        options: Array<SetterOption>;
+        options: Array<SetterOption<T, K>>;
     }
 
     /**
      * 胶囊设置器
      */
-    export interface CapsulesSetter {
+    export interface CapsulesSetter<T, K> {
         concept: 'CapsulesSetter';
-        options: Array<SetterOption>;
+        options: Array<SetterOption<T, K>>;
     }
 
     /**
@@ -89,7 +89,7 @@ declare namespace nasl.ui {
     /**
      * 组件属性
      */
-    export interface PropOptions<T extends ViewComponent, K extends keyof T> {
+    export interface PropOptions<T extends object, K extends keyof T> {
         title: string;
         group?: '基础信息' | '数据属性' | '主要属性' | '交互属性' | '状态属性' | '样式属性' | '工具属性';
         icon?: string;
@@ -100,7 +100,7 @@ declare namespace nasl.ui {
         bindHide?: boolean;
         bindOpen?: boolean;
         tabKind?: 'property' | 'style';
-        setter?: BaseSetter;
+        setter?: BaseSetter<T, K>;
         designerValue?: any;
         if?: (target: T) => boolean;
         disabledIf?: (target: T) => boolean;
@@ -133,21 +133,6 @@ declare namespace nasl.ui {
         description: string;
     }
 
-    /**
-     * 输入参数声明
-     */
-    export interface ParamOptions {
-        title: string;
-        description: string;
-    }
-
-    /**
-     * 输出参数声明
-     */
-    export interface ReturnOptions {
-        description: string;
-    }
-
     /**
      * 设置器枚举选项
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nasl/types",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "NASL types for TypeScript Declaration",
     "main": "index.d.ts",
     "scripts": {},