@mokup/server 1.1.1 → 1.1.3

package/dist/shared/{server.Dje1y79O.mjs → server.LbftO9Jh.mjs}

@@ -1,53 +1,5 @@
-import { createRuntime } from '@mokup/runtime';
-
 const textDecoder = new TextDecoder();
 const textEncoder = new TextEncoder();
-function toRuntimeOptions(options) {
-  const runtimeOptions = {
-    manifest: options.manifest
-  };
-  if (typeof options.moduleBase !== "undefined") {
-    runtimeOptions.moduleBase = options.moduleBase;
-  }
-  if (typeof options.moduleMap !== "undefined") {
-    runtimeOptions.moduleMap = options.moduleMap;
-  }
-  return runtimeOptions;
-}
-function normalizeQuery(params) {
-  const query = {};
-  for (const [key, value] of params.entries()) {
-    const current = query[key];
-    if (typeof current === "undefined") {
-      query[key] = value;
-    } else if (Array.isArray(current)) {
-      current.push(value);
-    } else {
-      query[key] = [current, value];
-    }
-  }
-  return query;
-}
-function normalizeHeaders(headers) {
-  const record = {};
-  headers.forEach((value, key) => {
-    record[key.toLowerCase()] = value;
-  });
-  return record;
-}
-function normalizeNodeHeaders(headers) {
-  if (!headers) {
-    return {};
-  }
-  const record = {};
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === "undefined") {
-      continue;
-    }
-    record[key.toLowerCase()] = Array.isArray(value) ? value.join(",") : String(value);
-  }
-  return record;
-}
 function parseBody(rawText, contentType) {
   if (!rawText) {
     return void 0;
@@ -80,14 +32,6 @@ function toArrayBuffer(body) {
   copy.set(body);
   return copy.buffer;
 }
-function resolveUrl(input, headers) {
-  if (/^https?:\/\//.test(input)) {
-    return new URL(input);
-  }
-  const host = headers.host;
-  const base = host ? `http://${host}` : "http://localhost";
-  return new URL(input, base);
-}
 function concatChunks(chunks) {
   if (chunks.length === 1) {
     return chunks[0] ?? new Uint8Array();
@@ -175,6 +119,50 @@ async function resolveBody(body, contentType, stream) {
     rawBody: rawText
   };
 }
+
+function normalizeQuery(params) {
+  const query = {};
+  for (const [key, value] of params.entries()) {
+    const current = query[key];
+    if (typeof current === "undefined") {
+      query[key] = value;
+    } else if (Array.isArray(current)) {
+      current.push(value);
+    } else {
+      query[key] = [current, value];
+    }
+  }
+  return query;
+}
+function normalizeHeaders(headers) {
+  const record = {};
+  headers.forEach((value, key) => {
+    record[key.toLowerCase()] = value;
+  });
+  return record;
+}
+function normalizeNodeHeaders(headers) {
+  if (!headers) {
+    return {};
+  }
+  const record = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (typeof value === "undefined") {
+      continue;
+    }
+    record[key.toLowerCase()] = Array.isArray(value) ? value.join(",") : String(value);
+  }
+  return record;
+}
+function resolveUrl(input, headers) {
+  if (/^https?:\/\//.test(input)) {
+    return new URL(input);
+  }
+  const host = headers.host;
+  const base = host ? `http://${host}` : "http://localhost";
+  return new URL(input, base);
+}
+
 function buildRuntimeRequest(url, method, headers, body, rawBody) {
   const request = {
     method,
@@ -219,6 +207,19 @@ async function toRuntimeRequestFromNode(req, bodyOverride) {
     resolvedBody.rawBody
   );
 }
+
+function toRuntimeOptions(options) {
+  const runtimeOptions = {
+    manifest: options.manifest
+  };
+  if (typeof options.moduleBase !== "undefined") {
+    runtimeOptions.moduleBase = options.moduleBase;
+  }
+  if (typeof options.moduleMap !== "undefined") {
+    runtimeOptions.moduleMap = options.moduleMap;
+  }
+  return runtimeOptions;
+}
 function applyRuntimeResultToNode(res, result) {
   res.statusCode = result.status;
   for (const [key, value] of Object.entries(result.headers)) {
@@ -235,24 +236,4 @@ function applyRuntimeResultToNode(res, result) {
   res.end(toBinaryBody(result.body));
 }
 
-function createFetchHandler(options) {
-  const runtime = createRuntime(toRuntimeOptions(options));
-  const onNotFound = options.onNotFound ?? "next";
-  return async (request) => {
-    const runtimeRequest = await toRuntimeRequestFromFetch(request);
-    const result = await runtime.handle(runtimeRequest);
-    if (!result) {
-      if (onNotFound === "response") {
-        return new Response(null, { status: 404 });
-      }
-      return null;
-    }
-    const responseBody = result.body === null ? null : typeof result.body === "string" ? result.body : toArrayBuffer(result.body);
-    return new Response(responseBody, {
-      status: result.status,
-      headers: result.headers
-    });
-  };
-}
-
-export { toRuntimeRequestFromNode as a, applyRuntimeResultToNode as b, createFetchHandler as c, toBinaryBody as d, toRuntimeOptions as t };
+export { toRuntimeRequestFromNode as a, applyRuntimeResultToNode as b, toBinaryBody as c, toRuntimeRequestFromFetch as d, toArrayBuffer as e, toRuntimeOptions as t };

package/dist/shared/{server.BdTl0qJd.cjs → server.aaygIV2Q.cjs}

@@ -1,55 +1,7 @@
 'use strict';
 
-const runtime = require('@mokup/runtime');
-
 const textDecoder = new TextDecoder();
 const textEncoder = new TextEncoder();
-function toRuntimeOptions(options) {
-  const runtimeOptions = {
-    manifest: options.manifest
-  };
-  if (typeof options.moduleBase !== "undefined") {
-    runtimeOptions.moduleBase = options.moduleBase;
-  }
-  if (typeof options.moduleMap !== "undefined") {
-    runtimeOptions.moduleMap = options.moduleMap;
-  }
-  return runtimeOptions;
-}
-function normalizeQuery(params) {
-  const query = {};
-  for (const [key, value] of params.entries()) {
-    const current = query[key];
-    if (typeof current === "undefined") {
-      query[key] = value;
-    } else if (Array.isArray(current)) {
-      current.push(value);
-    } else {
-      query[key] = [current, value];
-    }
-  }
-  return query;
-}
-function normalizeHeaders(headers) {
-  const record = {};
-  headers.forEach((value, key) => {
-    record[key.toLowerCase()] = value;
-  });
-  return record;
-}
-function normalizeNodeHeaders(headers) {
-  if (!headers) {
-    return {};
-  }
-  const record = {};
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === "undefined") {
-      continue;
-    }
-    record[key.toLowerCase()] = Array.isArray(value) ? value.join(",") : String(value);
-  }
-  return record;
-}
 function parseBody(rawText, contentType) {
   if (!rawText) {
     return void 0;
@@ -82,14 +34,6 @@ function toArrayBuffer(body) {
   copy.set(body);
   return copy.buffer;
 }
-function resolveUrl(input, headers) {
-  if (/^https?:\/\//.test(input)) {
-    return new URL(input);
-  }
-  const host = headers.host;
-  const base = host ? `http://${host}` : "http://localhost";
-  return new URL(input, base);
-}
 function concatChunks(chunks) {
   if (chunks.length === 1) {
     return chunks[0] ?? new Uint8Array();
@@ -177,6 +121,50 @@ async function resolveBody(body, contentType, stream) {
     rawBody: rawText
   };
 }
+
+function normalizeQuery(params) {
+  const query = {};
+  for (const [key, value] of params.entries()) {
+    const current = query[key];
+    if (typeof current === "undefined") {
+      query[key] = value;
+    } else if (Array.isArray(current)) {
+      current.push(value);
+    } else {
+      query[key] = [current, value];
+    }
+  }
+  return query;
+}
+function normalizeHeaders(headers) {
+  const record = {};
+  headers.forEach((value, key) => {
+    record[key.toLowerCase()] = value;
+  });
+  return record;
+}
+function normalizeNodeHeaders(headers) {
+  if (!headers) {
+    return {};
+  }
+  const record = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (typeof value === "undefined") {
+      continue;
+    }
+    record[key.toLowerCase()] = Array.isArray(value) ? value.join(",") : String(value);
+  }
+  return record;
+}
+function resolveUrl(input, headers) {
+  if (/^https?:\/\//.test(input)) {
+    return new URL(input);
+  }
+  const host = headers.host;
+  const base = host ? `http://${host}` : "http://localhost";
+  return new URL(input, base);
+}
+
 function buildRuntimeRequest(url, method, headers, body, rawBody) {
   const request = {
     method,
@@ -221,6 +209,19 @@ async function toRuntimeRequestFromNode(req, bodyOverride) {
     resolvedBody.rawBody
   );
 }
+
+function toRuntimeOptions(options) {
+  const runtimeOptions = {
+    manifest: options.manifest
+  };
+  if (typeof options.moduleBase !== "undefined") {
+    runtimeOptions.moduleBase = options.moduleBase;
+  }
+  if (typeof options.moduleMap !== "undefined") {
+    runtimeOptions.moduleMap = options.moduleMap;
+  }
+  return runtimeOptions;
+}
 function applyRuntimeResultToNode(res, result) {
   res.statusCode = result.status;
   for (const [key, value] of Object.entries(result.headers)) {
@@ -237,28 +238,9 @@ function applyRuntimeResultToNode(res, result) {
   res.end(toBinaryBody(result.body));
 }
 
-function createFetchHandler(options) {
-  const runtime$1 = runtime.createRuntime(toRuntimeOptions(options));
-  const onNotFound = options.onNotFound ?? "next";
-  return async (request) => {
-    const runtimeRequest = await toRuntimeRequestFromFetch(request);
-    const result = await runtime$1.handle(runtimeRequest);
-    if (!result) {
-      if (onNotFound === "response") {
-        return new Response(null, { status: 404 });
-      }
-      return null;
-    }
-    const responseBody = result.body === null ? null : typeof result.body === "string" ? result.body : toArrayBuffer(result.body);
-    return new Response(responseBody, {
-      status: result.status,
-      headers: result.headers
-    });
-  };
-}
-
 exports.applyRuntimeResultToNode = applyRuntimeResultToNode;
-exports.createFetchHandler = createFetchHandler;
+exports.toArrayBuffer = toArrayBuffer;
 exports.toBinaryBody = toBinaryBody;
 exports.toRuntimeOptions = toRuntimeOptions;
+exports.toRuntimeRequestFromFetch = toRuntimeRequestFromFetch;
 exports.toRuntimeRequestFromNode = toRuntimeRequestFromNode;

package/dist/worker-node.cjs

@@ -0,0 +1,74 @@
+'use strict';
+
+const fetch = require('./fetch.cjs');
+require('@mokup/runtime');
+require('./shared/server.aaygIV2Q.cjs');
+
+function isManifest(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) && "version" in value && "routes" in value;
+}
+function normalizeWorkerOptions(bundle) {
+  const options = {
+    manifest: bundle.manifest,
+    onNotFound: bundle.onNotFound ?? "response"
+  };
+  if (typeof bundle.moduleBase !== "undefined") {
+    options.moduleBase = bundle.moduleBase;
+  }
+  if (typeof bundle.moduleMap !== "undefined") {
+    options.moduleMap = bundle.moduleMap;
+  }
+  return options;
+}
+async function loadBundleFromDir(dir) {
+  const nodeProcess = await import('node:process');
+  const isNode = typeof nodeProcess !== "undefined" && !!nodeProcess.versions?.node;
+  if (!isNode) {
+    throw new TypeError("createMokupWorker(dir) is only supported in Node runtimes.");
+  }
+  const { readFile, access } = await import('node:fs/promises');
+  const { resolve, join } = await import('node:path');
+  const { pathToFileURL } = await import('node:url');
+  const manifestPath = resolve(dir, "mokup.manifest.json");
+  const manifestRaw = await readFile(manifestPath, "utf8");
+  const manifest = JSON.parse(manifestRaw);
+  const handlersIndexPath = resolve(dir, "mokup-handlers", "index.mjs");
+  let moduleMap;
+  try {
+    await access(handlersIndexPath);
+    const module = await import(pathToFileURL(handlersIndexPath).href);
+    moduleMap = module.mokupModuleMap;
+  } catch {
+    moduleMap = void 0;
+  }
+  const bundle = {
+    manifest,
+    moduleBase: join(dir, "/")
+  };
+  if (typeof moduleMap !== "undefined") {
+    bundle.moduleMap = moduleMap;
+  }
+  return bundle;
+}
+function createWorker(handlerOptions) {
+  const handler = fetch.createFetchHandler(handlerOptions);
+  return {
+    fetch: async (request) => {
+      return await handler(request) ?? new Response("Not Found", { status: 404 });
+    }
+  };
+}
+function createMokupWorker(input) {
+  if (typeof input === "string") {
+    return loadBundleFromDir(input).then((bundle) => createWorker(normalizeWorkerOptions(bundle)));
+  }
+  if (isManifest(input)) {
+    return createWorker({
+      manifest: input,
+      onNotFound: "response"
+    });
+  }
+  return createWorker(normalizeWorkerOptions(input));
+}
+
+exports.createMokupWorker = createMokupWorker;

package/dist/worker-node.d.cts

@@ -0,0 +1,40 @@
+import { a as WorkerInput } from './shared/server.DkerfsA-.cjs';
+import '@mokup/runtime';
+
+/**
+ * Minimal Worker-style fetch interface for Node helpers.
+ *
+ * @example
+ * import type { FetchWorker } from '@mokup/server/node'
+ *
+ * const worker: FetchWorker = { fetch: async () => new Response('ok') }
+ */
+interface FetchWorker {
+    /** Fetch handler for the Worker runtime. */
+    fetch: (request: Request) => Promise<Response>;
+}
+/**
+ * Input accepted by the Node worker helper.
+ *
+ * @example
+ * import type { NodeWorkerInput } from '@mokup/server/node'
+ *
+ * const input: NodeWorkerInput = '.mokup'
+ */
+type NodeWorkerInput = string | WorkerInput;
+/**
+ * Create a Worker-compatible fetch handler for Node.
+ *
+ * @param input - Directory path, manifest, or bundle.
+ * @returns Worker handler or a promise when input is a directory.
+ *
+ * @example
+ * import { createMokupWorker } from '@mokup/server/node'
+ *
+ * const worker = await createMokupWorker('.mokup')
+ */
+declare function createMokupWorker(input: string): Promise<FetchWorker>;
+declare function createMokupWorker(input: WorkerInput): FetchWorker;
+
+export { createMokupWorker };
+export type { FetchWorker, NodeWorkerInput };

package/dist/worker-node.d.mts

@@ -0,0 +1,40 @@
+import { a as WorkerInput } from './shared/server.DkerfsA-.mjs';
+import '@mokup/runtime';
+
+/**
+ * Minimal Worker-style fetch interface for Node helpers.
+ *
+ * @example
+ * import type { FetchWorker } from '@mokup/server/node'
+ *
+ * const worker: FetchWorker = { fetch: async () => new Response('ok') }
+ */
+interface FetchWorker {
+    /** Fetch handler for the Worker runtime. */
+    fetch: (request: Request) => Promise<Response>;
+}
+/**
+ * Input accepted by the Node worker helper.
+ *
+ * @example
+ * import type { NodeWorkerInput } from '@mokup/server/node'
+ *
+ * const input: NodeWorkerInput = '.mokup'
+ */
+type NodeWorkerInput = string | WorkerInput;
+/**
+ * Create a Worker-compatible fetch handler for Node.
+ *
+ * @param input - Directory path, manifest, or bundle.
+ * @returns Worker handler or a promise when input is a directory.
+ *
+ * @example
+ * import { createMokupWorker } from '@mokup/server/node'
+ *
+ * const worker = await createMokupWorker('.mokup')
+ */
+declare function createMokupWorker(input: string): Promise<FetchWorker>;
+declare function createMokupWorker(input: WorkerInput): FetchWorker;
+
+export { createMokupWorker };
+export type { FetchWorker, NodeWorkerInput };

package/dist/worker-node.d.ts

@@ -0,0 +1,40 @@
+import { a as WorkerInput } from './shared/server.DkerfsA-.js';
+import '@mokup/runtime';
+
+/**
+ * Minimal Worker-style fetch interface for Node helpers.
+ *
+ * @example
+ * import type { FetchWorker } from '@mokup/server/node'
+ *
+ * const worker: FetchWorker = { fetch: async () => new Response('ok') }
+ */
+interface FetchWorker {
+    /** Fetch handler for the Worker runtime. */
+    fetch: (request: Request) => Promise<Response>;
+}
+/**
+ * Input accepted by the Node worker helper.
+ *
+ * @example
+ * import type { NodeWorkerInput } from '@mokup/server/node'
+ *
+ * const input: NodeWorkerInput = '.mokup'
+ */
+type NodeWorkerInput = string | WorkerInput;
+/**
+ * Create a Worker-compatible fetch handler for Node.
+ *
+ * @param input - Directory path, manifest, or bundle.
+ * @returns Worker handler or a promise when input is a directory.
+ *
+ * @example
+ * import { createMokupWorker } from '@mokup/server/node'
+ *
+ * const worker = await createMokupWorker('.mokup')
+ */
+declare function createMokupWorker(input: string): Promise<FetchWorker>;
+declare function createMokupWorker(input: WorkerInput): FetchWorker;
+
+export { createMokupWorker };
+export type { FetchWorker, NodeWorkerInput };

package/dist/worker-node.mjs

@@ -0,0 +1,72 @@
+import { createFetchHandler } from './fetch.mjs';
+import '@mokup/runtime';
+import './shared/server.LbftO9Jh.mjs';
+
+function isManifest(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) && "version" in value && "routes" in value;
+}
+function normalizeWorkerOptions(bundle) {
+  const options = {
+    manifest: bundle.manifest,
+    onNotFound: bundle.onNotFound ?? "response"
+  };
+  if (typeof bundle.moduleBase !== "undefined") {
+    options.moduleBase = bundle.moduleBase;
+  }
+  if (typeof bundle.moduleMap !== "undefined") {
+    options.moduleMap = bundle.moduleMap;
+  }
+  return options;
+}
+async function loadBundleFromDir(dir) {
+  const nodeProcess = await import('node:process');
+  const isNode = typeof nodeProcess !== "undefined" && !!nodeProcess.versions?.node;
+  if (!isNode) {
+    throw new TypeError("createMokupWorker(dir) is only supported in Node runtimes.");
+  }
+  const { readFile, access } = await import('node:fs/promises');
+  const { resolve, join } = await import('node:path');
+  const { pathToFileURL } = await import('node:url');
+  const manifestPath = resolve(dir, "mokup.manifest.json");
+  const manifestRaw = await readFile(manifestPath, "utf8");
+  const manifest = JSON.parse(manifestRaw);
+  const handlersIndexPath = resolve(dir, "mokup-handlers", "index.mjs");
+  let moduleMap;
+  try {
+    await access(handlersIndexPath);
+    const module = await import(pathToFileURL(handlersIndexPath).href);
+    moduleMap = module.mokupModuleMap;
+  } catch {
+    moduleMap = void 0;
+  }
+  const bundle = {
+    manifest,
+    moduleBase: join(dir, "/")
+  };
+  if (typeof moduleMap !== "undefined") {
+    bundle.moduleMap = moduleMap;
+  }
+  return bundle;
+}
+function createWorker(handlerOptions) {
+  const handler = createFetchHandler(handlerOptions);
+  return {
+    fetch: async (request) => {
+      return await handler(request) ?? new Response("Not Found", { status: 404 });
+    }
+  };
+}
+function createMokupWorker(input) {
+  if (typeof input === "string") {
+    return loadBundleFromDir(input).then((bundle) => createWorker(normalizeWorkerOptions(bundle)));
+  }
+  if (isManifest(input)) {
+    return createWorker({
+      manifest: input,
+      onNotFound: "response"
+    });
+  }
+  return createWorker(normalizeWorkerOptions(input));
+}
+
+export { createMokupWorker };

package/dist/worker.cjs

@@ -1,8 +1,12 @@
 'use strict';
 
-const fetch = require('./shared/server.BdTl0qJd.cjs');
+const fetch = require('./fetch.cjs');
 require('@mokup/runtime');
+require('./shared/server.aaygIV2Q.cjs');
 
+function isStringInput(value) {
+  return typeof value === "string";
+}
 function isManifest(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) && "version" in value && "routes" in value;
 }
@@ -28,7 +32,7 @@ function createWorker(handlerOptions) {
   };
 }
 function createMokupWorker(input) {
-  if (typeof input === "string") {
+  if (isStringInput(input)) {
     throw new TypeError("createMokupWorker(dir) is only supported in Node runtimes.");
   }
   if (isManifest(input)) {

package/dist/worker.d.cts

@@ -1,10 +1,32 @@
-import { W as WorkerInput } from './shared/server.DNITwCtQ.cjs';
+import { a as WorkerInput } from './shared/server.DkerfsA-.cjs';
 import '@mokup/runtime';
 
+/**
+ * Minimal Worker-style fetch interface.
+ *
+ * @example
+ * import type { FetchWorker } from '@mokup/server/worker'
+ *
+ * const worker: FetchWorker = {
+ *   fetch: async () => new Response('ok'),
+ * }
+ */
 interface FetchWorker {
+    /** Fetch handler for the Worker runtime. */
     fetch: (request: Request) => Promise<Response>;
 }
-declare function createMokupWorker(input: Exclude<WorkerInput, string>): FetchWorker;
+/**
+ * Create a Worker-compatible fetch handler from a manifest or bundle.
+ *
+ * @param input - Manifest or bundle input.
+ * @returns Worker fetch handler.
+ *
+ * @example
+ * import { createMokupWorker } from '@mokup/server/worker'
+ *
+ * const worker = createMokupWorker({ version: 1, routes: [] })
+ */
+declare function createMokupWorker(input: WorkerInput): FetchWorker;
 
 export { createMokupWorker };
 export type { FetchWorker };

package/dist/worker.d.mts

@@ -1,10 +1,32 @@
-import { W as WorkerInput } from './shared/server.DNITwCtQ.mjs';
+import { a as WorkerInput } from './shared/server.DkerfsA-.mjs';
 import '@mokup/runtime';
 
+/**
+ * Minimal Worker-style fetch interface.
+ *
+ * @example
+ * import type { FetchWorker } from '@mokup/server/worker'
+ *
+ * const worker: FetchWorker = {
+ *   fetch: async () => new Response('ok'),
+ * }
+ */
 interface FetchWorker {
+    /** Fetch handler for the Worker runtime. */
     fetch: (request: Request) => Promise<Response>;
 }
-declare function createMokupWorker(input: Exclude<WorkerInput, string>): FetchWorker;
+/**
+ * Create a Worker-compatible fetch handler from a manifest or bundle.
+ *
+ * @param input - Manifest or bundle input.
+ * @returns Worker fetch handler.
+ *
+ * @example
+ * import { createMokupWorker } from '@mokup/server/worker'
+ *
+ * const worker = createMokupWorker({ version: 1, routes: [] })
+ */
+declare function createMokupWorker(input: WorkerInput): FetchWorker;
 
 export { createMokupWorker };
 export type { FetchWorker };