@superblocksteam/sdk 2.0.130-next.1 → 2.0.130-next.3

package/src/vite-plugin-sdk-api-entry-point.mts

@@ -2,6 +2,8 @@ import path from "node:path";
 
 import type { Plugin } from "vite";
 
+const SERVER_APIS_DIR = "server/apis";
+
 /**
  * Build a sourcemap `mappings` string for a simple prepend operation.
  *
@@ -24,27 +26,95 @@ function buildPrependMappings(
   return empty + original;
 }
 
+function qualifyAnchoredServerApisRelative(relative: string): string | null {
+  if (relative === `${SERVER_APIS_DIR}/index.ts`) {
+    return null;
+  }
+  const baseName = path.posix.basename(relative);
+  if (baseName === "index.ts") {
+    return null;
+  }
+  if (!relative.endsWith(".ts") && !relative.endsWith(".tsx")) {
+    return null;
+  }
+  return relative;
+}
+
+function qualifySegmentFallbackRelative(relative: string): string | null {
+  if (!relative.startsWith(`${SERVER_APIS_DIR}/`)) {
+    return null;
+  }
+  // Reject false positives when appRootDir sits under a server/apis/ path.
+  if (relative.includes("/client/")) {
+    return null;
+  }
+  const baseName = path.posix.basename(relative);
+  if (baseName !== "api.ts" && baseName !== "api.tsx") {
+    return null;
+  }
+  return relative;
+}
+
+/**
+ * Resolve the app-root-relative entry point path for a Vite module id.
+ *
+ * Fullstack apps keep `server/apis/` at the app root while `vite.config.ts`
+ * often sets `root: "./client"`. Dev server and build already pass the true
+ * app root into the plugin; failures are intermittent and depend on how Vite
+ * resolves module ids for files outside the client subtree (for example
+ * `../server/apis/...` relatives or `/@fs/...` absolute ids). Plain absolute
+ * paths under `<appRoot>/server/apis/` already matched before this helper.
+ */
+export function resolveSdkApiEntryPointRelativePath(
+  appRootDir: string,
+  moduleId: string,
+): string | null {
+  const normalizedId = path.normalize(moduleId);
+  const normalizedRoot = path.normalize(appRootDir);
+
+  const relative = path
+    .relative(normalizedRoot, normalizedId)
+    .replace(/\\/g, "/");
+  if (relative.startsWith(`${SERVER_APIS_DIR}/`)) {
+    return qualifyAnchoredServerApisRelative(relative);
+  }
+
+  // Plugin base is client/ or Vite passes a ../server/apis/... module id.
+  if (relative.startsWith(`../${SERVER_APIS_DIR}/`)) {
+    return qualifyAnchoredServerApisRelative(relative.slice("../".length));
+  }
+
+  // Fallback for module ids not matched above: /@fs/ prefixed ids, standard
+  // absolute paths when appRootDir is 2+ levels above server/apis/, etc.
+  // NOTE: unanchored to appRootDir — matches any id containing /server/apis/
+  // with an api.ts/api.tsx basename. lastIndexOf picks the deepest segment.
+  const posixId = normalizedId.replace(/\\/g, "/");
+  const segment = `/${SERVER_APIS_DIR}/`;
+  const segmentIndex = posixId.lastIndexOf(segment);
+  if (segmentIndex !== -1) {
+    return qualifySegmentFallbackRelative(posixId.slice(segmentIndex + 1));
+  }
+
+  return null;
+}
+
 /**
  * Vite plugin that prepends `__setEntryPoint(relativePath)` to SDK API files
  * so that `api()` can stamp the authoritative source file
  * path onto the compiled API object.
  *
+ * @param appRootDir - App root (parent of `client/` and `server/`).
+ *
  * Runs in both dev and build. The user's source code is never modified on disk.
  */
