@confect/cli 9.0.0-next.3 → 9.0.0-next.5

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @confect/cli
 
+## 9.0.0-next.5
+
+### Patch Changes
+
+- 4cebebc: Switch the codegen bundler to [`bundle-require`](https://github.com/egoist/bundle-require).
+
+  ### Why
+
+  `9.0.0-next.4`'s `absoluteExternalsPlugin` externalized every bare-specifier import and rewrote it to a `file://` URL because the bundle was loaded via a parent-less `data:` URL. esbuild's resolver honors `tsconfig.json#compilerOptions.paths`, so a `~/src/foo`-style alias resolved to a local `.ts` file and got externalized as `file:///…/foo.ts` — which Node ESM cannot import (`ERR_UNKNOWN_FILE_EXTENSION`). The codegen bundler hand-rolled a third reimplementation of "load a TypeScript config file at runtime"; each iteration introduced a new bug.
+
+  ### What changed
+  - `@confect/cli/Bundler` now delegates to `bundle-require`, the library `tsup`, `unbuild`, `vite`, `vitest`, and `vuepress` use for this exact problem. `bundle-require` writes a temp `.mjs` next to the source, `import()`s it, and deletes it — so bare-specifier externals (third-party packages, workspace deps) resolve through Node's normal `node_modules` walk and tsconfig `paths` aliases stay inside the bundle.
+  - `@confect/cli/confect/dev`'s watcher swaps `absoluteExternalsPlugin` for `bundle-require`'s `externalPlugin`, fed the project's `tsconfig.json#paths` via `loadTsConfig` so dev-mode rebuilds also bundle aliased local source instead of erroring on it.
+  - The `absoluteExternalsPlugin` export is removed from `@confect/cli/Bundler`.
+
+  ### Fixes
+  - Restores `confect codegen` for any project that uses `tsconfig.json` `paths` aliases (e.g. `~/*`, `@/*`, `@app/*`) for its own source.
+  - As a side benefit, `__dirname`, `__filename`, and `import.meta.url` inside bundled impls now resolve to the original source path instead of the temporary bundle URL (`bundle-require`'s built-in injection).
+  - @confect/core@9.0.0-next.5
+  - @confect/server@9.0.0-next.5
+
+## 9.0.0-next.4
+
+### Patch Changes
+
+- 46e17f7: Externalize every bare-specifier dependency during codegen bundling instead of inlining third-party packages.
+
+  ### Why
+
+  Since `9.0.0-next.0`, codegen bundles each `*.impl.ts` with esbuild so it can load the default-exported `Layer` and read the snapshotted function names from a `Finalized` `GroupImpl`. The bundler only marked `@confect/core`, `@confect/server`, `effect`, and `@effect/*` as external — every other dependency, including all of `node_modules` and every `node:*` built-in reached through inlined CJS source, was bundled into the output. With `format: "esm"`, esbuild rewrites any CJS `require(...)` in that inlined source to a runtime shim that throws `Dynamic require of "<id>" is not supported`, so any impl importing a third-party package (`sharp`, `luxon`, `@clerk/backend`, `jsonwebtoken`, `openai`, etc.) failed during `validateImpl`.
+
+  ### What changed
+  - `@confect/cli/Bundler`'s `absoluteExternalsPlugin` now externalizes every bare specifier (anything not starting with `./`, `../`, or `/`), resolving each to an absolute file URL via the user's `node_modules`. `node:*` built-ins pass through unchanged.
+  - The `EXTERNAL_PACKAGES` allow-list is removed; relative imports continue to be bundled so the user's own source is still transpiled together.
+  - `@confect/cli/confect/dev` drops the redundant `external: EXTERNAL_PACKAGES` esbuild option — the plugin handles externalization for both codegen and dev-mode watchers.
+
+  ### Fixes
+
+  This restores `confect codegen` for impls that import any non-`@confect/*` / `effect` / `@effect/*` library, fixing the regression introduced in `9.0.0-next.0`.
+  - @confect/core@9.0.0-next.4
+  - @confect/server@9.0.0-next.4
+
 ## 9.0.0-next.3
 
 ### Patch Changes

package/dist/Bundler.mjs

@@ -1,69 +1,79 @@
 import { BundlerError } from "./BuildError.mjs";
-import { createRequire } from "node:module";
 import { Array, Effect, Option, pipe } from "effect";
 import { Path } from "@effect/platform";
-import * as esbuild from "esbuild";
-import { pathToFileURL } from "node:url";
+import { dirname, isAbsolute, resolve } from "node:path";
+import { bundleRequire } from "bundle-require";
 
 //#region src/Bundler.ts
-const EXTERNAL_PACKAGES = [
-	"@confect/core",
-	"@confect/server",
-	"effect",
-	"@effect/*"
-];
-const isExternalImport = (path) => EXTERNAL_PACKAGES.some((p) => {
-	if (p.endsWith("/*")) return path.startsWith(p.slice(0, -1));
-	return path === p || path.startsWith(p + "/");
-});
-const absoluteExternalsPlugin = {
-	name: "absolute-externals",
-	setup(build) {
-		build.onResolve({ filter: /.*/ }, async (args) => {
-			if (args.kind !== "import-statement" && args.kind !== "dynamic-import") return;
-			if (!isExternalImport(args.path)) return;
-			const parentFile = pathToFileURL(args.resolveDir + "/_").href;
-			return {
-				path: pathToFileURL(createRequire(parentFile).resolve(args.path)).href,
-				external: true
-			};
-		});
-	}
-};
-const buildEntry = (entryPoint) => Effect.tryPromise({
-	try: () => esbuild.build({
-		entryPoints: [entryPoint],
-		bundle: true,
-		write: false,
-		platform: "node",
-		format: "esm",
-		logLevel: "silent",
-		metafile: true,
-		plugins: [absoluteExternalsPlugin]
-	}),
-	catch: (cause) => new BundlerError({ cause })
-});
-const importBundledModule = (result) => {
-	const code = result.outputFiles[0].text;
-	return import("data:text/javascript;base64," + Buffer.from(code).toString("base64"));
+/**
+* `bundle-require` sets `absWorkingDir: cwd` on the underlying esbuild build,
+* so the metafile's input keys (and each input's `imports[].path`) are stored
+* relative to that cwd. Callers reach for the metafile with absolute paths
+* (e.g. {@link directlyImports}), so we normalize every key/import path to
+* absolute up front. That way the lookup logic stays oblivious to whatever
+* cwd was used during bundling.
+*/
+const absolutizeMetafile = (metafile, cwd) => {
+	const absolutize = (p) => isAbsolute(p) ? p : resolve(cwd, p);
+	const inputs = {};
+	for (const [key, value] of Object.entries(metafile.inputs)) inputs[absolutize(key)] = {
+		...value,
+		imports: value.imports.map((i) => ({
+			...i,
+			path: absolutize(i.path)
+		}))
+	};
+	const outputs = {};
+	for (const [key, value] of Object.entries(metafile.outputs)) outputs[absolutize(key)] = value;
+	return {
+		inputs,
+		outputs
+	};
 };
 /**
-* Bundle a TypeScript entry point with esbuild and import the result via a
-* data URL. This handles extensionless `.ts` imports regardless of whether
-* the user's project sets `"type": "module"` in package.json. The returned
-* pair carries both the imported module and the esbuild metafile so callers
-* can inspect the import graph (see {@link directlyImports}).
+* Bundle a TypeScript entry point with esbuild via {@link bundleRequire} and
+* import the result. `bundle-require` writes a temp `.mjs` next to the source,
+* `import()`s it, and deletes it — so bare-specifier externals (third-party
+* packages, workspace deps) resolve through the user's normal `node_modules`
+* walk, and tsconfig `paths` aliases stay inside the bundle.
+*
+* `cwd` is set to the entry's directory so `bundle-require`'s `tsconfig.json`
+* discovery (which walks upward from `cwd`) lands on the project's tsconfig
+* regardless of where `confect codegen` was invoked from, and so esbuild
+* resolves relative imports against the entry's location.
+*
+* The returned pair carries both the imported module and the esbuild metafile
+* so callers can inspect the import graph (see {@link directlyImports}); the
+* metafile is captured via a small `onEnd` plugin because `bundle-require`
+* itself only exposes a flat `dependencies: string[]`.
 */
 const bundle = (entryPoint) => Effect.gen(function* () {
-	const result = yield* buildEntry(entryPoint);
-	const module = yield* Effect.tryPromise({
-		try: () => importBundledModule(result),
+	let metafile;
+	const captureMetafile = {
+		name: "confect:capture-metafile",
+		setup(build) {
+			build.onEnd((result) => {
+				metafile = result.metafile;
+			});
+		}
+	};
+	const cwd = dirname(entryPoint);
+	const result = yield* Effect.tryPromise({
+		try: () => bundleRequire({
+			filepath: entryPoint,
+			cwd,
+			format: "esm",
+			esbuildOptions: {
+				plugins: [captureMetafile],
+				logLevel: "silent"
+			}
+		}),
 		catch: (cause) => new BundlerError({ cause })
 	});
-	if (!result.metafile) return yield* Effect.dieMessage("esbuild metafile missing");
+	if (!metafile) return yield* Effect.dieMessage("esbuild metafile missing");
 	return {
-		module,
-		metafile: result.metafile
+		module: result.mod,
+		metafile: absolutizeMetafile(metafile, cwd)
 	};
 });
 const findMetafileInputKey = (metafile, absolutePath) => Effect.gen(function* () {
@@ -87,5 +97,5 @@ const directlyImports = (bundled, sourceAbsolutePath, targetAbsolutePath) => Eff
 });
 
 //#endregion
-export { EXTERNAL_PACKAGES, absoluteExternalsPlugin, bundle, directlyImports };
+export { bundle, directlyImports };
 //# sourceMappingURL=Bundler.mjs.map

package/dist/Bundler.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Bundler.mjs","names":[],"sources":["../src/Bundler.ts"],"sourcesContent":["import { createRequire } from \"node:module\";\nimport { pathToFileURL } from \"node:url\";\nimport { Path } from \"@effect/platform\";\nimport { Array, Effect, Option, pipe } from \"effect\";\nimport * as esbuild from \"esbuild\";\nimport { BundlerError } from \"./BuildError\";\n\nexport interface Bundled {\n  readonly module: any;\n  readonly metafile: esbuild.Metafile;\n}\n\nexport const EXTERNAL_PACKAGES = [\n  \"@confect/core\",\n  \"@confect/server\",\n  \"effect\",\n  \"@effect/*\",\n];\n\nconst isExternalImport = (path: string) =>\n  EXTERNAL_PACKAGES.some((p) => {\n    if (p.endsWith(\"/*\")) {\n      return path.startsWith(p.slice(0, -1));\n    }\n    return path === p || path.startsWith(p + \"/\");\n  });\n\nexport const absoluteExternalsPlugin: esbuild.Plugin = {\n  name: \"absolute-externals\",\n  setup(build) {\n    build.onResolve({ filter: /.*/ }, async (args) => {\n      if (args.kind !== \"import-statement\" && args.kind !== \"dynamic-import\")\n        return;\n      if (!isExternalImport(args.path)) return;\n      // `import.meta.resolve`'s second argument is silently ignored in modern\n      // Node, so resolution would always walk up from the CLI's bundled file\n      // (`packages/cli/dist/utils.mjs`) instead of from the user's project.\n      // Use `createRequire` keyed on the importing file's directory so we\n      // resolve out of *their* `node_modules`. The synthetic filename is just\n      // a CommonJS resolution anchor; the file does not need to exist.\n      const parentFile = pathToFileURL(args.resolveDir + \"/_\").href;\n      const require_ = createRequire(parentFile);\n      const resolvedPath = require_.resolve(args.path);\n      const resolved = pathToFileURL(resolvedPath).href;\n      return { path: resolved, external: true };\n    });\n  },\n};\n\nconst buildEntry = (entryPoint: string) =>\n  Effect.tryPromise({\n    try: () =>\n      esbuild.build({\n        entryPoints: [entryPoint],\n        bundle: true,\n        write: false,\n        platform: \"node\",\n        format: \"esm\",\n        logLevel: \"silent\",\n        metafile: true,\n        plugins: [absoluteExternalsPlugin],\n      }),\n    catch: (cause) => new BundlerError({ cause }),\n  });\n\nconst importBundledModule = (result: esbuild.BuildResult) => {\n  const code = result.outputFiles![0]!.text;\n  const dataUrl =\n    \"data:text/javascript;base64,\" + Buffer.from(code).toString(\"base64\");\n  return import(dataUrl);\n};\n\n/**\n * Bundle a TypeScript entry point with esbuild and import the result via a\n * data URL. This handles extensionless `.ts` imports regardless of whether\n * the user's project sets `\"type\": \"module\"` in package.json. The returned\n * pair carries both the imported module and the esbuild metafile so callers\n * can inspect the import graph (see {@link directlyImports}).\n */\nexport const bundle = (\n  entryPoint: string,\n): Effect.Effect<Bundled, BundlerError> =>\n  Effect.gen(function* () {\n    const result = yield* buildEntry(entryPoint);\n    const module = yield* Effect.tryPromise({\n      try: () => importBundledModule(result),\n      catch: (cause) => new BundlerError({ cause }),\n    });\n    if (!result.metafile) {\n      return yield* Effect.dieMessage(\"esbuild metafile missing\");\n    }\n    return { module, metafile: result.metafile };\n  });\n\nconst findMetafileInputKey = (\n  metafile: esbuild.Metafile,\n  absolutePath: string,\n) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const resolved = path.resolve(absolutePath);\n    return Array.findFirst(\n      Object.keys(metafile.inputs),\n      (key) => path.resolve(key) === resolved,\n    );\n  });\n\n/**\n * Returns `true` when the module bundled from `sourceAbsolutePath` declares a\n * direct import of `targetAbsolutePath` (according to the bundle's esbuild\n * metafile). Returns `false` if either path is missing from the metafile.\n */\nexport const directlyImports = (\n  bundled: Bundled,\n  sourceAbsolutePath: string,\n  targetAbsolutePath: string,\n) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const sourceKey = yield* findMetafileInputKey(\n      bundled.metafile,\n      sourceAbsolutePath,\n    );\n    const targetKey = yield* findMetafileInputKey(\n      bundled.metafile,\n      targetAbsolutePath,\n    );\n\n    return pipe(\n      Option.all([sourceKey, targetKey]),\n      Option.flatMap(([sourceKey_, targetKey_]) =>\n        Option.fromNullable(bundled.metafile.inputs[sourceKey_]).pipe(\n          Option.map((sourceInput) => {\n            const targetResolved = path.resolve(targetKey_);\n            return sourceInput.imports.some(\n              (importedFile) =>\n                path.resolve(importedFile.path) === targetResolved,\n            );\n          }),\n        ),\n      ),\n      Option.getOrElse(() => false),\n    );\n  });\n"],"mappings":";;;;;;;;AAYA,MAAa,oBAAoB;CAC/B;CACA;CACA;CACA;CACD;AAED,MAAM,oBAAoB,SACxB,kBAAkB,MAAM,MAAM;AAC5B,KAAI,EAAE,SAAS,KAAK,CAClB,QAAO,KAAK,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;AAExC,QAAO,SAAS,KAAK,KAAK,WAAW,IAAI,IAAI;EAC7C;AAEJ,MAAa,0BAA0C;CACrD,MAAM;CACN,MAAM,OAAO;AACX,QAAM,UAAU,EAAE,QAAQ,MAAM,EAAE,OAAO,SAAS;AAChD,OAAI,KAAK,SAAS,sBAAsB,KAAK,SAAS,iBACpD;AACF,OAAI,CAAC,iBAAiB,KAAK,KAAK,CAAE;GAOlC,MAAM,aAAa,cAAc,KAAK,aAAa,KAAK,CAAC;AAIzD,UAAO;IAAE,MADQ,cAFA,cAAc,WAAW,CACZ,QAAQ,KAAK,KAAK,CACJ,CAAC;IACpB,UAAU;IAAM;IACzC;;CAEL;AAED,MAAM,cAAc,eAClB,OAAO,WAAW;CAChB,WACE,QAAQ,MAAM;EACZ,aAAa,CAAC,WAAW;EACzB,QAAQ;EACR,OAAO;EACP,UAAU;EACV,QAAQ;EACR,UAAU;EACV,UAAU;EACV,SAAS,CAAC,wBAAwB;EACnC,CAAC;CACJ,QAAQ,UAAU,IAAI,aAAa,EAAE,OAAO,CAAC;CAC9C,CAAC;AAEJ,MAAM,uBAAuB,WAAgC;CAC3D,MAAM,OAAO,OAAO,YAAa,GAAI;AAGrC,QAAO,OADL,iCAAiC,OAAO,KAAK,KAAK,CAAC,SAAS,SAAS;;;;;;;;;AAWzE,MAAa,UACX,eAEA,OAAO,IAAI,aAAa;CACtB,MAAM,SAAS,OAAO,WAAW,WAAW;CAC5C,MAAM,SAAS,OAAO,OAAO,WAAW;EACtC,WAAW,oBAAoB,OAAO;EACtC,QAAQ,UAAU,IAAI,aAAa,EAAE,OAAO,CAAC;EAC9C,CAAC;AACF,KAAI,CAAC,OAAO,SACV,QAAO,OAAO,OAAO,WAAW,2BAA2B;AAE7D,QAAO;EAAE;EAAQ,UAAU,OAAO;EAAU;EAC5C;AAEJ,MAAM,wBACJ,UACA,iBAEA,OAAO,IAAI,aAAa;CACtB,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,WAAW,KAAK,QAAQ,aAAa;AAC3C,QAAO,MAAM,UACX,OAAO,KAAK,SAAS,OAAO,GAC3B,QAAQ,KAAK,QAAQ,IAAI,KAAK,SAChC;EACD;;;;;;AAOJ,MAAa,mBACX,SACA,oBACA,uBAEA,OAAO,IAAI,aAAa;CACtB,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,YAAY,OAAO,qBACvB,QAAQ,UACR,mBACD;CACD,MAAM,YAAY,OAAO,qBACvB,QAAQ,UACR,mBACD;AAED,QAAO,KACL,OAAO,IAAI,CAAC,WAAW,UAAU,CAAC,EAClC,OAAO,SAAS,CAAC,YAAY,gBAC3B,OAAO,aAAa,QAAQ,SAAS,OAAO,YAAY,CAAC,KACvD,OAAO,KAAK,gBAAgB;EAC1B,MAAM,iBAAiB,KAAK,QAAQ,WAAW;AAC/C,SAAO,YAAY,QAAQ,MACxB,iBACC,KAAK,QAAQ,aAAa,KAAK,KAAK,eACvC;GACD,CACH,CACF,EACD,OAAO,gBAAgB,MAAM,CAC9B;EACD"}
+{"version":3,"file":"Bundler.mjs","names":[],"sources":["../src/Bundler.ts"],"sourcesContent":["import { dirname, isAbsolute, resolve } from \"node:path\";\nimport { Path } from \"@effect/platform\";\nimport { bundleRequire } from \"bundle-require\";\nimport { Array, Effect, Option, pipe } from \"effect\";\nimport type * as esbuild from \"esbuild\";\nimport { BundlerError } from \"./BuildError\";\n\nexport interface Bundled {\n  readonly module: any;\n  readonly metafile: esbuild.Metafile;\n}\n\n/**\n * `bundle-require` sets `absWorkingDir: cwd` on the underlying esbuild build,\n * so the metafile's input keys (and each input's `imports[].path`) are stored\n * relative to that cwd. Callers reach for the metafile with absolute paths\n * (e.g. {@link directlyImports}), so we normalize every key/import path to\n * absolute up front. That way the lookup logic stays oblivious to whatever\n * cwd was used during bundling.\n */\nconst absolutizeMetafile = (\n  metafile: esbuild.Metafile,\n  cwd: string,\n): esbuild.Metafile => {\n  const absolutize = (p: string) => (isAbsolute(p) ? p : resolve(cwd, p));\n  const inputs: esbuild.Metafile[\"inputs\"] = {};\n  for (const [key, value] of Object.entries(metafile.inputs)) {\n    inputs[absolutize(key)] = {\n      ...value,\n      imports: value.imports.map((i) => ({ ...i, path: absolutize(i.path) })),\n    };\n  }\n  const outputs: esbuild.Metafile[\"outputs\"] = {};\n  for (const [key, value] of Object.entries(metafile.outputs)) {\n    outputs[absolutize(key)] = value;\n  }\n  return { inputs, outputs };\n};\n\n/**\n * Bundle a TypeScript entry point with esbuild via {@link bundleRequire} and\n * import the result. `bundle-require` writes a temp `.mjs` next to the source,\n * `import()`s it, and deletes it — so bare-specifier externals (third-party\n * packages, workspace deps) resolve through the user's normal `node_modules`\n * walk, and tsconfig `paths` aliases stay inside the bundle.\n *\n * `cwd` is set to the entry's directory so `bundle-require`'s `tsconfig.json`\n * discovery (which walks upward from `cwd`) lands on the project's tsconfig\n * regardless of where `confect codegen` was invoked from, and so esbuild\n * resolves relative imports against the entry's location.\n *\n * The returned pair carries both the imported module and the esbuild metafile\n * so callers can inspect the import graph (see {@link directlyImports}); the\n * metafile is captured via a small `onEnd` plugin because `bundle-require`\n * itself only exposes a flat `dependencies: string[]`.\n */\nexport const bundle = (\n  entryPoint: string,\n): Effect.Effect<Bundled, BundlerError> =>\n  Effect.gen(function* () {\n    let metafile: esbuild.Metafile | undefined;\n    const captureMetafile: esbuild.Plugin = {\n      name: \"confect:capture-metafile\",\n      setup(build) {\n        build.onEnd((result) => {\n          metafile = result.metafile;\n        });\n      },\n    };\n\n    const cwd = dirname(entryPoint);\n    const result = yield* Effect.tryPromise({\n      try: () =>\n        bundleRequire({\n          filepath: entryPoint,\n          cwd,\n          format: \"esm\",\n          esbuildOptions: {\n            plugins: [captureMetafile],\n            logLevel: \"silent\",\n          },\n        }),\n      catch: (cause) => new BundlerError({ cause }),\n    });\n\n    if (!metafile) {\n      return yield* Effect.dieMessage(\"esbuild metafile missing\");\n    }\n\n    return { module: result.mod, metafile: absolutizeMetafile(metafile, cwd) };\n  });\n\nconst findMetafileInputKey = (\n  metafile: esbuild.Metafile,\n  absolutePath: string,\n) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const resolved = path.resolve(absolutePath);\n    return Array.findFirst(\n      Object.keys(metafile.inputs),\n      (key) => path.resolve(key) === resolved,\n    );\n  });\n\n/**\n * Returns `true` when the module bundled from `sourceAbsolutePath` declares a\n * direct import of `targetAbsolutePath` (according to the bundle's esbuild\n * metafile). Returns `false` if either path is missing from the metafile.\n */\nexport const directlyImports = (\n  bundled: Bundled,\n  sourceAbsolutePath: string,\n  targetAbsolutePath: string,\n) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const sourceKey = yield* findMetafileInputKey(\n      bundled.metafile,\n      sourceAbsolutePath,\n    );\n    const targetKey = yield* findMetafileInputKey(\n      bundled.metafile,\n      targetAbsolutePath,\n    );\n\n    return pipe(\n      Option.all([sourceKey, targetKey]),\n      Option.flatMap(([sourceKey_, targetKey_]) =>\n        Option.fromNullable(bundled.metafile.inputs[sourceKey_]).pipe(\n          Option.map((sourceInput) => {\n            const targetResolved = path.resolve(targetKey_);\n            return sourceInput.imports.some(\n              (importedFile) =>\n                path.resolve(importedFile.path) === targetResolved,\n            );\n          }),\n        ),\n      ),\n      Option.getOrElse(() => false),\n    );\n  });\n"],"mappings":";;;;;;;;;;;;;;;AAoBA,MAAM,sBACJ,UACA,QACqB;CACrB,MAAM,cAAc,MAAe,WAAW,EAAE,GAAG,IAAI,QAAQ,KAAK,EAAE;CACtE,MAAM,SAAqC,EAAE;AAC7C,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,SAAS,OAAO,CACxD,QAAO,WAAW,IAAI,IAAI;EACxB,GAAG;EACH,SAAS,MAAM,QAAQ,KAAK,OAAO;GAAE,GAAG;GAAG,MAAM,WAAW,EAAE,KAAK;GAAE,EAAE;EACxE;CAEH,MAAM,UAAuC,EAAE;AAC/C,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,SAAS,QAAQ,CACzD,SAAQ,WAAW,IAAI,IAAI;AAE7B,QAAO;EAAE;EAAQ;EAAS;;;;;;;;;;;;;;;;;;;AAoB5B,MAAa,UACX,eAEA,OAAO,IAAI,aAAa;CACtB,IAAI;CACJ,MAAM,kBAAkC;EACtC,MAAM;EACN,MAAM,OAAO;AACX,SAAM,OAAO,WAAW;AACtB,eAAW,OAAO;KAClB;;EAEL;CAED,MAAM,MAAM,QAAQ,WAAW;CAC/B,MAAM,SAAS,OAAO,OAAO,WAAW;EACtC,WACE,cAAc;GACZ,UAAU;GACV;GACA,QAAQ;GACR,gBAAgB;IACd,SAAS,CAAC,gBAAgB;IAC1B,UAAU;IACX;GACF,CAAC;EACJ,QAAQ,UAAU,IAAI,aAAa,EAAE,OAAO,CAAC;EAC9C,CAAC;AAEF,KAAI,CAAC,SACH,QAAO,OAAO,OAAO,WAAW,2BAA2B;AAG7D,QAAO;EAAE,QAAQ,OAAO;EAAK,UAAU,mBAAmB,UAAU,IAAI;EAAE;EAC1E;AAEJ,MAAM,wBACJ,UACA,iBAEA,OAAO,IAAI,aAAa;CACtB,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,WAAW,KAAK,QAAQ,aAAa;AAC3C,QAAO,MAAM,UACX,OAAO,KAAK,SAAS,OAAO,GAC3B,QAAQ,KAAK,QAAQ,IAAI,KAAK,SAChC;EACD;;;;;;AAOJ,MAAa,mBACX,SACA,oBACA,uBAEA,OAAO,IAAI,aAAa;CACtB,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,YAAY,OAAO,qBACvB,QAAQ,UACR,mBACD;CACD,MAAM,YAAY,OAAO,qBACvB,QAAQ,UACR,mBACD;AAED,QAAO,KACL,OAAO,IAAI,CAAC,WAAW,UAAU,CAAC,EAClC,OAAO,SAAS,CAAC,YAAY,gBAC3B,OAAO,aAAa,QAAQ,SAAS,OAAO,YAAY,CAAC,KACvD,OAAO,KAAK,gBAAgB;EAC1B,MAAM,iBAAiB,KAAK,QAAQ,WAAW;AAC/C,SAAO,YAAY,QAAQ,MACxB,iBACC,KAAK,QAAQ,aAAa,KAAK,KAAK,eACvC;GACD,CACH,CACF,EACD,OAAO,gBAAgB,MAAM,CAC9B;EACD"}

package/dist/confect/dev.mjs

@@ -5,7 +5,6 @@ import { catchAndLog } from "../CodegenError.mjs";
 import { ConvexDirectory } from "../ConvexDirectory.mjs";
 import { ConfectDirectory } from "../ConfectDirectory.mjs";
 import { FunctionPaths, diff } from "../FunctionPaths.mjs";
-import { EXTERNAL_PACKAGES, absoluteExternalsPlugin } from "../Bundler.mjs";
 import { generateAuthConfig, generateCrons, generateHttp } from "../utils.mjs";
 import { discoverLeafImplFiles, isLeafImplPath, isLeafSpecPath } from "../LeafModule.mjs";
 import { codegenHandler, loadPreviousFunctionPaths } from "./codegen.mjs";
@@ -14,6 +13,7 @@ import { Command } from "@effect/cli";
 import { FileSystem, Path } from "@effect/platform";
 import { Ansi, AnsiDoc } from "@effect/printer-ansi";
 import * as esbuild from "esbuild";
+import { externalPlugin, loadTsConfig, tsconfigPathsToRegExp } from "bundle-require";
 
 //#region src/confect/dev.ts
 const GENERATED_SPEC_PATH = "_generated/spec.ts";
@@ -174,7 +174,7 @@ const discoverEntryPoints = Effect.gen(function* () {
 	const implEntryOptions = yield* Effect.forEach(implRelativePaths, (relativePath) => tryEntry(relativePath, "specDirty"));
 	return Array.getSomes([...fixedEntryOptions, ...implEntryOptions]);
 });
-const esbuildOptions = (entry, signal, pendingRef, watcherErrorsRef) => {
+const esbuildOptions = (entry, notExternal, signal, pendingRef, watcherErrorsRef) => {
 	const initialBuildSeenRef = Ref.unsafeMake(false);
 	return {
 		entryPoints: [entry.absolutePath],
@@ -184,8 +184,7 @@ const esbuildOptions = (entry, signal, pendingRef, watcherErrorsRef) => {
 		platform: "node",
 		format: "esm",
 		logLevel: "silent",
-		external: EXTERNAL_PACKAGES,
-		plugins: [absoluteExternalsPlugin, {
+		plugins: [externalPlugin({ notExternal: [...notExternal] }), {
 			name: "notify-rebuild",
 			setup(build) {
 				build.onEnd((result) => {
@@ -209,8 +208,8 @@ const esbuildOptions = (entry, signal, pendingRef, watcherErrorsRef) => {
 		}]
 	};
 };
-const createEntryPointWatcher = (entry, signal, pendingRef, watcherErrorsRef) => Effect.acquireRelease(Effect.promise(async () => {
-	const ctx = await esbuild.context(esbuildOptions(entry, signal, pendingRef, watcherErrorsRef));
+const createEntryPointWatcher = (entry, notExternal, signal, pendingRef, watcherErrorsRef) => Effect.acquireRelease(Effect.promise(async () => {
+	const ctx = await esbuild.context(esbuildOptions(entry, notExternal, signal, pendingRef, watcherErrorsRef));
 	await ctx.watch();
 	return ctx;
 }), (ctx) => Effect.gen(function* () {
@@ -233,6 +232,7 @@ const createEntryPointWatcher = (entry, signal, pendingRef, watcherErrorsRef) =>
 const entryPointsWatcher = (signal, pendingRef, restartQueue, watcherErrorsRef) => Effect.gen(function* () {
 	const parentScope = yield* Effect.scope;
 	const scopesRef = yield* Ref.make(/* @__PURE__ */ new Map());
+	const notExternal = tsconfigPathsToRegExp(loadTsConfig(yield* ProjectRoot.get)?.data.compilerOptions?.paths ?? {});
 	const sync = Effect.gen(function* () {
 		const desired = yield* discoverEntryPoints;
 		const desiredByPath = new Map(desired.map((entryPoint) => [entryPoint.absolutePath, entryPoint]));
@@ -245,7 +245,7 @@ const entryPointsWatcher = (signal, pendingRef, restartQueue, watcherErrorsRef)
 		yield* Effect.forEach(desired, (entry) => Effect.gen(function* () {
 			if ((yield* Ref.get(scopesRef)).has(entry.absolutePath)) return;
 			const childScope = yield* Scope.fork(parentScope, ExecutionStrategy.sequential);
-			yield* createEntryPointWatcher(entry, signal, pendingRef, watcherErrorsRef).pipe(Scope.extend(childScope));
+			yield* createEntryPointWatcher(entry, notExternal, signal, pendingRef, watcherErrorsRef).pipe(Scope.extend(childScope));
 			yield* Ref.update(scopesRef, (scopes) => {
 				const updated = new Map(scopes);
 				updated.set(entry.absolutePath, childScope);

package/dist/confect/dev.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dev.mjs","names":["FunctionPaths.diff","CodegenError.catchAndLog"],"sources":["../../src/confect/dev.ts"],"sourcesContent":["import { Command } from \"@effect/cli\";\nimport { FileSystem, Path } from \"@effect/platform\";\nimport { Ansi, AnsiDoc } from \"@effect/printer-ansi\";\nimport {\n  Array,\n  Chunk,\n  Clock,\n  Console,\n  Duration,\n  Effect,\n  Equal,\n  ExecutionStrategy,\n  Exit,\n  HashSet,\n  Match,\n  Option,\n  Order,\n  pipe,\n  Queue,\n  Ref,\n  Scope,\n  Stream,\n  String,\n} from \"effect\";\nimport * as esbuild from \"esbuild\";\nimport { logCoalescedBuildErrors } from \"../BuildError\";\nimport { absoluteExternalsPlugin, EXTERNAL_PACKAGES } from \"../Bundler\";\nimport * as CodegenError from \"../CodegenError\";\nimport { ConfectDirectory } from \"../ConfectDirectory\";\nimport { ConvexDirectory } from \"../ConvexDirectory\";\nimport * as FunctionPaths from \"../FunctionPaths\";\nimport type * as GroupPaths from \"../GroupPaths\";\nimport {\n  discoverLeafImplFiles,\n  isLeafImplPath,\n  isLeafSpecPath,\n} from \"../LeafModule\";\nimport {\n  logFunctionAdded,\n  logFunctionRemoved,\n  logPending,\n  logSuccess,\n} from \"../log\";\nimport { ProjectRoot } from \"../ProjectRoot\";\nimport { generateAuthConfig, generateCrons, generateHttp } from \"../utils\";\nimport { codegenHandler, loadPreviousFunctionPaths } from \"./codegen\";\n\nconst GENERATED_SPEC_PATH = \"_generated/spec.ts\";\nconst GENERATED_NODE_SPEC_PATH = \"_generated/nodeSpec.ts\";\n\n// Quiescence window: the sync loop waits this long for further signals\n// after each batch. One user edit fires `onEnd` on every esbuild\n// watcher that touches the file, and rebuild times vary across entry\n// points so the onEnds can be spread over hundreds of milliseconds.\n// The drain keeps extending its wait (bounded by `COALESCE_MAX_WAIT`)\n// until no new signals arrive within the window, collapsing the whole\n// burst into a single codegen cycle.\nconst COALESCE_QUIESCENCE = Duration.millis(300);\n\n// Upper bound on `drainUntilQuiescent` so a pathological infinite\n// signal stream can't pin the sync loop forever.\nconst COALESCE_MAX_WAIT = Duration.seconds(5);\n\n// How long to wait for esbuild watchers to react to codegen's own\n// writes (e.g. an updated `_generated/spec.ts`). Added on top of the\n// quiescence drain when codegen reported writes happened.\nconst ECHO_COOLDOWN = Duration.millis(500);\n\nconst emptyFunctionPaths = FunctionPaths.FunctionPaths.make(HashSet.empty());\n\ntype Pending = {\n  readonly specDirty: boolean;\n  readonly httpDirty: boolean;\n  readonly cronsDirty: boolean;\n  readonly authDirty: boolean;\n};\n\ntype PendingKey = keyof Pending;\n\nconst pendingInit: Pending = {\n  specDirty: false,\n  httpDirty: false,\n  cronsDirty: false,\n  authDirty: false,\n};\n\nconst isPendingDirty = (p: Pending): boolean =>\n  p.specDirty || p.httpDirty || p.cronsDirty || p.authDirty;\n\ntype WatcherErrors = ReadonlyMap<string, readonly esbuild.Message[]>;\n\nconst emptyWatcherErrors: WatcherErrors = new Map();\n\nconst changeChar = (change: \"Added\" | \"Removed\" | \"Modified\") =>\n  Match.value(change).pipe(\n    Match.when(\"Added\", () => ({ char: \"+\", color: Ansi.green })),\n    Match.when(\"Removed\", () => ({ char: \"-\", color: Ansi.red })),\n    Match.when(\"Modified\", () => ({ char: \"~\", color: Ansi.yellow })),\n    Match.exhaustive,\n  );\n\nconst logFileChangeIndented = (\n  change: \"Added\" | \"Removed\" | \"Modified\",\n  fullPath: string,\n) =>\n  Effect.gen(function* () {\n    const projectRoot = yield* ProjectRoot.get;\n    const path = yield* Path.Path;\n\n    const prefix = projectRoot + path.sep;\n    const suffix = pipe(fullPath, String.startsWith(prefix))\n      ? pipe(fullPath, String.slice(prefix.length))\n      : fullPath;\n\n    const { char, color } = changeChar(change);\n\n    yield* Console.log(\n      pipe(\n        AnsiDoc.char(char),\n        AnsiDoc.annotate(color),\n        AnsiDoc.catWithSpace(\n          AnsiDoc.hcat([\n            pipe(AnsiDoc.text(prefix), AnsiDoc.annotate(Ansi.blackBright)),\n            pipe(AnsiDoc.text(suffix), AnsiDoc.annotate(color)),\n          ]),\n        ),\n        AnsiDoc.render({ style: \"pretty\" }),\n      ),\n    );\n  });\n\nconst logFunctionPathDiff = (\n  previous: FunctionPaths.FunctionPaths,\n  current: FunctionPaths.FunctionPaths,\n) =>\n  Effect.gen(function* () {\n    const {\n      functionsAdded,\n      functionsRemoved,\n      groupsRemoved,\n      groupsAdded,\n      groupsChanged,\n    } = FunctionPaths.diff(previous, current);\n\n    const logForGroups = (\n      groupPaths: GroupPaths.GroupPaths,\n      fnPaths: FunctionPaths.FunctionPaths,\n      logFn: typeof logFunctionAdded,\n    ) =>\n      Effect.forEach(groupPaths, (gp) =>\n        Effect.forEach(\n          Array.fromIterable(\n            HashSet.filter(fnPaths, (fp) => Equal.equals(fp.groupPath, gp)),\n          ),\n          logFn,\n        ),\n      );\n\n    yield* logForGroups(groupsRemoved, functionsRemoved, logFunctionRemoved);\n    yield* logForGroups(groupsAdded, functionsAdded, logFunctionAdded);\n    yield* Effect.forEach(groupsChanged, (gp) =>\n      Effect.gen(function* () {\n        yield* Effect.forEach(\n          Array.fromIterable(\n            HashSet.filter(functionsAdded, (fp) =>\n              Equal.equals(fp.groupPath, gp),\n            ),\n          ),\n          logFunctionAdded,\n        );\n        yield* Effect.forEach(\n          Array.fromIterable(\n            HashSet.filter(functionsRemoved, (fp) =>\n              Equal.equals(fp.groupPath, gp),\n            ),\n          ),\n          logFunctionRemoved,\n        );\n      }),\n    );\n  });\n\nexport const dev = Command.make(\"dev\", {}, () =>\n  Effect.gen(function* () {\n    yield* logPending(\"Performing initial sync…\");\n    const previousFunctionPaths = yield* loadPreviousFunctionPaths;\n    const initialResult = yield* codegenHandler.pipe(\n      Effect.tap(({ functionPaths }) =>\n        logFunctionPathDiff(previousFunctionPaths, functionPaths),\n      ),\n      Effect.tap(() => logSuccess(\"Generated files are up-to-date\")),\n      CodegenError.catchAndLog,\n    );\n    const initialFunctionPaths = Option.match(initialResult, {\n      onNone: () => emptyFunctionPaths,\n      onSome: ({ functionPaths }) => functionPaths,\n    });\n\n    const pendingRef = yield* Ref.make<Pending>(pendingInit);\n    const signal = yield* Queue.sliding<void>(1);\n    const restartQueue = yield* Queue.sliding<void>(1);\n    const watcherErrorsRef = yield* Ref.make<WatcherErrors>(emptyWatcherErrors);\n\n    yield* Effect.all(\n      [\n        Effect.scoped(\n          entryPointsWatcher(\n            signal,\n            pendingRef,\n            restartQueue,\n            watcherErrorsRef,\n          ),\n        ),\n        confectStructureWatcher(signal, pendingRef, restartQueue),\n        syncLoop(signal, pendingRef, initialFunctionPaths, watcherErrorsRef),\n      ],\n      { concurrency: \"unbounded\" },\n    );\n  }),\n).pipe(Command.withDescription(\"Start the Confect development server\"));\n\nconst esbuildMessageKey = (m: esbuild.Message): string =>\n  `${m.location?.file ?? \"\"}:${m.location?.line ?? \"\"}:${m.location?.column ?? \"\"}:${m.text}`;\n\nconst allMessages = (errors: WatcherErrors): ReadonlyArray<esbuild.Message> =>\n  pipe(Array.fromIterable(errors.values()), Array.flatten);\n\nconst dedupeWatcherErrors = (\n  errors: WatcherErrors,\n): ReadonlyArray<esbuild.Message> =>\n  pipe(\n    allMessages(errors),\n    Array.dedupeWith(\n      (messageA, messageB) =>\n        esbuildMessageKey(messageA) === esbuildMessageKey(messageB),\n    ),\n  );\n\nconst watcherErrorsSignature = (errors: WatcherErrors): string =>\n  pipe(\n    allMessages(errors),\n    Array.map(esbuildMessageKey),\n    Array.dedupe,\n    Array.sort(Order.string),\n    Array.join(\"\\n\"),\n  );\n\n/**\n * Log any watcher errors that haven't already been logged at their\n * current signature. Suppresses the per-watcher fanout that happens\n * when one root cause (e.g. a missing import) breaks every entry\n * point's build at the same source location.\n */\nconst logChangedWatcherErrors = (\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n  lastLoggedSignatureRef: Ref.Ref<string>,\n) =>\n  Effect.gen(function* () {\n    const errors = yield* Ref.get(watcherErrorsRef);\n    const signature = watcherErrorsSignature(errors);\n    const previous = yield* Ref.get(lastLoggedSignatureRef);\n    if (signature === previous) return;\n    yield* Ref.set(lastLoggedSignatureRef, signature);\n    if (errors.size === 0) return;\n    yield* logCoalescedBuildErrors(dedupeWatcherErrors(errors));\n  });\n\n/**\n * Block until the signal queue has been quiet for `quiescence`. esbuild\n * watchers' `onEnd` events for a single user edit can be spread across\n * hundreds of milliseconds, so a fixed window misses late arrivals.\n * Bounded by `maxWait` so pathological signal floods can't pin the\n * loop forever.\n */\nconst drainUntilQuiescent = (\n  signal: Queue.Queue<void>,\n  quiescence: Duration.Duration,\n  maxWait: Duration.Duration,\n) =>\n  Effect.gen(function* () {\n    const start = yield* Clock.currentTimeMillis;\n    const maxMillis = Duration.toMillis(maxWait);\n    yield* Effect.iterate(true as boolean, {\n      while: (keepGoing) => keepGoing,\n      body: () =>\n        Effect.gen(function* () {\n          yield* Effect.sleep(quiescence);\n          const drained = yield* Queue.takeAll(signal);\n          if (Chunk.isEmpty(drained)) return false;\n          const now = yield* Clock.currentTimeMillis;\n          return now - start < maxMillis;\n        }),\n    });\n  });\n\nconst syncLoop = (\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  initialFunctionPaths: FunctionPaths.FunctionPaths,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) =>\n  Effect.gen(function* () {\n    const functionPathsRef = yield* Ref.make(initialFunctionPaths);\n    const lastLoggedErrorsRef = yield* Ref.make<string>(\"\");\n\n    return yield* Effect.forever(\n      Effect.gen(function* () {\n        yield* Effect.logDebug(\"Running sync loop…\");\n        // Wait for the first signal of a burst, then keep absorbing\n        // follow-up signals from other watchers' onEnds until the queue\n        // stays quiet for `COALESCE_QUIESCENCE`.\n        yield* Queue.take(signal);\n        yield* drainUntilQuiescent(\n          signal,\n          COALESCE_QUIESCENCE,\n          COALESCE_MAX_WAIT,\n        );\n\n        yield* logChangedWatcherErrors(watcherErrorsRef, lastLoggedErrorsRef);\n\n        const pending = yield* Ref.getAndSet(pendingRef, pendingInit);\n\n        if (!isPendingDirty(pending)) {\n          // No-op signal (e.g. a late echo after a previous cycle\n          // already drained). Stay silent.\n          return;\n        }\n\n        yield* logPending(\"Dependencies may have changed, reloading…\");\n\n        if (pending.specDirty) {\n          const current = yield* codegenHandler.pipe(\n            Effect.tap(({ functionPaths: nextFunctionPaths }) =>\n              Effect.gen(function* () {\n                const previous = yield* Ref.get(functionPathsRef);\n                yield* logFunctionPathDiff(previous, nextFunctionPaths);\n                yield* Ref.set(functionPathsRef, nextFunctionPaths);\n              }),\n            ),\n            CodegenError.catchAndLog,\n          );\n          if (Option.isNone(current)) {\n            return;\n          }\n          // Drain any stragglers from this cycle's burst (slow watchers\n          // whose onEnd fired after the first quiescence) plus, when\n          // codegen wrote, the echo signals esbuild emits in response\n          // to our writes. Reset `pendingRef` so those drained signals\n          // don't carry a dirty flag into the next cycle.\n          if (current.value.anyWritesHappened) {\n            yield* Effect.sleep(ECHO_COOLDOWN);\n          }\n          yield* drainUntilQuiescent(\n            signal,\n            COALESCE_QUIESCENCE,\n            COALESCE_MAX_WAIT,\n          );\n          yield* Ref.set(pendingRef, pendingInit);\n        }\n\n        const dirtyOptionalFiles = [\n          ...(pending.httpDirty\n            ? [syncOptionalFile(generateHttp, \"http.ts\")]\n            : []),\n          ...(pending.cronsDirty\n            ? [syncOptionalFile(generateCrons, \"crons.ts\")]\n            : []),\n          ...(pending.authDirty\n            ? [syncOptionalFile(generateAuthConfig, \"auth.config.ts\")]\n            : []),\n        ];\n\n        yield* Array.isNonEmptyReadonlyArray(dirtyOptionalFiles)\n          ? Effect.all(dirtyOptionalFiles, { concurrency: \"unbounded\" })\n          : Effect.void;\n\n        yield* logSuccess(\"Generated files are up-to-date\");\n      }),\n    );\n  });\n\ninterface EntryPoint {\n  readonly absolutePath: string;\n  readonly displayPath: string;\n  readonly pendingKey: PendingKey;\n}\n\n/**\n * Every file whose import graph codegen should react to. Each one becomes\n * its own scoped esbuild watcher; the union of their watches gives us\n * dependency-aware tracking of anything reachable from `confect/`,\n * including files outside `confect/`.\n */\nconst discoverEntryPoints = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const projectRoot = yield* ProjectRoot.get;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const tryEntry = (relativePath: string, pendingKey: PendingKey) =>\n    Effect.gen(function* () {\n      const absolutePath = path.join(confectDirectory, relativePath);\n      if (!(yield* fs.exists(absolutePath))) {\n        return Option.none<EntryPoint>();\n      }\n      return Option.some<EntryPoint>({\n        absolutePath,\n        displayPath: path.relative(projectRoot, absolutePath),\n        pendingKey,\n      });\n    });\n\n  const fixedEntryOptions = yield* Effect.all([\n    tryEntry(GENERATED_SPEC_PATH, \"specDirty\"),\n    tryEntry(GENERATED_NODE_SPEC_PATH, \"specDirty\"),\n    tryEntry(\"schema.ts\", \"specDirty\"),\n    tryEntry(\"http.ts\", \"httpDirty\"),\n    tryEntry(\"crons.ts\", \"cronsDirty\"),\n    tryEntry(\"auth.ts\", \"authDirty\"),\n  ]);\n\n  const implRelativePaths = yield* discoverLeafImplFiles;\n  const implEntryOptions = yield* Effect.forEach(\n    implRelativePaths,\n    (relativePath) => tryEntry(relativePath, \"specDirty\"),\n  );\n\n  return Array.getSomes([...fixedEntryOptions, ...implEntryOptions]);\n});\n\nconst esbuildOptions = (\n  entry: EntryPoint,\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) => {\n  // First `onEnd` fires when esbuild finishes the watcher's initial\n  // build. At startup that's an echo of the just-completed initial\n  // codegen pass; for a watcher spawned mid-session (e.g. a newly\n  // added impl) it's an echo of the codegen run that triggered the\n  // restart. Either way, the entry's contents were already accounted\n  // for, so we record any errors but don't flip dirty or push a\n  // signal — only genuine subsequent rebuilds should do that.\n  const initialBuildSeenRef = Ref.unsafeMake(false);\n  return {\n    entryPoints: [entry.absolutePath],\n    bundle: true,\n    write: false,\n    metafile: true,\n    platform: \"node\" as const,\n    format: \"esm\" as const,\n    logLevel: \"silent\" as const,\n    external: EXTERNAL_PACKAGES,\n    plugins: [\n      absoluteExternalsPlugin,\n      {\n        name: \"notify-rebuild\",\n        setup(build: esbuild.PluginBuild) {\n          build.onEnd((result) => {\n            Effect.runPromise(\n              Effect.gen(function* () {\n                const wasInitial = yield* Ref.getAndSet(\n                  initialBuildSeenRef,\n                  true,\n                );\n                const isInitial = !wasInitial;\n                yield* Ref.update(watcherErrorsRef, (current) => {\n                  const next = new Map(current);\n                  if (result.errors.length > 0) {\n                    next.set(entry.absolutePath, result.errors);\n                  } else {\n                    next.delete(entry.absolutePath);\n                  }\n                  return next;\n                });\n                if (isInitial && result.errors.length === 0) return;\n                yield* Ref.update(pendingRef, (p) => ({\n                  ...p,\n                  [entry.pendingKey]: true,\n                }));\n                yield* Queue.offer(signal, undefined);\n              }),\n            );\n          });\n        },\n      },\n    ],\n  };\n};\n\nconst createEntryPointWatcher = (\n  entry: EntryPoint,\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) =>\n  Effect.acquireRelease(\n    Effect.promise(async () => {\n      const ctx = await esbuild.context(\n        esbuildOptions(entry, signal, pendingRef, watcherErrorsRef),\n      );\n      await ctx.watch();\n      return ctx;\n    }),\n    (ctx) =>\n      Effect.gen(function* () {\n        yield* Effect.promise(() => ctx.dispose());\n        // Clear any errors recorded by this watcher so a disposed\n        // watcher can't leave stale errors visible to the sync loop.\n        yield* Ref.update(watcherErrorsRef, (current) => {\n          if (!current.has(entry.absolutePath)) return current;\n          const next = new Map(current);\n          next.delete(entry.absolutePath);\n          return next;\n        });\n        yield* Effect.logDebug(\n          `esbuild watcher disposed: ${entry.displayPath}`,\n        );\n      }),\n  );\n\n/**\n * Holds one scoped esbuild watcher per entry point and reconciles the set\n * whenever something offers to `restartQueue`. Adding or removing an entry\n * point only spawns/disposes the affected watcher; unchanged entries keep\n * their existing context, so a structural change doesn't churn watchers\n * for unrelated files.\n */\nconst entryPointsWatcher = (\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  restartQueue: Queue.Queue<void>,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) =>\n  Effect.gen(function* () {\n    const parentScope = yield* Effect.scope;\n    const scopesRef = yield* Ref.make(new Map<string, Scope.CloseableScope>());\n\n    const sync = Effect.gen(function* () {\n      const desired = yield* discoverEntryPoints;\n      const desiredByPath = new Map(\n        desired.map((entryPoint) => [entryPoint.absolutePath, entryPoint]),\n      );\n      const current = yield* Ref.get(scopesRef);\n\n      yield* Effect.forEach(\n        Array.fromIterable(current),\n        ([absolutePath, childScope]) =>\n          desiredByPath.has(absolutePath)\n            ? Effect.void\n            : Scope.close(childScope, Exit.void).pipe(\n                Effect.andThen(\n                  Ref.update(scopesRef, (scopes) => {\n                    const updated = new Map(scopes);\n                    updated.delete(absolutePath);\n                    return updated;\n                  }),\n                ),\n              ),\n      );\n\n      yield* Effect.forEach(desired, (entry) =>\n        Effect.gen(function* () {\n          const existing = yield* Ref.get(scopesRef);\n          if (existing.has(entry.absolutePath)) return;\n\n          const childScope = yield* Scope.fork(\n            parentScope,\n            ExecutionStrategy.sequential,\n          );\n          yield* createEntryPointWatcher(\n            entry,\n            signal,\n            pendingRef,\n            watcherErrorsRef,\n          ).pipe(Scope.extend(childScope));\n          yield* Ref.update(scopesRef, (scopes) => {\n            const updated = new Map(scopes);\n            updated.set(entry.absolutePath, childScope);\n            return updated;\n          });\n        }),\n      );\n    });\n\n    yield* sync;\n\n    return yield* Effect.forever(\n      Queue.take(restartQueue).pipe(Effect.andThen(sync)),\n    );\n  });\n\n/**\n * Single recursive `fs.watch` on `confect/`. Flips the matching dirty flag\n * for any change to an entry-point-shaped file (so codegen runs without\n * waiting on a newly spawned esbuild watcher), and offers to\n * `restartQueue` when an entry point is created or removed so the watcher\n * manager picks up the new set.\n */\nconst confectStructureWatcher = (\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  restartQueue: Queue.Queue<void>,\n) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    const path = yield* Path.Path;\n    const confectDirectory = yield* ConfectDirectory.get;\n\n    yield* pipe(\n      fs.watch(confectDirectory, { recursive: true }),\n      Stream.debounce(Duration.millis(200)),\n      Stream.runForEach((event) =>\n        handleConfectChange({\n          relativePath: path.relative(confectDirectory, event.path),\n          eventTag: event._tag,\n          signal,\n          pendingRef,\n          restartQueue,\n        }),\n      ),\n    );\n  });\n\nconst TOP_LEVEL_OPTIONAL_KEYS: ReadonlyMap<string, PendingKey> = new Map([\n  [\"http.ts\", \"httpDirty\"],\n  [\"crons.ts\", \"cronsDirty\"],\n  [\"auth.ts\", \"authDirty\"],\n]);\n\nconst flipDirtyAndSignal = (\n  pendingRef: Ref.Ref<Pending>,\n  signal: Queue.Queue<void>,\n  key: PendingKey,\n  restartQueue: Queue.Queue<void>,\n  restart: boolean,\n) =>\n  pipe(\n    Ref.update(pendingRef, (p) => ({ ...p, [key]: true })),\n    Effect.andThen(Queue.offer(signal, undefined)),\n    Effect.andThen(\n      restart ? Queue.offer(restartQueue, undefined) : Effect.void,\n    ),\n  );\n\nconst handleConfectChange = ({\n  relativePath,\n  eventTag,\n  signal,\n  pendingRef,\n  restartQueue,\n}: {\n  relativePath: string;\n  eventTag: \"Create\" | \"Update\" | \"Remove\";\n  signal: Queue.Queue<void>;\n  pendingRef: Ref.Ref<Pending>;\n  restartQueue: Queue.Queue<void>;\n}) => {\n  // _generated/ files are written by codegen itself; reacting to them here\n  // would form a loop. The esbuild watchers track the generated specs as\n  // entry points, so changes there flow back through `notify-rebuild`.\n  if (relativePath.split(/[/\\\\]/).includes(\"_generated\")) {\n    return Effect.void;\n  }\n\n  if (!relativePath.endsWith(\".ts\")) {\n    return Effect.void;\n  }\n\n  const isLifecycleChange = eventTag !== \"Update\";\n\n  const topLevelKey = TOP_LEVEL_OPTIONAL_KEYS.get(relativePath);\n  if (topLevelKey !== undefined) {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      topLevelKey,\n      restartQueue,\n      isLifecycleChange,\n    );\n  }\n\n  if (relativePath === \"schema.ts\") {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      \"specDirty\",\n      restartQueue,\n      isLifecycleChange,\n    );\n  }\n\n  if (isLeafSpecPath(relativePath) || isLeafImplPath(relativePath)) {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      \"specDirty\",\n      restartQueue,\n      isLifecycleChange,\n    );\n  }\n\n  // Any other `.ts` under `confect/` (helpers like `tables/Notes.ts`).\n  // Updates to such files are handled by the esbuild watcher for whichever\n  // entry point imports them — its onEnd flips the right dirty flag.\n  // Creates are our safety net: when a previously-missing import is added,\n  // esbuild may not have its parent directory on a poll path, so we\n  // re-run codegen on Create here.\n  if (eventTag === \"Create\") {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      \"specDirty\",\n      restartQueue,\n      false,\n    );\n  }\n\n  return Effect.void;\n};\n\nconst syncOptionalFile = (generate: typeof generateHttp, convexFile: string) =>\n  pipe(\n    generate,\n    Effect.andThen(\n      Option.match({\n        onSome: ({ change, convexFilePath }) =>\n          Match.value(change).pipe(\n            Match.when(\"Unchanged\", () => Effect.void),\n            Match.whenOr(\"Added\", \"Modified\", (addedOrModified) =>\n              logFileChangeIndented(addedOrModified, convexFilePath),\n            ),\n            Match.exhaustive,\n          ),\n        onNone: () =>\n          Effect.gen(function* () {\n            const fs = yield* FileSystem.FileSystem;\n            const path = yield* Path.Path;\n            const convexDirectory = yield* ConvexDirectory.get;\n            const convexFilePath = path.join(convexDirectory, convexFile);\n\n            if (yield* fs.exists(convexFilePath)) {\n              yield* fs.remove(convexFilePath);\n              yield* logFileChangeIndented(\"Removed\", convexFilePath);\n            }\n          }),\n      }),\n    ),\n  );\n"],"mappings":"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"}
+{"version":3,"file":"dev.mjs","names":["FunctionPaths.diff","CodegenError.catchAndLog"],"sources":["../../src/confect/dev.ts"],"sourcesContent":["import { Command } from \"@effect/cli\";\nimport { FileSystem, Path } from \"@effect/platform\";\nimport { Ansi, AnsiDoc } from \"@effect/printer-ansi\";\nimport {\n  Array,\n  Chunk,\n  Clock,\n  Console,\n  Duration,\n  Effect,\n  Equal,\n  ExecutionStrategy,\n  Exit,\n  HashSet,\n  Match,\n  Option,\n  Order,\n  pipe,\n  Queue,\n  Ref,\n  Scope,\n  Stream,\n  String,\n} from \"effect\";\nimport {\n  externalPlugin,\n  loadTsConfig,\n  tsconfigPathsToRegExp,\n} from \"bundle-require\";\nimport * as esbuild from \"esbuild\";\nimport { logCoalescedBuildErrors } from \"../BuildError\";\nimport * as CodegenError from \"../CodegenError\";\nimport { ConfectDirectory } from \"../ConfectDirectory\";\nimport { ConvexDirectory } from \"../ConvexDirectory\";\nimport * as FunctionPaths from \"../FunctionPaths\";\nimport type * as GroupPaths from \"../GroupPaths\";\nimport {\n  discoverLeafImplFiles,\n  isLeafImplPath,\n  isLeafSpecPath,\n} from \"../LeafModule\";\nimport {\n  logFunctionAdded,\n  logFunctionRemoved,\n  logPending,\n  logSuccess,\n} from \"../log\";\nimport { ProjectRoot } from \"../ProjectRoot\";\nimport { generateAuthConfig, generateCrons, generateHttp } from \"../utils\";\nimport { codegenHandler, loadPreviousFunctionPaths } from \"./codegen\";\n\nconst GENERATED_SPEC_PATH = \"_generated/spec.ts\";\nconst GENERATED_NODE_SPEC_PATH = \"_generated/nodeSpec.ts\";\n\n// Quiescence window: the sync loop waits this long for further signals\n// after each batch. One user edit fires `onEnd` on every esbuild\n// watcher that touches the file, and rebuild times vary across entry\n// points so the onEnds can be spread over hundreds of milliseconds.\n// The drain keeps extending its wait (bounded by `COALESCE_MAX_WAIT`)\n// until no new signals arrive within the window, collapsing the whole\n// burst into a single codegen cycle.\nconst COALESCE_QUIESCENCE = Duration.millis(300);\n\n// Upper bound on `drainUntilQuiescent` so a pathological infinite\n// signal stream can't pin the sync loop forever.\nconst COALESCE_MAX_WAIT = Duration.seconds(5);\n\n// How long to wait for esbuild watchers to react to codegen's own\n// writes (e.g. an updated `_generated/spec.ts`). Added on top of the\n// quiescence drain when codegen reported writes happened.\nconst ECHO_COOLDOWN = Duration.millis(500);\n\nconst emptyFunctionPaths = FunctionPaths.FunctionPaths.make(HashSet.empty());\n\ntype Pending = {\n  readonly specDirty: boolean;\n  readonly httpDirty: boolean;\n  readonly cronsDirty: boolean;\n  readonly authDirty: boolean;\n};\n\ntype PendingKey = keyof Pending;\n\nconst pendingInit: Pending = {\n  specDirty: false,\n  httpDirty: false,\n  cronsDirty: false,\n  authDirty: false,\n};\n\nconst isPendingDirty = (p: Pending): boolean =>\n  p.specDirty || p.httpDirty || p.cronsDirty || p.authDirty;\n\ntype WatcherErrors = ReadonlyMap<string, readonly esbuild.Message[]>;\n\nconst emptyWatcherErrors: WatcherErrors = new Map();\n\nconst changeChar = (change: \"Added\" | \"Removed\" | \"Modified\") =>\n  Match.value(change).pipe(\n    Match.when(\"Added\", () => ({ char: \"+\", color: Ansi.green })),\n    Match.when(\"Removed\", () => ({ char: \"-\", color: Ansi.red })),\n    Match.when(\"Modified\", () => ({ char: \"~\", color: Ansi.yellow })),\n    Match.exhaustive,\n  );\n\nconst logFileChangeIndented = (\n  change: \"Added\" | \"Removed\" | \"Modified\",\n  fullPath: string,\n) =>\n  Effect.gen(function* () {\n    const projectRoot = yield* ProjectRoot.get;\n    const path = yield* Path.Path;\n\n    const prefix = projectRoot + path.sep;\n    const suffix = pipe(fullPath, String.startsWith(prefix))\n      ? pipe(fullPath, String.slice(prefix.length))\n      : fullPath;\n\n    const { char, color } = changeChar(change);\n\n    yield* Console.log(\n      pipe(\n        AnsiDoc.char(char),\n        AnsiDoc.annotate(color),\n        AnsiDoc.catWithSpace(\n          AnsiDoc.hcat([\n            pipe(AnsiDoc.text(prefix), AnsiDoc.annotate(Ansi.blackBright)),\n            pipe(AnsiDoc.text(suffix), AnsiDoc.annotate(color)),\n          ]),\n        ),\n        AnsiDoc.render({ style: \"pretty\" }),\n      ),\n    );\n  });\n\nconst logFunctionPathDiff = (\n  previous: FunctionPaths.FunctionPaths,\n  current: FunctionPaths.FunctionPaths,\n) =>\n  Effect.gen(function* () {\n    const {\n      functionsAdded,\n      functionsRemoved,\n      groupsRemoved,\n      groupsAdded,\n      groupsChanged,\n    } = FunctionPaths.diff(previous, current);\n\n    const logForGroups = (\n      groupPaths: GroupPaths.GroupPaths,\n      fnPaths: FunctionPaths.FunctionPaths,\n      logFn: typeof logFunctionAdded,\n    ) =>\n      Effect.forEach(groupPaths, (gp) =>\n        Effect.forEach(\n          Array.fromIterable(\n            HashSet.filter(fnPaths, (fp) => Equal.equals(fp.groupPath, gp)),\n          ),\n          logFn,\n        ),\n      );\n\n    yield* logForGroups(groupsRemoved, functionsRemoved, logFunctionRemoved);\n    yield* logForGroups(groupsAdded, functionsAdded, logFunctionAdded);\n    yield* Effect.forEach(groupsChanged, (gp) =>\n      Effect.gen(function* () {\n        yield* Effect.forEach(\n          Array.fromIterable(\n            HashSet.filter(functionsAdded, (fp) =>\n              Equal.equals(fp.groupPath, gp),\n            ),\n          ),\n          logFunctionAdded,\n        );\n        yield* Effect.forEach(\n          Array.fromIterable(\n            HashSet.filter(functionsRemoved, (fp) =>\n              Equal.equals(fp.groupPath, gp),\n            ),\n          ),\n          logFunctionRemoved,\n        );\n      }),\n    );\n  });\n\nexport const dev = Command.make(\"dev\", {}, () =>\n  Effect.gen(function* () {\n    yield* logPending(\"Performing initial sync…\");\n    const previousFunctionPaths = yield* loadPreviousFunctionPaths;\n    const initialResult = yield* codegenHandler.pipe(\n      Effect.tap(({ functionPaths }) =>\n        logFunctionPathDiff(previousFunctionPaths, functionPaths),\n      ),\n      Effect.tap(() => logSuccess(\"Generated files are up-to-date\")),\n      CodegenError.catchAndLog,\n    );\n    const initialFunctionPaths = Option.match(initialResult, {\n      onNone: () => emptyFunctionPaths,\n      onSome: ({ functionPaths }) => functionPaths,\n    });\n\n    const pendingRef = yield* Ref.make<Pending>(pendingInit);\n    const signal = yield* Queue.sliding<void>(1);\n    const restartQueue = yield* Queue.sliding<void>(1);\n    const watcherErrorsRef = yield* Ref.make<WatcherErrors>(emptyWatcherErrors);\n\n    yield* Effect.all(\n      [\n        Effect.scoped(\n          entryPointsWatcher(\n            signal,\n            pendingRef,\n            restartQueue,\n            watcherErrorsRef,\n          ),\n        ),\n        confectStructureWatcher(signal, pendingRef, restartQueue),\n        syncLoop(signal, pendingRef, initialFunctionPaths, watcherErrorsRef),\n      ],\n      { concurrency: \"unbounded\" },\n    );\n  }),\n).pipe(Command.withDescription(\"Start the Confect development server\"));\n\nconst esbuildMessageKey = (m: esbuild.Message): string =>\n  `${m.location?.file ?? \"\"}:${m.location?.line ?? \"\"}:${m.location?.column ?? \"\"}:${m.text}`;\n\nconst allMessages = (errors: WatcherErrors): ReadonlyArray<esbuild.Message> =>\n  pipe(Array.fromIterable(errors.values()), Array.flatten);\n\nconst dedupeWatcherErrors = (\n  errors: WatcherErrors,\n): ReadonlyArray<esbuild.Message> =>\n  pipe(\n    allMessages(errors),\n    Array.dedupeWith(\n      (messageA, messageB) =>\n        esbuildMessageKey(messageA) === esbuildMessageKey(messageB),\n    ),\n  );\n\nconst watcherErrorsSignature = (errors: WatcherErrors): string =>\n  pipe(\n    allMessages(errors),\n    Array.map(esbuildMessageKey),\n    Array.dedupe,\n    Array.sort(Order.string),\n    Array.join(\"\\n\"),\n  );\n\n/**\n * Log any watcher errors that haven't already been logged at their\n * current signature. Suppresses the per-watcher fanout that happens\n * when one root cause (e.g. a missing import) breaks every entry\n * point's build at the same source location.\n */\nconst logChangedWatcherErrors = (\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n  lastLoggedSignatureRef: Ref.Ref<string>,\n) =>\n  Effect.gen(function* () {\n    const errors = yield* Ref.get(watcherErrorsRef);\n    const signature = watcherErrorsSignature(errors);\n    const previous = yield* Ref.get(lastLoggedSignatureRef);\n    if (signature === previous) return;\n    yield* Ref.set(lastLoggedSignatureRef, signature);\n    if (errors.size === 0) return;\n    yield* logCoalescedBuildErrors(dedupeWatcherErrors(errors));\n  });\n\n/**\n * Block until the signal queue has been quiet for `quiescence`. esbuild\n * watchers' `onEnd` events for a single user edit can be spread across\n * hundreds of milliseconds, so a fixed window misses late arrivals.\n * Bounded by `maxWait` so pathological signal floods can't pin the\n * loop forever.\n */\nconst drainUntilQuiescent = (\n  signal: Queue.Queue<void>,\n  quiescence: Duration.Duration,\n  maxWait: Duration.Duration,\n) =>\n  Effect.gen(function* () {\n    const start = yield* Clock.currentTimeMillis;\n    const maxMillis = Duration.toMillis(maxWait);\n    yield* Effect.iterate(true as boolean, {\n      while: (keepGoing) => keepGoing,\n      body: () =>\n        Effect.gen(function* () {\n          yield* Effect.sleep(quiescence);\n          const drained = yield* Queue.takeAll(signal);\n          if (Chunk.isEmpty(drained)) return false;\n          const now = yield* Clock.currentTimeMillis;\n          return now - start < maxMillis;\n        }),\n    });\n  });\n\nconst syncLoop = (\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  initialFunctionPaths: FunctionPaths.FunctionPaths,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) =>\n  Effect.gen(function* () {\n    const functionPathsRef = yield* Ref.make(initialFunctionPaths);\n    const lastLoggedErrorsRef = yield* Ref.make<string>(\"\");\n\n    return yield* Effect.forever(\n      Effect.gen(function* () {\n        yield* Effect.logDebug(\"Running sync loop…\");\n        // Wait for the first signal of a burst, then keep absorbing\n        // follow-up signals from other watchers' onEnds until the queue\n        // stays quiet for `COALESCE_QUIESCENCE`.\n        yield* Queue.take(signal);\n        yield* drainUntilQuiescent(\n          signal,\n          COALESCE_QUIESCENCE,\n          COALESCE_MAX_WAIT,\n        );\n\n        yield* logChangedWatcherErrors(watcherErrorsRef, lastLoggedErrorsRef);\n\n        const pending = yield* Ref.getAndSet(pendingRef, pendingInit);\n\n        if (!isPendingDirty(pending)) {\n          // No-op signal (e.g. a late echo after a previous cycle\n          // already drained). Stay silent.\n          return;\n        }\n\n        yield* logPending(\"Dependencies may have changed, reloading…\");\n\n        if (pending.specDirty) {\n          const current = yield* codegenHandler.pipe(\n            Effect.tap(({ functionPaths: nextFunctionPaths }) =>\n              Effect.gen(function* () {\n                const previous = yield* Ref.get(functionPathsRef);\n                yield* logFunctionPathDiff(previous, nextFunctionPaths);\n                yield* Ref.set(functionPathsRef, nextFunctionPaths);\n              }),\n            ),\n            CodegenError.catchAndLog,\n          );\n          if (Option.isNone(current)) {\n            return;\n          }\n          // Drain any stragglers from this cycle's burst (slow watchers\n          // whose onEnd fired after the first quiescence) plus, when\n          // codegen wrote, the echo signals esbuild emits in response\n          // to our writes. Reset `pendingRef` so those drained signals\n          // don't carry a dirty flag into the next cycle.\n          if (current.value.anyWritesHappened) {\n            yield* Effect.sleep(ECHO_COOLDOWN);\n          }\n          yield* drainUntilQuiescent(\n            signal,\n            COALESCE_QUIESCENCE,\n            COALESCE_MAX_WAIT,\n          );\n          yield* Ref.set(pendingRef, pendingInit);\n        }\n\n        const dirtyOptionalFiles = [\n          ...(pending.httpDirty\n            ? [syncOptionalFile(generateHttp, \"http.ts\")]\n            : []),\n          ...(pending.cronsDirty\n            ? [syncOptionalFile(generateCrons, \"crons.ts\")]\n            : []),\n          ...(pending.authDirty\n            ? [syncOptionalFile(generateAuthConfig, \"auth.config.ts\")]\n            : []),\n        ];\n\n        yield* Array.isNonEmptyReadonlyArray(dirtyOptionalFiles)\n          ? Effect.all(dirtyOptionalFiles, { concurrency: \"unbounded\" })\n          : Effect.void;\n\n        yield* logSuccess(\"Generated files are up-to-date\");\n      }),\n    );\n  });\n\ninterface EntryPoint {\n  readonly absolutePath: string;\n  readonly displayPath: string;\n  readonly pendingKey: PendingKey;\n}\n\n/**\n * Every file whose import graph codegen should react to. Each one becomes\n * its own scoped esbuild watcher; the union of their watches gives us\n * dependency-aware tracking of anything reachable from `confect/`,\n * including files outside `confect/`.\n */\nconst discoverEntryPoints = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const projectRoot = yield* ProjectRoot.get;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const tryEntry = (relativePath: string, pendingKey: PendingKey) =>\n    Effect.gen(function* () {\n      const absolutePath = path.join(confectDirectory, relativePath);\n      if (!(yield* fs.exists(absolutePath))) {\n        return Option.none<EntryPoint>();\n      }\n      return Option.some<EntryPoint>({\n        absolutePath,\n        displayPath: path.relative(projectRoot, absolutePath),\n        pendingKey,\n      });\n    });\n\n  const fixedEntryOptions = yield* Effect.all([\n    tryEntry(GENERATED_SPEC_PATH, \"specDirty\"),\n    tryEntry(GENERATED_NODE_SPEC_PATH, \"specDirty\"),\n    tryEntry(\"schema.ts\", \"specDirty\"),\n    tryEntry(\"http.ts\", \"httpDirty\"),\n    tryEntry(\"crons.ts\", \"cronsDirty\"),\n    tryEntry(\"auth.ts\", \"authDirty\"),\n  ]);\n\n  const implRelativePaths = yield* discoverLeafImplFiles;\n  const implEntryOptions = yield* Effect.forEach(\n    implRelativePaths,\n    (relativePath) => tryEntry(relativePath, \"specDirty\"),\n  );\n\n  return Array.getSomes([...fixedEntryOptions, ...implEntryOptions]);\n});\n\nconst esbuildOptions = (\n  entry: EntryPoint,\n  notExternal: ReadonlyArray<RegExp>,\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) => {\n  // First `onEnd` fires when esbuild finishes the watcher's initial\n  // build. At startup that's an echo of the just-completed initial\n  // codegen pass; for a watcher spawned mid-session (e.g. a newly\n  // added impl) it's an echo of the codegen run that triggered the\n  // restart. Either way, the entry's contents were already accounted\n  // for, so we record any errors but don't flip dirty or push a\n  // signal — only genuine subsequent rebuilds should do that.\n  const initialBuildSeenRef = Ref.unsafeMake(false);\n  return {\n    entryPoints: [entry.absolutePath],\n    bundle: true,\n    write: false,\n    metafile: true,\n    platform: \"node\" as const,\n    format: \"esm\" as const,\n    logLevel: \"silent\" as const,\n    plugins: [\n      externalPlugin({ notExternal: [...notExternal] }),\n      {\n        name: \"notify-rebuild\",\n        setup(build: esbuild.PluginBuild) {\n          build.onEnd((result) => {\n            Effect.runPromise(\n              Effect.gen(function* () {\n                const wasInitial = yield* Ref.getAndSet(\n                  initialBuildSeenRef,\n                  true,\n                );\n                const isInitial = !wasInitial;\n                yield* Ref.update(watcherErrorsRef, (current) => {\n                  const next = new Map(current);\n                  if (result.errors.length > 0) {\n                    next.set(entry.absolutePath, result.errors);\n                  } else {\n                    next.delete(entry.absolutePath);\n                  }\n                  return next;\n                });\n                if (isInitial && result.errors.length === 0) return;\n                yield* Ref.update(pendingRef, (p) => ({\n                  ...p,\n                  [entry.pendingKey]: true,\n                }));\n                yield* Queue.offer(signal, undefined);\n              }),\n            );\n          });\n        },\n      },\n    ],\n  };\n};\n\nconst createEntryPointWatcher = (\n  entry: EntryPoint,\n  notExternal: ReadonlyArray<RegExp>,\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) =>\n  Effect.acquireRelease(\n    Effect.promise(async () => {\n      const ctx = await esbuild.context(\n        esbuildOptions(\n          entry,\n          notExternal,\n          signal,\n          pendingRef,\n          watcherErrorsRef,\n        ),\n      );\n      await ctx.watch();\n      return ctx;\n    }),\n    (ctx) =>\n      Effect.gen(function* () {\n        yield* Effect.promise(() => ctx.dispose());\n        // Clear any errors recorded by this watcher so a disposed\n        // watcher can't leave stale errors visible to the sync loop.\n        yield* Ref.update(watcherErrorsRef, (current) => {\n          if (!current.has(entry.absolutePath)) return current;\n          const next = new Map(current);\n          next.delete(entry.absolutePath);\n          return next;\n        });\n        yield* Effect.logDebug(\n          `esbuild watcher disposed: ${entry.displayPath}`,\n        );\n      }),\n  );\n\n/**\n * Holds one scoped esbuild watcher per entry point and reconciles the set\n * whenever something offers to `restartQueue`. Adding or removing an entry\n * point only spawns/disposes the affected watcher; unchanged entries keep\n * their existing context, so a structural change doesn't churn watchers\n * for unrelated files.\n */\nconst entryPointsWatcher = (\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  restartQueue: Queue.Queue<void>,\n  watcherErrorsRef: Ref.Ref<WatcherErrors>,\n) =>\n  Effect.gen(function* () {\n    const parentScope = yield* Effect.scope;\n    const scopesRef = yield* Ref.make(new Map<string, Scope.CloseableScope>());\n    const projectRoot = yield* ProjectRoot.get;\n    // Discover the user's `tsconfig.json#paths` once at watcher startup so\n    // `~/...`-style aliases pointing into the user's source tree get bundled\n    // by esbuild instead of externalized via `bundle-require`'s `node_modules`\n    // heuristic. `loadTsConfig` walks up from `projectRoot` to find a\n    // `tsconfig.json`; if none exists, `paths` is empty and `notExternal` is\n    // `[]`, leaving the externalization rule unchanged.\n    const tsconfig = loadTsConfig(projectRoot);\n    const notExternal = tsconfigPathsToRegExp(\n      tsconfig?.data.compilerOptions?.paths ?? {},\n    );\n\n    const sync = Effect.gen(function* () {\n      const desired = yield* discoverEntryPoints;\n      const desiredByPath = new Map(\n        desired.map((entryPoint) => [entryPoint.absolutePath, entryPoint]),\n      );\n      const current = yield* Ref.get(scopesRef);\n\n      yield* Effect.forEach(\n        Array.fromIterable(current),\n        ([absolutePath, childScope]) =>\n          desiredByPath.has(absolutePath)\n            ? Effect.void\n            : Scope.close(childScope, Exit.void).pipe(\n                Effect.andThen(\n                  Ref.update(scopesRef, (scopes) => {\n                    const updated = new Map(scopes);\n                    updated.delete(absolutePath);\n                    return updated;\n                  }),\n                ),\n              ),\n      );\n\n      yield* Effect.forEach(desired, (entry) =>\n        Effect.gen(function* () {\n          const existing = yield* Ref.get(scopesRef);\n          if (existing.has(entry.absolutePath)) return;\n\n          const childScope = yield* Scope.fork(\n            parentScope,\n            ExecutionStrategy.sequential,\n          );\n          yield* createEntryPointWatcher(\n            entry,\n            notExternal,\n            signal,\n            pendingRef,\n            watcherErrorsRef,\n          ).pipe(Scope.extend(childScope));\n          yield* Ref.update(scopesRef, (scopes) => {\n            const updated = new Map(scopes);\n            updated.set(entry.absolutePath, childScope);\n            return updated;\n          });\n        }),\n      );\n    });\n\n    yield* sync;\n\n    return yield* Effect.forever(\n      Queue.take(restartQueue).pipe(Effect.andThen(sync)),\n    );\n  });\n\n/**\n * Single recursive `fs.watch` on `confect/`. Flips the matching dirty flag\n * for any change to an entry-point-shaped file (so codegen runs without\n * waiting on a newly spawned esbuild watcher), and offers to\n * `restartQueue` when an entry point is created or removed so the watcher\n * manager picks up the new set.\n */\nconst confectStructureWatcher = (\n  signal: Queue.Queue<void>,\n  pendingRef: Ref.Ref<Pending>,\n  restartQueue: Queue.Queue<void>,\n) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    const path = yield* Path.Path;\n    const confectDirectory = yield* ConfectDirectory.get;\n\n    yield* pipe(\n      fs.watch(confectDirectory, { recursive: true }),\n      Stream.debounce(Duration.millis(200)),\n      Stream.runForEach((event) =>\n        handleConfectChange({\n          relativePath: path.relative(confectDirectory, event.path),\n          eventTag: event._tag,\n          signal,\n          pendingRef,\n          restartQueue,\n        }),\n      ),\n    );\n  });\n\nconst TOP_LEVEL_OPTIONAL_KEYS: ReadonlyMap<string, PendingKey> = new Map([\n  [\"http.ts\", \"httpDirty\"],\n  [\"crons.ts\", \"cronsDirty\"],\n  [\"auth.ts\", \"authDirty\"],\n]);\n\nconst flipDirtyAndSignal = (\n  pendingRef: Ref.Ref<Pending>,\n  signal: Queue.Queue<void>,\n  key: PendingKey,\n  restartQueue: Queue.Queue<void>,\n  restart: boolean,\n) =>\n  pipe(\n    Ref.update(pendingRef, (p) => ({ ...p, [key]: true })),\n    Effect.andThen(Queue.offer(signal, undefined)),\n    Effect.andThen(\n      restart ? Queue.offer(restartQueue, undefined) : Effect.void,\n    ),\n  );\n\nconst handleConfectChange = ({\n  relativePath,\n  eventTag,\n  signal,\n  pendingRef,\n  restartQueue,\n}: {\n  relativePath: string;\n  eventTag: \"Create\" | \"Update\" | \"Remove\";\n  signal: Queue.Queue<void>;\n  pendingRef: Ref.Ref<Pending>;\n  restartQueue: Queue.Queue<void>;\n}) => {\n  // _generated/ files are written by codegen itself; reacting to them here\n  // would form a loop. The esbuild watchers track the generated specs as\n  // entry points, so changes there flow back through `notify-rebuild`.\n  if (relativePath.split(/[/\\\\]/).includes(\"_generated\")) {\n    return Effect.void;\n  }\n\n  if (!relativePath.endsWith(\".ts\")) {\n    return Effect.void;\n  }\n\n  const isLifecycleChange = eventTag !== \"Update\";\n\n  const topLevelKey = TOP_LEVEL_OPTIONAL_KEYS.get(relativePath);\n  if (topLevelKey !== undefined) {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      topLevelKey,\n      restartQueue,\n      isLifecycleChange,\n    );\n  }\n\n  if (relativePath === \"schema.ts\") {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      \"specDirty\",\n      restartQueue,\n      isLifecycleChange,\n    );\n  }\n\n  if (isLeafSpecPath(relativePath) || isLeafImplPath(relativePath)) {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      \"specDirty\",\n      restartQueue,\n      isLifecycleChange,\n    );\n  }\n\n  // Any other `.ts` under `confect/` (helpers like `tables/Notes.ts`).\n  // Updates to such files are handled by the esbuild watcher for whichever\n  // entry point imports them — its onEnd flips the right dirty flag.\n  // Creates are our safety net: when a previously-missing import is added,\n  // esbuild may not have its parent directory on a poll path, so we\n  // re-run codegen on Create here.\n  if (eventTag === \"Create\") {\n    return flipDirtyAndSignal(\n      pendingRef,\n      signal,\n      \"specDirty\",\n      restartQueue,\n      false,\n    );\n  }\n\n  return Effect.void;\n};\n\nconst syncOptionalFile = (generate: typeof generateHttp, convexFile: string) =>\n  pipe(\n    generate,\n    Effect.andThen(\n      Option.match({\n        onSome: ({ change, convexFilePath }) =>\n          Match.value(change).pipe(\n            Match.when(\"Unchanged\", () => Effect.void),\n            Match.whenOr(\"Added\", \"Modified\", (addedOrModified) =>\n              logFileChangeIndented(addedOrModified, convexFilePath),\n            ),\n            Match.exhaustive,\n          ),\n        onNone: () =>\n          Effect.gen(function* () {\n            const fs = yield* FileSystem.FileSystem;\n            const path = yield* Path.Path;\n            const convexDirectory = yield* ConvexDirectory.get;\n            const convexFilePath = path.join(convexDirectory, convexFile);\n\n            if (yield* fs.exists(convexFilePath)) {\n              yield* fs.remove(convexFilePath);\n              yield* logFileChangeIndented(\"Removed\", convexFilePath);\n            }\n          }),\n      }),\n    ),\n  );\n"],"mappings":"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"}

package/dist/package.mjs

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "9.0.0-next.3";
+var version = "9.0.0-next.5";
 
 //#endregion
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@confect/cli",
-  "version": "9.0.0-next.3",
+  "version": "9.0.0-next.5",
   "description": "Developer tooling for codegen and sync",
   "repository": {
     "type": "git",
@@ -44,6 +44,7 @@
     "@effect/platform-node-shared": "0.59.0",
     "@effect/printer": "^0.49.0",
     "@effect/printer-ansi": "^0.49.0",
+    "bundle-require": "^5.1.0",
     "code-block-writer": "^13.0.3",
     "esbuild": "^0.27.3"
   },
@@ -65,8 +66,8 @@
   },
   "peerDependencies": {
     "effect": "^3.21.2",
-    "@confect/core": "^9.0.0-next.3",
-    "@confect/server": "^9.0.0-next.3"
+    "@confect/core": "^9.0.0-next.5",
+    "@confect/server": "^9.0.0-next.5"
   },
   "engines": {
     "node": ">=22",

package/src/Bundler.ts

@@ -1,8 +1,8 @@
-import { createRequire } from "node:module";
-import { pathToFileURL } from "node:url";
+import { dirname, isAbsolute, resolve } from "node:path";
 import { Path } from "@effect/platform";
+import { bundleRequire } from "bundle-require";
 import { Array, Effect, Option, pipe } from "effect";
-import * as esbuild from "esbuild";
+import type * as esbuild from "esbuild";
 import { BundlerError } from "./BuildError";
 
 export interface Bundled {
@@ -10,86 +10,84 @@ export interface Bundled {
   readonly metafile: esbuild.Metafile;
 }
 
-export const EXTERNAL_PACKAGES = [
-  "@confect/core",
-  "@confect/server",
-  "effect",
-  "@effect/*",
-];
-
-const isExternalImport = (path: string) =>
-  EXTERNAL_PACKAGES.some((p) => {
-    if (p.endsWith("/*")) {
-      return path.startsWith(p.slice(0, -1));
-    }
-    return path === p || path.startsWith(p + "/");
-  });
-
-export const absoluteExternalsPlugin: esbuild.Plugin = {
-  name: "absolute-externals",
-  setup(build) {
-    build.onResolve({ filter: /.*/ }, async (args) => {
-      if (args.kind !== "import-statement" && args.kind !== "dynamic-import")
-        return;
-      if (!isExternalImport(args.path)) return;
-      // `import.meta.resolve`'s second argument is silently ignored in modern
-      // Node, so resolution would always walk up from the CLI's bundled file
-      // (`packages/cli/dist/utils.mjs`) instead of from the user's project.
-      // Use `createRequire` keyed on the importing file's directory so we
-      // resolve out of *their* `node_modules`. The synthetic filename is just
-      // a CommonJS resolution anchor; the file does not need to exist.
-      const parentFile = pathToFileURL(args.resolveDir + "/_").href;
-      const require_ = createRequire(parentFile);
-      const resolvedPath = require_.resolve(args.path);
-      const resolved = pathToFileURL(resolvedPath).href;
-      return { path: resolved, external: true };
-    });
-  },
-};
-
-const buildEntry = (entryPoint: string) =>
-  Effect.tryPromise({
-    try: () =>
-      esbuild.build({
-        entryPoints: [entryPoint],
-        bundle: true,
-        write: false,
-        platform: "node",
-        format: "esm",
-        logLevel: "silent",
-        metafile: true,
-        plugins: [absoluteExternalsPlugin],
-      }),
-    catch: (cause) => new BundlerError({ cause }),
-  });
-
-const importBundledModule = (result: esbuild.BuildResult) => {
-  const code = result.outputFiles![0]!.text;
-  const dataUrl =
-    "data:text/javascript;base64," + Buffer.from(code).toString("base64");
-  return import(dataUrl);
+/**
+ * `bundle-require` sets `absWorkingDir: cwd` on the underlying esbuild build,
+ * so the metafile's input keys (and each input's `imports[].path`) are stored
+ * relative to that cwd. Callers reach for the metafile with absolute paths
+ * (e.g. {@link directlyImports}), so we normalize every key/import path to
+ * absolute up front. That way the lookup logic stays oblivious to whatever
+ * cwd was used during bundling.
+ */
+const absolutizeMetafile = (
+  metafile: esbuild.Metafile,
+  cwd: string,
+): esbuild.Metafile => {
+  const absolutize = (p: string) => (isAbsolute(p) ? p : resolve(cwd, p));
+  const inputs: esbuild.Metafile["inputs"] = {};
+  for (const [key, value] of Object.entries(metafile.inputs)) {
+    inputs[absolutize(key)] = {
+      ...value,
+      imports: value.imports.map((i) => ({ ...i, path: absolutize(i.path) })),
+    };
+  }
+  const outputs: esbuild.Metafile["outputs"] = {};
+  for (const [key, value] of Object.entries(metafile.outputs)) {
+    outputs[absolutize(key)] = value;
+  }
+  return { inputs, outputs };
 };
 
 /**
- * Bundle a TypeScript entry point with esbuild and import the result via a
- * data URL. This handles extensionless `.ts` imports regardless of whether
- * the user's project sets `"type": "module"` in package.json. The returned
- * pair carries both the imported module and the esbuild metafile so callers
- * can inspect the import graph (see {@link directlyImports}).
+ * Bundle a TypeScript entry point with esbuild via {@link bundleRequire} and
+ * import the result. `bundle-require` writes a temp `.mjs` next to the source,
+ * `import()`s it, and deletes it — so bare-specifier externals (third-party
+ * packages, workspace deps) resolve through the user's normal `node_modules`
+ * walk, and tsconfig `paths` aliases stay inside the bundle.
+ *
+ * `cwd` is set to the entry's directory so `bundle-require`'s `tsconfig.json`
+ * discovery (which walks upward from `cwd`) lands on the project's tsconfig
+ * regardless of where `confect codegen` was invoked from, and so esbuild
+ * resolves relative imports against the entry's location.
+ *
+ * The returned pair carries both the imported module and the esbuild metafile
+ * so callers can inspect the import graph (see {@link directlyImports}); the
+ * metafile is captured via a small `onEnd` plugin because `bundle-require`
+ * itself only exposes a flat `dependencies: string[]`.
  */
 export const bundle = (
   entryPoint: string,
 ): Effect.Effect<Bundled, BundlerError> =>
   Effect.gen(function* () {
-    const result = yield* buildEntry(entryPoint);
-    const module = yield* Effect.tryPromise({
-      try: () => importBundledModule(result),
+    let metafile: esbuild.Metafile | undefined;
+    const captureMetafile: esbuild.Plugin = {
+      name: "confect:capture-metafile",
+      setup(build) {
+        build.onEnd((result) => {
+          metafile = result.metafile;
+        });
+      },
+    };
+
+    const cwd = dirname(entryPoint);
+    const result = yield* Effect.tryPromise({
+      try: () =>
+        bundleRequire({
+          filepath: entryPoint,
+          cwd,
+          format: "esm",
+          esbuildOptions: {
+            plugins: [captureMetafile],
+            logLevel: "silent",
+          },
+        }),
       catch: (cause) => new BundlerError({ cause }),
     });
-    if (!result.metafile) {
+
+    if (!metafile) {
       return yield* Effect.dieMessage("esbuild metafile missing");
     }
-    return { module, metafile: result.metafile };
+
+    return { module: result.mod, metafile: absolutizeMetafile(metafile, cwd) };
   });
 
 const findMetafileInputKey = (

package/src/confect/dev.ts

@@ -22,9 +22,13 @@ import {
   Stream,
   String,
 } from "effect";
+import {
+  externalPlugin,
+  loadTsConfig,
+  tsconfigPathsToRegExp,
+} from "bundle-require";
 import * as esbuild from "esbuild";
 import { logCoalescedBuildErrors } from "../BuildError";
-import { absoluteExternalsPlugin, EXTERNAL_PACKAGES } from "../Bundler";
 import * as CodegenError from "../CodegenError";
 import { ConfectDirectory } from "../ConfectDirectory";
 import { ConvexDirectory } from "../ConvexDirectory";
@@ -430,6 +434,7 @@ const discoverEntryPoints = Effect.gen(function* () {
 
 const esbuildOptions = (
   entry: EntryPoint,
+  notExternal: ReadonlyArray<RegExp>,
   signal: Queue.Queue<void>,
   pendingRef: Ref.Ref<Pending>,
   watcherErrorsRef: Ref.Ref<WatcherErrors>,
@@ -450,9 +455,8 @@ const esbuildOptions = (
     platform: "node" as const,
     format: "esm" as const,
     logLevel: "silent" as const,
-    external: EXTERNAL_PACKAGES,
     plugins: [
-      absoluteExternalsPlugin,
+      externalPlugin({ notExternal: [...notExternal] }),
       {
         name: "notify-rebuild",
         setup(build: esbuild.PluginBuild) {
@@ -490,6 +494,7 @@ const esbuildOptions = (
 
 const createEntryPointWatcher = (
   entry: EntryPoint,
+  notExternal: ReadonlyArray<RegExp>,
   signal: Queue.Queue<void>,
   pendingRef: Ref.Ref<Pending>,
   watcherErrorsRef: Ref.Ref<WatcherErrors>,
@@ -497,7 +502,13 @@ const createEntryPointWatcher = (
   Effect.acquireRelease(
     Effect.promise(async () => {
       const ctx = await esbuild.context(
-        esbuildOptions(entry, signal, pendingRef, watcherErrorsRef),
+        esbuildOptions(
+          entry,
+          notExternal,
+          signal,
+          pendingRef,
+          watcherErrorsRef,
+        ),
       );
       await ctx.watch();
       return ctx;
@@ -535,6 +546,17 @@ const entryPointsWatcher = (
   Effect.gen(function* () {
     const parentScope = yield* Effect.scope;
     const scopesRef = yield* Ref.make(new Map<string, Scope.CloseableScope>());
+    const projectRoot = yield* ProjectRoot.get;
+    // Discover the user's `tsconfig.json#paths` once at watcher startup so
+    // `~/...`-style aliases pointing into the user's source tree get bundled
+    // by esbuild instead of externalized via `bundle-require`'s `node_modules`
+    // heuristic. `loadTsConfig` walks up from `projectRoot` to find a
+    // `tsconfig.json`; if none exists, `paths` is empty and `notExternal` is
+    // `[]`, leaving the externalization rule unchanged.
+    const tsconfig = loadTsConfig(projectRoot);
+    const notExternal = tsconfigPathsToRegExp(
+      tsconfig?.data.compilerOptions?.paths ?? {},
+    );
 
     const sync = Effect.gen(function* () {
       const desired = yield* discoverEntryPoints;
@@ -570,6 +592,7 @@ const entryPointsWatcher = (
           );
           yield* createEntryPointWatcher(
             entry,
+            notExternal,
             signal,
             pendingRef,
             watcherErrorsRef,