firstly 0.0.13 → 0.0.14

package/esm/ui/Field.svelte

@@ -1,139 +1,192 @@
-<script generics="T extends Record<any, any>">import { createEventDispatcher } from "svelte";
-import {} from "remult";
-import {} from "../";
-import { suffixWithS } from "../formats/strings";
-import {
-  displayWithDefaultAndSuffix,
-  getEntityDisplayValue,
-  getFieldMetaType,
-  getFirstInterestingField
-} from "../helper.js";
-import { tw } from "../utils/tailwind";
-import Clipboardable from "./Clipboardable.svelte";
-import Icon from "./Icon.svelte";
-import FieldContainer from "./internals/FieldContainer.svelte";
-import Input from "./internals/Input.svelte";
-import MultiSelectMelt from "./internals/select/MultiSelectMelt.svelte";
-import SelectMelt from "./internals/select/SelectMelt.svelte";
-import SelectRadio from "./internals/select/SelectRadio.svelte";
-import Textarea from "./internals/Textarea.svelte";
-import LinkPlus from "./link/LinkPlus.svelte";
-export let cell;
-export let value = void 0;
-export let cellsValues = {};
-export let withDedounce = false;
-export let error = "";
-export let mode = "edit";
-export let focus = false;
-export let clearable = void 0;
-export let disabled = false;
-const dispatch = createEventDispatcher();
-function dispatchSelected(_data) {
-  value = _data;
-  dispatch("selected", _data);
-}
-$: metaType = getFieldMetaType(cell.field);
-const isViewMode = (_mode, _field) => {
-  return _mode === "view" || _field?.dbReadOnly || _field?.options.allowApiUpdate === false;
-};
-const common = (_field, isLight = false) => {
-  let toRet = {
-    id: _field?.key ?? "SOMETHING_AT_LEAST",
-    disabled: _field?.dbReadOnly || _field?.options.allowApiUpdate === false || disabled,
-    placeholder: _field?.options?.placeholder ?? void 0
-  };
-  if (isLight) {
-    return toRet;
-  }
-  return {
-    ...toRet,
-    step: _field?.options?.step ?? void 0,
-    name: _field?.key
-    // required: _field?.allowNull === false,
-  };
-};
-const toInput = (_metadata, _value) => {
-  try {
-    return _metadata?.valueConverter.toInput(_value, metaType.subKind);
-  } catch (error2) {
-    console.error(`error toInput w field '${_metadata?.key}'`, error2);
-  }
-};
-const fromInput = (_metadata, _value) => {
-  try {
-    if (_metadata.allowNull && _value === null) {
-      return null;
-    }
-    return _metadata?.valueConverter.fromInput(_value, metaType.subKind);
-  } catch (error2) {
-    console.error(`error fromInput w field '${_metadata.key}'`, error2);
-  }
-};
-const getId = () => {
-  return value?.id || value;
-};
-const getLoadOptions = async (cellsValues2, str) => {
-  if (metaType.kind !== "relation") {
-    return { items: [], totalCount: 0 };
-  }
-  const metaTypeObj = { ...metaType };
-  let findToUse = {};
-  if (metaTypeObj.repoTarget.metadata.options.searchableFind) {
-    findToUse = metaTypeObj.repoTarget.metadata.options.searchableFind(str);
-  } else {
-    if (str) {
-      const field = getFirstInterestingField(metaTypeObj.repoTarget);
-      findToUse = { where: { [field.key]: { $contains: str } } };
-    }
-  }
-  const foEdit = cell.field?.options.findOptionsForEdit;
-  const narrowFindEditWhere = typeof foEdit === "function" ? foEdit(cellsValues2).where ?? {} : typeof foEdit === "object" ? foEdit.where ?? {} : {};
-  const foCrud = cell.field?.options.findOptions;
-  const narrowFindCrudWhere = typeof foCrud === "function" ? foCrud().where ?? {} : typeof foCrud === "object" ? foCrud.where ?? {} : {};
-  findToUse = {
-    include: { ...findToUse.include ?? {} },
-    where: { $and: [findToUse.where, narrowFindEditWhere, narrowFindCrudWhere] }
-  };
-  let limit = cell.field?.options.findOptionsLimit ?? 24;
-  const arr = [];
-  arr.push(
-    ...await metaTypeObj.repoTarget.find({
-      ...findToUse,
-      limit
-    })
-  );
-  let totalCount = arr.length;
-  if (totalCount === limit) {
-    const agg = await metaTypeObj.repoTarget.aggregate({ where: findToUse.where });
-    totalCount = agg.$count;
-  }
-  if (!cell.field?.options.multiSelect) {
-    if (str === "" && getId() && !arr.find((r) => String(r.id) === String(getId()))) {
-      arr.unshift(await metaTypeObj.repoTarget.findId(getId()));
-    }
-  }
-  return { items: arr.map((r) => getEntityDisplayValue(metaTypeObj.repoTarget, r)), totalCount };
-};
-const getMultiValues = (value2) => {
-  return (value2 ?? []).map((c) => c.id) || value2;
-};
-const calcSuffix = (value2) => {
-  if (cell.field?.options.suffixEdit) {
-    if (cell.field?.options.suffixEditWithS) {
-      return suffixWithS(value2, cell.field?.options.suffixEdit);
-    } else {
-      return cell.field?.options.suffixEdit;
-    }
-  }
-  if (cell.field?.options.suffix) {
-    if (cell.field?.options.suffixWithS) {
-      return suffixWithS(value2, cell.field?.options.suffix);
-    } else {
-      return cell.field?.options.suffix;
-    }
-  }
-  return "";
-};
+<script lang="ts" generics="T extends Record<any, any>">
+	import { createEventDispatcher } from 'svelte'
+	import type { HTMLInputAttributes } from 'svelte/elements'
+
+	import { type FieldMetadata, type FindOptions } from 'remult'
+
+	import { type BaseItem, type Cell } from '../'
+	import { suffixWithS } from '../formats/strings'
+	import {
+		displayWithDefaultAndSuffix,
+		getEntityDisplayValue,
+		getFieldMetaType,
+		getFirstInterestingField,
+		type MetaTypeRelation,
+	} from '../helper.js'
+	import { tw } from '../utils/tailwind'
+	import Clipboardable from './Clipboardable.svelte'
+	import Icon from './Icon.svelte'
+	import FieldContainer from './internals/FieldContainer.svelte'
+	import Input from './internals/Input.svelte'
+	import MultiSelectMelt from './internals/select/MultiSelectMelt.svelte'
+	import SelectMelt from './internals/select/SelectMelt.svelte'
+	import SelectRadio from './internals/select/SelectRadio.svelte'
+	import Textarea from './internals/Textarea.svelte'
+	import LinkPlus from './link/LinkPlus.svelte'
+
+	export let cell: Cell<T>
+	export let value: HTMLInputAttributes['value'] = undefined
+
+	// values of other fields in same context e.g. in form
+	export let cellsValues: any = {}
+
+	export let withDedounce: boolean = false
+
+	export let error = ''
+
+	export let mode: 'edit' | 'view' | 'filtre' = 'edit'
+
+	export let focus: boolean = false
+
+	export let clearable: boolean | undefined = undefined
+	export let disabled = false
+
+	const dispatch = createEventDispatcher()
+
+	function dispatchSelected(_data: BaseItem | BaseItem[] | undefined) {
+		value = _data
+		dispatch('selected', _data)
+	}
+	$: metaType = getFieldMetaType(cell.field!)
+
+	const isViewMode = (_mode: 'edit' | 'view' | 'filtre', _field?: FieldMetadata<any, any>) => {
+		return _mode === 'view' || _field?.dbReadOnly || _field?.options.allowApiUpdate === false
+	}
+
+	const common = (_field?: FieldMetadata<any, any>, isLight = false) => {
+		let toRet = {
+			id: _field?.key ?? 'SOMETHING_AT_LEAST',
+			disabled: _field?.dbReadOnly || _field?.options.allowApiUpdate === false || disabled,
+			placeholder: _field?.options?.placeholder ?? undefined,
+		}
+		if (isLight) {
+			return toRet
+		}
+		return {
+			...toRet,
+			step: _field?.options?.step ?? undefined,
+			name: _field?.key,
+			// required: _field?.allowNull === false,
+		}
+	}
+
+	const toInput = (_metadata?: FieldMetadata<any, any>, _value?: HTMLInputAttributes['value']) => {
+		try {
+			return _metadata?.valueConverter.toInput(_value, metaType.subKind)
+		} catch (error) {
+			console.error(`error toInput w field '${_metadata?.key}'`, error)
+		}
+	}
+
+	const fromInput = (_metadata: FieldMetadata<any, any>, _value: HTMLInputAttributes['value']) => {
+		try {
+			// REMULT default for numbers ?
+			if (_metadata.allowNull && _value === null) {
+				return null
+			}
+			return _metadata?.valueConverter.fromInput(_value, metaType.subKind)
+		} catch (error) {
+			console.error(`error fromInput w field '${_metadata.key}'`, error)
+		}
+	}
+
+	// let items: any[] = []
+
+	const getId = () => {
+		return value?.id || value
+	}
+
+	const getLoadOptions = async (cellsValues: any, str: string) => {
+		if (metaType.kind !== 'relation') {
+			return { items: [], totalCount: 0 }
+		}
+		// To make TS happy
+		const metaTypeObj = { ...metaType } as MetaTypeRelation
+
+		let findToUse: FindOptions<any> = {}
+		if (metaTypeObj.repoTarget.metadata.options.searchableFind) {
+			// narrowFind at the end because searchableFind should not change the narrowed part!
+			findToUse = metaTypeObj.repoTarget.metadata.options.searchableFind(str)
+		} else {
+			if (str) {
+				const field = getFirstInterestingField(metaTypeObj.repoTarget)
+				findToUse = { where: { [field.key]: { $contains: str } } }
+			}
+		}
+
+		const foEdit = cell.field?.options.findOptionsForEdit
+		const narrowFindEditWhere =
+			typeof foEdit === 'function'
+				? (foEdit(cellsValues).where ?? {})
+				: typeof foEdit === 'object'
+					? (foEdit.where ?? {})
+					: {}
+
+		// @ts-ignore
+		const foCrud = cell.field?.options.findOptions
+		const narrowFindCrudWhere =
+			typeof foCrud === 'function'
+				? (foCrud().where ?? {})
+				: typeof foCrud === 'object'
+					? (foCrud.where ?? {})
+					: {}
+
+		findToUse = {
+			include: { ...(findToUse.include ?? {}) },
+			where: { $and: [findToUse.where, narrowFindEditWhere, narrowFindCrudWhere] },
+		}
+
+		// 24 here is a "magic number"!
+		let limit = cell.field?.options.findOptionsLimit ?? 24
+
+		const arr = []
+		arr.push(
+			...(await metaTypeObj.repoTarget.find({
+				...findToUse,
+				limit,
+			})),
+		)
+
+		let totalCount = arr.length
+		// If we are at the limit... there is probably more! How many?
+		if (totalCount === limit) {
+			const agg = await metaTypeObj.repoTarget.aggregate({ where: findToUse.where })
+			totalCount = agg.$count
+		}
+
+		if (!cell.field?.options.multiSelect) {
+			// let's get the current item if it's not in the default list (only when there is no searchFilter going on)
+			if (str === '' && getId() && !arr.find((r) => String(r.id) === String(getId()))) {
+				arr.unshift(await metaTypeObj.repoTarget.findId(getId()))
+			}
+		}
+
+		return { items: arr.map((r) => getEntityDisplayValue(metaTypeObj.repoTarget, r)), totalCount }
+	}
+
+	const getMultiValues = (value: any) => {
+		return (value ?? []).map((c: any) => c.id) || value
+	}
+
+	const calcSuffix = (value: any) => {
+		if (cell.field?.options.suffixEdit) {
+			if (cell.field?.options.suffixEditWithS) {
+				return suffixWithS(value, cell.field?.options.suffixEdit)
+			} else {
+				return cell.field?.options.suffixEdit
+			}
+		}
+
+		if (cell.field?.options.suffix) {
+			if (cell.field?.options.suffixWithS) {
+				return suffixWithS(value, cell.field?.options.suffix)
+			} else {
+				return cell.field?.options.suffix
+			}
+		}
+
+		return ''
+	}
 </script>
 
 <FieldContainer

