@bagelink/vue 1.4.111 → 1.4.118

package/src/utils/BagelFormUtils.ts

@@ -1,6 +1,27 @@
-import type { ArrayBagelField, ArrayFieldVal, Attributes, BaseBagelField, BglFormSchemaT, FieldByP, IconType, InputBagelField, Option, Path, SchemaChild, SelectBagelField, ShallowBglFormSchemaT, UploadInputProps } from '@bagelink/vue'
+// Import types from type-fest first
 import type { DefaultPathsOptions, PathsOptions } from 'type-fest/source/paths'
-import type { InputTypeHTMLAttribute, MaybeRefOrGetter } from 'vue'
+
+// Import types from local types file
+import type {
+	Path,
+	BaseBagelField,
+	InputBagelField,
+	SelectBagelField,
+	ArrayBagelField,
+	ArrayFieldVal,
+	Attributes,
+	BglFormSchemaT,
+	FieldByP,
+	SchemaChild,
+	ShallowBglFormSchemaT,
+	UploadInputProps
+} from '../types/BagelForm'
+
+// Local type definitions for internal use only
+interface IconType { name: string }
+interface AutoFillField { name: string }
+interface InputTypeHTMLAttribute { type: string }
+type MaybeRefOrGetter<T> = T | (() => T) | { value: T }
 
 export interface InputOptions<
 	T,
@@ -19,7 +40,7 @@ export interface DateOptions<T, K extends Path<T>> extends InputOptions<T, K> {
 }
 
 export interface TextInputOptions<T, K extends Path<T>> extends InputOptions<T, K> {
-	type?: InputTypeHTMLAttribute
+	type?: InputTypeHTMLAttribute['type']
 	pattern?: string
 	multiline?: boolean
 	autoheight?: boolean
@@ -98,28 +119,30 @@ export function txtField<
 		label,
 		class: options?.class,
 		required: options?.required,
-		vIf: options?.vIf,
-		disabled: options?.disabled,
 		placeholder: options?.placeholder,
-		defaultValue: options?.defaultValue,
-		validate: options?.validate,
-		onUpdate: options?.onUpdate,
 		helptext: options?.helptext,
+		disabled: options?.disabled,
+		defaultValue: options?.defaultValue,
+		vIf: options?.vIf,
 		transform: options?.transform,
 		attrs: {
-			type: options?.type,
+			autocomplete: options?.autocomplete,
 			pattern: options?.pattern,
 			multiline: options?.multiline,
-			autocomplete: options?.autocomplete,
-			rows: options?.rows,
-			code: options?.code,
 			autoheight: options?.autoheight,
+			code: options?.code,
+			rows: options?.rows,
 			icon: options?.icon,
 			iconStart: options?.iconStart,
+			type: options?.type,
 		},
 	}
 }
 
+// import type { Option } from '@bagelink/vue'
+
+// type OptionsSource = Option[] | ((query: string) => Promise<Option[]>)
+
 export function selectField<
 	T,
 	P extends Path<T, PO>,
@@ -127,28 +150,26 @@ export function selectField<
 >(
 	id?: P,
 	label?: string,
-	options?: Option[] | ((query: string) => Promise<Option[]>) | ((val?: any, row?: T) => Option[] | ((query: string) => Promise<Option[]>)) | ((query: string, val?: any, row?: T) => Promise<Option[]>),
-	config?: SlctInputOptions<T, P>,
+	options?: any,
+	fieldOptions?: SlctInputOptions<T, P>,
 ): SelectBagelField<T, P, PO> {
 	return {
 		$el: 'select',
 		id,
-		options,
-		class: config?.class,
-		placeholder: config?.placeholder,
-		required: config?.required,
 		label,
-		defaultValue: config?.defaultValue,
-		vIf: config?.vIf,
-		validate: config?.validate,
-		onUpdate: config?.onUpdate,
-		transform: config?.transform,
+		class: fieldOptions?.class,
+		required: fieldOptions?.required,
+		helptext: fieldOptions?.helptext,
+		disabled: fieldOptions?.disabled,
+		defaultValue: fieldOptions?.defaultValue,
+		vIf: fieldOptions?.vIf,
+		transform: fieldOptions?.transform,
+		options,
 		attrs: {
-			disabled: config?.disabled,
-			searchable: config?.searchable,
-			multiselect: config?.multiselect,
-			clearable: config?.clearable,
-			autocomplete: config?.autocomplete,
+			...fieldOptions?.attrs,
+			searchable: fieldOptions?.searchable,
+			multiselect: fieldOptions?.multiselect,
+			clearable: fieldOptions?.clearable,
 		},
 	}
 }
