@jk2908/solas 0.2.3 → 0.3.1

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

@@ -1,5 +1,9 @@
 export declare function useRouter(): {
-    go: (to: string, opts?: import("./router-context").Navigation.GoOptions | undefined) => Promise<string>;
+    go: (to: string, opts?: import("./router-context.js").Navigation.GoOptions | undefined) => Promise<string>;
     prefetch: (path: string) => void;
     isNavigating: boolean;
+    url: {
+        pathname?: string | undefined;
+        search?: string | undefined;
+    };
 };

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

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

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

@@ -1,4 +1,4 @@
-import type { Route } from '../../types';
+import type { Route } from '../../types.js';
 export type PathPattern = {
     path: string;
     wildcardNames: Set<string>;

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

@@ -0,0 +1,30 @@
+import { ReactFormState } from 'react-dom/client';
+import { SolasRequest } from '../../types.js';
+/**
+ * Check if a request is an action request and reuse parsed FormData
+ * when multipart action detection already had to inspect the body
+ */
+export declare function maybeAction(req: Request): Promise<{
+    action: boolean;
+    formData: null;
+} | {
+    action: boolean;
+    formData: FormData;
+}>;
+/**
+ * Process an incoming action request, either from ReactClient.setServerCallback or a <form action={...}> submission
+ * @returns an object containing either the return value of the action or the form state, depending on the type
+ * of action request
+ */
+export declare function processActionRequest(req: SolasRequest): Promise<{
+    returnValue: {
+        ok: boolean;
+        data: unknown;
+    } | undefined;
+    formState: ReactFormState | undefined;
+    temporaryReferences: unknown;
+}>;
+/**
+ * Check whether an action request came from the same origin as the target app
+ */
+export declare function isTrustedActionRequest(req: Request): boolean;

package/dist/internal/server/actions.js

@@ -0,0 +1,107 @@
+import { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, loadServerAction, } from '@vitejs/plugin-rsc/rsc';
+import { Solas } from '../../solas.js';
+import { HttpException } from '../navigation/http-exception.js';
+/**
+ * Check if a request is an action request and reuse parsed FormData
+ * when multipart action detection already had to inspect the body
+ */
+export async function maybeAction(req) {
+    if (req.method !== 'POST')
+        return { action: false, formData: null };
+    if (req.headers.has('x-rsc-action-id'))
+        return { action: true, formData: null };
+    const contentType = req.headers.get('content-type') ?? '';
+    if (!contentType.startsWith('multipart/form-data')) {
+        return { action: false, formData: null };
+    }
+    try {
+        const formData = await req.clone().formData();
+        for (const key of formData.keys()) {
+            if (key === '$ACTION_KEY' ||
+                key.startsWith('$ACTION_') ||
+                key.startsWith('$ACTION_REF_')) {
+                return { action: true, formData };
+            }
+        }
+    }
+    catch {
+        return { action: false, formData: null };
+    }
+    return { action: false, formData: null };
+}
+/**
+ * Process an incoming action request, either from ReactClient.setServerCallback or a <form action={...}> submission
+ * @returns an object containing either the return value of the action or the form state, depending on the type
+ * of action request
+ */
+export async function processActionRequest(req) {
+    let returnValue;
+    let formState;
+    let temporaryReferences;
+    // reject cross-site action posts before any body decoding or action loading
+    if (!isTrustedActionRequest(req)) {
+        throw new HttpException(403, 'Cross-site action requests are forbidden');
+    }
+    const id = req.headers.get('x-rsc-action-id');
+    if (id) {
+        // x-rsc-action-id header exists when action is
+        // called via ReactClient.setServerCallback
+        const body = req.headers.get('content-type')?.startsWith('multipart/form-data')
+            ? await req.formData()
+            : await req.text();
+        temporaryReferences = createTemporaryReferenceSet();
+        const args = await decodeReply(body, {
+            temporaryReferences,
+        });
+        const action = await loadServerAction(id);
+        try {
+            const data = await action.apply(null, args);
+            returnValue = { ok: true, data };
+        }
+        catch (err) {
+            returnValue = { ok: false, data: err };
+        }
+    }
+    else {
+        // otherwise server function is called via
+        // <form action={...}>
+        // we might have already parsed FormData in the router for multipart action
+        // detection should be attached to the SolasRequest, so we can reuse that
+        // to avoid parsing twice
+        const parsedFormData = req[Solas.Config.REQUEST_META]?.parsedFormData;
+        const formData = parsedFormData ?? (await req.formData());
+        const decodedAction = await decodeAction(formData);
+        const result = await decodedAction();
+        formState = await decodeFormState(result, formData);
+    }
+    return { returnValue, formState, temporaryReferences };
+}
+/**
+ * Reduce Origin and Referer headers to a comparable origin string
+ */
+function toOrigin(value) {
+    if (!value)
+        return null;
+    try {
+        return new URL(value).origin;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Check whether an action request came from the same origin as the target app
+ */
+export function isTrustedActionRequest(req) {
+    const requestOrigin = toOrigin(req.url);
+    if (!requestOrigin)
+        return false;
+    const origin = toOrigin(req.headers.get('origin'));
+    if (origin)
+        return origin === requestOrigin;
+    // some user agents omit Origin on same-origin form posts, so fall back to Referer
+    const referer = toOrigin(req.headers.get('referer'));
+    if (referer)
+        return referer === requestOrigin;
+    return false;
+}

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

@@ -1,4 +1,4 @@
-import { Cookies } from '../../utils/cookies';
+import { Cookies } from '../../utils/cookies.js';
 /**
  * Get the request cookies as a Cookies instance
  * @returns a read-only Cookies instance containing the request cookies

package/dist/internal/server/cookies.js

@@ -1,6 +1,6 @@
-import { Cookies } from '../../utils/cookies';
-import { RequestContext } from '../env/request-context';
-import { dynamic } from './dynamic';
+import { Cookies } from '../../utils/cookies.js';
+import { RequestContext } from '../env/request-context.js';
+import { dynamic } from './dynamic.js';
 /**
  * Get the request cookies as a Cookies instance
  * @returns a read-only Cookies instance containing the request cookies

package/dist/internal/server/dynamic.js

@@ -1,5 +1,5 @@
-import { Logger } from '../../utils/logger';
-import { RequestContext } from '../env/request-context';
+import { Logger } from '../../utils/logger.js';
+import { RequestContext } from '../env/request-context.js';
 const logger = new Logger();
 const NEVER = new Promise(() => { });
 /**

package/dist/internal/server/headers.js

@@ -1,5 +1,5 @@
-import { RequestContext } from '../env/request-context';
-import { dynamic } from './dynamic';
+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

package/dist/internal/server/url.js

@@ -1,5 +1,7 @@
-import { RequestContext } from '../env/request-context';
-import { dynamic } from './dynamic';
+import { Logger } from '../../utils/logger.js';
+import { RequestContext } from '../env/request-context.js';
+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
@@ -11,7 +13,16 @@ export function url() {
     // without corrupting the cached instance shared across the request
     if (cache.url)
         return new URL(cache.url);
-    const parsed = new URL(req.url);
+    let parsed;
+    try {
+        parsed = new URL(req.url);
+    }
+    catch (err) {
+        // if we throw the original error here, the rest of the code gets a messy parsing error
+        // instead of a simple 'invalid request url' failure
+        logger.error(`[url] invalid request url: ${req.url}`, err);
+        throw new Error('Invalid request url', { cause: err });
+    }
     cache.url = parsed;
     return new URL(parsed);
 }

package/dist/internal/ui/defaults/error.d.ts

@@ -1,4 +1,4 @@
-import type { HttpException } from '../../navigation/http-exception';
+import type { HttpException } from '../../navigation/http-exception.js';
 export default function Err({ error }: {
     error: HttpException | Error;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/internal/ui/error-boundary.d.ts

@@ -1,5 +1,5 @@
 import { Component } from 'react';
-import type { BoundaryError } from '../../types';
+import type { BoundaryError } from '../../types.js';
 export type Props = {
     fallback: ((error: BoundaryError, reset: () => void) => React.ReactNode) | React.ReactNode;
     onError?: (error: BoundaryError) => void;

package/dist/internal/ui/error-boundary.js

@@ -1,6 +1,6 @@
 'use client';
 import { Component } from 'react';
-import { isKnownError } from '../env/utils';
+import { isKnownError } from '../env/utils.js';
 /**
  * A component that catches synchronous errors in its child component tree and displays a fallback UI
  * @param props - the props for the component

package/dist/navigation.d.ts

@@ -1,6 +1,6 @@
-export { HttpException, abort, isHttpException, } from './internal/navigation/http-exception';
-export { HttpExceptionBoundary } from './internal/navigation/http-exception-boundary';
-export { Link } from './internal/navigation/link';
-export { Redirect, isRedirect, redirect } from './internal/navigation/redirect';
-export { RedirectBoundary } from './internal/navigation/redirect-boundary';
-export { useSearchParams } from './internal/navigation/use-search-params';
+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 { 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';
-export { HttpExceptionBoundary } from './internal/navigation/http-exception-boundary';
-export { Link } from './internal/navigation/link';
-export { Redirect, isRedirect, redirect } from './internal/navigation/redirect';
-export { RedirectBoundary } from './internal/navigation/redirect-boundary';
-export { useSearchParams } from './internal/navigation/use-search-params';
+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 { 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/prerender.d.ts

@@ -1 +1 @@
-export { Prerender } from './internal/prerender';
+export { Prerender } from './internal/prerender.js';

package/dist/prerender.js

@@ -1 +1 @@
-export { Prerender } from './internal/prerender';
+export { Prerender } from './internal/prerender.js';

package/dist/router.d.ts

@@ -1,4 +1,4 @@
-export { createRouter } from './internal/router/create-router';
-export { Router } from './internal/router/router';
-export { RouterProvider } from './internal/router/router-provider';
-export { useRouter } from './internal/router/use-router';
+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';

package/dist/router.js

@@ -1,4 +1,4 @@
-export { createRouter } from './internal/router/create-router';
-export { Router } from './internal/router/router';
-export { RouterProvider } from './internal/router/router-provider';
-export { useRouter } from './internal/router/use-router';
+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';

package/dist/server.d.ts

@@ -1,4 +1,4 @@
-export { cookies } from './internal/server/cookies';
-export { dynamic } from './internal/server/dynamic';
-export { headers } from './internal/server/headers';
-export { url } from './internal/server/url';
+export { cookies } from './internal/server/cookies.js';
+export { dynamic } from './internal/server/dynamic.js';
+export { headers } from './internal/server/headers.js';
+export { url } from './internal/server/url.js';

package/dist/server.js

@@ -1,4 +1,4 @@
-export { cookies } from './internal/server/cookies';
-export { dynamic } from './internal/server/dynamic';
-export { headers } from './internal/server/headers';
-export { url } from './internal/server/url';
+export { cookies } from './internal/server/cookies.js';
+export { dynamic } from './internal/server/dynamic.js';
+export { headers } from './internal/server/headers.js';
+export { url } from './internal/server/url.js';

package/dist/solas.d.ts

@@ -1,4 +1,4 @@
-import type { PluginConfig } from './types';
+import type { PluginConfig } from './types.js';
 export declare namespace Solas {
     namespace Config {
         const NAME = "Solas";

package/dist/solas.js

@@ -19,6 +19,7 @@ var Solas;
         Config.PRERENDER_MODES = ['full', 'ppr', false];
         Config.TRAILING_SLASH_MODES = ['always', 'never', 'ignore'];
         const CONFIG_KEYS = new Set([
+            'port',
             'logger',
             'metadata',
             'precompress',

package/dist/types.d.ts

@@ -1,12 +1,12 @@
 type BunRequest = Request & {
     params?: Record<string, string | string[]>;
 };
-import { Solas } from './solas';
-import { ExportReader } from './utils/export-reader';
-import type { Build } from './internal/build';
-import type { Metadata } from './internal/metadata';
-import type { HttpException } from './internal/navigation/http-exception';
-import type { Router } from './internal/router/router';
+import { Solas } from './solas.js';
+import { ExportReader } from './utils/export-reader.js';
+import type { Build } from './internal/build.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';
 export type LogLevel = (typeof Solas.Config.LOG_LEVELS)[number];
 type PluginConfigBase = {
     port?: number;

package/dist/types.js

@@ -1 +1 @@
-import { Solas } from './solas';
+import { Solas } from './solas.js';

package/dist/utils/context.js

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { Logger } from './logger';
+import { Logger } from './logger.js';
 const logger = new Logger();
 export { Context };
 var Context;

package/dist/utils/logger.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jk2908/solas",
-	"version": "0.2.3",
+	"version": "0.3.1",
 	"description": "A React Server Components meta-framework powered by Vite",
 	"keywords": [
 		"framework",
@@ -24,6 +24,7 @@
 	},
 	"files": [
 		"dist",
+		"CHANGELOG.md",
 		"README.md",
 		"LICENSE"
 	],
@@ -96,6 +97,7 @@
 		"@types/bun": "^1.2.22",
 		"@typescript/native-preview": "^7.0.0-dev.20260224.1",
 		"network-information-types": "^0.1.1",
+		"oxfmt": "^0.35.0",
 		"typescript": "^5.9.3"
 	},
 	"peerDependencies": {

package/dist/utils/format.d.ts

@@ -1,6 +0,0 @@
-export declare namespace Format {
-    /**
-     * Format a file in-place using oxfmt with our preferred code style
-     */
-    function run(filePath: string): Promise<void>;
-}

package/dist/utils/format.js

@@ -1,72 +0,0 @@
-import path from 'node:path';
-import { format } from 'oxfmt';
-import { Logger } from './logger';
-const logger = new Logger();
-const BASE_OPTIONS = {
-    useTabs: true,
-    tabWidth: 2,
-    printWidth: 90,
-    singleQuote: true,
-    jsxSingleQuote: false,
-    quoteProps: 'as-needed',
-    trailingComma: 'all',
-    semi: false,
-    arrowParens: 'avoid',
-    bracketSameLine: true,
-    bracketSpacing: true,
-    endOfLine: 'lf',
-};
-const SUPPORTED_EXTENSIONS = new Set([
-    '.js',
-    '.jsx',
-    '.ts',
-    '.tsx',
-    '.mjs',
-    '.cjs',
-    '.mts',
-    '.cts',
-    '.json',
-    '.jsonc',
-    '.json5',
-    '.css',
-    '.scss',
-    '.less',
-    '.md',
-    '.mdx',
-    '.html',
-    '.yml',
-    '.yaml',
-    '.toml',
-]);
-export { Format };
-var Format;
-(function (Format) {
-    /**
-     * Format a file in-place using oxfmt with our preferred code style
-     */
-    async function run(filePath) {
-        try {
-            const ext = path.extname(filePath).toLowerCase();
-            if (!SUPPORTED_EXTENSIONS.has(ext)) {
-                logger.warn(`[format] Skipping unsupported file type: ${filePath}`);
-                return;
-            }
-            const file = Bun.file(filePath);
-            const source = await file.text();
-            const options = ext === '.json' ? { ...BASE_OPTIONS, trailingComma: 'none' } : BASE_OPTIONS;
-            const result = await format(filePath, source, options);
-            if (result.errors.length > 0) {
-                logger.warn(`[format] oxfmt failed for ${filePath}: ${result.errors[0]?.message}`);
-                return;
-            }
-            if (result.code === source)
-                return;
-            await Bun.write(filePath, result.code);
-            logger.info(`[format] Formatted file: ${filePath}`);
-        }
-        catch (err) {
-            logger.error(`[format] Failed to format file: ${filePath}`, err);
-        }
-    }
-    Format.run = run;
-})(Format || (Format = {}));