@analogjs/vite-plugin-nitro 2.7.2-beta.3 → 2.7.2-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/vite-plugin-nitro",
-  "version": "2.7.2-beta.3",
+  "version": "2.7.2-beta.4",
   "description": "A Vite plugin for adding a nitro API server",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",

package/src/lib/utils/get-server-fn-handlers.d.ts

@@ -19,7 +19,8 @@ export type ServerFnHandlerModule = {
  *
  * Scope is `<projectRoot>/<sourceRoot>/**\/*.server.ts` because the RFC allows a
  * server function to live in any `.server.ts` module, including existing page
- * server files. Files that define no server function simply register nothing.
+ * server files. Only modules defining a server function that the client
+ * transform can rewrite participate.
  * Angular SSR config (`app.config.server.ts`) is excluded — it is not a route or
  * function module and must not be pulled into the dispatch bundle.
  *

package/src/lib/utils/get-server-fn-handlers.js

@@ -1,3 +1,5 @@
+import { readFileSync } from 'node:fs';
+import { parseSync } from 'oxc-parser';
 import { resolve } from 'node:path';
 import { globSync } from 'tinyglobby';
 import { normalizePath } from 'vite';
@@ -22,7 +24,8 @@ const EXCLUDED_SERVER_FILES = [/\/app\.config\.server\.ts$/];
  *
  * Scope is `<projectRoot>/<sourceRoot>/**\/*.server.ts` because the RFC allows a
  * server function to live in any `.server.ts` module, including existing page
- * server files. Files that define no server function simply register nothing.
+ * server files. Only modules defining a server function that the client
+ * transform can rewrite participate.
  * Angular SSR config (`app.config.server.ts`) is excluded — it is not a route or
  * function module and must not be pulled into the dispatch bundle.
  *
@@ -42,6 +45,42 @@ export function getServerFnHandlers({ workspaceRoot, sourceRoot, rootDir, additi
         file.slice(sourceRootDir.length).includes('/'))
         .filter((file) => (seen.has(file) ? false : (seen.add(file), true)))
         .sort()
+        .filter(definesServerFn)
         .map((file) => ({ file }));
 }
+/**
+ * Match the client scrub's supported server-function declaration shape. The
+ * scrub deliberately falls back to the conventional `serverFn` name when the
+ * function is re-exported through a local barrel, so discovery must make the
+ * same choice or the browser receives a proxy without a dispatch route.
+ */
+function definesServerFn(file) {
+    const code = readFileSync(file, 'utf8');
+    if (!code.includes('serverFn'))
+        return false;
+    const { program } = parseSync(file, code);
+    const localNames = new Set();
+    for (const node of program.body) {
+        if (node.type !== 'ImportDeclaration' ||
+            node.source.value !== '@analogjs/router/server') {
+            continue;
+        }
+        for (const specifier of node.specifiers) {
+            if (specifier.type === 'ImportSpecifier' &&
+                (specifier.imported.type === 'Identifier'
+                    ? specifier.imported.name
+                    : specifier.imported.value) === 'serverFn') {
+                localNames.add(specifier.local.name);
+            }
+        }
+    }
+    if (localNames.size === 0)
+        localNames.add('serverFn');
+    return program.body.some((node) => node.type === 'ExportNamedDeclaration' &&
+        node.declaration?.type === 'VariableDeclaration' &&
+        node.declaration.declarations.some((declarator) => declarator.id?.type === 'Identifier' &&
+            declarator.init?.type === 'CallExpression' &&
+            declarator.init.callee?.type === 'Identifier' &&
+            localNames.has(declarator.init.callee.name)));
+}
 //# sourceMappingURL=get-server-fn-handlers.js.map

package/src/lib/utils/get-server-fn-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-server-fn-handlers.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/utils/get-server-fn-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAcrC;;;;;;;;GAQG;AACH,MAAM,qBAAqB,GAAa,CAAC,4BAA4B,CAAC,CAAC;AAEvE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAClC,aAAa,EACb,UAAU,EACV,OAAO,EACP,sBAAsB,GACE;IACxB,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,KAAK,GAAG,QAAQ,CACpB;QACE,GAAG,IAAI,IAAI,UAAU,iBAAiB;QACtC,GAAG,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC,GAAG,CACnC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,aAAa,GAAG,GAAG,iBAAiB,CACjD;KACF,EACD,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAC9B,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IAErC,MAAM,aAAa,GAAG,GAAG,IAAI,IAAI,UAAU,GAAG,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO,KAAK;SACT,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACpE,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CACjD;SACA,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;SACnE,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"get-server-fn-handlers.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/utils/get-server-fn-handlers.ts"],"names":[],"mappings":"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"}