@mokup/server 1.1.0 → 1.1.1

package/dist/index.cjs

@@ -93,6 +93,7 @@ const supportedExtensions = /* @__PURE__ */ new Set([
   ".mjs",
   ".cjs"
 ]);
+const configExtensions = [".ts", ".js", ".mjs", ".cjs"];
 
 function normalizePrefix(prefix) {
   if (!prefix) {
@@ -398,12 +399,23 @@ const disabledReasonSet = /* @__PURE__ */ new Set([
   "include",
   "unknown"
 ]);
+const ignoredReasonSet = /* @__PURE__ */ new Set([
+  "unsupported",
+  "invalid-route",
+  "unknown"
+]);
 function normalizeDisabledReason(reason) {
   if (reason && disabledReasonSet.has(reason)) {
     return reason;
   }
   return "unknown";
 }
+function normalizeIgnoredReason(reason) {
+  if (reason && ignoredReasonSet.has(reason)) {
+    return reason;
+  }
+  return "unknown";
+}
 function formatRouteFile(file, root) {
   if (!root) {
     return toPosixPath(file);
@@ -482,6 +494,29 @@ function toPlaygroundDisabledRoute(route, root, groups) {
   }
   return disabled;
 }
+function toPlaygroundIgnoredRoute(route, root, groups) {
+  const matchedGroup = resolveRouteGroup(route.file, groups);
+  const ignored = {
+    file: formatRouteFile(route.file, root),
+    reason: normalizeIgnoredReason(route.reason)
+  };
+  if (matchedGroup) {
+    ignored.groupKey = matchedGroup.key;
+    ignored.group = matchedGroup.label;
+  }
+  return ignored;
+}
+function toPlaygroundConfigFile(entry, root, groups) {
+  const matchedGroup = resolveRouteGroup(entry.file, groups);
+  const configFile = {
+    file: formatRouteFile(entry.file, root)
+  };
+  if (matchedGroup) {
+    configFile.groupKey = matchedGroup.key;
+    configFile.group = matchedGroup.label;
+  }
+  return configFile;
+}
 function registerPlaygroundRoutes(params) {
   if (!params.config.enabled) {
     return;
@@ -520,7 +555,12 @@ function registerPlaygroundRoutes(params) {
       count: params.routes.length,
       groups: groups.map((group) => ({ key: group.key, label: group.label })),
       routes: params.routes.map((route) => toPlaygroundRoute(route, baseRoot, groups)),
-      disabled: (params.disabledRoutes ?? []).map((route) => toPlaygroundDisabledRoute(route, baseRoot, groups))
+      disabled: (params.disabledRoutes ?? []).map((route) => toPlaygroundDisabledRoute(route, baseRoot, groups)),
+      ignored: (params.ignoredRoutes ?? []).map((route) => toPlaygroundIgnoredRoute(route, baseRoot, groups)),
+      configs: (params.configFiles ?? []).map((entry) => toPlaygroundConfigFile(entry, baseRoot, groups)),
+      disabledConfigs: (params.disabledConfigFiles ?? []).map(
+        (entry) => toPlaygroundConfigFile(entry, baseRoot, groups)
+      )
     });
   });
   params.app.get(`${playgroundPath}/*`, async (c) => {
@@ -697,7 +737,6 @@ async function ensureTsxRegister(logger) {
   return registerPromise;
 }
 
-const configExtensions = [".ts", ".js", ".mjs", ".cjs"];
 function isUnknownFileExtensionError$1(error) {
   if (!error || typeof error !== "object") {
     return false;
@@ -899,12 +938,23 @@ function isSupportedFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;
   }
-  if (pathe.basename(file).startsWith("index.config.")) {
+  if (isConfigFile(file)) {
     return false;
   }
   const ext = pathe.extname(file).toLowerCase();
   return supportedExtensions.has(ext);
 }
+function isConfigFile(file) {
+  if (file.endsWith(".d.ts")) {
+    return false;
+  }
+  const base = pathe.basename(file);
+  if (!base.startsWith("index.config.")) {
+    return false;
+  }
+  const ext = pathe.extname(file).toLowerCase();
+  return configExtensions.includes(ext);
+}
 
 function isUnknownFileExtensionError(error) {
   if (!error || typeof error !== "object") {
@@ -1055,7 +1105,22 @@ async function scanRoutes(params) {
   const configCache = /* @__PURE__ */ new Map();
   const fileCache = /* @__PURE__ */ new Map();
   const shouldCollectSkip = typeof params.onSkip === "function";
+  const shouldCollectIgnore = typeof params.onIgnore === "function";
+  const shouldCollectConfig = typeof params.onConfig === "function";
   for (const fileInfo of files) {
+    if (isConfigFile(fileInfo.file)) {
+      if (shouldCollectConfig) {
+        const config2 = await resolveDirectoryConfig({
+          file: fileInfo.file,
+          rootDir: fileInfo.rootDir,
+          logger: params.logger,
+          configCache,
+          fileCache
+        });
+        params.onConfig?.({ file: fileInfo.file, enabled: config2.enabled !== false });
+      }
+      continue;
+    }
     const config = await resolveDirectoryConfig({
       file: fileInfo.file,
       rootDir: fileInfo.rootDir,
@@ -1087,6 +1152,9 @@ async function scanRoutes(params) {
       continue;
     }
     if (!isSupportedFile(fileInfo.file)) {
+      if (shouldCollectIgnore) {
+        params.onIgnore?.({ file: fileInfo.file, reason: "unsupported" });
+      }
       continue;
     }
     const effectiveInclude = typeof config.include !== "undefined" ? config.include : params.include;
@@ -1105,6 +1173,9 @@ async function scanRoutes(params) {
     }
     const derived = deriveRouteFromFile(fileInfo.file, fileInfo.rootDir, params.logger);
     if (!derived) {
+      if (shouldCollectIgnore) {
+        params.onIgnore?.({ file: fileInfo.file, reason: "invalid-route" });
+      }
       continue;
     }
     const rules = await loadRules(fileInfo.file, params.logger);
@@ -1225,6 +1296,9 @@ function buildApp(params) {
     app,
     routes: params.routes,
     disabledRoutes: params.disabledRoutes,
+    ignoredRoutes: params.ignoredRoutes,
+    configFiles: params.configFiles,
+    disabledConfigFiles: params.disabledConfigFiles,
     dirs: params.dirs,
     logger: params.logger,
     config: params.playground,
@@ -1390,9 +1464,15 @@ async function createFetchServer(options = {}) {
   }
   let routes = [];
   let disabledRoutes = [];
+  let ignoredRoutes = [];
+  let configFiles = [];
+  let disabledConfigFiles = [];
   let app = buildApp({
     routes,
     disabledRoutes,
+    ignoredRoutes,
+    configFiles,
+    disabledConfigFiles,
     dirs,
     playground: playgroundConfig,
     root,
@@ -1404,12 +1484,16 @@ async function createFetchServer(options = {}) {
     try {
       const collected = [];
       const collectedDisabled = [];
+      const collectedIgnored = [];
+      const collectedConfigs = [];
       for (const entry of optionList) {
         const scanParams = {
           dirs: resolveDirs(entry.dir, root),
           prefix: entry.prefix ?? "",
           logger,
-          onSkip: (info) => collectedDisabled.push(info)
+          onSkip: (info) => collectedDisabled.push(info),
+          onIgnore: (info) => collectedIgnored.push(info),
+          onConfig: (info) => collectedConfigs.push(info)
         };
         if (entry.include) {
           scanParams.include = entry.include;
@@ -1426,9 +1510,17 @@ async function createFetchServer(options = {}) {
       const resolvedRoutes = sortRoutes(collected);
       routes = resolvedRoutes;
       disabledRoutes = collectedDisabled;
+      ignoredRoutes = collectedIgnored;
+      const configMap = new Map(collectedConfigs.map((entry) => [entry.file, entry]));
+      const resolvedConfigs = Array.from(configMap.values());
+      configFiles = resolvedConfigs.filter((entry) => entry.enabled);
+      disabledConfigFiles = resolvedConfigs.filter((entry) => !entry.enabled);
       app = buildApp({
         routes,
         disabledRoutes,
+        ignoredRoutes,
+        configFiles,
+        disabledConfigFiles,
         dirs,
         playground: playgroundConfig,
         root,

package/dist/index.d.cts

@@ -41,8 +41,10 @@ declare function createFastifyPlugin(options: ServerOptions): (instance: Fastify
 declare function createFetchHandler(options: ServerOptions): FetchHandler;
 
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
-type RequestHandler = (context: Context) => Response | Promise<Response> | unknown;
-type RouteResponse = unknown | RequestHandler;
+type RouteStaticResponse = string | number | boolean | bigint | symbol | null | undefined | object;
+type RouteHandlerResult = RouteStaticResponse | Response;
+type RequestHandler = (context: Context) => RouteHandlerResult | Promise<RouteHandlerResult>;
+type RouteResponse = RouteStaticResponse | RequestHandler;
 interface ResolvedMiddleware {
     handle: MiddlewareHandler;
     source: string;

package/dist/index.d.mts

@@ -41,8 +41,10 @@ declare function createFastifyPlugin(options: ServerOptions): (instance: Fastify
 declare function createFetchHandler(options: ServerOptions): FetchHandler;
 
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
-type RequestHandler = (context: Context) => Response | Promise<Response> | unknown;
-type RouteResponse = unknown | RequestHandler;
+type RouteStaticResponse = string | number | boolean | bigint | symbol | null | undefined | object;
+type RouteHandlerResult = RouteStaticResponse | Response;
+type RequestHandler = (context: Context) => RouteHandlerResult | Promise<RouteHandlerResult>;
+type RouteResponse = RouteStaticResponse | RequestHandler;
 interface ResolvedMiddleware {
     handle: MiddlewareHandler;
     source: string;

package/dist/index.d.ts

@@ -41,8 +41,10 @@ declare function createFastifyPlugin(options: ServerOptions): (instance: Fastify
 declare function createFetchHandler(options: ServerOptions): FetchHandler;
 
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
-type RequestHandler = (context: Context) => Response | Promise<Response> | unknown;
-type RouteResponse = unknown | RequestHandler;
+type RouteStaticResponse = string | number | boolean | bigint | symbol | null | undefined | object;
+type RouteHandlerResult = RouteStaticResponse | Response;
+type RequestHandler = (context: Context) => RouteHandlerResult | Promise<RouteHandlerResult>;
+type RouteResponse = RouteStaticResponse | RequestHandler;
 interface ResolvedMiddleware {
     handle: MiddlewareHandler;
     source: string;

package/dist/index.mjs

@@ -86,6 +86,7 @@ const supportedExtensions = /* @__PURE__ */ new Set([
   ".mjs",
   ".cjs"
 ]);
+const configExtensions = [".ts", ".js", ".mjs", ".cjs"];
 
 function normalizePrefix(prefix) {
   if (!prefix) {
@@ -391,12 +392,23 @@ const disabledReasonSet = /* @__PURE__ */ new Set([
   "include",
   "unknown"
 ]);
+const ignoredReasonSet = /* @__PURE__ */ new Set([
+  "unsupported",
+  "invalid-route",
+  "unknown"
+]);
 function normalizeDisabledReason(reason) {
   if (reason && disabledReasonSet.has(reason)) {
     return reason;
   }
   return "unknown";
 }
+function normalizeIgnoredReason(reason) {
+  if (reason && ignoredReasonSet.has(reason)) {
+    return reason;
+  }
+  return "unknown";
+}
 function formatRouteFile(file, root) {
   if (!root) {
     return toPosixPath(file);
@@ -475,6 +487,29 @@ function toPlaygroundDisabledRoute(route, root, groups) {
   }
   return disabled;
 }
+function toPlaygroundIgnoredRoute(route, root, groups) {
+  const matchedGroup = resolveRouteGroup(route.file, groups);
+  const ignored = {
+    file: formatRouteFile(route.file, root),
+    reason: normalizeIgnoredReason(route.reason)
+  };
+  if (matchedGroup) {
+    ignored.groupKey = matchedGroup.key;
+    ignored.group = matchedGroup.label;
+  }
+  return ignored;
+}
+function toPlaygroundConfigFile(entry, root, groups) {
+  const matchedGroup = resolveRouteGroup(entry.file, groups);
+  const configFile = {
+    file: formatRouteFile(entry.file, root)
+  };
+  if (matchedGroup) {
+    configFile.groupKey = matchedGroup.key;
+    configFile.group = matchedGroup.label;
+  }
+  return configFile;
+}
 function registerPlaygroundRoutes(params) {
   if (!params.config.enabled) {
     return;
@@ -513,7 +548,12 @@ function registerPlaygroundRoutes(params) {
       count: params.routes.length,
       groups: groups.map((group) => ({ key: group.key, label: group.label })),
       routes: params.routes.map((route) => toPlaygroundRoute(route, baseRoot, groups)),
-      disabled: (params.disabledRoutes ?? []).map((route) => toPlaygroundDisabledRoute(route, baseRoot, groups))
+      disabled: (params.disabledRoutes ?? []).map((route) => toPlaygroundDisabledRoute(route, baseRoot, groups)),
+      ignored: (params.ignoredRoutes ?? []).map((route) => toPlaygroundIgnoredRoute(route, baseRoot, groups)),
+      configs: (params.configFiles ?? []).map((entry) => toPlaygroundConfigFile(entry, baseRoot, groups)),
+      disabledConfigs: (params.disabledConfigFiles ?? []).map(
+        (entry) => toPlaygroundConfigFile(entry, baseRoot, groups)
+      )
     });
   });
   params.app.get(`${playgroundPath}/*`, async (c) => {
@@ -690,7 +730,6 @@ async function ensureTsxRegister(logger) {
   return registerPromise;
 }
 
-const configExtensions = [".ts", ".js", ".mjs", ".cjs"];
 function isUnknownFileExtensionError$1(error) {
   if (!error || typeof error !== "object") {
     return false;
@@ -892,12 +931,23 @@ function isSupportedFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;
   }
-  if (basename(file).startsWith("index.config.")) {
+  if (isConfigFile(file)) {
     return false;
   }
   const ext = extname(file).toLowerCase();
   return supportedExtensions.has(ext);
 }
+function isConfigFile(file) {
+  if (file.endsWith(".d.ts")) {
+    return false;
+  }
+  const base = basename(file);
+  if (!base.startsWith("index.config.")) {
+    return false;
+  }
+  const ext = extname(file).toLowerCase();
+  return configExtensions.includes(ext);
+}
 
 function isUnknownFileExtensionError(error) {
   if (!error || typeof error !== "object") {
@@ -1048,7 +1098,22 @@ async function scanRoutes(params) {
   const configCache = /* @__PURE__ */ new Map();
   const fileCache = /* @__PURE__ */ new Map();
   const shouldCollectSkip = typeof params.onSkip === "function";
+  const shouldCollectIgnore = typeof params.onIgnore === "function";
+  const shouldCollectConfig = typeof params.onConfig === "function";
   for (const fileInfo of files) {
+    if (isConfigFile(fileInfo.file)) {
+      if (shouldCollectConfig) {
+        const config2 = await resolveDirectoryConfig({
+          file: fileInfo.file,
+          rootDir: fileInfo.rootDir,
+          logger: params.logger,
+          configCache,
+          fileCache
+        });
+        params.onConfig?.({ file: fileInfo.file, enabled: config2.enabled !== false });
+      }
+      continue;
+    }
     const config = await resolveDirectoryConfig({
       file: fileInfo.file,
       rootDir: fileInfo.rootDir,
@@ -1080,6 +1145,9 @@ async function scanRoutes(params) {
       continue;
     }
     if (!isSupportedFile(fileInfo.file)) {
+      if (shouldCollectIgnore) {
+        params.onIgnore?.({ file: fileInfo.file, reason: "unsupported" });
+      }
       continue;
     }
     const effectiveInclude = typeof config.include !== "undefined" ? config.include : params.include;
@@ -1098,6 +1166,9 @@ async function scanRoutes(params) {
     }
     const derived = deriveRouteFromFile(fileInfo.file, fileInfo.rootDir, params.logger);
     if (!derived) {
+      if (shouldCollectIgnore) {
+        params.onIgnore?.({ file: fileInfo.file, reason: "invalid-route" });
+      }
       continue;
     }
     const rules = await loadRules(fileInfo.file, params.logger);
@@ -1218,6 +1289,9 @@ function buildApp(params) {
     app,
     routes: params.routes,
     disabledRoutes: params.disabledRoutes,
+    ignoredRoutes: params.ignoredRoutes,
+    configFiles: params.configFiles,
+    disabledConfigFiles: params.disabledConfigFiles,
     dirs: params.dirs,
     logger: params.logger,
     config: params.playground,
@@ -1383,9 +1457,15 @@ async function createFetchServer(options = {}) {
   }
   let routes = [];
   let disabledRoutes = [];
+  let ignoredRoutes = [];
+  let configFiles = [];
+  let disabledConfigFiles = [];
   let app = buildApp({
     routes,
     disabledRoutes,
+    ignoredRoutes,
+    configFiles,
+    disabledConfigFiles,
     dirs,
     playground: playgroundConfig,
     root,
@@ -1397,12 +1477,16 @@ async function createFetchServer(options = {}) {
     try {
       const collected = [];
       const collectedDisabled = [];
+      const collectedIgnored = [];
+      const collectedConfigs = [];
       for (const entry of optionList) {
         const scanParams = {
           dirs: resolveDirs(entry.dir, root),
           prefix: entry.prefix ?? "",
           logger,
-          onSkip: (info) => collectedDisabled.push(info)
+          onSkip: (info) => collectedDisabled.push(info),
+          onIgnore: (info) => collectedIgnored.push(info),
+          onConfig: (info) => collectedConfigs.push(info)
         };
         if (entry.include) {
           scanParams.include = entry.include;
@@ -1419,9 +1503,17 @@ async function createFetchServer(options = {}) {
       const resolvedRoutes = sortRoutes(collected);
       routes = resolvedRoutes;
       disabledRoutes = collectedDisabled;
+      ignoredRoutes = collectedIgnored;
+      const configMap = new Map(collectedConfigs.map((entry) => [entry.file, entry]));
+      const resolvedConfigs = Array.from(configMap.values());
+      configFiles = resolvedConfigs.filter((entry) => entry.enabled);
+      disabledConfigFiles = resolvedConfigs.filter((entry) => !entry.enabled);
       app = buildApp({
         routes,
         disabledRoutes,
+        ignoredRoutes,
+        configFiles,
+        disabledConfigFiles,
         dirs,
         playground: playgroundConfig,
         root,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mokup/server",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Server adapters for @mokup/runtime.",
   "license": "MIT",
   "homepage": "https://mokup.icebreaker.top",
@@ -40,8 +40,8 @@
     "@hono/node-server": "^1.19.9",
     "@hono/node-ws": "^1.1.1",
     "tsx": "^4.21.0",
-    "@mokup/playground": "0.0.9",
-    "@mokup/runtime": "1.0.0",
+    "@mokup/playground": "0.0.10",
+    "@mokup/runtime": "1.0.1",
     "@mokup/shared": "1.0.0"
   },
   "devDependencies": {