@farm.js/plugin 0.1.0-beta.103 → 0.1.0-beta.105

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/rsc/server-fn-transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-fn-transform.d.ts","sourceRoot":"","sources":["../../src/rsc/server-fn-transform.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,GACT,2BAA2B,GAAG,IAAI,CAiCpC"}
+{"version":3,"file":"server-fn-transform.d.ts","sourceRoot":"","sources":["../../src/rsc/server-fn-transform.ts"],"names":[],"mappings":"AAkBA,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,GACT,2BAA2B,GAAG,IAAI,CAoDpC"}

package/dist/rsc/server-fn-transform.js

@@ -1,6 +1,13 @@
 const 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;
 const EXPORT_SERVER_FUNCTION_FACTORY_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?\s*\(/g;
 const EXPORT_DEFAULT_SERVER_FUNCTION_FACTORY_RE = /\bexport\s+default\s+([A-Za-z_$][\w$]*)\s*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?\s*\(/g;
+// Any assignment counts as a declaration, not only `const x = factory(...)`:
+// splitting `let save; save = createServerFn(...)` must not hide the binding
+// from the fail-closed export checks below.
+const SERVER_FUNCTION_DECLARATION_RE = /(?<![.\w$])([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?\s*\(/g;
+const LOCAL_EXPORT_CLAUSE_RE = /\bexport\s*\{([^}]*)\}/g;
+const EXPORT_DEFAULT_ALIAS_RE = /\bexport\s+default\s+([A-Za-z_$][\w$]*)\s*(?:;|(?=[\r\n])|$)/g;
+const EXPORT_BINDING_ALIAS_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*(?:;|(?=[,\r\n])|$)/g;
 const MODULE_EXT_RE = /\.[cm]?[jt]sx?$/;
 const DECLARATION_RE = /(^|\n)\s*["']([^"']+)["']\s*;?/g;
 export function transformFarmServerFns(code, id) {
@@ -11,6 +18,20 @@ export function transformFarmServerFns(code, id) {
     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;
@@ -53,6 +74,135 @@ function findServerFunctionFactoryImportNames(code) {
     }
     return names;
 }
+function findServerFnReExport(code, factoryNames) {
+    // Comments and string contents must not hide or fake an export: a comment
+    // inside `export { /* … */ save }` previously made the specifier unparsable
+    // and the module shipped untransformed.
+    const scannable = stripCommentsAndStrings(code);
+    const declarations = 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) : undefined;
+        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",
+            };
+        }
+    }
+    // `export default save;` — the export-default replacement only recognizes a
+    // direct factory call, so a bare identifier slipped through untransformed.
+    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",
+        };
+    }
+    // `export const persist = save;` — same escape through a renamed binding.
+    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;
+}
+/**
+ * Blank out comments and string/template contents, preserving length, so the
+ * export scans above see only real syntax. Quotes themselves are kept; the
+ * characters between them become spaces.
+ */
+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)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/plugin",
-  "version": "0.1.0-beta.103",
+  "version": "0.1.0-beta.105",
   "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.103"
+    "@farm.js/core": "0.1.0-beta.105"
   },
   "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.103"
+    "@farm.js/core": "0.1.0-beta.105"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {