@farm.js/plugin 0.1.0-beta.58 → 0.1.0-beta.59

package/dist/index.d.ts

@@ -39,5 +39,5 @@
  * })
  * ```
  */
-export declare const version = "0.1.0-beta.58";
+export declare const version = "0.1.0-beta.59";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -39,7 +39,7 @@
  * })
  * ```
  */
-export const version = "0.1.0-beta.58";
+export const version = "0.1.0-beta.59";
 // Note: Import plugins from their respective subpaths:
 // - @farm.js/plugin/rsc
 // - @farm.js/plugin/middleware

package/dist/middleware/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"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"}

package/dist/middleware/index.js

@@ -16,6 +16,7 @@
 import { createRequire } from "node:module";
 import { _withAfterNodeMiddleware } from "@farm.js/core/after";
 import { devServableFileExists } from "../dev-static.js";
+import { middlewareMatchesPath, parseCookies, serializeCookie } from "./matching.js";
 // Create require for ESM compatibility
 const require_ = createRequire(import.meta.url);
 // Get picocolors with forced color support (to handle NO_COLOR env being set)
@@ -43,52 +44,6 @@ const getColors = () => {
         magenta: id,
     };
 };
-/**
- * Parse cookies from Cookie header
- */
-function parseCookies(cookieHeader) {
-    if (!cookieHeader)
-        return {};
-    return cookieHeader.split(";").reduce((cookies, cookie) => {
-        const [name, ...rest] = cookie.split("=");
-        const value = rest.join("=").trim();
-        if (name && value) {
-            cookies[name.trim()] = decodeURIComponent(value);
-        }
-        return cookies;
-    }, {});
-}
-/**
- * Serialize a cookie
- */
-function serializeCookie(name, value, options = {}) {
-    let cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}`;
-    if (options.maxAge) {
-        cookie += `; Max-Age=${options.maxAge}`;
-    }
-    if (options.expires) {
-        cookie += `; Expires=${options.expires.toUTCString()}`;
-    }
-    if (options.path) {
-        cookie += `; Path=${options.path}`;
-    }
-    else {
-        cookie += "; Path=/";
-    }
-    if (options.domain) {
-        cookie += `; Domain=${options.domain}`;
-    }
-    if (options.secure) {
-        cookie += "; Secure";
-    }
-    if (options.httpOnly) {
-        cookie += "; HttpOnly";
-    }
-    if (options.sameSite) {
-        cookie += `; SameSite=${options.sameSite.charAt(0).toUpperCase() + options.sameSite.slice(1)}`;
-    }
-    return cookie;
-}
 /**
  * Create a cookie jar for managing cookies
  */
@@ -294,11 +249,7 @@ export default function farmMiddleware(options = {}) {
                 }
                 // Find applicable middleware (cascading from root to specific)
                 const applicable = Array.from(middlewareCache.values())
-                    .filter((mw) => {
-                    if (mw.path === "/")
-                        return true;
-                    return pathname.startsWith(mw.path) || pathname === mw.path;
-                })
+                    .filter((mw) => middlewareMatchesPath(pathname, mw.path))
                     .sort((a, b) => a.path.split("/").length - b.path.split("/").length);
                 if (applicable.length === 0)
                     return false;

package/dist/middleware/matching.d.ts

@@ -0,0 +1,29 @@
+import type { CookieOptions } from "./index.js";
+/**
+ * Parse cookies from a Cookie header.
+ *
+ * A single request cookie whose value is not valid UTF-8 percent-encoding
+ * (a latin-1 value from an old link, a crawler, or a bare `%`) must not take
+ * the whole map down: an unguarded `decodeURIComponent` throws `URIError`,
+ * which — because the middleware runner swallows the throw and calls `next()` —
+ * would silently skip every middleware for that request (a dev-time auth
+ * bypass). Decoding falls back to the raw value per entry instead.
+ */
+export declare function parseCookies(cookieHeader?: string): Record<string, string>;
+/**
+ * Whether a middleware registered at `middlewarePath` applies to `pathname`.
+ *
+ * Matching is by path segment, not raw string prefix: middleware at `/admin`
+ * covers `/admin` and everything under `/admin/`, but not sibling routes like
+ * `/administrator` or `/admin-public` that merely share a textual prefix.
+ */
+export declare function middlewareMatchesPath(pathname: string, middlewarePath: string): boolean;
+/**
+ * Serialize a cookie.
+ *
+ * `Max-Age=0` is the canonical immediate-expiry directive, so the attribute is
+ * emitted whenever `maxAge` is provided — a `0` must not be dropped the way a
+ * plain truthiness check would drop it.
+ */
+export declare function serializeCookie(name: string, value: string, options?: CookieOptions): string;
+//# sourceMappingURL=matching.d.ts.map

package/dist/middleware/matching.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matching.d.ts","sourceRoot":"","sources":["../../src/middleware/matching.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1E;AAUD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAIvF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAkChG"}

package/dist/middleware/matching.js

@@ -0,0 +1,79 @@
+/**
+ * Parse cookies from a Cookie header.
+ *
+ * A single request cookie whose value is not valid UTF-8 percent-encoding
+ * (a latin-1 value from an old link, a crawler, or a bare `%`) must not take
+ * the whole map down: an unguarded `decodeURIComponent` throws `URIError`,
+ * which — because the middleware runner swallows the throw and calls `next()` —
+ * would silently skip every middleware for that request (a dev-time auth
+ * bypass). Decoding falls back to the raw value per entry instead.
+ */
+export function parseCookies(cookieHeader) {
+    if (!cookieHeader)
+        return {};
+    return cookieHeader.split(";").reduce((cookies, cookie) => {
+        const [name, ...rest] = cookie.split("=");
+        const value = rest.join("=").trim();
+        if (name && value) {
+            cookies[name.trim()] = decodeCookieValue(value);
+        }
+        return cookies;
+    }, {});
+}
+function decodeCookieValue(value) {
+    try {
+        return decodeURIComponent(value);
+    }
+    catch {
+        return value;
+    }
+}
+/**
+ * Whether a middleware registered at `middlewarePath` applies to `pathname`.
+ *
+ * Matching is by path segment, not raw string prefix: middleware at `/admin`
+ * covers `/admin` and everything under `/admin/`, but not sibling routes like
+ * `/administrator` or `/admin-public` that merely share a textual prefix.
+ */
+export function middlewareMatchesPath(pathname, middlewarePath) {
+    if (middlewarePath === "/")
+        return true;
+    if (pathname === middlewarePath)
+        return true;
+    return pathname.startsWith(`${middlewarePath}/`);
+}
+/**
+ * Serialize a cookie.
+ *
+ * `Max-Age=0` is the canonical immediate-expiry directive, so the attribute is
+ * emitted whenever `maxAge` is provided — a `0` must not be dropped the way a
+ * plain truthiness check would drop it.
+ */
+export function serializeCookie(name, value, options = {}) {
+    let cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}`;
+    if (options.maxAge != null) {
+        cookie += `; Max-Age=${options.maxAge}`;
+    }
+    if (options.expires) {
+        cookie += `; Expires=${options.expires.toUTCString()}`;
+    }
+    if (options.path) {
+        cookie += `; Path=${options.path}`;
+    }
+    else {
+        cookie += "; Path=/";
+    }
+    if (options.domain) {
+        cookie += `; Domain=${options.domain}`;
+    }
+    if (options.secure) {
+        cookie += "; Secure";
+    }
+    if (options.httpOnly) {
+        cookie += "; HttpOnly";
+    }
+    if (options.sameSite) {
+        cookie += `; SameSite=${options.sameSite.charAt(0).toUpperCase() + options.sameSite.slice(1)}`;
+    }
+    return cookie;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/plugin",
-  "version": "0.1.0-beta.58",
+  "version": "0.1.0-beta.59",
   "description": "Official plugins for Farm.js framework",
   "license": "MIT",
   "author": "Farm.js Team",
@@ -61,7 +61,7 @@
     "nitro": "3.0.1-alpha.0",
     "picocolors": "^1.0.0",
     "rsc-html-stream": "^0.0.4",
-    "@farm.js/core": "0.1.0-beta.58"
+    "@farm.js/core": "0.1.0-beta.59"
   },
   "devDependencies": {
     "@types/node": "^20.19.21",
@@ -82,7 +82,7 @@
     "react-dom": "19.2.8",
     "react-server-dom-webpack": "19.2.8",
     "vite": ">=6.0.0",
-    "@farm.js/core": "0.1.0-beta.58"
+    "@farm.js/core": "0.1.0-beta.59"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {