@bagelink/vue 1.4.115 → 1.4.122

package/src/utils/BagelFormUtils.ts

@@ -1,6 +1,27 @@
-import type { ArrayBagelField, ArrayFieldVal, Attributes, BaseBagelField, BglFormSchemaT, FieldByP, IconType, InputBagelField, 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
@@ -85,12 +106,13 @@ export function richText<
 
 export function txtField<
 	T,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 >(
-	id?: Path<T, PO>,
+	id?: P,
 	label?: string,
-	options?: TextInputOptions<T, Path<T, PO>>,
-): InputBagelField<T, Path<T, PO>, PO> {
+	options?: TextInputOptions<T, P>,
+): InputBagelField<T, P, PO> {
 	return {
 		$el: 'text',
 		id,
@@ -117,15 +139,20 @@ export function txtField<
 	}
 }
 
+// import type { Option } from '@bagelink/vue'
+
+// type OptionsSource = Option[] | ((query: string) => Promise<Option[]>)
+
 export function selectField<
 	T,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 >(
-	id?: Path<T, PO>,
+	id?: P,
 	label?: string,
-	options?: any[],
-	fieldOptions?: SlctInputOptions<T, Path<T, PO>>,
-): SelectBagelField<T, Path<T, PO>, PO> {
+	options?: any,
+	fieldOptions?: SlctInputOptions<T, P>,
+): SelectBagelField<T, P, PO> {
 	return {
 		$el: 'select',
 		id,
@@ -156,12 +183,13 @@ interface CheckInputOptions<T, K extends Path<T>> extends Omit<InputOptions<T, K
 
 export function checkField<
 	T,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 >(
-	id?: Path<T, PO>,
+	id?: P,
 	label?: string,
-	options?: CheckInputOptions<T, Path<T, PO>>,
-): BaseBagelField<T, Path<T, PO>, PO> {
+	options?: CheckInputOptions<T, P>,
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'check',
 		id,
@@ -244,12 +272,13 @@ export function dateField<
 
 export function numField<
 	T,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 >(
-	id?: Path<T, PO>,
+	id?: P,
 	label?: string,
-	options?: NumFieldOptions<T, Path<T, PO>>,
-): BaseBagelField<T, Path<T, PO>, PO> {
+	options?: NumFieldOptions<T, P>,
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'number',
 		class: options?.class,
@@ -292,12 +321,13 @@ export interface UploadOptions<T, K extends Path<T>> extends Omit<UploadInputPro
 
 export function uploadField<
 	T,
+	P extends Path<T, PO>,
 	PO extends PathsOptions = DefaultPathsOptions,
 >(
-	id?: Path<T, PO>,
+	id?: P,
 	label?: string,
-	options?: UploadOptions<T, Path<T, PO>>,
-): BaseBagelField<T, Path<T, PO>, PO> {
+	options?: UploadOptions<T, P>,
+): BaseBagelField<T, P, PO> {
 	return {
 		$el: 'upload',
 		id,

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