@koumoul/vjsf 3.15.1 → 3.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "3.15.1",
+  "version": "3.15.3",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "scripts": {
     "test": "vitest run",
@@ -71,8 +71,8 @@
     "vuetify": "^3.6.13"
   },
   "dependencies": {
-    "@json-layout/core": "~1.10.1",
-    "@json-layout/vocabulary": "~2.3.0",
+    "@json-layout/core": "~1.10.4",
+    "@json-layout/vocabulary": "~2.3.3",
     "@vueuse/core": "^12.5.0",
     "debug": "^4.3.4"
   },

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']
     }
 

package/src/components/fragments/child-subtitle.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { computed } from 'vue'
-import { isSection } from '@json-layout/core'
+import { isSection } from '@json-layout/core/state'
 
 const { modelValue } = defineProps({
   modelValue: {

package/src/components/nodes/expansion-panels.vue

@@ -3,7 +3,7 @@ import { toRef } from 'vue'
 import { VExpansionPanels, VExpansionPanel, VExpansionPanelTitle, VExpansionPanelText } from 'vuetify/components/VExpansionPanel'
 import { VContainer, VRow } from 'vuetify/components/VGrid'
 import { VIcon } from 'vuetify/components/VIcon'
-import { isSection } from '@json-layout/core'
+import { isSection } from '@json-layout/core/state'
 import Node from '../node.vue'
 import SectionHeader from '../fragments/section-header.vue'
 import ChildSubtitle from '../fragments/child-subtitle.vue'

package/src/components/nodes/list.vue

@@ -10,7 +10,8 @@ import { VIcon } from 'vuetify/components/VIcon'
 import { VBtn } from 'vuetify/components/VBtn'
 import { VMenu } from 'vuetify/components/VMenu'
 import { VForm } from 'vuetify/components/VForm'
-import { isSection, clone, getRegexp } from '@json-layout/core'
+import { isSection, getRegexp } from '@json-layout/core/state'
+import { clone } from '@json-layout/core/utils/clone'
 import Node from '../node.vue'
 import { moveDataItem } from '../../utils/arrays.js'
 import useDnd from '../../composables/use-dnd.js'

package/src/components/nodes/one-of-select.vue

@@ -2,7 +2,7 @@
 import { VRow, VCol } from 'vuetify/components/VGrid'
 import { VSelect } from 'vuetify/components/VSelect'
 import { ref, watch, computed, toRef } from 'vue'
-import { isSection } from '@json-layout/core'
+import { isSection } from '@json-layout/core/state'
 import { isCompObject } from '@json-layout/vocabulary'
 import useNode from '../../composables/use-node.js'
 import Node from '../node.vue'

package/src/components/nodes/stepper.vue

@@ -4,7 +4,7 @@ import { VStepper, VStepperHeader, VStepperItem, VStepperWindow, VStepperWindowI
 import { VContainer, VRow, VSpacer } from 'vuetify/components/VGrid'
 import { VBtn } from 'vuetify/components/VBtn'
 import { VDivider } from 'vuetify/components/VDivider'
-import { isSection } from '@json-layout/core'
+import { isSection } from '@json-layout/core/state'
 import Node from '../node.vue'
 import SectionHeader from '../fragments/section-header.vue'
 import ChildSubtitle from '../fragments/child-subtitle.vue'

package/src/components/nodes/tabs.vue

@@ -6,7 +6,7 @@ import { VSheet } from 'vuetify/components/VSheet'
 import { VWindow, VWindowItem } from 'vuetify/components/VWindow'
 import { useDefaults } from 'vuetify'
 import { ref } from 'vue'
-import { isSection } from '@json-layout/core'
+import { isSection } from '@json-layout/core/state'
 import Node from '../node.vue'
 import SectionHeader from '../fragments/section-header.vue'
 import ChildSubtitle from '../fragments/child-subtitle.vue'

package/src/components/nodes/vertical-tabs.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { isSection } from '@json-layout/core'
+import { isSection } from '@json-layout/core/state'
 import { VTabs, VTab } from 'vuetify/components/VTabs'
 import { VContainer, VRow } from 'vuetify/components/VGrid'
 import { VIcon } from 'vuetify/components/VIcon'

package/src/components/vjsf.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue'
 
-import { compile } from '@json-layout/core'
+import { compile, produceCompileOptions } from '@json-layout/core/compile'
 import Tree from './tree.vue'
 import { useVjsf, emits } from '../composables/use-vjsf.js'
 import '../styles/vjsf.css'
@@ -93,6 +93,7 @@ const { el, statefulLayout, stateTree } = useVjsf(
   nodeComponents,
   emit,
   compile,
+  produceCompileOptions,
   computed(() => props.precompiledLayout)
 )
 

package/src/composables/use-vjsf.js

@@ -1,5 +1,5 @@
 import { useDefaults, useLocale } from 'vuetify'
-import { StatefulLayout, produceCompileOptions } from '@json-layout/core'
+import { StatefulLayout } from '@json-layout/core/state'
 import { inject, toRaw, shallowRef, computed, ref, watch, useSlots, getCurrentInstance, nextTick } from 'vue'
 import { useElementSize } from '@vueuse/core'
 import { getFullOptions } from '../options.js'
@@ -28,10 +28,11 @@ export const emits = {
  * @param {import('vue').Ref<import("../types.js").PartialVjsfOptions | null>} options
  * @param {Record<string, import('vue').Component>} nodeComponents
  * @param {any} emit
- * @param {typeof import('@json-layout/core').compile} [compile]
+ * @param {typeof import('@json-layout/core/compile').compile} [compile]
+ * @param {typeof import('@json-layout/core/compile').produceCompileOptions} [produceCompileOptions]
  * @param {import('vue').Ref<import('@json-layout/core').CompiledLayout>} [precompiledLayout]
  */
-export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compile, precompiledLayout) => {
+export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compile, produceCompileOptions, precompiledLayout) => {
   const el = ref(null)
 
   useDefaults({}, 'Vjsf')
@@ -114,6 +115,7 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
   const compileOptions = ref({})
   watch(fullOptions, (newOptions) => {
     if (precompiledLayout?.value) return
+    if (!produceCompileOptions) throw new Error('produceCompileOptions function is not available')
     const newCompileOptions = produceCompileOptions(compileOptions.value, newOptions)
     if (newCompileOptions !== compileOptions.value) {
       debug('new compileOptions', newCompileOptions)

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":"AA4NA;;;;;;GAMG;AACH,kCALW,MAAM,2CAEN,MAAM,0BAoBhB;sBApPqB,KAAK"}

package/types/components/fragments/child-subtitle.vue.d.ts

@@ -1,7 +1,7 @@
 declare const _default: import("vue").DefineComponent<{}, {
-    modelValue: import("../../../node_modules/@json-layout/core/types/state/types.js").StateNode;
+    modelValue: import("../../../../node_modules/@json-layout/core/types/state/types.js").StateNode;
     $props: {
-        modelValue?: import("../../../node_modules/@json-layout/core/types/state/types.js").StateNode | undefined;
+        modelValue?: import("../../../../node_modules/@json-layout/core/types/state/types.js").StateNode | undefined;
     };
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/types/components/fragments/select-item.vue.d.ts

@@ -1,11 +1,11 @@
 declare const _default: import("vue").DefineComponent<{}, {
     multiple: boolean;
-    item: import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem;
+    item: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem;
     avatarProps: Record<string, any>;
     itemProps: Record<string, any>;
     $props: {
         readonly multiple?: boolean | undefined;
-        readonly item?: import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem | undefined;
+        readonly item?: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem | undefined;
         readonly avatarProps?: Record<string, any> | undefined;
         readonly itemProps?: Record<string, any> | undefined;
     };

package/types/components/fragments/select-selection.vue.d.ts

@@ -1,11 +1,11 @@
 declare const _default: import("vue").DefineComponent<{}, {
     multiple: boolean;
-    item: import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem;
+    item: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem;
     avatarProps: Record<string, any>;
     last: boolean;
     $props: {
         readonly multiple?: boolean | undefined;
-        readonly item?: import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem | undefined;
+        readonly item?: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem | undefined;
         readonly avatarProps?: Record<string, any> | undefined;
         readonly last?: boolean | undefined;
     };

package/types/components/tree.vue.d.ts

@@ -1,8 +1,8 @@
 declare const _default: import("vue").DefineComponent<{}, {
-    modelValue: import("../../node_modules/@json-layout/core/types/state/types.js").StateTree;
+    modelValue: import("../../../node_modules/@json-layout/core/types/state/types.js").StateTree;
     statefulLayout: import("../types.js").VjsfStatefulLayout;
     $props: {
-        readonly modelValue?: import("../../node_modules/@json-layout/core/types/state/types.js").StateTree | undefined;
+        readonly modelValue?: import("../../../node_modules/@json-layout/core/types/state/types.js").StateTree | undefined;
         readonly statefulLayout?: import("../types.js").VjsfStatefulLayout | undefined;
     };
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/types/components/vjsf.vue.d.ts

@@ -3,12 +3,12 @@ declare const _default: import("vue").DefineComponent<{}, {
     options: import("../types.js").PartialVjsfOptions | null;
     modelValue: any;
     schema: Record<string, any>;
-    precompiledLayout: import("../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout;
+    precompiledLayout: import("../../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout;
     $props: {
         readonly options?: import("../types.js").PartialVjsfOptions | null | undefined;
         readonly modelValue?: any;
         readonly schema?: Record<string, any> | undefined;
-        readonly precompiledLayout?: import("../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout | undefined;
+        readonly precompiledLayout?: import("../../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout | undefined;
     };
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/types/composables/use-get-items.d.ts

@@ -4,7 +4,7 @@
  */
 export default function _default(nodeRef: import('vue').Ref<import('../types.js').VjsfNode>, statefulLayout: import('../types.js').VjsfStatefulLayout): {
     hasItems: import("vue").ComputedRef<boolean>;
-    items: import("vue").Ref<import("../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems, import("../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems>;
+    items: import("vue").Ref<import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems, import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems>;
     loading: import("vue").Ref<boolean, boolean>;
     search: import("vue").Ref<string, string>;
     prepareSelectedItem: (selectedItem: any, itemValue: any) => any;

package/types/composables/use-node.d.ts

@@ -24,9 +24,9 @@ export default function _default(nodeRef: import('vue').Ref<import('../types.js'
     }>;
     compSlots: import("vue").ComputedRef<Record<string, any>>;
     options: import("vue").ComputedRef<Required<import("../types.js").VjsfOptions>>;
-    skeleton: import("vue").ComputedRef<import("../../node_modules/@json-layout/core/types/compile/types.js").SkeletonNode>;
-    layout: import("vue").ComputedRef<import("../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").BaseCompObject>;
+    skeleton: import("vue").ComputedRef<import("../../../node_modules/@json-layout/core/types/compile/types.js").SkeletonNode>;
+    layout: import("vue").ComputedRef<import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").BaseCompObject>;
     data: import("vue").ComputedRef<unknown>;
-    children: import("vue").ComputedRef<import("../../node_modules/@json-layout/core/types/state/types.js").StateNode[] | undefined>;
+    children: import("vue").ComputedRef<import("../../../node_modules/@json-layout/core/types/state/types.js").StateNode[] | undefined>;
 };
 //# sourceMappingURL=use-node.d.ts.map

package/types/composables/use-select-node.d.ts

@@ -19,7 +19,7 @@ export default function _default(nodeRef: import('vue').Ref<import('../types.js'
     }>;
     getItems: {
         hasItems: import("vue").ComputedRef<boolean>;
-        items: import("vue").Ref<import("../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems, import("../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems>;
+        items: import("vue").Ref<import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems, import("../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItems>;
         loading: import("vue").Ref<boolean, boolean>;
         search: import("vue").Ref<string, string>;
         prepareSelectedItem: (selectedItem: any, itemValue: any) => any;

package/types/composables/use-vjsf.d.ts

@@ -8,9 +8,9 @@ export const emits: {
     */
     'update:state': (state: import('../types.js').VjsfStatefulLayout) => boolean;
 };
-export function useVjsf(schema: import('vue').Ref<Object>, modelValue: import('vue').Ref<any>, options: import('vue').Ref<import("../types.js").PartialVjsfOptions | null>, nodeComponents: Record<string, import('vue').Component>, emit: any, compile?: typeof import("@json-layout/core").compile | undefined, precompiledLayout?: import("vue").Ref<import("../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout, import("../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout> | undefined): {
+export function useVjsf(schema: import('vue').Ref<Object>, modelValue: import('vue').Ref<any>, options: import('vue').Ref<import("../types.js").PartialVjsfOptions | null>, nodeComponents: Record<string, import('vue').Component>, emit: any, compile?: typeof import("@json-layout/core").compile | undefined, produceCompileOptions?: ((draft: import("../../../node_modules/@json-layout/core/types/compile/types.js").PartialCompileOptions, newOptions: import("../../../node_modules/@json-layout/core/types/compile/types.js").PartialCompileOptions) => import("../../../node_modules/@json-layout/core/types/compile/types.js").PartialCompileOptions) | undefined, precompiledLayout?: import("vue").Ref<import("../../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout, import("../../../node_modules/@json-layout/core/types/compile/types.js").CompiledLayout> | undefined): {
     el: import("vue").Ref<null, null>;
     statefulLayout: import("vue").ShallowRef<import("../types.js").VjsfStatefulLayout | null, import("../types.js").VjsfStatefulLayout | null>;
-    stateTree: import("vue").ShallowRef<import("../../node_modules/@json-layout/core/types/state/types.js").StateTree | null, import("../../node_modules/@json-layout/core/types/state/types.js").StateTree | null>;
+    stateTree: import("vue").ShallowRef<import("../../../node_modules/@json-layout/core/types/state/types.js").StateTree | null, import("../../../node_modules/@json-layout/core/types/state/types.js").StateTree | null>;
 };
 //# sourceMappingURL=use-vjsf.d.ts.map

package/types/composables/use-vjsf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-vjsf.d.ts","sourceRoot":"","sources":["../../src/composables/use-vjsf.js"],"names":[],"mappings":"AAaA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAWM,gCARI,OAAO,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,cACzB,OAAO,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,WACtB,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,kBAClE,OAAO,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG;;;;EA8Ib"}
+{"version":3,"file":"use-vjsf.d.ts","sourceRoot":"","sources":["../../src/composables/use-vjsf.js"],"names":[],"mappings":"AAaA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAYM,gCATI,OAAO,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,cACzB,OAAO,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,WACtB,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,kBAClE,OAAO,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG;;;;EAgJb"}