@koumoul/vjsf 3.20.8 → 3.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "3.20.8",
+  "version": "3.22.0",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "scripts": {
     "test-tz1": "TZ=Europe/Paris vitest run",
@@ -72,8 +72,8 @@
     "vuetify": "^3.8.12"
   },
   "dependencies": {
-    "@json-layout/core": "~2.0.0",
-    "@json-layout/vocabulary": "~2.8.0",
+    "@json-layout/core": "~2.1.1",
+    "@json-layout/vocabulary": "~2.9.0",
     "@vueuse/core": "^12.5.0",
     "debug": "^4.3.4"
   },

package/src/components/fragments/list-select-key.vue

@@ -0,0 +1,67 @@
+<script>
+import { VSelect } from 'vuetify/components/VSelect'
+import { defineComponent, h, computed, toRef } from 'vue'
+import { useDefaults } from 'vuetify'
+import useSelectNode from '../../composables/use-select-node.js'
+import useCompDefaults from '../../composables/use-comp-defaults.js'
+import { mergePropsLevels } from '../../composables/use-node.js'
+
+export default defineComponent({
+  props: {
+    modelValue: {
+      type: String,
+      required: true
+    },
+    listNode: {
+      /** @type import('vue').PropType<import('../../types.js').VjsfListNode> */
+      type: Object,
+      required: true
+    },
+    statefulLayout: {
+      /** @type import('vue').PropType<import('../../types.js').VjsfStatefulLayout> */
+      type: Object,
+      required: true
+    },
+    rules: {
+      /** @type import('vue').PropType<((v: string) => boolean)[]> */
+      type: Array,
+      required: true
+    }
+  },
+  emits: ['update:modelValue'],
+  setup (props, { emit }) {
+    useDefaults({}, 'VjsfListSelectKey')
+    const vSelectProps = useCompDefaults('VjsfSelectItem-VSelect', { variant: 'outlined', class: 'mt-2' })
+    const avatarProps = useCompDefaults('VjsfSelectItem-VAvatar', { rounded: false, size: 'small' })
+
+    // @ts-ignore
+    const { getItems, selectProps, selectSlots } = useSelectNode(toRef(props, 'listNode'), props.statefulLayout, avatarProps.value, 'v-select')
+
+    const fieldProps = computed(() => {
+      const fieldProps = mergePropsLevels([vSelectProps.value, selectProps.value])
+      fieldProps.label = props.listNode.messages.addItem
+      fieldProps.loading = getItems.loading.value
+      fieldProps.items = getItems.items.value
+      delete fieldProps.clearable
+      delete fieldProps['onBlur']
+      fieldProps.rules = props.rules
+      fieldProps.active = false
+      fieldProps.modelValue = props.modelValue
+      fieldProps['onUpdate:modelValue'] = (/** @type string */value) => {
+        emit('update:modelValue', value)
+      }
+      return fieldProps
+    })
+
+    const fieldSlots = computed(() => {
+      const fieldSlots = { ...selectSlots.value }
+      delete fieldSlots.selection
+      return fieldSlots
+    })
+
+    // @ts-ignore
+    return () => h(VSelect, fieldProps.value, fieldSlots.value)
+  }
+})
+
+</script>

package/src/components/fragments/select-item-header.vue

@@ -0,0 +1,28 @@
+<script setup>
+
+import { VListSubheader } from 'vuetify/components/VList'
+import VSelectItemIcon from './select-item-icon.vue'
+
+defineProps({
+  item: {
+    /** @type import('vue').PropType<import('@json-layout/vocabulary').SelectItemHeader> */
+    type: Object,
+    required: true
+  },
+  avatarProps: {
+    type: Object,
+    required: true
+  }
+})
+</script>
+
+<template>
+  <v-list-subheader>
+    <v-select-item-icon
+      v-if="typeof item.icon === 'string'"
+      :icon="item.icon"
+      :avatar-props="avatarProps"
+    />
+    {{ item.title }}
+  </v-list-subheader>
+</template>

package/src/components/fragments/selection-group.vue

