effect-start 0.23.0 → 0.25.0

package/dist/PathPattern.js

@@ -1,104 +1,124 @@
+
+
 function isValidSegment(segment) {
-    if (segment.startsWith(":")) {
-        const rest = segment.slice(1);
-        if (rest.endsWith("*") || rest.endsWith("+") || rest.endsWith("?")) {
-            const name = rest.slice(0, -1);
-            return name !== "" && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name);
-        }
-        return rest !== "" && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(rest);
+  if (segment.startsWith(":")) {
+    const rest = segment.slice(1)
+    if (rest.endsWith("*") || rest.endsWith("+") || rest.endsWith("?")) {
+      const name = rest.slice(0, -1)
+      return name !== "" && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)
     }
-    return /^[\p{L}\p{N}._~-]+$/u.test(segment);
+    return rest !== "" && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(rest)
+  }
+  return /^[\p{L}\p{N}._~-]+$/u.test(segment)
 }
+
 export function validate(path) {
-    const segments = path.split("/").filter(Boolean);
-    for (const segment of segments) {
-        if (!isValidSegment(segment)) {
-            return {
-                ok: false,
-                error: `Invalid segment "${segment}" in "${path}"`,
-            };
-        }
+  const segments = path.split("/").filter(Boolean)
+  for (const segment of segments) {
+    if (!isValidSegment(segment)) {
+      return {
+        ok: false,
+        error: `Invalid segment "${segment}" in "${path}"`,
+      }
     }
-    return { ok: true, segments };
+  }
+  return { ok: true, segments }
 }
+
 export function match(pattern, path) {
-    const patternSegments = pattern.split("/").filter(Boolean);
-    const pathSegments = path.split("/").filter(Boolean);
-    const params = {};
-    let patternIndex = 0;
-    let pathIndex = 0;
-    while (patternIndex < patternSegments.length) {
-        const seg = patternSegments[patternIndex];
-        if (seg.startsWith(":")) {
-            const rest = seg.slice(1);
-            if (rest.endsWith("+")) {
-                const name = rest.slice(0, -1);
-                const remaining = pathSegments.slice(pathIndex);
-                if (remaining.length === 0) {
-                    return null;
-                }
-                params[name] = remaining.join("/");
-                return params;
-            }
-            if (rest.endsWith("*")) {
-                const name = rest.slice(0, -1);
-                const remaining = pathSegments.slice(pathIndex);
-                if (remaining.length > 0) {
-                    params[name] = remaining.join("/");
-                }
-                return params;
-            }
-            if (rest.endsWith("?")) {
-                const name = rest.slice(0, -1);
-                if (pathIndex < pathSegments.length) {
-                    params[name] = pathSegments[pathIndex];
-                    pathIndex++;
-                }
-                patternIndex++;
-                continue;
-            }
-            if (pathIndex >= pathSegments.length) {
-                return null;
-            }
-            params[rest] = pathSegments[pathIndex];
-            pathIndex++;
-            patternIndex++;
-            continue;
+  const patternSegments = pattern.split("/").filter(Boolean)
+  const pathSegments = path.split("/").filter(Boolean)
+  const params = {}
+  let patternIndex = 0
+  let pathIndex = 0
+
+  while (patternIndex < patternSegments.length) {
+    const seg = patternSegments[patternIndex]
+
+    if (seg.startsWith(":")) {
+      const rest = seg.slice(1)
+
+      if (rest.endsWith("+")) {
+        const name = rest.slice(0, -1)
+        const remaining = pathSegments.slice(pathIndex)
+        if (remaining.length === 0) {
+          return null
         }
-        if (pathIndex >= pathSegments.length) {
-            return null;
+        params[name] = remaining.join("/")
+        return params
+      }
+
+      if (rest.endsWith("*")) {
+        const name = rest.slice(0, -1)
+        const remaining = pathSegments.slice(pathIndex)
+        if (remaining.length > 0) {
+          params[name] = remaining.join("/")
         }
-        if (seg !== pathSegments[pathIndex]) {
-            return null;
+        return params
+      }
+
+      if (rest.endsWith("?")) {
+        const name = rest.slice(0, -1)
+        if (pathIndex < pathSegments.length) {
+          params[name] = pathSegments[pathIndex]
+          pathIndex++
         }
-        pathIndex++;
-        patternIndex++;
+        patternIndex++
+        continue
+      }
+
+      if (pathIndex >= pathSegments.length) {
+        return null
+      }
+
+      params[rest] = pathSegments[pathIndex]
+      pathIndex++
+      patternIndex++
+      continue
+    }
+
+    if (pathIndex >= pathSegments.length) {
+      return null
     }
-    if (pathIndex !== pathSegments.length) {
-        return null;
+
+    if (seg !== pathSegments[pathIndex]) {
+      return null
     }
-    return params;
+
+    pathIndex++
+    patternIndex++
+  }
+
+  if (pathIndex !== pathSegments.length) {
+    return null
+  }
+
+  return params
 }
+
 export function toRegex(path) {
-    const result = path
-        .replace(/\/+(\/|$)/g, "$1")
-        .replace(/\./g, "\\.")
-        .replace(/(\/?):(\w+)\+/g, "($1(?<$2>*))")
-        .replace(/(\/?):(\w+)\*/g, "(?:\\/(?<$2>.*))?")
-        .replace(/(\/?):(\w+)/g, "($1(?<$2>[^$1/]+?))")
-        .replace(/(\/?)\*/g, "($1.*)?");
-    return new RegExp(`^${result}/*$`);
+  const result = path
+    .replace(/\/+(\/|$)/g, "$1")
+    .replace(/\./g, "\\.")
+    .replace(/(\/?):(\w+)\+/g, "($1(?<$2>*))")
+    .replace(/(\/?):(\w+)\*/g, "(?:\\/(?<$2>.*))?")
+    .replace(/(\/?):(\w+)/g, "($1(?<$2>[^$1/]+?))")
+    .replace(/(\/?)\*/g, "($1.*)?")
+
+  return new RegExp(`^${result}/*$`)
 }
+
 function getModifier(seg) {
-    const last = seg[seg.length - 1];
-    if (last === "?" || last === "*" || last === "+")
-        return last;
-    return "";
+  const last = seg[seg.length - 1]
+  if (last === "?" || last === "*" || last === "+") return last
+  return ""
 }
+
 function getParamName(seg) {
-    const modifier = getModifier(seg);
-    return modifier ? seg.slice(1, -1) : seg.slice(1);
+  const modifier = getModifier(seg)
+  return modifier ? seg.slice(1, -1) : seg.slice(1)
 }
+
 /**
  * Converts to Express path pattern.
  *
@@ -110,45 +130,47 @@ function getParamName(seg) {
  * - `:param*` → `/`, `/*param`
  */
 export function toExpress(path) {
-    const segments = path.split("/").filter(Boolean);
-    const optionalWildcardIndex = segments.findIndex((s) => s.startsWith(":") && s.endsWith("*"));
-    if (optionalWildcardIndex !== -1) {
-        const before = segments.slice(0, optionalWildcardIndex);
-        const rest = segments[optionalWildcardIndex];
-        const name = getParamName(rest);
-        const beforeJoined = before
-            .map((s) => (s.startsWith(":") ? `:${getParamName(s)}` : s))
-            .join("/");
-        const basePath = beforeJoined ? "/" + beforeJoined : "/";
-        const withWildcard = basePath === "/" ? `/*${name}` : basePath + `/*${name}`;
-        return [basePath, withWildcard];
-    }
-    let result = "";
-    for (const seg of segments) {
-        if (!seg.startsWith(":")) {
-            result += "/" + seg;
-        }
-        else {
-            const name = getParamName(seg);
-            const modifier = getModifier(seg);
-            switch (modifier) {
-                case "":
-                    result += `/:${name}`;
-                    break;
-                case "?":
-                    result += `{/:${name}}`;
-                    break;
-                case "+":
-                    result += `/*${name}`;
-                    break;
-                case "*":
-                    result += `/*${name}`;
-                    break;
-            }
-        }
+  const segments = path.split("/").filter(Boolean)
+  const optionalWildcardIndex = segments.findIndex((s) => s.startsWith(":") && s.endsWith("*"))
+
+  if (optionalWildcardIndex !== -1) {
+    const before = segments.slice(0, optionalWildcardIndex)
+    const rest = segments[optionalWildcardIndex]
+    const name = getParamName(rest)
+    const beforeJoined = before
+      .map((s) => (s.startsWith(":") ? `:${getParamName(s)}` : s))
+      .join("/")
+    const basePath = beforeJoined ? "/" + beforeJoined : "/"
+    const withWildcard = basePath === "/" ? `/*${name}` : basePath + `/*${name}`
+    return [basePath, withWildcard]
+  }
+
+  let result = ""
+  for (const seg of segments) {
+    if (!seg.startsWith(":")) {
+      result += "/" + seg
+    } else {
+      const name = getParamName(seg)
+      const modifier = getModifier(seg)
+      switch (modifier) {
+        case "":
+          result += `/:${name}`
+          break
+        case "?":
+          result += `{/:${name}}`
+          break
+        case "+":
+          result += `/*${name}`
+          break
+        case "*":
+          result += `/*${name}`
+          break
+      }
     }
-    return [result || "/"];
+  }
+  return [result || "/"]
 }
+
 /**
  * Converts to URLPattern path pattern.
  *
@@ -160,18 +182,18 @@ export function toExpress(path) {
  * - `:param*` → `:param*`
  */
 export function toURLPattern(path) {
-    const segments = path.split("/").filter(Boolean);
-    const joined = segments
-        .map((seg) => {
-        if (!seg.startsWith(":"))
-            return seg;
-        const name = getParamName(seg);
-        const modifier = getModifier(seg);
-        return `:${name}${modifier}`;
+  const segments = path.split("/").filter(Boolean)
+  const joined = segments
+    .map((seg) => {
+      if (!seg.startsWith(":")) return seg
+      const name = getParamName(seg)
+      const modifier = getModifier(seg)
+      return `:${name}${modifier}`
     })
-        .join("/");
-    return [joined ? "/" + joined : "/"];
+    .join("/")
+  return [joined ? "/" + joined : "/"]
 }
+
 /**
  * Converts to React Router path pattern.
  *
@@ -183,48 +205,50 @@ export function toURLPattern(path) {
  * - `:param*` → `/`, `/*` (splat, optional - two routes)
  */
 export function toReactRouter(path) {
-    const segments = path.split("/").filter(Boolean);
-    const optionalWildcardIndex = segments.findIndex((s) => s.startsWith(":") && s.endsWith("*"));
-    if (optionalWildcardIndex !== -1) {
-        const before = segments.slice(0, optionalWildcardIndex);
-        const beforeJoined = before
-            .map((s) => {
-            if (!s.startsWith(":"))
-                return s;
-            const name = getParamName(s);
-            const modifier = getModifier(s);
-            return modifier === "?" ? `:${name}?` : `:${name}`;
-        })
-            .join("/");
-        const basePath = beforeJoined ? "/" + beforeJoined : "/";
-        const withWildcard = basePath === "/" ? "/*" : basePath + "/*";
-        return [basePath, withWildcard];
-    }
-    const joined = segments
-        .map((s) => {
-        if (!s.startsWith(":"))
-            return s;
-        const name = getParamName(s);
-        const modifier = getModifier(s);
-        switch (modifier) {
-            case "":
-                return `:${name}`;
-            case "?":
-                return `:${name}?`;
-            case "+":
-            case "*":
-                return "*";
-        }
+  const segments = path.split("/").filter(Boolean)
+  const optionalWildcardIndex = segments.findIndex((s) => s.startsWith(":") && s.endsWith("*"))
+
+  if (optionalWildcardIndex !== -1) {
+    const before = segments.slice(0, optionalWildcardIndex)
+    const beforeJoined = before
+      .map((s) => {
+        if (!s.startsWith(":")) return s
+        const name = getParamName(s)
+        const modifier = getModifier(s)
+        return modifier === "?" ? `:${name}?` : `:${name}`
+      })
+      .join("/")
+    const basePath = beforeJoined ? "/" + beforeJoined : "/"
+    const withWildcard = basePath === "/" ? "/*" : basePath + "/*"
+    return [basePath, withWildcard]
+  }
+
+  const joined = segments
+    .map((s) => {
+      if (!s.startsWith(":")) return s
+      const name = getParamName(s)
+      const modifier = getModifier(s)
+      switch (modifier) {
+        case "":
+          return `:${name}`
+        case "?":
+          return `:${name}?`
+        case "+":
+        case "*":
+          return "*"
+      }
     })
-        .join("/");
-    return [joined ? "/" + joined : "/"];
+    .join("/")
+  return [joined ? "/" + joined : "/"]
 }
+
 /**
  * Alias for toReactRouter.
  *
  * @see https://reactrouter.com/start/framework/routing
  */
-export const toRemix = toReactRouter;
+export const toRemix = toReactRouter
+
 /**
  * Converts to Remix file-based route naming convention.
  *
@@ -239,25 +263,27 @@ export const toRemix = toReactRouter;
  * - `:param*` → `($)` (optional splat) - Note: not officially supported
  */
 export function toRemixFile(path) {
-    const segments = path.split("/").filter(Boolean);
-    const mapped = segments.map((seg) => {
-        if (!seg.startsWith(":"))
-            return seg;
-        const name = getParamName(seg);
-        const modifier = getModifier(seg);
-        switch (modifier) {
-            case "":
-                return `$${name}`;
-            case "?":
-                return `($${name})`;
-            case "+":
-                return "$";
-            case "*":
-                return "($)";
-        }
-    });
-    return mapped.join(".");
+  const segments = path.split("/").filter(Boolean)
+
+  const mapped = segments.map((seg) => {
+    if (!seg.startsWith(":")) return seg
+    const name = getParamName(seg)
+    const modifier = getModifier(seg)
+    switch (modifier) {
+      case "":
+        return `$${name}`
+      case "?":
+        return `($${name})`
+      case "+":
+        return "$"
+      case "*":
+        return "($)"
+    }
+  })
+
+  return mapped.join(".")
 }
+
 /**
  * Converts to TanStack Router path/file pattern.
  *
@@ -273,25 +299,27 @@ export function toRemixFile(path) {
  * - `:param*` → `$` (splat, optional not supported - treated as required)
  */
 export function toTanStack(path) {
-    const segments = path.split("/").filter(Boolean);
-    const mapped = segments.map((seg) => {
-        if (!seg.startsWith(":"))
-            return seg;
-        const name = getParamName(seg);
-        const modifier = getModifier(seg);
-        switch (modifier) {
-            case "":
-                return `$${name}`;
-            case "?":
-                return `{-$${name}}`;
-            case "+":
-                return "$";
-            case "*":
-                return "$";
-        }
-    });
-    return mapped.join(".");
+  const segments = path.split("/").filter(Boolean)
+
+  const mapped = segments.map((seg) => {
+    if (!seg.startsWith(":")) return seg
+    const name = getParamName(seg)
+    const modifier = getModifier(seg)
+    switch (modifier) {
+      case "":
+        return `$${name}`
+      case "?":
+        return `{-$${name}}`
+      case "+":
+        return "$"
+      case "*":
+        return "$"
+    }
+  })
+
+  return mapped.join(".")
 }
+
 /**
  * Converts to Hono path pattern.
  *
@@ -306,42 +334,43 @@ export function toTanStack(path) {
  * - `:param*` → `/`, `/*` (unnamed, optional - two routes)
  */
 export function toHono(path) {
-    const segments = path.split("/").filter(Boolean);
-    const optionalWildcardIndex = segments.findIndex((s) => s.startsWith(":") && s.endsWith("*"));
-    if (optionalWildcardIndex !== -1) {
-        const before = segments.slice(0, optionalWildcardIndex);
-        const beforeJoined = before
-            .map((s) => {
-            if (!s.startsWith(":"))
-                return s;
-            const name = getParamName(s);
-            const modifier = getModifier(s);
-            return modifier === "?" ? `:${name}?` : `:${name}`;
-        })
-            .join("/");
-        const basePath = beforeJoined ? "/" + beforeJoined : "/";
-        const withWildcard = basePath === "/" ? "/*" : basePath + "/*";
-        return [basePath, withWildcard];
-    }
-    const joined = segments
-        .map((s) => {
-        if (!s.startsWith(":"))
-            return s;
-        const name = getParamName(s);
-        const modifier = getModifier(s);
-        switch (modifier) {
-            case "":
-                return `:${name}`;
-            case "?":
-                return `:${name}?`;
-            case "+":
-            case "*":
-                return "*";
-        }
+  const segments = path.split("/").filter(Boolean)
+  const optionalWildcardIndex = segments.findIndex((s) => s.startsWith(":") && s.endsWith("*"))
+
+  if (optionalWildcardIndex !== -1) {
+    const before = segments.slice(0, optionalWildcardIndex)
+    const beforeJoined = before
+      .map((s) => {
+        if (!s.startsWith(":")) return s
+        const name = getParamName(s)
+        const modifier = getModifier(s)
+        return modifier === "?" ? `:${name}?` : `:${name}`
+      })
+      .join("/")
+    const basePath = beforeJoined ? "/" + beforeJoined : "/"
+    const withWildcard = basePath === "/" ? "/*" : basePath + "/*"
+    return [basePath, withWildcard]
+  }
+
+  const joined = segments
+    .map((s) => {
+      if (!s.startsWith(":")) return s
+      const name = getParamName(s)
+      const modifier = getModifier(s)
+      switch (modifier) {
+        case "":
+          return `:${name}`
+        case "?":
+          return `:${name}?`
+        case "+":
+        case "*":
+          return "*"
+      }
     })
-        .join("/");
-    return [joined ? "/" + joined : "/"];
+    .join("/")
+  return [joined ? "/" + joined : "/"]
 }
+
 /**
  * Converts to Effect HttpRouter / find-my-way path pattern.
  *
@@ -355,8 +384,9 @@ export function toHono(path) {
  * - `:param*` → `/`, `/*` (two routes)
  */
 export function toEffect(path) {
-    return toHono(path);
+  return toHono(path)
 }
+
 /**
  * Converts to Bun.serve path pattern.
  *
@@ -371,43 +401,51 @@ export function toEffect(path) {
  * - `:param*` → `/`, `/*` (two routes)
  */
 export function toBun(path) {
-    const segments = path.split("/").filter(Boolean);
-    const optionalIndex = segments.findIndex((s) => s.startsWith(":") && (s.endsWith("?") || s.endsWith("*")));
-    if (optionalIndex === -1) {
-        const joined = segments
-            .map((s) => {
-            if (!s.startsWith(":"))
-                return s;
-            const modifier = getModifier(s);
-            const name = getParamName(s);
-            return modifier === "+" || modifier === "*" ? "*" : `:${name}`;
-        })
-            .join("/");
-        return [joined ? `/${joined}` : "/"];
+  const segments = path.split("/").filter(Boolean)
+
+  const optionalIndex = segments.findIndex(
+    (s) => s.startsWith(":") && (s.endsWith("?") || s.endsWith("*")),
+  )
+
+  if (optionalIndex === -1) {
+    const joined = segments
+      .map((s) => {
+        if (!s.startsWith(":")) return s
+        const modifier = getModifier(s)
+        const name = getParamName(s)
+        return modifier === "+" || modifier === "*" ? "*" : `:${name}`
+      })
+      .join("/")
+    return [joined ? `/${joined}` : "/"]
+  }
+
+  const before = segments.slice(0, optionalIndex)
+  const optional = segments[optionalIndex]
+  const after = segments.slice(optionalIndex + 1)
+
+  const formatSegment = (s) => {
+    if (!s.startsWith(":")) return s
+    const modifier = getModifier(s)
+    const name = getParamName(s)
+    switch (modifier) {
+      case "":
+      case "?":
+        return `:${name}`
+      case "+":
+      case "*":
+        return "*"
     }
-    const before = segments.slice(0, optionalIndex);
-    const optional = segments[optionalIndex];
-    const after = segments.slice(optionalIndex + 1);
-    const formatSegment = (s) => {
-        if (!s.startsWith(":"))
-            return s;
-        const modifier = getModifier(s);
-        const name = getParamName(s);
-        switch (modifier) {
-            case "":
-            case "?":
-                return `:${name}`;
-            case "+":
-            case "*":
-                return "*";
-        }
-    };
-    const beforePath = before.map(formatSegment).join("/");
-    const basePath = beforePath ? `/${beforePath}` : "/";
-    const optionalModifier = getModifier(optional);
-    const optionalName = getParamName(optional);
-    const requiredOptional = optionalModifier === "*" ? `:${optionalName}+` : `:${optionalName}`;
-    const withOptionalSegments = [...before, requiredOptional, ...after];
-    const withOptionalPath = `/${withOptionalSegments.map(formatSegment).join("/")}`;
-    return [...toBun(basePath), ...toBun(withOptionalPath)];
+  }
+
+  const beforePath = before.map(formatSegment).join("/")
+  const basePath = beforePath ? `/${beforePath}` : "/"
+
+  const optionalModifier = getModifier(optional)
+  const optionalName = getParamName(optional)
+  const requiredOptional = optionalModifier === "*" ? `:${optionalName}+` : `:${optionalName}`
+
+  const withOptionalSegments = [...before, requiredOptional, ...after]
+  const withOptionalPath = `/${withOptionalSegments.map(formatSegment).join("/")}`
+
+  return [...toBun(basePath), ...toBun(withOptionalPath)]
 }