@void/vue 1.2.1 → 1.4.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ActionClient, NavigationState, VisitOptions, VoidActionError, VoidRouter } from "void/pages-client";
+import { ActionClient, FormResetOptions, NavigationState, VisitOptions, VoidActionError, VoidRouter } from "void/pages-client";
 import { Component } from "vue";
 import { CloudContextVariables, DeferredState as Deferred, InferProps } from "void";
 import { ActionFormOptions, ActionUrl, ResolveActionBody } from "void/routes";
@@ -33,7 +33,9 @@ export declare function useForm<U extends ActionUrl & string>(url: U, defaults:
   put(opts?: FormSubmitOptions): Promise<void>;
   patch(opts?: FormSubmitOptions): Promise<void>;
   delete(opts?: FormSubmitOptions): Promise<void>;
+  reset(options: FormResetOptions, ...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
   reset(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
+  setError(field: keyof ResolveActionBody<U> & string, message: string): void;
   clearErrors(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
   clearError(): void;
 };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { VoidActionError, categorizeActionError, createActionClient, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, idleNavigationState, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, scheduleFormRetry, ssrProxy, submitAction } from "void/pages-client";
-import { computed, defineComponent, h, inject, onMounted, onUnmounted, reactive, ref, watch } from "vue";
+import { cloneFormValue, createActionClient, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, idleNavigationState, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, parseFormResetArgs, scheduleFormRetry, ssrProxy, submitAction, submitIslandAction } from "void/pages-client";
+import { computed, defineComponent, h, inject, onMounted, onUnmounted, reactive, ref, shallowRef, watch } from "vue";
 //#region src/runtime/form.ts
 const Form = defineComponent({
 	name: "VoidForm",
@@ -241,28 +241,36 @@ function useShared() {
 //#endregion
 //#region src/runtime/use-form.ts
 function useForm(url, defaults, options) {
-	const formDefaults = defaults;
+	const initialDefaults = cloneFormValue(defaults);
 	const router = inject("__void_router", null);
-	const data = reactive({ ...formDefaults });
+	const data = reactive(cloneFormValue(initialDefaults));
 	const errors = reactive({});
 	const error = ref(null);
 	const pending = ref(false);
 	const wasSuccessful = ref(false);
 	const recentlySuccessful = ref(false);
-	let defaults_ = { ...formDefaults };
+	const defaults_ = shallowRef(initialDefaults);
 	let successTimeout = null;
-	const hasChanges = ref(false);
-	watch(() => ({ ...data }), (val) => {
-		hasChanges.value = Object.keys(defaults_).some((key) => !isEqualFormValue(val[key], defaults_[key]));
-	}, { deep: true });
-	function reset(...fields) {
-		if (fields.length === 0) Object.assign(data, { ...defaults_ });
-		else for (const field of fields) data[field] = defaults_[field];
+	let dataSnapshot = cloneFormValue(initialDefaults);
+	watch(() => cloneFormValue(data), (val) => {
+		for (const key of /* @__PURE__ */ new Set([...Object.keys(dataSnapshot), ...Object.keys(val)])) if (!isEqualFormValue(val[key], dataSnapshot[key])) delete errors[key];
+		dataSnapshot = val;
+	}, { flush: "sync" });
+	const hasChanges = computed(() => Object.keys(defaults_.value).some((key) => !isEqualFormValue(data[key], defaults_.value[key])));
+	function reset(...args) {
+		const { initial, fields } = parseFormResetArgs(args);
+		const source = initial ? initialDefaults : defaults_.value;
+		if (fields.length === 0) Object.assign(data, cloneFormValue(source));
+		else for (const field of fields) data[field] = cloneFormValue(source[field]);
+		dataSnapshot = cloneFormValue(data);
 	}
 	function clearErrors(...fields) {
 		if (fields.length === 0) for (const key of Object.keys(errors)) delete errors[key];
 		else for (const field of fields) delete errors[field];
 	}
+	function setError(field, message) {
+		errors[field] = message;
+	}
 	function clearError() {
 		error.value = null;
 	}
@@ -288,7 +296,10 @@ function useForm(url, defaults, options) {
 			}
 			wasSuccessful.value = true;
 			recentlySuccessful.value = true;
-			defaults_ = { ...data };
+			if (options?.resetOnSuccess) {
+				Object.assign(data, cloneFormValue(initialDefaults));
+				defaults_.value = cloneFormValue(initialDefaults);
+			} else defaults_.value = cloneFormValue(data);
 			successTimeout = setTimeout(() => {
 				recentlySuccessful.value = false;
 			}, 2e3);
@@ -308,6 +319,7 @@ function useForm(url, defaults, options) {
 		wasSuccessful,
 		recentlySuccessful,
 		reset,
+		setError,
 		clearErrors,
 		clearError,
 		post: (opts) => submit("POST", opts),
@@ -323,15 +335,6 @@ function useNavigation() {
 }
 //#endregion
 //#region src/runtime/use-island-form.ts
-async function readActionErrorBody(response) {
-	const contentType = response.headers.get("content-type") || "";
-	try {
-		if (contentType.includes("application/json")) return await response.json();
-		return await response.text() || null;
-	} catch {
-		return null;
-	}
-}
 /**
 * Form composable for island pages. Uses fetch + page reload instead of the
 * Void Router (which is not available in island mode).
@@ -368,16 +371,12 @@ function useIslandForm(defaults) {
 		clearErrors();
 		clearError();
 		try {
-			const response = await fetch(url, {
-				method,
-				headers: { "Content-Type": "application/json" },
-				body: JSON.stringify(data)
-			});
-			if (response.redirected) {
-				window.location.href = response.url;
+			const result = await submitIslandAction(url, method, data);
+			if (result.kind === "redirect") {
+				window.location.href = result.url;
 				return;
 			}
-			if (response.ok) {
+			if (result.kind === "success") {
 				wasSuccessful.value = true;
 				recentlySuccessful.value = true;
 				defaults_ = { ...data };
@@ -385,22 +384,8 @@ function useIslandForm(defaults) {
 					recentlySuccessful.value = false;
 				}, 2e3);
 				window.location.reload();
-			} else {
-				const body = await readActionErrorBody(response);
-				const actionError = new VoidActionError({
-					body,
-					status: response.status,
-					statusText: response.statusText,
-					url
-				});
-				const validationErrors = response.status === 422 ? getValidationErrors(body) : null;
-				if (validationErrors) {
-					Object.assign(errors, validationErrors);
-					return;
-				}
-				if (categorizeActionError(response.status) === "boundary") throw actionError;
-				error.value = actionError;
-			}
+			} else if (result.kind === "validation") Object.assign(errors, result.errors);
+			else error.value = result.error;
 		} finally {
 			pending.value = false;
 		}

package/dist/plugin.mjs

@@ -1,5 +1,5 @@
 import vue from "@vitejs/plugin-vue";
-import { generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, resolveStaticPageDataBuildOptions, scanPages } from "void/pages";
+import { createPagesPlugin, generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, scanPages } from "void/pages";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import nodePath from "node:path";
 import { normalizePath } from "vite";
@@ -89,7 +89,10 @@ function islandsPlugin(pagesDir, options) {
 		},
 		async buildStart() {
 			if (existsSync(pagesDir)) {
-				pageScan = await scanPages(root, { pagesDir });
+				pageScan = await scanPages(root, {
+					pagesDir,
+					environment: isDev ? "dev" : "prod"
+				});
 				const filesToScan = [
 					...pageScan.pages.map((page) => ({
 						filePath: page.componentPath,
@@ -310,8 +313,36 @@ initIslands(islands, hydrateIsland);
 }
 //#endregion
 //#region src/plugin-pages.ts
-const RENDERER_ID = "virtual:void-pages-renderer";
 const CLIENT_ENTRY_ID = "virtual:void-pages-client";
+/** Runtime helper injected into generated SSR and client page bundles. */
+const PATCH_PROPS_RUNTIME = `
+function hasRuntimePropsDeclaration(comp) {
+  const declared = comp.props;
+  if (declared == null) return false;
+  if (Array.isArray(declared)) return declared.length > 0;
+  if (typeof declared === "object") return Object.keys(declared).length > 0;
+  return false;
+}
+
+function patchProps(comp, props) {
+  if (comp.__voidPatched) return;
+  const keys = Object.keys(props);
+  if (hasRuntimePropsDeclaration(comp)) {
+    const declared = comp.props;
+    // defineModel() can declare runtime props even after typed loader props are stripped.
+    const missing = keys.filter((key) =>
+      Array.isArray(declared) ? !declared.includes(key) : !Object.hasOwn(declared, key)
+    );
+    if (missing.length === 0) return;
+    comp.props = Array.isArray(declared)
+      ? [...declared, ...missing]
+      : { ...Object.fromEntries(missing.map((key) => [key, null])), ...declared };
+  } else {
+    comp.props = keys;
+  }
+  comp.__voidPatched = true;
+}
+`;
 function isVuePageFile(id, pagesDir) {
 	if (!id.startsWith(pagesDir + "/")) return false;
 	const rel = id.slice(pagesDir.length + 1);
@@ -357,34 +388,14 @@ function hasNonIslandPages(dir) {
 	return false;
 }
 function pagesPlugin(pagesDir, options) {
-	let pageScan = null;
-	let isDev = false;
-	let viteConfig;
-	const root = options?.root ?? dirname(pagesDir);
 	const normalizedPagesDir = normalizePath(pagesDir);
-	let pendingRescan = null;
-	const rescanPages = async () => {
-		pageScan = existsSync(pagesDir) ? await scanPages(root, { pagesDir }) : null;
-	};
-	const runRescan = () => {
-		pendingRescan ??= rescanPages().finally(() => {
-			pendingRescan = null;
-		});
-		return pendingRescan;
-	};
-	const invalidatePageModules = (server) => {
-		for (const env of Object.values(server.environments)) for (const id of ["\0" + RENDERER_ID, "\0" + CLIENT_ENTRY_ID]) {
-			const mod = env.moduleGraph.getModuleById(id);
-			if (mod) env.moduleGraph.invalidateModule(mod);
-		}
-	};
 	return [{
 		name: "void-vue:pages-transform",
 		enforce: "pre",
 		transform: {
 			filter: { id: /\.vue$/ },
 			handler(code, id) {
-				if (!isVuePageFile(id, pagesDir)) return;
+				if (!isVuePageFile(normalizePath(id), normalizedPagesDir)) return;
 				const transformed = stripDefinePropsTypeArgument(code);
 				if (!transformed) return;
 				return {
@@ -396,7 +407,7 @@ function pagesPlugin(pagesDir, options) {
 		handleHotUpdate: {
 			order: "pre",
 			handler(ctx) {
-				if (!isVuePageFile(ctx.file, pagesDir)) return;
+				if (!isVuePageFile(normalizePath(ctx.file), normalizedPagesDir)) return;
 				const read = ctx.read;
 				ctx.read = async () => {
 					const code = await read();
@@ -404,68 +415,24 @@ function pagesPlugin(pagesDir, options) {
 				};
 			}
 		}
-	}, {
+	}, createPagesPlugin(pagesDir, {
 		name: "void-vue:pages",
-		async buildStart() {
-			await runRescan();
+		root: options?.root,
+		generateRenderer(scan) {
+			return generateRendererModule(scan, pagesDir);
 		},
-		resolveId: {
-			filter: { id: /^virtual:void-pages-(renderer|client)$/ },
-			handler(id) {
-				return "\0" + id;
-			}
+		generateClient(scan, staticPageData) {
+			return generateClientEntry(scan, pagesDir, options?.viewTransitions, options?.prefetch, staticPageData);
 		},
-		load: {
-			filter: { id: /^\0virtual:void-pages-(renderer|client)$/ },
-			async handler(id) {
-				if (isDev && pendingRescan) await pendingRescan;
-				if (!pageScan && existsSync(pagesDir)) await runRescan();
-				if (id === "\0" + RENDERER_ID) {
-					if (!pageScan) return "export function renderPage() { throw new Error('No pages found'); }";
-					return generateRendererModule(pageScan, pagesDir);
-				}
-				if (id === "\0" + CLIENT_ENTRY_ID) {
-					if (!pageScan) return "";
-					return generateClientEntry(pageScan, pagesDir, options?.viewTransitions, options?.prefetch, resolveStaticPageDataBuildOptions(root, { publicDir: viteConfig?.publicDir }));
-				}
-			}
-		},
-		configureServer(server) {
-			const handlePagesChange = async (path, event) => {
-				const normalizedPath = normalizePath(path);
-				if (normalizedPath !== normalizedPagesDir && !normalizedPath.startsWith(normalizedPagesDir + "/")) return;
-				if (event === "change" && !normalizedPath.endsWith(".md")) return;
-				try {
-					await runRescan();
-				} catch (error) {
-					server.config.logger.error(error instanceof Error ? error.message : String(error), {
-						error: error instanceof Error ? error : void 0,
-						timestamp: true
-					});
-					return;
-				}
-				invalidatePageModules(server);
-			};
-			server.watcher.on("add", (path) => handlePagesChange(path, "add"));
-			server.watcher.on("change", (path) => handlePagesChange(path, "change"));
-			server.watcher.on("unlink", (path) => handlePagesChange(path, "unlink"));
-		},
-		configResolved(config) {
-			viteConfig = config;
-		},
-		config(_, env) {
-			if (!existsSync(pagesDir)) return;
-			if (env.command === "serve") {
-				isDev = true;
-				return { optimizeDeps: { include: ["vue"] } };
-			}
+		config({ isDev }) {
+			if (isDev) return { optimizeDeps: { include: ["vue"] } };
 			if (!hasNonIslandPages(pagesDir)) return;
 			return { environments: { client: { build: {
 				manifest: true,
 				rollupOptions: { input: { "pages-client": CLIENT_ENTRY_ID } }
 			} } } };
 		}
-	}];
+	})];
 }
 function generateRendererModule(scan, pagesDir) {
 	return `
@@ -477,11 +444,7 @@ import { serializePageData } from "void/pages-server";
 
 ${generateComponentManifest(scan, pagesDir)}
 
-function patchProps(comp, props) {
-  if (comp.__voidPatched) return;
-  comp.props = Object.keys(props);
-  comp.__voidPatched = true;
-}
+${PATCH_PROPS_RUNTIME}
 
 export async function renderPage(pageObj, assetTags) {
   const PageComponent = (await components[pageObj.component]()).default;
@@ -545,11 +508,7 @@ const currentPageKey = ref(0);
 const routeUrl = ref(window.location.pathname + window.location.search + window.location.hash);
 const navigation = reactive(idleNavigationState());
 
-function patchProps(comp, props) {
-  if (comp.__voidPatched) return;
-  comp.props = Object.keys(props);
-  comp.__voidPatched = true;
-}
+${PATCH_PROPS_RUNTIME}
 
 function replaceRecord(target, source) {
   for (const key of Object.keys(target)) delete target[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/vue",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "Vue pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -41,12 +41,12 @@
     "pathslash": "^0.1.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "void": "1.2.1",
+    "void": "1.4.0",
     "vue": "^3.5.44"
   },
   "peerDependencies": {
     "vite": "^8.0.0",
-    "void": "1.2.1",
+    "void": "1.4.0",
     "vue": "^3.5.0"
   },
   "scripts": {