@farm.js/core 0.1.39 → 0.1.41

package/dist/{chunk-OAHTRMIC.mjs → chunk-724JLMS4.mjs}

@@ -9,10 +9,10 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteConflictError
-} from "./chunk-WLL43JMO.mjs";
+} from "./chunk-YYQVGKO5.mjs";
 import {
   findProgrammaticRouteFilesInDir
-} from "./chunk-MYIZXDZA.mjs";
+} from "./chunk-FWCGUVVL.mjs";
 import {
   isFarmAPIRouteFileName
 } from "./chunk-CU625VAY.mjs";
@@ -23,21 +23,16 @@ import {
   matchAPIRouteAtBasePath,
   mergePluginAPIRoutes,
   resolveAPIRouteEndpoint
-} from "./chunk-6HB6V3R7.mjs";
+} from "./chunk-VTBXE6QG.mjs";
 import {
   isProgrammaticRoutesFileName
-} from "./chunk-EA5K5BKU.mjs";
-import {
-  createFarmRequestBodyErrorResponse,
-  readNodeRequestBody,
-  resolveFarmServerConfig
-} from "./chunk-ZMMBIVQM.mjs";
+} from "./chunk-KNHBTJP6.mjs";
 import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
 import {
   loadFarmDevModule
-} from "./chunk-KMTGADN3.mjs";
+} from "./chunk-QCVIRVHE.mjs";
 import {
   toPosixPath,
   toViteModuleId
@@ -45,9 +40,14 @@ import {
 import {
   sendWebResponse
 } from "./chunk-Z2RZJZIZ.mjs";
+import {
+  createFarmRequestBodyErrorResponse,
+  readNodeRequestBody,
+  resolveFarmServerConfig
+} from "./chunk-ZZGQD7A4.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-POSPE3IO.mjs";
+} from "./chunk-X3NGFVRF.mjs";
 import {
   AmbiguousRouteError,
   assertUniqueRouteParameters,

package/dist/chunk-7GNWGLWB.mjs

@@ -0,0 +1,14 @@
+import {
+  __name
+} from "./chunk-LPEX4YW6.mjs";
+
+// src/utils/file-module.ts
+import { pathToFileURL } from "url";
+function toFileModuleUrl(filePath) {
+  return pathToFileURL(filePath).href;
+}
+__name(toFileModuleUrl, "toFileModuleUrl");
+
+export {
+  toFileModuleUrl
+};

package/dist/{chunk-34UCJRQO.cjs → chunk-7RNAKBWF.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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 _chunkEKN7NSZOcjs = require('./chunk-EKN7NSZO.cjs');
+var _chunkSZLNU3GJcjs = require('./chunk-SZLNU3GJ.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -11,7 +11,7 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _url = require('url');
 async function createFarmMarkdownRouteModuleFromFile(filePath, options = {}) {
   const source = await _promises.readFile.call(void 0, filePath, "utf8");
-  return _chunkEKN7NSZOcjs.createFarmMarkdownRouteModule.call(void 0, {
+  return _chunkSZLNU3GJcjs.createFarmMarkdownRouteModule.call(void 0, {
     source,
     filePath,
     components: options.components,

package/dist/{chunk-U6QLDL3G.mjs → chunk-7UEEHAW7.mjs}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-Z3HATSKO.mjs";
 import {
   _resolveCurrentCspNonce
-} from "./chunk-QRKIMN7T.mjs";
+} from "./chunk-6LVRDOAW.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-UPJLHLJU.cjs → chunk-ALPWLT27.cjs}

@@ -67,18 +67,18 @@ function parseColonParam(segment) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, parseColonParam, "parseColonParam");
 var MATCHER_PARAM_NAME = /^[\p{L}\p{N}_$-]+$/u;
-var MATCHER_REGEX_SYNTAX = /[()[\]|\\{}^$?]/;
+var MATCHER_UNSUPPORTED_LITERAL = /[()[\]|\\{}^$?:]|\.[*+]/;
 var MATCHER_BRACKET_PARAM = /^\[\[\.\.\.(.+)\]\]$|^\[\.\.\.(.+)\]$|^\[(.+)\]$/;
 function isSupportedMatcherSegment(segment) {
   if (segment === "*" || segment === "**") return true;
   if (segment.startsWith(":")) return MATCHER_PARAM_NAME.test(parseColonParam(segment).name);
   const bracket = MATCHER_BRACKET_PARAM.exec(segment);
   if (bracket) return MATCHER_PARAM_NAME.test(_nullishCoalesce(_nullishCoalesce(bracket[1], () => ( bracket[2])), () => ( bracket[3])));
-  return !MATCHER_REGEX_SYNTAX.test(segment);
+  return !MATCHER_UNSUPPORTED_LITERAL.test(segment);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, isSupportedMatcherSegment, "isSupportedMatcherSegment");
 function isLiteralMatcherSegment(segment) {
-  return !MATCHER_REGEX_SYNTAX.test(segment) && !segment.includes("*") && !segment.startsWith(":");
+  return !MATCHER_UNSUPPORTED_LITERAL.test(segment) && !segment.includes("*");
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, isLiteralMatcherSegment, "isLiteralMatcherSegment");
 function assertSupportedMiddlewareMatcher(pattern) {
@@ -88,7 +88,7 @@ function assertSupportedMiddlewareMatcher(pattern) {
   const segments = path.split("/").filter(Boolean);
   if (segments.every(subtree ? isLiteralMatcherSegment : isSupportedMatcherSegment)) return;
   throw new Error(
-    `Middleware matcher "${pattern}" is not a supported string pattern, so it would never match a request and the middleware would not run. String matchers do not accept regular-expression syntax such as groups, alternation, character classes, or lookaheads. Pass a RegExp instead, for example \`matcher: /^\\/(?!api|_next).*/\`, or use the supported forms: /path/:param, /path/:param*, /path/[param], /path/[...param], /path/*, /path/**, or a trailing (.*) such as /path(.*).`
+    `Middleware matcher "${pattern}" is not a supported string pattern, so it would never match a request and the middleware would not run. String matchers do not accept regular-expression syntax such as groups, alternation, character classes, lookaheads, or \`.*\`, or a param after literal text such as \`/user-:id\`. Pass a RegExp instead, for example \`matcher: /^\\/(?!api|_next).*/\`, or use the supported forms: /path/:param, /path/:param*, /path/[param], /path/[...param], /path/*, /path/**, or a trailing (.*) such as /path(.*).`
   );
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, assertSupportedMiddlewareMatcher, "assertSupportedMiddlewareMatcher");

package/dist/{chunk-ATSDUUFK.mjs → chunk-AX7S67YV.mjs}

@@ -1,3 +1,6 @@
+import {
+  setFarmPluginIntegrationContext
+} from "./chunk-H3EGVQE5.mjs";
 import {
   defineSchema
 } from "./chunk-44SYJEG3.mjs";
@@ -5,19 +8,10 @@ import {
   assertSupportedMiddlewareMatcher,
   compileMiddlewareConfig,
   matchesCompiledMiddlewareConfig
-} from "./chunk-P3PLW4FR.mjs";
+} from "./chunk-HKFBMHCD.mjs";
 import {
-  bufferFarmRequestBody,
-  clearRequestContext,
-  createFarmRequestBodyErrorResponse,
-  deleteRequestContext,
-  getRequestContext,
-  getRequestContextSnapshot,
-  hasRequestContext,
-  readNodeRequestBody,
-  resolveFarmServerConfig,
-  setRequestContext
-} from "./chunk-ZMMBIVQM.mjs";
+  toPublicValidationIssues
+} from "./chunk-MGMF4VP7.mjs";
 import {
   applyWebResponseHeaders,
   sendWebResponse
@@ -26,6 +20,21 @@ import {
   createFarmAPIMiddlewarePathnames,
   resolveFarmAPIServerBasePath
 } from "./chunk-BTHHUD7Q.mjs";
+import {
+  bufferFarmRequestBody,
+  createFarmRequestBodyErrorResponse,
+  readNodeRequestBody,
+  resolveFarmServerConfig,
+  withFarmRequestClientAddress
+} from "./chunk-ZZGQD7A4.mjs";
+import {
+  clearRequestContext,
+  deleteRequestContext,
+  getRequestContext,
+  getRequestContextSnapshot,
+  hasRequestContext,
+  setRequestContext
+} from "./chunk-P7XDC7UJ.mjs";
 import {
   api,
   defineIntegrationAPIOperation
@@ -53,20 +62,6 @@ import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
 
-// src/plugin-integration-context.ts
-var FARM_PLUGIN_INTEGRATION_CONTEXT = /* @__PURE__ */ Symbol.for("@farm.js/core/plugin-integration-context");
-function setFarmPluginIntegrationContext(plugin, integration) {
-  Object.defineProperty(plugin, FARM_PLUGIN_INTEGRATION_CONTEXT, {
-    value: integration
-  });
-}
-__name(setFarmPluginIntegrationContext, "setFarmPluginIntegrationContext");
-function getFarmPluginIntegrationContext(plugin) {
-  const value = plugin[FARM_PLUGIN_INTEGRATION_CONTEXT];
-  return value && typeof value === "object" ? value : void 0;
-}
-__name(getFarmPluginIntegrationContext, "getFarmPluginIntegrationContext");
-
 // src/integrations.ts
 var FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY = "farm.integration.internalDispatch";
 var FARM_INTEGRATION_SET_COOKIES_KEY = "farm:integration:set-cookies";
@@ -863,7 +858,11 @@ function createIntegrationPlugin(integrationKey, integration) {
       }, "getRequestBody");
       const createHandlerRequest = /* @__PURE__ */ __name(async () => {
         try {
-          return createWebRequest(req, fullUrl, await getRequestBody());
+          return withFarmRequestClientAddress(
+            createWebRequest(req, fullUrl, await getRequestBody()),
+            resolveFarmServerConfig(context.config.server).trustProxy,
+            req.socket?.remoteAddress
+          );
         } catch (error) {
           const response = createFarmRequestBodyErrorResponse(error);
           if (!response) throw error;
@@ -1353,18 +1352,13 @@ function createIntegrationValidationResponse(issues) {
 __name(createIntegrationValidationResponse, "createIntegrationValidationResponse");
 function normalizeIntegrationValidationIssues(source, error) {
   if (Array.isArray(error.issues) && error.issues.length > 0) {
-    return error.issues.map((issue) => ({
-      source,
-      path: normalizeIntegrationValidationPath(issue.path),
-      code: issue.code,
-      message: issue.message || "Invalid input"
-    }));
+    return toPublicValidationIssues(error).map((issue) => ({ source, ...issue }));
   }
   return [
     {
       source,
       path: [],
-      message: error.message || "Invalid input"
+      message: "Invalid input"
     }
   ];
 }
@@ -1441,7 +1435,7 @@ function createIntegrationRouteArgs(input) {
         `Integration "${input.integration.type}" does not define a schema for ctx.args.db.`
       );
     }
-    ormPromise ?? (ormPromise = import("./integration-orm-KV5B3BGZ.mjs").then(
+    ormPromise ?? (ormPromise = import("./integration-orm-RBKCIQYZ.mjs").then(
       ({ createIntegrationOrm }) => createIntegrationOrm({
         schema: input.integration.schema,
         config: input.config
@@ -1571,16 +1565,15 @@ function createFormInput(formData) {
 }
 __name(createFormInput, "createFormInput");
 async function dispatchIntegrationRequest(runtime, request, options = {}) {
+  const serverConfig = resolveFarmServerConfig(runtime.config.server);
   try {
-    request = await bufferFarmRequestBody(
-      request,
-      resolveFarmServerConfig(runtime.config.server).bodySizeLimit
-    );
+    request = await bufferFarmRequestBody(request, serverConfig.bodySizeLimit);
   } catch (error) {
     const response = createFarmRequestBodyErrorResponse(error);
     if (response) return response;
     throw error;
   }
+  request = withFarmRequestClientAddress(request, serverConfig.trustProxy, options.clientAddress);
   const integration = runtime.integration;
   const url = new URL(request.url);
   const pathname = url.pathname;
@@ -1862,6 +1855,7 @@ async function dispatchIntegrationRequests(integrations, runtime, request, optio
       {
         currentRequest: options.currentRequest,
         ranMiddleware: options.ranMiddleware,
+        clientAddress: options.clientAddress,
         onForwardedCookies: /* @__PURE__ */ __name((cookies) => setCookies.push(...cookies), "onForwardedCookies")
       }
     );
@@ -2184,7 +2178,6 @@ function normalizeMatcher(matcher) {
 __name(normalizeMatcher, "normalizeMatcher");
 
 export {
-  getFarmPluginIntegrationContext,
   FARM_INTEGRATION_INTERNAL_DISPATCH_CONTEXT_KEY,
   FARM_INTEGRATION_SET_COOKIES_KEY,
   forwardIntegrationSetCookies,

package/dist/{chunk-MSSFIQGM.mjs → chunk-B2GSRB3P.mjs}

@@ -1,6 +1,6 @@
 import {
   emitFarmEvent
-} from "./chunk-FUZEBRP3.mjs";
+} from "./chunk-4GP3XZ4Z.mjs";
 import {
   getActiveFarmI18nSnapshot
 } from "./chunk-C4NCTZLM.mjs";
@@ -15,6 +15,9 @@ import {
   notifyFarmCacheTask,
   subscribeFarmCacheInvalidation
 } from "./chunk-4SIYUGRY.mjs";
+import {
+  _runInSharedCacheScope
+} from "./chunk-6LVRDOAW.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -208,6 +211,7 @@ async function encodeStorageKeySegment(value) {
 }
 __name(encodeStorageKeySegment, "encodeStorageKeySegment");
 var MIN_STALE_RETENTION_MS = 6e4;
+var PPR_SHELL_ADAPTER_TTL_SECONDS = 86400;
 function getFarmCacheEntryExpiresAt(createdAt, revalidate, now = Date.now()) {
   if (typeof revalidate !== "number") return void 0;
   const revalidateMs = revalidate * 1e3;
@@ -232,6 +236,8 @@ var _FarmDataCache = class _FarmDataCache {
     this.namespace = "farm";
     this.local = true;
     this.maxEntries = 1024;
+    this.config = {};
+    this.isShellCache = false;
     this.lease = {
       enabled: true,
       ttlMs: 1e4,
@@ -241,6 +247,8 @@ var _FarmDataCache = class _FarmDataCache {
     this.configure(config);
   }
   configure(config = {}) {
+    this.config = config;
+    this.shells?.configure(config);
     this.generation++;
     this.entries.clear();
     this.entriesByTag.clear();
@@ -267,6 +275,19 @@ var _FarmDataCache = class _FarmDataCache {
       )
     };
   }
+  /**
+   * Where PPR shells live: the same adapter and namespace, so path and tag invalidation
+   * reaches them, but their own in-memory LRU of `maxEntries`.
+   * @internal
+   */
+  get pprShellCache() {
+    if (this.isShellCache) return this;
+    if (!this.shells) {
+      this.shells = new _FarmDataCache(this.config);
+      this.shells.isShellCache = true;
+    }
+    return this.shells;
+  }
   get adapterName() {
     return this.adapter?.name || (this.adapter ? "custom" : "memory");
   }
@@ -396,7 +417,7 @@ var _FarmDataCache = class _FarmDataCache {
     const tags = normalizeCacheOptionsTags(options);
     const capturedVersions = tagVersions ?? await this.getAdapterTagVersions(Array.from(tags.values()));
     const createdAt = options.createdAt ?? Date.now();
-    const expiresAt = getFarmCacheEntryExpiresAt(createdAt, revalidate);
+    const expiresAt = getFarmCacheEntryExpiresAt(createdAt, revalidate) ?? (this.isShellCache && this.adapter ? createdAt + PPR_SHELL_ADAPTER_TTL_SECONDS * 1e3 : void 0);
     const entry = {
       key,
       value,
@@ -435,6 +456,11 @@ var _FarmDataCache = class _FarmDataCache {
     return this.adapter ? true : deleted;
   }
   clear() {
+    const count = this.entries.size + (this.shells?.resetLocal() ?? 0);
+    this.resetLocal();
+    emitFarmEvent({ type: "cache.clear", count });
+  }
+  resetLocal() {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
@@ -443,7 +469,7 @@ var _FarmDataCache = class _FarmDataCache {
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
     this.version = 0;
-    emitFarmEvent({ type: "cache.clear", count });
+    return count;
   }
   async clearAsync() {
     this.clear();
@@ -469,7 +495,7 @@ var _FarmDataCache = class _FarmDataCache {
   }
   revalidateTag(tag, options = {}) {
     const normalized = normalizeCacheTag(tag);
-    const count = this.invalidateTag(normalized);
+    const count = this.invalidateTag(normalized) + (this.shells?.invalidateTag(normalized) ?? 0);
     emitFarmEvent(
       options.source === "updateTag" ? { type: "cache.updateTag", tag: normalized, count } : { type: "cache.revalidateTag", tag: normalized, profile: options.profile, count }
     );
@@ -477,7 +503,7 @@ var _FarmDataCache = class _FarmDataCache {
   }
   async revalidateTagAsync(tag, options = {}) {
     const normalized = normalizeCacheTag(tag);
-    const count = this.invalidateTag(normalized);
+    const count = this.invalidateTag(normalized) + (this.shells?.invalidateTag(normalized) ?? 0);
     await this.adapter?.invalidateTags?.([this.createAdapterTag(normalized)]);
     emitFarmEvent(
       options.source === "updateTag" ? { type: "cache.updateTag", tag: normalized, count } : { type: "cache.revalidateTag", tag: normalized, profile: options.profile, count }
@@ -487,8 +513,8 @@ var _FarmDataCache = class _FarmDataCache {
   revalidatePath(routePath) {
     const normalizedPath = normalizeRevalidatePath(routePath);
     const pathTag = createPathCacheTag(normalizedPath);
-    const pprCount = this.countEntriesForTags([pathTag, "ppr"]);
-    const count = this.invalidateTag(pathTag);
+    const pprCount = this.countEntriesForTags([pathTag, "ppr"]) + (this.shells?.countEntriesForTags([pathTag, "ppr"]) ?? 0);
+    const count = this.invalidateTag(pathTag) + (this.shells?.invalidateTag(pathTag) ?? 0);
     emitFarmEvent({ type: "cache.revalidatePath", path: normalizedPath, count });
     if (pprCount > 0) {
       emitFarmEvent({
@@ -503,8 +529,8 @@ var _FarmDataCache = class _FarmDataCache {
   async revalidatePathAsync(routePath) {
     const normalizedPath = normalizeRevalidatePath(routePath);
     const pathTag = createPathCacheTag(normalizedPath);
-    const pprCount = this.countEntriesForTags([pathTag, "ppr"]);
-    const count = this.invalidateTag(pathTag);
+    const pprCount = this.countEntriesForTags([pathTag, "ppr"]) + (this.shells?.countEntriesForTags([pathTag, "ppr"]) ?? 0);
+    const count = this.invalidateTag(pathTag) + (this.shells?.invalidateTag(pathTag) ?? 0);
     await this.adapter?.invalidateTags?.([this.createAdapterTag(pathTag)]);
     emitFarmEvent({ type: "cache.revalidatePath", path: normalizedPath, count });
     if (pprCount > 0) {
@@ -785,7 +811,11 @@ function unstable_cache(fn, keyParts = [], options = {}) {
       keyParts,
       args
     ]);
-    return getFarmDataCache().getOrSet(key, () => fn(...args), options);
+    return getFarmDataCache().getOrSet(
+      key,
+      () => _runInSharedCacheScope("unstable_cache()", () => fn(...args)),
+      options
+    );
   };
 }
 __name(unstable_cache, "unstable_cache");
@@ -986,6 +1016,7 @@ export {
   createFarmCacheInvalidationStream,
   defineCacheKey,
   storageCacheAdapter,
+  PPR_SHELL_ADAPTER_TTL_SECONDS,
   FarmDataCache,
   getFarmDataCache,
   configureFarmCache,