package/esm/ui/Field.svelte.d.ts

@@ -1,4 +1,3 @@
-import { SvelteComponent } from "svelte";
 import type { HTMLInputAttributes } from 'svelte/elements';
 import { type Cell } from '../';
 declare class __sveltets_Render<T extends Record<any, any>> {
@@ -21,10 +20,18 @@ declare class __sveltets_Render<T extends Record<any, any>> {
         [evt: string]: CustomEvent<any>;
     };
     slots(): {};
+    bindings(): string;
+    exports(): {};
 }
-export type FieldProps<T extends Record<any, any>> = ReturnType<__sveltets_Render<T>['props']>;
-export type FieldEvents<T extends Record<any, any>> = ReturnType<__sveltets_Render<T>['events']>;
-export type FieldSlots<T extends Record<any, any>> = ReturnType<__sveltets_Render<T>['slots']>;
-export default class Field<T extends Record<any, any>> extends SvelteComponent<FieldProps<T>, FieldEvents<T>, FieldSlots<T>> {
+interface $$IsomorphicComponent {
+    new <T extends Record<any, any>>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T>['props']>, ReturnType<__sveltets_Render<T>['events']>, ReturnType<__sveltets_Render<T>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<T>['bindings']>;
+    } & ReturnType<__sveltets_Render<T>['exports']>;
+    <T extends Record<any, any>>(internal: unknown, props: ReturnType<__sveltets_Render<T>['props']> & {
+        $$events?: ReturnType<__sveltets_Render<T>['events']>;
+    }): ReturnType<__sveltets_Render<T>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
 }
