@nasl/types 0.1.2 → 0.1.4

package/nasl.ui.ast.d.ts

@@ -141,6 +141,7 @@ export interface SlotDeclaration {
     title: string;
     description?: string;
     tsType: string;
+    params: Array<Param>;
     emptyBackground?: string;
     snippets: Array<ViewBlockWithImage>;
 }
@@ -180,6 +181,7 @@ export interface BooleanLiteral {
 export interface StringLiteral {
     concept: 'StringLiteral';
     value: string;
+    i18nKey: string;
 }
 
 /**
@@ -257,21 +259,13 @@ export interface DefaultValue {
 */
 export type LogicItem = NullLiteral | BooleanLiteral | StringLiteral | NumericLiteral | NewList;
 
-/**
- * 类型参数
- */
-export interface TypeParam {
-    concept: 'TypeParam';
-    name: string;
-}
-
 /**
  * 输入参数
  */
 export interface Param {
     concept: 'Param';
     name: string;
-    description: string;
+    description?: string;
     typeAnnotation: TypeAnnotation;
     defaultValue?: DefaultValue;
 }
@@ -304,6 +298,14 @@ export interface StructureProperty {
     jsonName: string;
 }
 
+/**
+ * 类型参数
+ */
+export interface TypeParam {
+    concept: 'TypeParam';
+    name: string;
+}
+
 /**
  * 输出参数
  */

package/nasl.ui.ast.schema.json

@@ -490,11 +490,15 @@
                 },
                 "value": {
                     "type": "string"
+                },
+                "i18nKey": {
+                    "type": "string"
                 }
             },
             "required": [
                 "concept",
-                "value"
+                "value",
+                "i18nKey"
             ],
             "additionalProperties": false,
             "description": "字符串字面量"
@@ -702,6 +706,12 @@
                 "tsType": {
                     "type": "string"
                 },
+                "params": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/Param"
+                    }
+                },
                 "emptyBackground": {
                     "type": "string"
                 },
@@ -717,11 +727,40 @@
                 "name",
                 "title",
                 "tsType",
+                "params",
                 "snippets"
             ],
             "additionalProperties": false,
             "description": "插槽"
         },
