@jk2908/solas 0.3.0 → 0.3.2

package/dist/internal/server/dynamic.d.ts

@@ -3,7 +3,5 @@
  * @description in prerender mode this suspends forever so the nearest Suspense
  * boundary renders its fallback into the static shell. In request mode this
  * resolves immediately
- * @returns void during normal requests or prerender not in ppr mode
- * @throws if called in prerender mode (the desired effect)
  */
-export declare function dynamic(): void;
+export declare function dynamic(): Promise<void>;

package/dist/internal/server/dynamic.js

@@ -1,22 +1,14 @@
-import { Logger } from '../../utils/logger.js';
 import { RequestContext } from '../env/request-context.js';
-const logger = new Logger();
 const NEVER = new Promise(() => { });
 /**
  * Declaratively mark render below this call as request-time only
  * @description in prerender mode this suspends forever so the nearest Suspense
  * boundary renders its fallback into the static shell. In request mode this
  * resolves immediately
- * @returns void during normal requests or prerender not in ppr mode
- * @throws if called in prerender mode (the desired effect)
  */
-export function dynamic() {
+export async function dynamic() {
     const { prerender } = RequestContext.use();
-    if (!prerender)
+    if (prerender !== 'ppr')
         return;
-    if (prerender !== 'ppr') {
-        logger.warn('[dynamic]', "dynamic() was called but prerender mode is not 'ppr'. This means the component will be rendered at build time, which may not be what you intended");
-        return;
-    }
-    throw NEVER;
+    await NEVER;
 }

package/dist/internal/server/headers.d.ts

@@ -1,5 +1,5 @@
 /**
  * Get the request headers as a read-only map
- * @returns a read-only map of request headers
+ * @returns a Promise resolving to a read-only map of request headers
  */
-export declare function headers(): ReadonlyMap<string, string>;
+export declare function headers(): Promise<ReadonlyMap<string, string>>;

package/dist/internal/server/headers.js

@@ -2,10 +2,10 @@ import { RequestContext } from '../env/request-context.js';
 import { dynamic } from './dynamic.js';
 /**
  * Get the request headers as a read-only map
- * @returns a read-only map of request headers
+ * @returns a Promise resolving to a read-only map of request headers
  */
-export function headers() {
-    dynamic();
+export async function headers() {
+    await dynamic();
     const { req, cache } = RequestContext.use();
     // use request cache if possible to avoid reconstructing the map
     if (cache.headers)

package/dist/internal/server/url.d.ts

@@ -1,5 +1,5 @@
 /**
  * Get the request url as a URL instance
- * @returns a URL instance containing the request url
+ * @returns a Promise resolving to a URL instance containing the request url
  */
-export declare function url(): URL;
+export declare function url(): Promise<URL>;

package/dist/internal/server/url.js

@@ -4,10 +4,10 @@ import { dynamic } from './dynamic.js';
 const logger = new Logger();
 /**
  * Get the request url as a URL instance
- * @returns a URL instance containing the request url
+ * @returns a Promise resolving to a URL instance containing the request url
  */
-export function url() {
-    dynamic();
+export async function url() {
+    await dynamic();
     const { req, cache } = RequestContext.use();
     // always return a clone so consumers can mutate (e.g. searchParams.set)
     // without corrupting the cached instance shared across the request

package/dist/navigation.d.ts

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

package/dist/navigation.js

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

package/dist/router.d.ts

@@ -1,4 +1,3 @@
-export { createRouter } from './internal/router/create-router.js';
-export { Router } from './internal/router/router.js';
-export { RouterProvider } from './internal/router/router-provider.js';
-export { useRouter } from './internal/router/use-router.js';
+export { Link } from './internal/browser-router/link.js';
+export { useRouter } from './internal/browser-router/use-router.js';
+export { useSearchParams } from './internal/browser-router/use-search-params.js';

package/dist/router.js

@@ -1,4 +1,3 @@
-export { createRouter } from './internal/router/create-router.js';
-export { Router } from './internal/router/router.js';
-export { RouterProvider } from './internal/router/router-provider.js';
-export { useRouter } from './internal/router/use-router.js';
+export { Link } from './internal/browser-router/link.js';
+export { useRouter } from './internal/browser-router/use-router.js';
+export { useSearchParams } from './internal/browser-router/use-search-params.js';

package/dist/solas.d.ts

@@ -1,5 +1,7 @@
 import type { PluginConfig } from './types.js';
 export declare namespace Solas {
+    interface Routes {
+    }
     namespace Config {
         const NAME = "Solas";
         const SLUG: string;
@@ -12,7 +14,7 @@ export declare namespace Solas {
         const ENTRY_BROWSER = "entry.browser.tsx";
         const ASSETS_DIR = "assets";
         const $: unique symbol;
-        const REQUEST_META: string;
+        const REQUEST_META_KEY: string;
         const LOG_LEVELS: readonly ["debug", "info", "warn", "error", "fatal"];
         const PRERENDER_MODES: readonly ["full", "ppr", false];
         const TRAILING_SLASH_MODES: readonly ["always", "never", "ignore"];

package/dist/solas.js

@@ -14,7 +14,7 @@ var Solas;
         Config.ENTRY_BROWSER = 'entry.browser.tsx';
         Config.ASSETS_DIR = 'assets';
         Config.$ = Symbol(Config.SLUG);
-        Config.REQUEST_META = `__${Config.SLUG.toUpperCase()}__`;
+        Config.REQUEST_META_KEY = `__${Config.SLUG.toUpperCase()}__`;
         Config.LOG_LEVELS = ['debug', 'info', 'warn', 'error', 'fatal'];
         Config.PRERENDER_MODES = ['full', 'ppr', false];
         Config.TRAILING_SLASH_MODES = ['always', 'never', 'ignore'];

package/dist/types.d.ts

@@ -1,19 +1,20 @@
 type BunRequest = Request & {
     params?: Record<string, string | string[]>;
 };
-import { Solas } from './solas.js';
 import { ExportReader } from './utils/export-reader.js';
 import type { Build } from './internal/build.js';
+import type { HttpRouter } from './internal/http-router/router.js';
 import type { Metadata } from './internal/metadata.js';
 import type { HttpException } from './internal/navigation/http-exception.js';
-import type { Router } from './internal/router/router.js';
+import { BrowserRouter } from './internal/browser-router/router.js';
+import { Solas } from './solas.js';
 export type LogLevel = (typeof Solas.Config.LOG_LEVELS)[number];
 type PluginConfigBase = {
     port?: number;
     precompress?: boolean;
     prerender?: Route.Prerender;
     metadata?: Metadata.Item;
-    trailingSlash?: Route.TrailingSlash;
+    trailingSlash?: (typeof Solas.Config.TRAILING_SLASH_MODES)[number];
     readonly logger?: {
         level?: LogLevel;
     };
@@ -36,6 +37,13 @@ export type BuildContext = {
     knownRoutes: Set<string>;
     exportReader: ExportReader;
 };
+export type RequestMeta = {
+    error?: HttpException | Error;
+    action?: boolean;
+    match: HttpRouter.Match | null;
+    parsedFormData?: FormData | null;
+    url?: URL;
+};
 export type SolasRequest = Request & {};
 export type Segment = {
     __id: string;
@@ -68,6 +76,7 @@ export type Endpoint = {
     middlewares: (string | null)[];
 };
 export type ManifestEntry = Segment | Endpoint;
+export type ManifestEntryGroup = ManifestEntry | [ManifestEntry, ...ManifestEntry[]];
 export type Manifest = Awaited<ReturnType<typeof Build.Finder.prototype.process>>['manifest'];
 export type View<TProps> = React.ComponentType<TProps> | React.LazyExoticComponent<React.ComponentType<TProps>>;
 export type StaticImport = Record<string, unknown>;
@@ -81,7 +90,7 @@ export type MapEntry = {
     '404s'?: readonly (DynamicImport | null)[];
     '500s'?: readonly (DynamicImport | null)[];
     loaders?: readonly (DynamicImport | null)[];
-    middlewares?: readonly (Router.Middleware | null)[];
+    middlewares?: readonly (HttpRouter.Middleware | null)[];
     endpoint?: (req?: BunRequest) => unknown;
 };
 export type ImportMap = Record<string, MapEntry>;
@@ -92,13 +101,12 @@ export type BuildManifest = {
     prerenderRoutes: string[];
     sitemapRoutes: string[];
     precompress: boolean;
-    trailingSlash: Route.TrailingSlash;
+    trailingSlash: (typeof Solas.Config.TRAILING_SLASH_MODES)[number];
     url?: PluginConfig['url'];
 };
 export declare namespace Route {
-    type Metadata = Metadata.Item | ((input: Metadata.Input<Router.Params>) => Promise<Metadata.Item> | Metadata.Item);
+    type Metadata = Metadata.Item | ((input: Metadata.Input<BrowserRouter.Params>) => Promise<Metadata.Item> | Metadata.Item);
     type Prerender = (typeof Solas.Config.PRERENDER_MODES)[number];
-    type TrailingSlash = (typeof Solas.Config.TRAILING_SLASH_MODES)[number];
 }
 export type BoundaryError = Error & {
     digest?: string;

package/dist/utils/logger.js

@@ -1,5 +1,5 @@
-import { Solas } from '../solas.js';
 import { HttpException } from '../internal/navigation/http-exception.js';
+import { Solas } from '../solas.js';
 const LEVELS = {
     debug: 0,
     info: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jk2908/solas",
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"description": "A React Server Components meta-framework powered by Vite",
 	"keywords": [
 		"framework",
@@ -71,10 +71,6 @@
 		"./error-boundary": {
 			"types": "./dist/error-boundary.d.ts",
 			"import": "./dist/error-boundary.js"
-		},
-		"./solas": {
-			"types": "./dist/solas.d.ts",
-			"import": "./dist/solas.js"
 		}
 	},
 	"scripts": {
@@ -89,8 +85,7 @@
 	},
 	"dependencies": {
 		"@vitejs/plugin-rsc": "^0.5.20",
-		"path-to-regexp": "^8.3.0",
-		"rsc-html-stream": "^0.0.7"
+		"path-to-regexp": "^8.3.0"
 	},
 	"devDependencies": {
 		"@prettier/plugin-oxc": "^0.1.3",

package/dist/internal/navigation/link.d.ts

@@ -1,13 +0,0 @@
-type Props = {
-    href: string;
-    prefetch?: 'intent' | 'hover' | 'none';
-} & React.ComponentPropsWithRef<'a'>;
-/**
- * A link component that navigates to a given href
- * @param href - the href to navigate to
- * @param prefetch - when to prefetch the linked page, defaults to 'none'
- * @param rest - other props to pass to the underlying anchor element
- * @returns a link element that navigates to the given href
- */
-export declare function Link({ children, href, prefetch, ...rest }: Props): import("react/jsx-runtime").JSX.Element;
-export {};

package/dist/internal/router/create-router.d.ts

@@ -1,6 +0,0 @@
-import type { ImportMap, Manifest, PluginConfig, SolasRequest } from '../../types.js';
-import { Router } from './router.js';
-/**
- * Create the application router from the generated manifest and import map
- */
-export declare function createRouter(config: Pick<PluginConfig, 'precompress' | 'trailingSlash'>, manifest: Manifest, importMap: ImportMap, rsc: (req: SolasRequest) => Response | Promise<Response>): Router;

package/dist/internal/router/router-context.d.ts

@@ -1,15 +0,0 @@
-export declare namespace Navigation {
-    type GoOptions = {
-        replace?: boolean;
-        query?: Record<string, string | number | boolean>;
-    };
-}
-export declare const RouterContext: import("react").Context<{
-    go: (to: string, opts?: Navigation.GoOptions | undefined) => Promise<string>;
-    prefetch: (path: string) => void;
-    isNavigating: boolean;
-    url: {
-        pathname?: string | undefined;
-        search?: string | undefined;
-    };
-}>;

package/dist/internal/router/router-context.js

@@ -1,8 +0,0 @@
-'use client';
-import { createContext } from 'react';
-export const RouterContext = createContext({
-    go: async () => '',
-    prefetch: () => { },
-    isNavigating: false,
-    url: {},
-});

package/dist/internal/router/router-provider.d.ts

@@ -1,10 +0,0 @@
-import type { RSCPayload } from '../env/rsc.js';
-export declare function RouterProvider({ children, setPayload, isNavigating, url }: {
-    children: React.ReactNode;
-    setPayload?: (payload: RSCPayload) => void;
-    isNavigating?: boolean;
-    url?: {
-        pathname?: string;
-        search?: string;
-    };
-}): import("react/jsx-runtime").JSX.Element;

package/dist/internal/router/use-router.js

@@ -1,5 +0,0 @@
-import { use } from 'react';
-import { RouterContext } from './router-context.js';
-export function useRouter() {
-    return use(RouterContext);
-}