@vesperjs/vue 0.3.3 → 0.5.0

package/dist/index.d.mts

@@ -1,10 +1,8 @@
 import { BackendErrorInfo, BackendErrorResource, ErrorMessages, ErrorsResource, Flash, UseFlashType, useDate, useEntity, useExternalErrors, useFlash } from "@vesperjs/shared";
 import { Ref, WritableComputedRef } from "@vue/reactivity";
-import { FetchError, FetchOptions, FetchResponse } from "ofetch";
+import { FetchContext, FetchError, FetchOptions, FetchResponse } from "ofetch";
 import * as _$vue_i18n0 from "vue-i18n";
-import * as _$vue from "vue";
-import * as _$_nanostores_router0 from "@nanostores/router";
-import { Router, RouterConfig } from "@nanostores/router";
+import { ParamsFromConfig, Router, RouterConfig } from "@nanostores/router";
 
 //#region src/composables/backend/api/use-api-constants.d.ts
 declare const useApiConstants: () => {
@@ -25,6 +23,10 @@ interface QueryAPIOptions {
   token?: string | null | undefined;
   baseURL?: string | null | undefined;
   signal?: AbortSignal;
+  retry?: number | false;
+  retryDelay?: number | ((context: FetchContext<any, 'json'>) => number);
+  retryStatusCodes?: number[];
+  timeout?: number;
   onRequestError?: ({
     error
   }: {
@@ -51,6 +53,10 @@ interface MutationAPIOptions {
   body?: Record<string, any> | FormData;
   token?: string | null;
   baseURL?: string | null;
+  retry?: number | false;
+  retryDelay?: number | ((context: FetchContext<any, 'json'>) => number);
+  retryStatusCodes?: number[];
+  timeout?: number;
   onRequestError?: ({
     error
   }: {
@@ -62,14 +68,7 @@ interface MutationAPIOptions {
     response: FetchResponse<any>;
   }) => void;
 }
-declare const useMutationApi: <T = unknown, E = any>(url: string, {
-  method,
-  body,
-  token,
-  baseURL,
-  onRequestError,
-  onResponseError
-}: MutationAPIOptions) => Promise<{
+declare const useMutationApi: <T = unknown, E = any>(url: string, options: MutationAPIOptions) => Promise<{
   token: string | null | undefined;
   data: T | undefined;
   error: FetchError<E> | undefined;
@@ -117,13 +116,13 @@ declare const useElement: <EL extends Element, P extends string>(el: EL | undefi
 //#endregion
 //#region src/composables/use-locale.d.ts
 declare const useLocale: () => {
-  locale: _$vue.WritableComputedRef<"en" | "ja", "en" | "ja">;
+  locale: WritableComputedRef<"en" | "ja", "en" | "ja">;
   autodetect: () => void;
 };
 //#endregion
 //#region src/composables/use-nano-route.d.ts
 declare const useNanoRoute: <T extends RouterConfig>(router: Router<T>) => {
-  params: _$_nanostores_router0.ParamsFromConfig<T>[string] | _$_nanostores_router0.ParamsFromConfig<T>[number] | _$_nanostores_router0.ParamsFromConfig<T>[symbol] | undefined;
+  params: ParamsFromConfig<T>[string] | undefined;
   query: Record<string, string> | undefined;
   path: string | undefined;
 };

package/dist/index.mjs

@@ -92,7 +92,7 @@ const useQueryApi = async function(url, options) {
 	const tokenRef = ref();
 	const headers = commonHeaders.value;
 	if (options?.token) headers.Authorization = `Bearer ${options.token}`;
-	const getOptions = {
+	const queryOptions = {
 		baseURL: options?.baseURL ?? baseUrl.value,
 		method: "get",
 		query: options?.query ?? {},
@@ -101,10 +101,14 @@ const useQueryApi = async function(url, options) {
 			tokenRef.value = response.headers.get("Authorization")?.split(" ")[1] ?? options?.token;
 		}
 	};
-	if (options?.signal) getOptions.signal = options.signal;
-	if (options?.onRequestError) getOptions.onRequestError = options.onRequestError;
-	if (options?.onResponseError) getOptions.onResponseError = options.onResponseError;
-	const { data, error, pending } = await useOFetch(url, getOptions);
+	if (options?.retry) queryOptions.retry = options.retry;
+	if (options?.retryDelay) queryOptions.retryDelay = options.retryDelay;
+	if (options?.retryStatusCodes) queryOptions.retryStatusCodes = options.retryStatusCodes;
+	if (options?.timeout) queryOptions.timeout = options.timeout;
+	if (options?.signal) queryOptions.signal = options.signal;
+	if (options?.onRequestError) queryOptions.onRequestError = options.onRequestError;
+	if (options?.onResponseError) queryOptions.onResponseError = options.onResponseError;
+	const { data, error, pending } = await useOFetch(url, queryOptions);
 	return {
 		token: tokenRef.value,
 		data,
@@ -114,27 +118,38 @@ const useQueryApi = async function(url, options) {
 };
 //#endregion
 //#region src/composables/backend/api/use-mutation-api.ts
-const useMutationApi = async function(url, { method, body = {}, token = null, baseURL = null, onRequestError, onResponseError }) {
+const useMutationApi = async function(url, options) {
 	const { commonHeaders } = useHttpHeaders();
 	const { baseURL: baseUrl } = useApiConstants();
+	const method = options.method;
+	const body = options.body ?? {};
+	const token = options.token ?? null;
+	const baseURL = options.baseURL ?? null;
+	const retry = options.retry;
+	const retryDelay = options.retryDelay;
+	const retryStatusCodes = options.retryStatusCodes;
+	const timeout = options.timeout;
+	const onRequestError = options.onRequestError;
+	const onResponseError = options.onResponseError;
 	const headers = commonHeaders.value;
 	const tokenRef = ref();
-	if (token) {
-		headers.Authorization = `Bearer ${token}`;
-		tokenRef.value = token;
-	}
-	const options = {
+	if (token) headers.Authorization = `Bearer ${token}`;
+	const mutOptions = {
 		baseURL: baseURL ?? baseUrl.value,
 		headers,
 		method
 	};
-	if (onRequestError) options.onRequestError = onRequestError;
-	if (onResponseError) options.onResponseError = onResponseError;
-	if (method == "post" || method == "put") options.body = body;
-	options.onResponse = ({ response }) => {
+	if (retry) mutOptions.retry = retry;
+	if (retryDelay) mutOptions.retryDelay = retryDelay;
+	if (retryStatusCodes) mutOptions.retryStatusCodes = retryStatusCodes;
+	if (timeout) mutOptions.timeout = timeout;
+	if (onRequestError) mutOptions.onRequestError = onRequestError;
+	if (onResponseError) mutOptions.onResponseError = onResponseError;
+	if (method == "post" || method == "put") mutOptions.body = body;
+	mutOptions.onResponse = ({ response }) => {
 		tokenRef.value = response.headers.get("Authorization")?.split(" ")[1] ?? token;
 	};
-	const { data, error, pending } = await useOFetch(url, options);
+	const { data, error, pending } = await useOFetch(url, mutOptions);
 	return {
 		token: tokenRef.value,
 		data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesperjs/vue",
-  "version": "0.3.3",
+  "version": "0.5.0",
   "keywords": [
     "vue.js"
   ],
@@ -22,21 +22,18 @@
     "@formkit/tempo": "^1.0.0",
     "@nanostores/persistent": "^1.3.4",
     "@nanostores/router": "^1.0.0",
-    "@vesperjs/shared": "0.3.3",
+    "@vesperjs/shared": "0.5.0",
     "nanostores": "^1.3.0",
     "ofetch": "^1.5.1",
-    "undici": "^8.1.0",
+    "undici": "^8.2.0",
     "vue-i18n": "^11.4.0"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@typescript-eslint/eslint-plugin": "^8.59.1",
-    "@typescript-eslint/parser": "^8.59.1",
-    "@typescript-eslint/project-service": "^8.59.1",
-    "@typescript-eslint/typescript-estree": "^8.59.1",
-    "@typescript-eslint/utils": "^8.59.1",
+    "@typescript-eslint/eslint-plugin": "^8.59.2",
+    "@typescript-eslint/parser": "^8.59.2",
     "@vue/eslint-config-typescript": "^14.7.0",
-    "eslint": "^10.2.1",
+    "eslint": "^10.3.0",
     "eslint-plugin-vue": "^10.9.0",
     "oxfmt": "^0.47.0",
     "tsdown": "^0.21.10",