@v1nt1248/3nclient-lib 0.3.14 → 0.3.16

package/dist/components/ui3n-input-file/types.d.ts

@@ -1,3 +1,4 @@
+import { VNode } from 'vue';
 export interface Ui3nInputFileProps {
     /**
      * Selected files
@@ -40,3 +41,9 @@ export interface Ui3nInputFileEmits {
      */
     (event: 'error', value: string): void;
 }
+export interface Ui3nInputFileSlots {
+    /**
+     * Default slot
+     */
+    default: () => VNode;
+}

package/dist/components/ui3n-input-file/ui3n-input-file.vue.d.ts

@@ -1,5 +1,14 @@
-import { Ui3nInputFileProps } from './types';
-declare const _default: import('vue').DefineComponent<Ui3nInputFileProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
+import { Ui3nInputFileProps, Ui3nInputFileSlots } from './types';
+declare function __VLS_template(): {
+    attrs: Partial<{}>;
+    slots: Readonly<Ui3nInputFileSlots> & Ui3nInputFileSlots;
+    refs: {
+        fileInput: HTMLInputElement;
+    };
+    rootEl: HTMLDivElement;
+};
+type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
+declare const __VLS_component: import('vue').DefineComponent<Ui3nInputFileProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
     error: (value: string) => any;
     "update:modelValue": (value: FileList | File[]) => any;
 }, string, import('vue').PublicProps, Readonly<Ui3nInputFileProps> & Readonly<{
@@ -12,4 +21,10 @@ declare const _default: import('vue').DefineComponent<Ui3nInputFileProps, {}, {}
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     fileInput: HTMLInputElement;
 }, HTMLDivElement>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/ui3n-components.js

