@bagelink/vue 0.0.1194 → 0.0.1198

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/vue",
   "type": "module",
-  "version": "0.0.1194",
+  "version": "0.0.1198",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Neveh Allon",

package/src/components/form/inputs/DateInput.vue

@@ -1,13 +1,10 @@
 <script setup lang="ts">
-import type { VueDatePickerProps } from '@vuepic/vue-datepicker'
-import type { ComponentExposed } from 'vue-component-type-helpers'
+import type { VueDatePickerProps, DatePickerInstance } from '@vuepic/vue-datepicker'
 import VDatepicker from '@vuepic/vue-datepicker'
 import { onMounted } from 'vue'
 
 import '@vuepic/vue-datepicker/dist/main.css'
 
-export type DatePickerInstance = ComponentExposed<typeof VDatepicker>
-
 const props = withDefaults(
 	defineProps<{
 		required?: boolean

package/src/types/BagelForm.ts

@@ -26,7 +26,7 @@ type GenericAssertFn<T> = (val: any, row: T) => boolean
 
 export interface BaseBagelField<T = { [key: string]: any }> {
 	'$el'?: any
-	'id'?: string
+	'id'?: keyof T extends string ? keyof T : string
 	'label'?: string
 	'placeholder'?: string
 	'children'?: (Field<T> | string)[]
@@ -45,14 +45,14 @@ export interface BaseBagelField<T = { [key: string]: any }> {
 }
 
 export interface InputBagelField<T> extends BaseBagelField<T> {
-	$el: 'text' | typeof TextInput
-	id: string
+	$el: 'text' | InstanceType<typeof TextInput>
+	id: keyof T extends string ? keyof T : string
 	type?: string
 }
 
 export interface SelectBagelField<T> extends BaseBagelField<T> {
-	$el: 'select' | typeof SelectInput
-	id: string
+	$el: 'select' | InstanceType<typeof SelectInput>
+	id: keyof T extends string ? keyof T : string
 }
 
 export type Field<T = { [key: string]: any }> = BaseBagelField<T> | InputBagelField<T> | SelectBagelField<T>

package/src/utils/index.ts

@@ -95,7 +95,7 @@ export function getFallbackSchema<T>(
 ): BglFormSchemaT<T> {
 	const keys = Array.from(new Set((data ?? []).flatMap(Object.keys)))
 
-	const schema: BglFormSchemaT<T> = keys.map(id => ({
+	const schema = keys.map(id => ({
 		id,
 		label: keyToLabel(id),
 		transform: (val: any) => {
@@ -103,7 +103,7 @@ export function getFallbackSchema<T>(
 			if (dateFields.includes(id)) return val ? new Date(val).toLocaleString() : val
 			return val
 		},
-	}))
+	})) as BglFormSchemaT<T>
 
 	return showFields
 		? schema.filter(f => showFields.includes(f.id as string) || !f.id)