@mokup/server 1.2.0 → 1.2.1

package/dist/index.cjs

@@ -1,169 +1,17 @@
 'use strict';
 
+const defineConfig$1 = require('@mokup/shared/define-config');
 const fetch = require('./fetch.cjs');
 const worker = require('./worker.cjs');
 require('@mokup/runtime');
-require('./shared/server.aaygIV2Q.cjs');
+require('./shared/server.D0X6h49r.cjs');
 
-const middlewareSymbol = Symbol.for("mokup.config.middlewares");
-const contextStack = [];
-function getActiveContext() {
-  const context = contextStack[contextStack.length - 1];
-  if (!context) {
-    throw new Error("onBeforeAll/onAfterAll must be called inside defineConfig()");
-  }
-  return context;
-}
-function runWithContext(context, fn) {
-  contextStack.push(context);
-  try {
-    const result = fn();
-    if (isPromise(result)) {
-      return result.finally(() => {
-        contextStack.pop();
-      });
-    }
-    contextStack.pop();
-    return result;
-  } catch (error) {
-    contextStack.pop();
-    throw error;
-  }
-}
-function isPromise(value) {
-  return !!value && typeof value.then === "function";
-}
-function normalizeHookError(policy) {
-  if (policy === "throw" || policy === "silent") {
-    return policy;
-  }
-  return "warn";
-}
-function reportHookError(error, policy) {
-  if (policy === "silent") {
-    return;
-  }
-  if (policy === "warn") {
-    console.warn("[@mokup/server] defineConfig hook failed:", error);
-  }
-}
-function runHookSequence(stage, hooks, policy, setStage) {
-  if (hooks.length === 0) {
-    return;
-  }
-  setStage(stage);
-  let chain = null;
-  const runHook = (hook) => {
-    try {
-      const result = hook();
-      if (isPromise(result)) {
-        return result.catch((error) => {
-          if (policy === "throw") {
-            throw error;
-          }
-          reportHookError(error, policy);
-        });
-      }
-      return void 0;
-    } catch (error) {
-      if (policy === "throw") {
-        throw error;
-      }
-      reportHookError(error, policy);
-      return void 0;
-    }
-  };
-  for (const hook of hooks) {
-    if (chain) {
-      chain = chain.then(() => runHook(hook));
-      continue;
-    }
-    const result = runHook(hook);
-    if (isPromise(result)) {
-      chain = result;
-    }
-  }
-  if (!chain) {
-    setStage("normal");
-    return;
-  }
-  return chain.finally(() => {
-    setStage("normal");
-  });
-}
-function attachMetadata(config, meta) {
-  Object.defineProperty(config, middlewareSymbol, {
-    value: meta,
-    enumerable: false
-  });
-  return config;
-}
-function normalizeConfig(value) {
-  return value && typeof value === "object" ? value : {};
-}
-function onBeforeAll(handler) {
-  if (typeof handler !== "function") {
-    throw new TypeError("onBeforeAll expects a function");
-  }
-  const context = getActiveContext();
-  context.hooks.pre.push(handler);
-}
-function onAfterAll(handler) {
-  if (typeof handler !== "function") {
-    throw new TypeError("onAfterAll expects a function");
-  }
-  const context = getActiveContext();
-  context.hooks.post.push(handler);
-}
-function defineConfig(input) {
-  if (typeof input === "function") {
-    const pre = [];
-    const normal = [];
-    const post = [];
-    let stage = "normal";
-    const app = {
-      use: (...handlers) => {
-        if (stage === "pre") {
-          pre.push(...handlers);
-          return;
-        }
-        if (stage === "post") {
-          post.push(...handlers);
-          return;
-        }
-        normal.push(...handlers);
-      }
-    };
-    const context = {
-      app,
-      hooks: { pre: [], post: [] },
-      setStage: (next) => {
-        stage = next;
-      }
-    };
-    const result = runWithContext(context, () => input({ app }));
-    const finalize = (value) => {
-      const config2 = normalizeConfig(value);
-      const policy = normalizeHookError(config2.hookError);
-      const preResult = runHookSequence("pre", context.hooks.pre, policy, context.setStage);
-      const runPost = () => runHookSequence("post", context.hooks.post, policy, context.setStage);
-      if (isPromise(preResult)) {
-        return preResult.then(runPost).then(() => attachMetadata(config2, { pre, normal, post }));
-      }
-      const postResult = runPost();
-      if (isPromise(postResult)) {
-        return postResult.then(() => attachMetadata(config2, { pre, normal, post }));
-      }
-      return attachMetadata(config2, { pre, normal, post });
-    };
-    if (isPromise(result)) {
-      return result.then(finalize);
-    }
-    return finalize(result);
-  }
-  const config = normalizeConfig(input);
-  return attachMetadata(config, { pre: [], normal: [], post: [] });
-}
+const shared = defineConfig$1.createDefineConfig({
+  logPrefix: "[@mokup/server]"
+});
+const defineConfig = shared.defineConfig;
+const onBeforeAll = shared.onBeforeAll;
+const onAfterAll = shared.onAfterAll;
 
 exports.createFetchHandler = fetch.createFetchHandler;
 exports.createMokupWorker = worker.createMokupWorker;

