@qwik.dev/router 2.0.0-beta.43 → 2.0.0-beta.47

package/lib/ssg/index.mjs

@@ -1,20 +1,9 @@
 import { n as getPathnameForDynamicRoute, t as ensureSlash } from "../chunks/pathname.mjs";
+import { n as isStaticTrieKey, r as unescapeStaticTrieKey } from "../chunks/route-trie-key.mjs";
 import { r as msToString } from "../chunks/format.mjs";
 import { t as createRouteTester } from "../chunks/routes.mjs";
 import { relative } from "node:path";
 import { bold, dim, green, magenta, red } from "kleur/colors";
-function validateOptions(opts) {
-	if (!opts.qwikRouterConfig) throw new Error(`Missing "qwikRouterConfig" option`);
-	let siteOrigin = opts.origin;
-	if (typeof siteOrigin !== "string" || siteOrigin.trim().length === 0) throw new Error(`Missing "origin" option`);
-	siteOrigin = siteOrigin.trim();
-	if (!/:\/\//.test(siteOrigin) || siteOrigin.startsWith("://")) throw new Error(`"origin" must start with a valid protocol, such as "https://" or "http://", received "${siteOrigin}"`);
-	try {
-		new URL(siteOrigin);
-	} catch (e) {
-		throw new Error(`Invalid "origin"`, { cause: e });
-	}
-}
 async function mainThread(sys) {
 	const opts = sys.getOptions();
 	validateOptions(opts);
@@ -136,7 +125,8 @@ async function mainThread(sys) {
 			* Traverse the route tree and call the callback for each route that has module loaders.
 			* Reconstructs the original pathname and param names from the tree path. Accumulates _L
 			* layout loaders from ancestors during traversal.
-			*/ const traverseRouteTree = async (node, pathParts, basePathname, ancestorLoaders) => {
+			*/
+			const traverseRouteTree = async (node, pathParts, basePathname, ancestorLoaders) => {
 				const currentLoaders = node._L ? [...ancestorLoaders, node._L] : ancestorLoaders;
 				const index = node._I;
 				if (index) {
@@ -182,8 +172,8 @@ async function mainThread(sys) {
 					await traverseRouteTree(childNode, [...pathParts, pathPart], basePathname, currentLoaders);
 				}
 				for (const [key, child] of Object.entries(node)) {
-					if (key.charCodeAt(0) === 95) continue;
-					await traverseRouteTree(child, [...pathParts, key], basePathname, currentLoaders);
+					if (!isStaticTrieKey(key)) continue;
+					await traverseRouteTree(child, [...pathParts, unescapeStaticTrieKey(key)], basePathname, currentLoaders);
 				}
 			};
 			const loadStaticRoutes = async () => {
@@ -203,12 +193,25 @@ async function mainThread(sys) {
 		}
 	});
 }
+function validateOptions(opts) {
+	if (!opts.qwikRouterConfig) throw new Error(`Missing "qwikRouterConfig" option`);
+	let siteOrigin = opts.origin;
+	if (typeof siteOrigin !== "string" || siteOrigin.trim().length === 0) throw new Error(`Missing "origin" option`);
+	siteOrigin = siteOrigin.trim();
+	if (!/:\/\//.test(siteOrigin) || siteOrigin.startsWith("://")) throw new Error(`"origin" must start with a valid protocol, such as "https://" or "http://", received "${siteOrigin}"`);
+	try {
+		new URL(siteOrigin);
+	} catch (e) {
+		throw new Error(`Invalid "origin"`, { cause: e });
+	}
+}
 /**
 * Use this function when SSG should be generated from another module, such as a Vite plugin. This
 * function's should be passed the paths of the entry module and Qwik Router Plan.
 *
 * @public
-*/ async function generate(opts) {
+*/
+async function generate(opts) {
 	const { createSystem } = await import("../chunks/system.mjs");
 	return mainThread(await createSystem(opts));
 }
@@ -219,7 +222,8 @@ async function mainThread(sys) {
 * Intended to be called from a generated `run-ssg.js` wrapper that provides render/config.
 *
 * @public
-*/ async function runSsg(opts) {
+*/
+async function runSsg(opts) {
 	try {
 		const result = await generate(opts);
 		const fs = await import("node:fs");
@@ -243,7 +247,8 @@ async function mainThread(sys) {
 * @param opts - Must include `render` and `qwikRouterConfig` (imported by the worker entry). The
 *   remaining serializable options come from `workerData`.
 * @public
-*/ async function startWorker(opts) {
+*/
+async function startWorker(opts) {
 	const { workerData } = await import("node:worker_threads");
 	const mergedOpts = {
 		...workerData,

package/lib/vite/index.d.ts

@@ -1,4 +1,4 @@
-import type { BuiltinsWithOptionalParams } from 'svgo/plugins/plugins-types';
+import type { BuiltinsWithOptionalParams } from 'svgo';
 import type { CompileOptions } from '@mdx-js/mdx';
 import type { Config } from 'svgo';
 import { ConfigEnv } from 'vite';