@bagelink/vue 1.2.143 → 1.2.147

package/src/components/form/FieldArray.vue

@@ -24,7 +24,7 @@ export interface FieldArrayProps<T, P extends Path<T>> {
 	required?: boolean
 	disabled?: boolean
 	helptext?: string
-	options?: BagelFieldOptions<T>
+	options?: BagelFieldOptions<T, P>
 	defaultValue?: any
 	add?: boolean
 	delete?: boolean

package/src/components/form/inputs/Upload/UploadInput.vue

@@ -82,7 +82,7 @@ function fileName(pathKey: string) {
 				icon="upload"
 				outline
 				:value="btnPlaceholder || 'Upload'"
-				@click="browse(true)"
+				@click="browse()"
 			/>
 
 			<template v-for="path_key in pathKeys" :key="path_key">
@@ -100,7 +100,7 @@ function fileName(pathKey: string) {
 							color="gray"
 							thin
 							icon="autorenew"
-							@click="browse(true)"
+							@click="browse()"
 						/>
 						<Btn
 							icon="download"
@@ -139,7 +139,7 @@ function fileName(pathKey: string) {
 				'bgl_oval-upload': oval,
 			}"
 			:style="{ width, height }"
-			@click="browse(true)"
+			@click="browse()"
 			@dragover="(e) => handleDrag(e, true)"
 			@drop="handleDrop"
 			@dragleave="(e) => handleDrag(e)"
@@ -223,7 +223,7 @@ function fileName(pathKey: string) {
 								color="gray"
 								thin
 								icon="autorenew"
-								@click="browse(true)"
+								@click="browse()"
 							/>
 							<Btn
 								v-tooltip="'Download'"

package/src/components/form/inputs/Upload/useFileUpload.ts

@@ -30,7 +30,7 @@ export function useFileUpload(props: UseFileUploadProps = {}) {
 	// File handling methods
 	const fileToUrl = (file: File) => URL.createObjectURL(file)
 
-	const addFile = (file?: File | File[] | FileList | null) => {
+	function addFile(file?: File | File[] | FileList | null) {
 		if (!file) return
 
 		let filesToAdd: File[] = []
@@ -62,7 +62,7 @@ export function useFileUpload(props: UseFileUploadProps = {}) {
 		}
 	}
 
-	const removeFile = async (pathKeyOrFile: string | File | QueueFile) => {
+	async function removeFile(pathKeyOrFile: string | File | QueueFile) {
 		if (typeof pathKeyOrFile === 'string') {
 			// Remove from both lists
 			storageFiles.value = storageFiles.value.filter(file => file.path_key !== pathKeyOrFile)
@@ -92,8 +92,7 @@ export function useFileUpload(props: UseFileUploadProps = {}) {
 			}
 		}
 	}
-
-	const flushQueue = async () => {
+	async function flushQueue() {
 		// Only process files in the current namespace
 		const namespaceQueue = fileQueue.value.filter(file => file.namespace === namespace)
 
@@ -123,7 +122,7 @@ export function useFileUpload(props: UseFileUploadProps = {}) {
 	}
 
 	// UI interaction
-	const browse = (autoFlush = false) => {
+	function browse(autoFlush = false) {
 		if (props.disabled) return
 
 		const input = document.createElement('input')

package/src/types/BagelForm.ts

@@ -1,5 +1,5 @@
 import type { SelectInput, TextInput } from '@bagelink/vue'
-import type { Paths, Get, IterableElement, LiteralUnion } from 'type-fest'
+import type { Paths, Get, IterableElement, LiteralUnion, OmitIndexSignature } from 'type-fest'
 import type { VNode } from 'vue'
 import type { ComponentExposed } from 'vue-component-type-helpers'
 
@@ -17,7 +17,7 @@ export interface Attributes<T, P extends Path<T>> {
 	[key: string]: AttributeValue | AttributeFn<T, P>
 }
 
-export type BagelFieldOptions<T> = (
+export type BagelFieldOptions<T, P extends Path<T>> = (
 	string
 	| (
 		{
@@ -29,9 +29,8 @@ export type BagelFieldOptions<T> = (
 		| boolean
 		| { [key: string]: any }
 	)[]
-	| ((val: any, rowData?: T) => void)
+	| ((val?: FieldVal<T, P>, rowData?: T) => void)
 )
-// TODO: ^^ replace any with a more specific type (perhaps FieldVal<T, P>)
 
 export type VIfType<T, P extends Path<T>> = (
 	string |
@@ -40,14 +39,14 @@ export type VIfType<T, P extends Path<T>> = (
 )
 
 export type ValidationFn<T, P extends Path<T>> = (
-	val: FieldVal<T, P>,
+	val?: FieldVal<T, P>,
 	rowData?: T,
 ) => string | undefined
 
 export type _Path<T> = (
 	ToString<
 		Paths<
-			T,
+			OmitIndexSignature<T>,
 			{
 				bracketNotation: false
 			}
@@ -62,7 +61,12 @@ export type Path<T> = (
 )
 
 /** The value type at path P in object T. */
-export type FieldVal<T, P extends Path<T>> = Get<T, P>
+// Fall back to unknown if type resolution fails
+export type FieldVal<T, P extends Path<T>> = (
+unknown extends Get<T, P> ?
+	unknown :
+	Get<T, P>
+)
 
 /** If path P in T is an array, this gives the array's element type. */
 export type ArrayFieldVal<T, P extends Path<T>> = IterableElement<Get<T, P>>
@@ -81,7 +85,7 @@ export interface BaseBagelField<T, P extends Path<T>> {
 	'required'?: boolean
 	'disabled'?: boolean
 	'helptext'?: string
-	'options'?: BagelFieldOptions<T>
+	'options'?: BagelFieldOptions<T, P>
 	'children'?: SchemaChild<T, P>[]
 	'slots'?: { [key: string]: SchemaChild<T, P>[] }
 	'defaultValue'?: any
@@ -92,11 +96,15 @@ export interface BaseBagelField<T, P extends Path<T>> {
 	'validate'?: ValidationFn<T, P>
 }
 
-export type MappedBaseBagelField<T> = {
+export type _MappedBaseBagelField<T> = {
 	[P in Path<T>]: BaseBagelField<T, P>
-}[Path<T>]
+}
+
+export type MappedBaseBagelFieldP<T, P extends Path<T>> = _MappedBaseBagelField<T>[P]
+
+export type FieldByP<T, P extends Path<T>> = MappedBaseBagelFieldP<T, P>
 
-export type Field<T> = MappedBaseBagelField<T>
+export type Field<T> = MappedBaseBagelFieldP<T, Path<T>>
 
 export type BglFieldT<T> = Field<T>
 

package/src/utils/BagelFormUtils.ts

@@ -1,4 +1,4 @@
-import type { ArrayFieldVal, Attributes, BaseBagelField, BglFormSchemaT, Field, IconType, InputBagelField, Option, Path, SchemaChild, SelectBagelField, UploadInputProps } from '@bagelink/vue'
+import type { ArrayFieldVal, Attributes, BaseBagelField, BglFormSchemaT, FieldByP, IconType, InputBagelField, Option, Path, SchemaChild, SelectBagelField, UploadInputProps } from '@bagelink/vue'
 
 interface InputOptions<T, P extends Path<T>> extends Partial<BaseBagelField<T, P>> {
 	defaultValue?: string | number
@@ -229,25 +229,19 @@ export function numField<T, P extends Path<T>>(
 	}
 }
 
-export function frmRow<
-	T,
-	P extends Path<T>
->(
+export function frmRow<T, P extends Path<T>>(
 	...children: SchemaChild<T, P>[]
-): Field<T> {
+): FieldByP<T, P> {
 	return {
 		$el: 'div',
 		class: 'flex gap-1 m_block align-items-end',
-		children: children as Field<T>[],
+		children,
 	}
 }
 
 export interface UploadOptions<T, K extends Path<T>> extends Omit<UploadInputProps, 'id'>, InputOptions<T, K> {}
 
-export function uploadField<
-	T,
-	P extends Path<T>
->(
+export function uploadField<T, P extends Path<T>>(
 	id: P,
 	label?: string,
 	options?: UploadOptions<T, P>
@@ -294,7 +288,7 @@ export function rangeField<T, P extends Path<T>>(
 	}
 }
 
-export function bglForm<T>(idOrField?: string | Field<T>, ...schema: Field<T>[]) {
+export function bglForm<T>(idOrField?: string | FieldByP<T, Path<T>>, ...schema: FieldByP<T, Path<T>>[]) {
 	if (typeof idOrField === 'string') {
 		return {
 			$el: 'bagelform',
@@ -342,15 +336,15 @@ export function colorField<T, P extends Path<T>>(
 	}
 }
 
-export function findBglFieldById<T>(id: string, _schema: BglFormSchemaT<T>): Field<T> | undefined {
+export function findBglFieldById<T>(id: string, _schema: BglFormSchemaT<T>): FieldByP<T, Path<T>> | undefined {
 	for (const field of _schema) {
-		if (field.id === id) return field as Field<T> | undefined
+		if (field.id === id) return field as FieldByP<T, Path<T>> | undefined
 		if (field.children && Number(field.children.length) > 0) {
 			const fieldChildren = field.children.filter(
 				c => typeof c === 'object' && '$el' in c
 			)
 			const child = findBglFieldById(id, fieldChildren as BglFormSchemaT<T>)
-			if (child) return child as Field<T> | undefined
+			if (child) return child as FieldByP<T, Path<T>> | undefined
 		}
 	}
 	return undefined

package/dist/components/Carousel2.vue.d.ts

@@ -1,89 +0,0 @@
-type Easing = 'ease-in-out' | 'ease-in' | 'ease-out' | 'linear';
-type AutoplayMode = 'disabled' | 'standard' | 'linear';
-type AutoplayValue = boolean | AutoplayMode;
-interface CarouselOptions {
-    duration?: number;
-    easing?: Easing;
-    perPage?: number | {
-        [key: number]: number;
-    };
-    startIndex?: number;
-    draggable?: boolean;
-    multipleDrag?: boolean;
-    threshold?: number;
-    loop?: boolean;
-    rtl?: boolean;
-    autoplay?: AutoplayValue;
-    autoplayInterval?: number;
-    autoplaySpeed?: number;
-    pauseOnHover?: boolean;
-    dots?: boolean;
-    slideWidth?: number;
-    onInit?: () => void;
-    onChange?: () => void;
-}
-declare function prev(howManySlides?: number): void;
-declare function next(howManySlides?: number): void;
-declare function goTo(index: number): void;
-declare function remove(index: number): void;
-declare function insert(item: Element, index: number): void;
-declare function prepend(item: Element): void;
-declare function append(item: Element): void;
-declare function destroy(restoreMarkup?: boolean): void;
-declare function pauseAutoplay(): void;
-declare function resumeAutoplay(): void;
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {}): any;
-    };
-    refs: {
-        carouselRef: HTMLDivElement;
-    };
-    rootEl: HTMLDivElement;
-};
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<CarouselOptions, {
-    prev: typeof prev;
-    next: typeof next;
-    goTo: typeof goTo;
-    remove: typeof remove;
-    insert: typeof insert;
-    prepend: typeof prepend;
-    append: typeof append;
-    destroy: typeof destroy;
-    currentSlide: import('vue').Ref<number, number>;
-    pauseAutoplay: typeof pauseAutoplay;
-    resumeAutoplay: typeof resumeAutoplay;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
-    change: () => any;
-    init: () => any;
-}, string, import('vue').PublicProps, Readonly<CarouselOptions> & Readonly<{
-    onChange?: (() => any) | undefined;
-    onInit?: (() => any) | undefined;
-}>, {
-    autoplay: AutoplayValue;
-    loop: boolean;
-    duration: number;
-    easing: Easing;
-    startIndex: number;
-    draggable: boolean;
-    multipleDrag: boolean;
-    threshold: number;
-    rtl: boolean;
-    autoplayInterval: number;
-    autoplaySpeed: number;
-    pauseOnHover: boolean;
-    dots: boolean;
-    slideWidth: number;
-}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
-    carouselRef: HTMLDivElement;
-}, HTMLDivElement>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
-export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};
-//# sourceMappingURL=Carousel2.vue.d.ts.map

package/dist/components/Carousel2.vue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Carousel2.vue.d.ts","sourceRoot":"","sources":["../../src/components/Carousel2.vue"],"names":[],"mappings":"AAy/BA,KAAK,MAAM,GAAG,aAAa,GAAG,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAA;AAC/D,KAAK,YAAY,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAA;AACtD,KAAK,aAAa,GAAG,OAAO,GAAG,YAAY,CAAA;AAE3C,UAAU,eAAe;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB;AAkWD,iBAAS,IAAI,CAAC,aAAa,GAAE,MAAU,GAAG,IAAI,CAmC7C;AAED,iBAAS,IAAI,CAAC,aAAa,GAAE,MAAU,GAAG,IAAI,CAmC7C;AAED,iBAAS,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAejC;AA+SD,iBAAS,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAenC;AAED,iBAAS,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAkBlD;AAED,iBAAS,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAEpC;AAED,iBAAS,MAAM,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAEnC;AAED,iBAAS,OAAO,CAAC,aAAa,GAAE,OAAe,GAAG,IAAI,CAkBrD;AAqGD,iBAAS,aAAa,IAAI,IAAI,CAE7B;AAED,iBAAS,cAAc,IAAI,IAAI,CAI9B;AAgDD,iBAAS,cAAc;WAyDT,OAAO,IAA6B;;yBAXrB,GAAG;;;;;;EAgB/B;AAcD,KAAK,oBAAoB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;cA3hCT,aAAa;UAFjB,OAAO;cAPH,MAAM;YACR,MAAM;gBAEF,MAAM;eACP,OAAO;kBACJ,OAAO;eACV,MAAM;SAEZ,OAAO;sBAEM,MAAM;mBACT,MAAM;kBACP,OAAO;UACf,OAAO;gBACD,MAAM;;;kBAiiClB,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAAnG,wBAAoG;AAapG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACxC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}