package/dist/index.d.cts

@@ -1,3 +1,4 @@
+import * as _mokup_shared_define_config from '@mokup/shared/define-config';
 import { R as RouteDirectoryConfig } from './shared/server.DLPB_I9q.cjs';
 export { H as HookErrorPolicy, M as MiddlewarePosition, a as MiddlewareRegistry, b as ResolvedMiddleware, c as RouteRule } from './shared/server.DLPB_I9q.cjs';
 import { MiddlewareHandler } from '@mokup/shared/hono';
@@ -7,46 +8,8 @@ export { F as FetchHandler, S as ServerOptions, W as WorkerBundle, a as WorkerIn
 export { createMokupWorker } from './worker.cjs';
 export { Manifest, ManifestRoute, ModuleMap, RuntimeOptions } from '@mokup/runtime';
 
-type HookHandler = () => void | Promise<void>;
-interface ConfigApp {
-    use: (...handlers: MiddlewareHandler[]) => void;
-}
-type DefineConfigFactory = (context: {
-    app: ConfigApp;
-}) => RouteDirectoryConfig | void | Promise<RouteDirectoryConfig | void>;
-declare function onBeforeAll(handler: HookHandler): void;
-declare function onAfterAll(handler: HookHandler): void;
-/**
- * Define a directory config with hook-based middleware registration.
- *
- * @param input - Config object or factory callback.
- * @returns Route directory config with middleware metadata.
- *
- * @example
- * import { defineConfig, onBeforeAll, onAfterAll } from '@mokup/server'
- *
- * export default defineConfig(({ app }) => {
- *   onBeforeAll(() => {
- *     app.use(async (c, next) => {
- *       c.header('x-before', '1')
- *       await next()
- *     })
- *   })
- *
- *   app.use(async (_c, next) => {
- *     await next()
- *   })
- *
- *   onAfterAll(() => {
- *     app.use(async (c, next) => {
- *       await next()
- *       c.header('x-after', '1')
- *     })
- *   })
- *
- *   return { delay: 120 }
- * })
- */
-declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
+declare const defineConfig: (input: RouteDirectoryConfig | _mokup_shared_define_config.DefineConfigFactory<RouteDirectoryConfig, MiddlewareHandler>) => RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
+declare const onBeforeAll: (handler: _mokup_shared_define_config.HookHandler) => void;
+declare const onAfterAll: (handler: _mokup_shared_define_config.HookHandler) => void;
 
 export { RouteDirectoryConfig, defineConfig, onAfterAll, onBeforeAll };

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import * as _mokup_shared_define_config from '@mokup/shared/define-config';
 import { R as RouteDirectoryConfig } from './shared/server.DLPB_I9q.mjs';
 export { H as HookErrorPolicy, M as MiddlewarePosition, a as MiddlewareRegistry, b as ResolvedMiddleware, c as RouteRule } from './shared/server.DLPB_I9q.mjs';
 import { MiddlewareHandler } from '@mokup/shared/hono';
@@ -7,46 +8,8 @@ export { F as FetchHandler, S as ServerOptions, W as WorkerBundle, a as WorkerIn
 export { createMokupWorker } from './worker.mjs';
 export { Manifest, ManifestRoute, ModuleMap, RuntimeOptions } from '@mokup/runtime';
 
-type HookHandler = () => void | Promise<void>;
-interface ConfigApp {
-    use: (...handlers: MiddlewareHandler[]) => void;
-}
-type DefineConfigFactory = (context: {
-    app: ConfigApp;
-}) => RouteDirectoryConfig | void | Promise<RouteDirectoryConfig | void>;
-declare function onBeforeAll(handler: HookHandler): void;
-declare function onAfterAll(handler: HookHandler): void;
-/**
- * Define a directory config with hook-based middleware registration.
- *
- * @param input - Config object or factory callback.
- * @returns Route directory config with middleware metadata.
- *
- * @example
- * import { defineConfig, onBeforeAll, onAfterAll } from '@mokup/server'
- *
- * export default defineConfig(({ app }) => {
- *   onBeforeAll(() => {
- *     app.use(async (c, next) => {
- *       c.header('x-before', '1')
- *       await next()
- *     })
- *   })
- *
- *   app.use(async (_c, next) => {
- *     await next()
- *   })
- *
- *   onAfterAll(() => {
- *     app.use(async (c, next) => {
- *       await next()
- *       c.header('x-after', '1')
- *     })
- *   })
- *
- *   return { delay: 120 }
- * })
- */
-declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
+declare const defineConfig: (input: RouteDirectoryConfig | _mokup_shared_define_config.DefineConfigFactory<RouteDirectoryConfig, MiddlewareHandler>) => RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
+declare const onBeforeAll: (handler: _mokup_shared_define_config.HookHandler) => void;
+declare const onAfterAll: (handler: _mokup_shared_define_config.HookHandler) => void;
 
 export { RouteDirectoryConfig, defineConfig, onAfterAll, onBeforeAll };

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import * as _mokup_shared_define_config from '@mokup/shared/define-config';
 import { R as RouteDirectoryConfig } from './shared/server.DLPB_I9q.js';
 export { H as HookErrorPolicy, M as MiddlewarePosition, a as MiddlewareRegistry, b as ResolvedMiddleware, c as RouteRule } from './shared/server.DLPB_I9q.js';
 import { MiddlewareHandler } from '@mokup/shared/hono';
@@ -7,46 +8,8 @@ export { F as FetchHandler, S as ServerOptions, W as WorkerBundle, a as WorkerIn
 export { createMokupWorker } from './worker.js';
 export { Manifest, ManifestRoute, ModuleMap, RuntimeOptions } from '@mokup/runtime';
 
-type HookHandler = () => void | Promise<void>;
-interface ConfigApp {
-    use: (...handlers: MiddlewareHandler[]) => void;
-}
-type DefineConfigFactory = (context: {
-    app: ConfigApp;
-}) => RouteDirectoryConfig | void | Promise<RouteDirectoryConfig | void>;
-declare function onBeforeAll(handler: HookHandler): void;
-declare function onAfterAll(handler: HookHandler): void;
-/**
- * Define a directory config with hook-based middleware registration.
- *
- * @param input - Config object or factory callback.
- * @returns Route directory config with middleware metadata.
- *
- * @example
- * import { defineConfig, onBeforeAll, onAfterAll } from '@mokup/server'
- *
- * export default defineConfig(({ app }) => {
- *   onBeforeAll(() => {
- *     app.use(async (c, next) => {
- *       c.header('x-before', '1')
- *       await next()
- *     })
- *   })
- *
- *   app.use(async (_c, next) => {
- *     await next()
- *   })
- *
- *   onAfterAll(() => {
- *     app.use(async (c, next) => {
- *       await next()
- *       c.header('x-after', '1')
- *     })
- *   })
- *
- *   return { delay: 120 }
- * })
- */
-declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
+declare const defineConfig: (input: RouteDirectoryConfig | _mokup_shared_define_config.DefineConfigFactory<RouteDirectoryConfig, MiddlewareHandler>) => RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
+declare const onBeforeAll: (handler: _mokup_shared_define_config.HookHandler) => void;
+declare const onAfterAll: (handler: _mokup_shared_define_config.HookHandler) => void;
 
 export { RouteDirectoryConfig, defineConfig, onAfterAll, onBeforeAll };

package/dist/index.mjs

@@ -1,166 +1,14 @@
+import { createDefineConfig } from '@mokup/shared/define-config';
 export { createFetchHandler } from './fetch.mjs';
 export { createMokupWorker } from './worker.mjs';
 import '@mokup/runtime';
-import './shared/server.LbftO9Jh.mjs';
+import './shared/server.B5ThEHd_.mjs';
 
-const middlewareSymbol = Symbol.for("mokup.config.middlewares");
-const contextStack = [];
-function getActiveContext() {
-  const context = contextStack[contextStack.length - 1];
-  if (!context) {
-    throw new Error("onBeforeAll/onAfterAll must be called inside defineConfig()");
-  }
-  return context;
-}
-function runWithContext(context, fn) {
-  contextStack.push(context);
-  try {
-    const result = fn();
-    if (isPromise(result)) {
-      return result.finally(() => {
-        contextStack.pop();
-      });
-    }
-    contextStack.pop();
-    return result;
-  } catch (error) {
-    contextStack.pop();
-    throw error;
-  }
-}
-function isPromise(value) {
-  return !!value && typeof value.then === "function";
-}
-function normalizeHookError(policy) {
-  if (policy === "throw" || policy === "silent") {
-    return policy;
-  }
-  return "warn";
-}
-function reportHookError(error, policy) {
-  if (policy === "silent") {
-    return;
-  }
-  if (policy === "warn") {
-    console.warn("[@mokup/server] defineConfig hook failed:", error);
-  }
-}
-function runHookSequence(stage, hooks, policy, setStage) {
-  if (hooks.length === 0) {
-    return;
-  }
-  setStage(stage);
-  let chain = null;
-  const runHook = (hook) => {
-    try {
-      const result = hook();
-      if (isPromise(result)) {
-        return result.catch((error) => {
-          if (policy === "throw") {
-            throw error;
-          }
-          reportHookError(error, policy);
-        });
-      }
-      return void 0;
-    } catch (error) {
-      if (policy === "throw") {
-        throw error;
-      }
-      reportHookError(error, policy);
-      return void 0;
-    }
-  };
-  for (const hook of hooks) {
-    if (chain) {
-      chain = chain.then(() => runHook(hook));
-      continue;
-    }
-    const result = runHook(hook);
-    if (isPromise(result)) {
-      chain = result;
-    }
-  }
-  if (!chain) {
-    setStage("normal");
-    return;
-  }
-  return chain.finally(() => {
-    setStage("normal");
-  });
-}
-function attachMetadata(config, meta) {
-  Object.defineProperty(config, middlewareSymbol, {
-    value: meta,
-    enumerable: false
-  });
-  return config;
-}
-function normalizeConfig(value) {
-  return value && typeof value === "object" ? value : {};
-}
-function onBeforeAll(handler) {
-  if (typeof handler !== "function") {
-    throw new TypeError("onBeforeAll expects a function");
-  }
-  const context = getActiveContext();
-  context.hooks.pre.push(handler);
-}
-function onAfterAll(handler) {
-  if (typeof handler !== "function") {
-    throw new TypeError("onAfterAll expects a function");
-  }
-  const context = getActiveContext();
-  context.hooks.post.push(handler);
-}
-function defineConfig(input) {
-  if (typeof input === "function") {
-    const pre = [];
-    const normal = [];
-    const post = [];
-    let stage = "normal";
-    const app = {
-      use: (...handlers) => {
-        if (stage === "pre") {
-          pre.push(...handlers);
-          return;
-        }
-        if (stage === "post") {
-          post.push(...handlers);
-          return;
-        }
-        normal.push(...handlers);
-      }
-    };
-    const context = {
-      app,
-      hooks: { pre: [], post: [] },
-      setStage: (next) => {
-        stage = next;
-      }
-    };
-    const result = runWithContext(context, () => input({ app }));
-    const finalize = (value) => {
-      const config2 = normalizeConfig(value);
-      const policy = normalizeHookError(config2.hookError);
-      const preResult = runHookSequence("pre", context.hooks.pre, policy, context.setStage);
-      const runPost = () => runHookSequence("post", context.hooks.post, policy, context.setStage);
-      if (isPromise(preResult)) {
-        return preResult.then(runPost).then(() => attachMetadata(config2, { pre, normal, post }));
-      }
-      const postResult = runPost();
-      if (isPromise(postResult)) {
-        return postResult.then(() => attachMetadata(config2, { pre, normal, post }));
-      }
-      return attachMetadata(config2, { pre, normal, post });
-    };
-    if (isPromise(result)) {
-      return result.then(finalize);
-    }
-    return finalize(result);
-  }
-  const config = normalizeConfig(input);
-  return attachMetadata(config, { pre: [], normal: [], post: [] });
-}
+const shared = createDefineConfig({
+  logPrefix: "[@mokup/server]"
+});
+const defineConfig = shared.defineConfig;
+const onBeforeAll = shared.onBeforeAll;
+const onAfterAll = shared.onAfterAll;
 
 export { defineConfig, onAfterAll, onBeforeAll };

package/dist/koa.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const runtime = require('@mokup/runtime');
-const runtime$1 = require('./shared/server.aaygIV2Q.cjs');
+const runtime$1 = require('./shared/server.D0X6h49r.cjs');
 
 function createKoaMiddleware(options) {
   const runtime$2 = runtime.createRuntime(runtime$1.toRuntimeOptions(options));

package/dist/koa.mjs

@@ -1,5 +1,5 @@
 import { createRuntime } from '@mokup/runtime';
-import { t as toRuntimeOptions, a as toRuntimeRequestFromNode, c as toBinaryBody } from './shared/server.LbftO9Jh.mjs';
+import { t as toRuntimeOptions, a as toRuntimeRequestFromNode, c as toBinaryBody } from './shared/server.B5ThEHd_.mjs';
 
 function createKoaMiddleware(options) {
   const runtime = createRuntime(toRuntimeOptions(options));

package/dist/node.cjs

@@ -9,21 +9,25 @@ const koa = require('./koa.cjs');
 const workerNode = require('./worker-node.cjs');
 const nodeServer = require('@hono/node-server');
 require('@mokup/runtime');
-require('./shared/server.aaygIV2Q.cjs');
+require('./shared/server.D0X6h49r.cjs');
 require('@mokup/shared/pathe');
 require('node:fs');
 require('node:module');
 require('@mokup/shared/playground-grouping');
+require('@mokup/shared/route-utils');
+require('@mokup/shared/config-utils');
+require('@mokup/shared/module-loader');
+require('@mokup/shared/route-constants');
+require('@mokup/shared/mock-files');
+require('@mokup/shared/load-rules');
+require('@mokup/shared/scan-utils');
 require('@mokup/shared/path-utils');
 require('@mokup/shared/timing');
-require('node:buffer');
-require('node:url');
-require('@mokup/shared/esbuild');
-require('node:process');
-require('@mokup/shared/jsonc-parser');
 require('@mokup/shared/hono');
+require('node:process');
 require('./fetch.cjs');
 require('node:path');
+require('node:url');
 
 
 

package/dist/node.mjs

@@ -7,18 +7,22 @@ export { createKoaMiddleware } from './koa.mjs';
 export { createMokupWorker } from './worker-node.mjs';
 export { serve } from '@hono/node-server';
 import '@mokup/runtime';
-import './shared/server.LbftO9Jh.mjs';
+import './shared/server.B5ThEHd_.mjs';
 import '@mokup/shared/pathe';
 import 'node:fs';
 import 'node:module';
 import '@mokup/shared/playground-grouping';
+import '@mokup/shared/route-utils';
+import '@mokup/shared/config-utils';
+import '@mokup/shared/module-loader';
+import '@mokup/shared/route-constants';
+import '@mokup/shared/mock-files';
+import '@mokup/shared/load-rules';
+import '@mokup/shared/scan-utils';
 import '@mokup/shared/path-utils';
 import '@mokup/shared/timing';
-import 'node:buffer';
-import 'node:url';
-import '@mokup/shared/esbuild';
-import 'node:process';
-import '@mokup/shared/jsonc-parser';
 import '@mokup/shared/hono';
+import 'node:process';
 import './fetch.mjs';
 import 'node:path';
+import 'node:url';

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

@@ -193,7 +193,7 @@ async function toRuntimeRequestFromFetch(request) {
 async function toRuntimeRequestFromNode(req, bodyOverride) {
   const headers = normalizeNodeHeaders(req.headers);
   const contentType = (headers["content-type"] ?? "").split(";")[0]?.trim() ?? "";
-  const url = resolveUrl(req.originalUrl ?? req.url ?? "/", headers);
+  const url = resolveUrl(req.url ?? req.originalUrl ?? "/", headers);
   const resolvedBody = await resolveBody(
     typeof bodyOverride === "undefined" ? req.body : bodyOverride,
     contentType,

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

@@ -195,7 +195,7 @@ async function toRuntimeRequestFromFetch(request) {
 async function toRuntimeRequestFromNode(req, bodyOverride) {
   const headers = normalizeNodeHeaders(req.headers);
   const contentType = (headers["content-type"] ?? "").split(";")[0]?.trim() ?? "";
-  const url = resolveUrl(req.originalUrl ?? req.url ?? "/", headers);
+  const url = resolveUrl(req.url ?? req.originalUrl ?? "/", headers);
   const resolvedBody = await resolveBody(
     typeof bodyOverride === "undefined" ? req.body : bodyOverride,
     contentType,

package/dist/worker-node.cjs

@@ -4,7 +4,7 @@ const node_path = require('node:path');
 const node_url = require('node:url');
 const fetch = require('./fetch.cjs');
 require('@mokup/runtime');
-require('./shared/server.aaygIV2Q.cjs');
+require('./shared/server.D0X6h49r.cjs');
 
 function ensureTrailingSlash(value) {
   return value.endsWith("/") ? value : `${value}/`;

package/dist/worker-node.mjs

@@ -2,7 +2,7 @@ import { resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { createFetchHandler } from './fetch.mjs';
 import '@mokup/runtime';
-import './shared/server.LbftO9Jh.mjs';
+import './shared/server.B5ThEHd_.mjs';
 
 function ensureTrailingSlash(value) {
   return value.endsWith("/") ? value : `${value}/`;

package/dist/worker.cjs

@@ -2,7 +2,7 @@
 
 const fetch = require('./fetch.cjs');
 require('@mokup/runtime');
-require('./shared/server.aaygIV2Q.cjs');
+require('./shared/server.D0X6h49r.cjs');
 
 function isStringInput(value) {
   return typeof value === "string";

package/dist/worker.mjs

@@ -1,6 +1,6 @@
 import { createFetchHandler } from './fetch.mjs';
 import '@mokup/runtime';
-import './shared/server.LbftO9Jh.mjs';
+import './shared/server.B5ThEHd_.mjs';
 
 function isStringInput(value) {
   return typeof value === "string";