@json-layout/vocabulary 0.1.0 → 0.2.0

package/src/normalized-layout/schema.js

@@ -94,6 +94,9 @@ export default {
             {
               "$ref": "#/$defs/textarea"
             },
+            {
+              "$ref": "#/$defs/markdown"
+            },
             {
               "$ref": "#/$defs/checkbox"
             },
@@ -115,9 +118,18 @@ export default {
             {
               "$ref": "#/$defs/color-picker"
             },
+            {
+              "$ref": "#/$defs/combobox"
+            },
+            {
+              "$ref": "#/$defs/number-combobox"
+            },
             {
               "$ref": "#/$defs/select"
             },
+            {
+              "$ref": "#/$defs/autocomplete"
+            },
             {
               "$ref": "#/$defs/one-of-select"
             },
@@ -425,6 +437,21 @@ export default {
         }
       }
     },
+    "markdown": {
+      "type": "object",
+      "required": [
+        "comp",
+        "label"
+      ],
+      "properties": {
+        "comp": {
+          "const": "markdown"
+        },
+        "label": {
+          "type": "string"
+        }
+      }
+    },
     "checkbox": {
       "type": "object",
       "required": [
@@ -573,6 +600,63 @@ export default {
         }
       }
     },
+    "combobox": {
+      "type": "object",
+      "required": [
+        "comp",
+        "label"
+      ],
+      "properties": {
+        "comp": {
+          "const": "combobox"
+        },
+        "label": {
+          "type": "string"
+        },
+        "items": {
+          "$ref": "#/$defs/select-items"
+        },
+        "getItems": {
+          "$ref": "#/$defs/get-items"
+        },
+        "multiple": {
+          "type": "boolean"
+        }
+      }
+    },
+    "number-combobox": {
+      "type": "object",
+      "required": [
+        "comp",
+        "label"
+      ],
+      "properties": {
+        "comp": {
+          "const": "number-combobox"
+        },
+        "label": {
+          "type": "string"
+        },
+        "items": {
+          "$ref": "#/$defs/select-items"
+        },
+        "getItems": {
+          "$ref": "#/$defs/get-items"
+        },
+        "multiple": {
+          "type": "boolean"
+        },
+        "step": {
+          "type": "number"
+        },
+        "min": {
+          "type": "number"
+        },
+        "max": {
+          "type": "number"
+        }
+      }
+    },
     "select": {
       "type": "object",
       "required": [
@@ -591,6 +675,33 @@ export default {
         },
         "getItems": {
           "$ref": "#/$defs/get-items"
+        },
+        "multiple": {
+          "type": "boolean"
+        }
+      }
+    },
+    "autocomplete": {
+      "type": "object",
+      "required": [
+        "comp",
+        "label"
+      ],
+      "properties": {
+        "comp": {
+          "const": "autocomplete"
+        },
+        "label": {
+          "type": "string"
+        },
+        "items": {
+          "$ref": "#/$defs/select-items"
+        },
+        "getItems": {
+          "$ref": "#/$defs/get-items"
+        },
+        "multiple": {
+          "type": "boolean"
         }
       }
     },