@@ -56,7 +56,7 @@ export default defineComponent({
               } else {
                 modelValue = localData.value === item.value
               }
-              checkboxes.push(h(props.type === 'switch' ? VSwitch : VCheckbox, {
+              checkboxes.push(h(/** @type {import('vue').Component} */(props.type === 'switch' ? VSwitch : VCheckbox), {
                 label: item.title,
                 hideDetails: true,
                 key: item.key,

package/src/components/nodes/list.vue

@@ -13,6 +13,7 @@ import { VDialog } from 'vuetify/components/VDialog'
 import { VToolbar } from 'vuetify/components/VToolbar'
 import { VForm } from 'vuetify/components/VForm'
 import { VSheet } from 'vuetify/components/VSheet'
+import ListSelectKey from '../fragments/list-select-key.vue'
 import { isSection, getRegexp } from '@json-layout/core/state'
 import { clone } from '@json-layout/core/utils/clone'
 import Node from '../node.vue'
@@ -207,6 +208,10 @@ const itemBorderColor = computed(() => (/** @type {import('@json-layout/core').S
   return 'transparent'
 })
 
+const indexedListRules = computed(() => {
+  return [(/** @type {string} */v) => !props.modelValue.children.some(c => c.key === v), (/** @type {string} */v) => !v || !!props.modelValue.layout.indexed?.some(pattern => v.match(getRegexp(pattern)))]
+})
+
 </script>
 
 <template>
@@ -328,11 +333,11 @@ const itemBorderColor = computed(() => (/** @type {import('@json-layout/core').S
                         v-bind="vEditMenuProps"
                         @update:model-value="value => value || statefulLayout.deactivateItem(modelValue)"
                       >
-                        <template #activator="{props}">
+                        <template #activator="{props: listItemProps}">
                           <v-list-item
                             :density="modelValue.options.density"
                             base-color="primary"
-                            v-bind="props"
+                            v-bind="listItemProps"
                             @click="statefulLayout.activateItem(modelValue, childIndex);"
                           >
                             <template #prepend>
@@ -451,12 +456,21 @@ const itemBorderColor = computed(() => (/** @type {import('@json-layout/core').S
             style="max-width: 250px;"
             @submit.prevent
           >
+            <list-select-key
+              v-if="modelValue.layout.getItems ?? modelValue.layout.items"
+              v-model="newKey"
+              :list-node="modelValue"
+              :stateful-layout="statefulLayout"
+              :rules="indexedListRules"
+              @update:model-value="pushEmptyIndexedItem"
+            />
             <v-text-field
+              v-else
               v-model="newKey"
               variant="outlined"
               :placeholder="modelValue.messages.addItem"
               hide-details
-              :rules="[(/** @type {string} */v) => !modelValue.children.some(c => c.key === v), v => !v || !!modelValue.layout.indexed?.some(pattern => v.match(getRegexp(pattern)))]"
+              :rules="indexedListRules"
               @keypress.enter="pushEmptyIndexedItem"
             >
               <template #append>

package/src/composables/use-select-node.js

@@ -2,6 +2,7 @@ import { computed, h } from 'vue'
 import useField from './use-node.js'
 import useGetItems from './use-get-items.js'
 import SelectItem from '../components/fragments/select-item.vue'
+import SelectItemHeader from '../components/fragments/select-item-header.vue'
 import SelectSelection from '../components/fragments/select-selection.vue'
 import useZIndexStack from './use-z-index-stack.js'
 
@@ -55,12 +56,21 @@ export default function (nodeRef, statefulLayout, avatarProps, cssPrefix) {
   const selectSlots = computed(() => {
     const slots = { ...compSlots.value }
     if (!slots.item) {
-      slots.item = (/** @type {any} */ context) => h(SelectItem, {
-        multiple: layout.value.multiple,
-        itemProps: context.props,
-        item: context.item.raw,
-        avatarProps
-      })
+      slots.item = (/** @type {any} */ context) => {
+        if (context.item.raw.header) {
+          return h(SelectItemHeader, {
+            item: context.item.raw,
+            avatarProps
+          })
+        } else {
+          return h(SelectItem, {
+            multiple: layout.value.multiple,
+            itemProps: context.props,
+            item: context.item.raw,
+            avatarProps
+          })
+        }
+      }
     }
     if (!slots.selection) {
       slots.selection = (/** @type {any} */ context) => h(SelectSelection, {

package/src/utils/arrays.js

@@ -41,6 +41,5 @@ export function moveObjectItem (data, fromIndex, toIndex) {
   for (const key of newKeys) {
     newData[key] = data[key]
   }
-  console.log(newData)
   return newData
 }

package/types/components/fragments/list-select-key.vue.d.ts

@@ -0,0 +1,47 @@
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        required: true;
+    };
+    listNode: {
+        /** @type import('vue').PropType<import('../../types.js').VjsfListNode> */
+        type: import('vue').PropType<import('../../types.js').VjsfListNode>;
+        required: true;
+    };
+    statefulLayout: {
+        /** @type import('vue').PropType<import('../../types.js').VjsfStatefulLayout> */
+        type: import('vue').PropType<import('../../types.js').VjsfStatefulLayout>;
+        required: true;
+    };
+    rules: {
+        /** @type import('vue').PropType<((v: string) => boolean)[]> */
+        type: import("vue").PropType<((v: string) => boolean)[]>;
+        required: true;
+    };
+}>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        required: true;
+    };
+    listNode: {
+        /** @type import('vue').PropType<import('../../types.js').VjsfListNode> */
+        type: import('vue').PropType<import('../../types.js').VjsfListNode>;
+        required: true;
+    };
+    statefulLayout: {
+        /** @type import('vue').PropType<import('../../types.js').VjsfStatefulLayout> */
+        type: import('vue').PropType<import('../../types.js').VjsfStatefulLayout>;
+        required: true;
+    };
+    rules: {
+        /** @type import('vue').PropType<((v: string) => boolean)[]> */
+        type: import("vue").PropType<((v: string) => boolean)[]>;
+        required: true;
+    };
+}>> & Readonly<{
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;
+//# sourceMappingURL=list-select-key.vue.d.ts.map

package/types/components/fragments/list-select-key.vue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-select-key.vue.d.ts","sourceRoot":"","sources":["../../../src/components/fragments/list-select-key.vue.js"],"names":[],"mappings":";;;;;;QAgBM,0EAA0E;cAAhE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;;;QAKvE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;QAK7E,+DAA+D;0CAAzB,MAAM,KAAK,OAAO;;;;;;;;;;;QAVxD,0EAA0E;cAAhE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,YAAY,CAAC;;;;QAKvE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;QAK7E,+DAA+D;0CAAzB,MAAM,KAAK,OAAO"}

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

@@ -0,0 +1,14 @@
+declare const _default: import("vue").DefineComponent<{}, {
+    multiple: boolean;
+    itemProps: Record<string, any>;
+    item: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem;
+    avatarProps: Record<string, any>;
+    $props: {
+        readonly multiple?: boolean | undefined;
+        readonly itemProps?: Record<string, any> | undefined;
+        readonly item?: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItem | undefined;
+        readonly avatarProps?: Record<string, any> | undefined;
+    };
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;
+//# sourceMappingURL=select-item%20copy.vue.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"select-item copy.vue.d.ts","sourceRoot":"","sources":["../../../src/components/fragments/select-item copy.vue.js"],"names":[],"mappings":""}

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

@@ -0,0 +1,10 @@
+declare const _default: import("vue").DefineComponent<{}, {
+    item: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItemHeader;
+    avatarProps: Record<string, any>;
+    $props: {
+        readonly item?: import("../../../../node_modules/@json-layout/vocabulary/types/normalized-layout/types.js").SelectItemHeader | undefined;
+        readonly avatarProps?: Record<string, any> | undefined;
+    };
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;
+//# sourceMappingURL=select-item-header.vue.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"select-item-header.vue.d.ts","sourceRoot":"","sources":["../../../src/components/fragments/select-item-header.vue.js"],"names":[],"mappings":""}

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

@@ -1 +1 @@
-{"version":3,"file":"use-select-node.d.ts","sourceRoot":"","sources":["../../src/composables/use-select-node.js"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,0CALW,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,aAAa,EAAE,cAAc,CAAC,kBACvD,OAAO,aAAa,EAAE,kBAAkB,eACxC,GAAG,aACH,gBAAgB,GAAG,UAAU;;;;;;;;;;;;;;;;;;;;EAiEvC"}
+{"version":3,"file":"use-select-node.d.ts","sourceRoot":"","sources":["../../src/composables/use-select-node.js"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,0CALW,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,aAAa,EAAE,cAAc,CAAC,kBACvD,OAAO,aAAa,EAAE,kBAAkB,eACxC,GAAG,aACH,gBAAgB,GAAG,UAAU;;;;;;;;;;;;;;;;;;;;EA0EvC"}

package/types/utils/arrays.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arrays.d.ts","sourceRoot":"","sources":["../../src/utils/arrays.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,mCALW,GAAG,EAAE,GAAG,OAAO,MAAM,EAAE,GAAG,CAAC,aAC3B,MAAM,WACN,MAAM,GACL,GAAG,EAAE,GAAG,OAAO,MAAM,EAAE,GAAG,CAAC,CAMtC;AAED;;;;;GAKG;AACH,oCALW,GAAG,EAAE,aACL,MAAM,WACN,MAAM,GACL,GAAG,EAAE,CAWhB;AAED;;;;;GAKG;AACH,qCALW,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,MAAM,WACN,MAAM,GACL,OAAO,MAAM,EAAE,GAAG,CAAC,CAY9B"}
+{"version":3,"file":"arrays.d.ts","sourceRoot":"","sources":["../../src/utils/arrays.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,mCALW,GAAG,EAAE,GAAG,OAAO,MAAM,EAAE,GAAG,CAAC,aAC3B,MAAM,WACN,MAAM,GACL,GAAG,EAAE,GAAG,OAAO,MAAM,EAAE,GAAG,CAAC,CAMtC;AAED;;;;;GAKG;AACH,oCALW,GAAG,EAAE,aACL,MAAM,WACN,MAAM,GACL,GAAG,EAAE,CAWhB;AAED;;;;;GAKG;AACH,qCALW,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,MAAM,WACN,MAAM,GACL,OAAO,MAAM,EAAE,GAAG,CAAC,CAW9B"}