mokup 1.0.4 → 2.0.0

package/dist/index.d.cts

@@ -20,6 +20,10 @@ interface ServiceWorkerOptions {
     fallback?: boolean;
     basePath?: string | string[];
 }
+type PlaygroundOptionsInput = boolean | {
+    path?: string;
+    enabled?: boolean;
+} | undefined;
 interface RouteDirectoryConfig {
     headers?: Record<string, string>;
     status?: number;
@@ -40,11 +44,11 @@ interface VitePluginOptions {
     log?: boolean;
     mode?: RuntimeMode;
     sw?: ServiceWorkerOptions;
-    playground?: boolean | {
-        path?: string;
-        enabled?: boolean;
-    };
 }
-type VitePluginOptionsInput = VitePluginOptions | VitePluginOptions[];
+interface MokupPluginOptions {
+    entries?: VitePluginOptions | VitePluginOptions[];
+    playground?: PlaygroundOptionsInput;
+}
+type VitePluginOptionsInput = MokupPluginOptions;
 
-export type { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput };
+export type { HttpMethod, MokupPluginOptions, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput };

package/dist/index.d.mts

@@ -20,6 +20,10 @@ interface ServiceWorkerOptions {
     fallback?: boolean;
     basePath?: string | string[];
 }
+type PlaygroundOptionsInput = boolean | {
+    path?: string;
+    enabled?: boolean;
+} | undefined;
 interface RouteDirectoryConfig {
     headers?: Record<string, string>;
     status?: number;
@@ -40,11 +44,11 @@ interface VitePluginOptions {
     log?: boolean;
     mode?: RuntimeMode;
     sw?: ServiceWorkerOptions;
-    playground?: boolean | {
-        path?: string;
-        enabled?: boolean;
-    };
 }
-type VitePluginOptionsInput = VitePluginOptions | VitePluginOptions[];
+interface MokupPluginOptions {
+    entries?: VitePluginOptions | VitePluginOptions[];
+    playground?: PlaygroundOptionsInput;
+}
+type VitePluginOptionsInput = MokupPluginOptions;
 
-export type { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput };
+export type { HttpMethod, MokupPluginOptions, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput };

package/dist/index.d.ts

@@ -20,6 +20,10 @@ interface ServiceWorkerOptions {
     fallback?: boolean;
     basePath?: string | string[];
 }
+type PlaygroundOptionsInput = boolean | {
+    path?: string;
+    enabled?: boolean;
+} | undefined;
 interface RouteDirectoryConfig {
     headers?: Record<string, string>;
     status?: number;
@@ -40,11 +44,11 @@ interface VitePluginOptions {
     log?: boolean;
     mode?: RuntimeMode;
     sw?: ServiceWorkerOptions;
-    playground?: boolean | {
-        path?: string;
-        enabled?: boolean;
-    };
 }
-type VitePluginOptionsInput = VitePluginOptions | VitePluginOptions[];
+interface MokupPluginOptions {
+    entries?: VitePluginOptions | VitePluginOptions[];
+    playground?: PlaygroundOptionsInput;
+}
+type VitePluginOptionsInput = MokupPluginOptions;
 
-export type { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput };
+export type { HttpMethod, MokupPluginOptions, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput };

package/dist/shared/{mokup.C7VW7pSP.cjs → mokup.CvPjMpMJ.cjs}

@@ -350,7 +350,7 @@ function createMiddleware(getApp, logger) {
   };
 }
 
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.C7VW7pSP.cjs', document.baseURI).href)));
+const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.CvPjMpMJ.cjs', document.baseURI).href)));
 const mimeTypes = {
   ".html": "text/html; charset=utf-8",
   ".css": "text/css; charset=utf-8",
@@ -584,14 +584,21 @@ function toPlaygroundRoute(route, root, groups) {
 }
 function toPlaygroundDisabledRoute(route, root, groups) {
   const matchedGroup = resolveRouteGroup(route.file, groups);
-  return {
+  const disabled = {
     file: formatRouteFile(route.file, root),
-    reason: normalizeDisabledReason(route.reason),
-    method: route.method,
-    url: route.url,
-    groupKey: matchedGroup?.key,
-    group: matchedGroup?.label
+    reason: normalizeDisabledReason(route.reason)
   };
+  if (typeof route.method !== "undefined") {
+    disabled.method = route.method;
+  }
+  if (typeof route.url !== "undefined") {
+    disabled.url = route.url;
+  }
+  if (matchedGroup) {
+    disabled.groupKey = matchedGroup.key;
+    disabled.group = matchedGroup.label;
+  }
+  return disabled;
 }
 function createPlaygroundMiddleware(params) {
   const distDir = resolvePlaygroundDist();
@@ -795,7 +802,7 @@ const configExtensions = [".ts", ".js", ".mjs", ".cjs"];
 async function loadModule$1(file) {
   const ext = configExtensions.find((extension) => file.endsWith(extension));
   if (ext === ".cjs") {
-    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.C7VW7pSP.cjs', document.baseURI).href)));
+    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.CvPjMpMJ.cjs', document.baseURI).href)));
     delete require$1.cache[file];
     return require$1(file);
   }
@@ -988,7 +995,7 @@ function isSupportedFile(file) {
 async function loadModule(file) {
   const ext = pathe.extname(file).toLowerCase();
   if (ext === ".cjs") {
-    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.C7VW7pSP.cjs', document.baseURI).href)));
+    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.CvPjMpMJ.cjs', document.baseURI).href)));
     delete require$1.cache[file];
     return require$1(file);
   }
@@ -1103,6 +1110,14 @@ function resolveSkipRoute(params) {
     url: resolved.template
   };
 }
+function buildSkipInfo(file, reason, resolved) {
+  const info = { file, reason };
+  if (resolved) {
+    info.method = resolved.method;
+    info.url = resolved.url;
+  }
+  return info;
+}
 async function scanRoutes(params) {
   const routes = [];
   const seen = /* @__PURE__ */ new Set();
@@ -1130,12 +1145,7 @@ async function scanRoutes(params) {
           rootDir: fileInfo.rootDir,
           prefix: params.prefix
         });
-        params.onSkip?.({
-          file: fileInfo.file,
-          reason: "disabled-dir",
-          method: resolved?.method,
-          url: resolved?.url
-        });
+        params.onSkip?.(buildSkipInfo(fileInfo.file, "disabled-dir", resolved));
       }
       continue;
     }
@@ -1147,12 +1157,7 @@ async function scanRoutes(params) {
           rootDir: fileInfo.rootDir,
           prefix: params.prefix
         });
-        params.onSkip?.({
-          file: fileInfo.file,
-          reason: "ignore-prefix",
-          method: resolved?.method,
-          url: resolved?.url
-        });
+        params.onSkip?.(buildSkipInfo(fileInfo.file, "ignore-prefix", resolved));
       }
       continue;
     }
@@ -1169,12 +1174,7 @@ async function scanRoutes(params) {
           prefix: params.prefix
         });
         const reason = effectiveExclude && matchesFilter(fileInfo.file, void 0, effectiveExclude) ? "exclude" : "include";
-        params.onSkip?.({
-          file: fileInfo.file,
-          reason,
-          method: resolved?.method,
-          url: resolved?.url
-        });
+        params.onSkip?.(buildSkipInfo(fileInfo.file, reason, resolved));
       }
       continue;
     }