-export {};
+declare const Field: $$IsomorphicComponent;
+type Field<T extends Record<any, any>> = InstanceType<typeof Field<T>>;
+export default Field;

package/esm/ui/FieldGroup.svelte

@@ -1,56 +1,77 @@
-<script generics="T extends Record<any, any>">import { createEventDispatcher } from "svelte";
-import { getRelationFieldInfo } from "remult/internals";
-import { tw } from "../";
-import Field from "./Field.svelte";
-import FieldContainer from "./internals/FieldContainer.svelte";
-import Loading from "./Loading.svelte";
-export let mode = "edit";
-export let cells;
-export let store;
-export let focusKey = null;
-const getError = (errors, field) => {
-  const fo = getRelationFieldInfo(field);
-  const keyToUse = fo?.options?.field;
-  if (errors && keyToUse && errors[keyToUse]) {
-    return errors[keyToUse];
-  } else if (errors && errors[field.key]) {
-    return errors[field.key];
-  }
-  return void 0;
-};
-const shouldHide = (c, mode2) => {
-  if (mode2 === "edit" && c.modeEdit === "hide") {
-    return true;
-  }
-  if (mode2 === "view" && c.modeView === "hide") {
-    return true;
-  }
-  return false;
-};
-const modeToUse = (c, mode2) => {
-  if (mode2 === "edit" && c.modeEdit === "view") {
-    return "view";
-  }
-  if (mode2 === "view" && c.modeView === "edit") {
-    return "edit";
-  }
-  return mode2;
-};
-const dispatch = createEventDispatcher();
-function dispatchChanged(_data) {
-  dispatch("changed", _data);
-}
-$: dispatchChanged($store.item);
-let size = ["", "w-1/2", "w-1/3", "w-1/4", "w-1/5", "w-1/6"];
-function isToFocus(currentKey, focusKey2, i) {
-  if (focusKey2 === null || focusKey2 === void 0) {
-    if (i === 0) {
-      return true;
-    }
-    return false;
-  }
-  return focusKey2 === currentKey;
-}
+<script lang="ts" generics="T extends Record<any, any>">
+	import { createEventDispatcher } from 'svelte'
+
+	import type { FieldMetadata } from 'remult'
+	import { getRelationFieldInfo } from 'remult/internals'
+
+	import { tw, type StoreItem } from '../'
+	import type { Cell } from '../cellsBuildor'
+	import Field from './Field.svelte'
+	import FieldContainer from './internals/FieldContainer.svelte'
+	import Loading from './Loading.svelte'
+
+	type Mode = 'edit' | 'view' | 'filtre'
+	export let mode: Mode = 'edit'
+
+	export let cells: Cell<T>[]
+	export let store: StoreItem<T>
+
+	export let focusKey: string | null | undefined = null
+
+	const getError = (errors: any, field: FieldMetadata<any, any>) => {
+		const fo = getRelationFieldInfo(field)
+		const keyToUse = fo?.options?.field
+		if (errors && keyToUse && errors[keyToUse]) {
+			return errors[keyToUse]
+		} else if (errors && errors[field.key]) {
+			return errors[field.key]
+		}
+		return undefined
+	}
+
+	const shouldHide = (c: Cell<T>, mode: Mode) => {
+		if (mode === 'edit' && c.modeEdit === 'hide') {
+			return true
+		}
+		if (mode === 'view' && c.modeView === 'hide') {
+			return true
+		}
+		return false
+	}
+
+	const modeToUse = (c: Cell<T>, mode: Mode) => {
+		if (mode === 'edit' && c.modeEdit === 'view') {
+			return 'view'
+		}
+		if (mode === 'view' && c.modeView === 'edit') {
+			return 'edit'
+		}
+		return mode
+	}
+
+	const dispatch = createEventDispatcher()
+
+	function dispatchChanged(_data: T | undefined) {
+		dispatch('changed', _data)
+	}
+
+	$: dispatchChanged($store.item)
+
+	let size = ['', 'w-1/2', 'w-1/3', 'w-1/4', 'w-1/5', 'w-1/6']
+
+	function isToFocus(
+		currentKey: string | undefined,
+		focusKey: string | null | undefined,
+		i: number,
+	): boolean {
+		if (focusKey === null || focusKey === undefined) {
+			if (i === 0) {
+				return true
+			}
+			return false
+		}
+		return focusKey === currentKey
+	}
 </script>
 
 {#each cells as cell, i}

package/esm/ui/FieldGroup.svelte.d.ts

@@ -1,4 +1,3 @@
-import { SvelteComponent } from "svelte";
 import type { FieldMetadata } from 'remult';
 import { type StoreItem } from '../';
 import type { Cell } from '../cellsBuildor';
@@ -21,10 +20,22 @@ declare class __sveltets_Render<T extends Record<any, any>> {
             focus: typeof focus;
         };
     };
