@revojs/vue 0.1.21 → 0.1.22

package/dist/client/index.d.ts

@@ -1,23 +1,25 @@
+import * as revojs0 from "revojs";
 import { Scope } from "revojs";
 import { Ref } from "vue";
 
 //#region src/client/index.d.ts
-type AsyncOptions<T> = {
+interface AsyncOptions<T> {
   catch?: (error: T) => void | Promise<void>;
-};
+}
 declare function useScope(): Scope;
 declare function useState<T>(scope: Scope, name: string): Ref<T | undefined>;
 declare function useState<T>(scope: Scope, name: string, value: T): Ref<T>;
-declare function useAsync<T, TError = Error>(scope: Scope, name: string, invoke: () => Promise<T>, defaultOptions?: AsyncOptions<TError>): {
+declare function useAsync<T, TError = Error>(scope: Scope, name: string, invoke: () => Promise<T>, defaultOptions?: AsyncOptions<TError>): Promise<{
   state: Ref<T | undefined, T | undefined>;
   isLoading: Ref<boolean, boolean>;
-  execute: (options?: AsyncOptions<TError>) => Promise<T | undefined>;
-};
-declare function useFetch<T, TError = Error>(scope: Scope, input: string | URL, options?: RequestInit & AsyncOptions<TError>): {
+  refresh: (options?: AsyncOptions<TError>) => Promise<T | undefined>;
+}>;
+declare function useFetch<T, TError = Error>(scope: Scope, input: string | URL, options?: RequestInit & AsyncOptions<TError>): Promise<{
   state: Ref<T | undefined, T | undefined>;
   isLoading: Ref<boolean, boolean>;
-  execute: (options?: AsyncOptions<TError> | undefined) => Promise<T | undefined>;
-};
-declare function navigate(scope: Scope, path: string): void;
+  refresh: (options?: AsyncOptions<TError> | undefined) => Promise<T | undefined>;
+}>;
+declare function refreshAsync(scope: Scope, input?: string | Array<string>): Promise<void[] | undefined>;
+declare const REFRESH_ASYNC_HOOK: revojs0.Descriptor<(names?: Array<string>) => Promise<void>>;
 //#endregion
-export { AsyncOptions, navigate, useAsync, useFetch, useScope, useState };
+export { AsyncOptions, REFRESH_ASYNC_HOOK, refreshAsync, useAsync, useFetch, useScope, useState };

package/dist/client/index.js

@@ -1,6 +1,5 @@
-import { $fetch, getState, sendRedirect, setState } from "revojs";
-import { customRef, inject, onServerPrefetch, ref } from "vue";
-import { useRouter } from "vue-router";
+import { $fetch, defineHook, getState, isClient, isServer, setState } from "revojs";
+import { customRef, inject, onScopeDispose, ref } from "vue";
 
 //#region src/client/index.ts
 function useScope() {
@@ -22,10 +21,10 @@ function useState(scope, name, value) {
 		}
 	}));
 }
-function useAsync(scope, name, invoke, defaultOptions) {
+async function useAsync(scope, name, invoke, defaultOptions) {
 	const state = useState(scope, name);
 	const isLoading = ref(false);
-	const execute = async (options) => {
+	const refresh = async (options) => {
 		const onCatch = options?.catch ?? defaultOptions?.catch;
 		isLoading.value = true;
 		try {
@@ -37,21 +36,24 @@ function useAsync(scope, name, invoke, defaultOptions) {
 		}
 		return state.value;
 	};
-	const task = execute();
-	if (import.meta.server) onServerPrefetch(async () => await task);
+	const task = refresh();
+	if (isServer) await task;
+	if (isClient) onScopeDispose(scope.registerHook(REFRESH_ASYNC_HOOK, async (names) => {
+		if (names === void 0 || names?.includes(name)) await refresh();
+	}));
 	return {
 		state,
 		isLoading,
-		execute
+		refresh
 	};
 }
 function useFetch(scope, input, options) {
 	return useAsync(scope, input.toString(), () => $fetch(scope, input, options), options);
 }
-function navigate(scope, path) {
-	if (import.meta.server) throw sendRedirect(scope, path);
-	else useRouter().push(path);
+async function refreshAsync(scope, input) {
+	if (isClient) return await scope.dispatchHook(REFRESH_ASYNC_HOOK, input === void 0 ? void 0 : Array.isArray(input) ? input : [input]);
 }
+const REFRESH_ASYNC_HOOK = defineHook("REFRESH_ASYNC_HOOK");
 
 //#endregion
-export { navigate, useAsync, useFetch, useScope, useState };
+export { REFRESH_ASYNC_HOOK, refreshAsync, useAsync, useFetch, useScope, useState };

package/dist/module/app.ts

@@ -1,4 +1,4 @@
-import { Radix, Scope, toRoutePath, useUrl, type Node } from "revojs";
+import { isServer, Radix, Scope, toRoutePath, useUrl, type Node } from "revojs";
 import { type Component, createSSRApp } from "vue";
 import { createMemoryHistory, createRouter, createWebHistory, RouterView, type RouteRecordRaw } from "vue-router";
 import Main from "#alias/vue/main";
@@ -44,7 +44,7 @@ export default async (scope: Scope) => {
     }
 
     const router = createRouter({
-        history: import.meta.server ? createMemoryHistory() : createWebHistory(),
+        history: isServer ? createMemoryHistory() : createWebHistory(),
         routes: [toRoute("/", radix.rootNode, 0)],
     });
 
@@ -52,7 +52,7 @@ export default async (scope: Scope) => {
 
     app.config.throwUnhandledErrorInProduction = true;
 
-    if (import.meta.server) {
+    if (isServer) {
         const { pathname } = useUrl(scope);
 
         await router.push(pathname);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revojs/vue",
-    "version": "0.1.21",
+    "version": "0.1.22",
     "type": "module",
     "repository": "coverbase/revojs",
     "license": "MIT",