@jk2908/solas 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.1 - 2026-04-07
+
+- Fixed `useSearchParams()` client builds.
+- Reworked the code generators to keep the source templates readable while still emitting tidy generated files.
+- Added a shared template dedent helper for generated source and tightened nested object and route map indentation.
+- Made generated config output emit logger code only when a logger level is configured.
+
 ## 0.3.0 - 2026-04-07
 
 - Fixed `useSearchParams()` hydration so query-driven ui uses the initial request url on first render.

package/dist/internal/codegen/config.js

@@ -1,19 +1,28 @@
 import { Solas } from '../../solas.js';
-import { AUTOGEN_MSG, toSourceLiteral } from './utils.js';
+import { AUTOGEN_MSG, source, toSourceLiteral } from './utils.js';
 /**
  * Generates the code to create an exported config object
  */
 export function writeConfig(config) {
-    return `
+    const loggerLevel = config.logger?.level;
+    const importLines = [
+        `import type { PluginConfig } from '${Solas.Config.PKG_NAME}'`,
+        loggerLevel ? `import { Logger } from '${Solas.Config.PKG_NAME}/utils/logger'` : '',
+    ]
+        .filter(Boolean)
+        .join('\n');
+    const configStatement = `const config = ${toSourceLiteral(config)} as const satisfies PluginConfig`;
+    const loggerStatement = loggerLevel
+        ? `Logger.defaultLevel = ${toSourceLiteral(loggerLevel)}`
+        : '';
+    return source `
 		${AUTOGEN_MSG}
 
-		import type { PluginConfig } from '${Solas.Config.PKG_NAME}'
-		import { Logger } from '${Solas.Config.PKG_NAME}/utils/logger'
+		${importLines}
 
-		const config = ${toSourceLiteral(config)} as const satisfies PluginConfig
-
-		if (config.logger?.level) Logger.defaultLevel = config.logger.level
+		${configStatement}
+		${loggerStatement}
 
 		export { config }
-	`.trim();
+	`;
 }

package/dist/internal/codegen/environments.js

@@ -1,10 +1,10 @@
 import { Solas } from '../../solas.js';
-import { AUTOGEN_MSG } from './utils.js';
+import { AUTOGEN_MSG, source } from './utils.js';
 /**
  * Generates the RSC entry code
  */
 export function writeRSCEntry() {
-    return `
+    return source `
 		${AUTOGEN_MSG}
 
 		import { createHandler } from '${Solas.Config.PKG_NAME}/env/rsc'
@@ -20,27 +20,27 @@ export function writeRSCEntry() {
 		export default createHandler(config, manifest, importMap, artifactManifest)
 
 		import.meta.hot?.accept()
-	`.trim();
+	`;
 }
 /**
  * Generates the SSR entry code
  */
 export function writeSSREntry() {
-    return `
+    return source `
 		${AUTOGEN_MSG}
 
 		export { prerender, resume, ssr } from '${Solas.Config.PKG_NAME}/env/ssr'
-	`.trim();
+	`;
 }
 /**
  * Generates the browser entry code
  */
 export function writeBrowserEntry() {
-    return `
+    return source `
 		${AUTOGEN_MSG}
 
 		import { browser } from '${Solas.Config.PKG_NAME}/env/browser'
 
 		browser()
-	`.trim();
+	`;
 }

package/dist/internal/codegen/manifest.js

@@ -1,14 +1,14 @@
 import { Solas } from '../../solas.js';
-import { AUTOGEN_MSG, toSourceLiteral } from './utils.js';
+import { AUTOGEN_MSG, source, toSourceLiteral } from './utils.js';
 /**
  * Generates the code to create an exported manifest object
  */
 export function writeManifest(manifest) {
-    return `
+    return source `
 		${AUTOGEN_MSG}
 
 		import type { Manifest } from '${Solas.Config.PKG_NAME}'
 
 		export const manifest = ${toSourceLiteral(manifest)} as const satisfies Manifest
-	`.trim();
+	`;
 }

package/dist/internal/codegen/maps.js

@@ -1,5 +1,5 @@
 import { Solas } from '../../solas.js';
-import { AUTOGEN_MSG, toIdentifier, toIdentifierList, toRelativeModuleSpecifier, toStringLiteral, } from './utils.js';
+import { AUTOGEN_MSG, indent, source, toIdentifier, toIdentifierList, toRelativeModuleSpecifier, toStringLiteral, } from './utils.js';
 /**
  * Generates the import map for all route components, endpoints, layouts, shells, and middlewares
  */
@@ -61,26 +61,22 @@ export function writeMaps(imports, modules) {
             parts.push(`middlewares: [${middleware}]`);
         }
         if (parts.length === 0)
-            return `\t${toStringLiteral(moduleId)}: {}`;
-        return `\t${toStringLiteral(moduleId)}: {\n\t\t${parts.join(',\n\t\t')}\n\t}`;
+            return `${toStringLiteral(moduleId)}: {}`;
+        return `${toStringLiteral(moduleId)}: {\n${parts.map(part => indent(part, 1)).join(',\n')}\n}`;
     });
