@mokup/cli 1.0.9 → 1.0.11

package/dist/index.cjs

@@ -7,6 +7,7 @@ const node_buffer = require('node:buffer');
 const node_module = require('node:module');
 const node_url = require('node:url');
 const esbuild = require('@mokup/shared/esbuild');
+const pathUtils = require('@mokup/shared/path-utils');
 const runtime = require('@mokup/runtime');
 const jsoncParser = require('@mokup/shared/jsonc-parser');
 const node = require('@mokup/server/node');
@@ -264,10 +265,6 @@ async function resolveDirectoryConfig(params) {
   };
 }
 
-function toPosix(value) {
-  return value.replace(/\\/g, "/");
-}
-
 const supportedExtensions = /* @__PURE__ */ new Set([
   ".json",
   ".jsonc",
@@ -318,34 +315,10 @@ function resolveDirs(dir, root) {
   );
   return Array.from(new Set(normalized));
 }
-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 isSupportedFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;
@@ -363,7 +336,7 @@ function getHandlerModulePath(file, handlersDir, root) {
   const relNoExt = `${relFromRoot.slice(0, relFromRoot.length - ext.length)}.mjs`;
   const outputPath = pathe.join(handlersDir, relNoExt);
   const relFromOutDir = pathe.relative(pathe.dirname(handlersDir), outputPath);
-  const normalized = toPosix(relFromOutDir);
+  const normalized = pathUtils.toPosix(relFromOutDir);
   return normalized.startsWith(".") ? normalized : `./${normalized}`;
 }
 async function writeHandlerIndex(handlerModuleMap, handlersDir, outDir) {
@@ -375,7 +348,7 @@ async function writeHandlerIndex(handlerModuleMap, handlersDir, outDir) {
   const entries = [];
   modulePaths.forEach((modulePath, index) => {
     const absolutePath = pathe.resolve(outDir, modulePath);
-    const relImport = toPosix(pathe.relative(handlersDir, absolutePath));
+    const relImport = pathUtils.toPosix(pathe.relative(handlersDir, absolutePath));
     const importPath = relImport.startsWith(".") ? relImport : `./${relImport}`;
     const name = `module${index}`;
     imports.push(`import * as ${name} from '${importPath}'`);
@@ -509,7 +482,7 @@ function stripMethodSuffix(base) {
   };
 }
 function deriveRouteFromFile(file, rootDir, log) {
-  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);
@@ -525,7 +498,7 @@ function deriveRouteFromFile(file, rootDir, log) {
     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();
   }
@@ -683,7 +656,7 @@ async function buildManifest(options = {}) {
       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)) {
       continue;
     }
     if (!isSupportedFile(fileInfo.file)) {
@@ -691,7 +664,7 @@ async function buildManifest(options = {}) {
     }
     const effectiveInclude = typeof config.include !== "undefined" ? config.include : options.include;
     const effectiveExclude = typeof config.exclude !== "undefined" ? config.exclude : options.exclude;
-    if (!matchesFilter(fileInfo.file, effectiveInclude, effectiveExclude)) {
+    if (!pathUtils.matchesFilter(fileInfo.file, effectiveInclude, effectiveExclude)) {
       continue;
     }
     const derived = deriveRouteFromFile(fileInfo.file, fileInfo.rootDir, options.log);
@@ -753,7 +726,7 @@ async function buildManifest(options = {}) {
       if (!response) {
         continue;
       }
-      const source = toPosix(pathe.relative(root, fileInfo.file));
+      const source = pathUtils.toPosix(pathe.relative(root, fileInfo.file));
       const middlewareRefs = options.handlers === false ? [] : config.middlewares.map((entry) => {
         handlerSources.add(entry.file);
         const modulePath = getHandlerModulePath(entry.file, handlersDir, root);

package/dist/index.mjs

@@ -1,10 +1,11 @@
 import { promises } from 'node:fs';
 import process, { cwd } from 'node:process';
-import { join, normalize, dirname, resolve, isAbsolute, relative, basename, extname } from '@mokup/shared/pathe';
+import { join, normalize, dirname, resolve, isAbsolute, basename, extname, relative } from '@mokup/shared/pathe';
 import { Buffer } from 'node:buffer';
 import { createRequire } from 'node:module';
 import { pathToFileURL } from 'node:url';
 import { build } from '@mokup/shared/esbuild';
+import { toPosix, hasIgnoredPrefix, matchesFilter } from '@mokup/shared/path-utils';
 import { parseRouteTemplate, compareRouteScore } from '@mokup/runtime';
 import { parse } from '@mokup/shared/jsonc-parser';
 import { createFetchServer, serve } from '@mokup/server/node';
@@ -257,10 +258,6 @@ async function resolveDirectoryConfig(params) {
   };
 }
 
-function toPosix(value) {
-  return value.replace(/\\/g, "/");
-}
-
 const supportedExtensions = /* @__PURE__ */ new Set([
   ".json",
   ".jsonc",
@@ -311,34 +308,10 @@ function resolveDirs(dir, root) {
   );
   return Array.from(new Set(normalized));
 }
-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 isSupportedFile(file) {
   if (file.endsWith(".d.ts")) {
     return false;

package/package.json

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