@@ -171,13 +192,17 @@ export function checkField<
 ): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'check',
+		id,
+		label,
 		class: options?.class,
 		required: options?.required,
+		helptext: options?.helptext,
+		disabled: options?.disabled,
 		defaultValue: options?.defaultValue,
-		id,
-		label,
+		vIf: options?.vIf,
 		transform: options?.transform,
 		attrs: {
+			...options?.attrs,
 			value: options?.value,
 		},
 	}
@@ -281,11 +306,10 @@ export function numField<
 
 export function frmRow<
 	T,
-	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 >(
-	...children: SchemaChild<T, P, PO>[]
-): FieldByP<T, P, PO> {
+	...children: SchemaChild<T, Path<T, PO>, PO>[]
+): { $el: string, class: string, children: SchemaChild<T, Path<T, PO>, PO>[] } {
 	return {
 		$el: 'div',
 		class: 'flex gap-1 m_block align-items-end',
@@ -302,12 +326,17 @@ export function uploadField<
 >(
 	id?: P,
 	label?: string,
-	options?: UploadOptions<T, P>
+	options?: UploadOptions<T, P>,
 ): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'upload',
 		id,
 		label,
+		class: options?.class,
+		required: options?.required,
+		helptext: options?.helptext,
+		disabled: options?.disabled,
+		defaultValue: options?.defaultValue,
 		vIf: options?.vIf,
 		transform: options?.transform,
 		attrs: {

package/src/utils/elementUtils.ts

@@ -353,20 +353,17 @@ export function img<
 ): BaseElementField<T, PO> {
 	// Handle different overload patterns
 	let id: Path<T, PO> | undefined
-	let finalSrc: string = ''
 	let finalOptions: ImgElementOptions<T, PO> = {}
 
 	if (typeof idOrOptions === 'object' && idOrOptions !== null) {
 		// img(options)
 		finalOptions = idOrOptions
-		const { id: optionId, src: optionSrc } = finalOptions
+		const { id: optionId } = finalOptions
 		id = optionId as Path<T, PO> | undefined
-		finalSrc = optionSrc ?? ''
 	} else {
 		// img(id, ...) patterns
 		id = idOrOptions
 		if (src != null) {
-			finalSrc = src
 			if (typeof altOrOptions === 'string') {
 				// img(id, src, alt)
 				finalOptions = { alt: altOrOptions }

package/src/utils/index.ts

@@ -1,4 +1,4 @@
-import type { Attributes, BglFormSchemaT, Path } from '@bagelink/vue'
+import type { Attributes, BglFormSchemaT, Path } from '../types/BagelForm'
 
 const debouncers = new Map<() => void, ReturnType<typeof setTimeout>>()
 
@@ -93,7 +93,7 @@ export function iffer(field: any, itemData: any) {
 }
 
 export function denullify(itemData?: { [key: string]: any }, fieldID?: string) {
-	if (!fieldID) return
+	if (!fieldID) return undefined
 	return itemData ? itemData[fieldID] : undefined
 }
 
@@ -132,7 +132,8 @@ export async function appendScript(src: string, options?: { id?: string }): Prom
 	await sleep(1)
 	// If this script is already loading, return the existing promise
 	if (scriptsLoading.has(scriptId)) {
-		return scriptsLoading.get(scriptId)!
+		const existingPromise = scriptsLoading.get(scriptId)
+		if (existingPromise) return existingPromise
 	}
 
 	// Check if script is already in the document
@@ -157,7 +158,7 @@ export async function appendScript(src: string, options?: { id?: string }): Prom
 		}
 
 		script.onerror = (err) => {
-			reject(err)
+			reject(new Error(String(err)))
 			// Remove from loading scripts map on error
 			scriptsLoading.delete(scriptId)
 		}
@@ -241,7 +242,8 @@ export function downloadFile(source: string | Blob, fileName?: string) {
 
 	if (typeof source === 'string') {
 		link.href = upgradeHeaders(source)
-		link.download = fileName || source.split('/').pop() || 'download'
+		const fileNameFromSource = source.split('/').pop()
+		link.download = fileName || fileNameFromSource || 'download'
 	} else {
 		const url = URL.createObjectURL(source)
 		link.href = url