@mokup/server 1.1.6 → 1.2.0

package/dist/fetch-server.cjs

@@ -3,11 +3,14 @@
 const pathe = require('@mokup/shared/pathe');
 const node_fs = require('node:fs');
 const node_module = require('node:module');
-const process = require('node:process');
+const playgroundGrouping = require('@mokup/shared/playground-grouping');
 const runtime = require('@mokup/runtime');
+const pathUtils = require('@mokup/shared/path-utils');
+const timing = require('@mokup/shared/timing');
 const node_buffer = require('node:buffer');
 const node_url = require('node:url');
 const esbuild = require('@mokup/shared/esbuild');
+const process = require('node:process');
 const jsoncParser = require('@mokup/shared/jsonc-parser');
 const hono = require('@mokup/shared/hono');
 
@@ -117,92 +120,6 @@ async function readPlaygroundAsset(distDir, relPath) {
   return new Response(content, { headers: { "Content-Type": contentType } });
 }
 
-function toPosixPath(value) {
-  return value.replace(/\\/g, "/");
-}
-function normalizePath(value) {
-  return toPosixPath(pathe.normalize(value));
-}
-function isAncestor(parent, child) {
-  const normalizedParent = normalizePath(parent).replace(/\/$/, "");
-  const normalizedChild = normalizePath(child);
-  return normalizedChild === normalizedParent || normalizedChild.startsWith(`${normalizedParent}/`);
-}
-function resolveGroupRoot(dirs, serverRoot) {
-  if (!dirs || dirs.length === 0) {
-    return serverRoot ?? process.cwd();
-  }
-  if (serverRoot) {
-    const normalizedRoot = normalizePath(serverRoot);
-    const canUseRoot = dirs.every((dir) => isAncestor(normalizedRoot, dir));
-    if (canUseRoot) {
-      return normalizedRoot;
-    }
-  }
-  if (dirs.length === 1) {
-    return normalizePath(pathe.dirname(dirs[0]));
-  }
-  let common = normalizePath(dirs[0]);
-  for (const dir of dirs.slice(1)) {
-    const normalizedDir = normalizePath(dir);
-    while (common && !isAncestor(common, normalizedDir)) {
-      const parent = normalizePath(pathe.dirname(common));
-      if (parent === common) {
-        break;
-      }
-      common = parent;
-    }
-  }
-  if (!common || common === "/") {
-    return serverRoot ?? process.cwd();
-  }
-  return common;
-}
-function resolveGroups(dirs, root) {
-  const groups = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const dir of dirs) {
-    const normalized = normalizePath(dir);
-    if (seen.has(normalized)) {
-      continue;
-    }
-    seen.add(normalized);
-    const rel = toPosixPath(pathe.relative(root, normalized));
-    const label = rel && !rel.startsWith("..") ? rel : normalized;
-    groups.push({
-      key: normalized,
-      label,
-      path: normalized
-    });
-  }
-  return groups;
-}
-function resolveRouteGroup(routeFile, groups) {
-  if (groups.length === 0) {
-    return void 0;
-  }
-  const normalizedFile = toPosixPath(pathe.normalize(routeFile));
-  let matched;
-  for (const group of groups) {
-    if (normalizedFile === group.path || normalizedFile.startsWith(`${group.path}/`)) {
-      if (!matched || group.path.length > matched.path.length) {
-        matched = group;
-      }
-    }
-  }
-  return matched;
-}
-function formatRouteFile(file, root) {
-  if (!root) {
-    return toPosixPath(file);
-  }
-  const rel = toPosixPath(pathe.relative(root, file));
-  if (!rel || rel.startsWith("..")) {
-    return toPosixPath(file);
-  }
-  return rel;
-}
-
 const disabledReasonSet = /* @__PURE__ */ new Set([
   "disabled",
   "disabled-dir",
@@ -229,10 +146,10 @@ function normalizeIgnoredReason(reason) {
   return "unknown";
 }
 function toPlaygroundRoute(route, root, groups) {
-  const matchedGroup = resolveRouteGroup(route.file, groups);
-  const preSources = route.middlewares?.filter((entry) => entry.position === "pre").map((entry) => formatRouteFile(entry.source, root)) ?? [];
-  const postSources = route.middlewares?.filter((entry) => entry.position === "post").map((entry) => formatRouteFile(entry.source, root)) ?? [];
-  const normalSources = route.middlewares?.filter((entry) => entry.position !== "pre" && entry.position !== "post").map((entry) => formatRouteFile(entry.source, root)) ?? [];
+  const matchedGroup = playgroundGrouping.resolveRouteGroup(route.file, groups);
+  const preSources = route.middlewares?.filter((entry) => entry.position === "pre").map((entry) => playgroundGrouping.formatRouteFile(entry.source, root)) ?? [];
+  const postSources = route.middlewares?.filter((entry) => entry.position === "post").map((entry) => playgroundGrouping.formatRouteFile(entry.source, root)) ?? [];
+  const normalSources = route.middlewares?.filter((entry) => entry.position !== "pre" && entry.position !== "post").map((entry) => playgroundGrouping.formatRouteFile(entry.source, root)) ?? [];
   const combinedSources = [
     ...preSources,
     ...normalSources,
@@ -241,7 +158,7 @@ function toPlaygroundRoute(route, root, groups) {
   return {
     method: route.method,
     url: route.template,
-    file: formatRouteFile(route.file, root),
+    file: playgroundGrouping.formatRouteFile(route.file, root),
     type: typeof route.handler === "function" ? "handler" : "static",
     status: route.status,
     delay: route.delay,
@@ -258,9 +175,9 @@ function toPlaygroundRoute(route, root, groups) {
   };
 }
 function toPlaygroundDisabledRoute(route, root, groups) {
-  const matchedGroup = resolveRouteGroup(route.file, groups);
+  const matchedGroup = playgroundGrouping.resolveRouteGroup(route.file, groups);
   const disabled = {
-    file: formatRouteFile(route.file, root),
+    file: playgroundGrouping.formatRouteFile(route.file, root),
     reason: normalizeDisabledReason(route.reason)
   };
   if (typeof route.method !== "undefined") {
@@ -276,9 +193,9 @@ function toPlaygroundDisabledRoute(route, root, groups) {
   return disabled;
 }
 function toPlaygroundIgnoredRoute(route, root, groups) {
-  const matchedGroup = resolveRouteGroup(route.file, groups);
+  const matchedGroup = playgroundGrouping.resolveRouteGroup(route.file, groups);
   const ignored = {
-    file: formatRouteFile(route.file, root),
+    file: playgroundGrouping.formatRouteFile(route.file, root),
     reason: normalizeIgnoredReason(route.reason)
   };
   if (matchedGroup) {
@@ -288,9 +205,9 @@ function toPlaygroundIgnoredRoute(route, root, groups) {
   return ignored;
 }
 function toPlaygroundConfigFile(entry, root, groups) {
-  const matchedGroup = resolveRouteGroup(entry.file, groups);
+  const matchedGroup = playgroundGrouping.resolveRouteGroup(entry.file, groups);
   const configFile = {
-    file: formatRouteFile(entry.file, root)
+    file: playgroundGrouping.formatRouteFile(entry.file, root)
   };
   if (matchedGroup) {
     configFile.groupKey = matchedGroup.key;
@@ -327,8 +244,8 @@ function registerPlaygroundRoutes(params) {
   params.app.get(`${playgroundPath}/`, () => serveIndex());
   params.app.get(`${playgroundPath}/index.html`, () => serveIndex());
   params.app.get(`${playgroundPath}/routes`, (c) => {
-    const baseRoot = resolveGroupRoot(params.dirs, params.root);
-    const groups = resolveGroups(params.dirs, baseRoot);
+    const baseRoot = playgroundGrouping.resolveGroupRoot(params.dirs, params.root);
+    const groups = playgroundGrouping.resolveGroups(params.dirs, baseRoot);
     return c.json({
       basePath: playgroundPath,
       root: baseRoot,
@@ -394,59 +311,10 @@ function resolveDirs(dir, root) {
   );
   return Array.from(new Set(normalized));
 }
-function createDebouncer(delayMs, fn) {
-  let timer = null;
-  return () => {
-    if (timer) {
-      clearTimeout(timer);
-    }
-    timer = setTimeout(() => {
-      timer = null;
-      fn();
-    }, delayMs);
-  };
-}
-function toPosix(value) {
-  return value.replace(/\\/g, "/");
-}
-function isInDirs(file, dirs) {
-  const normalized = toPosix(file);
-  return dirs.some((dir) => {
-    const normalizedDir = toPosix(dir).replace(/\/$/, "");
-    return normalized === normalizedDir || normalized.startsWith(`${normalizedDir}/`);
-  });
-}
-function testPatterns(patterns, value) {
-  const list = Array.isArray(patterns) ? patterns : [patterns];
-  return list.some((pattern) => pattern.test(value));
-}
-function matchesFilter(file, include, exclude) {
-  const normalized = toPosix(file);
-  if (exclude && testPatterns(exclude, normalized)) {
-    return false;
-  }
-  if (include) {
-    return testPatterns(include, normalized);
-  }
-  return true;
-}
 function normalizeIgnorePrefix(value, fallback = ["."]) {
   const list = typeof value === "undefined" ? fallback : Array.isArray(value) ? value : [value];
   return list.filter((entry) => typeof entry === "string" && entry.length > 0);
 }
-function hasIgnoredPrefix(file, rootDir, prefixes) {
-  if (prefixes.length === 0) {
-    return false;
-  }
-  const relativePath = toPosix(pathe.relative(rootDir, file));
-  const segments = relativePath.split("/");
-  return segments.some(
-    (segment) => prefixes.some((prefix) => segment.startsWith(prefix))
-  );
-}
-function delay(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
 
 const jsonExtensions = /* @__PURE__ */ new Set([".json", ".jsonc"]);
 function resolveTemplate(template, prefix) {
@@ -482,7 +350,7 @@ function stripMethodSuffix(base) {
   };
 }
 function deriveRouteFromFile(file, rootDir, logger) {
-  const rel = toPosix(pathe.relative(rootDir, file));
+  const rel = pathUtils.toPosix(pathe.relative(rootDir, file));
   const ext = pathe.extname(rel);
   const withoutExt = rel.slice(0, rel.length - ext.length);
   const dir = pathe.dirname(withoutExt);
@@ -498,7 +366,7 @@ function deriveRouteFromFile(file, rootDir, logger) {
     return null;
   }
   const joined = dir === "." ? name : pathe.join(dir, name);
-  const segments = toPosix(joined).split("/");
+  const segments = pathUtils.toPosix(joined).split("/");
   if (segments.at(-1) === "index") {
     segments.pop();
   }
@@ -681,12 +549,16 @@ async function loadConfig(file, logger) {
   if (!mod) {
     return null;
   }
-  const value = mod?.default ?? mod;
+  const raw = mod?.default ?? mod;
+  const value = isPromise(raw) ? await raw : raw;
   if (!value || typeof value !== "object") {
     return null;
   }
   return value;
 }
+function isPromise(value) {
+  return !!value && typeof value.then === "function";
+}
 function normalizeMiddlewares(value, source, logger, position) {
   if (!value) {
     return [];
@@ -854,26 +726,26 @@ async function collectFiles(dirs) {
   }
   return files;
 }
-function isSupportedFile(file) {
+function isConfigFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;
   }
-  if (isConfigFile(file)) {
+  const base = pathe.basename(file);
+  if (!base.startsWith("index.config.")) {
     return false;
   }
   const ext = pathe.extname(file).toLowerCase();
-  return supportedExtensions.has(ext);
+  return configExtensions.includes(ext);
 }
-function isConfigFile(file) {
+function isSupportedFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;
   }
-  const base = pathe.basename(file);
-  if (!base.startsWith("index.config.")) {
+  if (isConfigFile(file)) {
     return false;
   }
   const ext = pathe.extname(file).toLowerCase();
-  return configExtensions.includes(ext);
+  return supportedExtensions.has(ext);
 }
 
 function isUnknownFileExtensionError(error) {
@@ -1062,7 +934,7 @@ async function scanRoutes(params) {
       continue;
     }
     const effectiveIgnorePrefix = typeof config.ignorePrefix !== "undefined" ? normalizeIgnorePrefix(config.ignorePrefix, []) : globalIgnorePrefix;
-    if (hasIgnoredPrefix(fileInfo.file, fileInfo.rootDir, effectiveIgnorePrefix)) {
+    if (pathUtils.hasIgnoredPrefix(fileInfo.file, fileInfo.rootDir, effectiveIgnorePrefix)) {
       if (shouldCollectSkip && isSupportedFile(fileInfo.file)) {
         const resolved = resolveSkipRoute({
           file: fileInfo.file,
@@ -1081,14 +953,14 @@ async function scanRoutes(params) {
     }
     const effectiveInclude = typeof config.include !== "undefined" ? config.include : params.include;
     const effectiveExclude = typeof config.exclude !== "undefined" ? config.exclude : params.exclude;
-    if (!matchesFilter(fileInfo.file, effectiveInclude, effectiveExclude)) {
+    if (!pathUtils.matchesFilter(fileInfo.file, effectiveInclude, effectiveExclude)) {
       if (shouldCollectSkip) {
         const resolved = resolveSkipRoute({
           file: fileInfo.file,
           rootDir: fileInfo.rootDir,
           prefix: params.prefix
         });
-        const reason = effectiveExclude && matchesFilter(fileInfo.file, void 0, effectiveExclude) ? "exclude" : "include";
+        const reason = effectiveExclude && pathUtils.matchesFilter(fileInfo.file, void 0, effectiveExclude) ? "exclude" : "include";
         params.onSkip?.(buildSkipInfo(fileInfo.file, reason, resolved));
       }
       continue;
@@ -1259,7 +1131,7 @@ function createFinalizeMiddleware(route, onResponse) {
     const response = await next();
     const resolved = resolveResponse(response, c.res);
     if (route.delay && route.delay > 0) {
-      await delay(route.delay);
+      await timing.delay(route.delay);
     }
     const overridden = applyRouteOverrides(resolved, route);
     c.res = overridden;
@@ -1495,17 +1367,17 @@ async function createChokidarWatcher(params) {
     const { default: chokidar } = await import('@mokup/shared/chokidar');
     const watcher = chokidar.watch(params.dirs, { ignoreInitial: true });
     watcher.on("add", (file) => {
-      if (isInDirs(file, params.dirs)) {
+      if (pathUtils.isInDirs(file, params.dirs)) {
         params.onChange();
       }
     });
     watcher.on("change", (file) => {
-      if (isInDirs(file, params.dirs)) {
+      if (pathUtils.isInDirs(file, params.dirs)) {
         params.onChange();
       }
     });
     watcher.on("unlink", (file) => {
-      if (isInDirs(file, params.dirs)) {
+      if (pathUtils.isInDirs(file, params.dirs)) {
         params.onChange();
       }
     });
@@ -1629,7 +1501,7 @@ async function createFetchServer(options = {}) {
   if (wsHandler && playgroundConfig.enabled) {
     app.get(`${playgroundConfig.path}/ws`, wsHandler);
   }
-  const scheduleRefresh = createDebouncer(80, () => {
+  const scheduleRefresh = timing.createDebouncer(80, () => {
     void refreshRoutes();
   });
   const watcher = await createWatcher({

package/dist/fetch-server.d.cts

@@ -1,4 +1,4 @@
-import { d as RouteTable } from './shared/server.CyVIKPsp.cjs';
+import { d as RouteTable } from './shared/server.DLPB_I9q.cjs';
 import { MockEntryOptions, PlaygroundOptionsInput } from '@mokup/shared';
 import '@mokup/runtime';
 import '@mokup/shared/hono';

package/dist/fetch-server.d.mts

@@ -1,4 +1,4 @@
-import { d as RouteTable } from './shared/server.CyVIKPsp.mjs';
+import { d as RouteTable } from './shared/server.DLPB_I9q.mjs';
 import { MockEntryOptions, PlaygroundOptionsInput } from '@mokup/shared';
 import '@mokup/runtime';
 import '@mokup/shared/hono';

package/dist/fetch-server.d.ts

@@ -1,4 +1,4 @@
-import { d as RouteTable } from './shared/server.CyVIKPsp.js';
+import { d as RouteTable } from './shared/server.DLPB_I9q.js';
 import { MockEntryOptions, PlaygroundOptionsInput } from '@mokup/shared';
 import '@mokup/runtime';
 import '@mokup/shared/hono';

package/dist/fetch-server.mjs

@@ -1,11 +1,14 @@
-import { join, normalize, extname, dirname, relative, resolve, isAbsolute, basename } from '@mokup/shared/pathe';
+import { join, normalize, extname, resolve, isAbsolute, relative, dirname, basename } from '@mokup/shared/pathe';
 import { promises } from 'node:fs';
 import { createRequire } from 'node:module';
-import process, { cwd } from 'node:process';
+import { resolveRouteGroup, formatRouteFile, resolveGroupRoot, resolveGroups } from '@mokup/shared/playground-grouping';
 import { compareRouteScore, parseRouteTemplate } from '@mokup/runtime';
+import { toPosix, hasIgnoredPrefix, matchesFilter, isInDirs } from '@mokup/shared/path-utils';
+import { delay, createDebouncer } from '@mokup/shared/timing';
 import { Buffer } from 'node:buffer';
 import { pathToFileURL } from 'node:url';
 import { build } from '@mokup/shared/esbuild';
+import process, { cwd } from 'node:process';
 import { parse } from '@mokup/shared/jsonc-parser';
 import { Hono, PatternRouter } from '@mokup/shared/hono';
 
@@ -110,92 +113,6 @@ async function readPlaygroundAsset(distDir, relPath) {
   return new Response(content, { headers: { "Content-Type": contentType } });
 }
 
-function toPosixPath(value) {
-  return value.replace(/\\/g, "/");
-}
-function normalizePath(value) {
-  return toPosixPath(normalize(value));
-}
-function isAncestor(parent, child) {
-  const normalizedParent = normalizePath(parent).replace(/\/$/, "");
-  const normalizedChild = normalizePath(child);
-  return normalizedChild === normalizedParent || normalizedChild.startsWith(`${normalizedParent}/`);
-}
-function resolveGroupRoot(dirs, serverRoot) {
-  if (!dirs || dirs.length === 0) {
-    return serverRoot ?? cwd();
-  }
-  if (serverRoot) {
-    const normalizedRoot = normalizePath(serverRoot);
-    const canUseRoot = dirs.every((dir) => isAncestor(normalizedRoot, dir));
-    if (canUseRoot) {
-      return normalizedRoot;
-    }
-  }
-  if (dirs.length === 1) {
-    return normalizePath(dirname(dirs[0]));
-  }
-  let common = normalizePath(dirs[0]);
-  for (const dir of dirs.slice(1)) {
-    const normalizedDir = normalizePath(dir);
-    while (common && !isAncestor(common, normalizedDir)) {
-      const parent = normalizePath(dirname(common));
-      if (parent === common) {
-        break;
-      }
-      common = parent;
-    }
-  }
-  if (!common || common === "/") {
-    return serverRoot ?? cwd();
-  }
-  return common;
-}
-function resolveGroups(dirs, root) {
-  const groups = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const dir of dirs) {
-    const normalized = normalizePath(dir);
-    if (seen.has(normalized)) {
-      continue;
-    }
-    seen.add(normalized);
-    const rel = toPosixPath(relative(root, normalized));
-    const label = rel && !rel.startsWith("..") ? rel : normalized;
-    groups.push({
-      key: normalized,
-      label,
-      path: normalized
-    });
-  }
-  return groups;
-}
-function resolveRouteGroup(routeFile, groups) {
-  if (groups.length === 0) {
-    return void 0;
-  }
-  const normalizedFile = toPosixPath(normalize(routeFile));
-  let matched;
-  for (const group of groups) {
-    if (normalizedFile === group.path || normalizedFile.startsWith(`${group.path}/`)) {
-      if (!matched || group.path.length > matched.path.length) {
-        matched = group;
-      }
-    }
-  }
-  return matched;
-}
-function formatRouteFile(file, root) {
-  if (!root) {
-    return toPosixPath(file);
-  }
-  const rel = toPosixPath(relative(root, file));
-  if (!rel || rel.startsWith("..")) {
-    return toPosixPath(file);
-  }
-  return rel;
-}
-
 const disabledReasonSet = /* @__PURE__ */ new Set([
   "disabled",
   "disabled-dir",
@@ -387,59 +304,10 @@ function resolveDirs(dir, root) {
   );
   return Array.from(new Set(normalized));
 }
-function createDebouncer(delayMs, fn) {
-  let timer = null;
-  return () => {
-    if (timer) {
-      clearTimeout(timer);
-    }
-    timer = setTimeout(() => {
-      timer = null;
-      fn();
-    }, delayMs);
-  };
-}
-function toPosix(value) {
-  return value.replace(/\\/g, "/");
-}
-function isInDirs(file, dirs) {
-  const normalized = toPosix(file);
-  return dirs.some((dir) => {
-    const normalizedDir = toPosix(dir).replace(/\/$/, "");
-    return normalized === normalizedDir || normalized.startsWith(`${normalizedDir}/`);
-  });
-}
-function testPatterns(patterns, value) {
-  const list = Array.isArray(patterns) ? patterns : [patterns];
-  return list.some((pattern) => pattern.test(value));
-}
-function matchesFilter(file, include, exclude) {
-  const normalized = toPosix(file);
-  if (exclude && testPatterns(exclude, normalized)) {
-    return false;
-  }
-  if (include) {
-    return testPatterns(include, normalized);
-  }
-  return true;
-}
 function normalizeIgnorePrefix(value, fallback = ["."]) {
   const list = typeof value === "undefined" ? fallback : Array.isArray(value) ? value : [value];
   return list.filter((entry) => typeof entry === "string" && entry.length > 0);
 }
-function hasIgnoredPrefix(file, rootDir, prefixes) {
-  if (prefixes.length === 0) {
-    return false;
-  }
-  const relativePath = toPosix(relative(rootDir, file));
-  const segments = relativePath.split("/");
-  return segments.some(
-    (segment) => prefixes.some((prefix) => segment.startsWith(prefix))
-  );
-}
-function delay(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
 
 const jsonExtensions = /* @__PURE__ */ new Set([".json", ".jsonc"]);
 function resolveTemplate(template, prefix) {
@@ -674,12 +542,16 @@ async function loadConfig(file, logger) {
   if (!mod) {
     return null;
   }
-  const value = mod?.default ?? mod;
+  const raw = mod?.default ?? mod;
+  const value = isPromise(raw) ? await raw : raw;
   if (!value || typeof value !== "object") {
     return null;
   }
   return value;
 }
+function isPromise(value) {
+  return !!value && typeof value.then === "function";
+}
 function normalizeMiddlewares(value, source, logger, position) {
   if (!value) {
     return [];
@@ -847,26 +719,26 @@ async function collectFiles(dirs) {
   }
   return files;
 }
-function isSupportedFile(file) {
+function isConfigFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;
   }
-  if (isConfigFile(file)) {
+  const base = basename(file);
+  if (!base.startsWith("index.config.")) {
     return false;
   }
   const ext = extname(file).toLowerCase();
-  return supportedExtensions.has(ext);
+  return configExtensions.includes(ext);
 }
-function isConfigFile(file) {
+function isSupportedFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;
   }
-  const base = basename(file);
-  if (!base.startsWith("index.config.")) {
+  if (isConfigFile(file)) {
     return false;
   }
   const ext = extname(file).toLowerCase();
-  return configExtensions.includes(ext);
+  return supportedExtensions.has(ext);
 }
 
 function isUnknownFileExtensionError(error) {