@koumoul/vjsf 3.13.1 → 3.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "3.13.1",
+  "version": "3.14.0",
   "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.9.0",
-    "@json-layout/vocabulary": "~2.2.0",
+    "@json-layout/core": "~1.10.0",
+    "@json-layout/vocabulary": "~2.3.0",
     "@vueuse/core": "^12.5.0",
     "debug": "^4.3.4"
   },

package/src/components/nodes/date-time-picker.vue

@@ -10,8 +10,10 @@ import { useDate, useDefaults } from 'vuetify'
 import { computed, ref, watch, toRef } from 'vue'
 import { getDateTimeParts, getDateTimeWithOffset, getShortTime } from '../../utils/dates.js'
 import useNode from '../../composables/use-node.js'
+import useCompDefaults from '../../composables/use-comp-defaults.js'
 
 useDefaults({}, 'VjsfDatePicker')
+const timePickerDefaults = useCompDefaults('VTimePicker')
 
 const props = defineProps({
   modelValue: {
@@ -54,8 +56,8 @@ const datePickerProps = computed(() => {
 })
 
 const timePickerProps = computed(() => {
-  const timePickerProps = { ...compProps.value }
-  timePickerProps['ampm-in-title'] = true
+  const timePickerProps = { ...timePickerDefaults.value, ...compProps.value }
+  if (timePickerProps.format !== '24hr') timePickerProps['ampm-in-title'] = true
   if (localData.value) timePickerProps.modelValue = getShortTime(localData.value.slice(11))
   timePickerProps['onUpdate:modelValue'] = (/** @type {string} */value) => {
     if (!localData.value) return

package/src/components/nodes/list.vue

@@ -111,7 +111,7 @@ const pushEmptyIndexedItem = () => {
   if (!newKey.value) return
   if (!newKeyForm.value) return
   if (!newKeyForm.value.isValid) return
-  const newData = { ...(props.modelValue.data ?? {}), [newKey.value]: null }
+  const newData = { ...(props.modelValue.data ?? {}), [newKey.value]: undefined }
   props.statefulLayout.input(props.modelValue, newData)
   if (layout.value.listEditMode === 'inline-single') {
     props.statefulLayout.activateItem(props.modelValue, Object.keys(newData).length - 1)

package/src/components/nodes/time-picker.vue

@@ -7,8 +7,10 @@ import { useDate, useDefaults } from 'vuetify'
 import { computed, toRef } from 'vue'
 import { getShortTime, getLongTime } from '../../utils/dates.js'
 import useNode from '../../composables/use-node.js'
+import useCompDefaults from '../../composables/use-comp-defaults.js'
 
-useDefaults({}, 'VjsfDatePicker')
+useDefaults({}, 'VjsfTimePicker')
+const timePickerDefaults = useCompDefaults('VTimePicker')
 
 const props = defineProps({
   modelValue: {
@@ -28,8 +30,8 @@ const vDate = useDate()
 const { compProps, localData } = useNode(toRef(props, 'modelValue'), props.statefulLayout)
 
 const timePickerProps = computed(() => {
-  const timePickerProps = { ...compProps.value }
-  timePickerProps['ampm-in-title'] = true
+  const timePickerProps = { ...timePickerDefaults.value, ...compProps.value }
+  if (timePickerProps.format !== '24hr') timePickerProps['ampm-in-title'] = true
   if (localData.value) timePickerProps.modelValue = getShortTime(localData.value)
   return timePickerProps
 })

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, 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