@next-bricks/vs 0.2.2 → 0.4.0

package/dist/types.json

@@ -79,11 +79,119 @@
       },
       {
         "name": "completers",
+        "annotation": {
+          "type": "array",
+          "elementType": {
+            "type": "reference",
+            "typeName": {
+              "type": "qualifiedName",
+              "left": {
+                "type": "qualifiedName",
+                "left": {
+                  "type": "identifier",
+                  "name": "monaco"
+                },
+                "right": {
+                  "type": "identifier",
+                  "name": "languages"
+                }
+              },
+              "right": {
+                "type": "identifier",
+                "name": "CompletionItem"
+              }
+            }
+          }
+        }
+      },
+      {
+        "name": "advancedCompleters",
         "annotation": {
           "type": "reference",
           "typeName": {
             "type": "identifier",
-            "name": "Completers"
+            "name": "Record"
+          },
+          "typeParameters": {
+            "type": "typeParameterInstantiation",
+            "params": [
+              {
+                "type": "keyword",
+                "value": "string"
+              },
+              {
+                "type": "typeLiteral",
+                "members": [
+                  {
+                    "type": "propertySignature",
+                    "key": {
+                      "type": "identifier",
+                      "name": "triggerCharacter"
+                    },
+                    "annotation": {
+                      "type": "keyword",
+                      "value": "string"
+                    },
+                    "computed": false
+                  },
+                  {
+                    "type": "propertySignature",
+                    "key": {
+                      "type": "identifier",
+                      "name": "completers"
+                    },
+                    "annotation": {
+                      "type": "array",
+                      "elementType": {
+                        "type": "reference",
+                        "typeName": {
+                          "type": "qualifiedName",
+                          "left": {
+                            "type": "qualifiedName",
+                            "left": {
+                              "type": "identifier",
+                              "name": "monaco"
+                            },
+                            "right": {
+                              "type": "identifier",
+                              "name": "languages"
+                            }
+                          },
+                          "right": {
+                            "type": "identifier",
+                            "name": "CompletionItem"
+                          }
+                        }
+                      }
+                    },
+                    "computed": false
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "markers",
+        "annotation": {
+          "type": "array",
+          "elementType": {
+            "type": "reference",
+            "typeName": {
+              "type": "identifier",
+              "name": "Marker"
+            }
+          }
+        }
+      },
+      {
+        "name": "links",
+        "annotation": {
+          "type": "array",
+          "elementType": {
+            "type": "keyword",
+            "value": "string"
           }
         }
       },
@@ -109,6 +217,13 @@
             }
           ]
         }
+      },
+      {
+        "name": "message",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
       }
     ],
     "events": [
@@ -131,7 +246,7 @@
         }
       },
       {
-        "name": "highlight.click",
+        "name": "token.click",
         "detail": {
           "annotation": {
             "type": "keyword",
@@ -143,102 +258,107 @@
     "methods": [],
     "types": [
       {
-        "type": "typeAlias",
-        "name": "Completers",
-        "annotation": {
-          "type": "reference",
-          "typeName": {
-            "type": "identifier",
-            "name": "Record"
+        "type": "interface",
+        "name": "Marker",
+        "body": [
+          {
+            "type": "propertySignature",
+            "key": {
+              "type": "identifier",
+              "name": "token"
+            },
+            "annotation": {
+              "type": "keyword",
+              "value": "string"
+            },
+            "computed": false
           },
-          "typeParameters": {
-            "type": "typeParameterInstantiation",
-            "params": [
-              {
+          {
+            "type": "propertySignature",
+            "key": {
+              "type": "identifier",
+              "name": "level"
+            },
+            "annotation": {
+              "type": "typeOperator",
+              "operator": "keyof",
+              "annotation": {
+                "type": "typeQuery",
+                "exprName": {
+                  "type": "identifier",
+                  "name": "Level"
+                }
+              }
+            },
+            "computed": false
+          },
+          {
+            "type": "propertySignature",
+            "key": {
+              "type": "identifier",
+              "name": "message"
+            },
+            "annotation": {
+              "type": "keyword",
+              "value": "string"
+            },
+            "computed": false
+          },
+          {
+            "type": "propertySignature",
+            "key": {
+              "type": "identifier",
+              "name": "code"
+            },
+            "annotation": {
+              "type": "typeLiteral",
+              "members": [
+                {
+                  "type": "propertySignature",
+                  "key": {
+                    "type": "identifier",
+                    "name": "value"
+                  },
+                  "annotation": {
+                    "type": "keyword",
+                    "value": "string"
+                  },
+                  "computed": false
+                },
+                {
+                  "type": "propertySignature",
+                  "key": {
+                    "type": "identifier",
+                    "name": "target"
+                  },
+                  "annotation": {
+                    "type": "keyword",
+                    "value": "string"
+                  },
+                  "computed": false
+                }
+              ]
+            },
+            "optional": true,
+            "computed": false
+          },
+          {
+            "type": "propertySignature",
+            "key": {
+              "type": "identifier",
+              "name": "params"
+            },
+            "annotation": {
+              "type": "array",
+              "elementType": {
                 "type": "keyword",
                 "value": "string"
-              },
-              {
-                "type": "union",
-                "types": [
-                  {
-                    "type": "array",
-                    "elementType": {
-                      "type": "reference",
-                      "typeName": {
-                        "type": "qualifiedName",
-                        "left": {
-                          "type": "qualifiedName",
-                          "left": {
-                            "type": "identifier",
-                            "name": "monaco"
-                          },
-                          "right": {
-                            "type": "identifier",
-                            "name": "languages"
-                          }
-                        },
-                        "right": {
-                          "type": "identifier",
-                          "name": "CompletionItem"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "type": "typeLiteral",
-                    "members": [
-                      {
-                        "type": "propertySignature",
-                        "key": {
-                          "type": "identifier",
-                          "name": "triggerCharacter"
-                        },
-                        "annotation": {
-                          "type": "keyword",
-                          "value": "string"
-                        },
-                        "computed": false
-                      },
-                      {
-                        "type": "propertySignature",
-                        "key": {
-                          "type": "identifier",
-                          "name": "list"
-                        },
-                        "annotation": {
-                          "type": "array",
-                          "elementType": {
-                            "type": "reference",
-                            "typeName": {
-                              "type": "qualifiedName",
-                              "left": {
-                                "type": "qualifiedName",
-                                "left": {
-                                  "type": "identifier",
-                                  "name": "monaco"
-                                },
-                                "right": {
-                                  "type": "identifier",
-                                  "name": "languages"
-                                }
-                              },
-                              "right": {
-                                "type": "identifier",
-                                "name": "CompletionItem"
-                              }
-                            }
-                          }
-                        },
-                        "computed": false
-                      }
-                    ]
-                  }
-                ]
               }
-            ]
+            },
+            "optional": true,
+            "computed": false
           }
-        }
+        ]
       }
     ]
   }

package/dist-types/code-editor/index.d.ts

@@ -3,10 +3,7 @@ import { FormItemElementBase } from "@next-shared/form";
 import * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 import "@next-core/theme";
 import "./index.css";
-export type Completers = Record<string, monaco.languages.CompletionItem[] | {
-    triggerCharacter: string;
-    list: monaco.languages.CompletionItem[];
-}>;
+import { Level } from "./utils/constants.js";
 export interface CodeEditorProps {
     name?: string;
     label?: string;
@@ -19,7 +16,24 @@ export interface CodeEditorProps {
     minLines?: number;
     maxLines?: number;
     height?: string | number;
-    completers?: Completers;
+    completers?: monaco.languages.CompletionItem[];
+    advancedCompleters?: Record<string, {
+        triggerCharacter: string;
+        completers: monaco.languages.CompletionItem[];
+    }>;
+    markers?: Marker[];
+    links?: string[];
+    validateState?: string;
+}
+export interface Marker {
+    token: string;
+    level: keyof typeof Level;
+    message: string;
+    code?: {
+        value: string;
+        target: string;
+    };
+    params?: string[];
 }
 /**
  * 构件 code-editor
@@ -47,16 +61,23 @@ export declare class CodeEditor extends FormItemElementBase implements CodeEdito
      * @default 3
      */
     accessor minLines: number | undefined;
-    accessor completers: Completers | undefined;
+    accessor completers: monaco.languages.CompletionItem[] | undefined;
+    accessor advancedCompleters: Record<string, {
+        triggerCharacter: string;
+        completers: monaco.languages.CompletionItem[];
+    }> | undefined;
+    accessor markers: Marker[] | undefined;
+    accessor links: string[] | undefined;
     /**
      * @default Infinity
      */
     accessor maxLines: number | undefined;
     accessor height: string | number | undefined;
+    accessor message: string | undefined;
     connectedCallback(): void;
     render(): JSX.Element;
 }
-export declare function CodeEditorComponent({ value: _value, language: _language, theme: _theme, minLines: _minLines, maxLines: _maxLines, height: _height, automaticLayout, completers, onChange, onHighlightClick, }: CodeEditorProps & {
-    onChange(value: string, isFlush: boolean): void;
+export declare function CodeEditorComponent({ value: _value, language: _language, theme: _theme, minLines: _minLines, maxLines: _maxLines, height: _height, automaticLayout, completers, advancedCompleters, markers, links, validateState, onChange, onHighlightClick, }: CodeEditorProps & {
+    onChange(value: string, parseValue: any, isFlush: boolean): void;
     onHighlightClick(word: string): void;
 }): JSX.Element;

package/dist-types/code-editor/utils/brickNextSourceMap.d.ts

@@ -0,0 +1,17 @@
+import type { State } from "js-yaml";
+export interface Token {
+    startLineNumber: number;
+    endLineNumber: number;
+    startColumn: number;
+    endColumn: number;
+    source: string;
+    isString?: boolean;
+}
+declare class BrickNextYamlSourceMap {
+    #private;
+    constructor();
+    private handleState;
+    listen(): (event: "open" | "close", state: State) => void;
+    getTokens: () => Token[];
+}
+export default BrickNextYamlSourceMap;

package/dist-types/code-editor/utils/brickNextYaml.d.ts

@@ -1,5 +1,6 @@
 import * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
-import { Completers } from "../index.jsx";
 export declare const isInEvaluateBody: (model: monaco.editor.ITextModel, position: monaco.Position) => boolean;
-export declare const brickNextYAMLProvideCompletionItems: (completers?: Completers) => (model: monaco.editor.ITextModel, position: monaco.Position, context: monaco.languages.CompletionContext, _token: monaco.CancellationToken) => monaco.languages.ProviderResult<monaco.languages.CompletionList>;
-export declare const setDecoractions: (editor: monaco.editor.IStandaloneCodeEditor, decorationsCollection: monaco.editor.IEditorDecorationsCollection, completers?: Completers) => void;
+export declare const brickNextYAMLProvideCompletionItems: (completers?: monaco.languages.CompletionItem[], advancedCompleters?: Record<string, {
+    triggerCharacter: string;
+    completers: monaco.languages.CompletionItem[];
+}> | undefined) => (model: monaco.editor.ITextModel, position: monaco.Position, context: monaco.languages.CompletionContext, _token: monaco.CancellationToken) => monaco.languages.ProviderResult<monaco.languages.CompletionList>;

package/dist-types/code-editor/utils/constants.d.ts

@@ -1,2 +1,8 @@
 export declare const EVALUATE_KEYWORD: string[];
 export declare const brickNextKeywords: string[];
+export declare const Level: {
+    hit: number;
+    info: number;
+    warn: number;
+    error: number;
+};

package/docs/code-editor.md

@@ -78,40 +78,159 @@ children:
   properties:
     language: brick_next_yaml
     value: |
-      # Enhanced yaml for Brick Next with completers
-      brick: button
-      properties:
-        buttonName: test
-        textContent: '<% CTX.error ? "CTX.error": "Hello" %>'
-        a: CTX.test
-        b: <% CTX.b %>
-        c: <% STATE.e %>
-        d: <% PATH.instanceId %>
-        e:
-          action: console.log
-          args:
-            - <% FN.getPageDetail(APP.id, CTX.pageTitle) %>
-            - <% `${ CTX.name }` %>
+      basicUsige:
+        keyword:
+         Expression:
+          expression1: <% CTX.work %>
+          expression2: <% `${CTX.work}` %>
+          expression3:
+            test1: |
+              <%
+                CTX.a ? CTX.b : CTX.c 
+              %>
+            test2: |-
+              <% 
+                CTX.a ? CTX.b : CTX.c 
+              %>
+            test3: >
+              <% 
+                CTX.a ? CTX.b : CTX.c 
+              %>
+            test4: >-
+              <% 
+                CTX.a ? CTX.b : CTX.c 
+              %>
+          expression4: "<% CTX.a ? CTX.b : CTX.c %>"
+          expression7: <% CTX.list.map(item => FN.getDetail(item, CTX.name)) %>
+          expression8: <% CTX.list.map(FN.getDetail) %>
+          expression9: |
+            <% 
+              [
+                CTX.work,
+                CTX.work.a,
+                ACTX,
+                CTXA,
+                ACTX.noWork,
+                CTXA.noWork,
+                a.CTX.noWork,
+              ]
+            %>
+          expression10: |
+            <% 
+              "TPL is warn", 
+              TPL.id 
+            %>
+          expression11: |
+            <%
+              FN.getDetail(CTX.abc, CTX.efg) %>
+          expression12:
+            test1:
+              test2:          <%  CTX.name %>
+              test3: |
+                              <% 
+                                CTX.name
+                              %>
+          expression13: <%= CTX.b + CTX.c %>
+          expression14: |
+            <%=
+              APP.id + CTX.name
+            %>
+          expression15: 
+            test1: |
+              <% 
+                CTX.name %>
+            test2: |
+              <% CTX.name
+              %>
+            test3: |
+              <% "track context", CTX.name
+              %>
+            test4: |
+              <%      
+                "track context", CTX.name 
+              %>
+            test5: |
+              <%      
+                "track context", 
+                CTX.name 
+              %>
+            test6: |
+              <% "track context", 
+                CTX.name 
+              %>
+            test7: |
+              <%  "track context",  CTX.name 
+          exporession16:
+            - <% CTX.a %>     
+            - CTX.b
+            -   <% CTX.c %>    
+            - <% "CTX.d" %>
+        markers:
+          hit:
+            PATH: <% PATH.instanceId %>
+          info:
+            QUERY: <% QUERY.info %>
+          warn:
+            ANCHOR: <% ANCHOR.id %>
+          error:
+            STATE: <% STATE.name %>
+        stringAndNoWork:
+          string1: CTX.noWork
+          string2: FN.getTest
+          string3: <% "FN.getTest(CTX.test)" %>
     automaticLayout: fit-content
+    links:
+      - CTX
+      - FN
+    markers:
+      - token: CTX
+        params:
+          - a
+          - b
+      - token: PATH
+        message: “这是 PATH”
+        level: hit
+      - token: QUERY
+        message: “这是 QUERY”
+        level: info
+      - token: ANCHOR
+        message: “这是 ANCHOR“
+        level: warn
+      - token: STATE
+        message: "这里不能写 STATE"
+        level: error
+        code:
+          value: "详情地址"
+          target: https://brick-next.js.org/docs/concepts/context
+      - token: TPL
+        level: warn
+        message: 不允许写入TPL
     completers:
-      custom:
-        - label: buttonName
-          detail: string
-        - label: buttonType
-          detail: "primary|default|link|danger"
-        - label: buttonSize
-          insertText: size
+      - label: buttonName
+        detail: string
+      - label: buttonType
+        detail: "primary|default|link|danger"
+      - label: buttonSize
+        insertText: size
+    advancedCompleters:
       target:
         triggerCharacter: ":"
-        list:
+        completers:
           - label: a
           - label: b
       CTX:
-        - label: pageTitle
-        - label: name
+        triggerCharacter: "."
+        completers:
+          - label: pageTitle
+          - label: name
       FN:
-        - label: getPageDetail
-        - label: getInstance
+        triggerCharacter: "."
+        completers:
+          - label: getPageDetail
+          - label: getInstance
       PATH:
-        - label: instanceId
+        triggerCharacter: "."
+        completers:
+          - label: instanceId
+          - label: name
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-bricks/vs",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "homepage": "https://github.com/easyops-cn/next-bricks/tree/master/bricks/vs",
   "repository": {
     "type": "git",
@@ -38,5 +38,5 @@
     "@next-core/test-next": "^1.0.7",
     "resize-observer-polyfill": "^1.5.1"
   },
-  "gitHead": "cf94974ff1cac5d54b1502d8687191302c3808a7"
+  "gitHead": "1d1d029906b29f94be440bc2d5c93db819034443"
 }