@@ -18089,23 +18089,23 @@ var Wo = {
 		function o(e) {
 			n.disabled || (e.stopImmediatePropagation(), a.value?.click());
 		}
-		function l(e) {
+		function u(e) {
 			if (!e) return !1;
 			if (!n.maxFileSize) return !0;
 			let { name: t, size: i } = e;
 			return i > n.maxFileSize ? (r("error", `The [${t}] file is too big. Maximum file size ${co(n.maxFileSize)}`), !1) : !0;
 		}
-		function u(e) {
+		function d(e) {
 			if (!e) return !1;
 			let { name: t } = e, i = `.${(0, Ts.default)(t.split("."))}`.toLowerCase(), a = n.allowedFileTypes.split(",").map((e) => (0, Es.default)(e).toLowerCase()), o = a.includes("*") || a.includes(i);
 			return o || r("error", `The [${t}] file type is not valid.`), o;
 		}
-		function d(e) {
+		function f(e) {
 			if (!e) return !1;
 			let { name: t } = e, i = [...n.modelValue].find((e) => e.name === t);
 			return i && r("error", `The [${t}] file has already been downloaded.`), !i;
 		}
-		function f(e = []) {
+		function p(e = []) {
 			if (!n.maxNumberOfFiles) return !0;
 			let t = e.reduce((e, t) => {
 				let { size: n } = t;
@@ -18113,21 +18113,21 @@ var Wo = {
 			}, 0) <= Number(n.maxNumberOfFiles);
 			return t || r("error", `You cannot select more than ${n.maxNumberOfFiles} files.`), t;
 		}
-		function p(e) {
+		function m(e) {
 			if ((0, ws.default)(e)) {
-				if (!f(e)) return;
-				let t = e.filter((e) => d(e)).filter((e) => l(e)).filter((e) => u(e));
+				if (!p(e)) return;
+				let t = e.filter((e) => f(e)).filter((e) => u(e)).filter((e) => d(e));
 				(0, ws.default)(t) > 0 && r("update:modelValue", [...n.modelValue, ...t]);
 			}
 		}
-		function m() {
-			a.value && a.value.files && p([...a.value.files]), a.value && (a.value.value = "");
+		function h() {
+			a.value && a.value.files && m([...a.value.files]), a.value && (a.value.value = "");
 		}
 		return (t, n) => (x(), s("div", { class: g(t.$style.ui3nInputFile) }, [c("label", {
 			for: A(i),
 			class: g([t.$style.label, e.disabled && t.$style.disabled]),
 			onClick: B(o, ["stop", "prevent"])
-		}, D(e.buttonText), 11, Ds), c("input", {
+		}, [T(t.$slots, "default", {}, () => [l(D(e.buttonText), 1)])], 10, Ds), c("input", {
 			id: A(i),
 			ref_key: "fileInput",
 			ref: a,
@@ -18137,7 +18137,7 @@ var Wo = {
 			multiple: e.multiple,
 			accept: e.allowedFileTypes,
 			disabled: e.disabled,
-			onChange: m
+			onChange: h
 		}, null, 40, Os)], 2));
 	}
 }), [["__cssModules", { $style: {

package/dist/ui3n-utils.js

@@ -4199,30 +4199,29 @@ var Me = class extends Error {
 	}
 };
 async function J(e) {
-	let { fn: t, fnArgs: n, defaultValue: r, doesErrorPropagateStop: i = !1, timeoutValue: a = 5e3, retryCount: o = 0, retryDelay: s = 1e3, errorText: c = "An error occurred while executing the function.", actionIfError: l, actionIfSuccess: u, actionInFinally: d } = e, f, p = o + 1;
-	for (let e = 1; e <= p; e++) {
-		let r = new AbortController(), { signal: i } = r, o = null;
+	let { fn: t, fnArgs: n, passSignal: r = !1, defaultValue: i, doesErrorPropagateStop: a = !1, timeoutValue: o = 5e3, retryCount: s = 0, retryDelay: c = 1e3, errorText: l = "An error occurred while executing the function.", actionIfError: u, actionIfSuccess: d, actionInFinally: f } = e, p = n, m = s + 1, h;
+	for (let e = 1; e <= m; e++) {
+		let n = new AbortController(), i = null;
 		try {
-			let s = new Promise((t, i) => {
-				a <= 0 || (o = setTimeout(() => {
-					r.abort(), i(new Me(`Attempt ${e}/${p} timed out.`, {
+			let a = (async () => r ? t(n.signal, ...p) : t(...p))(), s = new Promise((t, r) => {
+				o > 0 && (i = setTimeout(() => {
+					n.abort(), r(new Me(`Attempt ${e}/${m} timed out.`, {
 						cause: "timeout",
-						fnArgs: n
+						fnArgs: p
 					}));
-				}, a));
-			}), c = n, l = t.length > c.length ? t(i, ...c) : t(...c), d = await Promise.race([Promise.resolve(l), s]);
-			return u?.(), o && clearTimeout(o), d;
+				}, o));
+			}), c = await Promise.race([a, s]);
+			return i && clearTimeout(i), d?.(), f?.(), c;
 		} catch (t) {
-			if (o && clearTimeout(o), f = t, e === p) break;
-			console.warn(`Attempt ${e} failed. Retrying in ${s}ms...`, t), s > 0 && await b(s);
+			i && clearTimeout(i), h = t, e < m && (console.warn(`[executeFunc] Attempt ${e} failed. Retrying in ${c}ms...`, t), c > 0 && await b(c));
 		}
 	}
-	let m = f instanceof Me && f.cause === "timeout", h = f.name === "AbortError" || f.name === "CanceledError", g = m ? f : new Me(h ? "Operation aborted" : c, {
-		cause: f,
-		fnArgs: n
+	let g = h instanceof Me && h.cause === "timeout", _ = h?.name === "AbortError" || h?.name === "CanceledError", v = g ? h : new Me(_ ? "Operation aborted" : l, {
+		cause: h,
+		fnArgs: p
 	});
-	if (console.error(`All ${p} attempts failed.`, g), l?.(g), !i) throw g;
-	return d?.(), r;
+	if (console.error(`[executeFunc] All ${m} attempts failed.`, v), u?.(v), f?.(), !a) throw v;
+	return i;
 }
 //#endregion
 //#region src/utils/remove-whitespace-in-string.ts
@@ -7248,4 +7247,4 @@ function jt(e) {
 	return e.replace(/[A-Z]/g, (e) => `_${e.toLowerCase()}`);
 }
 //#endregion
-export { g as DIALOGS_KEY, Me as ExecuteFunctionError, _ as NOTIFICATIONS_KEY, T as NamedProcs, Et as SQLiteOn3NStorage, w as SingleCyclicProc, x as SingleProc, O as TaskRunner, v as VUEBUS_KEY, lt as b64ToBlob, ut as blobFromDataURL, ct as blobToB64, qe as capitalize, je as copyToClipboard, pt as createVideoThumbnail, y as defer, h as emoticons, J as executeFunc, ft as fileToUint8Array, Ye as formatFileSize, Be as generateColor, ke as getDeliveryErrors, G as getFileExtension, A as getRandomId, ze as hasSlotContent, He as html2text, Ve as invertColor, st as isFileArchive, it as isFileAudio, Qe as isFileImage, tt as isFileVideo, m as mailReg, C as makeSyncedFunc, Re as markSearch, K as mimeTypes, ne as patchTextareaMaxRowsSupport, Ke as prepareDateAsSting, Ne as removeWhitespaceInString, dt as resizeImage, k as round, D as schedulerYield, Fe as selectAll, Le as selectEnd, Ie as selectStart, b as sleep, q as transformFileToWeb3NFile, Ae as transformWeb3nFileToFile, ht as tryOnScopeDispose, X as uint8ToDataURL, mt as unrefElement };
+export { g as DIALOGS_KEY, _ as NOTIFICATIONS_KEY, T as NamedProcs, Et as SQLiteOn3NStorage, w as SingleCyclicProc, x as SingleProc, O as TaskRunner, v as VUEBUS_KEY, lt as b64ToBlob, ut as blobFromDataURL, ct as blobToB64, qe as capitalize, je as copyToClipboard, pt as createVideoThumbnail, y as defer, h as emoticons, J as executeFunc, ft as fileToUint8Array, Ye as formatFileSize, Be as generateColor, ke as getDeliveryErrors, G as getFileExtension, A as getRandomId, ze as hasSlotContent, He as html2text, Ve as invertColor, st as isFileArchive, it as isFileAudio, Qe as isFileImage, tt as isFileVideo, m as mailReg, C as makeSyncedFunc, Re as markSearch, K as mimeTypes, ne as patchTextareaMaxRowsSupport, Ke as prepareDateAsSting, Ne as removeWhitespaceInString, dt as resizeImage, k as round, D as schedulerYield, Fe as selectAll, Le as selectEnd, Ie as selectStart, b as sleep, q as transformFileToWeb3NFile, Ae as transformWeb3nFileToFile, ht as tryOnScopeDispose, X as uint8ToDataURL, mt as unrefElement };

package/dist/utils/execute-function.d.ts

@@ -1,7 +1,8 @@
-export type ExtractArgs<F> = F extends (signal: AbortSignal, ...args: infer P) => any ? P : F extends (...args: infer P) => any ? P : never;
-export interface ExecuteFnBaseProps<F extends (...args: any[]) => any, V> {
+type ExtractArgs<F> = F extends (signal: AbortSignal, ...args: infer P) => any ? P : F extends (...args: infer P) => any ? P : never;
+interface BaseProps<F extends (...args: any[]) => any, V> {
     fn: F;
     fnArgs: ExtractArgs<F>;
+    passSignal?: boolean;
     timeoutValue?: number;
     retryCount?: number;
     retryDelay?: number;
@@ -10,20 +11,14 @@ export interface ExecuteFnBaseProps<F extends (...args: any[]) => any, V> {
     actionIfSuccess?: () => void;
     actionInFinally?: () => void;
 }
-export interface ExecuteFunctionPropsNoCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends ExecuteFnBaseProps<F, V> {
+interface ExecuteFunctionPropsNoCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends BaseProps<F, V> {
     doesErrorPropagateStop: true;
     defaultValue: V;
 }
-export interface ExecuteFunctionPropsCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends ExecuteFnBaseProps<F, V> {
+interface ExecuteFunctionPropsCatchError<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> extends BaseProps<F, V> {
     doesErrorPropagateStop?: false;
     defaultValue?: undefined;
 }
-export type ExecuteFunctionProps<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> = ExecuteFunctionPropsCatchError<F, V> | ExecuteFunctionPropsNoCatchError<F, V>;
-export declare class ExecuteFunctionError extends Error {
-    cause: unknown;
-    constructor(message: string, data?: {
-        cause?: unknown;
-        fnArgs?: unknown[];
-    });
-}
+type ExecuteFunctionProps<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>> = ExecuteFunctionPropsCatchError<F, V> | ExecuteFunctionPropsNoCatchError<F, V>;
 export declare function executeFunc<F extends (...args: any[]) => any, V = Awaited<ReturnType<F>>>(props: ExecuteFunctionProps<F, V>): Promise<V>;
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@v1nt1248/3nclient-lib",
   "license": "AGPL-3.0-or-later",
   "author": "v1nt1248",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "Library for 3NWeb clients",
   "type": "module",
   "files": [

package/src/components/ui3n-input-file/types.ts

@@ -1,3 +1,5 @@
+import { VNode } from 'vue';
+
 export interface Ui3nInputFileProps {
   /**
    * Selected files
@@ -41,3 +43,10 @@ export interface Ui3nInputFileEmits {
    */
   (event: 'error', value: string): void;
 }
+
+export interface Ui3nInputFileSlots {
+  /**
+   * Default slot
+   */
+  default: () => VNode;
+}

package/src/components/ui3n-input-file/ui3n-input-file.vue

@@ -1,34 +1,10 @@
-<template>
-  <div :class="$style.ui3nInputFile">
-    <label
-      :for="id"
-      :class="[$style.label, disabled && $style.disabled]"
-      @click.stop.prevent="selectFiles"
-    >
-      {{ buttonText }}
-    </label>
-
-    <input
-      :id="id"
-      ref="fileInput"
-      type="file"
-      name="file"
-      hidden
-      :multiple="multiple"
-      :accept="allowedFileTypes"
-      :disabled="disabled"
-      @change="onChange"
-    >
-  </div>
-</template>
-
 <script lang="ts" setup>
   import { ref } from 'vue';
   import size from 'lodash/size';
   import last from 'lodash/last';
   import trim from 'lodash/trim';
   import { getRandomId, formatFileSize } from '@/utils';
-  import type { Ui3nInputFileProps, Ui3nInputFileEmits } from './types';
+  import type { Ui3nInputFileProps, Ui3nInputFileEmits, Ui3nInputFileSlots } from './types';
   import type { Nullable } from '@/types';
 
   const props = withDefaults(defineProps<Ui3nInputFileProps>(), {
@@ -37,6 +13,7 @@
     allowedFileTypes: '*',
   });
   const emits = defineEmits<Ui3nInputFileEmits>();
+  defineSlots<Ui3nInputFileSlots>();
 
   const id = getRandomId(4);
   const fileInput = ref<Nullable<HTMLInputElement>>(null);
@@ -141,6 +118,30 @@
   }
 </script>
 
+<template>
+  <div :class="$style.ui3nInputFile">
+    <label
+      :for="id"
+      :class="[$style.label, disabled && $style.disabled]"
+      @click.stop.prevent="selectFiles"
+    >
+      <slot>{{ buttonText }}</slot>
+    </label>
+
+    <input
+      :id="id"
+      ref="fileInput"
+      type="file"
+      name="file"
+      hidden
+      :multiple="multiple"
+      :accept="allowedFileTypes"
+      :disabled="disabled"
+      @change="onChange"
+    />
+  </div>
+</template>
+
 <style lang="scss" module>
   .ui3nInputFile {
     position: relative;