@json-layout/vocabulary 0.6.0 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/vocabulary",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Main JSON Layout vocabulary as JSON schemas and Typescript types. Also contains some small utility functions to validate and normalize annotations.",
   "type": "module",
   "exports": {

package/src/normalize.js

@@ -294,9 +294,13 @@ function getCompObject (layoutKeyword, schemaFragment, schemaPath, markdown, arr
 
   if (partial.if) partial.if = normalizeExpression(partial.if)
 
-  if (partial.defaultData) partial.defaultData = normalizeExpression(partial.defaultData)
-  if (partial.constData) partial.constData = normalizeExpression(partial.constData)
-  if (partial.transformData) partial.transformData = normalizeExpression(partial.transformData)
+  if (!partial.defaultData && schemaFragment.type === 'string' && schemaPath.split('#').pop() === '') {
+    partial.defaultData = '""'
+  }
+
+  if (partial.defaultData !== undefined) partial.defaultData = normalizeExpression(partial.defaultData)
+  if (partial.constData !== undefined) partial.constData = normalizeExpression(partial.constData)
+  if (partial.transformData !== undefined) partial.transformData = normalizeExpression(partial.transformData)
 
   if (partial.getItems && isPartialGetItemsExpr(partial.getItems)) partial.getItems = normalizeExpression(partial.getItems)
   if (partial.getItems && isPartialGetItemsObj(partial.getItems)) {

package/src/normalized-layout/index.js

@@ -33,6 +33,7 @@ import schema from './schema.js'
  * @typedef {import('./types.js').Stepper} Stepper
  * @typedef {import('./types.js').List} List
  * @typedef {import('./types.js').Combobox} Combobox
+ * @typedef {import('./types.js').Markdown} Markdown
  * @typedef {import('./types.js').FileInput} FileInput
  * @typedef {import('./types.js').Cols} Cols
  * @typedef {import('./types.js').ColsObj} ColsObj

package/src/normalized-layout/schema.js

@@ -884,11 +884,15 @@ export default {
     "one-of-select": {
       "type": "object",
       "required": [
-        "comp"
+        "comp",
+        "label"
       ],
       "properties": {
         "comp": {
           "const": "one-of-select"
+        },
+        "label": {
+          "type": "string"
         }
       }
     },

package/src/normalized-layout/schema.json

@@ -402,9 +402,10 @@
     },
     "one-of-select": {
       "type": "object",
-      "required": ["comp"],
+      "required": ["comp", "label"],
       "properties": {
-        "comp": {"const": "one-of-select"}
+        "comp": {"const": "one-of-select"},
+        "label": {"type": "string"}
       }
     },
     "expression": {

package/src/normalized-layout/types.ts

@@ -269,6 +269,7 @@ export interface Autocomplete {
 }
 export interface OneOfSelect {
   comp: "one-of-select";
+  label: string;
   [k: string]: unknown;
 }
 export interface Section {