@ederzeel/nuxt-schema-form-nightly 0.1.0-29119026.5bb3293 → 0.1.0-29119142.f6bc066

package/dist/runtime/components/Array.vue

@@ -1,13 +1,9 @@
 <script lang="ts" setup>
-import { Draft2019 } from 'json-schema-library'
-import SComponent from './Component.vue'
-import { ref, computed, h, resolveComponent } from 'vue'
+import { h } from 'vue'
 import type { TableColumn } from '@nuxt/ui'
-import type { Row } from '@tanstack/vue-table'
 import type { PropertiesType } from '../types'
-
-const UDropdownMenu = resolveComponent('UDropdownMenu')
-const UButton = resolveComponent('UButton')
+import SObject from './array/ArrayObject.vue'
+import SMultiSelect from './MultiSelect.vue'
 
 const props = defineProps<{
   id: string
@@ -15,252 +11,53 @@ const props = defineProps<{
   description?: string
   jsonSchemaPath: string
   items: PropertiesType
-  modelValue: Record<string, unknown>[]
   isRequired: boolean
   minItems?: number
   maxItems?: number
   edit?: boolean
   columns?: TableColumn<{}>[]
   editInline?: boolean
+  modelValue: unknown[]
 }>()
-const emit = defineEmits(['update:modelValue', 'submit'])
-
-const massActions = [
-  [
-    {
-      label: 'delete',
-      click: () => {
-        massRemove()
-        selectedRows.value = []
-      }
-    }
-  ]
-]
-
-const selectedRows = ref<{ __id: any }[]>([])
-const schemaObject = ref(new Draft2019(props.items))
-const model = ref<{ open: boolean; index: number; value: Record<string, unknown> }>({
-  open: false,
-  index: 0,
-  value: {}
-})
-const expand = ref({
-  openedRows: [],
-  row: null
-})
-
-const values = computed(() => {
-  if (props.modelValue.length > 0) {
-    return props.modelValue.map((x, i) => ({ ...x, __id: i }))
-  } else if (props.minItems && props.minItems > 0) {
-    const template = schemaObject.value.getTemplate()
-    return [...Array(props.minItems)].map((_, i) => ({ ...template, __id: i }))
-  }
-
-  return []
-})
-
-const columns = computed<TableColumn<{}>[]>(() => {
-  const columns = props.columns ?? []
-  if (props.editInline) {
-    columns.push({
-      id: 'expand',
-      cell: ({ row }) =>
-        h(UButton, {
-          color: 'neutral',
-          variant: 'ghost',
-          icon: 'i-lucide-chevron-down',
-          square: true,
-          'aria-label': 'Expand',
-          ui: {
-            leadingIcon: ['transition-transform', row.getIsExpanded() ? 'duration-200 rotate-180' : '']
-          },
-          onClick: () => row.toggleExpanded()
-        })
-    })
-  }
 
-  if (props.items.type === 'object') {
-    for (const column of Object.keys(props?.items?.properties).map<TableColumn<{}>>(x => ({
-      header: x,
-      accessorKey: x,
-      cell: ({ row }) => row.getValue(x)
-    }))) {
-      columns.push(column)
-    }
-  }
-
-  if (props.edit) {
-    columns.push({
-      id: 'actions',
-      cell: ({ row }) => {
-        return h(
-          'div',
-          { class: 'text-right' },
-          h(
-            UDropdownMenu,
-            {
-              content: {
-                align: 'end'
-              },
-              items: getRowItems(row),
-              'aria-label': 'Actions dropdown'
-            },
-            () =>
-              h(UButton, {
-                icon: 'i-lucide-ellipsis-vertical',
-                color: 'neutral',
-                variant: 'ghost',
-                class: 'ml-auto',
-                'aria-label': 'Actions dropdown'
-              })
-          )
-        )
-      }
-    })
-  }
-
-  return columns
-})
-
-function getRowItems(row: Row<{}>) {
-  return [
-    {
-      label: 'edit',
-      onSelect: () => open(row.index)
-    },
-    {
-      label: 'delete',
-      onSelect: () => {
-        remove(row.index)
-        selectedRows.value = []
-      }
-    }
-  ]
-}
-
-const options = computed(() => {
-  let res: {
-    modelValue?: any
-    'onUpdate:modelValue'?: (v: any) => void
-    expand?: {
-      openedRows: any[]
-      row: null
-    }
-    'update:expand'?: (v: any) => void
-  } = {}
-
-  if (props.edit) {
-    res.modelValue = selectedRows.value
-    res['onUpdate:modelValue'] = value => (selectedRows.value = value)
-  }
-  if (props.editInline) {
-    res.expand = expand.value
-    res['update:expand'] = value => (expand.value = value)
-  }
-
-  return res
-})
-
-const open = (index: number) => {
-  model.value = { open: true, index: index, value: structuredClone(values.value[index]) }
-}
+const emit = defineEmits(['update:modelValue', 'submit'])
 
 const onInput = (value: Record<string, unknown>, index: number) => {
   props.modelValue[index] = value
   emit('update:modelValue', props.modelValue)
 }
 
-const add = () => {
-  emit('update:modelValue', [...props.modelValue, schemaObject.value.getTemplate()])
-}
-
-const remove = (index: number) => {
-  props.modelValue.splice(index, 1)
-  emit('update:modelValue', props.modelValue)
-}
-
-const massRemove = () => {
-  let res = props.modelValue
-  for (const index of selectedRows.value.map(x => x.__id)) {
-    res.splice(index, 1)
+const Renderer = () => {
+  if (props.items.type === 'object') {
+    return h(SObject, {
+      ...props,
+      required: props.items.required,
+      isRequired: props.isRequired,
+      modelValue: props.modelValue as Record<string, unknown>[],
+      'onUpdate:modelValue': (v: Record<string, unknown>[]) => {
+        emit('update:modelValue', v)
+      }
+    })
+  } else if (props.items.type === 'string' && props.items.enum) {
+    return h(SMultiSelect, {
+      ...props,
+      items: props.items as unknown as {
+        id: string
+        enum: string[]
+        enum_titles?: string[]
+      },
+      isRequired: props.isRequired,
+      modelValue: props.modelValue as string[],
+      'onUpdate:modelValue': (v: string[]) => {
+        emit('update:modelValue', v)
+      }
+    })
   }
-
-  emit('update:modelValue', res)
 }
 </script>
 
 <template>
   <div>
-    <h2 v-if="props.title" class="mb-4 text-2xl leading-none tracking-tight">{{ props.title }}</h2>
-    <p v-if="props.description" class="mb-4">{{ props.description }}</p>
-
-    <div>
-      <div class="flex justify-between items-center w-full px-4 py-3">
-        <div class="flex gap-1.5 items-center">
-          <UButton
-            v-if="edit"
-            :disabled="maxItems && values.length >= maxItems"
-            @click="add"
-            icon="i-heroicons-plus"
-            trailing
-            color="neutral"
-            size="xs"
-          />
-        </div>
-        <div class="flex gap-1.5 items-center">
-          <UDropdownMenu v-if="selectedRows.length > 0" :items="massActions">
-            <UButton icon="i-heroicons-chevron-down" trailing color="neutral" size="xs"> Action </UButton>
-          </UDropdownMenu>
-        </div>
-      </div>
-      <UTable v-bind="options" by="__id" :data="values" :columns="columns" class="flex-1">
-        <template #expanded="{ row }">
-          <div class="p-4">
-            <SComponent
-              :id="id.length <= 0 ? `${row.index}` : `${id}[${row.index}]`"
-              :model-value="row.original"
-              :json-schema-path="
-                jsonSchemaPath?.length <= 0 ? `properties.${row.index}` : `${jsonSchemaPath}[${row.index}]`
-              "
-              v-bind="items"
-              :isRequired="false"
-              class="mt-4"
-              @update:model-value="(event: Record<string, unknown>) => onInput(event, row.index)"
-              @submit="() => emit('submit')"
-            />
-          </div>
-        </template>
-      </UTable>
-    </div>
-    <UModal v-model:open="model.open">
-      <template #content>
-        <UCard>
-          <SComponent
-            :id="id.length <= 0 ? `${model.index}` : `${id}[0]`"
-            :model-value="model.value"
-            :json-schema-path="
-              jsonSchemaPath?.length <= 0 ? `properties.${model.index}` : `${jsonSchemaPath}[${model.index}]`
-            "
-            v-bind="items"
-            :isRequired="false"
-            class="mt-4"
-            @update:model-value="(event: Record<string, unknown>) => (model.value = event)"
-            @submit="() => emit('submit')"
-          />
-          <template #footer>
-            <UButton
-              @click="
-                () => {
-                  onInput(model.value, model.index)
-                  model.open = false
-                }
-              "
-              >Save</UButton
-            >
-          </template>
-        </UCard>
-      </template>
-    </UModal>
+    <Renderer />
   </div>
 </template>

package/dist/runtime/components/Component.vue

@@ -26,7 +26,7 @@ export type SComponentProps = {
   jsonSchemaPath?: string
   required?: string[]
   isRequired: boolean
-  items?: PropertiesType[]
+  items?: PropertiesType
   edit?: boolean
   minItems?: number
   maxItems?: number
@@ -144,9 +144,9 @@ const Render = () => {
       editInline: props.editInline,
       jsonSchemaPath: `${props.jsonSchemaPath}.${props.id}`,
       onSubmit,
-      modelValue: value.value as Record<string, unknown>[],
-      'onUpdate:modelValue': (v: string) => {
-        value.value = v
+      modelValue: value.value as unknown[],
+      'onUpdate:modelValue': (v: unknown) => {
+        value.value = v as unknown[]
       }
     })
   }

package/dist/runtime/components/Date.vue

@@ -22,13 +22,14 @@ const open = ref(false)
 
 <template>
   <div>
+    {{ open }}
     <UFormField
       :label="props.title || id"
       :hint="!props.isRequired ? 'optional' : undefined"
       :description="props.description"
       :name="props.id"
     >
-      <UPopover :open="open">
+      <UPopover v-model="open" :open="open" :dismissable="true">
         <UButton color="neutral" variant="subtle" icon="i-lucide-calendar" class="w-full" @click="() => (open = true)">
           {{ value ? df.format(date.toDate(getLocalTimeZone())) : 'Select a date' }}
         </UButton>

package/dist/runtime/components/MultiSelect.vue

@@ -0,0 +1,48 @@
+<script lang="ts" setup>
+import { computed } from 'vue'
+
+const props = defineProps<{
+  id: string
+  title?: string
+  description?: string
+  jsonSchemaPath: string
+  items: {
+    id: string
+    enum: string[]
+    enum_titles?: string[]
+  }
+  modelValue: string[]
+  isRequired: boolean
+  minItems?: number
+  maxItems?: number
+  edit?: boolean
+  editInline?: boolean
+}>()
+
+const options = computed(() =>
+  props.items.enum.map((x, i) => ({ label: props?.items.enum_titles?.[i] ?? x, value: x }))
+)
+
+const value = defineModel<string[]>({ required: true })
+</script>
+
+<template>
+  <div>
+    <UFormField
+      :label="props.title || id"
+      :hint="!props.isRequired ? 'optional' : undefined"
+      :description="props.description"
+      :name="props.id"
+    >
+      <USelect
+        v-model="value"
+        placeholder="select size"
+        :items="options"
+        multiple
+        value-attribute="value"
+        option-attribute="key"
+        class="w-full"
+      />
+    </UFormField>
+  </div>
+</template>

package/dist/runtime/components/array/ArrayObject.vue

@@ -0,0 +1,266 @@
+<script lang="ts" setup>
+import { Draft2019 } from 'json-schema-library'
+import SComponent from '../Component.vue'
+import { ref, computed, h, resolveComponent } from 'vue'
+import type { TableColumn } from '@nuxt/ui'
+import type { Row } from '@tanstack/vue-table'
+import type { PropertiesType } from '../../types'
+
+const UDropdownMenu = resolveComponent('UDropdownMenu')
+const UButton = resolveComponent('UButton')
+
+const props = defineProps<{
+  id: string
+  title?: string
+  description?: string
+  jsonSchemaPath: string
+  items: PropertiesType
+  modelValue: Record<string, unknown>[]
+  isRequired: boolean
+  minItems?: number
+  maxItems?: number
+  edit?: boolean
+  columns?: TableColumn<{}>[]
+  editInline?: boolean
+}>()
+const emit = defineEmits(['update:modelValue', 'submit'])
+
+const massActions = [
+  [
+    {
+      label: 'delete',
+      click: () => {
+        massRemove()
+        selectedRows.value = []
+      }
+    }
+  ]
+]
+
+const selectedRows = ref<{ __id: any }[]>([])
+const schemaObject = ref(new Draft2019(props.items))
+const model = ref<{ open: boolean; index: number; value: Record<string, unknown> }>({
+  open: false,
+  index: 0,
+  value: {}
+})
+const expand = ref({
+  openedRows: [],
+  row: null
+})
+
+const values = computed(() => {
+  if (props.modelValue.length > 0) {
+    return props.modelValue.map((x, i) => ({ ...x, __id: i }))
+  } else if (props.minItems && props.minItems > 0) {
+    const template = schemaObject.value.getTemplate()
+    return [...Array(props.minItems)].map((_, i) => ({ ...template, __id: i }))
+  }
+
+  return []
+})
+
+const columns = computed<TableColumn<{}>[]>(() => {
+  const columns = props.columns ?? []
+  if (props.editInline) {
+    columns.push({
+      id: 'expand',
+      cell: ({ row }) =>
+        h(UButton, {
+          color: 'neutral',
+          variant: 'ghost',
+          icon: 'i-lucide-chevron-down',
+          square: true,
+          'aria-label': 'Expand',
+          ui: {
+            leadingIcon: ['transition-transform', row.getIsExpanded() ? 'duration-200 rotate-180' : '']
+          },
+          onClick: () => row.toggleExpanded()
+        })
+    })
+  }
+
+  if (props.items.type === 'object') {
+    for (const column of Object.keys(props?.items?.properties).map<TableColumn<{}>>(x => ({
+      header: x,
+      accessorKey: x,
+      cell: ({ row }) => row.getValue(x)
+    }))) {
+      columns.push(column)
+    }
+  }
+
+  if (props.edit) {
+    columns.push({
+      id: 'actions',
+      cell: ({ row }) => {
+        return h(
+          'div',
+          { class: 'text-right' },
+          h(
+            UDropdownMenu,
+            {
+              content: {
+                align: 'end'
+              },
+              items: getRowItems(row),
+              'aria-label': 'Actions dropdown'
+            },
+            () =>
+              h(UButton, {
+                icon: 'i-lucide-ellipsis-vertical',
+                color: 'neutral',
+                variant: 'ghost',
+                class: 'ml-auto',
+                'aria-label': 'Actions dropdown'
+              })
+          )
+        )
+      }
+    })
+  }
+
+  return columns
+})
+
+function getRowItems(row: Row<{}>) {
+  return [
+    {
+      label: 'edit',
+      onSelect: () => open(row.index)
+    },
+    {
+      label: 'delete',
+      onSelect: () => {
+        remove(row.index)
+        selectedRows.value = []
+      }
+    }
+  ]
+}
+
+const options = computed(() => {
+  let res: {
+    modelValue?: any
+    'onUpdate:modelValue'?: (v: any) => void
+    expand?: {
+      openedRows: any[]
+      row: null
+    }
+    'update:expand'?: (v: any) => void
+  } = {}
+
+  if (props.edit) {
+    res.modelValue = selectedRows.value
+    res['onUpdate:modelValue'] = value => (selectedRows.value = value)
+  }
+  if (props.editInline) {
+    res.expand = expand.value
+    res['update:expand'] = value => (expand.value = value)
+  }
+
+  return res
+})
+
+const open = (index: number) => {
+  model.value = { open: true, index: index, value: structuredClone(values.value[index]) }
+}
+
+const onInput = (value: Record<string, unknown>, index: number) => {
+  props.modelValue[index] = value
+  emit('update:modelValue', props.modelValue)
+}
+
+const add = () => {
+  emit('update:modelValue', [...props.modelValue, schemaObject.value.getTemplate()])
+}
+
+const remove = (index: number) => {
+  props.modelValue.splice(index, 1)
+  emit('update:modelValue', props.modelValue)
+}
+
+const massRemove = () => {
+  let res = props.modelValue
+  for (const index of selectedRows.value.map(x => x.__id)) {
+    res.splice(index, 1)
+  }
+
+  emit('update:modelValue', res)
+}
+</script>
+
+<template>
+  <div>
+    <h2 v-if="props.title" class="mb-4 text-2xl leading-none tracking-tight">{{ props.title }}</h2>
+    <p v-if="props.description" class="mb-4">{{ props.description }}</p>
+
+    <div>
+      <div class="flex justify-between items-center w-full px-4 py-3">
+        <div class="flex gap-1.5 items-center">
+          <UButton
+            v-if="edit"
+            :disabled="maxItems && values.length >= maxItems"
+            @click="add"
+            icon="i-heroicons-plus"
+            trailing
+            color="neutral"
+            size="xs"
+          />
+        </div>
+        <div class="flex gap-1.5 items-center">
+          <UDropdownMenu v-if="selectedRows.length > 0" :items="massActions">
+            <UButton icon="i-heroicons-chevron-down" trailing color="neutral" size="xs"> Action </UButton>
+          </UDropdownMenu>
+        </div>
+      </div>
+      <UTable v-bind="options" by="__id" :data="values" :columns="columns" class="flex-1">
+        <template #expanded="{ row }">
+          <div class="p-4">
+            <SComponent
+              :id="id.length <= 0 ? `${row.index}` : `${id}[${row.index}]`"
+              :model-value="row.original"
+              :json-schema-path="
+                jsonSchemaPath?.length <= 0 ? `properties.${row.index}` : `${jsonSchemaPath}[${row.index}]`
+              "
+              v-bind="items"
+              :isRequired="false"
+              class="mt-4"
+              @update:model-value="(event: Record<string, unknown>) => onInput(event, row.index)"
+              @submit="() => emit('submit')"
+            />
+          </div>
+        </template>
+      </UTable>
+    </div>
+    <UModal v-model:open="model.open">
+      <template #content>
+        <UCard>
+          <SComponent
+            :id="id.length <= 0 ? `${model.index}` : `${id}[0]`"
+            :model-value="model.value"
+            :json-schema-path="
+              jsonSchemaPath?.length <= 0 ? `properties.${model.index}` : `${jsonSchemaPath}[${model.index}]`
+            "
+            v-bind="items"
+            :isRequired="false"
+            class="mt-4"
+            @update:model-value="(event: Record<string, unknown>) => (model.value = event)"
+            @submit="() => emit('submit')"
+          />
+          <template #footer>
+            <UButton
+              @click="
+                () => {
+                  onInput(model.value, model.index)
+                  model.open = false
+                }
+              "
+              >Save</UButton
+            >
+          </template>
+        </UCard>
+      </template>
+    </UModal>
+  </div>
+</template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ederzeel/nuxt-schema-form-nightly",
-  "version": "0.1.0-29119026.5bb3293",
+  "version": "0.1.0-29119142.f6bc066",
   "description": "A runtime form generator for nuxt",
   "type": "module",
   "exports": {