+    bindings(): string;
+    exports(): {};
 }
-export type FieldGroupProps<T extends Record<any, any>> = ReturnType<__sveltets_Render<T>['props']>;
-export type FieldGroupEvents<T extends Record<any, any>> = ReturnType<__sveltets_Render<T>['events']>;
-export type FieldGroupSlots<T extends Record<any, any>> = ReturnType<__sveltets_Render<T>['slots']>;
-export default class FieldGroup<T extends Record<any, any>> extends SvelteComponent<FieldGroupProps<T>, FieldGroupEvents<T>, FieldGroupSlots<T>> {
+interface $$IsomorphicComponent {
+    new <T extends Record<any, any>>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T>['props']> & {
+        children?: any;
+    }>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T>['props']>, ReturnType<__sveltets_Render<T>['events']>, ReturnType<__sveltets_Render<T>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<T>['bindings']>;
+    } & ReturnType<__sveltets_Render<T>['exports']>;
+    <T extends Record<any, any>>(internal: unknown, props: ReturnType<__sveltets_Render<T>['props']> & {
+        $$events?: ReturnType<__sveltets_Render<T>['events']>;
+        $$slots?: ReturnType<__sveltets_Render<T>['slots']>;
+        children?: any;
+    }): ReturnType<__sveltets_Render<T>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
 }
-export {};
+declare const FieldGroup: $$IsomorphicComponent;
+type FieldGroup<T extends Record<any, any>> = InstanceType<typeof FieldGroup<T>>;
+export default FieldGroup;