fix(better-auth): keep schema-generator import lazy in CJS output (#2658)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: ymc9

packages/auth-adapters/better-auth/src/adapter.ts

@@ -187,7 +187,9 @@ export const zenstackAdapter = <Schema extends SchemaDef>(db: ClientContract<Sch
                 options: config,
 
                 createSchema: async ({ file, tables }) => {
-                    const generateSchema = (await import('./schema-generator')).generateSchema;
+                    // Self-import via package subpath (not a relative './schema-generator') so the
+                    // bundler treats it as external and keeps it lazy in the CJS output — see tsdown.config.ts.
+                    const generateSchema = (await import('@zenstackhq/better-auth/schema-generator')).generateSchema;
                     return generateSchema(file, tables, config, options);
                 },
             };

packages/auth-adapters/better-auth/tsconfig.json

@@ -3,7 +3,10 @@
     "compilerOptions": {
         "rootDir": ".",
         "noPropertyAccessFromIndexSignature": false,
-        "types": ["node"]
+        "types": ["node"],
+        "paths": {
+            "@zenstackhq/better-auth/schema-generator": ["./src/schema-generator.ts"]
+        }
     },
     "include": ["src/**/*"]
 }

packages/auth-adapters/better-auth/tsdown.config.ts

@@ -1,3 +1,18 @@
 import { createConfig } from '@zenstackhq/tsdown-config';
 
-export default createConfig({ entry: { index: 'src/index.ts', 'schema-generator': 'src/schema-generator.ts' } });
+// `index` and `schema-generator` are built as two separate tsdown invocations so that
+// the lazy `await import('@zenstackhq/better-auth/schema-generator')` in the adapter
+// stays lazy in the CJS output. When both entries live in a single build, Rolldown
+// treats them as siblings and injects a top-level `require('./schema-generator.cjs')`
+// into `index.cjs`, which eagerly pulls in `@zenstackhq/language` (Langium) at adapter
+// load time. Splitting the builds hides that relationship; `neverBundle` then keeps
+// the dynamic import as a package-name reference that Node resolves at first call.
+export default [
+    createConfig({
+        entry: { index: 'src/index.ts' },
+        deps: { neverBundle: ['@zenstackhq/better-auth/schema-generator'] },
+    }),
+    createConfig({
+        entry: { 'schema-generator': 'src/schema-generator.ts' },
+    }),
+];