@@ -614,35 +725,47 @@ export default {
         "key": {
           "type": "string"
         },
-        "value": {}
+        "value": {},
+        "icon": {
+          "type": "string"
+        }
       }
     },
     "get-items": {
       "type": "object",
-      "properties": {
-        "returnObjects": {
-          "type": "boolean",
-          "readOnly": true
-        },
-        "itemsResults": {
-          "$ref": "#/$defs/expression"
-        },
-        "itemTitle": {
-          "$ref": "#/$defs/expression"
-        },
-        "itemKey": {
-          "$ref": "#/$defs/expression"
-        },
-        "itemValue": {
-          "$ref": "#/$defs/expression"
-        }
-      },
-      "oneOf": [
+      "allOf": [
         {
-          "$ref": "#/$defs/expression"
+          "properties": {
+            "returnObjects": {
+              "type": "boolean",
+              "readOnly": true
+            },
+            "itemsResults": {
+              "$ref": "#/$defs/expression"
+            },
+            "itemTitle": {
+              "$ref": "#/$defs/expression"
+            },
+            "itemKey": {
+              "$ref": "#/$defs/expression"
+            },
+            "itemValue": {
+              "$ref": "#/$defs/expression"
+            },
+            "itemIcon": {
+              "$ref": "#/$defs/expression"
+            }
+          }
         },
         {
-          "$ref": "#/$defs/get-items-fetch"
+          "oneOf": [
+            {
+              "$ref": "#/$defs/expression"
+            },
+            {
+              "$ref": "#/$defs/get-items-fetch"
+            }
+          ]
         }
       ]
     },
@@ -654,6 +777,17 @@ export default {
       "properties": {
         "url": {
           "$ref": "#/$defs/expression"
+        },
+        "qSearchParam": {
+          "type": "string"
+        },
+        "searchParams": {
+          "type": "object",
+          "patternProperties": {
+            ".*": {
+              "$ref": "#/$defs/expression"
+            }
+          }
         }
       }
     },
@@ -665,15 +799,6 @@ export default {
       "properties": {
         "comp": {
           "const": "one-of-select"
-        },
-        "if": {
-          "$ref": "#/$defs/expression"
-        },
-        "label": {
-          "type": "string"
-        },
-        "help": {
-          "type": "string"
         }
       }
     },

package/src/normalized-layout/schema.json

@@ -52,6 +52,7 @@
             {"$ref": "#/$defs/text-field"},
             {"$ref": "#/$defs/number-field"},
             {"$ref": "#/$defs/textarea"},
+            {"$ref": "#/$defs/markdown"},
             {"$ref": "#/$defs/checkbox"},
             {"$ref": "#/$defs/switch"},
             {"$ref": "#/$defs/slider"},
@@ -59,7 +60,10 @@
             {"$ref": "#/$defs/date-time-picker"},
             {"$ref": "#/$defs/time-picker"},
             {"$ref": "#/$defs/color-picker"},
+            {"$ref": "#/$defs/combobox"},
+            {"$ref": "#/$defs/number-combobox"},
             {"$ref": "#/$defs/select"},
+            {"$ref": "#/$defs/autocomplete"},
             {"$ref": "#/$defs/one-of-select"},
             {"$ref": "#/$defs/section"},
             {"$ref": "#/$defs/tabs"},
@@ -194,6 +198,14 @@
         "label": {"type": "string"}
       }
     },
+    "markdown": {
+      "type": "object",
+      "required": ["comp", "label"],
+      "properties": {
+        "comp": {"const": "markdown"},
+        "label": {"type": "string"}
+      }
+    },
     "checkbox": {
       "type": "object",
       "required": ["comp", "label"],
@@ -260,6 +272,31 @@
         "label": {"type": "string"}
       }
     },
+    "combobox": {
+      "type": "object",
+      "required": ["comp", "label"],
+      "properties": {
+        "comp": {"const": "combobox"},
+        "label": {"type": "string"},
+        "items": {"$ref": "#/$defs/select-items"},
+        "getItems": {"$ref": "#/$defs/get-items"},
+        "multiple": {"type": "boolean"}
+      }
+    },
+    "number-combobox": {
+      "type": "object",
+      "required": ["comp", "label"],
+      "properties": {
+        "comp": {"const": "number-combobox"},
+        "label": {"type": "string"},
+        "items": {"$ref": "#/$defs/select-items"},
+        "getItems": {"$ref": "#/$defs/get-items"},
+        "multiple": {"type": "boolean"},
+        "step": {"type": "number"},
+        "min": {"type": "number"},
+        "max": {"type": "number"}
+      }
+    },
     "select": {
       "type": "object",
       "required": ["comp", "label"],
@@ -267,7 +304,19 @@
         "comp": {"const": "select"},
         "label": {"type": "string"},
         "items": {"$ref": "#/$defs/select-items"},
-        "getItems": {"$ref": "#/$defs/get-items"}
+        "getItems": {"$ref": "#/$defs/get-items"},
+        "multiple": {"type": "boolean"}
+      }
+    },
+    "autocomplete": {
+      "type": "object",
+      "required": ["comp", "label"],
+      "properties": {
+        "comp": {"const": "autocomplete"},
+        "label": {"type": "string"},
+        "items": {"$ref": "#/$defs/select-items"},
+        "getItems": {"$ref": "#/$defs/get-items"},
+        "multiple": {"type": "boolean"}
       }
     },
     "select-items": {
@@ -280,38 +329,48 @@
       "properties": {
         "title": {"type": "string"},
         "key": {"type": "string"},
-        "value": {}
+        "value": {},
+        "icon": {"type": "string"}
       }
     },
     "get-items": {
       "type": "object",
-      "properties": {
-        "returnObjects": {"type": "boolean", "readOnly": true},
-        "itemsResults": {"$ref": "#/$defs/expression"},
-        "itemTitle": {"$ref": "#/$defs/expression"},
-        "itemKey": {"$ref": "#/$defs/expression"},
-        "itemValue": {"$ref": "#/$defs/expression"}
+      "allOf": [{
+        "properties": {
+          "returnObjects": {"type": "boolean", "readOnly": true},
+          "itemsResults": {"$ref": "#/$defs/expression"},
+          "itemTitle": {"$ref": "#/$defs/expression"},
+          "itemKey": {"$ref": "#/$defs/expression"},
+          "itemValue": {"$ref": "#/$defs/expression"},
+          "itemIcon": {"$ref": "#/$defs/expression"}
+        }
       },
-      "oneOf": [
-        {"$ref": "#/$defs/expression"},
-        {"$ref": "#/$defs/get-items-fetch"}
-      ]
+      {
+        "oneOf": [
+          {"$ref": "#/$defs/expression"},
+          {"$ref": "#/$defs/get-items-fetch"}
+        ]
+      }]
     },
     "get-items-fetch": {
       "type": "object",
       "required": ["url"],
       "properties": {
-        "url": {"$ref": "#/$defs/expression"}
+        "url": {"$ref": "#/$defs/expression"},
+        "qSearchParam": {"type": "string"},
+        "searchParams": {
+          "type": "object",
+          "patternProperties": {
+            ".*": {"$ref": "#/$defs/expression"}
+          }
+        }
       }
     },
     "one-of-select": {
       "type": "object",
       "required": ["comp"],
       "properties": {
-        "comp": {"const": "one-of-select"},
-        "if": {"$ref": "#/$defs/expression"},
-        "label": {"type": "string"},
-        "help": {"type": "string"}
+        "comp": {"const": "one-of-select"}
       }
     },
     "expression": {

package/src/normalized-layout/types.ts

@@ -18,6 +18,7 @@ export type CompObject = {
   | TextField
   | NumberField
   | Textarea
+  | Markdown
   | Checkbox
   | Switch
   | Slider
@@ -25,7 +26,10 @@ export type CompObject = {
   | DateTimePicker
   | TimePicker
   | ColorPicker
+  | Combobox
+  | NumberCombobox
   | Select
+  | Autocomplete
   | OneOfSelect
   | Section
   | Tabs
@@ -60,9 +64,9 @@ export type GetItems = {
   itemTitle?: Expression;
   itemKey?: Expression;
   itemValue?: Expression;
+  itemIcon?: Expression;
   [k: string]: unknown;
-} & GetItems1;
-export type GetItems1 = Expression | GetItemsFetch;
+} & (Expression | GetItemsFetch);
 export type Child = Child1 & {
   key: string | number;
   cols?: ColsObj;
@@ -75,6 +79,10 @@ export type Children = Child[];
 export interface SwitchStruct {
   switch: CompObject[];
 }
+/**
+ * This interface was referenced by `undefined`'s JSON-Schema definition
+ * via the `patternProperty` ".*".
+ */
 export interface Expression {
   type: "js-fn" | "js-eval" | "js-tpl";
   expr: string;
@@ -144,6 +152,11 @@ export interface Textarea {
   label: string;
   [k: string]: unknown;
 }
+export interface Markdown {
+  comp: "markdown";
+  label: string;
+  [k: string]: unknown;
+}
 export interface Checkbox {
   comp: "checkbox";
   label: string;
@@ -189,28 +202,58 @@ export interface ColorPicker {
   label: string;
   [k: string]: unknown;
 }
-export interface Select {
-  comp: "select";
+export interface Combobox {
+  comp: "combobox";
   label: string;
   items?: SelectItems;
   getItems?: GetItems;
+  multiple?: boolean;
   [k: string]: unknown;
 }
 export interface SelectItem {
   title: string;
   key: string;
   value: unknown;
+  icon?: string;
   [k: string]: unknown;
 }
 export interface GetItemsFetch {
   url: Expression;
+  qSearchParam?: string;
+  searchParams?: {
+    [k: string]: Expression;
+  };
+  [k: string]: unknown;
+}
+export interface NumberCombobox {
+  comp: "number-combobox";
+  label: string;
+  items?: SelectItems;
+  getItems?: GetItems;
+  multiple?: boolean;
+  step?: number;
+  min?: number;
+  max?: number;
+  [k: string]: unknown;
+}
+export interface Select {
+  comp: "select";
+  label: string;
+  items?: SelectItems;
+  getItems?: GetItems;
+  multiple?: boolean;
+  [k: string]: unknown;
+}
+export interface Autocomplete {
+  comp: "autocomplete";
+  label: string;
+  items?: SelectItems;
+  getItems?: GetItems;
+  multiple?: boolean;
   [k: string]: unknown;
 }
 export interface OneOfSelect {
   comp: "one-of-select";
-  if?: Expression;
-  label?: string;
-  help?: string;
   [k: string]: unknown;
 }
 export interface Section {