@bagelink/vue 1.4.134 → 1.4.139

package/src/types/BagelForm.ts

@@ -67,20 +67,29 @@ export type OpenEndedPath<T> =
   		: never
   	: never
 
+// Helper type to check if a type has ONLY index signature (no specific keys)
+type HasOnlyIndexSignature<T> = T extends Record<string, any>
+	? string extends keyof T
+		? Record<string, never> extends Pick<T, Exclude<keyof T, string | number>>
+			? true // Only index signature, no specific keys
+			: false // Has specific keys
+		: false
+	: false
+
+// Helper type to get paths for index signature properties
+type IndexSignaturePaths<T> = {
+	[K in keyof T]: T[K] extends { [key: string]: any }
+		? T[K] extends { [key: string]: infer V }
+			? `${K & string}.${string}`
+			: never
+		: never
+}[keyof T]
+
 // Enhanced Path type that allows flexibility for nested open-ended objects
 export type Path<T, PO extends PathsOptions = DefaultPathsOptions> =
   FieldVal<T, _Path<T, PO>> extends Array<any>
   	? LiteralStringUnion<_Path<T, PO>>
-  	: _Path<T, PO> | (
-        // Allow nested paths for properties that have index signatures
-        keyof T extends infer K ?
-        	K extends keyof T ?
-        		T[K] extends { [key: string]: any } ?
-              `${K & string}.${string}`
-        			: never
-        		: never
-        	: never
-      )
+  	: _Path<T, PO> | IndexSignaturePaths<T> | `${keyof T & string}.more_info.${string}`
 
 // Smart field value type that preserves type information when possible
 export type SmartFieldVal<T, P extends Path<T>> =
@@ -164,18 +173,23 @@ export interface ElementField<
 	children?: ElementField<T, PO>[]
 }
 
+// Helper type to extract all possible BaseBagelField types for valid paths
+type ValidBaseBagelField<T, PO extends PathsOptions = DefaultPathsOptions> = {
+	[P in Path<T, PO>]: BaseBagelField<T, P, PO>
+}[Path<T, PO>]
+
 export type SchemaChild<
 	T,
 	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
-> = Field<T, PO> | ElementField<T, PO> | VNode | VNodeFn<T, P> | string | BaseBagelField<T, P, PO>
+> = Field<T, PO> | ElementField<T, PO> | VNode | VNodeFn<T, P> | string | ValidBaseBagelField<T, PO>
 
 export interface BaseBagelField<
 	T,
 	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 > {
-	'$el'?: any
+	'$el'?: string | any
 	'id'?: P
 	'label'?: string
 	'placeholder'?: string

package/src/utils/BagelFormUtils.ts

@@ -12,11 +12,15 @@ import type {
 	Attributes,
 	BglFormSchemaT,
 	FieldByP,
-	SchemaChild,
 	ShallowBglFormSchemaT,
 	UploadInputProps
 } from '../types/BagelForm'
 
+// Import ValidBaseBagelField from the types file
+type ValidBaseBagelField<T, PO extends import('type-fest/source/paths').PathsOptions = import('type-fest/source/paths').DefaultPathsOptions> = {
+	[P in Path<T, PO>]: BaseBagelField<T, P, PO>
+}[Path<T, PO>]
+
 // Local type definitions for internal use only
 interface IconType { name: string }
 interface AutoFillField { name: string }
@@ -70,6 +74,11 @@ export interface RichTextOptions<T, P extends Path<T>> extends InputOptions<T, P
 	height?: number | string
 }
 
+export interface TelInputOptions<T, P extends Path<T>> extends InputOptions<T, P> {
+	pattern?: string
+	autocomplete?: AutoFillField
+}
+
 export function getBaseField<T, P extends Path<T, PO>, PO extends PathsOptions = DefaultPathsOptions>(
 	id?: P,
 	labelOrRest: string | Partial<BaseBagelField<T, P>> = {},
@@ -308,8 +317,8 @@ export function frmRow<
 	T,
 	PO extends PathsOptions = DefaultPathsOptions,
 >(
-	...children: SchemaChild<T, Path<T, PO>, PO>[]
-): { $el: string, class: string, children: SchemaChild<T, Path<T, PO>, PO>[] } {
+	...children: Array<BaseBagelField<T, any, PO>>
+): { $el: string, class: string, children: Array<BaseBagelField<T, any, PO>> } {
 	return {
 		$el: 'div',
 		class: 'flex gap-1 m_block align-items-end',
@@ -406,16 +415,25 @@ export function telField<
 >(
 	id?: P,
 	label?: string,
-	options?: { [key: string]: any }
+	options?: TelInputOptions<T, P>
 ): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'tel',
 		id,
 		label,
-		vIf: options?.vIf,
-		attrs: options,
 		class: options?.class,
+		required: options?.required,
+		placeholder: options?.placeholder,
+		helptext: options?.helptext,
+		disabled: options?.disabled,
+		defaultValue: options?.defaultValue,
+		vIf: options?.vIf,
 		transform: options?.transform,
+		attrs: {
+			...options?.attrs,
+			pattern: options?.pattern,
+			autocomplete: options?.autocomplete,
+		},
 	}
 }
 
@@ -517,6 +535,77 @@ export function arrField<
 // 			})
 // }
 
+// Schema builder function that provides type context
+export function createSchema<T, PO extends PathsOptions = DefaultPathsOptions>() {
+	return {
+		txtField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: TextInputOptions<T, P>
+		) => txtField<T, P, PO>(id, label, options),
+
+		selectField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: any,
+			fieldOptions?: SlctInputOptions<T, P>
+		) => selectField<T, P, PO>(id, label, options, fieldOptions),
+
+		dateField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: DateOptions<T, P>
+		) => dateField<T, P, PO>(id, label, options),
+
+		telField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: TelInputOptions<T, P>
+		) => telField<T, P, PO>(id, label, options),
+
+		frmRow: (
+			...children: Array<BaseBagelField<T, any, PO>>
+		) => frmRow<T, PO>(...children),
+
+		// Add other field functions as needed
+		numField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: NumFieldOptions<T, P>
+		) => numField<T, P, PO>(id, label, options),
+
+		checkField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: CheckInputOptions<T, P>
+		) => checkField<T, P, PO>(id, label, options),
+
+		emailField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: EmailInputOptions<T, P>
+		) => emailField<T, P, PO>(id, label, options),
+
+		uploadField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: UploadOptions<T, P>
+		) => uploadField<T, P, PO>(id, label, options),
+
+		rangeField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: RangeOptions<T, P>
+		) => rangeField<T, P, PO>(id, label, options),
+
+		colorField: <P extends Path<T, PO>>(
+			id?: P,
+			label?: string,
+			options?: { [key: string]: any }
+		) => colorField<T, P, PO>(id, label, options),
+	}
+}
+
 export function useForm() {
 	return {
 		txtField,
@@ -534,6 +623,7 @@ export function useForm() {
 		arrField,
 		richText,
 		findBglFieldById,
-		getBaseField
+		getBaseField,
+		createSchema
 	}
 }

package/src/utils/index.ts

@@ -62,7 +62,7 @@ export function bindAttrs<T, P extends Path<T>>(
 // TODO: Fix this so that you don't have to return a fn for other on* event handlers
 	if (!attrs) return {}
 
-	const exclude = ['class', 'onClick'] as const
+	const exclude = ['class', 'onClick', '$el'] as const
 	const arr = Object.entries(attrs)
 		.filter(([key]) => !exclude.includes(key as typeof exclude[number]))
 		.map(([key, value]) => [