@koumoul/vjsf 3.15.2 → 3.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "3.15.2",
+  "version": "3.15.4",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "scripts": {
     "test": "vitest run",

package/src/compat/v2.js

@@ -96,7 +96,23 @@ const processFragment = (schema, getJSONRef, schemaId, processed) => {
       if (display === 'checkbox' && schema.type !== 'boolean') display = 'checkbox-group'
       if (display === 'switch' && schema.type !== 'boolean') display = 'switch-group'
       if (display === 'hidden') display = 'none'
-      layout.comp = display
+      if (schema.allOf && schema.properties) {
+        const children = []
+        for (const key of Object.keys(schema.properties)) {
+          children.push(key)
+        }
+        const allOfChild = {
+          comp: display,
+          children: /** @type string[] */([])
+        }
+        for (let i = 0; i < schema.allOf.length; i++) {
+          allOfChild.children.push('$allOf-' + i)
+        }
+        children.push(allOfChild)
+        layout.children = children
+      } else {
+        layout.comp = display
+      }
       delete schema['x-display']
     }
 
@@ -147,6 +163,19 @@ const processFragment = (schema, getJSONRef, schemaId, processed) => {
       layout.if = '!summary'
     }
 
+    if (schema.type === 'array' && schema.items) {
+      if (!Array.isArray(schema.items)) {
+        layout.comp = 'list'
+        if (schema['x-itemTitle']) layout.itemTitle = `data["${schema['x-itemTitle']}"]`
+        else {
+          // vjsf 2 implicitly used a title property as an item title in lists
+          if (schema.items.properties?.title || schema.items.allOf?.some((/** @type {any} */ ao) => ao.properties?.title)) {
+            layout.itemTitle = 'data.title'
+          }
+        }
+      }
+    }
+
     // compact the layout keyword if possible
     if (Object.keys(layout).length === 1 && 'comp' in layout) {
       schema.layout = layout.comp

package/types/compat/v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v2.d.ts","sourceRoot":"","sources":["../../src/compat/v2.js"],"names":[],"mappings":"AA4MA;;;;;;GAMG;AACH,kCALW,MAAM,2CAEN,MAAM,0BAoBhB;sBApOqB,KAAK"}
+{"version":3,"file":"v2.d.ts","sourceRoot":"","sources":["../../src/compat/v2.js"],"names":[],"mappings":"AAyOA;;;;;;GAMG;AACH,kCALW,MAAM,2CAEN,MAAM,0BAoBhB;sBAjQqB,KAAK"}