@@ -1195,12 +1195,7 @@ async function scanRoutes(params) {
             prefix: params.prefix,
             derived
           });
-          params.onSkip?.({
-            file: fileInfo.file,
-            reason: "disabled",
-            method: resolved2?.method,
-            url: resolved2?.url
-          });
+          params.onSkip?.(buildSkipInfo(fileInfo.file, "disabled", resolved2));
         }
         continue;
       }

package/dist/shared/{mokup.Da2mv7KS.mjs → mokup.U2S5CHgY.mjs}

@@ -581,14 +581,21 @@ function toPlaygroundRoute(route, root, groups) {
 }
 function toPlaygroundDisabledRoute(route, root, groups) {
   const matchedGroup = resolveRouteGroup(route.file, groups);
-  return {
+  const disabled = {
     file: formatRouteFile(route.file, root),
-    reason: normalizeDisabledReason(route.reason),
-    method: route.method,
-    url: route.url,
-    groupKey: matchedGroup?.key,
-    group: matchedGroup?.label
+    reason: normalizeDisabledReason(route.reason)
   };
+  if (typeof route.method !== "undefined") {
+    disabled.method = route.method;
+  }
+  if (typeof route.url !== "undefined") {
+    disabled.url = route.url;
+  }
+  if (matchedGroup) {
+    disabled.groupKey = matchedGroup.key;
+    disabled.group = matchedGroup.label;
+  }
+  return disabled;
 }
 function createPlaygroundMiddleware(params) {
   const distDir = resolvePlaygroundDist();
@@ -1100,6 +1107,14 @@ function resolveSkipRoute(params) {
     url: resolved.template
   };
 }
+function buildSkipInfo(file, reason, resolved) {
+  const info = { file, reason };
+  if (resolved) {
+    info.method = resolved.method;
+    info.url = resolved.url;
+  }
+  return info;
+}
 async function scanRoutes(params) {
   const routes = [];
   const seen = /* @__PURE__ */ new Set();
@@ -1127,12 +1142,7 @@ async function scanRoutes(params) {
           rootDir: fileInfo.rootDir,
           prefix: params.prefix
         });
-        params.onSkip?.({
-          file: fileInfo.file,
-          reason: "disabled-dir",
-          method: resolved?.method,
-          url: resolved?.url
-        });
+        params.onSkip?.(buildSkipInfo(fileInfo.file, "disabled-dir", resolved));
       }
       continue;
     }
