@confect/cli 1.0.0-next.3 → 1.0.0-next.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @confect/cli
 
+## 1.0.0-next.4
+
+### Patch Changes
+
+- 46109fb: Support Node actions
+- Updated dependencies [46109fb]
+  - @confect/server@1.0.0-next.4
+  - @confect/core@1.0.0-next.4
+
 ## 1.0.0-next.3
 
 ### Patch Changes

package/dist/confect/codegen.mjs

@@ -1,7 +1,7 @@
-import { logCompleted, logFileAdded, logFileModified } from "../log.mjs";
+import { logFileAdded, logFileModified, logFileRemoved, logPending, logSuccess } from "../log.mjs";
 import { ConvexDirectory } from "../services/ConvexDirectory.mjs";
 import { ConfectDirectory } from "../services/ConfectDirectory.mjs";
-import { api, refs, registeredFunctions, schema, services } from "../templates.mjs";
+import { api, nodeApi, nodeRegisteredFunctions, refs, registeredFunctions, schema, services } from "../templates.mjs";
 import { generateAuthConfig, generateConvexConfig, generateCrons, generateFunctions, generateHttp, removePathExtension, writeFileStringAndLog } from "../utils.mjs";
 import { Effect, Match, Option } from "effect";
 import { Command } from "@effect/cli";
@@ -11,9 +11,25 @@ import { FileSystem, Path } from "@effect/platform";
 import * as tsx from "tsx/esm/api";
 
 //#region src/confect/codegen.ts
+const getNodeSpecPath = Effect.gen(function* () {
+	const path = yield* Path.Path;
+	const confectDirectory = yield* ConfectDirectory.get;
+	return path.join(confectDirectory, "nodeSpec.ts");
+});
+const loadNodeSpec = Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const nodeSpecPath = yield* getNodeSpecPath;
+	if (!(yield* fs.exists(nodeSpecPath))) return Option.none();
+	const nodeSpecPathUrl = yield* path.toFileUrl(nodeSpecPath);
+	const nodeSpec = (yield* Effect.promise(() => tsx.tsImport(nodeSpecPathUrl.href, import.meta.url))).default;
+	if (!Spec.isNodeSpec(nodeSpec)) return yield* Effect.die("nodeSpec.ts does not export a valid Node Spec");
+	return Option.some(nodeSpec);
+});
 const codegen = Command.make("codegen", {}, () => Effect.gen(function* () {
+	yield* logPending("Performing initial sync…");
 	yield* codegenHandler;
-	yield* logCompleted("Generated files are up-to-date");
+	yield* logSuccess("Generated files are up-to-date");
 })).pipe(Command.withDescription("Generate `confect/_generated` files and the contents of the `convex` directory (except `tsconfig.json`)"));
 const codegenHandler = Effect.gen(function* () {
 	yield* generateConfectGeneratedDirectory;
@@ -21,6 +37,8 @@ const codegenHandler = Effect.gen(function* () {
 		generateApi,
 		generateRefs,
 		generateRegisteredFunctions,
+		generateNodeApi,
+		generateNodeRegisteredFunctions,
 		generateServices
 	], { concurrency: "unbounded" });
 	const [functionPaths] = yield* Effect.all([
@@ -46,21 +64,50 @@ const generateApi = Effect.gen(function* () {
 	const path = yield* Path.Path;
 	const confectDirectory = yield* ConfectDirectory.get;
 	const apiPath = path.join(confectDirectory, "_generated", "api.ts");
-	const schemaImportPath = yield* removePathExtension(path.relative(path.dirname(apiPath), path.join(confectDirectory, "schema.ts")));
-	const specImportPath = yield* removePathExtension(path.relative(path.dirname(apiPath), path.join(confectDirectory, "spec.ts")));
+	const apiDir = path.dirname(apiPath);
+	const schemaImportPath = yield* removePathExtension(path.relative(apiDir, path.join(confectDirectory, "schema.ts")));
+	const specImportPath = yield* removePathExtension(path.relative(apiDir, path.join(confectDirectory, "spec.ts")));
 	yield* writeFileStringAndLog(apiPath, yield* api({
 		schemaImportPath,
 		specImportPath
 	}));
 });
+const generateNodeApi = Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const confectDirectory = yield* ConfectDirectory.get;
+	const nodeSpecPath = yield* getNodeSpecPath;
+	const nodeApiPath = path.join(confectDirectory, "_generated", "nodeApi.ts");
+	if (!(yield* fs.exists(nodeSpecPath))) {
+		if (yield* fs.exists(nodeApiPath)) {
+			yield* fs.remove(nodeApiPath);
+			yield* logFileRemoved(nodeApiPath);
+		}
+		return;
+	}
+	const nodeApiDir = path.dirname(nodeApiPath);
+	const schemaImportPath = yield* removePathExtension(path.relative(nodeApiDir, path.join(confectDirectory, "schema.ts")));
+	const nodeSpecImportPath = yield* removePathExtension(path.relative(nodeApiDir, nodeSpecPath));
+	yield* writeFileStringAndLog(nodeApiPath, yield* nodeApi({
+		schemaImportPath,
+		nodeSpecImportPath
+	}));
+});
 const generateFunctionModules = Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const confectDirectory = yield* ConfectDirectory.get;
 	const specPath = path.join(confectDirectory, "spec.ts");
 	const specPathUrl = yield* path.toFileUrl(specPath);
 	const spec = (yield* Effect.promise(() => tsx.tsImport(specPathUrl.href, import.meta.url))).default;
-	if (!Spec.isSpec(spec)) return yield* Effect.die("spec.ts does not export a valid Spec");
-	return yield* generateFunctions(spec);
+	if (!Spec.isConvexSpec(spec)) return yield* Effect.die("spec.ts does not export a valid Convex Spec");
+	const nodeImplPath = path.join(confectDirectory, "nodeImpl.ts");
+	const nodeImplExists = yield* fs.exists(nodeImplPath);
+	const nodeSpecOption = yield* loadNodeSpec;
+	return yield* generateFunctions(Option.match(nodeSpecOption, {
+		onNone: () => spec,
+		onSome: (nodeSpec) => nodeImplExists ? Spec.merge(spec, nodeSpec) : spec
+	}));
 });
 const generateSchema = Effect.gen(function* () {
 	const path = yield* Path.Path;
@@ -92,14 +139,39 @@ const generateRegisteredFunctions = Effect.gen(function* () {
 	const implImportPath = yield* removePathExtension(path.relative(path.dirname(registeredFunctionsPath), path.join(confectDirectory, "impl.ts")));
 	yield* writeFileStringAndLog(registeredFunctionsPath, yield* registeredFunctions({ implImportPath }));
 });
+const generateNodeRegisteredFunctions = Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const confectDirectory = yield* ConfectDirectory.get;
+	const nodeImplPath = path.join(confectDirectory, "nodeImpl.ts");
+	const nodeSpecPath = yield* getNodeSpecPath;
+	const nodeRegisteredFunctionsPath = path.join(confectDirectory, "_generated", "nodeRegisteredFunctions.ts");
+	const nodeImplExists = yield* fs.exists(nodeImplPath);
+	const nodeSpecExists = yield* fs.exists(nodeSpecPath);
+	if (!nodeImplExists || !nodeSpecExists) {
+		if (yield* fs.exists(nodeRegisteredFunctionsPath)) {
+			yield* fs.remove(nodeRegisteredFunctionsPath);
+			yield* logFileRemoved(nodeRegisteredFunctionsPath);
+		}
+		return;
+	}
+	const nodeImplImportPath = yield* removePathExtension(path.relative(path.dirname(nodeRegisteredFunctionsPath), nodeImplPath));
+	yield* writeFileStringAndLog(nodeRegisteredFunctionsPath, yield* nodeRegisteredFunctions({ nodeImplImportPath }));
+});
 const generateRefs = Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const confectDirectory = yield* ConfectDirectory.get;
 	const confectGeneratedDirectory = path.join(confectDirectory, "_generated");
