@farm.js/core 0.1.50 → 0.1.51-beta.0

package/dist/{chunk-C73RIAEF.mjs → chunk-QI5AQMEE.mjs}

@@ -9,10 +9,10 @@ import {
 } from "./chunk-IYEY3JWJ.mjs";
 import {
   APIRouteConflictError
-} from "./chunk-WXHDVXJE.mjs";
+} from "./chunk-KY32FWK7.mjs";
 import {
   findProgrammaticRouteFilesInDir
-} from "./chunk-2H3FJYY6.mjs";
+} from "./chunk-FSXSQQTV.mjs";
 import {
   isFarmAPIRouteFileName
 } from "./chunk-YX6AFPXC.mjs";
@@ -20,6 +20,7 @@ import {
   API_ROUTE_METHODS,
   getAllowedAPIRouteMethods,
   invokeAPIRouteEndpoint,
+  isFarmAPIPathname,
   matchAPIRouteAtBasePath,
   mergePluginAPIRoutes,
   resolveAPIRouteEndpoint
@@ -36,7 +37,7 @@ import {
 import {
   toPosixPath,
   toViteModuleId
-} from "./chunk-2SVJGOAX.mjs";
+} from "./chunk-Y3N5BFRJ.mjs";
 import {
   sendWebResponse
 } from "./chunk-IUQLRTTO.mjs";
@@ -400,16 +401,26 @@ function farmApiPlugin(options = {}) {
           const pathname = url.split("?")[0];
           const method = req.method || "GET";
           if (discoveryPromise) await waitForDiscovery();
+          const farmMiddleware = server.__farmMiddleware__;
+          let middlewareRan = false;
           if (!matchAPIRouteAtBasePath(servedRoutes(), pathname, basePath)) {
-            return next();
+            if (!farmMiddleware || !apiRouterHandler || !isFarmAPIPathname(pathname, basePath)) {
+              return next();
+            }
+            await farmMiddleware.waitForDiscovery?.();
+            if (await farmMiddleware.execute(req, res, pathname, /* @__PURE__ */ new Map())) return;
+            middlewareRan = true;
+            const rewrittenPathname = (req.url || url).split("?")[0];
+            if (rewrittenPathname === pathname || !matchAPIRouteAtBasePath(servedRoutes(), rewrittenPathname, basePath)) {
+              return next();
+            }
           }
           if (!apiRouterHandler) {
             return next();
           }
           const startTime = Date.now();
           try {
-            const farmMiddleware = server.__farmMiddleware__;
-            if (farmMiddleware) {
+            if (farmMiddleware && !middlewareRan) {
               await farmMiddleware.waitForDiscovery?.();
               const middlewareData = /* @__PURE__ */ new Map();
               const handled = await farmMiddleware.execute(req, res, pathname, middlewareData);

package/dist/{chunk-F5LERVY3.cjs → chunk-QK3HBOTG.cjs}

@@ -1,20 +1,20 @@
 "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 _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await 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; } async function _asyncOptionalChain(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 = await fn(value); } else if (op === 'call' || op === 'optionalCall') { value = await fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunkETF5C6HRcjs = require('./chunk-ETF5C6HR.cjs');
+var _chunkSJ23LJ3Ncjs = require('./chunk-SJ23LJ3N.cjs');
 
 
-var _chunkCGCJ2TJUcjs = require('./chunk-CGCJ2TJU.cjs');
+var _chunkXPMC4E2Gcjs = require('./chunk-XPMC4E2G.cjs');
 
 
-var _chunkLYWAGXXWcjs = require('./chunk-LYWAGXXW.cjs');
+var _chunkO3MMJPC2cjs = require('./chunk-O3MMJPC2.cjs');
 
 
 
 var _chunkDGOLAZLVcjs = require('./chunk-DGOLAZLV.cjs');
 
 
-var _chunkIXSMFKZ2cjs = require('./chunk-IXSMFKZ2.cjs');
+var _chunkLNM57D3Hcjs = require('./chunk-LNM57D3H.cjs');
 
 
 var _chunkAQLHD6HZcjs = require('./chunk-AQLHD6HZ.cjs');
@@ -54,7 +54,7 @@ function pickImportTarget(entry) {
   return void 0;
 }
 async function importFromApp(root, packageName, subpath = ".") {
-  const packageDir = _chunkETF5C6HRcjs.findFarmAppPackageDir.call(void 0, root, packageName);
+  const packageDir = _chunkSJ23LJ3Ncjs.findFarmAppPackageDir.call(void 0, root, packageName);
   if (!packageDir) return void 0;
   const manifest = JSON.parse(_fs.readFileSync.call(void 0, _path2.default.join(packageDir, "package.json"), "utf8"));
   const exportsMap = manifest.exports;
@@ -81,9 +81,9 @@ async function createFarmRscViteConfig(userConfig, options) {
     importFromApp(root, "@vitejs/plugin-rsc"),
     importFromApp(root, "@vitejs/plugin-react")
   ]);
-  if (!pluginRsc || !viteRsc || !_chunkETF5C6HRcjs.findFarmAppPackageDir.call(void 0, root, "react-server-dom-webpack")) {
+  if (!pluginRsc || !viteRsc || !_chunkSJ23LJ3Ncjs.findFarmAppPackageDir.call(void 0, root, "react-server-dom-webpack")) {
     throw new Error(
-      `[Farm.js] experimental.serverComponents runs on @farm.js/plugin and the official @vitejs/plugin-rsc. Install them: ${_chunkETF5C6HRcjs.FARM_RSC_INSTALL_HINT}`
+      `[Farm.js] experimental.serverComponents runs on @farm.js/plugin and the official @vitejs/plugin-rsc. Install them: ${_chunkSJ23LJ3Ncjs.FARM_RSC_INSTALL_HINT}`
     );
   }
   const { plugins: vitePlugins = [], ...viteOptions } = _nullishCoalesce(userConfig.vite, () => ( {}));
@@ -92,7 +92,7 @@ async function createFarmRscViteConfig(userConfig, options) {
     if (userConfig[key] !== void 0) rscConfig[key] = userConfig[key];
   }
   const createReactPlugin = hasPluginNamed(vitePlugins, "vite:react") ? void 0 : await _asyncNullishCoalesce(await _asyncOptionalChain([viteReact, 'optionalAccess', async _2 => _2.default]), async () => ( (options.command === "serve" ? (await _chunkDGOLAZLVcjs.loadFarmReactPlugin.call(void 0, )).default : void 0)));
-  const tailwind = hasPluginNamed(vitePlugins, "@tailwindcss/vite") ? void 0 : await _chunkIXSMFKZ2cjs.loadTailwindVitePlugin.call(void 0, );
+  const tailwind = hasPluginNamed(vitePlugins, "@tailwindcss/vite") ? void 0 : await _chunkLNM57D3Hcjs.loadTailwindVitePlugin.call(void 0, );
   const farmConfig = pluginRsc.defineConfig({
     ...rscConfig,
     experimental: { ...userConfig.experimental, serverComponents: true },
@@ -111,7 +111,7 @@ async function createFarmRscViteConfig(userConfig, options) {
         server: { environmentName: "rsc" },
         config: {
           preset: options.preset,
-          outputDir: options.outputDir && _chunkLYWAGXXWcjs.resolveDeployOutputPath.call(void 0, root, options.outputDir)
+          outputDir: options.outputDir && _chunkO3MMJPC2cjs.resolveDeployOutputPath.call(void 0, root, options.outputDir)
         }
       })
     ]
@@ -134,7 +134,7 @@ async function createFarmRscDevServer(userConfig, options) {
   const config = await createFarmRscViteConfig(userConfig, { ...configOptions, command: "serve" });
   return createServer({
     ...config,
-    plugins: [..._nullishCoalesce(config.plugins, () => ( [])), _chunkCGCJ2TJUcjs.createFarmDevLoopbackPlugin.call(void 0, )],
+    plugins: [..._nullishCoalesce(config.plugins, () => ( [])), _chunkXPMC4E2Gcjs.createFarmDevLoopbackPlugin.call(void 0, )],
     ...host === void 0 ? {} : { server: { ...config.server, host } }
   });
 }

package/dist/{chunk-Q3UU2KXC.mjs → chunk-QMDU6QHN.mjs}

@@ -15,6 +15,9 @@ import {
   createRouteDataCacheTag,
   getFarmDataCache
 } from "./chunk-RLEALQEN.mjs";
+import {
+  createFarmSearchParams
+} from "./chunk-H3ASZDT7.mjs";
 import {
   createFarmCacheKey
 } from "./chunk-GLOICKDO.mjs";
@@ -535,7 +538,7 @@ async function resolveProgrammaticRouteProps(route, props) {
     ...props,
     params,
     search,
-    searchParams: Promise.resolve(search)
+    searchParams: createFarmSearchParams(search)
   };
   const routeContextProps = {
     ...baseProps,

package/dist/{chunk-JJOWY3XD.mjs → chunk-R5P4KFPM.mjs}

@@ -23,7 +23,7 @@ import {
 } from "./chunk-LM2YOGDK.mjs";
 import {
   FARM_VERSION
-} from "./chunk-2VCC3GVC.mjs";
+} from "./chunk-ZF3GX4O7.mjs";
 import {
   applyFarmBasePath
 } from "./chunk-SF3JB56B.mjs";

package/dist/{chunk-IWJKJDNW.mjs → chunk-S5ZA2T2W.mjs}

@@ -1,14 +1,11 @@
+import {
+  resolveFarmPlatform
+} from "./chunk-SMUW7UST.mjs";
 import {
   collectSSGPages,
   matchSSGPage,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-SHJJM6OG.mjs";
-import {
-  createFarmMetadataImageResponse
-} from "./chunk-OZK2DS44.mjs";
-import {
-  resolveFarmPlatform
-} from "./chunk-SMUW7UST.mjs";
+} from "./chunk-WVX3BUNJ.mjs";
 import {
   classifyFarmDocumentPrefix,
   composeFarmFullDocument,
@@ -33,10 +30,10 @@ import {
   renderFarmLocaleAlternateLinks,
   resolveDefaultErrorStatus,
   routeBoundaryCoversDirectory
-} from "./chunk-ZIBIE7AH.mjs";
+} from "./chunk-7UPCJDB5.mjs";
 import {
   listFarmMCPLlmsTxtLinks
-} from "./chunk-JJOWY3XD.mjs";
+} from "./chunk-R5P4KFPM.mjs";
 import {
   FARM_DEFAULT_MCP_PATH,
   collectFarmDefaultMCPPages,
@@ -45,13 +42,16 @@ import {
   isFarmDefaultMCPPathname,
   resolveFarmDefaultMCPServer
 } from "./chunk-KRRZJ77U.mjs";
+import {
+  createFarmMetadataImageResponse
+} from "./chunk-OZK2DS44.mjs";
 import {
   installFarmIslandValues,
   uninstallFarmIslandValues
 } from "./chunk-A4PWGL46.mjs";
 import {
   handleFarmFormActionRequest
-} from "./chunk-OTOOJIUB.mjs";
+} from "./chunk-Z5A6CNV2.mjs";
 import {
   FARM_ISLAND_REPLAYABLE_SELECTOR,
   isFarmIslandStrategy
@@ -134,13 +134,13 @@ import {
 } from "./chunk-UIJOLBUL.mjs";
 import {
   resolveWorkflowsConfig
-} from "./chunk-5V4KZOZO.mjs";
+} from "./chunk-LZ4SB57H.mjs";
 import {
   resolveCronConfig
-} from "./chunk-UCQ52TJY.mjs";
+} from "./chunk-X3JNB2TB.mjs";
 import {
   resolveServerActionsConfig
-} from "./chunk-BW6SCVYX.mjs";
+} from "./chunk-FSQMN2MQ.mjs";
 import {
   resolveFarmThemeConfig
 } from "./chunk-YWPNIYUP.mjs";
@@ -168,7 +168,7 @@ import {
 import {
   createRouteSlotContainerId,
   parseRouteSlotFile
-} from "./chunk-CBJKDB6F.mjs";
+} from "./chunk-IRSS4HS4.mjs";
 import {
   _clearCurrentMiddlewareContext,
   _clearCurrentMiddlewareData,
@@ -178,7 +178,7 @@ import {
 import {
   findProgrammaticRouteFiles,
   loadProgrammaticRouteManifests
-} from "./chunk-2H3FJYY6.mjs";
+} from "./chunk-FSXSQQTV.mjs";
 import {
   _runWithFarmI18nRequest,
   _setDefaultFarmI18nRuntime,
@@ -230,10 +230,11 @@ import {
   splitRoutePath,
   toRootRelativeUrlPath,
   toViteModuleId
-} from "./chunk-2SVJGOAX.mjs";
+} from "./chunk-Y3N5BFRJ.mjs";
 import {
+  createFarmSearchParams,
   searchParamsToObject
-} from "./chunk-TXK4D46O.mjs";
+} from "./chunk-H3ASZDT7.mjs";
 import {
   configureFarmObservability,
   emitFarmEvent
@@ -253,7 +254,7 @@ import {
 } from "./chunk-LM2YOGDK.mjs";
 import {
   FARM_VERSION
-} from "./chunk-2VCC3GVC.mjs";
+} from "./chunk-ZF3GX4O7.mjs";
 import {
   resolveFarmTrailingSlashRedirect,
   setFarmTrailingSlashPreference
@@ -4465,7 +4466,12 @@ function withFarmIslandsRenders(runtime, islandsRuntime) {
   return wrapped;
 }
 var cachedClerkProvider = null;
-var importRuntimeModule = new Function("specifier", "return import(specifier);");
+function importRuntimeModule(specifier) {
+  return import(
+    /* @vite-ignore */
+    specifier
+  );
+}
 function shouldServePrerenderedPage(nodeEnv, method) {
   if (nodeEnv !== "production") return false;
   const normalizedMethod = (method || "GET").toUpperCase();
@@ -4655,7 +4661,7 @@ async function parseRouteModuleProps(routeModule, input) {
     ...input.props,
     params,
     search,
-    searchParams: Promise.resolve(search)
+    searchParams: createFarmSearchParams(search)
   };
 }
 function parseRouteModuleSchema(schema, value, label, routePath) {
@@ -4673,7 +4679,7 @@ function createRouteStateProps(input) {
   return {
     params: input.params,
     search: input.searchParamsObject,
-    searchParams: Promise.resolve(input.searchParamsObject),
+    searchParams: createFarmSearchParams(input.searchParamsObject),
     path: input.path,
     middleware: input.middlewareMap.size > 0 ? { data: input.middlewareMap } : void 0,
     context: input.pluginExposedContext.size > 0 ? { data: input.pluginExposedContext } : void 0
@@ -5126,7 +5132,7 @@ var ServerRenderer = class {
           const PageComponent = mod.default;
           const pageProps = {
             params: page.params,
-            searchParams: Promise.resolve({}),
+            searchParams: createFarmSearchParams({}),
             path: page.urlPath
           };
           let pageElement = this.rendererRuntime.createElement(PageComponent, pageProps);
@@ -5412,7 +5418,7 @@ var ServerRenderer = class {
       const rawPageProps = withFarmRouteContext(
         {
           params,
-          searchParams: Promise.resolve(searchParamsObject),
+          searchParams: createFarmSearchParams(searchParamsObject),
           path: pathname,
           middleware: middlewareMap.size > 0 ? { data: middlewareMap } : void 0,
           context: pluginExposedContext.size > 0 ? { data: pluginExposedContext } : void 0
@@ -5435,7 +5441,7 @@ var ServerRenderer = class {
         const routeStateProps = {
           ...rawPageProps,
           search: searchParamsObject,
-          searchParams: Promise.resolve(searchParamsObject),
+          searchParams: createFarmSearchParams(searchParamsObject),
           error
         };
         if (isFarmNotFoundError(error) && programmaticRouteComponents?.notFound) {
@@ -5553,7 +5559,7 @@ var ServerRenderer = class {
           const rawSlotProps = withFarmRouteContext(
             {
               params: slot.params,
-              searchParams: Promise.resolve(searchParamsObject),
+              searchParams: createFarmSearchParams(searchParamsObject),
               path: pathname,
               middleware: middlewareMap.size > 0 ? { data: middlewareMap } : void 0,
               context: pluginExposedContext.size > 0 ? { data: pluginExposedContext } : void 0
@@ -6417,7 +6423,7 @@ var ServerRenderer = class {
     }
     const imageProps = {
       params: options.params,
-      searchParams: Promise.resolve(options.searchParamsObject),
+      searchParams: createFarmSearchParams(options.searchParamsObject),
       path: options.pagePath
     };
     const handlerResult = typeof imageModule.default === "function" ? await imageModule.default(imageProps) : imageModule.default;
@@ -7721,7 +7727,7 @@ function resolveFarmAppPackages(root) {
 import fs7 from "fs";
 import { createRequire as createRequire2 } from "module";
 import path12 from "path";
-import fg from "fast-glob";
+import { globSync } from "tinyglobby";
 var WEBMCP_CLIENT = "@farm.js/webmcp/client";
 var DEFINERS = /* @__PURE__ */ new Set(["defineWebMCPTool", "registerWebMCPTool", "registerWebMCPTools"]);
 var HINTS = ["readOnlyHint", "destructiveHint", "idempotentHint", "openWorldHint"];
@@ -7865,9 +7871,10 @@ function collectFarmWebMCPTools(root, srcDir = "src") {
   const base = path12.resolve(root, srcDir);
   let files;
   try {
-    files = fg.sync("**/*.{ts,tsx,js,jsx,mts,mjs,cts,cjs}", {
+    files = globSync("**/*.{ts,tsx,js,jsx,mts,mjs,cts,cjs}", {
       cwd: base,
       absolute: true,
+      expandDirectories: false,
       ignore: ["**/node_modules/**", "**/*.d.ts", "**/*.{test,spec}.*", "**/__tests__/**"]
     });
   } catch {

package/dist/{chunk-PXEXOQ5R.mjs → chunk-SHS6KXOZ.mjs}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-PAKCHVUS.mjs";
 import {
   logger
-} from "./chunk-2SVJGOAX.mjs";
+} from "./chunk-Y3N5BFRJ.mjs";
 
 // src/server-components-status.ts
 import { existsSync, realpathSync } from "fs";

package/dist/{chunk-ETF5C6HR.cjs → chunk-SJ23LJ3N.cjs}

@@ -4,7 +4,7 @@
 var _chunkBPNOYILCcjs = require('./chunk-BPNOYILC.cjs');
 
 
-var _chunkXN2MB4QZcjs = require('./chunk-XN2MB4QZ.cjs');
+var _chunkVQJYGZNXcjs = require('./chunk-VQJYGZNX.cjs');
 
 // src/server-components-status.ts
 var _fs = require('fs');
@@ -103,7 +103,7 @@ function farmAppUsesRscPipeline(config, root) {
   if (status.fallback) {
     if (!warnedFallback) {
       warnedFallback = true;
-      _chunkXN2MB4QZcjs.logger.warn(
+      _chunkVQJYGZNXcjs.logger.warn(
         `[Farm.js] ${formatFarmRscFallbackMessage(status.missingPackages, status.blockingKeys)}`
       );
     }
@@ -113,7 +113,7 @@ function farmAppUsesRscPipeline(config, root) {
     throw new Error(`[Farm.js] ${formatFarmRscBlockingMessage(status.blockingKeys)}`);
   }
   if (status.ignoredKeys.length > 0) {
-    _chunkXN2MB4QZcjs.logger.warn(
+    _chunkVQJYGZNXcjs.logger.warn(
       `[Farm.js] experimental.serverComponents runs on the RSC pipeline, which does not run ${formatKeys(
         status.ignoredKeys
       )} yet. ${status.ignoredKeys.length === 1 ? "It is" : "They are"} ignored.`