oxidejs 0.2.0 → 0.2.1

package/README.md

@@ -76,15 +76,15 @@ export default {
 };
 ```
 
-`action()` is identity — it only marks the export. Wrap `async function*` in it to stream over tacho SSE. `oxidejs/tsconfig` makes `await ticks()` typecheck. Pass `{ signal }` last on any action to abort the fetch. Types come from the real `*.server.ts`, so declare the last argument there:
+`action()` is runtime identity — it marks the export and adds a typed transport-only `{ signal }` argument. Wrap `async function*` in it to stream over tacho SSE. Inside server code, always read the non-optional signal from `useRequest().signal`:
 
 ```ts
 // src/test.server.ts
-import { action } from "oxidejs";
-import type { ActionOptions } from "oxidejs";
+import { action, useRequest } from "oxidejs";
 
-export const ticks = action(async function* (n: number, _opts?: ActionOptions) {
-  for (let i = 0; i < n; i++) yield i;
+export const ticks = action(async function* (n: number) {
+  const { signal } = useRequest();
+  for (let i = 0; i < n && !signal.aborted; i++) yield i;
 });
 
 // src/client.ts

package/dist/index.d.mts

@@ -12,28 +12,25 @@ type ActionContext = {
   fetchCtx?: ExecutionContext;
   [key: string]: unknown;
 };
-/** Current tacho `ctx`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current tacho or host request context. Throws outside request handling. */
 declare function useCtx<C extends ActionContext = ActionContext>(): C;
-/** Current action `Request`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current server `Request`. Available in actions, SSR, and frame renders. */
 declare function useRequest(): Request;
 /** Worker `env` from `fetch(request, env, ctx)`. `undefined` on the Node fetch preset. */
 declare function useEnv<E = unknown>(): E | undefined;
 /** Worker `ctx` from `fetch(request, env, ctx)` (`waitUntil`). Not tacho `ctx`. `undefined` on Node. */
 declare function useFetchCtx(): ExecutionContext | undefined;
-/** Optional last argument on a `*.server.ts` export so the client can pass `{ signal }`. */
-type ActionOptions = {
-  signal?: AbortSignal;
-};
 /**
- * Marks a `*.server.ts` export as a remote RPC action. Identity: returns `fn` unchanged.
- * Only exports wrapped in `action()` become callable over the wire; other exports stay
- * server-local. Wrap async functions and async generators.
+ * Marks a `*.server.ts` export as a remote RPC action. Runtime identity; the
+ * second call signature adds the transport-only `{ signal }` argument.
  */
-declare function action<T>(fn: T): T;
+declare function action<Args extends unknown[], Result>(fn: (...args: Args) => Result): typeof fn & ((...args: [...Args, options: {
+  signal?: AbortSignal;
+}]) => Result);
 //#endregion
 //#region src/index.d.ts
 declare const unpluginFactory: UnpluginFactory<OxidejsOptions | undefined>;
 declare const oxidejs: import("unplugin").UnpluginInstance<OxidejsOptions | undefined, boolean>;
 declare const vite: (options?: OxidejsOptions | undefined) => import("vite").Plugin<any> | import("vite").Plugin<any>[];
 //#endregion
-export { type ActionContext, type ActionOptions, type ExecutionContext, type OxidejsActionHeaders, type OxidejsActionTransport, type OxidejsOptions, type OxidejsPreset, type OxidejsWranglerOptions, type ResolvedOptions, action, oxidejs as default, oxidejs, unpluginFactory, useCtx, useEnv, useFetchCtx, useRequest, vite };
+export { type ActionContext, type ExecutionContext, type OxidejsActionHeaders, type OxidejsActionTransport, type OxidejsOptions, type OxidejsPreset, type OxidejsWranglerOptions, type ResolvedOptions, action, oxidejs as default, oxidejs, unpluginFactory, useCtx, useEnv, useFetchCtx, useRequest, vite };

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as useCtx, c as useRequest, i as action, n as unpluginFactory, o as useEnv, r as vite, s as useFetchCtx, t as oxidejs } from "./src-zvdCGkyp.mjs";
+import { a as useCtx, c as useRequest, i as action, n as unpluginFactory, o as useEnv, r as vite, s as useFetchCtx, t as oxidejs } from "./src-CsQ-6GnW.mjs";
 export { action, oxidejs as default, oxidejs, unpluginFactory, useCtx, useEnv, useFetchCtx, useRequest, vite };

package/dist/rsbuild.mjs

@@ -1,4 +1,4 @@
-import { t as oxidejs } from "./src-zvdCGkyp.mjs";
+import { t as oxidejs } from "./src-CsQ-6GnW.mjs";
 //#region src/rsbuild.ts
 /** @experimental Rsbuild integration is not yet implemented. */
 var rsbuild_default = oxidejs.rsbuild;

package/dist/{src-zvdCGkyp.mjs → src-CsQ-6GnW.mjs}

@@ -210,7 +210,7 @@ function generateWorkerWrapper(userWorkerAbs, opts = {}) {
 	const hasActions = opts.hasActions !== false;
 	const ws = hasActions && opts.actions === "ws";
 	const bodyLimit = opts.bodyLimit ?? 1048576;
-	const __nf = `() => new Response(${JSON.stringify(opts.notFound ?? "<h1>404 Not Found</h1>")}, { status: 404, headers: { "content-type": "text/html; charset=utf-8" } })`;
+	const nfBlock = `const __nf = ${`() => new Response(${JSON.stringify(opts.notFound ?? "<h1>404 Not Found</h1>")}, { status: 404, headers: { "content-type": "text/html; charset=utf-8" } })`};\n`;
 	const assetBlock = serveAssets ? `import { readFile } from "node:fs/promises";
 import { extname, join } from "node:path";
 const __assets = join(import.meta.dirname, ${JSON.stringify(clientDir)});
@@ -253,7 +253,6 @@ async function __asset(request, spa) {
     return;
   }
 }
-const __nf = ${__nf};
 ` : "";
 	const envJson = JSON.stringify(opts.env ?? {});
 	const afterAction = serveAssets ? `if (typeof user.fetch === "function") {
@@ -326,7 +325,6 @@ const __fetch = Symbol.for("oxidejs.fetch");
 const __rpc = handle(actions, { path: ${JSON.stringify(actionPath)}${sameOrigin ? `, sameOrigin: true` : ``}, createContext: (req) => req[__fetch] ?? {} });
 ` : "";
 	const actionGate = hasActions && !ws ? `if (new URL(request.url).pathname === ${JSON.stringify(actionPath)}) {
-      request[__fetch] = { env, fetchCtx: ctx };
       return __rpc(request);
     }
     ` : "";
@@ -343,9 +341,10 @@ const __rpc = handle(actions, { path: ${JSON.stringify(actionPath)}${sameOrigin
     ` : "";
 	return `${(opts.imports ?? []).map((spec) => `import ${JSON.stringify(spec)};`).join("\n")}export * from ${JSON.stringify(userWorkerAbs)};
 import user from ${JSON.stringify(userWorkerAbs)};
-${middlewareImports}${actionImports}${assetBlock}const app = {
+${middlewareImports}${actionImports}${assetBlock}${nfBlock}const app = {
   ...user,
   async fetch(request, env, ctx) {
+    request[__fetch] = { env, fetchCtx: ctx };
     ${middlewareGate}${actionGate}${afterAction}
   },
 };
@@ -679,20 +678,21 @@ function applyRsbuildEnvironments(config, opts) {
 //#endregion
 //#region src/context.ts
 const ALS_KEY = Symbol.for("oxidejs.requestContext");
+const FETCH_KEY = Symbol.for("oxidejs.fetch");
 function als() {
 	const g = globalThis;
 	return g[ALS_KEY] ??= new AsyncLocalStorage();
 }
 function store() {
 	const current = als().getStore();
-	if (!current) throw new Error("oxidejs: useRequest() called outside an action");
+	if (!current) throw new Error("oxidejs: request context is unavailable");
 	return current;
 }
-/** Current tacho `ctx`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current tacho or host request context. Throws outside request handling. */
 function useCtx() {
 	return store();
 }
-/** Current action `Request`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current server `Request`. Available in actions, SSR, and frame renders. */
 function useRequest() {
 	return store().req;
 }
@@ -704,10 +704,20 @@ function useEnv() {
 function useFetchCtx() {
 	return store().fetchCtx;
 }
+function runWithRequest(req, fn, extra) {
+	return als().run({
+		...extra,
+		req
+	}, fn);
+}
+const HOOK_KEY = Symbol.for("oxidejs.runWithRequest");
+globalThis[HOOK_KEY] ??= (req, fn) => {
+	const extra = req[FETCH_KEY];
+	return runWithRequest(req, fn, extra);
+};
 /**
-* Marks a `*.server.ts` export as a remote RPC action. Identity: returns `fn` unchanged.
-* Only exports wrapped in `action()` become callable over the wire; other exports stay
-* server-local. Wrap async functions and async generators.
+* Marks a `*.server.ts` export as a remote RPC action. Runtime identity; the
+* second call signature adds the transport-only `{ signal }` argument.
 */
 function action(fn) {
 	return fn;

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as oxidejs } from "./src-zvdCGkyp.mjs";
+import { t as oxidejs } from "./src-CsQ-6GnW.mjs";
 //#region src/vite.ts
 var vite_default = oxidejs.vite;
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxidejs",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Vite/Rsbuild plugin. One build → dist/server.js + optional client. Server actions via *.server.ts.",
   "keywords": [
     "cloudflare",
@@ -59,7 +59,7 @@
     "unplugin": "^3.3.0"
   },
   "devDependencies": {
-    "tacho": "^0.4.3"
+    "tacho": "^0.5.0"
   },
   "peerDependencies": {
     "@rsbuild/core": "*",