-	const confectSpecPath = path.join(confectDirectory, "spec.ts");
 	const refsPath = path.join(confectGeneratedDirectory, "refs.ts");
-	const importPathWithoutExt = yield* removePathExtension(path.relative(path.dirname(refsPath), confectSpecPath));
-	yield* writeFileStringAndLog(refsPath, yield* refs({ specImportPath: importPathWithoutExt }));
+	const refsDir = path.dirname(refsPath);
+	const specImportPath = yield* removePathExtension(path.relative(refsDir, path.join(confectDirectory, "spec.ts")));
+	const nodeSpecPath = yield* getNodeSpecPath;
+	const nodeSpecImportPath = (yield* fs.exists(nodeSpecPath)) ? yield* removePathExtension(path.relative(refsDir, nodeSpecPath)) : null;
+	yield* writeFileStringAndLog(refsPath, yield* refs({
+		specImportPath,
+		...nodeSpecImportPath === null ? {} : { nodeSpecImportPath }
+	}));
 });
 const logGenerated = (effect) => effect.pipe(Effect.tap(Option.match({
 	onNone: () => Effect.void,
@@ -107,5 +179,5 @@ const logGenerated = (effect) => effect.pipe(Effect.tap(Option.match({
 })));
 
 //#endregion
-export { codegen, codegenHandler };
+export { codegen, codegenHandler, generateNodeApi, generateNodeRegisteredFunctions };
 //# sourceMappingURL=codegen.mjs.map

package/dist/confect/codegen.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.mjs","names":["templates.api","templates.schema","templates.services","templates.registeredFunctions","templates.refs"],"sources":["../../src/confect/codegen.ts"],"sourcesContent":["import { Spec } from \"@confect/core\";\nimport { DatabaseSchema } from \"@confect/server\";\nimport { Command } from \"@effect/cli\";\nimport { FileSystem, Path } from \"@effect/platform\";\nimport { Effect, Match, Option } from \"effect\";\nimport * as tsx from \"tsx/esm/api\";\nimport { logCompleted, logFileAdded, logFileModified } from \"../log\";\nimport { ConfectDirectory } from \"../services/ConfectDirectory\";\nimport { ConvexDirectory } from \"../services/ConvexDirectory\";\nimport * as templates from \"../templates\";\nimport {\n  generateAuthConfig,\n  generateConvexConfig,\n  generateCrons,\n  generateFunctions,\n  generateHttp,\n  removePathExtension,\n  writeFileStringAndLog,\n} from \"../utils\";\n\nexport const codegen = Command.make(\"codegen\", {}, () =>\n  Effect.gen(function* () {\n    yield* codegenHandler;\n    yield* logCompleted(\"Generated files are up-to-date\");\n  }),\n).pipe(\n  Command.withDescription(\n    \"Generate `confect/_generated` files and the contents of the `convex` directory (except `tsconfig.json`)\",\n  ),\n);\n\nexport const codegenHandler = Effect.gen(function* () {\n  yield* generateConfectGeneratedDirectory;\n  yield* Effect.all(\n    [generateApi, generateRefs, generateRegisteredFunctions, generateServices],\n    { concurrency: \"unbounded\" },\n  );\n  const [functionPaths] = yield* Effect.all(\n    [\n      generateFunctionModules,\n      generateSchema,\n      logGenerated(generateHttp),\n      logGenerated(generateConvexConfig),\n      logGenerated(generateCrons),\n      logGenerated(generateAuthConfig),\n    ],\n    { concurrency: \"unbounded\" },\n  );\n  return functionPaths;\n});\n\nconst generateConfectGeneratedDirectory = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  if (!(yield* fs.exists(path.join(confectDirectory, \"_generated\")))) {\n    yield* fs.makeDirectory(path.join(confectDirectory, \"_generated\"), {\n      recursive: true,\n    });\n    yield* logFileAdded(path.join(confectDirectory, \"_generated\") + \"/\");\n  }\n});\n\nconst generateApi = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const apiPath = path.join(confectDirectory, \"_generated\", \"api.ts\");\n\n  const schemaImportPath = yield* removePathExtension(\n    path.relative(\n      path.dirname(apiPath),\n      path.join(confectDirectory, \"schema.ts\"),\n    ),\n  );\n\n  const specImportPath = yield* removePathExtension(\n    path.relative(\n      path.dirname(apiPath),\n      path.join(confectDirectory, \"spec.ts\"),\n    ),\n  );\n\n  const apiContents = yield* templates.api({\n    schemaImportPath,\n    specImportPath,\n  });\n\n  yield* writeFileStringAndLog(apiPath, apiContents);\n});\n\nconst generateFunctionModules = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const specPath = path.join(confectDirectory, \"spec.ts\");\n  const specPathUrl = yield* path.toFileUrl(specPath);\n\n  const specModule = yield* Effect.promise(() =>\n    tsx.tsImport(specPathUrl.href, import.meta.url),\n  );\n  const spec = specModule.default;\n\n  if (!Spec.isSpec(spec)) {\n    return yield* Effect.die(\"spec.ts does not export a valid Spec\");\n  }\n\n  return yield* generateFunctions(spec);\n});\n\nconst generateSchema = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n  const convexDirectory = yield* ConvexDirectory.get;\n\n  const confectSchemaPath = path.join(confectDirectory, \"schema.ts\");\n  const confectSchemaUrl = yield* path.toFileUrl(confectSchemaPath);\n\n  yield* Effect.promise(() =>\n    tsx.tsImport(confectSchemaUrl.href, import.meta.url),\n  ).pipe(\n    Effect.andThen((schemaModule) => {\n      const defaultExport = schemaModule.default;\n\n      return DatabaseSchema.isSchema(defaultExport)\n        ? Effect.succeed(defaultExport)\n        : Effect.die(\"Invalid schema module\");\n    }),\n  );\n\n  const convexSchemaPath = path.join(convexDirectory, \"schema.ts\");\n\n  const relativeImportPath = path.relative(\n    path.dirname(convexSchemaPath),\n    confectSchemaPath,\n  );\n  const importPathWithoutExt = yield* removePathExtension(relativeImportPath);\n  const schemaContents = yield* templates.schema({\n    schemaImportPath: importPathWithoutExt,\n  });\n\n  yield* writeFileStringAndLog(convexSchemaPath, schemaContents);\n});\n\nconst generateServices = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const confectGeneratedDirectory = path.join(confectDirectory, \"_generated\");\n\n  const servicesPath = path.join(confectGeneratedDirectory, \"services.ts\");\n  const schemaImportPath = path.relative(\n    path.dirname(servicesPath),\n    path.join(confectDirectory, \"schema\"),\n  );\n\n  const servicesContentsString = yield* templates.services({\n    schemaImportPath,\n  });\n\n  yield* writeFileStringAndLog(servicesPath, servicesContentsString);\n});\n\nconst generateRegisteredFunctions = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const confectGeneratedDirectory = path.join(confectDirectory, \"_generated\");\n\n  const registeredFunctionsPath = path.join(\n    confectGeneratedDirectory,\n    \"registeredFunctions.ts\",\n  );\n  const implImportPath = yield* removePathExtension(\n    path.relative(\n      path.dirname(registeredFunctionsPath),\n      path.join(confectDirectory, \"impl.ts\"),\n    ),\n  );\n\n  const registeredFunctionsContents = yield* templates.registeredFunctions({\n    implImportPath,\n  });\n\n  yield* writeFileStringAndLog(\n    registeredFunctionsPath,\n    registeredFunctionsContents,\n  );\n});\n\nconst generateRefs = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const confectGeneratedDirectory = path.join(confectDirectory, \"_generated\");\n\n  const confectSpecPath = path.join(confectDirectory, \"spec.ts\");\n  const refsPath = path.join(confectGeneratedDirectory, \"refs.ts\");\n\n  const relativeImportPath = path.relative(\n    path.dirname(refsPath),\n    confectSpecPath,\n  );\n  const importPathWithoutExt = yield* removePathExtension(relativeImportPath);\n\n  const refsContents = yield* templates.refs({\n    specImportPath: importPathWithoutExt,\n  });\n\n  yield* writeFileStringAndLog(refsPath, refsContents);\n});\n\nconst logGenerated = (effect: typeof generateHttp) =>\n  effect.pipe(\n    Effect.tap(\n      Option.match({\n        onNone: () => Effect.void,\n        onSome: ({ change, convexFilePath }) =>\n          Match.value(change).pipe(\n            Match.when(\"Added\", () => logFileAdded(convexFilePath)),\n            Match.when(\"Modified\", () => logFileModified(convexFilePath)),\n            Match.when(\"Unchanged\", () => Effect.void),\n            Match.exhaustive,\n          ),\n      }),\n    ),\n  );\n"],"mappings":"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"}
+{"version":3,"file":"codegen.mjs","names":["templates.api","templates.nodeApi","templates.schema","templates.services","templates.registeredFunctions","templates.nodeRegisteredFunctions","templates.refs"],"sources":["../../src/confect/codegen.ts"],"sourcesContent":["import { Spec } from \"@confect/core\";\nimport { DatabaseSchema } from \"@confect/server\";\nimport { Command } from \"@effect/cli\";\nimport { FileSystem, Path } from \"@effect/platform\";\nimport { Effect, Match, Option } from \"effect\";\nimport * as tsx from \"tsx/esm/api\";\nimport {\n  logFileAdded,\n  logFileModified,\n  logFileRemoved,\n  logPending,\n  logSuccess,\n} from \"../log\";\nimport { ConfectDirectory } from \"../services/ConfectDirectory\";\nimport { ConvexDirectory } from \"../services/ConvexDirectory\";\nimport * as templates from \"../templates\";\nimport {\n  generateAuthConfig,\n  generateConvexConfig,\n  generateCrons,\n  generateFunctions,\n  generateHttp,\n  removePathExtension,\n  writeFileStringAndLog,\n} from \"../utils\";\n\nconst getNodeSpecPath = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n  return path.join(confectDirectory, \"nodeSpec.ts\");\n});\n\nconst loadNodeSpec = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const nodeSpecPath = yield* getNodeSpecPath;\n\n  if (!(yield* fs.exists(nodeSpecPath))) {\n    return Option.none<Spec.AnyWithPropsWithRuntime<\"Node\">>();\n  }\n\n  const nodeSpecPathUrl = yield* path.toFileUrl(nodeSpecPath);\n  const nodeSpecModule = yield* Effect.promise(() =>\n    tsx.tsImport(nodeSpecPathUrl.href, import.meta.url),\n  );\n  const nodeSpec = nodeSpecModule.default;\n\n  if (!Spec.isNodeSpec(nodeSpec)) {\n    return yield* Effect.die(\"nodeSpec.ts does not export a valid Node Spec\");\n  }\n\n  return Option.some(nodeSpec);\n});\n\nexport const codegen = Command.make(\"codegen\", {}, () =>\n  Effect.gen(function* () {\n    yield* logPending(\"Performing initial sync…\");\n    yield* codegenHandler;\n    yield* logSuccess(\"Generated files are up-to-date\");\n  }),\n).pipe(\n  Command.withDescription(\n    \"Generate `confect/_generated` files and the contents of the `convex` directory (except `tsconfig.json`)\",\n  ),\n);\n\nexport const codegenHandler = Effect.gen(function* () {\n  yield* generateConfectGeneratedDirectory;\n  yield* Effect.all(\n    [\n      generateApi,\n      generateRefs,\n      generateRegisteredFunctions,\n      generateNodeApi,\n      generateNodeRegisteredFunctions,\n      generateServices,\n    ],\n    { concurrency: \"unbounded\" },\n  );\n  const [functionPaths] = yield* Effect.all(\n    [\n      generateFunctionModules,\n      generateSchema,\n      logGenerated(generateHttp),\n      logGenerated(generateConvexConfig),\n      logGenerated(generateCrons),\n      logGenerated(generateAuthConfig),\n    ],\n    { concurrency: \"unbounded\" },\n  );\n  return functionPaths;\n});\n\nconst generateConfectGeneratedDirectory = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  if (!(yield* fs.exists(path.join(confectDirectory, \"_generated\")))) {\n    yield* fs.makeDirectory(path.join(confectDirectory, \"_generated\"), {\n      recursive: true,\n    });\n    yield* logFileAdded(path.join(confectDirectory, \"_generated\") + \"/\");\n  }\n});\n\nconst generateApi = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const apiPath = path.join(confectDirectory, \"_generated\", \"api.ts\");\n  const apiDir = path.dirname(apiPath);\n\n  const schemaImportPath = yield* removePathExtension(\n    path.relative(apiDir, path.join(confectDirectory, \"schema.ts\")),\n  );\n\n  const specImportPath = yield* removePathExtension(\n    path.relative(apiDir, path.join(confectDirectory, \"spec.ts\")),\n  );\n\n  const apiContents = yield* templates.api({\n    schemaImportPath,\n    specImportPath,\n  });\n\n  yield* writeFileStringAndLog(apiPath, apiContents);\n});\n\nexport const generateNodeApi = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const nodeSpecPath = yield* getNodeSpecPath;\n  const nodeApiPath = path.join(confectDirectory, \"_generated\", \"nodeApi.ts\");\n\n  if (!(yield* fs.exists(nodeSpecPath))) {\n    if (yield* fs.exists(nodeApiPath)) {\n      yield* fs.remove(nodeApiPath);\n      yield* logFileRemoved(nodeApiPath);\n    }\n    return;\n  }\n\n  const nodeApiDir = path.dirname(nodeApiPath);\n\n  const schemaImportPath = yield* removePathExtension(\n    path.relative(nodeApiDir, path.join(confectDirectory, \"schema.ts\")),\n  );\n\n  const nodeSpecImportPath = yield* removePathExtension(\n    path.relative(nodeApiDir, nodeSpecPath),\n  );\n\n  const nodeApiContents = yield* templates.nodeApi({\n    schemaImportPath,\n    nodeSpecImportPath,\n  });\n\n  yield* writeFileStringAndLog(nodeApiPath, nodeApiContents);\n});\n\nconst generateFunctionModules = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const specPath = path.join(confectDirectory, \"spec.ts\");\n  const specPathUrl = yield* path.toFileUrl(specPath);\n\n  const specModule = yield* Effect.promise(() =>\n    tsx.tsImport(specPathUrl.href, import.meta.url),\n  );\n  const spec = specModule.default;\n\n  if (!Spec.isConvexSpec(spec)) {\n    return yield* Effect.die(\"spec.ts does not export a valid Convex Spec\");\n  }\n\n  const nodeImplPath = path.join(confectDirectory, \"nodeImpl.ts\");\n  const nodeImplExists = yield* fs.exists(nodeImplPath);\n  const nodeSpecOption = yield* loadNodeSpec;\n\n  const mergedSpec = Option.match(nodeSpecOption, {\n    onNone: () => spec,\n    onSome: (nodeSpec) => (nodeImplExists ? Spec.merge(spec, nodeSpec) : spec),\n  });\n\n  return yield* generateFunctions(mergedSpec);\n});\n\nconst generateSchema = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n  const convexDirectory = yield* ConvexDirectory.get;\n\n  const confectSchemaPath = path.join(confectDirectory, \"schema.ts\");\n  const confectSchemaUrl = yield* path.toFileUrl(confectSchemaPath);\n\n  yield* Effect.promise(() =>\n    tsx.tsImport(confectSchemaUrl.href, import.meta.url),\n  ).pipe(\n    Effect.andThen((schemaModule) => {\n      const defaultExport = schemaModule.default;\n\n      return DatabaseSchema.isSchema(defaultExport)\n        ? Effect.succeed(defaultExport)\n        : Effect.die(\"Invalid schema module\");\n    }),\n  );\n\n  const convexSchemaPath = path.join(convexDirectory, \"schema.ts\");\n\n  const relativeImportPath = path.relative(\n    path.dirname(convexSchemaPath),\n    confectSchemaPath,\n  );\n  const importPathWithoutExt = yield* removePathExtension(relativeImportPath);\n  const schemaContents = yield* templates.schema({\n    schemaImportPath: importPathWithoutExt,\n  });\n\n  yield* writeFileStringAndLog(convexSchemaPath, schemaContents);\n});\n\nconst generateServices = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const confectGeneratedDirectory = path.join(confectDirectory, \"_generated\");\n\n  const servicesPath = path.join(confectGeneratedDirectory, \"services.ts\");\n  const schemaImportPath = path.relative(\n    path.dirname(servicesPath),\n    path.join(confectDirectory, \"schema\"),\n  );\n\n  const servicesContentsString = yield* templates.services({\n    schemaImportPath,\n  });\n\n  yield* writeFileStringAndLog(servicesPath, servicesContentsString);\n});\n\nconst generateRegisteredFunctions = Effect.gen(function* () {\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const confectGeneratedDirectory = path.join(confectDirectory, \"_generated\");\n\n  const registeredFunctionsPath = path.join(\n    confectGeneratedDirectory,\n    \"registeredFunctions.ts\",\n  );\n  const implImportPath = yield* removePathExtension(\n    path.relative(\n      path.dirname(registeredFunctionsPath),\n      path.join(confectDirectory, \"impl.ts\"),\n    ),\n  );\n\n  const registeredFunctionsContents = yield* templates.registeredFunctions({\n    implImportPath,\n  });\n\n  yield* writeFileStringAndLog(\n    registeredFunctionsPath,\n    registeredFunctionsContents,\n  );\n});\n\nexport const generateNodeRegisteredFunctions = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const nodeImplPath = path.join(confectDirectory, \"nodeImpl.ts\");\n  const nodeSpecPath = yield* getNodeSpecPath;\n  const nodeRegisteredFunctionsPath = path.join(\n    confectDirectory,\n    \"_generated\",\n    \"nodeRegisteredFunctions.ts\",\n  );\n\n  const nodeImplExists = yield* fs.exists(nodeImplPath);\n  const nodeSpecExists = yield* fs.exists(nodeSpecPath);\n\n  if (!nodeImplExists || !nodeSpecExists) {\n    if (yield* fs.exists(nodeRegisteredFunctionsPath)) {\n      yield* fs.remove(nodeRegisteredFunctionsPath);\n      yield* logFileRemoved(nodeRegisteredFunctionsPath);\n    }\n    return;\n  }\n\n  const nodeImplImportPath = yield* removePathExtension(\n    path.relative(path.dirname(nodeRegisteredFunctionsPath), nodeImplPath),\n  );\n\n  const nodeRegisteredFunctionsContents =\n    yield* templates.nodeRegisteredFunctions({\n      nodeImplImportPath,\n    });\n\n  yield* writeFileStringAndLog(\n    nodeRegisteredFunctionsPath,\n    nodeRegisteredFunctionsContents,\n  );\n});\n\nconst generateRefs = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const confectDirectory = yield* ConfectDirectory.get;\n\n  const confectGeneratedDirectory = path.join(confectDirectory, \"_generated\");\n  const refsPath = path.join(confectGeneratedDirectory, \"refs.ts\");\n  const refsDir = path.dirname(refsPath);\n\n  const specImportPath = yield* removePathExtension(\n    path.relative(refsDir, path.join(confectDirectory, \"spec.ts\")),\n  );\n\n  const nodeSpecPath = yield* getNodeSpecPath;\n  const nodeSpecExists = yield* fs.exists(nodeSpecPath);\n  const nodeSpecImportPath = nodeSpecExists\n    ? yield* removePathExtension(path.relative(refsDir, nodeSpecPath))\n    : null;\n\n  const refsContents = yield* templates.refs({\n    specImportPath,\n    ...(nodeSpecImportPath === null ? {} : { nodeSpecImportPath }),\n  });\n\n  yield* writeFileStringAndLog(refsPath, refsContents);\n});\n\nconst logGenerated = (effect: typeof generateHttp) =>\n  effect.pipe(\n    Effect.tap(\n      Option.match({\n        onNone: () => Effect.void,\n        onSome: ({ change, convexFilePath }) =>\n          Match.value(change).pipe(\n            Match.when(\"Added\", () => logFileAdded(convexFilePath)),\n            Match.when(\"Modified\", () => logFileModified(convexFilePath)),\n            Match.when(\"Unchanged\", () => Effect.void),\n            Match.exhaustive,\n          ),\n      }),\n    ),\n  );\n"],"mappings":"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"}

package/dist/confect/dev.mjs

@@ -1,12 +1,12 @@
 import { modulePath, toString } from "../GroupPath.mjs";
 import { ProjectRoot } from "../services/ProjectRoot.mjs";
-import { logCompleted, logFailed } from "../log.mjs";
+import { logFailure, logPending, logSuccess } from "../log.mjs";
 import { ConvexDirectory } from "../services/ConvexDirectory.mjs";
 import { ConfectDirectory } from "../services/ConfectDirectory.mjs";
 import { diff, make } from "../FunctionPaths.mjs";
 import { generateAuthConfig, generateConvexConfig, generateCrons, generateHttp, removeGroups, writeGroups } from "../utils.mjs";
-import { codegenHandler } from "./codegen.mjs";
-import { Array, Console, Data, Duration, Effect, Equal, HashSet, Match, Option, Queue, Ref, Schema, Stream, String, pipe } from "effect";
+import { codegenHandler, generateNodeApi, generateNodeRegisteredFunctions } from "./codegen.mjs";
+import { Array, Console, Deferred, Duration, Effect, Equal, HashSet, Match, Option, Queue, Ref, Schema, Stream, String, pipe } from "effect";
 import { Command } from "@effect/cli";
 import { Spec } from "@confect/core";
 import { FileSystem, Path } from "@effect/platform";
@@ -17,23 +17,12 @@ import * as esbuild from "esbuild";
 //#region src/confect/dev.ts
 const pendingInit = {
 	specDirty: false,
+	nodeImplDirty: false,
 	httpDirty: false,
 	appDirty: false,
 	cronsDirty: false,
 	authDirty: false
 };
-const FileChange = Data.taggedEnum();
-const logChangeReport = (changes) => Effect.gen(function* () {
-	yield* logCompleted("Generated files are up-to-date");
-	yield* Effect.when(Effect.forEach(changes, (change) => FileChange.$match(change, {
-		OptionalFile: ({ change: c, filePath }) => logFileChangeIndented(c, filePath),
-		GroupModule: ({ change: c, filePath, functionsAdded, functionsRemoved }) => Effect.gen(function* () {
-			yield* logFileChangeIndented(c, filePath);
-			yield* Effect.forEach(functionsAdded, logFunctionAddedIndented);
-			yield* Effect.forEach(functionsRemoved, logFunctionRemovedIndented);
-		})
-	})), () => Array.isNonEmptyReadonlyArray(changes));
-});
 const changeChar = (change) => Match.value(change).pipe(Match.when("Added", () => ({
 	char: "+",
 	color: Ansi.green
@@ -48,27 +37,36 @@ const logFileChangeIndented = (change, fullPath) => Effect.gen(function* () {
 	const prefix = (yield* ProjectRoot.get) + (yield* Path.Path).sep;
 	const suffix = pipe(fullPath, String.startsWith(prefix)) ? pipe(fullPath, String.slice(prefix.length)) : fullPath;
 	const { char, color } = changeChar(change);
-	yield* Console.log(pipe(AnsiDoc.text("  "), AnsiDoc.cat(pipe(AnsiDoc.char(char), AnsiDoc.annotate(color))), AnsiDoc.catWithSpace(AnsiDoc.hcat([pipe(AnsiDoc.text(prefix), AnsiDoc.annotate(Ansi.blackBright)), pipe(AnsiDoc.text(suffix), AnsiDoc.annotate(color))])), AnsiDoc.render({ style: "pretty" })));
+	yield* Console.log(pipe(AnsiDoc.char(char), AnsiDoc.annotate(color), AnsiDoc.catWithSpace(AnsiDoc.hcat([pipe(AnsiDoc.text(prefix), AnsiDoc.annotate(Ansi.blackBright)), pipe(AnsiDoc.text(suffix), AnsiDoc.annotate(color))])), AnsiDoc.render({ style: "pretty" })));
 });
-const logFunctionAddedIndented = (functionPath) => Console.log(pipe(AnsiDoc.text("    "), AnsiDoc.cat(pipe(AnsiDoc.char("+"), AnsiDoc.annotate(Ansi.green))), AnsiDoc.catWithSpace(AnsiDoc.hcat([pipe(AnsiDoc.text(toString(functionPath.groupPath) + "."), AnsiDoc.annotate(Ansi.blackBright)), pipe(AnsiDoc.text(functionPath.name), AnsiDoc.annotate(Ansi.green))])), AnsiDoc.render({ style: "pretty" })));
-const logFunctionRemovedIndented = (functionPath) => Console.log(pipe(AnsiDoc.text("    "), AnsiDoc.cat(pipe(AnsiDoc.char("-"), AnsiDoc.annotate(Ansi.red))), AnsiDoc.catWithSpace(AnsiDoc.hcat([pipe(AnsiDoc.text(toString(functionPath.groupPath) + "."), AnsiDoc.annotate(Ansi.blackBright)), pipe(AnsiDoc.text(functionPath.name), AnsiDoc.annotate(Ansi.red))])), AnsiDoc.render({ style: "pretty" })));
+const logFunctionAddedIndented = (functionPath) => Console.log(pipe(AnsiDoc.text("  "), AnsiDoc.cat(pipe(AnsiDoc.char("+"), AnsiDoc.annotate(Ansi.green))), AnsiDoc.catWithSpace(AnsiDoc.hcat([pipe(AnsiDoc.text(toString(functionPath.groupPath) + "."), AnsiDoc.annotate(Ansi.blackBright)), pipe(AnsiDoc.text(functionPath.name), AnsiDoc.annotate(Ansi.green))])), AnsiDoc.render({ style: "pretty" })));
+const logFunctionRemovedIndented = (functionPath) => Console.log(pipe(AnsiDoc.text("  "), AnsiDoc.cat(pipe(AnsiDoc.char("-"), AnsiDoc.annotate(Ansi.red))), AnsiDoc.catWithSpace(AnsiDoc.hcat([pipe(AnsiDoc.text(toString(functionPath.groupPath) + "."), AnsiDoc.annotate(Ansi.blackBright)), pipe(AnsiDoc.text(functionPath.name), AnsiDoc.annotate(Ansi.red))])), AnsiDoc.render({ style: "pretty" })));
 const dev = Command.make("dev", {}, () => Effect.gen(function* () {
+	yield* logPending("Performing initial sync…");
 	const initialFunctionPaths = yield* codegenHandler;
 	const pendingRef = yield* Ref.make(pendingInit);
 	const signal = yield* Queue.sliding(1);
+	const specWatcherRestartQueue = yield* Queue.sliding(1);
 	yield* Effect.all([
-		specFileWatcher(signal, pendingRef),
-		confectDirectoryWatcher(signal, pendingRef),
+		specFileWatcher(signal, pendingRef, specWatcherRestartQueue),
+		confectDirectoryWatcher(signal, pendingRef, specWatcherRestartQueue),
 		syncLoop(signal, pendingRef, initialFunctionPaths)
 	], { concurrency: "unbounded" });
 })).pipe(Command.withDescription("Start the Confect development server"));
 const syncLoop = (signal, pendingRef, initialFunctionPaths) => Effect.gen(function* () {
 	const functionPathsRef = yield* Ref.make(initialFunctionPaths);
-	const changesRef = yield* Ref.make([]);
+	const initialSyncDone = yield* Deferred.make();
 	return yield* Effect.forever(Effect.gen(function* () {
 		yield* Effect.logDebug("Running sync loop...");
 		yield* Queue.take(signal);
+		const isDone = yield* Deferred.isDone(initialSyncDone);
+		yield* Effect.when(logPending("Dependencies changed, reloading…"), () => isDone);
+		yield* Deferred.succeed(initialSyncDone, void 0);
 		const pending = yield* Ref.getAndSet(pendingRef, pendingInit);
+		if (pending.specDirty || pending.nodeImplDirty) {
+			yield* generateNodeApi;
+			yield* generateNodeRegisteredFunctions;
+		}
 		const specResult = yield* Effect.if(pending.specDirty, {
 			onTrue: () => loadSpec.pipe(Effect.andThen(Effect.fn(function* (spec) {
 				yield* Effect.logDebug("Spec loaded");
@@ -78,144 +76,162 @@ const syncLoop = (signal, pendingRef, initialFunctionPaths) => Effect.gen(functi
 				const current = make(spec);
 				const { functionsAdded, functionsRemoved, groupsRemoved, groupsAdded, groupsChanged } = diff(previous, current);
 				yield* removeGroups(groupsRemoved);
-				const removedChanges = yield* Effect.forEach(groupsRemoved, (gp) => Effect.gen(function* () {
+				yield* Effect.forEach(groupsRemoved, (gp) => Effect.gen(function* () {
 					const relativeModulePath = yield* modulePath(gp);
-					return FileChange.GroupModule({
-						change: "Removed",
-						filePath: path.join(convexDirectory, relativeModulePath),
-						functionsAdded: [],
-						functionsRemoved: Array.fromIterable(HashSet.filter(functionsRemoved, (fp) => Equal.equals(fp.groupPath, gp)))
-					});
+					yield* logFileChangeIndented("Removed", path.join(convexDirectory, relativeModulePath));
+					yield* Effect.forEach(Array.fromIterable(HashSet.filter(functionsRemoved, (fp) => Equal.equals(fp.groupPath, gp))), logFunctionRemovedIndented);
 				}));
 				yield* writeGroups(spec, groupsAdded);
-				const addedChanges = yield* Effect.forEach(groupsAdded, (gp) => Effect.gen(function* () {
+				yield* Effect.forEach(groupsAdded, (gp) => Effect.gen(function* () {
 					const relativeModulePath = yield* modulePath(gp);
-					return FileChange.GroupModule({
-						change: "Added",
-						filePath: path.join(convexDirectory, relativeModulePath),
-						functionsAdded: Array.fromIterable(HashSet.filter(functionsAdded, (fp) => Equal.equals(fp.groupPath, gp))),
-						functionsRemoved: []
-					});
+					yield* logFileChangeIndented("Added", path.join(convexDirectory, relativeModulePath));
+					yield* Effect.forEach(Array.fromIterable(HashSet.filter(functionsAdded, (fp) => Equal.equals(fp.groupPath, gp))), logFunctionAddedIndented);
 				}));
 				yield* writeGroups(spec, groupsChanged);
-				const changedChanges = yield* Effect.forEach(groupsChanged, (gp) => Effect.gen(function* () {
+				yield* Effect.forEach(groupsChanged, (gp) => Effect.gen(function* () {
 					const relativeModulePath = yield* modulePath(gp);
-					return FileChange.GroupModule({
-						change: "Modified",
-						filePath: path.join(convexDirectory, relativeModulePath),
-						functionsAdded: Array.fromIterable(HashSet.filter(functionsAdded, (fp) => Equal.equals(fp.groupPath, gp))),
-						functionsRemoved: Array.fromIterable(HashSet.filter(functionsRemoved, (fp) => Equal.equals(fp.groupPath, gp)))
-					});
+					yield* logFileChangeIndented("Modified", path.join(convexDirectory, relativeModulePath));
+					yield* Effect.forEach(Array.fromIterable(HashSet.filter(functionsAdded, (fp) => Equal.equals(fp.groupPath, gp))), logFunctionAddedIndented);
+					yield* Effect.forEach(Array.fromIterable(HashSet.filter(functionsRemoved, (fp) => Equal.equals(fp.groupPath, gp))), logFunctionRemovedIndented);
 				}));
 				yield* Ref.set(functionPathsRef, current);
-				return Option.some([
-					...removedChanges,
-					...addedChanges,
-					...changedChanges
-				]);
-			})), Effect.catchTag("SpecImportFailedError", () => logFailed("Spec import failed").pipe(Effect.as(Option.none()))), Effect.catchTag("SpecFileDoesNotExportSpecError", () => logFailed("Spec file does not default export a spec").pipe(Effect.as(Option.none())))),
-			onFalse: () => Effect.succeed(Option.some([]))
+				return Option.some(void 0);
+			})), Effect.catchTag("SpecImportFailedError", () => logFailure("Spec import failed").pipe(Effect.as(Option.none()))), Effect.catchTag("SpecFileDoesNotExportSpecError", () => logFailure("Spec file does not default export a Convex spec").pipe(Effect.as(Option.none()))), Effect.catchTag("NodeSpecFileDoesNotExportSpecError", () => logFailure("Node spec file does not default export a Node spec").pipe(Effect.as(Option.none())))),
+			onFalse: () => Effect.succeed(Option.some(void 0))
 		});
-		const specChanges = Option.getOrElse(specResult, () => []);
 		const dirtyOptionalFiles = [
 			...pending.httpDirty ? [syncOptionalFile(generateHttp, "http.ts")] : [],
 			...pending.appDirty ? [syncOptionalFile(generateConvexConfig, "convex.config.ts")] : [],
 			...pending.cronsDirty ? [syncOptionalFile(generateCrons, "crons.ts")] : [],
 			...pending.authDirty ? [syncOptionalFile(generateAuthConfig, "auth.config.ts")] : []
 		];
-		const optionalChanges = Array.isNonEmptyReadonlyArray(dirtyOptionalFiles) ? yield* pipe(Effect.all(dirtyOptionalFiles, { concurrency: "unbounded" }), Effect.map(Array.getSomes)) : [];
-		yield* Ref.update(changesRef, (prev) => [
-			...prev,
-			...specChanges,
-			...optionalChanges
-		]);
+		yield* Array.isNonEmptyReadonlyArray(dirtyOptionalFiles) ? Effect.all(dirtyOptionalFiles, { concurrency: "unbounded" }) : Effect.void;
 		yield* Option.match(specResult, {
-			onSome: () => Effect.gen(function* () {
-				const pendingSize = yield* Queue.size(signal);
-				yield* Effect.when(Effect.gen(function* () {
-					yield* logChangeReport(yield* Ref.getAndSet(changesRef, []));
-				}), () => pendingSize === 0);
-			}),
-			onNone: () => Ref.set(changesRef, [])
+			onSome: () => logSuccess("Generated files are up-to-date"),
+			onNone: () => Effect.void
 		});
 	}));
 });
 const loadSpec = Effect.gen(function* () {
-	const specPathUrl = yield* (yield* Path.Path).toFileUrl(yield* getSpecPath);
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const confectDirectory = yield* ConfectDirectory.get;
+	const specPathUrl = yield* path.toFileUrl(yield* getSpecPath);
 	const spec = (yield* Effect.tryPromise({
 		try: () => tsx.tsImport(specPathUrl.href, import.meta.url),
 		catch: (error) => new SpecImportFailedError({ error })
 	})).default;
-	if (Spec.isSpec(spec)) return spec;
-	else return yield* Effect.fail(new SpecFileDoesNotExportSpecError());
+	if (!Spec.isConvexSpec(spec)) return yield* new SpecFileDoesNotExportSpecError();
+	const nodeImplPath = path.join(confectDirectory, "nodeImpl.ts");
+	const nodeImplExists = yield* fs.exists(nodeImplPath);
+	const nodeSpecOption = yield* loadNodeSpec;
+	return Option.match(nodeSpecOption, {
+		onNone: () => spec,
+		onSome: (nodeSpec) => nodeImplExists ? Spec.merge(spec, nodeSpec) : spec
+	});
 });
 const getSpecPath = Effect.gen(function* () {
 	const path = yield* Path.Path;
 	const confectDirectory = yield* ConfectDirectory.get;
 	return path.join(confectDirectory, "spec.ts");
 });
-const specFileWatcher = (signal, pendingRef) => Effect.gen(function* () {
+const getNodeSpecPath = Effect.gen(function* () {
+	const path = yield* Path.Path;
+	const confectDirectory = yield* ConfectDirectory.get;
+	return path.join(confectDirectory, "nodeSpec.ts");
+});
+const loadNodeSpec = Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const nodeSpecPath = yield* getNodeSpecPath;
+	if (!(yield* fs.exists(nodeSpecPath))) return Option.none();
+	const nodeSpecPathUrl = yield* path.toFileUrl(nodeSpecPath);
+	const nodeSpec = (yield* Effect.tryPromise({
+		try: () => tsx.tsImport(nodeSpecPathUrl.href, import.meta.url),
+		catch: (error) => new SpecImportFailedError({ error })
+	})).default;
+	if (!Spec.isNodeSpec(nodeSpec)) return yield* new NodeSpecFileDoesNotExportSpecError();
+	return Option.some(nodeSpec);
+});
+const esbuildOptions = (entryPoint) => ({
+	entryPoints: [entryPoint],
+	bundle: true,
+	write: false,
+	metafile: true,
+	platform: "node",
+	format: "esm",
+	logLevel: "silent",
+	external: [
+		"@confect/core",
+		"@confect/server",
+		"effect",
+		"@effect/*"
+	],
+	plugins: [{
+		name: "notify-rebuild",
+		setup(build) {
+			build.onEnd((result) => {
+				if (result.errors.length === 0) build._emit?.();
+				else Effect.runPromise(Effect.gen(function* () {
+					const formattedMessages = yield* Effect.promise(() => esbuild.formatMessages(result.errors, {
+						kind: "error",
+						color: true,
+						terminalWidth: 80
+					}));
+					const output = formatBuildErrors(result.errors, formattedMessages);
+					yield* Console.error("\n" + output + "\n");
+					yield* logFailure("Build errors found");
+				}));
+			});
+		}
+	}]
+});
+const createSpecWatcher = (entryPoint) => Stream.asyncPush((emit) => Effect.acquireRelease(Effect.promise(async () => {
+	const opts = esbuildOptions(entryPoint);
+	const plugin = opts.plugins[0];
+	const originalSetup = plugin.setup;
+	plugin.setup = (build) => {
+		build._emit = () => emit.single();
+		return originalSetup(build);
+	};
+	const ctx = await esbuild.context({
+		...opts,
+		plugins: [plugin]
+	});
+	await ctx.watch();
+	return ctx;
+}), (ctx) => Effect.promise(() => ctx.dispose()).pipe(Effect.tap(() => Effect.logDebug("esbuild watcher disposed")))), {
+	bufferSize: 1,
+	strategy: "sliding"
+});
+const specFileWatcher = (signal, pendingRef, specWatcherRestartQueue) => Effect.forever(Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
 	const specPath = yield* getSpecPath;
-	yield* pipe(Stream.asyncPush((emit) => Effect.acquireRelease(Effect.promise(async () => {
-		const ctx = await esbuild.context({
-			entryPoints: [specPath],
-			bundle: true,
-			write: false,
-			metafile: true,
-			platform: "node",
-			format: "esm",
-			logLevel: "silent",
-			external: [
-				"@confect/core",
-				"@confect/server",
-				"effect",
-				"@effect/*"
-			],
-			plugins: [{
-				name: "notify-rebuild",
-				setup(build) {
-					build.onEnd((result) => {
-						if (result.errors.length === 0) emit.single();
-						else Effect.runPromise(Effect.gen(function* () {
-							yield* logFailed("Build errors");
-							const formattedMessages = yield* Effect.promise(() => esbuild.formatMessages(result.errors, {
-								kind: "error",
-								color: true,
-								terminalWidth: 80
-							}));
-							const output = formatBuildErrors(result.errors, formattedMessages);
-							yield* Console.error("\n" + output + "\n");
-						}));
-					});
-				}
-			}]
-		});
-		await ctx.watch();
-		return ctx;
-	}), (ctx) => Effect.promise(() => ctx.dispose()).pipe(Effect.tap(() => Effect.logDebug("esbuild watcher disposed")))), {
-		bufferSize: 1,
-		strategy: "sliding"
-	}), Stream.debounce(Duration.millis(200)), Stream.runForEach(() => Ref.update(pendingRef, (pending) => ({
+	const nodeSpecPath = yield* getNodeSpecPath;
+	const nodeSpecExists = yield* fs.exists(nodeSpecPath);
+	const specWatcher = createSpecWatcher(specPath);
+	const nodeSpecWatcher = nodeSpecExists ? createSpecWatcher(nodeSpecPath) : Stream.empty;
+	const specChanges = pipe(Stream.merge(specWatcher, nodeSpecWatcher), Stream.map(() => "change"));
+	const restartStream = pipe(Stream.fromQueue(specWatcherRestartQueue), Stream.map(() => "restart"));
+	yield* pipe(Stream.merge(specChanges, restartStream), Stream.debounce(Duration.millis(200)), Stream.takeUntil((event) => event === "restart"), Stream.runForEach((event) => event === "change" ? Ref.update(pendingRef, (pending) => ({
 		...pending,
 		specDirty: true
-	})).pipe(Effect.andThen(Queue.offer(signal, void 0)))));
-});
+	})).pipe(Effect.andThen(Queue.offer(signal, void 0))) : Effect.void));
+}));
 const formatBuildError = (error, formattedMessage) => {
 	const lines = String.split(formattedMessage, "\n");
 	const redErrorText = pipe(AnsiDoc.text(error?.text ?? ""), AnsiDoc.annotate(Ansi.red), AnsiDoc.render({ style: "pretty" }));
 	return pipe(pipe(Array.findFirstIndex(lines, (l) => pipe(l, String.trim, String.isNonEmpty)), Option.match({
 		onNone: () => lines,
-		onSome: (idx) => Array.modify(lines, idx, () => redErrorText)
-	})), Array.map((l) => pipe(l, String.trim, String.isNonEmpty) ? `  ${l}` : l), Array.join("\n"));
+		onSome: (index) => Array.modify(lines, index, () => redErrorText)
+	})), Array.join("\n"));
 };
 const formatBuildErrors = (errors, formattedMessages) => pipe(formattedMessages, Array.map((message, i) => formatBuildError(errors[i], message)), Array.join(""), String.trimEnd);
-var SpecFileDoesNotExportSpecError = class extends Schema.TaggedError("SpecFileDoesNotExportSpecError")("SpecFileDoesNotExportSpecError", {}) {};
-var SpecImportFailedError = class extends Schema.TaggedError("SpecImportFailedError")("SpecImportFailedError", { error: Schema.Unknown }) {};
+var SpecFileDoesNotExportSpecError = class extends Schema.TaggedError()("SpecFileDoesNotExportSpecError", {}) {};
+var NodeSpecFileDoesNotExportSpecError = class extends Schema.TaggedError()("NodeSpecFileDoesNotExportSpecError", {}) {};
+var SpecImportFailedError = class extends Schema.TaggedError()("SpecImportFailedError", { error: Schema.Unknown }) {};
 const syncOptionalFile = (generate, convexFile) => pipe(generate, Effect.andThen(Option.match({
-	onSome: ({ change, convexFilePath }) => Match.value(change).pipe(Match.when("Unchanged", () => Effect.succeed(Option.none())), Match.whenOr("Added", "Modified", (addedOrModified) => Effect.succeed(Option.some(FileChange.OptionalFile({
-		change: addedOrModified,
-		filePath: convexFilePath
-	})))), Match.exhaustive),
+	onSome: ({ change, convexFilePath }) => Match.value(change).pipe(Match.when("Unchanged", () => Effect.void), Match.whenOr("Added", "Modified", (addedOrModified) => logFileChangeIndented(addedOrModified, convexFilePath)), Match.exhaustive),
 	onNone: () => Effect.gen(function* () {
 		const fs = yield* FileSystem.FileSystem;
 		const path = yield* Path.Path;
@@ -223,29 +239,38 @@ const syncOptionalFile = (generate, convexFile) => pipe(generate, Effect.andThen
 		const convexFilePath = path.join(convexDirectory, convexFile);
 		if (yield* fs.exists(convexFilePath)) {
 			yield* fs.remove(convexFilePath);
-			return Option.some(FileChange.OptionalFile({
-				change: "Removed",
-				filePath: convexFilePath
-			}));
-		} else return Option.none();
+			yield* logFileChangeIndented("Removed", convexFilePath);
+		}
 	})
 })));
 const optionalConfectFiles = {
 	"http.ts": "httpDirty",
 	"app.ts": "appDirty",
 	"crons.ts": "cronsDirty",
-	"auth.ts": "authDirty"
+	"auth.ts": "authDirty",
+	"nodeSpec.ts": "specDirty",
+	"nodeImpl.ts": "nodeImplDirty"
 };
-const confectDirectoryWatcher = (signal, pendingRef) => Effect.gen(function* () {
+const confectDirectoryWatcher = (signal, pendingRef, specWatcherRestartQueue) => Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
 	const confectDirectory = yield* ConfectDirectory.get;
-	yield* pipe(fs.watch(confectDirectory), Stream.runForEach((event) => pipe(Option.fromNullable(optionalConfectFiles[event.path]), Option.match({
-		onNone: () => Effect.void,
-		onSome: (pendingKey) => pipe(pendingRef, Ref.update((pending) => ({
-			...pending,
-			[pendingKey]: true
-		})), Effect.andThen(Queue.offer(signal, void 0)))
-	}))));
+	yield* pipe(fs.watch(confectDirectory), Stream.runForEach((event) => {
+		const basename = path.basename(event.path);
+		const pendingKey = optionalConfectFiles[basename];
+		if (pendingKey !== void 0) return pipe(pendingRef, Ref.update((pending) => {
+			const next = {
+				...pending,
+				[pendingKey]: true
+			};
+			if (basename === "nodeImpl.ts") return {
+				...next,
+				specDirty: true
+			};
+			return next;
+		}), Effect.andThen(Queue.offer(signal, void 0)), Effect.andThen(basename === "nodeSpec.ts" ? Queue.offer(specWatcherRestartQueue, void 0) : Effect.void));
+		return Effect.void;
+	}));
 });
 
 //#endregion