-export function sdkApiEntryPointPlugin(root: string): Plugin {
+export function sdkApiEntryPointPlugin(appRootDir: string): Plugin {
   return {
     name: "sb-sdk-api-entry-point",
     enforce: "pre",
 
     transform(code, id) {
-      const relative = path.relative(root, id).replace(/\\/g, "/");
-      if (
-        !relative.startsWith("server/apis/") ||
-        relative === "server/apis/index.ts"
-      ) {
-        return null;
-      }
-      if (!relative.endsWith(".ts") && !relative.endsWith(".tsx")) {
+      const relative = resolveSdkApiEntryPointRelativePath(appRootDir, id);
+      if (!relative) {
         return null;
       }
 

package/src/vite-plugin-sdk-api-entry-point.test.mts

@@ -2,7 +2,10 @@ import path from "node:path";
 
 import { describe, it, expect } from "vitest";
 
-import { sdkApiEntryPointPlugin } from "./vite-plugin-sdk-api-entry-point.mjs";
+import {
+  resolveSdkApiEntryPointRelativePath,
+  sdkApiEntryPointPlugin,
+} from "./vite-plugin-sdk-api-entry-point.mjs";
 
 type TransformResult = {
   code: string;
@@ -88,6 +91,95 @@ function expectValidSourcemap(
   });
 }
 
+describe("resolveSdkApiEntryPointRelativePath", () => {
+  it("resolves server API paths from the true app root", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app",
+        "/app/server/apis/GetUsers/api.ts",
+      ),
+    ).toBe("server/apis/GetUsers/api.ts");
+  });
+
+  it("resolves server API paths when the base dir is vite client/", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app/client",
+        "/app/server/apis/GetPastAnalyses/api.ts",
+      ),
+    ).toBe("server/apis/GetPastAnalyses/api.ts");
+  });
+
+  it("resolves server API paths from absolute /@fs module ids", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app",
+        "/@fs/Users/me/app/server/apis/GetFeedback/api.ts",
+      ),
+    ).toBe("server/apis/GetFeedback/api.ts");
+  });
+
+  it("returns null for the registry barrel file", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath("/app", "/app/server/apis/index.ts"),
+    ).toBeNull();
+  });
+
+  it("returns null when app root contains server/apis and module is a client file", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/home/server/apis/myapp",
+        "/home/server/apis/myapp/client/components/Button.tsx",
+      ),
+    ).toBeNull();
+  });
+
+  it("uses the deepest server/apis segment in /@fs fallback", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app",
+        "/@fs/home/server/apis/decoy/server/apis/GetReal/api.ts",
+      ),
+    ).toBe("server/apis/GetReal/api.ts");
+  });
+
+  it("resolves server API paths for api.tsx entry points", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app",
+        "/app/server/apis/Render/api.tsx",
+      ),
+    ).toBe("server/apis/Render/api.tsx");
+  });
+
+  it("resolves Clark-style API entry points that are not named api.ts", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app",
+        "/app/server/apis/issues/list-issues.ts",
+      ),
+    ).toBe("server/apis/issues/list-issues.ts");
+  });
+
+  it("resolves helper modules under server/apis/ on anchored paths", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app",
+        "/app/server/apis/GetFoo/helper.ts",
+      ),
+    ).toBe("server/apis/GetFoo/helper.ts");
+  });
+
+  it("returns null for index.ts under an API directory", () => {
+    expect(
+      resolveSdkApiEntryPointRelativePath(
+        "/app",
+        "/app/server/apis/GetFoo/index.ts",
+      ),
+    ).toBeNull();
+  });
+});
+
 describe("sdkApiEntryPointPlugin", () => {
   const root = "/app";
 
@@ -98,6 +190,19 @@ describe("sdkApiEntryPointPlugin", () => {
   });
 
   describe("transform", () => {
+    it("prepends __setEntryPoint for Clark-style list-issues.ts entry points", () => {
+      const { transform } = createPlugin(root);
+      const result = transform(
+        'export default api({ name: "ListIssues" });',
+        path.join(root, "server/apis/issues/list-issues.ts"),
+      );
+
+      expect(result).not.toBeNull();
+      expect(result!.code).toContain(
+        '__sb_set_ep("server/apis/issues/list-issues.ts");',
+      );
+    });
+
     it("prepends __setEntryPoint for a standard API file", () => {
       const { transform } = createPlugin(root);
       const result = transform(
@@ -171,6 +276,34 @@ describe("sdkApiEntryPointPlugin", () => {
       );
     });
 
+    it("prepends __setEntryPoint when plugin root is vite client/ subdir (fullstack)", () => {
+      const appRoot = "/app";
+      const viteRoot = path.join(appRoot, "client");
+      const { transform } = createPlugin(viteRoot);
+      const result = transform(
+        'export default api({ name: "GetPastAnalyses" });',
+        path.join(appRoot, "server/apis/GetPastAnalyses/api.ts"),
+      );
+
+      expect(result).not.toBeNull();
+      expect(result!.code).toContain(
+        '__sb_set_ep("server/apis/GetPastAnalyses/api.ts");',
+      );
+    });
+
+    it("prepends __setEntryPoint for /@fs/ module ids", () => {
+      const { transform } = createPlugin(root);
+      const result = transform(
+        'export default api({ name: "GetFeedback" });',
+        "/@fs/Users/me/app/server/apis/GetFeedback/api.ts",
+      );
+
+      expect(result).not.toBeNull();
+      expect(result!.code).toContain(
+        '__sb_set_ep("server/apis/GetFeedback/api.ts");',
+      );
+    });
+
     it("preserves original code after the prepend", () => {
       const { transform } = createPlugin(root);
       const originalCode = [