-    return `
+    const importLines = [...statics, ...dynamics].join('\n');
+    const entries = map.map(entry => indent(entry, 1)).join(',\n');
+    return source `
 		${AUTOGEN_MSG}
 
 		import type { ImportMap } from '${Solas.Config.PKG_NAME}'
-
-		${statics.length
-        ? `${statics.join('\n')}
-
-		`
-        : ''}${dynamics.length
-        ? `${dynamics.join('\n')}
-
-		`
+${importLines
+        ? `
+${importLines}`
         : ''}
 
 		export const importMap = {
-		${map.join(',\n')}
+${entries}
 		} as const satisfies ImportMap
-	`.trim();
+	`;
 }

package/dist/internal/codegen/utils.d.ts

@@ -15,7 +15,17 @@ export declare function toIdentifierList(values: readonly (string | null)[], lab
  * Escape text into a safe string literal for generated source
  */
 export declare function toStringLiteral(value: string, quoteStyle?: "'" | '"'): string;
+/**
+ * Dedent an interpolated template literal while preserving indentation for
+ * multiline substitutions
+ */
+export declare function source(strings: TemplateStringsArray, ...values: Array<string | number | boolean | false | null | undefined>): string;
 /**
  * Emit readable ts source for generated config and manifest data
  */
 export declare function toSourceLiteral(value: unknown, level?: number): string;
+/**
+ * Indent each line of a block of source code by the specified level for embedding in
+ * generated output
+ */
+export declare function indent(value: string, level?: number): string;

package/dist/internal/codegen/utils.js

@@ -60,6 +60,31 @@ export function toStringLiteral(value, quoteStyle = "'") {
         .replace(/\r/g, '\\r')
         .replace(/\t/g, '\\t')}${quoteStyle}`;
 }
+/**
+ * Dedent an interpolated template literal while preserving indentation for
+ * multiline substitutions
+ */
+export function source(strings, ...values) {
+    let text = strings[0] ?? '';
+    for (let index = 0; index < values.length; index += 1) {
+        const value = values[index];
+        const indentation = text.match(/(?:^|\n)([ \t]*)$/)?.[1] ?? '';
+        const chunk = value === false || value == null ? '' : String(value);
+        text += chunk.replace(/\n/g, `\n${indentation}`);
+        text += strings[index + 1] ?? '';
+    }
+    const lines = text.replace(/^\n+|\n+$/g, '').split('\n');
+    const margin = lines
+        .filter(line => line.trim().length > 0)
+        .reduce((smallest, line) => {
+        const indentation = line.match(/^[ \t]*/)?.[0].length ?? 0;
+        return Math.min(smallest, indentation);
+    }, Number.POSITIVE_INFINITY);
+    if (!Number.isFinite(margin) || margin === 0) {
+        return lines.join('\n');
+    }
+    return lines.map(line => line.slice(margin)).join('\n');
+}
 /**
  * Convert a string into a valid unquoted property key if possible, otherwise quote it
  * as a string literal for generated source
@@ -120,7 +145,7 @@ export function toSourceLiteral(value, level = 0) {
                     }
                     return `${prefix}${source.replace(/\n/g, `\n${INDENT.repeat(level + 1)}`)}`;
                 }
-                return `${prefix}${toSourceLiteral(entryValue, level + 1).replace(/\n/g, `\n${INDENT.repeat(level + 1)}`)}`;
+                return `${prefix}${toSourceLiteral(entryValue, level + 1)}`;
             })
                 .join(',\n'),
             `${INDENT.repeat(level)}}`,
@@ -132,7 +157,7 @@ export function toSourceLiteral(value, level = 0) {
  * Indent each line of a block of source code by the specified level for embedding in
  * generated output
  */
-function indent(value, level = 1) {
+export function indent(value, level = 1) {
     const prefix = INDENT.repeat(level);
     return value
         .split('\n')

package/dist/internal/navigation/use-search-params.d.ts

@@ -1 +1,11 @@
-export declare function useSearchParams(): URLSearchParams;
+export type ReadonlySearchParams = Iterable<[string, string]> & {
+    entries(): IterableIterator<[string, string]>;
+    forEach(callbackfn: (value: string, key: string, parent: ReadonlySearchParams) => void, thisArg?: unknown): void;
+    get(name: string): string | null;
+    getAll(name: string): string[];
+    has(name: string, value?: string): boolean;
+    keys(): IterableIterator<string>;
+    toString(): string;
+    values(): IterableIterator<string>;
+};
+export declare function useSearchParams(): ReadonlySearchParams;

package/dist/internal/navigation/use-search-params.js

@@ -1,6 +1,25 @@
 import { useMemo, useSyncExternalStore } from 'react';
-import { useRouter } from '../../router.js';
 import { Solas } from '../../solas.js';
+import { useRouter } from '../router/use-router.js';
+function createReadonlySearchParams(search) {
+    const params = new URLSearchParams(search);
+    const readonlyParams = {
+        [Symbol.iterator]: () => params[Symbol.iterator](),
+        entries: () => params.entries(),
+        forEach: (callbackfn, thisArg) => {
+            params.forEach((value, key) => {
+                callbackfn.call(thisArg, value, key, readonlyParams);
+            });
+        },
+        get: name => params.get(name),
+        getAll: name => params.getAll(name),
+        has: (name, value) => params.has(name, value),
+        keys: () => params.keys(),
+        toString: () => params.toString(),
+        values: () => params.values(),
+    };
+    return readonlyParams;
+}
 export function useSearchParams() {
     const { url } = useRouter();
     const search = useSyncExternalStore(fn => {
@@ -11,5 +30,5 @@ export function useSearchParams() {
             window.removeEventListener(Solas.Events.names.NAVIGATION, fn);
         };
     }, () => window.location.search, () => url?.search);
-    return useMemo(() => new URLSearchParams(search), [search]);
+    return useMemo(() => createReadonlySearchParams(search), [search]);
 }

package/dist/navigation.d.ts

@@ -1,6 +1,6 @@
-export { HttpException, abort, isHttpException, } from './internal/navigation/http-exception.js';
 export { HttpExceptionBoundary } from './internal/navigation/http-exception-boundary.js';
+export { HttpException, abort, isHttpException, } from './internal/navigation/http-exception.js';
 export { Link } from './internal/navigation/link.js';
-export { Redirect, isRedirect, redirect } from './internal/navigation/redirect.js';
 export { RedirectBoundary } from './internal/navigation/redirect-boundary.js';
+export { Redirect, isRedirect, redirect } from './internal/navigation/redirect.js';
 export { useSearchParams } from './internal/navigation/use-search-params.js';

package/dist/navigation.js

@@ -1,6 +1,6 @@
-export { HttpException, abort, isHttpException, } from './internal/navigation/http-exception.js';
 export { HttpExceptionBoundary } from './internal/navigation/http-exception-boundary.js';
+export { HttpException, abort, isHttpException, } from './internal/navigation/http-exception.js';
 export { Link } from './internal/navigation/link.js';
-export { Redirect, isRedirect, redirect } from './internal/navigation/redirect.js';
 export { RedirectBoundary } from './internal/navigation/redirect-boundary.js';
+export { Redirect, isRedirect, redirect } from './internal/navigation/redirect.js';
 export { useSearchParams } from './internal/navigation/use-search-params.js';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jk2908/solas",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"description": "A React Server Components meta-framework powered by Vite",
 	"keywords": [
 		"framework",