convex-zen 1.9.1 → 1.10.0

package/dist/cli/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/cli/generate.ts"],"names":[],"mappings":"AAqBA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAk3CD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,cAAc,CAAC,CAsRzB"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/cli/generate.ts"],"names":[],"mappings":"AAyBA,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAs2CD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,cAAc,CAAC,CAySzB"}

package/dist/cli/generate.js

@@ -1,6 +1,8 @@
-import { access, mkdir, readFile, readdir, rm, writeFile, } from "node:fs/promises";
+import { access, mkdir, readFile, readdir, rm, stat, writeFile, } from "node:fs/promises";
+import { createRequire } from "node:module";
 import path from "node:path";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { collectPluginGatewayMetadata } from "../component/plugin";
 const GENERATED_MARKER = "// @generated by convex-zen generate. DO NOT EDIT.";
 const RESERVED_CORE_FUNCTION_NAMES = new Set([
     "getSession",
@@ -9,6 +11,7 @@ const RESERVED_CORE_FUNCTION_NAMES = new Set([
     "plugin",
     "core",
 ]);
+const nodeRequire = createRequire(import.meta.url);
 function normalizeContent(content) {
     const trimmed = content.trimEnd();
     return trimmed.endsWith("\n") ? trimmed : `${trimmed}\n`;
@@ -22,6 +25,90 @@ async function fileExists(filePath) {
         return false;
     }
 }
+function splitPackageSpecifier(moduleSpecifier) {
+    if (moduleSpecifier.startsWith("@")) {
+        const [scope, name, ...rest] = moduleSpecifier.split("/");
+        return {
+            packageName: [scope, name].filter(Boolean).join("/"),
+            subpath: rest.join("/"),
+        };
+    }
+    const [name, ...rest] = moduleSpecifier.split("/");
+    return {
+        packageName: name ?? moduleSpecifier,
+        subpath: rest.join("/"),
+    };
+}
+function readExportTarget(exportsField, key) {
+    if (!exportsField || typeof exportsField !== "object") {
+        return null;
+    }
+    const record = exportsField;
+    const entry = record[key];
+    if (!entry) {
+        return null;
+    }
+    if (typeof entry === "string") {
+        return entry;
+    }
+    if (typeof entry === "object" && entry !== null) {
+        const importTarget = entry.import;
+        if (typeof importTarget === "string") {
+            return importTarget;
+        }
+        const defaultTarget = entry.default;
+        if (typeof defaultTarget === "string") {
+            return defaultTarget;
+        }
+        const typesTarget = entry.types;
+        if (typeof typesTarget === "string") {
+            return typesTarget;
+        }
+    }
+    return null;
+}
+async function findWorkspacePackage(authSource, packageName) {
+    const workspaceRoot = (await findWorkspaceRoot(path.dirname(authSource.absolutePath))) ??
+        (await findWorkspaceRoot(path.dirname(fileURLToPath(import.meta.url))));
+    if (!workspaceRoot) {
+        return null;
+    }
+    const packagesDir = path.join(workspaceRoot, "packages");
+    const packageDirs = await readdir(packagesDir).catch(() => []);
+    for (const packageDirName of packageDirs) {
+        const dir = path.join(packagesDir, packageDirName);
+        const packageJsonPath = path.join(dir, "package.json");
+        if (!(await fileExists(packageJsonPath))) {
+            continue;
+        }
+        const packageJson = JSON.parse(await readFile(packageJsonPath, "utf8"));
+        if (packageJson.name !== packageName) {
+            continue;
+        }
+        return {
+            dir,
+            name: packageName,
+            packageJson,
+        };
+    }
+    return null;
+}
+async function resolveWorkspacePackageImport(authSource, moduleSpecifier) {
+    const { packageName, subpath } = splitPackageSpecifier(moduleSpecifier);
+    const workspacePackage = await findWorkspacePackage(authSource, packageName);
+    if (!workspacePackage) {
+        return null;
+    }
+    const exportKey = subpath.length > 0 ? `./${subpath}` : ".";
+    const exportTarget = readExportTarget(workspacePackage.packageJson.exports, exportKey) ??
+        (subpath.length === 0 && typeof workspacePackage.packageJson.main === "string"
+            ? workspacePackage.packageJson.main
+            : null);
+    if (!exportTarget) {
+        return null;
+    }
+    return pathToFileURL(path.resolve(workspacePackage.dir, exportTarget)).href;
+}
 function isGeneratedFile(content) {
     return content.startsWith(GENERATED_MARKER);
 }
@@ -121,19 +208,71 @@ function toGeneratedImportPath(sourceFileAbsolutePath, targetFileAbsolutePath) {
     const normalized = relativeImport.replace(/\\/g, "/").replace(/\.ts$/, "");
     return normalized.startsWith(".") ? normalized : `./${normalized}`;
 }
-async function resolveGeneratedComponentImportPath(authSource, pluginModuleSpecifier, componentImportPath) {
-    if (!componentImportPath.startsWith(".")) {
-        return componentImportPath;
+async function resolveGeneratedComponentImportPath(authSource, pluginModuleSpecifier, pluginDefinition) {
+    if (!pluginModuleSpecifier.startsWith(".") && !path.isAbsolute(pluginModuleSpecifier)) {
+        return `${pluginModuleSpecifier}/convex.config`;
+    }
+    if (pluginModuleSpecifier.startsWith("convex-zen/plugins/")) {
+        return `${pluginModuleSpecifier}/convex.config`;
     }
-    const pluginModulePath = pluginModuleSpecifier.startsWith(".")
-        ? path.resolve(path.dirname(authSource.absolutePath), pluginModuleSpecifier)
-        : null;
+    const pluginModulePath = await resolvePluginModulePath(authSource, pluginModuleSpecifier);
     if (!pluginModulePath) {
-        return componentImportPath;
+        throw new Error(`Could not resolve plugin module path for "${pluginDefinition.id}" from "${pluginModuleSpecifier}".`);
     }
-    const componentAbsolutePath = path.resolve(path.dirname(pluginModulePath), componentImportPath);
+    if (pluginModulePath.includes(`${path.sep}src${path.sep}client${path.sep}plugins${path.sep}`) ||
+        pluginModulePath.includes(`${path.sep}src${path.sep}plugins${path.sep}`)) {
+        return `convex-zen/plugins/${pluginDefinition.id}/convex.config`;
+    }
+    const componentAbsolutePath = path.resolve(path.dirname(pluginModulePath), "convex.config.ts");
     return toGeneratedImportPath(path.join(path.dirname(authSource.absolutePath), "zen", "component", "convex.config.ts"), componentAbsolutePath);
 }
+async function resolveGatewaySourcePath(authSource, pluginModuleSpecifier, pluginDefinition) {
+    if (!pluginModuleSpecifier.startsWith(".") && !path.isAbsolute(pluginModuleSpecifier)) {
+        return `${pluginModuleSpecifier}/gateway`;
+    }
+    if (pluginModuleSpecifier.startsWith("convex-zen/plugins/")) {
+        return `${pluginModuleSpecifier}/gateway`;
+    }
+    const pluginModulePath = await resolvePluginModulePath(authSource, pluginModuleSpecifier);
+    if (!pluginModulePath) {
+        throw new Error(`Could not resolve plugin module path for "${pluginDefinition.id}" from "${pluginModuleSpecifier}".`);
+    }
+    if (pluginModulePath.includes(`${path.sep}src${path.sep}client${path.sep}plugins${path.sep}`) ||
+        pluginModulePath.includes(`${path.sep}src${path.sep}plugins${path.sep}`)) {
+        return `convex-zen/plugins/${pluginDefinition.id}/gateway`;
+    }
+    return path.resolve(path.dirname(pluginModulePath), "gateway.ts");
+}
+async function resolvePluginModulePath(authSource, pluginModuleSpecifier) {
+    if (path.isAbsolute(pluginModuleSpecifier)) {
+        return pluginModuleSpecifier;
+    }
+    if (!pluginModuleSpecifier.startsWith(".")) {
+        if (pluginModuleSpecifier === "convex-zen") {
+            return null;
+        }
+        const moduleSpecifier = await resolveImportSpecifier(authSource, pluginModuleSpecifier);
+        return moduleSpecifier.startsWith("file:")
+            ? fileURLToPath(moduleSpecifier)
+            : null;
+    }
+    const resolved = path.resolve(path.dirname(authSource.absolutePath), pluginModuleSpecifier);
+    if (await fileExists(resolved)) {
+        const resolvedStats = await stat(resolved);
+        if (resolvedStats.isFile()) {
+            return resolved;
+        }
+    }
+    const indexPath = path.join(resolved, "index.ts");
+    if (await fileExists(indexPath)) {
+        return indexPath;
+    }
+    const directTsPath = `${resolved}.ts`;
+    if (await fileExists(directTsPath)) {
+        return directTsPath;
+    }
+    return resolved;
+}
 async function resolveImportSpecifier(authSource, moduleSpecifier) {
     if (moduleSpecifier.startsWith(".")) {
         return pathToFileURL(path.resolve(path.dirname(authSource.absolutePath), moduleSpecifier)).href;
@@ -155,13 +294,25 @@ async function resolveImportSpecifier(authSource, moduleSpecifier) {
                     : subpath === "core/convex.config"
                         ? path.join(workspaceRoot, "packages", "convex-zen", "src", "component", "core", "convex.config.ts")
                         : subpath.startsWith("plugins/") && subpath.endsWith("/convex.config")
-                            ? path.join(workspaceRoot, "packages", "convex-zen", "src", "component", subpath.replace(/\/convex\.config$/, ""), "convex.config.ts")
-                            : path.join(workspaceRoot, "packages", "convex-zen", "src", "client", `${subpath}.ts`);
+                            ? path.join(workspaceRoot, "packages", "convex-zen", "src", "plugins", subpath.replace(/^plugins\//, "").replace(/\/convex\.config$/, ""), "convex.config.ts")
+                            : subpath.startsWith("plugins/") && subpath.endsWith("/gateway")
+                                ? path.join(workspaceRoot, "packages", "convex-zen", "src", "plugins", subpath.replace(/^plugins\//, "").replace(/\/gateway$/, ""), "gateway.ts")
+                                : path.join(workspaceRoot, "packages", "convex-zen", "src", "client", `${subpath}.ts`);
             if (await fileExists(mapped)) {
                 return pathToFileURL(mapped).href;
             }
         }
     }
+    if (!moduleSpecifier.startsWith(".")) {
+        const workspaceImport = await resolveWorkspacePackageImport(authSource, moduleSpecifier);
+        if (workspaceImport) {
+            return workspaceImport;
+        }
+        const resolved = nodeRequire.resolve(moduleSpecifier, {
+            paths: [path.dirname(authSource.absolutePath)],
+        });
+        return pathToFileURL(resolved).href;
+    }
     return moduleSpecifier;
 }
 async function findWorkspaceRoot(startDir) {
@@ -188,10 +339,13 @@ async function loadPluginDefinitions(authSource, authSourceContents) {
             throw new Error(`Could not resolve plugin factory "${factoryId}" from ${authSource.relativePath}.`);
         }
         const definition = await importPluginDefinition(authSource, binding);
+        const gatewayFunctions = collectPluginGatewayMetadata(definition.gateway);
         definitions.push({
             definition,
-            componentImportPath: await resolveGeneratedComponentImportPath(authSource, binding.moduleSpecifier, definition.component.importPath),
-            childName: definition.component.childName ?? definition.id,
+            componentImportPath: await resolveGeneratedComponentImportPath(authSource, binding.moduleSpecifier, definition),
+            gatewaySourcePath: await resolveGatewaySourcePath(authSource, binding.moduleSpecifier, definition),
+            childName: `${definition.id}Component`,
+            gatewayFunctions,
         });
     }
     return definitions;
@@ -575,113 +729,22 @@ export const getUserById = query({
 ${oauthExports}
 `);
 }
-function addInternalActorFieldsToArgsSource(argsSource, options) {
-    const actorFields = [
-        "    actorUserId: v.optional(v.string()),",
-        ...(options?.includeActorEmail === true
-            ? ["    actorEmail: v.optional(v.string()),"]
-            : []),
-    ];
-    if (argsSource.trim() === "{}") {
-        return `{\n${actorFields.join("\n")}\n  }`;
-    }
-    return argsSource.replace("{", `{\n${actorFields.join("\n")}\n`);
+function resolveGatewayImportPathForGeneratedFile(generatedFileAbsolutePath, gatewaySourcePath) {
+    return gatewaySourcePath.startsWith("/")
+        ? toGeneratedImportPath(generatedFileAbsolutePath, gatewaySourcePath)
+        : gatewaySourcePath;
 }
-function renderComponentPluginFacadeFile(options) {
+function renderPluginFacadeFile(options) {
     const pluginName = options.pluginDefinition.id;
-    const publicFunctions = options.pluginDefinition.publicFunctions;
-    if (!publicFunctions) {
-        throw new Error(`Plugin "${pluginName}" is missing public function metadata.`);
-    }
-    const kinds = new Set(Object.values(publicFunctions.functions).map((fn) => fn.kind));
+    const kinds = new Set(Object.values(options.gatewayFunctions).map((fn) => fn.kind));
     const serverImports = [...kinds].sort().join(", ");
-    const needsActorHelper = Object.values(publicFunctions.functions).some((fn) => fn.auth === "actor" || fn.auth === "optionalActor");
-    const preamble = publicFunctions.preambleSource
-        ? `${publicFunctions.preambleSource}\n\n`
-        : "";
-    const actorHelper = needsActorHelper
-        ? `async function requireActorUserId(ctx: { auth: { getUserIdentity: () => Promise<{ subject?: string } | null> } }): Promise<string> {
-  const identity = await ctx.auth.getUserIdentity();
-  const actorUserId = identity?.subject;
-  if (!actorUserId) {
-    throw new Error("Unauthorized: missing identity subject");
-  }
-  return actorUserId;
-}
-
-`
-        : "";
-    const actorEmailMethods = pluginName === "organization"
-        ? new Set([
-            "listIncomingInvitations",
-            "acceptInvitation",
-            "acceptIncomingInvitation",
-            "declineIncomingInvitation",
-        ])
-        : new Set();
-    const actorEmailHelper = actorEmailMethods.size > 0
-        ? `async function resolveActorEmail(ctx: unknown): Promise<string | undefined> {
-  const actor = await auth.user.safeGet(ctx as { runQuery(fn: unknown, args: Record<string, unknown>): Promise<unknown> });
-  return actor?.email;
-}
-
-`
-        : "";
-    const functionSource = Object.entries(publicFunctions.functions)
+    const functionSource = Object.entries(options.gatewayFunctions)
         .map(([functionName, fn]) => {
-        const runtimeAccess = `auth.plugins.${pluginName}`;
-        const kindFactory = fn.kind;
-        const argsSource = fn.auth === "actor" || fn.auth === "optionalActor"
-            ? addInternalActorFieldsToArgsSource(fn.argsSource, {
-                includeActorEmail: actorEmailMethods.has(functionName),
-            })
-            : fn.argsSource;
-        if (fn.auth === "public") {
-            return `export const ${functionName} = ${kindFactory}({
-  args: ${argsSource},
-  handler: async (ctx, args) => {
-    return ${runtimeAccess}.${fn.runtimeMethod}(ctx, args as any);
-  },
-});`;
-        }
-        if (fn.auth === "optionalActor") {
-            const optionalActorEmail = actorEmailMethods.has(functionName)
-                ? `    const actorEmail = await resolveActorEmail(ctx);\n`
-                : "";
-            const optionalActorEmailSpread = actorEmailMethods.has(functionName)
-                ? `      ...(actorEmail ? { actorEmail } : {}),\n`
-                : "";
-            return `export const ${functionName} = ${kindFactory}({
-  args: ${argsSource},
-  handler: async (ctx, args) => {
-    const identity = await ctx.auth.getUserIdentity();
-    const actorUserId = identity?.subject;
-    if (!actorUserId) {
-      return false;
-    }
-${optionalActorEmail}    const { actorUserId: _ignoredActorUserId, ...inputArgs } = args as Record<string, unknown>;
-    return ${runtimeAccess}.${fn.runtimeMethod}(ctx, {
-      ...inputArgs,
-      actorUserId,
-${optionalActorEmailSpread}    } as any);
-  },
-});`;
-        }
-        const actorEmailResolution = actorEmailMethods.has(functionName)
-            ? `    const actorEmail = await resolveActorEmail(ctx);\n`
-            : "";
-        const actorEmailSpread = actorEmailMethods.has(functionName)
-            ? `      ...(actorEmail ? { actorEmail } : {}),\n`
-            : "";
-        return `export const ${functionName} = ${kindFactory}({
-  args: ${argsSource},
+        const runtimeAccess = `auth.plugins.${pluginName}.${functionName}`;
+        return `export const ${functionName} = ${fn.kind}({
+  args: getPublicPluginFunctionArgs(pluginGateway.${functionName}, ${JSON.stringify(functionName)}),
   handler: async (ctx, args) => {
-    const actorUserId = await requireActorUserId(ctx);
-${actorEmailResolution}    const { actorUserId: _ignoredActorUserId, ...inputArgs } = args as Record<string, unknown>;
-    return ${runtimeAccess}.${fn.runtimeMethod}(ctx, {
-      ...inputArgs,
-      actorUserId,
-${actorEmailSpread}    } as any);
+    return ${runtimeAccess}(ctx, args);
   },
 });`;
     })
@@ -691,11 +754,12 @@ ${actorEmailSpread}    } as any);
         ? `import { auth } from ${JSON.stringify(options.runtimeImportPath)};`
         : `import { ${runtimeImportName} as auth } from ${JSON.stringify(options.runtimeImportPath)};`;
     return normalizeContent(`${GENERATED_MARKER}
-import { v } from "convex/values";
 import { ${serverImports} } from ${JSON.stringify(options.serverImportPath)};
+import { getPublicPluginFunctionArgs } from "convex-zen/component";
+import * as pluginGateway from ${JSON.stringify(options.gatewayImportPath)};
 ${runtimeImport}
 
-${actorHelper}${actorEmailHelper}${preamble}${functionSource}
+${functionSource}
 `);
 }
 function renderCoreFile(options) {
@@ -881,117 +945,6 @@ export const currentUser = query({
 ${oauthExports}
 `);
 }
-function renderPluginFile(options) {
-    const pluginName = options.pluginDefinition.id;
-    const publicFunctions = options.pluginDefinition.publicFunctions;
-    if (!publicFunctions) {
-        throw new Error(`Plugin "${pluginName}" is missing public function metadata.`);
-    }
-    const kinds = new Set(Object.values(publicFunctions.functions).map((fn) => fn.kind));
-    const serverImports = [...kinds].sort().join(", ");
-    const needsActorHelper = Object.values(publicFunctions.functions).some((fn) => fn.auth === "actor" || fn.auth === "optionalActor");
-    const preamble = publicFunctions.preambleSource
-        ? `${publicFunctions.preambleSource}\n\n`
-        : "";
-    const actorHelper = needsActorHelper
-        ? `async function requireActorUserId(ctx: { auth: { getUserIdentity: () => Promise<{ subject?: string } | null> } }): Promise<string> {
-  const identity = await ctx.auth.getUserIdentity();
-  const actorUserId = identity?.subject;
-  if (!actorUserId) {
-    throw new Error("Unauthorized: missing identity subject");
-  }
-  return actorUserId;
-}
-
-`
-        : "";
-    const actorEmailMethods = pluginName === "organization"
-        ? new Set([
-            "listIncomingInvitations",
-            "acceptInvitation",
-            "acceptIncomingInvitation",
-            "declineIncomingInvitation",
-        ])
-        : new Set();
-    const actorEmailHelper = actorEmailMethods.size > 0
-        ? `async function resolveActorEmail(ctx: unknown): Promise<string | undefined> {
-  const actor = await auth.user.safeGet(ctx as { runQuery(fn: unknown, args: Record<string, unknown>): Promise<unknown> });
-  return actor?.email;
-}
-
-`
-        : "";
-    const functionSource = Object.entries(publicFunctions.functions)
-        .map(([functionName, fn]) => {
-        const runtimeAccess = `auth.plugins.${pluginName}`;
-        const kindFactory = fn.kind;
-        const argsSource = fn.auth === "actor" || fn.auth === "optionalActor"
-            ? addInternalActorFieldsToArgsSource(fn.argsSource, {
-                includeActorEmail: actorEmailMethods.has(functionName),
-            })
-            : fn.argsSource;
-        if (fn.auth === "public") {
-            return `export const ${functionName} = ${kindFactory}({
-  args: ${argsSource},
-  handler: async (ctx, args) => {
-    return ${runtimeAccess}.${fn.runtimeMethod}(ctx, args as any);
-  },
-});`;
-        }
-        if (fn.auth === "optionalActor") {
-            const optionalActorEmail = actorEmailMethods.has(functionName)
-                ? `
-    const actorEmail = await resolveActorEmail(ctx);`
-                : "";
-            const optionalActorEmailSpread = actorEmailMethods.has(functionName)
-                ? `
-      ...(actorEmail ? { actorEmail } : {}),`
-                : "";
-            return `export const ${functionName} = ${kindFactory}({
-  args: ${argsSource},
-  handler: async (ctx, args) => {
-    const identity = await ctx.auth.getUserIdentity();
-    const actorUserId = identity?.subject;
-    if (!actorUserId) {
-      return false;
-    }
-    ${optionalActorEmail}
-    const { actorUserId: _ignoredActorUserId, ...inputArgs } = args as Record<string, unknown>;
-    return ${runtimeAccess}.${fn.runtimeMethod}(ctx, {
-      ...inputArgs,
-      actorUserId,
-      ${optionalActorEmailSpread}
-    } as any);
-  },
-});`;
-        }
-        const actorEmailResolution = actorEmailMethods.has(functionName)
-            ? `    const actorEmail = await resolveActorEmail(ctx);\n`
-            : "";
-        const actorEmailSpread = actorEmailMethods.has(functionName)
-            ? `      ...(actorEmail ? { actorEmail } : {}),\n`
-            : "";
-        return `export const ${functionName} = ${kindFactory}({
-  args: ${argsSource},
-  handler: async (ctx, args) => {
-    const actorUserId = await requireActorUserId(ctx);
-${actorEmailResolution}    const { actorUserId: _ignoredActorUserId, ...inputArgs } = args as Record<string, unknown>;
-    return ${runtimeAccess}.${fn.runtimeMethod}(ctx, {
-      ...inputArgs,
-      actorUserId,
-${actorEmailSpread}    } as any);
-  },
-});`;
-    })
-        .join("\n\n");
-    return normalizeContent(`${GENERATED_MARKER}
-import { v } from "convex/values";
-import { ${serverImports} } from "../../_generated/server";
-import { auth } from "../_generated/auth";
-
-${actorHelper}${actorEmailHelper}${preamble}${functionSource}
-`);
-}
 function parseFunctionKinds(source) {
     const result = {};
     const pattern = /export\s+const\s+([A-Za-z0-9_]+)\s*=\s*(query|mutation|action)\s*\(/g;
@@ -1244,24 +1197,30 @@ export async function generateAuthFunctions(options) {
     const generatedPluginSources = new Map();
     const coreMeta = parseFunctionKinds(coreContent);
     for (const pluginDefinition of pluginDefinitions) {
-        const pluginContent = renderComponentPluginFacadeFile({
+        const pluginAbsolutePath = path.join(pluginDir, `${pluginDefinition.definition.id}.ts`);
+        const pluginContent = renderPluginFacadeFile({
             pluginDefinition: pluginDefinition.definition,
+            gatewayFunctions: pluginDefinition.gatewayFunctions,
+            gatewayImportPath: resolveGatewayImportPathForGeneratedFile(pluginAbsolutePath, pluginDefinition.gatewaySourcePath),
             serverImportPath: "../../_generated/server",
             runtimeImportPath: "../_generated/auth",
         });
         filesToGenerate.push({
-            absolutePath: path.join(pluginDir, `${pluginDefinition.definition.id}.ts`),
+            absolutePath: pluginAbsolutePath,
             relativePath: path.join("convex", "zen", "plugin", `${pluginDefinition.definition.id}.ts`),
             content: pluginContent,
         });
         generatedPluginSources.set(pluginDefinition.definition.id, pluginContent);
-        const zenPluginContent = renderComponentPluginFacadeFile({
+        const componentGatewayAbsolutePath = path.join(componentDir, pluginDefinition.definition.id, "gateway.ts");
+        const zenPluginContent = renderPluginFacadeFile({
             pluginDefinition: pluginDefinition.definition,
+            gatewayFunctions: pluginDefinition.gatewayFunctions,
+            gatewayImportPath: resolveGatewayImportPathForGeneratedFile(componentGatewayAbsolutePath, pluginDefinition.gatewaySourcePath),
             serverImportPath: "../_generated/server",
             runtimeImportPath: "../_runtime",
         });
         filesToGenerate.push({
-            absolutePath: path.join(componentDir, pluginDefinition.definition.id, "gateway.ts"),
+            absolutePath: componentGatewayAbsolutePath,
             relativePath: path.join("convex", "zen", "component", pluginDefinition.definition.id, "gateway.ts"),
             content: zenPluginContent,
         });
@@ -1271,10 +1230,10 @@ export async function generateAuthFunctions(options) {
     }
     await deleteGeneratedFileIfExists(path.join(zenDir, "admin.ts"), path.join("convex", "zen", "admin.ts"), options, result);
     const pluginMeta = {};
-    for (const [pluginName, source] of generatedPluginSources) {
-        const kinds = parseFunctionKinds(source);
+    for (const pluginDefinition of pluginDefinitions) {
+        const kinds = Object.fromEntries(Object.entries(pluginDefinition.gatewayFunctions).map(([functionName, metadata]) => [functionName, metadata.kind]));
         if (Object.keys(kinds).length > 0) {
-            pluginMeta[pluginName] = kinds;
+            pluginMeta[pluginDefinition.definition.id] = kinds;
         }
     }
     if (await fileExists(pluginDir)) {