@mokup/cli 1.0.11 → 1.1.0

package/dist/index.cjs

@@ -131,12 +131,16 @@ async function loadConfig(file) {
   if (!mod) {
     return null;
   }
-  const value = mod?.default ?? mod;
+  const raw = mod?.default ?? mod;
+  const value = isPromise$1(raw) ? await raw : raw;
   if (!value || typeof value !== "object") {
     return null;
   }
   return value;
 }
+function isPromise$1(value) {
+  return !!value && typeof value.then === "function";
+}
 function normalizeMiddlewares(value, source, log, position) {
   if (!value) {
     return [];
@@ -790,12 +794,90 @@ async function buildManifest(options = {}) {
 }
 
 const middlewareSymbol = Symbol.for("mokup.config.middlewares");
-function createRegistry(list) {
-  return {
-    use: (...handlers) => {
-      list.push(...handlers);
+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/cli] 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, {
@@ -804,21 +886,70 @@ function attachMetadata(config, meta) {
   });
   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 = {
-      pre: createRegistry(pre),
-      normal: createRegistry(normal),
-      post: createRegistry(post)
+      app,
+      hooks: { pre: [], post: [] },
+      setStage: (next) => {
+        stage = next;
+      }
     };
-    const result = input(context);
-    const config2 = result && typeof result === "object" ? result : {};
-    return attachMetadata(config2, { pre, normal, post });
+    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 = input && typeof input === "object" ? input : {};
+  const config = normalizeConfig(input);
   return attachMetadata(config, { pre: [], normal: [], post: [] });
 }
 
@@ -965,4 +1096,6 @@ async function runCli(argv = process__default.argv) {
 exports.buildManifest = buildManifest;
 exports.createCli = createCli;
 exports.defineConfig = defineConfig;
+exports.onAfterAll = onAfterAll;
+exports.onBeforeAll = onBeforeAll;
 exports.runCli = runCli;

package/dist/index.d.cts

@@ -164,6 +164,12 @@ interface RouteDirectoryConfig {
      * @default undefined
      */
     middleware?: MiddlewareHandler | MiddlewareHandler[];
+    /**
+     * Error handling policy for defineConfig hooks.
+     *
+     * @default "warn"
+     */
+    hookError?: HookErrorPolicy;
 }
 /**
  * Middleware execution position.
@@ -174,6 +180,10 @@ interface RouteDirectoryConfig {
  * const position: MiddlewarePosition = 'pre'
  */
 type MiddlewarePosition = 'pre' | 'normal' | 'post';
+/**
+ * Error handling policy for config hooks.
+ */
+type HookErrorPolicy = 'throw' | 'warn' | 'silent';
 /**
  * Middleware registry used by defineConfig.
  *
@@ -202,39 +212,47 @@ declare function buildManifest(options?: BuildOptions): Promise<{
     manifestPath: string;
 }>;
 
+type HookHandler = () => void | Promise<void>;
+interface ConfigApp {
+    use: (...handlers: MiddlewareHandler[]) => void;
+}
 type DefineConfigFactory = (context: {
-    pre: MiddlewareRegistry;
-    normal: MiddlewareRegistry;
-    post: MiddlewareRegistry;
-}) => RouteDirectoryConfig | void;
+    app: ConfigApp;
+}) => RouteDirectoryConfig | void | Promise<RouteDirectoryConfig | void>;
+declare function onBeforeAll(handler: HookHandler): void;
+declare function onAfterAll(handler: HookHandler): void;
 /**
- * Define a directory config with Hono-style middleware registration.
+ * 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 } from '@mokup/cli'
+ * import { defineConfig, onBeforeAll, onAfterAll } from '@mokup/cli'
  *
- * export default defineConfig(({ pre, normal, post }) => {
- *   pre.use(async (c, next) => {
- *     c.header('x-before', '1')
- *     await next()
+ * export default defineConfig(({ app }) => {
+ *   onBeforeAll(() => {
+ *     app.use(async (c, next) => {
+ *       c.header('x-before', '1')
+ *       await next()
+ *     })
  *   })
  *
- *   normal.use(async (_c, next) => {
+ *   app.use(async (_c, next) => {
  *     await next()
  *   })
  *
- *   post.use(async (c, next) => {
- *     await next()
- *     c.header('x-after', '1')
+ *   onAfterAll(() => {
+ *     app.use(async (c, next) => {
+ *       await next()
+ *       c.header('x-after', '1')
+ *     })
  *   })
  *
  *   return { delay: 120 }
  * })
  */
-declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig;
+declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
 
 /**
  * Create the mokup CLI program instance.
@@ -260,5 +278,5 @@ declare function createCli(): Command;
  */
 declare function runCli(argv?: string[]): Promise<void>;
 
-export { buildManifest, createCli, defineConfig, runCli };
-export type { BuildOptions, MiddlewarePosition, MiddlewareRegistry, RouteDirectoryConfig, RouteRule };
+export { buildManifest, createCli, defineConfig, onAfterAll, onBeforeAll, runCli };
+export type { BuildOptions, HookErrorPolicy, MiddlewarePosition, MiddlewareRegistry, RouteDirectoryConfig, RouteRule };

package/dist/index.d.mts

@@ -164,6 +164,12 @@ interface RouteDirectoryConfig {
      * @default undefined
      */
     middleware?: MiddlewareHandler | MiddlewareHandler[];
+    /**
+     * Error handling policy for defineConfig hooks.
+     *
+     * @default "warn"
+     */
+    hookError?: HookErrorPolicy;
 }
 /**
  * Middleware execution position.
@@ -174,6 +180,10 @@ interface RouteDirectoryConfig {
  * const position: MiddlewarePosition = 'pre'
  */
 type MiddlewarePosition = 'pre' | 'normal' | 'post';
+/**
+ * Error handling policy for config hooks.
+ */
+type HookErrorPolicy = 'throw' | 'warn' | 'silent';
 /**
  * Middleware registry used by defineConfig.
  *
@@ -202,39 +212,47 @@ declare function buildManifest(options?: BuildOptions): Promise<{
     manifestPath: string;
 }>;
 
+type HookHandler = () => void | Promise<void>;
+interface ConfigApp {
+    use: (...handlers: MiddlewareHandler[]) => void;
+}
 type DefineConfigFactory = (context: {
-    pre: MiddlewareRegistry;
-    normal: MiddlewareRegistry;
-    post: MiddlewareRegistry;
-}) => RouteDirectoryConfig | void;
+    app: ConfigApp;
+}) => RouteDirectoryConfig | void | Promise<RouteDirectoryConfig | void>;
+declare function onBeforeAll(handler: HookHandler): void;
+declare function onAfterAll(handler: HookHandler): void;
 /**
- * Define a directory config with Hono-style middleware registration.
+ * 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 } from '@mokup/cli'
+ * import { defineConfig, onBeforeAll, onAfterAll } from '@mokup/cli'
  *
- * export default defineConfig(({ pre, normal, post }) => {
- *   pre.use(async (c, next) => {
- *     c.header('x-before', '1')
- *     await next()
+ * export default defineConfig(({ app }) => {
+ *   onBeforeAll(() => {
+ *     app.use(async (c, next) => {
+ *       c.header('x-before', '1')
+ *       await next()
+ *     })
  *   })
  *
- *   normal.use(async (_c, next) => {
+ *   app.use(async (_c, next) => {
  *     await next()
  *   })
  *
- *   post.use(async (c, next) => {
- *     await next()
- *     c.header('x-after', '1')
+ *   onAfterAll(() => {
+ *     app.use(async (c, next) => {
+ *       await next()
+ *       c.header('x-after', '1')
+ *     })
  *   })
  *
  *   return { delay: 120 }
  * })
  */
-declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig;
+declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
 
 /**
  * Create the mokup CLI program instance.
@@ -260,5 +278,5 @@ declare function createCli(): Command;
  */
 declare function runCli(argv?: string[]): Promise<void>;
 
-export { buildManifest, createCli, defineConfig, runCli };
-export type { BuildOptions, MiddlewarePosition, MiddlewareRegistry, RouteDirectoryConfig, RouteRule };
+export { buildManifest, createCli, defineConfig, onAfterAll, onBeforeAll, runCli };
+export type { BuildOptions, HookErrorPolicy, MiddlewarePosition, MiddlewareRegistry, RouteDirectoryConfig, RouteRule };

package/dist/index.d.ts

@@ -164,6 +164,12 @@ interface RouteDirectoryConfig {
      * @default undefined
      */
     middleware?: MiddlewareHandler | MiddlewareHandler[];
+    /**
+     * Error handling policy for defineConfig hooks.
+     *
+     * @default "warn"
+     */
+    hookError?: HookErrorPolicy;
 }
 /**
  * Middleware execution position.
@@ -174,6 +180,10 @@ interface RouteDirectoryConfig {
  * const position: MiddlewarePosition = 'pre'
  */
 type MiddlewarePosition = 'pre' | 'normal' | 'post';
+/**
+ * Error handling policy for config hooks.
+ */
+type HookErrorPolicy = 'throw' | 'warn' | 'silent';
 /**
  * Middleware registry used by defineConfig.
  *
@@ -202,39 +212,47 @@ declare function buildManifest(options?: BuildOptions): Promise<{
     manifestPath: string;
 }>;
 
+type HookHandler = () => void | Promise<void>;
+interface ConfigApp {
+    use: (...handlers: MiddlewareHandler[]) => void;
+}
 type DefineConfigFactory = (context: {
-    pre: MiddlewareRegistry;
-    normal: MiddlewareRegistry;
-    post: MiddlewareRegistry;
-}) => RouteDirectoryConfig | void;
+    app: ConfigApp;
+}) => RouteDirectoryConfig | void | Promise<RouteDirectoryConfig | void>;
+declare function onBeforeAll(handler: HookHandler): void;
+declare function onAfterAll(handler: HookHandler): void;
 /**
- * Define a directory config with Hono-style middleware registration.
+ * 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 } from '@mokup/cli'
+ * import { defineConfig, onBeforeAll, onAfterAll } from '@mokup/cli'
  *
- * export default defineConfig(({ pre, normal, post }) => {
- *   pre.use(async (c, next) => {
- *     c.header('x-before', '1')
- *     await next()
+ * export default defineConfig(({ app }) => {
+ *   onBeforeAll(() => {
+ *     app.use(async (c, next) => {
+ *       c.header('x-before', '1')
+ *       await next()
+ *     })
  *   })
  *
- *   normal.use(async (_c, next) => {
+ *   app.use(async (_c, next) => {
  *     await next()
  *   })
  *
- *   post.use(async (c, next) => {
- *     await next()
- *     c.header('x-after', '1')
+ *   onAfterAll(() => {
+ *     app.use(async (c, next) => {
+ *       await next()
+ *       c.header('x-after', '1')
+ *     })
  *   })
  *
  *   return { delay: 120 }
  * })
  */
-declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig;
+declare function defineConfig(input: RouteDirectoryConfig | DefineConfigFactory): RouteDirectoryConfig | Promise<RouteDirectoryConfig>;
 
 /**
  * Create the mokup CLI program instance.
@@ -260,5 +278,5 @@ declare function createCli(): Command;
  */
 declare function runCli(argv?: string[]): Promise<void>;
 
-export { buildManifest, createCli, defineConfig, runCli };
-export type { BuildOptions, MiddlewarePosition, MiddlewareRegistry, RouteDirectoryConfig, RouteRule };
+export { buildManifest, createCli, defineConfig, onAfterAll, onBeforeAll, runCli };
+export type { BuildOptions, HookErrorPolicy, MiddlewarePosition, MiddlewareRegistry, RouteDirectoryConfig, RouteRule };

package/dist/index.mjs

@@ -124,12 +124,16 @@ async function loadConfig(file) {
   if (!mod) {
     return null;
   }
-  const value = mod?.default ?? mod;
+  const raw = mod?.default ?? mod;
+  const value = isPromise$1(raw) ? await raw : raw;
   if (!value || typeof value !== "object") {
     return null;
   }
   return value;
 }
+function isPromise$1(value) {
+  return !!value && typeof value.then === "function";
+}
 function normalizeMiddlewares(value, source, log, position) {
   if (!value) {
     return [];
@@ -783,12 +787,90 @@ async function buildManifest(options = {}) {
 }
 
 const middlewareSymbol = Symbol.for("mokup.config.middlewares");
-function createRegistry(list) {
-  return {
-    use: (...handlers) => {
-      list.push(...handlers);
+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/cli] 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, {
@@ -797,21 +879,70 @@ function attachMetadata(config, meta) {
   });
   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 = {
-      pre: createRegistry(pre),
-      normal: createRegistry(normal),
-      post: createRegistry(post)
+      app,
+      hooks: { pre: [], post: [] },
+      setStage: (next) => {
+        stage = next;
+      }
     };
-    const result = input(context);
-    const config2 = result && typeof result === "object" ? result : {};
-    return attachMetadata(config2, { pre, normal, post });
+    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 = input && typeof input === "object" ? input : {};
+  const config = normalizeConfig(input);
   return attachMetadata(config, { pre: [], normal: [], post: [] });
 }
 
@@ -955,4 +1086,4 @@ async function runCli(argv = process.argv) {
   await program.parseAsync(argv);
 }
 
-export { buildManifest, createCli, defineConfig, runCli };
+export { buildManifest, createCli, defineConfig, onAfterAll, onBeforeAll, runCli };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mokup/cli",
   "type": "module",
-  "version": "1.0.11",
+  "version": "1.1.0",
   "description": "CLI for building mokup manifests and handlers.",
   "license": "MIT",
   "homepage": "https://mokup.icebreaker.top",
@@ -29,7 +29,7 @@
   "dependencies": {
     "commander": "^14.0.0",
     "@mokup/runtime": "1.0.6",
-    "@mokup/server": "1.1.8",
+    "@mokup/server": "1.2.0",
     "@mokup/shared": "1.1.1"
   },
   "devDependencies": {