@koumoul/vjsf 4.1.5 → 4.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "4.1.5",
+  "version": "4.3.0",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "scripts": {
     "test-tz1": "TZ=Europe/Paris vitest run",
@@ -78,8 +78,8 @@
     "vuetify": "^4.0.0"
   },
   "dependencies": {
-    "@json-layout/core": "~2.5.0",
-    "@json-layout/vocabulary": "~2.12.0",
+    "@json-layout/core": "~2.7.0",
+    "@json-layout/vocabulary": "~2.13.0",
     "@vueuse/core": "^12.5.0",
     "debug": "^4.3.4"
   },

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

@@ -33,7 +33,7 @@ export default defineComponent({
   setup (props, { emit }) {
     useDefaults({}, 'VjsfListSelectKey')
     const vSelectProps = useCompDefaults('VjsfIndexedList-VSelect', { variant: 'outlined', class: 'mt-2' })
-    const avatarProps = useCompDefaults('VjsfSelectItem-VAvatar', { rounded: false, size: 'small' })
+    const avatarProps = useCompDefaults('VjsfSelectItem-VAvatar', { rounded: false, size: 'small', color: 'transparent' })
 
     // @ts-ignore
     const { getItems, selectProps, selectSlots } = useSelectNode(toRef(props, 'listNode'), props.statefulLayout, avatarProps.value, 'v-select')

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

@@ -17,7 +17,7 @@ export default defineComponent({
     }
   },
   setup (props) {
-    const isUrl = computed(() => props.icon.startsWith('http://') || props.icon.startsWith('https://'))
+    const isUrl = computed(() => props.icon.startsWith('http://') || props.icon.startsWith('https://') || props.icon.startsWith('/'))
     const isSVG = computed(() => props.icon.startsWith('<?xml') || props.icon.startsWith('<svg'))
     return () => {
       if (isUrl.value) {

package/src/components/nodes/autocomplete.vue

@@ -20,7 +20,7 @@ export default defineComponent({
   },
   setup (props) {
     useDefaults({}, 'VjsfAutocomplete')
-    const avatarProps = useCompDefaults('VjsfSelectItem-VAvatar', { rounded: false, size: 'small' })
+    const avatarProps = useCompDefaults('VjsfSelectItem-VAvatar', { rounded: false, size: 'small', color: 'transparent' })
 
     const { getItems, selectProps, selectSlots, localData } = useSelectNode(toRef(props, 'modelValue'), props.statefulLayout, avatarProps.value, 'v-autocomplete')
 

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

@@ -1,6 +1,7 @@
 <script setup>
 import { VRow, VCol } from 'vuetify/components/VGrid'
 import { VSelect } from 'vuetify/components/VSelect'
+import { VAutocomplete } from 'vuetify/components/VAutocomplete'
 import { ref, watch, computed, toRef } from 'vue'
 import { isSection } from '@json-layout/core/state'
 import { isCompObject, isOneOfItemHeader, isOneOfItemChild } from '@json-layout/vocabulary'
@@ -32,6 +33,7 @@ const { inputProps, localData, skeleton, children } = useNode(
   toRef(props, 'modelValue'), props.statefulLayout, { bindData: false }
 )
 const zIndex = useZIndexStack(props.modelValue.fullKey)
+const isAutocomplete = computed(() => !!props.modelValue.layout.autocomplete)
 
 /** @type import('vue').Ref<string | undefined> */
 const activeChildTree = ref(undefined)
@@ -45,9 +47,10 @@ watch(() => children.value?.[0]?.key, () => {
   }
 }, { immediate: true })
 
-const onChange = (/** @type {string} */childTree) => {
+const onChange = (/** @type {string | null} */childTree) => {
   if (!skeleton.value.childrenTrees) return
-  props.statefulLayout.activateItem(props.modelValue, skeleton.value.childrenTrees.indexOf(childTree))
+  const index = childTree == null ? -1 : skeleton.value.childrenTrees.indexOf(childTree)
+  props.statefulLayout.activateItem(props.modelValue, index)
 }
 
 const fieldProps = computed(() => {
@@ -83,7 +86,8 @@ const fieldProps = computed(() => {
       v-if="modelValue.skeleton.childrenTrees"
       cols="12"
     >
-      <v-select
+      <component
+        :is="isAutocomplete ? VAutocomplete : VSelect"
         v-bind="fieldProps"
         :model-value="activeChildTree"
       >
@@ -112,7 +116,7 @@ const fieldProps = computed(() => {
             </template>
           </v-list-item>
         </template>
-      </v-select>
+      </component>
     </v-col>
     <template v-if="modelValue.children?.[0]">
       <node

package/src/components/nodes/select.vue

@@ -20,7 +20,7 @@ export default defineComponent({
   },
   setup (props) {
     useDefaults({}, 'VjsfSelect')
-    const avatarProps = useCompDefaults('VjsfSelectItem-VAvatar', { rounded: false, size: 'small' })
+    const avatarProps = useCompDefaults('VjsfSelectItem-VAvatar', { rounded: false, size: 'small', color: 'transparent' })
 
     const { getItems, selectProps, selectSlots, localData } = useSelectNode(toRef(props, 'modelValue'), props.statefulLayout, avatarProps.value, 'v-select')
 

package/src/components/nodes/slider.vue

@@ -40,3 +40,9 @@ export default defineComponent({
   }
 })
 </script>
+
+<style>
+.vjsf-node-slider .v-slider {
+  padding-right: 8px;
+}
+</style>

package/src/components/vjsf-webmcp.vue

@@ -34,6 +34,10 @@ const props = defineProps({
   dataTitle: {
     type: String,
     default: null
+  },
+  subAgent: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -57,7 +61,7 @@ watch(statefulLayout, () => {
   if (statefulLayout.value) {
     webMCP.value = new WebMCP(
       /** @type {import('@json-layout/core').StatefulLayout} */(/** @type {unknown} */(statefulLayout.value)),
-      { prefixName: props.prefixName, dataTitle: props.dataTitle, schema: props.schema }
+      { prefixName: props.prefixName, dataTitle: props.dataTitle, schema: props.schema, includeSubAgent: props.subAgent }
     )
     webMCP.value.registerTools()
   }

package/src/composables/use-vjsf.js

@@ -67,6 +67,7 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
   // cf https://github.com/vuetifyjs/vuetify/blob/master/packages/vuetify/src/composables/form.ts
   /** @type {any | null} */
   const form = inject(Symbol.for('vuetify:form'), null)
+  const parentVjsf = inject(Symbol.for('vjsf:form'), false)
   const formMemberId = `vjsf-${Math.random().toString(36).substring(2, 9)}`
   if (form) {
     form.register({
@@ -79,7 +80,7 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
       resetValidation: () => statefulLayout.value?.resetValidation(),
       vm: getCurrentInstance()
     })
-  } else {
+  } else if (!parentVjsf) {
     console.warn('Vjsf should be wrapped in VForm')
   }
 
@@ -88,6 +89,7 @@ export const useVjsf = (schema, modelValue, options, nodeComponents, emit, compi
   // registers as a single form member above. Without this, each VInput registers
   // separately, causing VForm to cascade updates to all N fields on every keystroke.
   provide(Symbol.for('vuetify:form'), null)
+  provide(Symbol.for('vjsf:form'), true)
 
   const slots = useSlots()
 

package/types/components/nodes/one-of-select.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"one-of-select.vue.d.ts","sourceRoot":"","sources":["../../../src/components/nodes/one-of-select.vue"],"names":[],"mappings":"wBA2XqB,OAAO,YAAY;;AAdxC;;QAGI,iFAAiF;cAAvE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,mBAAmB,CAAC;;;;QAK9E,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;;QAL7E,iFAAiF;cAAvE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,mBAAmB,CAAC;;;;QAK9E,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;6IAK9E"}
+{"version":3,"file":"one-of-select.vue.d.ts","sourceRoot":"","sources":["../../../src/components/nodes/one-of-select.vue"],"names":[],"mappings":"wBAkYqB,OAAO,YAAY;;AAdxC;;QAGI,iFAAiF;cAAvE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,mBAAmB,CAAC;;;;QAK9E,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;;QAL7E,iFAAiF;cAAvE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,mBAAmB,CAAC;;;;QAK9E,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;6IAK9E"}

package/types/components/nodes/slider.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slider.vue.d.ts","sourceRoot":"","sources":["../../../src/components/nodes/slider.vue"],"names":[],"mappings":"wBAkDqB,OAAO,YAAY;;AAQxC;;QAGM,4EAA4E;cAAlE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,cAAc,CAAC;;;;QAKzE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;;;;QAL7E,4EAA4E;cAAlE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,cAAc,CAAC;;;;QAKzE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;6IA0BhF"}
+{"version":3,"file":"slider.vue.d.ts","sourceRoot":"","sources":["../../../src/components/nodes/slider.vue"],"names":[],"mappings":"wBAwDqB,OAAO,YAAY;;AAQxC;;QAGM,4EAA4E;cAAlE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,cAAc,CAAC;;;;QAKzE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;;;;;QAL7E,4EAA4E;cAAlE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,cAAc,CAAC;;;;QAKzE,gFAAgF;cAAtE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC;;;6IA0BhF"}

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

@@ -27,6 +27,10 @@ declare const __VLS_export: import("vue", { with: { "resolution-mode": "import"
         type: StringConstructor;
         default: null;
     };
+    subAgent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>, {}, {}, {}, {}, import("vue", { with: { "resolution-mode": "import" } }).ComponentOptionsMixin, import("vue", { with: { "resolution-mode": "import" } }).ComponentOptionsMixin, {
     "update:state": (state: import("../types.js", { with: { "resolution-mode": "import" } }).VjsfStatefulLayout) => void;
     "update:modelValue": (data: any) => void;
@@ -57,6 +61,10 @@ declare const __VLS_export: import("vue", { with: { "resolution-mode": "import"
         type: StringConstructor;
         default: null;
     };
+    subAgent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{
     "onUpdate:state"?: ((state: import("../types.js", { with: { "resolution-mode": "import" } }).VjsfStatefulLayout) => any) | undefined;
     "onUpdate:modelValue"?: ((data: any) => any) | undefined;
@@ -66,5 +74,6 @@ declare const __VLS_export: import("vue", { with: { "resolution-mode": "import"
     precompiledLayout: import("../../../node_modules/@json-layout/core/types/compile/types.js", { with: { "resolution-mode": "import" } }).CompiledLayout;
     prefixName: string;
     dataTitle: string;
+    subAgent: boolean;
 }, {}, {}, {}, string, import("vue", { with: { "resolution-mode": "import" } }).ComponentProvideOptions, true, {}, any>;
 //# sourceMappingURL=vjsf-webmcp.vue.d.ts.map

package/types/components/vjsf-webmcp.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vjsf-webmcp.vue.d.ts","sourceRoot":"","sources":["../../src/components/vjsf-webmcp.vue"],"names":[],"mappings":"wBAgOqB,OAAO,YAAY;;AA/BxC;;;;;;QAQI,+EAA+E;cAArE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC;;;;;;;;QAS5E,oFAAoF;cAA1E,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;QATjF,+EAA+E;cAArE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC;;;;;;;;QAS5E,oFAAoF;cAA1E,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;wHAalF"}
+{"version":3,"file":"vjsf-webmcp.vue.d.ts","sourceRoot":"","sources":["../../src/components/vjsf-webmcp.vue"],"names":[],"mappings":"wBA4OqB,OAAO,YAAY;;AAnCxC;;;;;;QAQI,+EAA+E;cAArE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC;;;;;;;;QAS5E,oFAAoF;cAA1E,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;QATjF,+EAA+E;cAArE,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC;;;;;;;;QAS5E,oFAAoF;cAA1E,OAAO,KAAK,EAAE,QAAQ,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;wHAiBlF"}

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":"AAcA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAiBM,gCAdI,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,MAAM,CAAC,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG,YACH,cAAc,2BAA2B,EAAE,OAAO,0BAClD,cAAc,2BAA2B,EAAE,qBAAqB,sBAChE,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC,GAC3D;IACV,EAAE,EAAE,OAAO,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5B,cAAc,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAC1F,SAAS,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,mBAAmB,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;CAChF,CAuKH"}
+{"version":3,"file":"use-vjsf.d.ts","sourceRoot":"","sources":["../../src/composables/use-vjsf.js"],"names":[],"mappings":"AAcA;IACE;;MAEE;gCADO,GAAG;IAGZ;;MAEE;4BADO,OAAO,aAAa,EAAE,kBAAkB;EAGlD;AAiBM,gCAdI,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,MAAM,CAAC,MAAM,EAAE,OAAO,KAAK,EAAE,SAAS,CAAC,QACvC,GAAG,YACH,cAAc,2BAA2B,EAAE,OAAO,0BAClD,cAAc,2BAA2B,EAAE,qBAAqB,sBAChE,OAAO,KAAK,EAAE,GAAG,CAAC,OAAO,mBAAmB,EAAE,cAAc,CAAC,GAC3D;IACV,EAAE,EAAE,OAAO,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5B,cAAc,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAC1F,SAAS,EAAE,OAAO,KAAK,EAAE,UAAU,CAAC,OAAO,mBAAmB,EAAE,SAAS,GAAG,IAAI,CAAC,CAAA;CAChF,CAyKH"}