@void/svelte 0.26.0 → 0.26.1

package/README.md

@@ -1,10 +1,12 @@
 # @void/svelte
 
-Build server-rendered Void pages with Svelte 5, server loaders, and typed forms.
+Svelte adapter for [Void](https://void.cloud). Build server-rendered pages with typed server loaders, forms, layouts, and interactive islands.
+
+Requires Svelte 5.
 
 ## Setup
 
-Install alongside `void`:
+For a new app, run `npx void init` and choose Svelte. To add the adapter to an existing Void app:
 
 ```sh
 npm install @void/svelte
@@ -13,15 +15,17 @@ npm install @void/svelte
 Add the adapter to your Vite config. It includes the framework's Vite plugin:
 
 ```ts
+import { voidSvelte } from '@void/svelte/plugin';
 import { defineConfig } from 'vite';
 import { voidPlugin } from 'void';
-import { voidSvelte } from '@void/svelte/plugin';
 
 export default defineConfig({
   plugins: [voidPlugin(), voidSvelte()],
 });
 ```
 
-Follow [Pages Routing](https://void.cloud/guide/pages-routing/overview) to add pages, then use [loaders](https://void.cloud/guide/pages-routing/loaders), [forms](https://void.cloud/guide/pages-routing/actions-and-forms), and [layouts](https://void.cloud/guide/pages-routing/layouts).
+## Documentation
+
+Follow [Pages Routing](https://void.cloud/guide/pages-routing/overview) to add pages, then use [loaders](https://void.cloud/guide/pages-routing/loaders), [forms](https://void.cloud/guide/pages-routing/actions-and-forms), and [layouts](https://void.cloud/guide/pages-routing/layouts). See the [adapter API reference](https://void.cloud/reference/api/pages) for plugin options and runtime helpers.
 
-See the [adapter API reference](https://void.cloud/reference/api/pages) for plugin options and runtime helpers, and [TESTING.md](../../TESTING.md) for repository verification.
+Read the [Void documentation](https://void.cloud) online or use the Markdown guides and references in `node_modules/void/docs/`, included with the `void` package.

package/dist/plugin.d.mts

@@ -1,10 +1,12 @@
 import { svelte } from "@sveltejs/vite-plugin-svelte";
 import { Plugin } from "vite";
-//#region src/plugin.d.ts
+//#region src/plugin-pages.d.ts
 type PrefetchConfig = {
   hoverDelay?: number;
   cacheFor?: number | string | [string, string];
 };
+//#endregion
+//#region src/plugin.d.ts
 export type VoidSvelteOptions = Readonly<{
   svelte?: Parameters<typeof svelte>[0];
   viewTransitions?: boolean;

package/dist/plugin.mjs

@@ -63,9 +63,23 @@ function islandsPlugin(pagesDir, options) {
 	let isDev = false;
 	let viteRoot = "";
 	let resolvedConfig = null;
-	function computePagesNeedingClientJS$1() {
-		if (!pageScan) return /* @__PURE__ */ new Set();
-		return computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig);
+	/** Resolve an island import and record it in the client manifest. */
+	function registerIsland(spec, importerDir, hydrate) {
+		const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
+		if (!absPath) return {
+			absPath,
+			islandId: spec
+		};
+		const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
+		islandManifest.set(islandId, {
+			componentPath: absPath,
+			islandId,
+			hydrate
+		});
+		return {
+			absPath,
+			islandId
+		};
 	}
 	return [{
 		name: "void-svelte:islands",
@@ -102,19 +116,7 @@ function islandsPlugin(pagesDir, options) {
 					const filePath = resolve(pagesDir, entry.filePath);
 					const code = readFileSync(filePath, "utf-8");
 					const importerDir = dirname(filePath);
-					for (const islandImport of findIslandImports(code, filePath)) {
-						const spec = islandImport.specifier;
-						const strategy = islandImport.hydrate;
-						const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
-						if (absPath) {
-							const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
-							islandManifest.set(islandId, {
-								componentPath: absPath,
-								islandId,
-								hydrate: strategy
-							});
-						}
-					}
+					for (const islandImport of findIslandImports(code, filePath)) registerIsland(islandImport.specifier, importerDir, islandImport.hydrate);
 				}
 				for (const page of pageScan.pages) {
 					if (!page.island) continue;
@@ -146,7 +148,7 @@ function islandsPlugin(pagesDir, options) {
 					if (!pageScan) return "export function renderIslandPage() { throw new Error('No pages found'); }";
 					const mdPlugin = resolvedConfig?.plugins?.find((plugin) => plugin.name === "void-md");
 					const mdScriptIds = new Set(mdPlugin?.api?.getClientScripts?.()?.keys() ?? []);
-					const needsJS = computePagesNeedingClientJS$1();
+					const needsJS = computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig);
 					return generateIslandRenderer(pageScan, pagesDir, mdScriptIds, needsJS);
 				}
 				if (id === "\0" + ISLANDS_CLIENT_ENTRY_ID) {
@@ -170,16 +172,7 @@ function islandsPlugin(pagesDir, options) {
 					const name = islandImport.importName;
 					const spec = islandImport.specifier;
 					const strategy = islandImport.hydrate;
-					const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
-					if (absPath) {
-						const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
-						islandManifest.set(islandId, {
-							componentPath: absPath,
-							islandId,
-							hydrate: strategy
-						});
-					}
-					const islandId = absPath ? normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "") : spec;
+					const { absPath, islandId } = registerIsland(spec, importerDir, strategy);
 					const wrapperUrl = WRAPPER_PREFIX + encodeURIComponent(islandId) + ".svelte?src=" + encodeURIComponent(absPath || spec) + "&island=" + encodeURIComponent(islandId) + "&hydrate=" + encodeURIComponent(strategy);
 					const replacement = `import ${name} from ${JSON.stringify(wrapperUrl)}`;
 					edits.push({
@@ -201,6 +194,7 @@ function islandsPlugin(pagesDir, options) {
 		}
 	}, {
 		name: "void-svelte:islands-style",
+		apply: "build",
 		resolveId: {
 			filter: { id: /\?island-style&/ },
 			handler(source) {
@@ -399,7 +393,7 @@ function pagesPlugin(pagesDir, options) {
 				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, isDev);
+					return generateRendererModule(pageScan, pagesDir);
 				}
 				if (id === "\0" + CLIENT_ENTRY_ID) {
 					if (!pageScan) return "";
@@ -439,7 +433,7 @@ function pagesPlugin(pagesDir, options) {
 		}
 	};
 }
-function generateRendererModule(scan, pagesDir, _isDev) {
+function generateRendererModule(scan, pagesDir) {
 	return `
 import { render } from "svelte/server";
 import App from "@void/svelte/App.svelte";

package/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@void/svelte",
-  "version": "0.26.0",
+  "version": "0.26.1",
+  "description": "Svelte pages, server rendering, forms, and navigation for Void.",
+  "homepage": "https://void.cloud",
+  "bugs": {
+    "url": "https://github.com/voidzero-dev/void/issues"
+  },
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -34,15 +40,15 @@
   "devDependencies": {
     "@types/node": "^26.6.4",
     "pathslash": "^0.1.0",
-    "svelte": "^5.57.1",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.0.0",
-    "vite-plus": "1.0.0",
-    "void": "0.26.0"
+    "svelte": "^5.57.2",
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
+    "vite-plus": "1.1.0",
+    "void": "0.26.1"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",
     "vite": "^8.0.0",
-    "void": "0.26.0"
+    "void": "0.26.1"
   },
   "scripts": {
     "build": "vp pack",

package/src/runtime/Link.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { getContext, onDestroy, onMount, type Snippet } from "svelte";
-  import type { VoidRouter } from "void/pages-client";
+  import { isModifiedEvent, mergeDataIntoHref, type VoidRouter } from "void/pages-client";
 
   type PrefetchStrategy = "hover" | "click" | "mount" | "visible";
   type LinkMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
@@ -57,72 +57,10 @@
 
   const router = getContext<VoidRouter>("__void_router");
 
-  function appendQueryValue(params: URLSearchParams, key: string, value: unknown): boolean {
-    if (value === null || value === undefined) {
-      return false;
-    }
-    if (value instanceof Date) {
-      params.append(key, value.toISOString());
-      return true;
-    }
-    if (Array.isArray(value)) {
-      let appended = false;
-      for (const item of value) {
-        appended = appendQueryValue(params, key, item) || appended;
-      }
-      return appended;
-    }
-    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-      params.append(key, String(value));
-      return true;
-    }
-    throw new Error(
-      `Link: GET data only supports primitive values and arrays. Remove nested data for '${key}'.`,
-    );
-  }
-
-  function mergeDataIntoHref(hrefValue: string, dataValue?: Record<string, unknown>): string {
-    if (!dataValue) {
-      return hrefValue;
-    }
-
-    const hashIndex = hrefValue.indexOf("#");
-    const beforeHash = hashIndex === -1 ? hrefValue : hrefValue.slice(0, hashIndex);
-    const hash = hashIndex === -1 ? "" : hrefValue.slice(hashIndex);
-    const searchIndex = beforeHash.indexOf("?");
-    const path = searchIndex === -1 ? beforeHash : beforeHash.slice(0, searchIndex);
-    const search = searchIndex === -1 ? "" : beforeHash.slice(searchIndex + 1);
-    const params = new URLSearchParams(search);
-    let appended = false;
-
-    for (const [key, value] of Object.entries(dataValue)) {
-      appended = appendQueryValue(params, key, value) || appended;
-    }
-
-    if (!appended) {
-      return hrefValue;
-    }
-
-    const query = params.toString();
-    return `${path}${query ? `?${query}` : ""}${hash}`;
-  }
-
   function hasPrefetch(prefetch: boolean | PrefetchStrategy | Array<PrefetchStrategy>): boolean {
     return prefetch !== false;
   }
 
-  function isModifiedEvent(e: MouseEvent): boolean {
-    const target = (e.currentTarget as HTMLElement).getAttribute("target");
-    return (
-      (target !== null && target !== "_self") ||
-      e.ctrlKey ||
-      e.metaKey ||
-      e.shiftKey ||
-      e.altKey ||
-      e.button !== 0
-    );
-  }
-
   function getStrategies(): Array<PrefetchStrategy> {
     if (hasPrefetch(prefetchProp) && !isGet) {
       throw new Error(

package/src/runtime/use-form.svelte.ts

@@ -1,6 +1,8 @@
 import { getContext } from 'svelte';
 import {
   VoidActionError,
+  getValidationErrors,
+  interpolateRouteParams,
   isAbortError,
   isEqualFormValue,
   submitAction,
@@ -29,21 +31,6 @@ type UntypedForm = {
   clearError(): void;
 };
 
-function getValidationErrors(error: VoidActionError): Record<string, string> | null {
-  const body = error.body;
-  if (
-    body &&
-    typeof body === 'object' &&
-    'errors' in body &&
-    body.errors &&
-    typeof body.errors === 'object' &&
-    !Array.isArray(body.errors)
-  ) {
-    return body.errors as Record<string, string>;
-  }
-  return null;
-}
-
 // Typed overload — full inference from PageActionMap (requires codegen)
 export function useForm<U extends ActionUrl & string>(
   url: U,
@@ -71,24 +58,6 @@ export function useForm(
   defaults: Record<string, unknown>,
   options?: { params?: Record<string, string> },
 ): UntypedForm {
-  let resolvedUrl = url;
-
-  // Strip ?action query before param resolution, then re-append
-  let actionQuery = '';
-  const qIdx = resolvedUrl.indexOf('?');
-  if (qIdx !== -1) {
-    actionQuery = resolvedUrl.slice(qIdx);
-    resolvedUrl = resolvedUrl.slice(0, qIdx);
-  }
-
-  if (options?.params) {
-    for (const [key, value] of Object.entries(options.params)) {
-      resolvedUrl = resolvedUrl.replace(`:${key}`, encodeURIComponent(value));
-    }
-  }
-
-  resolvedUrl = resolvedUrl + actionQuery;
-
   const router = getContext<VoidRouter>('__void_router');
 
   let data = $state({ ...defaults });
@@ -140,14 +109,16 @@ export function useForm(
     clearError();
 
     try {
-      const result = await submitAction(router, resolvedUrl, {
+      // Params are filled in on submit, so a param that would change the
+      // request path (such as "..") fails this submit, not the page render.
+      const result = await submitAction(router, interpolateRouteParams(url, options?.params), {
         method,
         data: { ...data },
         ...opts,
       });
 
       if (!result.ok) {
-        const validationErrors = getValidationErrors(result.error);
+        const validationErrors = getValidationErrors(result.error.body);
         if (validationErrors) {
           Object.assign(errors, validationErrors);
         } else {

package/src/runtime/use-island-form.svelte.ts

@@ -1,4 +1,9 @@
-import { VoidActionError, categorizeActionError, isEqualFormValue } from 'void/pages-client';
+import {
+  VoidActionError,
+  categorizeActionError,
+  getValidationErrors,
+  isEqualFormValue,
+} from 'void/pages-client';
 
 type UntypedIslandForm = {
   readonly data: Record<string, unknown>;
@@ -18,20 +23,6 @@ type UntypedIslandForm = {
   clearError(): void;
 };
 
-function getValidationErrors(body: unknown): Record<string, string> | null {
-  if (
-    body &&
-    typeof body === 'object' &&
-    'errors' in body &&
-    body.errors &&
-    typeof body.errors === 'object' &&
-    !Array.isArray(body.errors)
-  ) {
-    return body.errors as Record<string, string>;
-  }
-  return null;
-}
-
 async function readActionErrorBody(response: Response): Promise<unknown> {
   const contentType = response.headers.get('content-type') || '';
   try {
@@ -118,7 +109,7 @@ export function useIslandForm(defaults: Record<string, unknown>): UntypedIslandF
           recentlySuccessful = false;
         }, 2000);
         window.location.reload();
-      } else if (!response.ok) {
+      } else {
         const body = await readActionErrorBody(response);
         const actionError = new VoidActionError({
           body,