@farm.js/core 0.1.31 → 0.1.34

package/dist/{chunk-NRVGEI5I.mjs → chunk-2NNMOPDN.mjs}

@@ -1,12 +1,9 @@
 import {
   parseRequestCookieHeader
-} from "./chunk-5TISYEQF.mjs";
+} from "./chunk-JM5XPKWH.mjs";
 import {
   createWebRequestFromFarmRequest
-} from "./chunk-BSPQVJ4A.mjs";
-import {
-  canonicalizeRequestPathname
-} from "./chunk-CQ6OSQ3K.mjs";
+} from "./chunk-FDR64H6B.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -93,7 +90,7 @@ function serializeMiddlewareCookie(name, value, options = {}) {
   if (resolved.expires) cookie += `; Expires=${resolved.expires.toUTCString()}`;
   cookie += `; Path=${resolved.path || "/"}`;
   if (resolved.domain) cookie += `; Domain=${resolved.domain}`;
-  if (resolved.secure) cookie += "; Secure";
+  if (resolved.secure || resolved.sameSite === "none") cookie += "; Secure";
   if (resolved.httpOnly) cookie += "; HttpOnly";
   if (resolved.sameSite) {
     cookie += `; SameSite=${resolved.sameSite.charAt(0).toUpperCase()}${resolved.sameSite.slice(1)}`;
@@ -225,205 +222,6 @@ function normalizeMiddlewareModule(middlewareModule, routePath) {
 }
 __name(normalizeMiddlewareModule, "normalizeMiddlewareModule");
 
-// src/middleware/matcher.ts
-var compiledConfigCache = /* @__PURE__ */ new WeakMap();
-var compiledRouteCache = /* @__PURE__ */ new WeakMap();
-function compileMiddlewareRoute(entry) {
-  const path = entry.path;
-  if (path === "/") return void 0;
-  const cached = compiledRouteCache.get(entry);
-  if (cached?.path === path) return cached;
-  const compiled = {
-    path,
-    exact: compilePattern(path),
-    nested: compilePattern(`${path}/:__farmRest*`)
-  };
-  compiledRouteCache.set(entry, compiled);
-  return compiled;
-}
-__name(compileMiddlewareRoute, "compileMiddlewareRoute");
-function matchesMiddlewareRoute(pathname, entry) {
-  const compiled = compileMiddlewareRoute(entry);
-  if (!compiled) return { matched: true };
-  const canonicalPathname = canonicalizeRequestPathname(pathname);
-  const exactMatch = matchPattern(compiled.exact, canonicalPathname);
-  if (exactMatch.matched) return exactMatch;
-  const nestedMatch = matchPattern(compiled.nested, canonicalPathname);
-  if (!nestedMatch.matched) return { matched: false };
-  const params = { ...nestedMatch.params };
-  delete params.__farmRest;
-  return { matched: true, params: Object.keys(params).length > 0 ? params : void 0 };
-}
-__name(matchesMiddlewareRoute, "matchesMiddlewareRoute");
-function sameEntries(current, previous) {
-  return current === void 0 || previous === void 0 ? current === previous : current.length === previous.length && current.every((entry, index) => entry === previous[index]);
-}
-__name(sameEntries, "sameEntries");
-function toMatcherList(matcher) {
-  if (!matcher) return [];
-  return Array.isArray(matcher) ? matcher : [matcher];
-}
-__name(toMatcherList, "toMatcherList");
-function escapeRegex(value) {
-  return value.replace(/[|\\{}()[\]^$+?.]/g, "\\$&");
-}
-__name(escapeRegex, "escapeRegex");
-function parseColonParam(segment) {
-  const raw = segment.slice(1);
-  const last = raw[raw.length - 1];
-  const modifier = last === "*" || last === "+" || last === "?" ? last : void 0;
-  return {
-    name: modifier ? raw.slice(0, -1) : raw,
-    modifier
-  };
-}
-__name(parseColonParam, "parseColonParam");
-function compilePathPattern(pattern, trailingSlash = false) {
-  const params = [];
-  const segments = pattern.split("/").filter(Boolean);
-  if (segments.length === 0) {
-    return { kind: "path", regex: /^\/$/, params };
-  }
-  const parts = segments.map((segment) => {
-    if (segment === "**") {
-      return "(?:/.*)?";
-    }
-    if (segment === "*") {
-      return "/[^/]+";
-    }
-    if (segment.startsWith(":")) {
-      const { name, modifier } = parseColonParam(segment);
-      params.push(name);
-      if (modifier === "*") {
-        return "(?:/(.*))?";
-      }
-      if (modifier === "+") {
-        return "/(.+)";
-      }
-      return "/([^/]+)";
-    }
-    if (segment.startsWith("[...") && segment.endsWith("]")) {
-      params.push(segment.slice(4, -1));
-      return "(?:/(.*))?";
-    }
-    if (segment.startsWith("[") && segment.endsWith("]")) {
-      params.push(segment.slice(1, -1));
-      return "/([^/]+)";
-    }
-    return `/${escapeRegex(segment).replace(/\\\*/g, "[^/]*")}`;
-  });
-  return {
-    kind: "path",
-    regex: new RegExp(`^${parts.join("")}${trailingSlash ? "/?" : ""}$`),
-    params
-  };
-}
-__name(compilePathPattern, "compilePathPattern");
-function compileMatcherPattern(pattern) {
-  if (typeof pattern === "string" && pattern !== "*" && !pattern.endsWith("(.*)")) {
-    return compilePathPattern(pattern, true);
-  }
-  return compilePattern(pattern);
-}
-__name(compileMatcherPattern, "compileMatcherPattern");
-function compilePattern(pattern) {
-  if (pattern instanceof RegExp) {
-    return { kind: "regexp", regex: pattern };
-  }
-  if (pattern === "*" || pattern === "/(.*)") {
-    return { kind: "all" };
-  }
-  if (pattern.endsWith("(.*)")) {
-    return {
-      kind: "subtree",
-      prefix: pattern.slice(0, -4).replace(/\/$/, "")
-    };
-  }
-  return compilePathPattern(pattern);
-}
-__name(compilePattern, "compilePattern");
-function compileMiddlewareConfig(config) {
-  const compiled = {
-    matcher: config.matcher ? toMatcherList(config.matcher).map(
-      (matcher) => typeof matcher === "function" ? matcher : compileMatcherPattern(matcher)
-    ) : void 0,
-    exclude: config.exclude?.map(compilePattern)
-  };
-  compiledConfigCache.set(config, {
-    compiled,
-    matcher: config.matcher,
-    matcherEntries: Array.isArray(config.matcher) ? config.matcher.slice() : void 0,
-    excludeEntries: config.exclude?.slice()
-  });
-  return compiled;
-}
-__name(compileMiddlewareConfig, "compileMiddlewareConfig");
-function matchPattern(pattern, pathname) {
-  if (pattern.kind === "all") {
-    return { matched: true };
-  }
-  if (pattern.kind === "subtree") {
-    return {
-      matched: pathname === pattern.prefix || pathname.startsWith(`${pattern.prefix}/`)
-    };
-  }
-  pattern.regex.lastIndex = 0;
-  const match = pattern.regex.exec(pathname);
-  if (!match) {
-    return { matched: false };
-  }
-  if (pattern.kind === "regexp") {
-    return {
-      matched: true,
-      params: match.groups ? { ...match.groups } : void 0
-    };
-  }
-  const values = {};
-  pattern.params.forEach((param, index) => {
-    values[param] = match[index + 1] || "";
-  });
-  return {
-    matched: true,
-    params: Object.keys(values).length > 0 ? values : void 0
-  };
-}
-__name(matchPattern, "matchPattern");
-function matchesCompiledMiddlewareConfig(pathname, config, ctx) {
-  let canonicalPathname;
-  const getCanonicalPathname = /* @__PURE__ */ __name(() => canonicalPathname ?? (canonicalPathname = canonicalizeRequestPathname(pathname)), "getCanonicalPathname");
-  if (config.exclude) {
-    for (const pattern of config.exclude) {
-      if (matchPattern(pattern, getCanonicalPathname()).matched) {
-        return { matched: false };
-      }
-    }
-  }
-  if (config.matcher) {
-    for (const matcher of config.matcher) {
-      if (typeof matcher === "function") {
-        if (matcher(ctx)) {
-          return { matched: true };
-        }
-        continue;
-      }
-      const result = matchPattern(matcher, getCanonicalPathname());
-      if (result.matched) {
-        return result;
-      }
-    }
-    return { matched: false };
-  }
-  return { matched: true };
-}
-__name(matchesCompiledMiddlewareConfig, "matchesCompiledMiddlewareConfig");
-function matchesMiddlewareConfig(pathname, config, ctx) {
-  const cached = compiledConfigCache.get(config);
-  const unchanged = cached && (Array.isArray(config.matcher) ? sameEntries(config.matcher, cached.matcherEntries) : config.matcher === cached.matcher) && sameEntries(config.exclude, cached.excludeEntries);
-  const compiled = unchanged ? cached.compiled : compileMiddlewareConfig(config);
-  return matchesCompiledMiddlewareConfig(pathname, compiled, ctx);
-}
-__name(matchesMiddlewareConfig, "matchesMiddlewareConfig");
-
 export {
   _clearCurrentMiddlewareData,
   _clearCurrentMiddlewareContext,
@@ -435,9 +233,5 @@ export {
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion,
-  normalizeMiddlewareModule,
-  compileMiddlewareRoute,
-  matchesMiddlewareRoute,
-  compileMiddlewareConfig,
-  matchesMiddlewareConfig
+  normalizeMiddlewareModule
 };

package/dist/chunk-2NQQ5H5G.cjs

@@ -0,0 +1,86 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+var _chunk5QIKR7RRcjs = require('./chunk-5QIKR7RR.cjs');
+
+
+var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
+
+// src/routing/route-slots.ts
+var SLOT_SEGMENT = /^@([A-Za-z][A-Za-z0-9_-]*)$/;
+function isRouteSlotSegment(segment) {
+  return SLOT_SEGMENT.test(segment);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isRouteSlotSegment, "isRouteSlotSegment");
+function parseRouteSlotFile(filePath) {
+  const normalized = filePath.replace(/\\/g, "/");
+  const parts = normalized.split("/").filter(Boolean);
+  const fileName = _nullishCoalesce(parts.at(-1), () => ( ""));
+  const baseName = fileName.replace(/\.(tsx?|jsx?|vue|svelte)$/, "");
+  if (baseName !== "page" && baseName !== "default") return null;
+  const slotIndex = parts.findIndex((part) => SLOT_SEGMENT.test(part));
+  if (slotIndex < 0) return null;
+  if (parts.slice(slotIndex + 1, -1).some((part) => SLOT_SEGMENT.test(part))) {
+    throw new Error(`Nested route slots are not supported in "${filePath}"`);
+  }
+  const slotMatch = parts[slotIndex].match(SLOT_SEGMENT);
+  const name = _optionalChain([slotMatch, 'optionalAccess', _ => _[1]]);
+  if (!name) return null;
+  const ownerParts = parts.slice(0, slotIndex);
+  const contentParts = parts.slice(slotIndex + 1, -1);
+  const marker = parseInterceptionMarker(contentParts[0]);
+  let targetBase = ownerParts;
+  let targetParts = contentParts;
+  if (marker) {
+    targetBase = marker.root === true ? [] : ownerParts.slice(0, Math.max(0, ownerParts.length - marker.up));
+    targetParts = [...marker.remainder ? [marker.remainder] : [], ...contentParts.slice(1)];
+  }
+  const ownerFile = [...ownerParts, "layout.tsx"].join("/");
+  const routeFile = [
+    ...baseName === "default" ? ownerParts : targetBase,
+    ...baseName === "default" ? [] : targetParts,
+    "page.tsx"
+  ].join("/");
+  return {
+    name,
+    ownerRoute: _chunk5QIKR7RRcjs.parseRoutePath.call(void 0, ownerFile || "layout.tsx"),
+    route: _chunk5QIKR7RRcjs.parseRoutePath.call(void 0, routeFile || "page.tsx"),
+    interception: marker !== null,
+    fallback: baseName === "default"
+  };
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, parseRouteSlotFile, "parseRouteSlotFile");
+function createRouteSlotContainerId(name, ownerPattern) {
+  const owner = ownerPattern === "/" ? "root" : ownerPattern.replace(/^\//, "").replace(/[^A-Za-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
+  return `__farm_slot_${name}_${owner || "root"}__`;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, createRouteSlotContainerId, "createRouteSlotContainerId");
+function parseInterceptionMarker(segment) {
+  if (!segment) return null;
+  if (segment.startsWith("(...)")) {
+    return {
+      up: 0,
+      root: true,
+      remainder: segment.slice(5)
+    };
+  }
+  if (segment.startsWith("(.)")) {
+    return {
+      up: 0,
+      remainder: segment.slice(3)
+    };
+  }
+  let remainder = segment;
+  let up = 0;
+  while (remainder.startsWith("(..)")) {
+    up += 1;
+    remainder = remainder.slice(4);
+  }
+  return up > 0 ? { up, remainder } : null;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, parseInterceptionMarker, "parseInterceptionMarker");
+
+
+
+
+
+exports.isRouteSlotSegment = isRouteSlotSegment; exports.parseRouteSlotFile = parseRouteSlotFile; exports.createRouteSlotContainerId = createRouteSlotContainerId;