@bagelink/vue 1.2.81 → 1.2.85

package/src/types/BagelForm.ts

@@ -65,21 +65,23 @@ export type FieldVal<T, P extends Path<T>> = 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>>
 
-export type SchemaChildrenT<T> = (Field<T> | string | VNode)[]
+export type VNodeFn<T, P extends Path<T>> = (props: { row?: T, field: BaseBagelField<T, P> }) => VNode
+
+export type SchemaChild<T, P extends Path<T>> = Field<T> | VNode | VNodeFn<T, P> | string
 
 export interface BaseBagelField<T, P extends Path<T>> {
 	'$el'?: any
 	'id'?: P
 	'label'?: string
 	'placeholder'?: string
-	'children'?: SchemaChildrenT<T>
 	'class'?: AttributeValue | AttributeFn<T, P>
 	'attrs'?: Attributes<T, P>
 	'required'?: boolean
 	'disabled'?: boolean
 	'helptext'?: string
 	'options'?: BagelFieldOptions<T>
-	'slots'?: { [key: string]: Field<T>[] }
+	'children'?: SchemaChild<T, P>[]
+	'slots'?: { [key: string]: SchemaChild<T, P>[] }
 	'defaultValue'?: any
 	'vIf'?: VIfType<T, P>
 	'v-if'?: VIfType<T, P>
@@ -92,22 +94,28 @@ export type MappedBaseBagelField<T> = {
 	[P in Path<T>]: BaseBagelField<T, P>
 }[Path<T>]
 
-export type InputBagelField<T> = MappedBaseBagelField<T> & {
-	$el: 'text' | ComponentExposed<typeof TextInput>
-	type?: string
-}
-
-export type SelectBagelField<T> = MappedBaseBagelField<T> & {
-	$el: 'select' | ComponentExposed<typeof SelectInput>
-}
-
 export type Field<T> = MappedBaseBagelField<T>
 
 export type BglFieldT<T> = Field<T>
 
 export type BglFormSchemaT<T> = Field<T>[]
 
-export type BglFormSchemaFnT<T> = (() => BglFormSchemaT<T>) | BglFormSchemaT<T>
+export type InputBagelField<T> = Field<T> & {
+	$el: 'text' | ComponentExposed<typeof TextInput>
+	type?: string
+}
+// export interface InputBagelField<T> extends BaseBagelField<T, Path<T>> {
+// 	$el: 'text' | ComponentExposed<typeof TextInput>
+// 	type?: string
+// }
+
+export type SelectBagelField<T> = Field<T> & {
+	$el: 'select' | ComponentExposed<typeof SelectInput>
+}
+// export interface SelectBagelField<T> extends BaseBagelField<T, Path<T>> {
+// 	$el: 'select' | ComponentExposed<typeof SelectInput>
+// 	type?: string
+// }
 
 export interface ValidateInputBaseT {
 	validate?: ValidationFn<{ [key: string]: unknown }, string>

package/src/types/TableSchema.ts

@@ -1,19 +1,19 @@
 import type { BglFormSchemaT } from '@bagelink/vue'
-import type { Ref, ComputedRef } from 'vue'
+import type { MaybeRefOrGetter, ComputedRef } from 'vue'
 
 export type SortDirectionsT = 'ASC' | 'DESC'
 export type EmitOrderT = `${string} ${SortDirectionsT}`
 
 export interface TableSchemaProps<T extends { [key: string]: any } = { [key: string]: any }> {
 	data: T[]
-	schema?: BglFormSchemaT<T> | (() => BglFormSchemaT<T>)
-	columns?: string[]
-	useServerSort?: boolean
+	schema?: MaybeRefOrGetter<BglFormSchemaT<T>>
+	columns?: MaybeRefOrGetter<string[]>
+	useServerSort?: MaybeRefOrGetter<boolean>
 	selectable?: boolean
 	onLastItemVisible?: () => void
 }
 
-export interface SortingOptions<T> {
+export interface SortingOptions {
 	onSort: (field: string, direction: SortDirectionsT) => void
 }
 
@@ -24,15 +24,15 @@ export interface TableSelectionOptions<T> {
 }
 
 export interface TableVirtualizationOptions<T> {
-	data: Ref<T[]> | ComputedRef<T[]>
+	data: ComputedRef<T[]>
 	itemHeight: number
 	onLastItemVisible?: () => void
 }
 
 export interface TableDataOptions<T> {
-	data: Ref<T[]> | ComputedRef<T[]>
-	schema?: BglFormSchemaT<T> | (() => BglFormSchemaT<T>) | Promise<BglFormSchemaT<T>> | Promise<() => BglFormSchemaT<T>>
-	columns?: string[]
+	data: MaybeRefOrGetter<T[]>
+	schema?: MaybeRefOrGetter<BglFormSchemaT<T>>
+	columns?: MaybeRefOrGetter<string[]>
 	sortField: string
 	sortDirection: SortDirectionsT
 	useServerSort?: boolean

package/src/utils/BagelFormUtils.ts

@@ -1,4 +1,4 @@
-import type { ArrayFieldVal, Attributes, BaseBagelField, BglFormSchemaT, Field, IconType, InputBagelField, Option, Path, SelectBagelField } from '@bagelink/vue'
+import type { ArrayFieldVal, Attributes, BaseBagelField, BglFormSchemaT, Field, IconType, InputBagelField, Option, Path, SchemaChild, SelectBagelField } from '@bagelink/vue'
 import type { UploadInputProps } from '../components/form/inputs/Upload/upload.types'
 
 interface InputOptions<T, P extends Path<T>> extends Partial<BaseBagelField<T, P>> {
@@ -230,8 +230,7 @@ export function numField<T, P extends Path<T>>(
 	}
 }
 
-// export function frmRow<T, P extends Path<T>>(...children: SchemaChildrenT<T>): BaseBagelField<T, P> {
-export function frmRow<T>(...children: Field<T>[]): Field<T> {
+export function frmRow<T>(...children: SchemaChild<T, Path<T>>[]): Field<T> {
 	return {
 		$el: 'div',
 		class: 'flex gap-1 m_block align-items-end',
@@ -239,7 +238,8 @@ export function frmRow<T>(...children: Field<T>[]): Field<T> {
 	}
 }
 
-export type UploadOptions<T, K extends Path<T>> = InputOptions<T, K> & UploadInputProps
+// export type UploadOptions<T, K extends Path<T>> = InputOptions<T, K> & UploadInputProps
+export interface UploadOptions<T, K extends Path<T>> extends InputOptions<T, K>, UploadInputProps {}
 
 export function uploadField<T, P extends Path<T>>(id: P, label?: string, options?: UploadOptions<T, P>): BaseBagelField<T, P> {
 	return {
@@ -411,6 +411,7 @@ export function useForm(): {
 	arrField: typeof arrField
 	richText: typeof richText
 	findBglFieldById: typeof findBglFieldById
+	getBaseField: typeof getBaseField
 } {
 	return {
 		txtField,
@@ -427,5 +428,6 @@ export function useForm(): {
 		arrField,
 		richText,
 		findBglFieldById,
+		getBaseField
 	}
 }

package/src/utils/{search.ts → useSearch.ts}

@@ -112,7 +112,7 @@ export interface SearchItemParams<T> {
 }
 
 export interface SearchResult<T> {
-	results: ComputedRef<readonly T[]>
+	results: ComputedRef<T[]>
 	resultCount: ComputedRef<number>
 	hasResults: ComputedRef<boolean>
 	isSearching: ComputedRef<boolean>
@@ -378,7 +378,6 @@ export function useSearch<T>(
 		// Otherwise use client-side filtering
 		return searchItems(params)
 	}
-
 	// Create computed references
 	const results = computed(() => getFilteredResults())
 	const resultCount = computed(() => results.value.length)

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"}