mokup 2.1.0 → 2.1.1

package/dist/shared/{mokup.i875Kuim.cjs → mokup.To7knvSq.cjs}

@@ -283,7 +283,7 @@ function resolvePlaygroundOptions(playground) {
   return { enabled: true, path: "/__mokup" };
 }
 
-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.i875Kuim.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.To7knvSq.cjs', document.baseURI).href)));
 const mimeTypes = {
   ".html": "text/html; charset=utf-8",
   ".css": "text/css; charset=utf-8",
@@ -774,6 +774,7 @@ function resolveSwUnregisterConfig(options, logger) {
 function buildSwScript(params) {
   const { routes, root } = params;
   const runtimeImportPath = params.runtimeImportPath ?? "mokup/runtime";
+  const loggerImportPath = params.loggerImportPath ?? "@mokup/shared/logger";
   const basePaths = params.basePaths ?? [];
   const resolveModulePath = params.resolveModulePath ?? toViteImportPath;
   const { manifest, modules } = buildManifestData({
@@ -782,7 +783,7 @@ function buildSwScript(params) {
     resolveModulePath
   });
   const imports = [
-    "import { createLogger } from '@mokup/shared/logger'",
+    `import { createLogger } from ${JSON.stringify(loggerImportPath)}`,
     `import { createRuntimeApp, handle } from ${JSON.stringify(runtimeImportPath)}`
   ];
   const moduleEntries = [];
@@ -1315,7 +1316,7 @@ function isConfigFile(file) {
   return configExtensions.includes(ext);
 }
 
-const sourceRoot = pathe.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.i875Kuim.cjs', document.baseURI).href))));
+const sourceRoot = pathe.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/mokup.To7knvSq.cjs', document.baseURI).href))));
 const mokupSourceEntry = pathe.resolve(sourceRoot, "../index.ts");
 const mokupViteSourceEntry = pathe.resolve(sourceRoot, "../vite.ts");
 const hasMokupSourceEntry = node_fs.existsSync(mokupSourceEntry);
@@ -1340,7 +1341,7 @@ const workspaceResolvePlugin = createWorkspaceResolvePlugin();
 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.i875Kuim.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.To7knvSq.cjs', document.baseURI).href)));
     delete require$1.cache[file];
     return require$1(file);
   }

package/dist/shared/{mokup.Bp9u3JKA.mjs → mokup.ghra3mzH.mjs}

@@ -771,6 +771,7 @@ function resolveSwUnregisterConfig(options, logger) {
 function buildSwScript(params) {
   const { routes, root } = params;
   const runtimeImportPath = params.runtimeImportPath ?? "mokup/runtime";
+  const loggerImportPath = params.loggerImportPath ?? "@mokup/shared/logger";
   const basePaths = params.basePaths ?? [];
   const resolveModulePath = params.resolveModulePath ?? toViteImportPath;
   const { manifest, modules } = buildManifestData({
@@ -779,7 +780,7 @@ function buildSwScript(params) {
     resolveModulePath
   });
   const imports = [
-    "import { createLogger } from '@mokup/shared/logger'",
+    `import { createLogger } from ${JSON.stringify(loggerImportPath)}`,
     `import { createRuntimeApp, handle } from ${JSON.stringify(runtimeImportPath)}`
   ];
   const moduleEntries = [];

package/dist/vite.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const process = require('node:process');
-const scanner = require('./shared/mokup.i875Kuim.cjs');
+const scanner = require('./shared/mokup.To7knvSq.cjs');
 const logger = require('@mokup/shared/logger');
 const pc = require('picocolors');
 const node_path = require('node:path');
@@ -148,6 +148,10 @@ function resolveSwRuntimeImportPath(base) {
   const normalizedBase = normalizeBase(base);
   return `${normalizedBase}@id/mokup/runtime`;
 }
+function resolveSwLoggerImportPath(base) {
+  const normalizedBase = normalizeBase(base);
+  return `${normalizedBase}@id/@mokup/shared/logger`;
+}
 
 function buildRouteSignature(routes, disabledRoutes, ignoredRoutes, configFiles, disabledConfigFiles) {
   return routes.map(
@@ -316,6 +320,47 @@ function addMiddlewareFirst(server, middleware) {
   server.middlewares.use(middleware);
 }
 
+const portPattern = /:(?<port>\d{2,5})/g;
+const escapeCode = 27;
+function stripAnsi(value) {
+  let output = "";
+  for (let index = 0; index < value.length; index += 1) {
+    const code = value.charCodeAt(index);
+    if (code === escapeCode && value[index + 1] === "[") {
+      index += 1;
+      while (index < value.length && value[index] !== "m") {
+        index += 1;
+      }
+      continue;
+    }
+    output += value[index];
+  }
+  return output;
+}
+function formatOutputLine(line, options) {
+  const { arrowToken, formattedArrow, labels, formatLabel, formatPort } = options;
+  let output = formattedArrow ? line.replaceAll(arrowToken, formattedArrow) : line;
+  if (labels && formatLabel) {
+    for (const label of labels) {
+      output = output.replaceAll(label, formatLabel(label));
+    }
+  }
+  if (formatPort) {
+    output = output.replace(portPattern, (_match, port) => `:${formatPort(port)}`);
+  }
+  return output;
+}
+
+const arrowToken = "\u279C";
+const playgroundLabel = "Mokup Playground";
+const coloredArrow = pc__default.green(arrowToken);
+const formatOptions = {
+  arrowToken,
+  formattedArrow: coloredArrow,
+  labels: [playgroundLabel],
+  formatLabel: pc__default.bold,
+  formatPort: pc__default.bold
+};
 function patchPlaygroundPrintUrls(server, playgroundPath) {
   const originalPrintUrls = server.printUrls.bind(server);
   const patchPrintUrls = () => {
@@ -340,18 +385,22 @@ function patchPlaygroundPrintUrls(server, playgroundPath) {
     const localUrl = server.resolvedUrls?.local?.[0];
     const outputUrl = formatPlaygroundUrl(localUrl, playgroundPath);
     const coloredUrl = pc__default.magenta(outputUrl);
-    const playgroundLine = `  \u279C  Mokup Playground: ${coloredUrl}`;
-    const ansiEscape = "\x1B";
-    const ansiPattern = new RegExp(`${ansiEscape}\\[[0-9;]*m`, "g");
-    const stripAnsi = (value) => value.replace(ansiPattern, "");
+    const playgroundLine = `  ${arrowToken}  ${playgroundLabel}: ${coloredUrl}`;
+    const arrowPrefix = `  ${arrowToken}  `;
     const findIndex = (needle) => lines.findIndex((args) => stripAnsi(args[0]).includes(needle));
-    const networkIndex = findIndex("  \u279C  Network:");
-    const localIndex = findIndex("  \u279C  Local:");
+    const networkIndex = findIndex(`${arrowPrefix}Network:`);
+    const localIndex = findIndex(`${arrowPrefix}Local:`);
     const insertIndex = networkIndex >= 0 ? networkIndex + 1 : localIndex >= 0 ? localIndex + 1 : lines.length;
     const outputLines = lines.slice();
     outputLines.splice(insertIndex, 0, [playgroundLine]);
     for (const args of outputLines) {
-      originalInfo(...args);
+      if (typeof args[0] === "string") {
+        const nextArgs = args.slice();
+        nextArgs[0] = formatOutputLine(nextArgs[0], formatOptions);
+        originalInfo(...nextArgs);
+      } else {
+        originalInfo(...args);
+      }
     }
   };
   Object.defineProperty(server, "printUrls", {
@@ -476,6 +525,7 @@ async function configureDevServer(params) {
           routes: state.swRoutes,
           root,
           runtimeImportPath: resolveSwRuntimeImportPath(base),
+          loggerImportPath: resolveSwLoggerImportPath(base),
           basePaths: swConfig?.basePaths ?? []
         });
         res.statusCode = 200;

package/dist/vite.mjs

@@ -1,5 +1,5 @@
 import { cwd } from 'node:process';
-import { k as buildManifestData, r as resolveDirs, s as scanRoutes, a as sortRoutes, c as createHonoApp, i as isInDirs, d as createDebouncer, b as buildSwScript, j as createMiddleware, e as resolvePlaygroundOptions, f as resolveSwConfig, g as resolveSwUnregisterConfig, h as createPlaygroundMiddleware } from './shared/mokup.Bp9u3JKA.mjs';
+import { k as buildManifestData, r as resolveDirs, s as scanRoutes, a as sortRoutes, c as createHonoApp, i as isInDirs, d as createDebouncer, b as buildSwScript, j as createMiddleware, e as resolvePlaygroundOptions, f as resolveSwConfig, g as resolveSwUnregisterConfig, h as createPlaygroundMiddleware } from './shared/mokup.ghra3mzH.mjs';
 import { createLogger } from '@mokup/shared/logger';
 import pc from 'picocolors';
 import { isAbsolute, resolve } from 'node:path';
@@ -140,6 +140,10 @@ function resolveSwRuntimeImportPath(base) {
   const normalizedBase = normalizeBase(base);
   return `${normalizedBase}@id/mokup/runtime`;
 }
+function resolveSwLoggerImportPath(base) {
+  const normalizedBase = normalizeBase(base);
+  return `${normalizedBase}@id/@mokup/shared/logger`;
+}
 
 function buildRouteSignature(routes, disabledRoutes, ignoredRoutes, configFiles, disabledConfigFiles) {
   return routes.map(
@@ -308,6 +312,47 @@ function addMiddlewareFirst(server, middleware) {
   server.middlewares.use(middleware);
 }
 
+const portPattern = /:(?<port>\d{2,5})/g;
+const escapeCode = 27;
+function stripAnsi(value) {
+  let output = "";
+  for (let index = 0; index < value.length; index += 1) {
+    const code = value.charCodeAt(index);
+    if (code === escapeCode && value[index + 1] === "[") {
+      index += 1;
+      while (index < value.length && value[index] !== "m") {
+        index += 1;
+      }
+      continue;
+    }
+    output += value[index];
+  }
+  return output;
+}
+function formatOutputLine(line, options) {
+  const { arrowToken, formattedArrow, labels, formatLabel, formatPort } = options;
+  let output = formattedArrow ? line.replaceAll(arrowToken, formattedArrow) : line;
+  if (labels && formatLabel) {
+    for (const label of labels) {
+      output = output.replaceAll(label, formatLabel(label));
+    }
+  }
+  if (formatPort) {
+    output = output.replace(portPattern, (_match, port) => `:${formatPort(port)}`);
+  }
+  return output;
+}
+
+const arrowToken = "\u279C";
+const playgroundLabel = "Mokup Playground";
+const coloredArrow = pc.green(arrowToken);
+const formatOptions = {
+  arrowToken,
+  formattedArrow: coloredArrow,
+  labels: [playgroundLabel],
+  formatLabel: pc.bold,
+  formatPort: pc.bold
+};
 function patchPlaygroundPrintUrls(server, playgroundPath) {
   const originalPrintUrls = server.printUrls.bind(server);
   const patchPrintUrls = () => {
@@ -332,18 +377,22 @@ function patchPlaygroundPrintUrls(server, playgroundPath) {
     const localUrl = server.resolvedUrls?.local?.[0];
     const outputUrl = formatPlaygroundUrl(localUrl, playgroundPath);
     const coloredUrl = pc.magenta(outputUrl);
-    const playgroundLine = `  \u279C  Mokup Playground: ${coloredUrl}`;
-    const ansiEscape = "\x1B";
-    const ansiPattern = new RegExp(`${ansiEscape}\\[[0-9;]*m`, "g");
-    const stripAnsi = (value) => value.replace(ansiPattern, "");
+    const playgroundLine = `  ${arrowToken}  ${playgroundLabel}: ${coloredUrl}`;
+    const arrowPrefix = `  ${arrowToken}  `;
     const findIndex = (needle) => lines.findIndex((args) => stripAnsi(args[0]).includes(needle));
-    const networkIndex = findIndex("  \u279C  Network:");
-    const localIndex = findIndex("  \u279C  Local:");
+    const networkIndex = findIndex(`${arrowPrefix}Network:`);
+    const localIndex = findIndex(`${arrowPrefix}Local:`);
     const insertIndex = networkIndex >= 0 ? networkIndex + 1 : localIndex >= 0 ? localIndex + 1 : lines.length;
     const outputLines = lines.slice();
     outputLines.splice(insertIndex, 0, [playgroundLine]);
     for (const args of outputLines) {
-      originalInfo(...args);
+      if (typeof args[0] === "string") {
+        const nextArgs = args.slice();
+        nextArgs[0] = formatOutputLine(nextArgs[0], formatOptions);
+        originalInfo(...nextArgs);
+      } else {
+        originalInfo(...args);
+      }
     }
   };
   Object.defineProperty(server, "printUrls", {
@@ -468,6 +517,7 @@ async function configureDevServer(params) {
           routes: state.swRoutes,
           root,
           runtimeImportPath: resolveSwRuntimeImportPath(base),
+          loggerImportPath: resolveSwLoggerImportPath(base),
           basePaths: swConfig?.basePaths ?? []
         });
         res.statusCode = 200;

package/dist/webpack.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const process = require('node:process');
-const scanner = require('./shared/mokup.i875Kuim.cjs');
+const scanner = require('./shared/mokup.To7knvSq.cjs');
 const logger = require('@mokup/shared/logger');
 const esbuild = require('@mokup/shared/esbuild');
 const node_module = require('node:module');

package/dist/webpack.mjs

@@ -1,5 +1,5 @@
 import { cwd } from 'node:process';
-import { b as buildSwScript, t as toPosix, r as resolveDirs, s as scanRoutes, a as sortRoutes, c as createHonoApp, i as isInDirs, d as createDebouncer, e as resolvePlaygroundOptions, f as resolveSwConfig, g as resolveSwUnregisterConfig, h as createPlaygroundMiddleware, j as createMiddleware } from './shared/mokup.Bp9u3JKA.mjs';
+import { b as buildSwScript, t as toPosix, r as resolveDirs, s as scanRoutes, a as sortRoutes, c as createHonoApp, i as isInDirs, d as createDebouncer, e as resolvePlaygroundOptions, f as resolveSwConfig, g as resolveSwUnregisterConfig, h as createPlaygroundMiddleware, j as createMiddleware } from './shared/mokup.ghra3mzH.mjs';
 import { createLogger } from '@mokup/shared/logger';
 import { build } from '@mokup/shared/esbuild';
 import { createRequire } from 'node:module';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mokup",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Mock utilities and Vite plugin for mokup.",
   "license": "MIT",
   "homepage": "https://mokup.icebreaker.top",
@@ -92,10 +92,10 @@
   },
   "dependencies": {
     "picocolors": "^1.1.1",
-    "@mokup/cli": "1.0.6",
-    "@mokup/playground": "0.0.11",
+    "@mokup/cli": "1.0.7",
+    "@mokup/playground": "0.0.12",
     "@mokup/runtime": "1.0.3",
-    "@mokup/server": "1.1.3",
+    "@mokup/server": "1.1.4",
     "@mokup/shared": "1.0.2"
   },
   "devDependencies": {