@@ -1144,12 +1154,7 @@ async function scanRoutes(params) {
           rootDir: fileInfo.rootDir,
           prefix: params.prefix
         });
-        params.onSkip?.({
-          file: fileInfo.file,
-          reason: "ignore-prefix",
-          method: resolved?.method,
-          url: resolved?.url
-        });
+        params.onSkip?.(buildSkipInfo(fileInfo.file, "ignore-prefix", resolved));
       }
       continue;
     }
@@ -1166,12 +1171,7 @@ async function scanRoutes(params) {
           prefix: params.prefix
         });
         const reason = effectiveExclude && matchesFilter(fileInfo.file, void 0, effectiveExclude) ? "exclude" : "include";
-        params.onSkip?.({
-          file: fileInfo.file,
-          reason,
-          method: resolved?.method,
-          url: resolved?.url
-        });
+        params.onSkip?.(buildSkipInfo(fileInfo.file, reason, resolved));
       }
       continue;
     }
@@ -1192,12 +1192,7 @@ async function scanRoutes(params) {
             prefix: params.prefix,
             derived
           });
-          params.onSkip?.({
-            file: fileInfo.file,
-            reason: "disabled",
-            method: resolved2?.method,
-            url: resolved2?.url
-          });
+          params.onSkip?.(buildSkipInfo(fileInfo.file, "disabled", resolved2));
         }
         continue;
       }

package/dist/vite.cjs

@@ -1,10 +1,11 @@
 'use strict';
 
 const node_fs = require('node:fs');
+const node_path = require('node:path');
 const process = require('node:process');
 const node_url = require('node:url');
 const chokidar = require('@mokup/shared/chokidar');
-const sw = require('./shared/mokup.C7VW7pSP.cjs');
+const sw = require('./shared/mokup.CvPjMpMJ.cjs');
 require('node:buffer');
 require('@mokup/shared/hono');
 require('node:module');