+        "Param": {
+            "type": "object",
+            "properties": {
+                "concept": {
+                    "type": "string",
+                    "const": "Param"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "typeAnnotation": {
+                    "$ref": "#/definitions/TypeAnnotation"
+                },
+                "defaultValue": {
+                    "$ref": "#/definitions/DefaultValue"
+                }
+            },
+            "required": [
+                "concept",
+                "name",
+                "typeAnnotation"
+            ],
+            "additionalProperties": false,
+            "description": "输入参数"
+        },
         "ViewBlockWithImage": {
             "type": "object",
             "properties": {
@@ -819,35 +858,6 @@
             "additionalProperties": false,
             "description": "类型参数"
         },
-        "Param": {
-            "type": "object",
-            "properties": {
-                "concept": {
-                    "type": "string",
-                    "const": "Param"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "description": {
-                    "type": "string"
-                },
-                "typeAnnotation": {
-                    "$ref": "#/definitions/TypeAnnotation"
-                },
-                "defaultValue": {
-                    "$ref": "#/definitions/DefaultValue"
-                }
-            },
-            "required": [
-                "concept",
-                "name",
-                "description",
-                "typeAnnotation"
-            ],
-            "additionalProperties": false,
-            "description": "输入参数"
-        },
         "Return": {
             "type": "object",
             "properties": {

package/nasl.ui.decorators.d.ts

@@ -5,16 +5,40 @@ declare namespace nasl.ui {
         // name: '__ViewComponent';
     }
 
+    export class ViewComponentOptions {
+        // name: '__ViewComponentOptions';
+
+        @Prop({
+            title: '显示条件',
+            description: '是否展示组件',
+            setter: {
+                concept: 'SwitchSetter',
+            },
+        })
+        if: nasl.core.Boolean;
+
+        @Prop({
+            title: '工具提示',
+            description: '在鼠标悬停时显示的文字',
+        })
+        tooltip: nasl.core.String;
+    }
+
     export function Component(options?: ViewComponentOptions): (target: any) => void;
 
-    export function Prop(options?: PropOptions<never, never>): (target: any, key: string) => void;
-    export function Prop<T extends object, K extends keyof T>(options?: PropOptions<T, K>): (target: T, key: K) => void;
+    export function Prop(options?: PropOpts<never, never>): (target: any, key: string) => void;
+    export function Prop<T extends object, K extends keyof T>(options?: PropOpts<T, K>): (target: T, key: K) => void;
+
+    export function Event(options?: EventOpts): (target: any, key: string) => void;
 
-    export function Event(options?: EventOptions): (target: any, key: string) => void;
+    export function Slot(options?: SlotOpts): (target: any, key: string) => void;
 
-    export function Slot(options?: SlotOptions): (target: any, key: string) => void;
+    /**
+     * 与类型推导有关，必须将返回值类型放在第一个参数位置
+     */
+    export type SlotType<T extends (...args: Array<any>) => Array<any>> = (ret: ReturnType<T>, ...args: Parameters<T>) => ReturnType<T>;
 
-    export function Method(options?: LogicOptions): (target: any, key: string) => void;
+    export function Method(options?: LogicOpts): (target: any, key: string) => void;
 
-    export function Param(options?: ParamOptions): (target: any, key: string, paramIndex: number) => void;
+    export function Param(options?: ParamOpts): (target: any, key: string, paramIndex: number) => void;
 }

package/nasl.ui.options.d.ts

@@ -4,7 +4,7 @@ declare namespace nasl.ui {
     /**
      * 设置器基类
      */
-    export type BaseSetter<T, K> = InputSetter | SwitchSetter | EnumSelectSetter<T, K> | CapsulesSetter<T, K> | NumberInputSetter | IconSetter | ImageSetter | PropertySelectSetter;
+    export type BaseSetter<T extends object, K extends keyof T> = InputSetter | SwitchSetter | EnumSelectSetter<T, K> | CapsulesSetter<T, K> | NumberInputSetter | IconSetter | ImageSetter | PropertySelectSetter;
 
     /**
      * 输入框设置器
@@ -25,7 +25,7 @@ declare namespace nasl.ui {
     /**
      * 枚举选择设置器
      */
-    export interface EnumSelectSetter<T, K> {
+    export interface EnumSelectSetter<T extends object, K extends keyof T> {
         concept: 'EnumSelectSetter';
         options: Array<SetterOption<T, K>>;
     }
@@ -33,7 +33,7 @@ declare namespace nasl.ui {
     /**
      * 胶囊设置器
      */
-    export interface CapsulesSetter<T, K> {
+    export interface CapsulesSetter<T extends object, K extends keyof T> {
         concept: 'CapsulesSetter';
         options: Array<SetterOption<T, K>>;
     }
@@ -77,7 +77,7 @@ declare namespace nasl.ui {
     /**
      * 页面组件
      */
-    export interface ViewComponentOptions {
+    export interface ViewComponentOpts {
         kebabName?: string;
         title: string;
         group?: string;
@@ -89,7 +89,7 @@ declare namespace nasl.ui {
     /**
      * 组件属性
      */
-    export interface PropOptions<T extends object, K extends keyof T> {
+    export interface PropOpts<T extends object, K extends keyof T> {
         title: string;
         group?: '基础信息' | '数据属性' | '主要属性' | '交互属性' | '状态属性' | '样式属性' | '工具属性';
         icon?: string;
@@ -110,7 +110,7 @@ declare namespace nasl.ui {
     /**
      * 组件事件
      */
-    export interface EventOptions {
+    export interface EventOpts {
         title: string;
         description?: string;
     }
@@ -118,7 +118,7 @@ declare namespace nasl.ui {
     /**
      * 插槽
      */
-    export interface SlotOptions {
+    export interface SlotOpts {
         title: string;
         description?: string;
         emptyBackground?: string;
@@ -128,11 +128,20 @@ declare namespace nasl.ui {
     /**
      * 逻辑声明
      */
-    export interface LogicOptions {
+    export interface LogicOpts {
         title: string;
         description: string;
     }
 
+    /**
+     * 带分组的参数
+     */
+    export interface ParamOpts {
+        description?: string;
+        title: string;
+        group?: string;
+    }
+
     /**
      * 设置器枚举选项
      */

package/package.json

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

package/tsconfig.json

@@ -4,7 +4,7 @@
         "module": "ESNext",
         "moduleResolution": "Node",
         "experimentalDecorators": true,
-        "skipLibCheck": true,
+        "skipLibCheck": false,
         "strict": true,
         "strictPropertyInitialization": false,
         "rootDir": ".",