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

package/dist/{chunk-6QA2SXVH.cjs → chunk-FK25QSVC.cjs}

@@ -382,4 +382,5 @@ function throwIfAborted(signal) {
 
 
 
-exports.FARM_SERVER_FN_FAILURE_SYMBOL = FARM_SERVER_FN_FAILURE_SYMBOL; exports.ServerFnFailure = ServerFnFailure; exports.ServerActionError = ServerActionError; exports.isServerFnFailure = isServerFnFailure; exports.createServerFnTransportError = createServerFnTransportError; exports.DEFAULT_SERVER_ACTION_BODY_SIZE_LIMIT = DEFAULT_SERVER_ACTION_BODY_SIZE_LIMIT; exports.ServerActionRequestError = ServerActionRequestError; exports.resolveServerActionsConfig = resolveServerActionsConfig; exports.validateServerActionRequest = validateServerActionRequest; exports.prepareServerActionRequest = prepareServerActionRequest; exports.createServerActionRequestErrorResponse = createServerActionRequestErrorResponse; exports.sanitizeServerActionError = sanitizeServerActionError; exports.runWithServerActionRequest = runWithServerActionRequest; exports.getServerActionExecutionContext = getServerActionExecutionContext; exports.getServerActionSignal = getServerActionSignal; exports.getServerActionInvalidations = getServerActionInvalidations;
+
+exports.FARM_SERVER_FN_FAILURE_SYMBOL = FARM_SERVER_FN_FAILURE_SYMBOL; exports.ServerFnFailure = ServerFnFailure; exports.ServerActionError = ServerActionError; exports.isServerFnFailure = isServerFnFailure; exports.serializeServerFnFailure = serializeServerFnFailure; exports.createServerFnTransportError = createServerFnTransportError; exports.DEFAULT_SERVER_ACTION_BODY_SIZE_LIMIT = DEFAULT_SERVER_ACTION_BODY_SIZE_LIMIT; exports.ServerActionRequestError = ServerActionRequestError; exports.resolveServerActionsConfig = resolveServerActionsConfig; exports.validateServerActionRequest = validateServerActionRequest; exports.prepareServerActionRequest = prepareServerActionRequest; exports.createServerActionRequestErrorResponse = createServerActionRequestErrorResponse; exports.sanitizeServerActionError = sanitizeServerActionError; exports.runWithServerActionRequest = runWithServerActionRequest; exports.getServerActionExecutionContext = getServerActionExecutionContext; exports.getServerActionSignal = getServerActionSignal; exports.getServerActionInvalidations = getServerActionInvalidations;

package/dist/{chunk-BW6SCVYX.mjs → chunk-FSQMN2MQ.mjs}

@@ -370,6 +370,7 @@ export {
   ServerFnFailure,
   ServerActionError,
   isServerFnFailure,
+  serializeServerFnFailure,
   createServerFnTransportError,
   DEFAULT_SERVER_ACTION_BODY_SIZE_LIMIT,
   ServerActionRequestError,

package/dist/{chunk-2H3FJYY6.mjs → chunk-FSXSQQTV.mjs}

@@ -52,10 +52,11 @@ async function findProgrammaticRouteSourceFiles(srcRoot) {
     return [];
   }
   try {
-    const glob = await import("fast-glob");
-    return await glob.default("**/*.{ts,tsx,js,jsx}", {
+    const { glob } = await import("tinyglobby");
+    return await glob("**/*.{ts,tsx,js,jsx}", {
       cwd: srcRoot,
       absolute: true,
+      expandDirectories: false,
       ignore: [
         "**/*.d.ts",
         "**/node_modules/**",

package/dist/chunk-GNZIAJGB.mjs

@@ -0,0 +1,358 @@
+// src/server-fn-transform.ts
+var SERVER_FUNCTION_FACTORY_IMPORT_RE = /\bimport\s+(?:type\s+)?(?:[A-Za-z_$][\w$]*\s*,\s*)?(\{[^}]*\})\s+from\s*["']@farm.js\/core(?:\/(?:server-fn|server-query))?["']\s*;?/g;
+var EXPORT_SERVER_FUNCTION_FACTORY_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?\s*\(/g;
+var EXPORT_DEFAULT_SERVER_FUNCTION_FACTORY_RE = /\bexport\s+default\s+([A-Za-z_$][\w$]*)\s*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?\s*\(/g;
+var SERVER_FUNCTION_DECLARATION_RE = /(?<![.\w$])([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?\s*\(/g;
+var LOCAL_EXPORT_CLAUSE_RE = /\bexport\s*\{([^}]*)\}/g;
+var EXPORT_DEFAULT_ALIAS_RE = /\bexport\s+default\s+([A-Za-z_$][\w$]*)\s*(?:;|(?=[\r\n])|$)/g;
+var EXPORT_BINDING_ALIAS_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*(?:;|(?=[,\r\n])|$)/g;
+var MODULE_EXT_RE = /\.[cm]?[jt]sx?$/;
+var DECLARATION_RE = /(^|\n)\s*["']([^"']+)["']\s*;?/g;
+var FARM_SERVER_FN_BOUNDARY_QUERY = "?farm-server-fns";
+function transformFarmServerFns(code, id, options = {}) {
+  const analysis = analyzeServerFnModule(code, id);
+  if (!analysis) return null;
+  const { replacements } = analysis;
+  const exports = replacements.map((replacement) => replacement.exportName);
+  if (hasModuleDirective(code, "use server")) {
+    return { code: applyReplacements(code, replacements, "wrapper"), exports };
+  }
+  const boundaryId = JSON.stringify(serverFnBoundaryId(id));
+  if (options.environment !== void 0 && options.environment !== "rsc") {
+    return {
+      code: `export { ${exports.join(", ")} } from ${boundaryId};
+`,
+      exports
+    };
+  }
+  const imports = replacements.map(
+    (replacement) => replacement.exportName === "default" ? "default as $$farm_server_fn_boundary_default" : replacement.exportName
+  );
+  const reExports = replacements.map(
+    (replacement) => replacement.exportName === "default" ? "$$farm_server_fn_boundary_default as default" : replacement.exportName
+  );
+  const privateNames = replacements.map((replacement) => replacement.privateName);
+  return {
+    code: applyReplacements(code, replacements, "private") + `
+import { ${imports.join(", ")} } from ${boundaryId};
+export { ${[...reExports, ...privateNames].join(", ")} };
+`,
+    exports
+  };
+}
+function createFarmServerFnBoundaryModule(code, id) {
+  if (hasModuleDirective(code, "use server")) return null;
+  const analysis = analyzeServerFnModule(code, id);
+  if (!analysis) return null;
+  const sourceId = JSON.stringify(id.split("?", 1)[0].replace(/\\/g, "/"));
+  const privateNames = analysis.replacements.map((replacement) => replacement.privateName);
+  let output = `"use server";
+import { ${privateNames.join(", ")} } from ${sourceId};
+`;
+  for (const replacement of analysis.replacements) {
+    const declaration = replacement.exportName === "default" ? "export default async function" : "export async function";
+    output += `${declaration} ${replacement.wrapperName}(input) {
+  return ${replacement.privateName}(input);
+}
+${copyServerFunctionDescriptor(replacement.wrapperName, replacement.privateName, true)}
+`;
+  }
+  return output;
+}
+function isFarmServerFnBoundaryId(id) {
+  return /[?&]farm-server-fns(?:&|$)/.test(id);
+}
+function serverFnBoundaryId(id) {
+  return `${id.split("?", 1)[0].replace(/\\/g, "/")}${FARM_SERVER_FN_BOUNDARY_QUERY}`;
+}
+function applyReplacements(code, replacements, mode) {
+  let output = code;
+  for (const replacement of [...replacements].sort((a, b) => b.start - a.start)) {
+    const declaration = `const ${replacement.privateName} = ${replacement.callExpression};
+`;
+    const wrapper = mode === "private" ? "" : `${replacement.exportName === "default" ? "export default async function" : "export async function"} ${replacement.wrapperName}(input) {
+  return ${replacement.privateName}(input);
+}
+${copyServerFunctionDescriptor(replacement.wrapperName, replacement.privateName, false)}`;
+    output = output.slice(0, replacement.start) + declaration + wrapper + output.slice(replacement.end);
+  }
+  return output;
+}
+function analyzeServerFnModule(code, id) {
+  if (!isTransformableModule(id) || !code.includes("createServerFn") && !code.includes("createServerQuery")) {
+    return null;
+  }
+  const factoryNames = findServerFunctionFactoryImportNames(code);
+  if (factoryNames.size === 0) return null;
+  const reExport = findServerFnReExport(code, factoryNames);
+  if (reExport) {
+    const factoryName = reExport.factory === "fn" ? "createServerFn" : "createServerQuery";
+    const escape = reExport.form === "clause" ? "with an export clause" : reExport.form === "default" ? "as the default export" : "through another exported binding";
+    const inlineForm = reExport.form === "default" ? `export default ${factoryName}(...)` : `export const ${reExport.exportName} = ${factoryName}(...)`;
+    throw new Error(
+      `Server function "${reExport.localName}" cannot be re-exported ${escape}. Export it inline instead: ${inlineForm}.`
+    );
+  }
+  const replacements = findServerFnExportReplacements(code, factoryNames);
+  if (replacements.length === 0) return null;
+  if (hasModuleDirective(code, "use client")) {
+    throw new Error(
+      "createServerFn and createServerQuery exports must live in a server module. Move them out of the 'use client' file."
+    );
+  }
+  return { replacements };
+}
+function isTransformableModule(id) {
+  const cleanId = id.split("?", 1)[0];
+  return MODULE_EXT_RE.test(cleanId) && !/\.d\.[cm]?ts$/.test(cleanId);
+}
+function findServerFunctionFactoryImportNames(code) {
+  const names = /* @__PURE__ */ new Map();
+  for (const match of code.matchAll(SERVER_FUNCTION_FACTORY_IMPORT_RE)) {
+    const importClause = match[1] ?? "";
+    const namedStart = importClause.indexOf("{");
+    const namedEnd = importClause.lastIndexOf("}");
+    if (namedStart === -1 || namedEnd === -1 || namedEnd <= namedStart) continue;
+    const namedImports = importClause.slice(namedStart + 1, namedEnd).split(",");
+    for (const specifier of namedImports) {
+      const normalized = specifier.trim().replace(/^type\s+/, "");
+      const specifierMatch = normalized.match(
+        /^(createServerFn|createServerQuery)(?:\s+as\s+([A-Za-z_$][\w$]*))?$/
+      );
+      if (specifierMatch) {
+        const factory = specifierMatch[1];
+        names.set(specifierMatch[2] ?? factory, factory === "createServerFn" ? "fn" : "query");
+      }
+    }
+  }
+  return names;
+}
+function findServerFnReExport(code, factoryNames) {
+  const scannable = stripCommentsAndStrings(code);
+  const declarations = /* @__PURE__ */ new Map();
+  for (const match of scannable.matchAll(SERVER_FUNCTION_DECLARATION_RE)) {
+    const localName = match[1];
+    const factoryName = match[2];
+    const factory = factoryName ? factoryNames.get(factoryName) : void 0;
+    if (localName && factory) declarations.set(localName, factory);
+  }
+  if (declarations.size === 0) return null;
+  for (const match of scannable.matchAll(LOCAL_EXPORT_CLAUSE_RE)) {
+    const clause = match[1] ?? "";
+    const clauseEnd = (match.index ?? 0) + match[0].length;
+    if (scannable.slice(clauseEnd).trimStart().startsWith("from")) continue;
+    for (const specifier of clause.split(",")) {
+      const parts = specifier.trim().split(/\s+as\s+/);
+      const localName = parts[0]?.trim();
+      if (!localName || !declarations.has(localName)) continue;
+      return {
+        localName,
+        exportName: parts[1]?.trim() || localName,
+        factory: declarations.get(localName),
+        form: "clause"
+      };
+    }
+  }
+  for (const match of scannable.matchAll(EXPORT_DEFAULT_ALIAS_RE)) {
+    const localName = match[1];
+    if (!localName || !declarations.has(localName)) continue;
+    return {
+      localName,
+      exportName: "default",
+      factory: declarations.get(localName),
+      form: "default"
+    };
+  }
+  for (const match of scannable.matchAll(EXPORT_BINDING_ALIAS_RE)) {
+    const exportName = match[1];
+    const localName = match[2];
+    if (!exportName || !localName || !declarations.has(localName)) continue;
+    return {
+      localName,
+      exportName,
+      factory: declarations.get(localName),
+      form: "binding"
+    };
+  }
+  return null;
+}
+function stripCommentsAndStrings(code) {
+  const output = code.split("");
+  let quote = null;
+  let lineComment = false;
+  let blockComment = false;
+  let escaped = false;
+  for (let index = 0; index < code.length; index++) {
+    const char = code[index];
+    const next = code[index + 1];
+    if (lineComment) {
+      if (char === "\n" || char === "\r") lineComment = false;
+      else output[index] = " ";
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        output[index] = " ";
+        output[index + 1] = " ";
+        index++;
+      } else if (char !== "\n") {
+        output[index] = " ";
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) {
+        escaped = false;
+        output[index] = " ";
+        continue;
+      }
+      if (char === "\\") {
+        escaped = true;
+        output[index] = " ";
+        continue;
+      }
+      if (char === quote) {
+        quote = null;
+        continue;
+      }
+      if (char !== "\n") output[index] = " ";
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      output[index] = " ";
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      output[index] = " ";
+      continue;
+    }
+    if (char === "'" || char === '"' || char === "`") {
+      quote = char;
+    }
+  }
+  return output.join("");
+}
+function findServerFnExportReplacements(code, factoryNames) {
+  const replacements = [];
+  for (const match of code.matchAll(EXPORT_SERVER_FUNCTION_FACTORY_RE)) {
+    const exportName = match[1];
+    const calleeName = match[2];
+    const factory = calleeName ? factoryNames.get(calleeName) : void 0;
+    if (!exportName || !calleeName || !factory) continue;
+    const openParenIndex = (match.index ?? 0) + match[0].length - 1;
+    const callEnd = findMatchingParen(code, openParenIndex);
+    if (callEnd === -1) continue;
+    let declarationEnd = callEnd + 1;
+    while (/\s/.test(code[declarationEnd] ?? "")) declarationEnd++;
+    if (code[declarationEnd] === ";") declarationEnd++;
+    const calleeIndex = code.indexOf(calleeName, match.index);
+    replacements.push({
+      start: match.index ?? 0,
+      end: declarationEnd,
+      exportName,
+      privateName: `$$farm_server_${factory}_${exportName}`,
+      wrapperName: exportName,
+      callExpression: code.slice(calleeIndex, callEnd + 1)
+    });
+  }
+  for (const match of code.matchAll(EXPORT_DEFAULT_SERVER_FUNCTION_FACTORY_RE)) {
+    const calleeName = match[1];
+    const factory = calleeName ? factoryNames.get(calleeName) : void 0;
+    if (!calleeName || !factory) continue;
+    const openParenIndex = (match.index ?? 0) + match[0].length - 1;
+    const callEnd = findMatchingParen(code, openParenIndex);
+    if (callEnd === -1) continue;
+    let declarationEnd = callEnd + 1;
+    while (/\s/.test(code[declarationEnd] ?? "")) declarationEnd++;
+    if (code[declarationEnd] === ";") declarationEnd++;
+    const calleeIndex = code.indexOf(calleeName, match.index);
+    const privateName = `$$farm_server_${factory}_default`;
+    replacements.push({
+      start: match.index ?? 0,
+      end: declarationEnd,
+      exportName: "default",
+      privateName,
+      wrapperName: `${privateName}_export`,
+      callExpression: code.slice(calleeIndex, callEnd + 1)
+    });
+  }
+  return replacements;
+}
+function copyServerFunctionDescriptor(target, source, lazy) {
+  const key = 'Symbol.for("farm.server-function.descriptor")';
+  return lazy ? `Object.defineProperty(${target}, ${key}, { get: () => ${source}[${key}] });` : `Object.defineProperty(${target}, ${key}, { value: ${source}[${key}] });`;
+}
+function hasModuleDirective(code, directive) {
+  for (const match of code.matchAll(DECLARATION_RE)) {
+    const value = match[2];
+    if (value === directive) return true;
+    if (value !== "use strict" && value !== "use client" && value !== "use server") return false;
+  }
+  return false;
+}
+function findMatchingParen(code, openParenIndex) {
+  let depth = 0;
+  let quote = null;
+  let lineComment = false;
+  let blockComment = false;
+  let escaped = false;
+  for (let index = openParenIndex; index < code.length; index++) {
+    const char = code[index];
+    const next = code[index + 1];
+    if (lineComment) {
+      if (char === "\n" || char === "\r") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index++;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) {
+        escaped = false;
+        continue;
+      }
+      if (char === "\\") {
+        escaped = true;
+        continue;
+      }
+      if (char === quote) {
+        quote = null;
+      }
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index++;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index++;
+      continue;
+    }
+    if (char === "'" || char === '"' || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "(") depth++;
+    if (char === ")") {
+      depth--;
+      if (depth === 0) return index;
+    }
+  }
+  return -1;
+}
+
+export {
+  FARM_SERVER_FN_BOUNDARY_QUERY,
+  transformFarmServerFns,
+  createFarmServerFnBoundaryModule,
+  isFarmServerFnBoundaryId
+};

package/dist/{chunk-TXK4D46O.mjs → chunk-H3ASZDT7.mjs}

@@ -16,7 +16,27 @@ function searchParamsToObject(searchParams) {
   });
   return output;
 }
+var RESERVED_SEARCH_KEYS = /* @__PURE__ */ new Set([
+  "then",
+  "catch",
+  "finally",
+  "__proto__",
+  "constructor",
+  "prototype"
+]);
+function createFarmSearchParams(search) {
+  const promise = Promise.resolve(search);
+  for (const key of Object.keys(search)) {
+    if (RESERVED_SEARCH_KEYS.has(key)) continue;
+    Object.defineProperty(promise, key, {
+      value: search[key],
+      enumerable: true
+    });
+  }
+  return promise;
+}
 
 export {
-  searchParamsToObject
+  searchParamsToObject,
+  createFarmSearchParams
 };

package/dist/{chunk-B6PREBN6.cjs → chunk-HASX6DC7.cjs}

@@ -4,13 +4,13 @@
 
 
 
-var _chunkRWT2BTJTcjs = require('./chunk-RWT2BTJT.cjs');
+var _chunk2IAPKPEBcjs = require('./chunk-2IAPKPEB.cjs');
 
 
 var _chunkMPU5DOXXcjs = require('./chunk-MPU5DOXX.cjs');
 
 
-var _chunk6QA2SXVHcjs = require('./chunk-6QA2SXVH.cjs');
+var _chunkFK25QSVCcjs = require('./chunk-FK25QSVC.cjs');
 
 
 
@@ -32,7 +32,7 @@ function createServerQuery(options) {
     throw new TypeError("createServerQuery requires a key function");
   }
   const staleTime = normalizeServerQueryStaleTime(options.staleTime);
-  const execute = _chunkRWT2BTJTcjs.createServerFn.call(void 0, {
+  const execute = _chunk2IAPKPEBcjs.createServerFn.call(void 0, {
     input: options.input,
     middleware: options.middleware,
     handler: async (context) => {
@@ -42,7 +42,7 @@ function createServerQuery(options) {
       const cacheKey = _chunkDXUXQP2Tcjs.createFarmCacheKey.call(void 0, ["route-data", routeKey]);
       const producer = async () => {
         const value = await options.handler(context);
-        return _chunkRWT2BTJTcjs._parseServerFnSchema.call(void 0, options.output, value, "output", "createServerQuery");
+        return _chunk2IAPKPEBcjs._parseServerFnSchema.call(void 0, options.output, value, "output", "createServerQuery");
       };
       let data;
       let updatedAt;
@@ -67,7 +67,7 @@ function createServerQuery(options) {
   });
   const query = async (input) => {
     const result = await execute(input);
-    return _chunk6QA2SXVHcjs.getServerActionExecutionContext.call(void 0, ) ? result : result.data;
+    return _chunkFK25QSVCcjs.getServerActionExecutionContext.call(void 0, ) ? result : result.data;
   };
   Object.defineProperties(query, {
     [FARM_SERVER_QUERY_SYMBOL]: {
@@ -87,10 +87,10 @@ function createServerQuery(options) {
       enumerable: false
     }
   });
-  _chunkRWT2BTJTcjs._attachServerFunctionDescriptor.call(void 0, 
+  _chunk2IAPKPEBcjs._attachServerFunctionDescriptor.call(void 0, 
     query,
-    _chunkRWT2BTJTcjs.createServerFunctionDescriptor.call(void 0, "query", options, async (value) => {
-      const result = await _chunkRWT2BTJTcjs._runServerFunctionForCaller.call(void 0, 
+    _chunk2IAPKPEBcjs.createServerFunctionDescriptor.call(void 0, "query", options, async (value) => {
+      const result = await _chunk2IAPKPEBcjs._runServerFunctionForCaller.call(void 0, 
         execute,
         value
       );