@@ -42,17 +43,41 @@ function buildRouteSignature(routes, disabledRoutes) {
 function isViteDevServer(server) {
   return !!server && "ws" in server;
 }
-function normalizeOptions(options) {
-  const list = Array.isArray(options) ? options : [options];
-  return list.length > 0 ? list : [{}];
+const legacyEntryKeys = [
+  "dir",
+  "prefix",
+  "include",
+  "exclude",
+  "ignorePrefix",
+  "watch",
+  "log",
+  "mode",
+  "sw"
+];
+function isLegacyEntryOptions(value) {
+  return legacyEntryKeys.some((key) => key in value);
 }
-function resolvePlaygroundInput(list) {
-  for (const entry of list) {
-    if (typeof entry.playground !== "undefined") {
-      return entry.playground;
-    }
+function normalizeMokupOptions(options) {
+  if (!options) {
+    return {};
   }
-  return void 0;
+  if (Array.isArray(options)) {
+    throw new TypeError("[mokup] Invalid config: use mokup({ entries: [...] }) instead of mokup([...]).");
+  }
+  if (typeof options !== "object") {
+    return {};
+  }
+  if (isLegacyEntryOptions(options)) {
+    throw new Error(
+      "[mokup] Invalid config: use mokup({ entries: { ... } }) instead of mokup({ dir, prefix, ... })."
+    );
+  }
+  return options;
+}
+function normalizeOptions(options) {
+  const entries = options.entries;
+  const list = Array.isArray(entries) ? entries : entries ? [entries] : [{}];
+  return list.length > 0 ? list : [{}];
 }
 function normalizeBase(base) {
   if (!base) {
@@ -115,6 +140,24 @@ function addMiddlewareFirst(server, middleware) {
   }
   server.middlewares.use(middleware);
 }
+function normalizeWatcherFile(file, rootDir) {
+  if (!file) {
+    return file;
+  }
+  if (node_path.isAbsolute(file)) {
+    return file;
+  }
+  return node_path.resolve(rootDir, file);
+}
+function normalizeRawWatcherPath(rawPath) {
+  if (typeof rawPath === "string") {
+    return rawPath;
+  }
+  if (rawPath && typeof rawPath.toString === "function") {
+    return rawPath.toString();
+  }
+  return "";
+}
 function createMokupPlugin(options = {}) {
   let root = process.cwd();
   let base = "/";
@@ -128,10 +171,11 @@ function createMokupPlugin(options = {}) {
   let previewWatcher = null;
   let currentServer = null;
   let lastSignature = null;
-  const optionList = normalizeOptions(options);
+  const normalizedOptions = normalizeMokupOptions(options);
+  const optionList = normalizeOptions(normalizedOptions);
   const logEnabled = optionList.every((entry) => entry.log !== false);
   const watchEnabled = optionList.every((entry) => entry.watch !== false);
-  const playgroundConfig = sw.resolvePlaygroundOptions(resolvePlaygroundInput(optionList));
+  const playgroundConfig = sw.resolvePlaygroundOptions(normalizedOptions.playground);
   const logger = sw.createLogger(logEnabled);
   const hasSwEntries = optionList.some((entry) => entry.mode === "sw");
   const swConfig = sw.resolveSwConfig(optionList, logger);
@@ -425,18 +469,26 @@ function createMokupPlugin(options = {}) {
       const dirs = resolveAllDirs();
       server.watcher.add(dirs);
       const scheduleRefresh = sw.createDebouncer(80, () => refreshRoutes(server));
-      server.watcher.on("add", (file) => {
-        if (sw.isInDirs(file, dirs)) {
+      const handleWatchedFile = (file) => {
+        const resolvedFile = normalizeWatcherFile(file, server.config.root ?? root);
+        if (sw.isInDirs(resolvedFile, dirs)) {
           scheduleRefresh();
         }
-      });
-      server.watcher.on("change", (file) => {
-        if (sw.isInDirs(file, dirs)) {
-          scheduleRefresh();
+      };
+      server.watcher.on("add", handleWatchedFile);
+      server.watcher.on("change", handleWatchedFile);
+      server.watcher.on("unlink", handleWatchedFile);
+      server.watcher.on("raw", (eventName, rawPath, details) => {
+        if (eventName !== "rename") {
+          return;
         }
-      });
-      server.watcher.on("unlink", (file) => {
-        if (sw.isInDirs(file, dirs)) {
+        const candidate = normalizeRawWatcherPath(rawPath);
+        if (!candidate) {
+          return;
+        }
+        const baseDir = typeof details === "object" && details && "watchedPath" in details ? details.watchedPath ?? (server.config.root ?? root) : server.config.root ?? root;
+        const resolvedFile = normalizeWatcherFile(candidate, baseDir);
+        if (sw.isInDirs(resolvedFile, dirs)) {
           scheduleRefresh();
         }
       });
@@ -481,9 +533,29 @@ function createMokupPlugin(options = {}) {
       const watcher = chokidar__default.watch(dirs, { ignoreInitial: true });
       previewWatcher = watcher;
       const scheduleRefresh = sw.createDebouncer(80, () => refreshRoutes(server));
-      watcher.on("add", scheduleRefresh);
-      watcher.on("change", scheduleRefresh);
-      watcher.on("unlink", scheduleRefresh);
+      const handleWatchedFile = (file) => {
+        const resolvedFile = normalizeWatcherFile(file, server.config.root ?? root);
+        if (sw.isInDirs(resolvedFile, dirs)) {
+          scheduleRefresh();
+        }
+      };
+      watcher.on("add", handleWatchedFile);
+      watcher.on("change", handleWatchedFile);
+      watcher.on("unlink", handleWatchedFile);
+      watcher.on("raw", (eventName, rawPath, details) => {
+        if (eventName !== "rename") {
+          return;
+        }
+        const candidate = normalizeRawWatcherPath(rawPath);
+        if (!candidate) {
+          return;
+        }
+        const baseDir = typeof details === "object" && details && "watchedPath" in details ? details.watchedPath ?? (server.config.root ?? root) : server.config.root ?? root;
+        const resolvedFile = normalizeWatcherFile(candidate, baseDir);
+        if (sw.isInDirs(resolvedFile, dirs)) {
+          scheduleRefresh();
+        }
+      });
       server.httpServer?.once("close", () => {
         previewWatcher?.close();
         previewWatcher = null;

package/dist/vite.d.cts

@@ -1,10 +1,10 @@
 import { Plugin } from 'vite';
-import { VitePluginOptionsInput } from './index.cjs';
-export { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions } from './index.cjs';
+import { MokupPluginOptions } from './index.cjs';
+export { HttpMethod, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput } from './index.cjs';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 
-declare function createMokupPlugin(options?: VitePluginOptionsInput): Plugin;
+declare function createMokupPlugin(options?: MokupPluginOptions): Plugin;
 
 // @ts-ignore
 export = createMokupPlugin;
-export { VitePluginOptionsInput };
+export { MokupPluginOptions };

package/dist/vite.d.mts

@@ -1,8 +1,8 @@
 import { Plugin } from 'vite';
-import { VitePluginOptionsInput } from './index.mjs';
-export { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions } from './index.mjs';
+import { MokupPluginOptions } from './index.mjs';
+export { HttpMethod, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput } from './index.mjs';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 
-declare function createMokupPlugin(options?: VitePluginOptionsInput): Plugin;
+declare function createMokupPlugin(options?: MokupPluginOptions): Plugin;
 
-export { VitePluginOptionsInput, createMokupPlugin as default };
+export { MokupPluginOptions, createMokupPlugin as default };

package/dist/vite.d.ts

@@ -1,10 +1,10 @@
 import { Plugin } from 'vite';
-import { VitePluginOptionsInput } from './index.js';
-export { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions } from './index.js';
+import { MokupPluginOptions } from './index.js';
+export { HttpMethod, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput } from './index.js';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 
-declare function createMokupPlugin(options?: VitePluginOptionsInput): Plugin;
+declare function createMokupPlugin(options?: MokupPluginOptions): Plugin;
 
 // @ts-ignore
 export = createMokupPlugin;
-export { VitePluginOptionsInput };
+export { MokupPluginOptions };

package/dist/vite.mjs

@@ -1,8 +1,9 @@
 import { existsSync } from 'node:fs';
+import { isAbsolute, resolve } from 'node:path';
 import { cwd } from 'node:process';
 import { fileURLToPath } from 'node:url';
 import chokidar from '@mokup/shared/chokidar';
-import { r as resolvePlaygroundOptions, a as resolveSwConfig, b as resolveSwUnregisterConfig, c as createPlaygroundMiddleware, d as buildSwScript, e as createLogger, f as createMiddleware, g as createDebouncer, i as isInDirs, h as resolveDirs, s as scanRoutes, j as sortRoutes, k as createHonoApp } from './shared/mokup.Da2mv7KS.mjs';
+import { r as resolvePlaygroundOptions, a as resolveSwConfig, b as resolveSwUnregisterConfig, c as createPlaygroundMiddleware, d as buildSwScript, e as createLogger, f as createMiddleware, i as isInDirs, g as createDebouncer, h as resolveDirs, s as scanRoutes, j as sortRoutes, k as createHonoApp } from './shared/mokup.U2S5CHgY.mjs';
 import 'node:buffer';
 import '@mokup/shared/hono';
 import 'node:module';
@@ -35,17 +36,41 @@ function buildRouteSignature(routes, disabledRoutes) {
 function isViteDevServer(server) {
   return !!server && "ws" in server;
 }
-function normalizeOptions(options) {
-  const list = Array.isArray(options) ? options : [options];
-  return list.length > 0 ? list : [{}];
+const legacyEntryKeys = [
+  "dir",
+  "prefix",
+  "include",
+  "exclude",
+  "ignorePrefix",
+  "watch",
+  "log",
+  "mode",
+  "sw"
+];
+function isLegacyEntryOptions(value) {
+  return legacyEntryKeys.some((key) => key in value);
 }
-function resolvePlaygroundInput(list) {
-  for (const entry of list) {
-    if (typeof entry.playground !== "undefined") {
-      return entry.playground;
-    }
+function normalizeMokupOptions(options) {
+  if (!options) {
+    return {};
   }
-  return void 0;
+  if (Array.isArray(options)) {
+    throw new TypeError("[mokup] Invalid config: use mokup({ entries: [...] }) instead of mokup([...]).");
+  }
+  if (typeof options !== "object") {
+    return {};
+  }
+  if (isLegacyEntryOptions(options)) {
+    throw new Error(
+      "[mokup] Invalid config: use mokup({ entries: { ... } }) instead of mokup({ dir, prefix, ... })."
+    );
+  }
+  return options;
+}
+function normalizeOptions(options) {
+  const entries = options.entries;
+  const list = Array.isArray(entries) ? entries : entries ? [entries] : [{}];
+  return list.length > 0 ? list : [{}];
 }
 function normalizeBase(base) {
   if (!base) {
@@ -108,6 +133,24 @@ function addMiddlewareFirst(server, middleware) {
   }
   server.middlewares.use(middleware);
 }
+function normalizeWatcherFile(file, rootDir) {
+  if (!file) {
+    return file;
+  }
+  if (isAbsolute(file)) {
+    return file;
+  }
+  return resolve(rootDir, file);
+}
+function normalizeRawWatcherPath(rawPath) {
+  if (typeof rawPath === "string") {
+    return rawPath;
+  }
+  if (rawPath && typeof rawPath.toString === "function") {
+    return rawPath.toString();
+  }
+  return "";
+}
 function createMokupPlugin(options = {}) {
   let root = cwd();
   let base = "/";
@@ -121,10 +164,11 @@ function createMokupPlugin(options = {}) {
   let previewWatcher = null;
   let currentServer = null;
   let lastSignature = null;
-  const optionList = normalizeOptions(options);
+  const normalizedOptions = normalizeMokupOptions(options);
+  const optionList = normalizeOptions(normalizedOptions);
   const logEnabled = optionList.every((entry) => entry.log !== false);
   const watchEnabled = optionList.every((entry) => entry.watch !== false);
-  const playgroundConfig = resolvePlaygroundOptions(resolvePlaygroundInput(optionList));
+  const playgroundConfig = resolvePlaygroundOptions(normalizedOptions.playground);
   const logger = createLogger(logEnabled);
   const hasSwEntries = optionList.some((entry) => entry.mode === "sw");
   const swConfig = resolveSwConfig(optionList, logger);
@@ -418,18 +462,26 @@ function createMokupPlugin(options = {}) {
       const dirs = resolveAllDirs();
       server.watcher.add(dirs);
       const scheduleRefresh = createDebouncer(80, () => refreshRoutes(server));
-      server.watcher.on("add", (file) => {
-        if (isInDirs(file, dirs)) {
+      const handleWatchedFile = (file) => {
+        const resolvedFile = normalizeWatcherFile(file, server.config.root ?? root);
+        if (isInDirs(resolvedFile, dirs)) {
           scheduleRefresh();
         }
-      });
-      server.watcher.on("change", (file) => {
-        if (isInDirs(file, dirs)) {
-          scheduleRefresh();
+      };
+      server.watcher.on("add", handleWatchedFile);
+      server.watcher.on("change", handleWatchedFile);
+      server.watcher.on("unlink", handleWatchedFile);
+      server.watcher.on("raw", (eventName, rawPath, details) => {
+        if (eventName !== "rename") {
+          return;
         }
-      });
-      server.watcher.on("unlink", (file) => {
-        if (isInDirs(file, dirs)) {
+        const candidate = normalizeRawWatcherPath(rawPath);
+        if (!candidate) {
+          return;
+        }
+        const baseDir = typeof details === "object" && details && "watchedPath" in details ? details.watchedPath ?? (server.config.root ?? root) : server.config.root ?? root;
+        const resolvedFile = normalizeWatcherFile(candidate, baseDir);
+        if (isInDirs(resolvedFile, dirs)) {
           scheduleRefresh();
         }
       });
@@ -474,9 +526,29 @@ function createMokupPlugin(options = {}) {
       const watcher = chokidar.watch(dirs, { ignoreInitial: true });
       previewWatcher = watcher;
       const scheduleRefresh = createDebouncer(80, () => refreshRoutes(server));
-      watcher.on("add", scheduleRefresh);
-      watcher.on("change", scheduleRefresh);
-      watcher.on("unlink", scheduleRefresh);
+      const handleWatchedFile = (file) => {
+        const resolvedFile = normalizeWatcherFile(file, server.config.root ?? root);
+        if (isInDirs(resolvedFile, dirs)) {
+          scheduleRefresh();
+        }
+      };
+      watcher.on("add", handleWatchedFile);
+      watcher.on("change", handleWatchedFile);
+      watcher.on("unlink", handleWatchedFile);
+      watcher.on("raw", (eventName, rawPath, details) => {
+        if (eventName !== "rename") {
+          return;
+        }
+        const candidate = normalizeRawWatcherPath(rawPath);
+        if (!candidate) {
+          return;
+        }
+        const baseDir = typeof details === "object" && details && "watchedPath" in details ? details.watchedPath ?? (server.config.root ?? root) : server.config.root ?? root;
+        const resolvedFile = normalizeWatcherFile(candidate, baseDir);
+        if (isInDirs(resolvedFile, dirs)) {
+          scheduleRefresh();
+        }
+      });
       server.httpServer?.once("close", () => {
         previewWatcher?.close();
         previewWatcher = null;

package/dist/webpack.cjs

@@ -7,7 +7,7 @@ const process = require('node:process');
 const chokidar = require('@mokup/shared/chokidar');
 const esbuild = require('@mokup/shared/esbuild');
 const pathe = require('@mokup/shared/pathe');
-const sw = require('./shared/mokup.C7VW7pSP.cjs');
+const sw = require('./shared/mokup.CvPjMpMJ.cjs');
 require('node:buffer');
 require('@mokup/shared/hono');
 require('node:fs');
@@ -22,17 +22,41 @@ const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
 
 const pluginName = "mokup:webpack";
 const lifecycleBaseName = "mokup-sw-lifecycle.js";
-function normalizeOptions(options) {
-  const list = Array.isArray(options) ? options : [options];
-  return list.length > 0 ? list : [{}];
+const legacyEntryKeys = [
+  "dir",
+  "prefix",
+  "include",
+  "exclude",
+  "ignorePrefix",
+  "watch",
+  "log",
+  "mode",
+  "sw"
+];
+function isLegacyEntryOptions(value) {
+  return legacyEntryKeys.some((key) => key in value);
 }
-function resolvePlaygroundInput(list) {
-  for (const entry of list) {
-    if (typeof entry.playground !== "undefined") {
-      return entry.playground;
-    }
+function normalizeMokupOptions(options) {
+  if (!options) {
+    return {};
+  }
+  if (Array.isArray(options)) {
+    throw new TypeError("[mokup] Invalid config: use mokup({ entries: [...] }) instead of mokup([...]).");
+  }
+  if (typeof options !== "object") {
+    return {};
   }
-  return void 0;
+  if (isLegacyEntryOptions(options)) {
+    throw new Error(
+      "[mokup] Invalid config: use mokup({ entries: { ... } }) instead of mokup({ dir, prefix, ... })."
+    );
+  }
+  return options;
+}
+function normalizeOptions(options) {
+  const entries = options.entries;
+  const list = Array.isArray(entries) ? entries : entries ? [entries] : [{}];
+  return list.length > 0 ? list : [{}];
 }
 function normalizeBase(base) {
   if (!base) {
@@ -165,10 +189,11 @@ function resolveHtmlWebpackPlugin() {
   }
 }
 function createMokupWebpackPlugin(options = {}) {
-  const optionList = normalizeOptions(options);
+  const normalizedOptions = normalizeMokupOptions(options);
+  const optionList = normalizeOptions(normalizedOptions);
   const logEnabled = optionList.every((entry) => entry.log !== false);
   const watchEnabled = optionList.every((entry) => entry.watch !== false);
-  const playgroundConfig = sw.resolvePlaygroundOptions(resolvePlaygroundInput(optionList));
+  const playgroundConfig = sw.resolvePlaygroundOptions(normalizedOptions.playground);
   const logger = sw.createLogger(logEnabled);
   const hasSwEntries = optionList.some((entry) => entry.mode === "sw");
   const swConfig = sw.resolveSwConfig(optionList, logger);

package/dist/webpack.d.cts

@@ -1,5 +1,5 @@
-import { VitePluginOptionsInput } from './index.cjs';
-export { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions } from './index.cjs';
+import { MokupPluginOptions } from './index.cjs';
+export { HttpMethod, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput } from './index.cjs';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 
@@ -81,8 +81,8 @@ interface WebpackCompiler {
         };
     };
 }
-declare function createMokupWebpackPlugin(options?: VitePluginOptionsInput): WebpackPluginInstance;
+declare function createMokupWebpackPlugin(options?: MokupPluginOptions): WebpackPluginInstance;
 
 // @ts-ignore
 export = createMokupWebpackPlugin;
-export { VitePluginOptionsInput, createMokupWebpackPlugin };
+export { MokupPluginOptions, createMokupWebpackPlugin };

package/dist/webpack.d.mts

@@ -1,5 +1,5 @@
-import { VitePluginOptionsInput } from './index.mjs';
-export { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions } from './index.mjs';
+import { MokupPluginOptions } from './index.mjs';
+export { HttpMethod, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput } from './index.mjs';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 
@@ -81,6 +81,6 @@ interface WebpackCompiler {
         };
     };
 }
-declare function createMokupWebpackPlugin(options?: VitePluginOptionsInput): WebpackPluginInstance;
+declare function createMokupWebpackPlugin(options?: MokupPluginOptions): WebpackPluginInstance;
 
-export { VitePluginOptionsInput, createMokupWebpackPlugin, createMokupWebpackPlugin as default };
+export { MokupPluginOptions, createMokupWebpackPlugin, createMokupWebpackPlugin as default };

package/dist/webpack.d.ts

@@ -1,5 +1,5 @@
-import { VitePluginOptionsInput } from './index.js';
-export { HttpMethod, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions } from './index.js';
+import { MokupPluginOptions } from './index.js';
+export { HttpMethod, PlaygroundOptionsInput, RequestHandler, RouteDirectoryConfig, RouteResponse, RouteRule, RuntimeMode, ServiceWorkerOptions, VitePluginOptions, VitePluginOptionsInput } from './index.js';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 
@@ -81,8 +81,8 @@ interface WebpackCompiler {
         };
     };
 }
-declare function createMokupWebpackPlugin(options?: VitePluginOptionsInput): WebpackPluginInstance;
+declare function createMokupWebpackPlugin(options?: MokupPluginOptions): WebpackPluginInstance;
 
 // @ts-ignore
 export = createMokupWebpackPlugin;
-export { VitePluginOptionsInput, createMokupWebpackPlugin };
+export { MokupPluginOptions, createMokupWebpackPlugin };

package/dist/webpack.mjs

@@ -3,7 +3,7 @@ import { cwd } from 'node:process';
 import chokidar from '@mokup/shared/chokidar';
 import { build } from '@mokup/shared/esbuild';
 import { isAbsolute, resolve } from '@mokup/shared/pathe';
-import { r as resolvePlaygroundOptions, a as resolveSwConfig, b as resolveSwUnregisterConfig, c as createPlaygroundMiddleware, e as createLogger, f as createMiddleware, i as isInDirs, g as createDebouncer, h as resolveDirs, s as scanRoutes, j as sortRoutes, k as createHonoApp, d as buildSwScript, t as toPosix } from './shared/mokup.Da2mv7KS.mjs';
+import { r as resolvePlaygroundOptions, a as resolveSwConfig, b as resolveSwUnregisterConfig, c as createPlaygroundMiddleware, e as createLogger, f as createMiddleware, i as isInDirs, g as createDebouncer, h as resolveDirs, s as scanRoutes, j as sortRoutes, k as createHonoApp, d as buildSwScript, t as toPosix } from './shared/mokup.U2S5CHgY.mjs';
 import 'node:buffer';
 import '@mokup/shared/hono';
 import 'node:fs';
@@ -13,17 +13,41 @@ import '@mokup/runtime';
 
 const pluginName = "mokup:webpack";
 const lifecycleBaseName = "mokup-sw-lifecycle.js";
-function normalizeOptions(options) {
-  const list = Array.isArray(options) ? options : [options];
-  return list.length > 0 ? list : [{}];
+const legacyEntryKeys = [
+  "dir",
+  "prefix",
+  "include",
+  "exclude",
+  "ignorePrefix",
+  "watch",
+  "log",
+  "mode",
+  "sw"
+];
+function isLegacyEntryOptions(value) {
+  return legacyEntryKeys.some((key) => key in value);
 }
-function resolvePlaygroundInput(list) {
-  for (const entry of list) {
-    if (typeof entry.playground !== "undefined") {
-      return entry.playground;
-    }
+function normalizeMokupOptions(options) {
+  if (!options) {
+    return {};
+  }
+  if (Array.isArray(options)) {
+    throw new TypeError("[mokup] Invalid config: use mokup({ entries: [...] }) instead of mokup([...]).");
+  }
+  if (typeof options !== "object") {
+    return {};
   }
-  return void 0;
+  if (isLegacyEntryOptions(options)) {
+    throw new Error(
+      "[mokup] Invalid config: use mokup({ entries: { ... } }) instead of mokup({ dir, prefix, ... })."
+    );
+  }
+  return options;
+}
+function normalizeOptions(options) {
+  const entries = options.entries;
+  const list = Array.isArray(entries) ? entries : entries ? [entries] : [{}];
+  return list.length > 0 ? list : [{}];
 }
 function normalizeBase(base) {
   if (!base) {
@@ -156,10 +180,11 @@ function resolveHtmlWebpackPlugin() {
   }
 }
 function createMokupWebpackPlugin(options = {}) {
-  const optionList = normalizeOptions(options);
+  const normalizedOptions = normalizeMokupOptions(options);
+  const optionList = normalizeOptions(normalizedOptions);
   const logEnabled = optionList.every((entry) => entry.log !== false);
   const watchEnabled = optionList.every((entry) => entry.watch !== false);
-  const playgroundConfig = resolvePlaygroundOptions(resolvePlaygroundInput(optionList));
+  const playgroundConfig = resolvePlaygroundOptions(normalizedOptions.playground);
   const logger = createLogger(logEnabled);
   const hasSwEntries = optionList.some((entry) => entry.mode === "sw");
   const swConfig = resolveSwConfig(optionList, logger);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mokup",
   "type": "module",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "description": "Mock utilities and Vite plugin for mokup.",
   "license": "MIT",
   "homepage": "https://mokup.icebreaker.top",
@@ -81,10 +81,10 @@
     }
   },
   "dependencies": {
-    "@mokup/cli": "1.0.2",
-    "@mokup/playground": "0.0.8",
+    "@mokup/cli": "1.0.3",
+    "@mokup/playground": "0.0.9",
     "@mokup/runtime": "1.0.0",
-    "@mokup/server": "1.0.4",
+    "@mokup/server": "1.1.0",
     "@mokup/shared": "1.0.0"
   },
   "devDependencies": {