@gaganref/confect-cli 10.3.1-fork.5 → 10.3.1-fork.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,14 +1,15 @@
1
1
  import { fromBundlerError } from "../BuildError.mjs";
2
2
  import { ProjectRoot } from "../ProjectRoot.mjs";
3
- import { logFileRemoved } from "../log.mjs";
3
+ import { logFileRemoved, logWarn } from "../log.mjs";
4
4
  import { bundle, resolveModule } from "../Bundler.mjs";
5
- import { DeclarationKindMismatchError, HandWrittenConvexFileError, InvalidDeclarationError } from "../CodegenError.mjs";
5
+ import { DeclarationKindMismatchError, HandWrittenConvexFileError, InvalidDeclarationError, logCodegenError } from "../CodegenError.mjs";
6
6
  import { ConvexDirectory } from "../ConvexDirectory.mjs";
7
7
  import { ConfectDirectory } from "../ConfectDirectory.mjs";
8
8
  import { authConfig, declaredHttp, http } from "../templates.mjs";
9
9
  import { removePathIfExists, toModuleImportPath, toPosixPath, writeFileString, writeFileStringAndLog } from "../utils.mjs";
10
10
  import { CONVEX_CONFIG_FILENAME, componentConfigPlugin, componentImportOf } from "../ConvexConfig.mjs";
11
- import { authConfig as authConfig$1, convexConfig, digest, fileOf, isGenerated, manifest, parse } from "../Declaration.mjs";
11
+ import { authConfig as authConfig$1, authProviders, convexConfig, digest, fileOf, isGenerated, manifest, parse, renderManifest } from "../Declaration.mjs";
12
+ import { check, collect, sections } from "../ManifestSections.mjs";
12
13
  import * as Effect from "effect/Effect";
13
14
  import { App, Http } from "@confect/core";
14
15
  import * as FileSystem from "effect/FileSystem";
@@ -22,7 +23,7 @@ import * as Predicate from "effect/Predicate";
22
23
  * Bumped when the generated files change shape, so a manifest written by an
23
24
  * older generator never matches a current one.
24
25
  */
25
- const GENERATOR_FORMAT = "1";
26
+ const GENERATOR_FORMAT = "2";
26
27
  const confectPath = Effect.fnUntraced(function* (file) {
27
28
  return (yield* Path.Path).join(yield* ConfectDirectory.get, file);
28
29
  });
@@ -94,7 +95,7 @@ const componentImport = Effect.fnUntraced(function* () {
94
95
  const convexDirectory = yield* ConvexDirectory.get;
95
96
  return (definition) => Option.map(componentImportOf(definition), (recorded) => {
96
97
  const bare = !recorded.specifier.startsWith(".") && !path.isAbsolute(recorded.specifier);
97
- const relative = toPosixPath(path, path.relative(convexDirectory, recorded.path)).replace(/\.[cm]?[jt]s$/, "");
98
+ const relative = toPosixPath(path, path.relative(convexDirectory, recorded.path)).replace(/\.([cm]?)[jt]s$/, ".$1js");
98
99
  return {
99
100
  importPath: bare ? recorded.specifier : relative.startsWith(".") ? relative : `./${relative}`,
100
101
  componentName: Predicate.hasProperty(definition, "defaultName") && Predicate.isString(definition.defaultName) ? definition.defaultName : "component"
@@ -117,7 +118,46 @@ const removeGenerated = Effect.fnUntraced(function* (filePath, legacy) {
117
118
  const removeManifest = Effect.gen(function* () {
118
119
  yield* removeGenerated(yield* manifestPath, []);
119
120
  });
120
- const writeDeclaration = Effect.gen(function* () {
121
+ const readManifest = Effect.gen(function* () {
122
+ const fs = yield* FileSystem.FileSystem;
123
+ const file = yield* manifestPath;
124
+ if (!(yield* fs.exists(file))) return {};
125
+ const data = (yield* bundle(file).pipe(Effect.mapError((error) => fromBundlerError("confect/_generated/manifest.ts", error)))).module.default;
126
+ return Predicate.isObject(data) ? data : {};
127
+ });
128
+ const readPrevious = readManifest.pipe(Effect.orElseSucceed(() => ({})));
129
+ const sectionDigest = (base, sections) => Object.keys(sections).length === 0 ? base : digest({
130
+ files: [["declaration", base]],
131
+ versions: [],
132
+ sections
133
+ });
134
+ const syncManifestSections = Effect.fnUntraced(function* (leaves, previous, baseDigest) {
135
+ if (baseDigest === void 0) return;
136
+ const current = yield* readManifest;
137
+ const registry = yield* Effect.fromResult(collect(leaves));
138
+ const checked = check(registry, previous);
139
+ for (const note of checked.notes) yield* logWarn(note);
140
+ const [error, ...more] = checked.errors;
141
+ for (const other of more) yield* logCodegenError(other);
142
+ if (error !== void 0) return yield* error;
143
+ const sections = Object.fromEntries([...registry].map(([key, { data }]) => [key, data]));
144
+ const { name, env, http } = current;
145
+ const digest = sectionDigest(baseDigest, sections);
146
+ yield* writeFileStringAndLog(yield* manifestPath, renderManifest({
147
+ name,
148
+ env,
149
+ http,
150
+ digest,
151
+ ...sections
152
+ }));
153
+ }, Effect.tapError(() => removeManifest));
154
+ const authProvidersPath = Effect.gen(function* () {
155
+ return (yield* Path.Path).join(yield* ConfectDirectory.get, "_generated", "auth.providers.ts");
156
+ });
157
+ const removeAuthProviders = Effect.gen(function* () {
158
+ yield* removeGenerated(yield* authProvidersPath, []);
159
+ });
160
+ const writeDeclaration = Effect.fnUntraced(function* (previous) {
121
161
  const fs = yield* FileSystem.FileSystem;
122
162
  const path = yield* Path.Path;
123
163
  const convexDirectory = yield* ConvexDirectory.get;
@@ -143,27 +183,37 @@ const writeDeclaration = Effect.gen(function* () {
143
183
  })), Effect.fromResult);
144
184
  const convexConfigPath = path.join(convexDirectory, CONVEX_CONFIG_FILENAME);
145
185
  const authConfigPath = path.join(convexDirectory, "auth.config.ts");
146
- const legacyAuthConfig = yield* authConfig({ authImportPath: yield* toModuleImportPath(path.relative(convexDirectory, authPath)) });
186
+ const authImportPath = yield* toModuleImportPath(path.relative(convexDirectory, authPath));
187
+ const legacyAuthConfigs = yield* Effect.forEach([authImportPath, authImportPath.replace(/\.js$/, "")], (importPath) => authConfig({ authImportPath: importPath }));
147
188
  yield* assertOwned(convexConfigPath, "app.ts", []);
148
- yield* assertOwned(authConfigPath, "auth.ts", [legacyAuthConfig]);
189
+ yield* assertOwned(authConfigPath, "auth.ts", legacyAuthConfigs);
190
+ let digest$1;
149
191
  if (target === "app") {
150
- const digest$1 = digest({
192
+ digest$1 = digest({
151
193
  files: yield* declarationInputs([app, ...Option.toArray(auth)]),
152
194
  versions: [["convex", yield* packageVersion("convex", projectRoot)], ["@confect/cli generator format", GENERATOR_FORMAT]]
153
195
  });
154
- yield* writeFileStringAndLog(yield* manifestPath, manifest(declaration, digest$1));
196
+ const sections$1 = sections(previous);
197
+ yield* writeFileStringAndLog(yield* manifestPath, manifest(declaration, sectionDigest(digest$1, sections$1), sections$1));
155
198
  }
156
199
  yield* writeFileStringAndLog(convexConfigPath, convexConfig(declaration));
157
200
  yield* Option.match(declaration.providers, {
158
201
  onNone: () => Effect.gen(function* () {
202
+ yield* removeAuthProviders;
159
203
  if (yield* fs.exists(authConfigPath)) {
160
204
  yield* removePathIfExists(authConfigPath);
161
205
  yield* logFileRemoved(authConfigPath);
162
206
  }
163
207
  }),
164
- onSome: (providers) => writeFileStringAndLog(authConfigPath, authConfig$1(providers))
208
+ onSome: (providers) => Effect.gen(function* () {
209
+ yield* writeFileStringAndLog(authConfigPath, authConfig$1(providers));
210
+ yield* writeFileStringAndLog(yield* authProvidersPath, authProviders(providers));
211
+ })
165
212
  });
166
- return App.isApp(appValue) ? Option.some(appValue) : Option.none();
213
+ return {
214
+ app: App.isApp(appValue) ? Option.some(appValue) : Option.none(),
215
+ digest: digest$1
216
+ };
167
217
  });
168
218
  /**
169
219
  * Write the declaration's Convex files and manifest from `confect/app.ts`,
@@ -171,12 +221,16 @@ const writeDeclaration = Effect.gen(function* () {
171
221
  * any failure the previous manifest is removed, so a stale manifest never
172
222
  * outlives a declaration that no longer produces it.
173
223
  */
174
- const syncDeclaration = Effect.gen(function* () {
224
+ const syncDeclaration = Effect.fnUntraced(function* (previous) {
175
225
  if (!(yield* isDeclared)) {
176
226
  yield* removeManifest;
177
- return Option.none();
227
+ yield* removeAuthProviders;
228
+ return {
229
+ app: Option.none(),
230
+ digest: void 0
231
+ };
178
232
  }
179
- return yield* writeDeclaration.pipe(Effect.tapError(() => removeManifest));
233
+ return yield* writeDeclaration(previous).pipe(Effect.tapError(() => removeManifest.pipe(Effect.andThen(removeAuthProviders))));
180
234
  });
181
235
  /**
182
236
  * Check every HTTP route the backend serves and write `convex/http.ts` from
@@ -203,6 +257,7 @@ const checkAndWriteHttp = Effect.fnUntraced(function* (app) {
203
257
  });
204
258
  yield* Http.routes(app, http$1).pipe(Result.mapError(invalid("http.ts")), Effect.fromResult);
205
259
  const contents = yield* declaredHttp({
260
+ runtimeImportPath: (yield* fs.exists(path.join(confectDirectory, "runtime.ts"))) ? yield* toModuleImportPath(path.relative(convexDirectory, path.join(confectDirectory, "runtime.ts"))) : void 0,
206
261
  schemaImportPath: yield* toModuleImportPath(path.relative(convexDirectory, path.join(confectDirectory, "_generated", "schema.ts"))),
207
262
  httpImportPath: yield* toModuleImportPath(path.relative(convexDirectory, httpPath))
208
263
  });
@@ -213,6 +268,6 @@ const checkAndWriteHttp = Effect.fnUntraced(function* (app) {
213
268
  });
214
269
  });
215
270
  //#endregion
216
- export { isDeclared, syncDeclaration, syncDeclaredHttp };
271
+ export { isDeclared, readPrevious, syncDeclaration, syncDeclaredHttp, syncManifestSections };
217
272
 
218
273
  //# sourceMappingURL=declaration.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"declaration.mjs","names":["Bundler.bundle","ConvexConfig.componentConfigPlugin","Declaration.isGenerated","Bundler.resolveModule","ConvexConfig.componentImportOf","Declaration.parse","Declaration.fileOf","ConvexConfig.CONVEX_CONFIG_FILENAME","templates.authConfig","digest","Declaration.digest","Declaration.manifest","Declaration.convexConfig","Declaration.authConfig","templates.http","http","templates.declaredHttp"],"sources":["../../src/confect/declaration.ts"],"sourcesContent":["import { App, Http } from \"@confect/core\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport { fromBundlerError } from \"../BuildError.js\";\nimport * as Bundler from \"../Bundler.js\";\nimport {\n HandWrittenConvexFileError,\n DeclarationKindMismatchError,\n InvalidDeclarationError,\n} from \"../CodegenError.js\";\nimport { ConfectDirectory } from \"../ConfectDirectory.js\";\nimport * as ConvexConfig from \"../ConvexConfig.js\";\nimport { ConvexDirectory } from \"../ConvexDirectory.js\";\nimport * as Declaration from \"../Declaration.js\";\nimport { logFileRemoved } from \"../log.js\";\nimport { ProjectRoot } from \"../ProjectRoot.js\";\nimport * as templates from \"../templates.js\";\nimport {\n removePathIfExists,\n toModuleImportPath,\n toPosixPath,\n writeFileString,\n writeFileStringAndLog,\n} from \"../utils.js\";\n\n/**\n * Bumped when the generated files change shape, so a manifest written by an\n * older generator never matches a current one.\n */\nconst GENERATOR_FORMAT = \"1\";\n\nconst confectPath = Effect.fnUntraced(function* (file: string) {\n const path = yield* Path.Path;\n return path.join(yield* ConfectDirectory.get, file);\n});\n\n/**\n * A backend opts in to the declaration by writing `confect/app.ts`.\n */\nexport const isDeclared = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n return yield* fs.exists(yield* confectPath(\"app.ts\"));\n});\n\nconst displayPath = Effect.fnUntraced(function* (absolutePath: string) {\n const path = yield* Path.Path;\n return toPosixPath(path, path.relative(yield* ProjectRoot.get, absolutePath));\n});\n\nconst bundleDeclaration = Effect.fnUntraced(function* (file: string) {\n const path = yield* Path.Path;\n const absolutePath = yield* confectPath(file);\n return yield* Bundler.bundle(absolutePath, {\n plugins: [ConvexConfig.componentConfigPlugin(path)],\n }).pipe(\n Effect.mapError((error) => fromBundlerError(`confect/${file}`, error)),\n );\n});\n\nconst invalid = (file: string) => (error: { readonly message: string }) =>\n new InvalidDeclarationError({\n declarationPath: `confect/${file}`,\n reason: error.message,\n });\n\n/**\n * Fail instead of overwriting a Convex file someone wrote by hand. A file with\n * the generated header, or one of the exact files an earlier codegen wrote\n * there, is ours to replace.\n */\nconst assertOwned = Effect.fnUntraced(function* (\n convexPath: string,\n declarationFile: string,\n legacy: ReadonlyArray<string>,\n) {\n const fs = yield* FileSystem.FileSystem;\n if (!(yield* fs.exists(convexPath))) return;\n if (Declaration.isGenerated(yield* fs.readFileString(convexPath), legacy)) {\n return;\n }\n return yield* new HandWrittenConvexFileError({\n convexPath: yield* displayPath(convexPath),\n declarationPath: `confect/${declarationFile}`,\n });\n});\n\nconst decodeVersion = Schema.decodeUnknownOption(\n Schema.fromJsonString(Schema.Struct({ version: Schema.String })),\n);\n\nconst packageVersion = Effect.fnUntraced(function* (\n name: string,\n from: string,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n return yield* Option.match(\n Bundler.resolveModule(`${name}/package.json`, path.join(from, \"_\")),\n {\n onNone: () => Effect.succeed(\"unresolved\"),\n onSome: (packageJson) =>\n fs.readFileString(packageJson).pipe(\n Effect.map((contents) =>\n Option.match(decodeVersion(contents), {\n onNone: () => \"unknown\",\n onSome: ({ version }) => version,\n }),\n ),\n ),\n },\n );\n});\n\n/**\n * Every first-party file the declaration modules import, by project-relative\n * path and contents. Files under `node_modules` and outside the project count\n * through package versions instead, so rebuilding a dependency does not change\n * the digest.\n */\nconst declarationInputs = Effect.fnUntraced(function* (\n bundles: ReadonlyArray<Bundler.Bundled>,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const projectRoot = yield* ProjectRoot.get;\n const files = new Set<string>();\n for (const { metafile } of bundles) {\n for (const input of Object.keys(metafile.inputs)) {\n const relative = path.relative(projectRoot, input);\n if (\n path.isAbsolute(input) &&\n !relative.startsWith(\"..\") &&\n !relative.split(path.sep).includes(\"node_modules\")\n ) {\n files.add(input);\n }\n }\n }\n // Plugin namespaces (component config wrappers) appear as inputs too;\n // only real files count.\n const real = yield* Effect.filter([...files], (file) => fs.exists(file));\n return yield* Effect.forEach(real, (file) =>\n fs\n .readFileString(file)\n .pipe(\n Effect.map(\n (contents) =>\n [\n toPosixPath(path, path.relative(projectRoot, file)),\n contents,\n ] as const,\n ),\n ),\n );\n});\n\nconst componentImport = Effect.fnUntraced(function* () {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n return (definition: unknown): Option.Option<Declaration.ComponentImport> =>\n Option.map(ConvexConfig.componentImportOf(definition), (recorded) => {\n const bare =\n !recorded.specifier.startsWith(\".\") &&\n !path.isAbsolute(recorded.specifier);\n const relative = toPosixPath(\n path,\n path.relative(convexDirectory, recorded.path),\n ).replace(/\\.[cm]?[jt]s$/, \"\");\n return {\n importPath: bare\n ? recorded.specifier\n : relative.startsWith(\".\")\n ? relative\n : `./${relative}`,\n componentName:\n Predicate.hasProperty(definition, \"defaultName\") &&\n Predicate.isString(definition.defaultName)\n ? definition.defaultName\n : \"component\",\n };\n });\n});\n\nconst manifestPath = Effect.gen(function* () {\n const path = yield* Path.Path;\n return path.join(yield* ConfectDirectory.get, \"_generated\", \"manifest.ts\");\n});\n\n/**\n * Remove a file codegen wrote whose source is gone; leave anything else.\n */\nconst removeGenerated = Effect.fnUntraced(function* (\n filePath: string,\n legacy: ReadonlyArray<string>,\n) {\n const fs = yield* FileSystem.FileSystem;\n if (!(yield* fs.exists(filePath))) return;\n if (!Declaration.isGenerated(yield* fs.readFileString(filePath), legacy)) {\n return;\n }\n yield* removePathIfExists(filePath);\n yield* logFileRemoved(filePath);\n});\n\nconst removeManifest = Effect.gen(function* () {\n yield* removeGenerated(yield* manifestPath, []);\n});\n\nconst writeDeclaration = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n const projectRoot = yield* ProjectRoot.get;\n const target = (yield* ConvexDirectory.target).kind;\n\n const app = yield* bundleDeclaration(\"app.ts\");\n const appValue: unknown = app.module.default;\n if (App.isApp(appValue) && appValue.kind !== target) {\n return yield* new DeclarationKindMismatchError({\n declarationPath: \"confect/app.ts\",\n declaredKind: appValue.kind,\n targetKind: target,\n });\n }\n const authPath = yield* confectPath(\"auth.ts\");\n const auth = (yield* fs.exists(authPath))\n ? Option.some(yield* bundleDeclaration(\"auth.ts\"))\n : Option.none();\n\n const declaration = yield* Declaration.parse({\n target,\n app: app.module.default,\n auth: Option.map(auth, ({ module }) => module.default),\n componentImport: yield* componentImport(),\n }).pipe(\n Result.mapError(\n (error) =>\n new InvalidDeclarationError({\n declarationPath: Declaration.fileOf(error),\n reason: error.message,\n }),\n ),\n Effect.fromResult,\n );\n\n const convexConfigPath = path.join(\n convexDirectory,\n ConvexConfig.CONVEX_CONFIG_FILENAME,\n );\n const authConfigPath = path.join(convexDirectory, \"auth.config.ts\");\n const legacyAuthConfig = yield* templates.authConfig({\n authImportPath: yield* toModuleImportPath(\n path.relative(convexDirectory, authPath),\n ),\n });\n yield* assertOwned(convexConfigPath, \"app.ts\", []);\n yield* assertOwned(authConfigPath, \"auth.ts\", [legacyAuthConfig]);\n\n if (target === \"app\") {\n const digest = Declaration.digest({\n files: yield* declarationInputs([app, ...Option.toArray(auth)]),\n versions: [\n [\"convex\", yield* packageVersion(\"convex\", projectRoot)],\n [\"@confect/cli generator format\", GENERATOR_FORMAT],\n ],\n });\n yield* writeFileStringAndLog(\n yield* manifestPath,\n Declaration.manifest(declaration, digest),\n );\n }\n yield* writeFileStringAndLog(\n convexConfigPath,\n Declaration.convexConfig(declaration),\n );\n yield* Option.match(declaration.providers, {\n onNone: () =>\n Effect.gen(function* () {\n if (yield* fs.exists(authConfigPath)) {\n yield* removePathIfExists(authConfigPath);\n yield* logFileRemoved(authConfigPath);\n }\n }),\n onSome: (providers) =>\n writeFileStringAndLog(authConfigPath, Declaration.authConfig(providers)),\n });\n return App.isApp(appValue) ? Option.some(appValue) : Option.none<App.Any>();\n});\n\n/**\n * Write the declaration's Convex files and manifest from `confect/app.ts`,\n * `confect/env.ts` and `confect/auth.ts`, before anything else is validated. On\n * any failure the previous manifest is removed, so a stale manifest never\n * outlives a declaration that no longer produces it.\n */\nexport const syncDeclaration = Effect.gen(function* () {\n if (!(yield* isDeclared)) {\n yield* removeManifest;\n return Option.none<App.Any>();\n }\n return yield* writeDeclaration.pipe(Effect.tapError(() => removeManifest));\n});\n\n/**\n * Check every HTTP route the backend serves and write `convex/http.ts` from\n * `confect/http.ts`. Runs after generation, because `http.ts` imports its\n * handlers, which import generated services.\n */\nexport const syncDeclaredHttp = (app: App.Any) =>\n checkAndWriteHttp(app).pipe(Effect.tapError(() => removeManifest));\n\nconst checkAndWriteHttp = Effect.fnUntraced(function* (app: App.Any) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n const confectDirectory = yield* ConfectDirectory.get;\n const httpPath = yield* confectPath(\"http.ts\");\n\n const convexHttpPath = path.join(convexDirectory, \"http.ts\");\n if (!(yield* fs.exists(httpPath))) {\n yield* Http.routes(app).pipe(\n Result.mapError(invalid(\"app.ts\")),\n Effect.fromResult,\n );\n yield* removeGenerated(convexHttpPath, [\n yield* templates.http({\n httpImportPath: yield* toModuleImportPath(\n path.relative(convexDirectory, httpPath),\n ),\n }),\n ]);\n return Option.none();\n }\n\n const http = (yield* bundleDeclaration(\"http.ts\")).module.default;\n if (!Http.isHttp(http)) {\n return yield* new InvalidDeclarationError({\n declarationPath: \"confect/http.ts\",\n reason: \"it must default-export Http.make(...).\",\n });\n }\n yield* Http.routes(app, http).pipe(\n Result.mapError(invalid(\"http.ts\")),\n Effect.fromResult,\n );\n\n const contents = yield* templates.declaredHttp({\n schemaImportPath: yield* toModuleImportPath(\n path.relative(\n convexDirectory,\n path.join(confectDirectory, \"_generated\", \"schema.ts\"),\n ),\n ),\n httpImportPath: yield* toModuleImportPath(\n path.relative(convexDirectory, httpPath),\n ),\n });\n const change = yield* writeFileString(convexHttpPath, contents);\n return Option.some({ change, convexFilePath: convexHttpPath });\n});\n"],"mappings":"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"}
1
+ {"version":3,"file":"declaration.mjs","names":["Bundler.bundle","ConvexConfig.componentConfigPlugin","Declaration.isGenerated","Bundler.resolveModule","ConvexConfig.componentImportOf","Declaration.digest","ManifestSections.collect","ManifestSections.check","Declaration.renderManifest","Declaration.parse","Declaration.fileOf","ConvexConfig.CONVEX_CONFIG_FILENAME","templates.authConfig","digest","sections","ManifestSections.sections","Declaration.manifest","Declaration.convexConfig","Declaration.authConfig","Declaration.authProviders","templates.http","http","templates.declaredHttp"],"sources":["../../src/confect/declaration.ts"],"sourcesContent":["import { App, Http } from \"@confect/core\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport { fromBundlerError } from \"../BuildError.js\";\nimport * as Bundler from \"../Bundler.js\";\nimport {\n HandWrittenConvexFileError,\n DeclarationKindMismatchError,\n InvalidDeclarationError,\n logCodegenError,\n} from \"../CodegenError.js\";\nimport { ConfectDirectory } from \"../ConfectDirectory.js\";\nimport * as ConvexConfig from \"../ConvexConfig.js\";\nimport { ConvexDirectory } from \"../ConvexDirectory.js\";\nimport * as Declaration from \"../Declaration.js\";\nimport * as ManifestSections from \"../ManifestSections.js\";\nimport type { LoadedLeafModule } from \"../LeafModule.js\";\nimport { logWarn, logFileRemoved } from \"../log.js\";\nimport { ProjectRoot } from \"../ProjectRoot.js\";\nimport * as templates from \"../templates.js\";\nimport {\n removePathIfExists,\n toModuleImportPath,\n toPosixPath,\n writeFileString,\n writeFileStringAndLog,\n} from \"../utils.js\";\n\n/**\n * Bumped when the generated files change shape, so a manifest written by an\n * older generator never matches a current one.\n */\nconst GENERATOR_FORMAT = \"2\";\n\nconst confectPath = Effect.fnUntraced(function* (file: string) {\n const path = yield* Path.Path;\n return path.join(yield* ConfectDirectory.get, file);\n});\n\n/**\n * A backend opts in to the declaration by writing `confect/app.ts`.\n */\nexport const isDeclared = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n return yield* fs.exists(yield* confectPath(\"app.ts\"));\n});\n\nconst displayPath = Effect.fnUntraced(function* (absolutePath: string) {\n const path = yield* Path.Path;\n return toPosixPath(path, path.relative(yield* ProjectRoot.get, absolutePath));\n});\n\nconst bundleDeclaration = Effect.fnUntraced(function* (file: string) {\n const path = yield* Path.Path;\n const absolutePath = yield* confectPath(file);\n return yield* Bundler.bundle(absolutePath, {\n plugins: [ConvexConfig.componentConfigPlugin(path)],\n }).pipe(\n Effect.mapError((error) => fromBundlerError(`confect/${file}`, error)),\n );\n});\n\nconst invalid = (file: string) => (error: { readonly message: string }) =>\n new InvalidDeclarationError({\n declarationPath: `confect/${file}`,\n reason: error.message,\n });\n\n/**\n * Fail instead of overwriting a Convex file someone wrote by hand. A file with\n * the generated header, or one of the exact files an earlier codegen wrote\n * there, is ours to replace.\n */\nconst assertOwned = Effect.fnUntraced(function* (\n convexPath: string,\n declarationFile: string,\n legacy: ReadonlyArray<string>,\n) {\n const fs = yield* FileSystem.FileSystem;\n if (!(yield* fs.exists(convexPath))) return;\n if (Declaration.isGenerated(yield* fs.readFileString(convexPath), legacy)) {\n return;\n }\n return yield* new HandWrittenConvexFileError({\n convexPath: yield* displayPath(convexPath),\n declarationPath: `confect/${declarationFile}`,\n });\n});\n\nconst decodeVersion = Schema.decodeUnknownOption(\n Schema.fromJsonString(Schema.Struct({ version: Schema.String })),\n);\n\nconst packageVersion = Effect.fnUntraced(function* (\n name: string,\n from: string,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n return yield* Option.match(\n Bundler.resolveModule(`${name}/package.json`, path.join(from, \"_\")),\n {\n onNone: () => Effect.succeed(\"unresolved\"),\n onSome: (packageJson) =>\n fs.readFileString(packageJson).pipe(\n Effect.map((contents) =>\n Option.match(decodeVersion(contents), {\n onNone: () => \"unknown\",\n onSome: ({ version }) => version,\n }),\n ),\n ),\n },\n );\n});\n\n/**\n * Every first-party file the declaration modules import, by project-relative\n * path and contents. Files under `node_modules` and outside the project count\n * through package versions instead, so rebuilding a dependency does not change\n * the digest.\n */\nconst declarationInputs = Effect.fnUntraced(function* (\n bundles: ReadonlyArray<Bundler.Bundled>,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const projectRoot = yield* ProjectRoot.get;\n const files = new Set<string>();\n for (const { metafile } of bundles) {\n for (const input of Object.keys(metafile.inputs)) {\n const relative = path.relative(projectRoot, input);\n if (\n path.isAbsolute(input) &&\n !relative.startsWith(\"..\") &&\n !relative.split(path.sep).includes(\"node_modules\")\n ) {\n files.add(input);\n }\n }\n }\n // Plugin namespaces (component config wrappers) appear as inputs too;\n // only real files count.\n const real = yield* Effect.filter([...files], (file) => fs.exists(file));\n return yield* Effect.forEach(real, (file) =>\n fs\n .readFileString(file)\n .pipe(\n Effect.map(\n (contents) =>\n [\n toPosixPath(path, path.relative(projectRoot, file)),\n contents,\n ] as const,\n ),\n ),\n );\n});\n\nconst componentImport = Effect.fnUntraced(function* () {\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n return (definition: unknown): Option.Option<Declaration.ComponentImport> =>\n Option.map(ConvexConfig.componentImportOf(definition), (recorded) => {\n const bare =\n !recorded.specifier.startsWith(\".\") &&\n !path.isAbsolute(recorded.specifier);\n const relative = toPosixPath(\n path,\n path.relative(convexDirectory, recorded.path),\n ).replace(/\\.([cm]?)[jt]s$/, \".$1js\");\n return {\n importPath: bare\n ? recorded.specifier\n : relative.startsWith(\".\")\n ? relative\n : `./${relative}`,\n componentName:\n Predicate.hasProperty(definition, \"defaultName\") &&\n Predicate.isString(definition.defaultName)\n ? definition.defaultName\n : \"component\",\n };\n });\n});\n\nconst manifestPath = Effect.gen(function* () {\n const path = yield* Path.Path;\n return path.join(yield* ConfectDirectory.get, \"_generated\", \"manifest.ts\");\n});\n\n/**\n * Remove a file codegen wrote whose source is gone; leave anything else.\n */\nconst removeGenerated = Effect.fnUntraced(function* (\n filePath: string,\n legacy: ReadonlyArray<string>,\n) {\n const fs = yield* FileSystem.FileSystem;\n if (!(yield* fs.exists(filePath))) return;\n if (!Declaration.isGenerated(yield* fs.readFileString(filePath), legacy)) {\n return;\n }\n yield* removePathIfExists(filePath);\n yield* logFileRemoved(filePath);\n});\n\nconst removeManifest = Effect.gen(function* () {\n yield* removeGenerated(yield* manifestPath, []);\n});\n\nconst readManifest = Effect.gen(function* () {\n const fs = yield* FileSystem.FileSystem;\n const file = yield* manifestPath;\n if (!(yield* fs.exists(file))) return {} as Record<string, unknown>;\n const data: unknown = (yield* Bundler.bundle(file).pipe(\n Effect.mapError((error) =>\n fromBundlerError(\"confect/_generated/manifest.ts\", error),\n ),\n )).module.default;\n return Predicate.isObject(data) ? data : {};\n});\n\nexport const readPrevious = readManifest.pipe(\n Effect.orElseSucceed(() => ({}) as Record<string, unknown>),\n);\n\nconst sectionDigest = (\n base: string,\n sections: Readonly<Record<string, unknown>>,\n) =>\n Object.keys(sections).length === 0\n ? base\n : Declaration.digest({\n files: [[\"declaration\", base]],\n versions: [],\n sections,\n });\n\nexport const syncManifestSections = Effect.fnUntraced(\n function* (\n leaves: ReadonlyArray<LoadedLeafModule>,\n previous: Readonly<Record<string, unknown>>,\n baseDigest: string | undefined,\n ) {\n if (baseDigest === undefined) return;\n const current = yield* readManifest;\n const registry = yield* Effect.fromResult(ManifestSections.collect(leaves));\n const checked = ManifestSections.check(registry, previous);\n for (const note of checked.notes) yield* logWarn(note);\n const [error, ...more] = checked.errors;\n for (const other of more) yield* logCodegenError(other);\n if (error !== undefined) return yield* error;\n const sections = Object.fromEntries(\n [...registry].map(([key, { data }]) => [key, data]),\n );\n const { name, env, http } = current;\n const digest = sectionDigest(baseDigest, sections);\n yield* writeFileStringAndLog(\n yield* manifestPath,\n Declaration.renderManifest({ name, env, http, digest, ...sections }),\n );\n },\n Effect.tapError(() => removeManifest),\n);\n\nconst authProvidersPath = Effect.gen(function* () {\n const path = yield* Path.Path;\n return path.join(\n yield* ConfectDirectory.get,\n \"_generated\",\n \"auth.providers.ts\",\n );\n});\n\nconst removeAuthProviders = Effect.gen(function* () {\n yield* removeGenerated(yield* authProvidersPath, []);\n});\n\nconst writeDeclaration = Effect.fnUntraced(function* (\n previous: Readonly<Record<string, unknown>>,\n) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n const projectRoot = yield* ProjectRoot.get;\n const target = (yield* ConvexDirectory.target).kind;\n\n const app = yield* bundleDeclaration(\"app.ts\");\n const appValue: unknown = app.module.default;\n if (App.isApp(appValue) && appValue.kind !== target) {\n return yield* new DeclarationKindMismatchError({\n declarationPath: \"confect/app.ts\",\n declaredKind: appValue.kind,\n targetKind: target,\n });\n }\n const authPath = yield* confectPath(\"auth.ts\");\n const auth = (yield* fs.exists(authPath))\n ? Option.some(yield* bundleDeclaration(\"auth.ts\"))\n : Option.none();\n\n const declaration = yield* Declaration.parse({\n target,\n app: app.module.default,\n auth: Option.map(auth, ({ module }) => module.default),\n componentImport: yield* componentImport(),\n }).pipe(\n Result.mapError(\n (error) =>\n new InvalidDeclarationError({\n declarationPath: Declaration.fileOf(error),\n reason: error.message,\n }),\n ),\n Effect.fromResult,\n );\n\n const convexConfigPath = path.join(\n convexDirectory,\n ConvexConfig.CONVEX_CONFIG_FILENAME,\n );\n const authConfigPath = path.join(convexDirectory, \"auth.config.ts\");\n const authImportPath = yield* toModuleImportPath(\n path.relative(convexDirectory, authPath),\n );\n const legacyAuthConfigs = yield* Effect.forEach(\n [authImportPath, authImportPath.replace(/\\.js$/, \"\")],\n (importPath) => templates.authConfig({ authImportPath: importPath }),\n );\n yield* assertOwned(convexConfigPath, \"app.ts\", []);\n yield* assertOwned(authConfigPath, \"auth.ts\", legacyAuthConfigs);\n\n let digest: string | undefined;\n if (target === \"app\") {\n digest = Declaration.digest({\n files: yield* declarationInputs([app, ...Option.toArray(auth)]),\n versions: [\n [\"convex\", yield* packageVersion(\"convex\", projectRoot)],\n [\"@confect/cli generator format\", GENERATOR_FORMAT],\n ],\n });\n const sections = ManifestSections.sections(previous);\n yield* writeFileStringAndLog(\n yield* manifestPath,\n Declaration.manifest(\n declaration,\n sectionDigest(digest, sections),\n sections,\n ),\n );\n }\n yield* writeFileStringAndLog(\n convexConfigPath,\n Declaration.convexConfig(declaration),\n );\n yield* Option.match(declaration.providers, {\n onNone: () =>\n Effect.gen(function* () {\n yield* removeAuthProviders;\n if (yield* fs.exists(authConfigPath)) {\n yield* removePathIfExists(authConfigPath);\n yield* logFileRemoved(authConfigPath);\n }\n }),\n onSome: (providers) =>\n Effect.gen(function* () {\n yield* writeFileStringAndLog(\n authConfigPath,\n Declaration.authConfig(providers),\n );\n yield* writeFileStringAndLog(\n yield* authProvidersPath,\n Declaration.authProviders(providers),\n );\n }),\n });\n return {\n app: App.isApp(appValue) ? Option.some(appValue) : Option.none<App.Any>(),\n digest,\n };\n});\n\n/**\n * Write the declaration's Convex files and manifest from `confect/app.ts`,\n * `confect/env.ts` and `confect/auth.ts`, before anything else is validated. On\n * any failure the previous manifest is removed, so a stale manifest never\n * outlives a declaration that no longer produces it.\n */\nexport const syncDeclaration = Effect.fnUntraced(function* (\n previous: Readonly<Record<string, unknown>>,\n) {\n if (!(yield* isDeclared)) {\n yield* removeManifest;\n yield* removeAuthProviders;\n return { app: Option.none<App.Any>(), digest: undefined };\n }\n return yield* writeDeclaration(previous).pipe(\n Effect.tapError(() =>\n removeManifest.pipe(Effect.andThen(removeAuthProviders)),\n ),\n );\n});\n\n/**\n * Check every HTTP route the backend serves and write `convex/http.ts` from\n * `confect/http.ts`. Runs after generation, because `http.ts` imports its\n * handlers, which import generated services.\n */\nexport const syncDeclaredHttp = (app: App.Any) =>\n checkAndWriteHttp(app).pipe(Effect.tapError(() => removeManifest));\n\nconst checkAndWriteHttp = Effect.fnUntraced(function* (app: App.Any) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const convexDirectory = yield* ConvexDirectory.get;\n const confectDirectory = yield* ConfectDirectory.get;\n const httpPath = yield* confectPath(\"http.ts\");\n\n const convexHttpPath = path.join(convexDirectory, \"http.ts\");\n if (!(yield* fs.exists(httpPath))) {\n yield* Http.routes(app).pipe(\n Result.mapError(invalid(\"app.ts\")),\n Effect.fromResult,\n );\n yield* removeGenerated(convexHttpPath, [\n yield* templates.http({\n httpImportPath: yield* toModuleImportPath(\n path.relative(convexDirectory, httpPath),\n ),\n }),\n ]);\n return Option.none();\n }\n\n const http = (yield* bundleDeclaration(\"http.ts\")).module.default;\n if (!Http.isHttp(http)) {\n return yield* new InvalidDeclarationError({\n declarationPath: \"confect/http.ts\",\n reason: \"it must default-export Http.make(...).\",\n });\n }\n yield* Http.routes(app, http).pipe(\n Result.mapError(invalid(\"http.ts\")),\n Effect.fromResult,\n );\n\n const contents = yield* templates.declaredHttp({\n runtimeImportPath: (yield* fs.exists(\n path.join(confectDirectory, \"runtime.ts\"),\n ))\n ? yield* toModuleImportPath(\n path.relative(\n convexDirectory,\n path.join(confectDirectory, \"runtime.ts\"),\n ),\n )\n : undefined,\n schemaImportPath: yield* toModuleImportPath(\n path.relative(\n convexDirectory,\n path.join(confectDirectory, \"_generated\", \"schema.ts\"),\n ),\n ),\n httpImportPath: yield* toModuleImportPath(\n path.relative(convexDirectory, httpPath),\n ),\n });\n const change = yield* writeFileString(convexHttpPath, contents);\n return Option.some({ change, convexFilePath: convexHttpPath });\n});\n"],"mappings":"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"}
@@ -10,8 +10,8 @@ import { functionPaths } from "../GenerationSnapshot.mjs";
10
10
  import { preserveComponentOutput } from "../Rollback.mjs";
11
11
  import { isDeclared } from "./declaration.mjs";
12
12
  import { Operation, Outcome, Phase, forBackend, isDirty, needsDeploymentNotification, plan, shouldRetry, transition } from "../SyncState.mjs";
13
- import { isRefreshSuccessful, make } from "../Watcher.mjs";
14
- import { EvaluationError, catchAndLog, generateSnapshot, loadPreviousFunctionPaths, updateDeclarations, validate } from "../Evaluation.mjs";
13
+ import { CoalesceQuiescence, isRefreshSuccessful, make } from "../Watcher.mjs";
14
+ import { EvaluationError, catchAndLog, generateSnapshot, loadPreviousFunctionPaths, prewarmedLayer, updateDeclarations, validate } from "../Evaluation.mjs";
15
15
  import * as Effect from "effect/Effect";
16
16
  import * as Command from "effect/cli/Command";
17
17
  import * as FileSystem from "effect/FileSystem";
@@ -26,6 +26,8 @@ import * as Ref from "effect/Ref";
26
26
  import * as String from "effect/String";
27
27
  import * as Console from "effect/Console";
28
28
  import * as Order from "effect/Order";
29
+ import * as Flag from "effect/cli/Flag";
30
+ import * as Duration from "effect/Duration";
29
31
  import * as Equal from "effect/Equal";
30
32
  //#region src/confect/dev.ts
31
33
  const changeChar = (change) => Match.value(change).pipe(Match.when("Added", () => ({
@@ -59,8 +61,11 @@ const devHandler = Effect.gen(function* () {
59
61
  const previousFunctionPaths = yield* loadPreviousFunctionPaths;
60
62
  const watcher = yield* make();
61
63
  yield* Effect.all([watcher.run, syncLoop(previousFunctionPaths, watcher)], { concurrency: "unbounded" });
62
- });
63
- const dev = Command.make("dev", flags, () => devHandler).pipe(Command.withDescription("Start the Confect development server"), Command.provide(layer));
64
+ }).pipe(Effect.provide(prewarmedLayer));
65
+ const dev = Command.make("dev", {
66
+ ...flags,
67
+ coalesceMs: Flag.Int("coalesce-ms").pipe(Flag.filter((ms) => ms >= 0 && ms <= 5e3, () => "Set --coalesce-ms to an integer between 0 and 5000 milliseconds."), Flag.withDefault(Duration.toMillis(CoalesceQuiescence.defaultValue())), Flag.withDescription("Quiet period before processing saved files, in milliseconds."))
68
+ }, ({ coalesceMs }) => devHandler.pipe(Effect.provideService(CoalesceQuiescence, Duration.millis(coalesceMs)))).pipe(Command.withDescription("Start the Confect development server"), Command.provide((options) => layer(options)));
64
69
  const esbuildMessageKey = (m) => `${m.location?.file ?? ""}:${m.location?.line ?? ""}:${m.location?.column ?? ""}:${m.text}`;
65
70
  const dedupeWatcherMessages = (messages) => pipe(messages, Array.dedupeWith((messageA, messageB) => esbuildMessageKey(messageA) === esbuildMessageKey(messageB)));
66
71
  const watcherMessagesSignature = (messages) => pipe(messages, Array.map(esbuildMessageKey), Array.dedupe, Array.sort(Order.String), Array.join("\n"));
@@ -1 +1 @@
1
- {"version":3,"file":"dev.mjs","names":["Ansi.green","Ansi.red","Ansi.magenta","Ansi.blackBright","FunctionPaths.diff","Evaluation.loadPreviousFunctionPaths","Watcher.make","DirectoryOptions.flags","DirectoryOptions.layer","SyncState.isDirty","SyncState.forBackend","SyncState.plan","GenerationSnapshot.functionPaths","Evaluation.catchAndLog","Watcher.isRefreshSuccessful","Evaluation.EvaluationError","validate","Evaluation.validate","Evaluation.generateSnapshot","Evaluation.updateDeclarations","SyncState.transition","SyncState.shouldRetry","SyncState.needsDeploymentNotification"],"sources":["../../src/confect/dev.ts"],"sourcesContent":["import * as Command from \"effect/cli/Command\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Path from \"effect/Path\";\nimport { pipe } from \"effect/Function\";\nimport * as Array from \"effect/Array\";\nimport * as Console from \"effect/Console\";\nimport * as Effect from \"effect/Effect\";\nimport * as Equal from \"effect/Equal\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Match from \"effect/Match\";\nimport * as Option from \"effect/Option\";\nimport * as Order from \"effect/Order\";\nimport * as Ref from \"effect/Ref\";\nimport * as Result from \"effect/Result\";\nimport * as String from \"effect/String\";\nimport type * as esbuild from \"esbuild\";\nimport * as Ansi from \"../Ansi.js\";\nimport { renderCodegenError } from \"../CodegenError.js\";\nimport * as SyncState from \"../SyncState.js\";\nimport type { OptionalFile } from \"../EntryPoint.js\";\nimport * as Watcher from \"../Watcher.js\";\nimport * as Evaluation from \"../Evaluation.js\";\nimport { ConvexDirectory } from \"../ConvexDirectory.js\";\nimport * as DirectoryOptions from \"../DirectoryOptions.js\";\nimport * as FunctionPaths from \"../FunctionPaths.js\";\nimport * as GenerationSnapshot from \"../GenerationSnapshot.js\";\nimport type { ImplModulePath } from \"../ImplModulePath.js\";\nimport type * as GroupPath from \"../GroupPath.js\";\nimport type * as GroupPaths from \"../GroupPaths.js\";\nimport {\n logCoalescedBuildErrors,\n logCoalescedBuildWarnings,\n logFunctionAdded,\n logFunctionRemoved,\n logPending,\n logSuccess,\n} from \"../log.js\";\nimport { ProjectRoot } from \"../ProjectRoot.js\";\nimport { preserveComponentOutput } from \"../Rollback.js\";\nimport {\n generateAuthConfig,\n generateCrons,\n generateHttp,\n touchConvexSchema,\n} from \"../utils.js\";\nimport { isDeclared } from \"./declaration.js\";\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.magenta })),\n Match.exhaustive,\n );\n\nconst logFileChangeIndented = Effect.fnUntraced(function* (\n change: \"Added\" | \"Removed\" | \"Modified\",\n fullPath: string,\n) {\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 `${color(char)} ${Ansi.blackBright(prefix)}${color(suffix)}`,\n );\n});\n\nconst logFunctionPathDiff = Effect.fnUntraced(function* (\n previous: FunctionPaths.FunctionPaths,\n current: FunctionPaths.FunctionPaths,\n) {\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(\n groupsChanged,\n Effect.fnUntraced(function* (gp: GroupPath.GroupPath) {\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 devHandler = Effect.gen(function* () {\n yield* logPending(\"Performing initial sync…\");\n const previousFunctionPaths = yield* Evaluation.loadPreviousFunctionPaths;\n\n const watcher = yield* Watcher.make();\n\n yield* Effect.all([watcher.run, syncLoop(previousFunctionPaths, watcher)], {\n concurrency: \"unbounded\",\n });\n});\n\nexport const dev = Command.make(\n \"dev\",\n DirectoryOptions.flags,\n () => devHandler,\n).pipe(\n Command.withDescription(\"Start the Confect development server\"),\n Command.provide(DirectoryOptions.layer),\n);\n\nconst esbuildMessageKey = (m: esbuild.Message): string =>\n `${m.location?.file ?? \"\"}:${m.location?.line ?? \"\"}:${m.location?.column ?? \"\"}:${m.text}`;\n\nconst dedupeWatcherMessages = (\n messages: ReadonlyArray<esbuild.Message>,\n): ReadonlyArray<esbuild.Message> =>\n pipe(\n messages,\n Array.dedupeWith(\n (messageA, messageB) =>\n esbuildMessageKey(messageA) === esbuildMessageKey(messageB),\n ),\n );\n\nconst watcherMessagesSignature = (\n messages: ReadonlyArray<esbuild.Message>,\n): string =>\n pipe(\n messages,\n Array.map(esbuildMessageKey),\n Array.dedupe,\n Array.sort(Order.String),\n Array.join(\"\\n\"),\n );\n\n/**\n * Log any watcher messages (errors or warnings) that haven't already been\n * logged at their current signature. Suppresses the per-watcher fanout that\n * happens when one root cause (e.g. a missing import) breaks every entry\n * point's build at the same source location.\n */\nconst logChangedWatcherMessages = Effect.fnUntraced(function* (\n messages: ReadonlyArray<esbuild.Message>,\n lastLoggedSignatureRef: Ref.Ref<string>,\n log: (messages: ReadonlyArray<esbuild.Message>) => Effect.Effect<void>,\n) {\n const signature = watcherMessagesSignature(messages);\n const previous = yield* Ref.get(lastLoggedSignatureRef);\n if (signature === previous) return;\n yield* Ref.set(lastLoggedSignatureRef, signature);\n if (messages.length === 0) return;\n yield* log(dedupeWatcherMessages(messages));\n});\n\nconst syncLoop = Effect.fnUntraced(function* (\n initialFunctionPaths: FunctionPaths.FunctionPaths,\n watcher: Watcher.Watcher,\n) {\n const functionPathsRef = yield* Ref.make(initialFunctionPaths);\n const lastLoggedErrorsRef = yield* Ref.make<string>(\"\");\n const lastLoggedWarningsRef = yield* Ref.make<string>(\"\");\n const phaseRef = yield* Ref.make<SyncState.Phase>(\n SyncState.Phase.Bootstrapping(),\n );\n const optionalPendingRef = yield* Ref.make(HashSet.empty<OptionalFile>());\n const logMessages = Effect.gen(function* () {\n const { errors, warnings } = yield* watcher.diagnostics;\n yield* logChangedWatcherMessages(\n errors,\n lastLoggedErrorsRef,\n logCoalescedBuildErrors,\n );\n yield* logChangedWatcherMessages(\n warnings,\n lastLoggedWarningsRef,\n logCoalescedBuildWarnings,\n );\n });\n\n return yield* Effect.forever(\n Effect.gen(function* () {\n yield* Effect.logDebug(\"Running sync loop…\");\n const taken = yield* watcher.next;\n\n const phase = yield* Ref.get(phaseRef);\n const firstSync = SyncState.Phase.$is(\"Bootstrapping\")(phase);\n if (!firstSync) yield* logMessages;\n\n if (!SyncState.isDirty(taken)) return;\n\n const declared = yield* isDeclared;\n const pending = SyncState.forBackend(\n {\n ...taken,\n optional: yield* Ref.updateAndGet(\n optionalPendingRef,\n HashSet.union(taken.optional),\n ),\n },\n {\n declared,\n component: (yield* ConvexDirectory.target).kind === \"component\",\n },\n );\n const optional = pending.optional;\n const operation = SyncState.plan(phase, pending);\n yield* Effect.logDebug(\"Planned development sync\").pipe(\n Effect.annotateLogs({\n phase: phase._tag,\n work: pending.work._tag,\n operation: operation._tag,\n }),\n );\n if (\n !firstSync &&\n !(\n SyncState.Operation.$is(\"Validate\")(operation) &&\n operation.paths.length === 0\n )\n )\n yield* logPending(\"Dependencies may have changed, reloading…\");\n\n const regenerate = <R>(\n generation: Effect.Effect<\n GenerationSnapshot.GenerationSnapshot,\n Effect.Error<typeof Evaluation.generateSnapshot>,\n R\n >,\n ) =>\n Effect.gen(function* () {\n const current = yield* generation.pipe(\n Effect.tap((snapshot) =>\n Effect.gen(function* () {\n const nextFunctionPaths =\n GenerationSnapshot.functionPaths(snapshot);\n const previous = yield* Ref.get(functionPathsRef);\n yield* logFunctionPathDiff(previous, nextFunctionPaths);\n yield* Ref.set(functionPathsRef, nextFunctionPaths);\n }),\n ),\n Evaluation.catchAndLog,\n );\n if (Option.isNone(current)) {\n return SyncState.Outcome.GenerationFailed();\n }\n const refreshed = yield* watcher.refresh.pipe(Effect.result);\n if (Result.isFailure(refreshed)) {\n yield* Console.error(\n `Dependency watcher could not ${refreshed.failure.operation}: ${globalThis.String(refreshed.failure.cause)}`,\n );\n return SyncState.Outcome.ReconciliationFailed();\n }\n if (!Watcher.isRefreshSuccessful(refreshed.success)) {\n yield* logMessages;\n return SyncState.Outcome.ReconciliationFailed();\n }\n return SyncState.Outcome.Succeeded({ snapshot: current.value });\n });\n const preserved = <R>(\n generation: Effect.Effect<\n GenerationSnapshot.GenerationSnapshot,\n Effect.Error<typeof Evaluation.generateSnapshot>,\n R\n >,\n ) =>\n preserveComponentOutput(generation, watcher.duringRestore).pipe(\n Effect.tapErrorTag(\n \"ComponentNodeGroupError\",\n () => watcher.discardRestoreEchoes,\n ),\n Effect.catchTags({\n RemoveBusyError: (error) =>\n Effect.fail(\n new Evaluation.EvaluationError({\n diagnostic: renderCodegenError(error),\n }),\n ),\n // Output that cannot be restored leaves nothing to serve.\n PlatformError: Effect.die,\n }),\n );\n const validate = (\n paths: ReadonlyArray<ImplModulePath>,\n snapshot: GenerationSnapshot.GenerationSnapshot,\n ) =>\n Effect.gen(function* () {\n if (Array.isReadonlyArrayNonEmpty(paths)) {\n const validated = yield* Evaluation.validate(paths).pipe(\n Evaluation.catchAndLog,\n );\n if (Option.isNone(validated)) {\n return SyncState.Outcome.ValidationFailed({ paths, snapshot });\n }\n }\n return SyncState.Outcome.Succeeded({ snapshot });\n });\n const outcome = yield* SyncState.Operation.$match(operation, {\n Generate: () => regenerate(preserved(Evaluation.generateSnapshot)),\n Validate: ({ paths, snapshot }) => validate(paths, snapshot),\n Update: ({ snapshot, declarations, paths }) =>\n regenerate(\n preserved(\n Evaluation.updateDeclarations(snapshot, declarations, paths),\n ),\n ),\n });\n yield* Ref.set(phaseRef, SyncState.transition(outcome));\n if (SyncState.shouldRetry(phase, outcome)) {\n yield* watcher.requestRetry;\n }\n if (!SyncState.Outcome.$is(\"Succeeded\")(outcome)) return;\n\n const dirtyOptionalFiles = [\n ...(HashSet.has(optional, \"Http\")\n ? [syncOptionalFile(generateHttp, \"http.ts\")]\n : []),\n ...(HashSet.has(optional, \"Crons\")\n ? [syncOptionalFile(generateCrons, \"crons.ts\")]\n : []),\n ...(HashSet.has(optional, \"Auth\")\n ? [syncOptionalFile(generateAuthConfig, \"auth.config.ts\")]\n : []),\n ];\n\n yield* Array.isReadonlyArrayNonEmpty(dirtyOptionalFiles)\n ? Effect.all(dirtyOptionalFiles, { concurrency: \"unbounded\" })\n : Effect.void;\n yield* Ref.set(optionalPendingRef, HashSet.empty());\n\n if (SyncState.needsDeploymentNotification(phase))\n yield* touchConvexSchema;\n\n if (!SyncState.isDirty(yield* watcher.pending)) {\n yield* logSuccess(\"Generated files are up-to-date\");\n }\n }),\n );\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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"}
1
+ {"version":3,"file":"dev.mjs","names":["Ansi.green","Ansi.red","Ansi.magenta","Ansi.blackBright","FunctionPaths.diff","Evaluation.loadPreviousFunctionPaths","Watcher.make","Evaluation.prewarmedLayer","DirectoryOptions.flags","Watcher.CoalesceQuiescence","DirectoryOptions.layer","SyncState.isDirty","SyncState.forBackend","SyncState.plan","GenerationSnapshot.functionPaths","Evaluation.catchAndLog","Watcher.isRefreshSuccessful","Evaluation.EvaluationError","validate","Evaluation.validate","Evaluation.generateSnapshot","Evaluation.updateDeclarations","SyncState.transition","SyncState.shouldRetry","SyncState.needsDeploymentNotification"],"sources":["../../src/confect/dev.ts"],"sourcesContent":["import * as Command from \"effect/cli/Command\";\nimport * as Flag from \"effect/cli/Flag\";\nimport * as Duration from \"effect/Duration\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Path from \"effect/Path\";\nimport { pipe } from \"effect/Function\";\nimport * as Array from \"effect/Array\";\nimport * as Console from \"effect/Console\";\nimport * as Effect from \"effect/Effect\";\nimport * as Equal from \"effect/Equal\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Match from \"effect/Match\";\nimport * as Option from \"effect/Option\";\nimport * as Order from \"effect/Order\";\nimport * as Ref from \"effect/Ref\";\nimport * as Result from \"effect/Result\";\nimport * as String from \"effect/String\";\nimport type * as esbuild from \"esbuild\";\nimport * as Ansi from \"../Ansi.js\";\nimport { renderCodegenError } from \"../CodegenError.js\";\nimport * as SyncState from \"../SyncState.js\";\nimport type { OptionalFile } from \"../EntryPoint.js\";\nimport * as Watcher from \"../Watcher.js\";\nimport * as Evaluation from \"../Evaluation.js\";\nimport { ConvexDirectory } from \"../ConvexDirectory.js\";\nimport * as DirectoryOptions from \"../DirectoryOptions.js\";\nimport * as FunctionPaths from \"../FunctionPaths.js\";\nimport * as GenerationSnapshot from \"../GenerationSnapshot.js\";\nimport type { ImplModulePath } from \"../ImplModulePath.js\";\nimport type * as GroupPath from \"../GroupPath.js\";\nimport type * as GroupPaths from \"../GroupPaths.js\";\nimport {\n logCoalescedBuildErrors,\n logCoalescedBuildWarnings,\n logFunctionAdded,\n logFunctionRemoved,\n logPending,\n logSuccess,\n} from \"../log.js\";\nimport { ProjectRoot } from \"../ProjectRoot.js\";\nimport { preserveComponentOutput } from \"../Rollback.js\";\nimport {\n generateAuthConfig,\n generateCrons,\n generateHttp,\n touchConvexSchema,\n} from \"../utils.js\";\nimport { isDeclared } from \"./declaration.js\";\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.magenta })),\n Match.exhaustive,\n );\n\nconst logFileChangeIndented = Effect.fnUntraced(function* (\n change: \"Added\" | \"Removed\" | \"Modified\",\n fullPath: string,\n) {\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 `${color(char)} ${Ansi.blackBright(prefix)}${color(suffix)}`,\n );\n});\n\nconst logFunctionPathDiff = Effect.fnUntraced(function* (\n previous: FunctionPaths.FunctionPaths,\n current: FunctionPaths.FunctionPaths,\n) {\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(\n groupsChanged,\n Effect.fnUntraced(function* (gp: GroupPath.GroupPath) {\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 devHandler = Effect.gen(function* () {\n yield* logPending(\"Performing initial sync…\");\n const previousFunctionPaths = yield* Evaluation.loadPreviousFunctionPaths;\n\n const watcher = yield* Watcher.make();\n\n yield* Effect.all([watcher.run, syncLoop(previousFunctionPaths, watcher)], {\n concurrency: \"unbounded\",\n });\n}).pipe(Effect.provide(Evaluation.prewarmedLayer));\n\nexport const dev = Command.make(\n \"dev\",\n {\n ...DirectoryOptions.flags,\n coalesceMs: Flag.Int(\"coalesce-ms\").pipe(\n Flag.filter(\n (ms) => ms >= 0 && ms <= 5000,\n () =>\n \"Set --coalesce-ms to an integer between 0 and 5000 milliseconds.\",\n ),\n Flag.withDefault(\n Duration.toMillis(Watcher.CoalesceQuiescence.defaultValue()),\n ),\n Flag.withDescription(\n \"Quiet period before processing saved files, in milliseconds.\",\n ),\n ),\n },\n ({ coalesceMs }) =>\n devHandler.pipe(\n Effect.provideService(\n Watcher.CoalesceQuiescence,\n Duration.millis(coalesceMs),\n ),\n ),\n).pipe(\n Command.withDescription(\"Start the Confect development server\"),\n Command.provide(\n (options: { componentDir: Option.Option<string>; coalesceMs: number }) =>\n DirectoryOptions.layer(options),\n ),\n);\n\nconst esbuildMessageKey = (m: esbuild.Message): string =>\n `${m.location?.file ?? \"\"}:${m.location?.line ?? \"\"}:${m.location?.column ?? \"\"}:${m.text}`;\n\nconst dedupeWatcherMessages = (\n messages: ReadonlyArray<esbuild.Message>,\n): ReadonlyArray<esbuild.Message> =>\n pipe(\n messages,\n Array.dedupeWith(\n (messageA, messageB) =>\n esbuildMessageKey(messageA) === esbuildMessageKey(messageB),\n ),\n );\n\nconst watcherMessagesSignature = (\n messages: ReadonlyArray<esbuild.Message>,\n): string =>\n pipe(\n messages,\n Array.map(esbuildMessageKey),\n Array.dedupe,\n Array.sort(Order.String),\n Array.join(\"\\n\"),\n );\n\n/**\n * Log any watcher messages (errors or warnings) that haven't already been\n * logged at their current signature. Suppresses the per-watcher fanout that\n * happens when one root cause (e.g. a missing import) breaks every entry\n * point's build at the same source location.\n */\nconst logChangedWatcherMessages = Effect.fnUntraced(function* (\n messages: ReadonlyArray<esbuild.Message>,\n lastLoggedSignatureRef: Ref.Ref<string>,\n log: (messages: ReadonlyArray<esbuild.Message>) => Effect.Effect<void>,\n) {\n const signature = watcherMessagesSignature(messages);\n const previous = yield* Ref.get(lastLoggedSignatureRef);\n if (signature === previous) return;\n yield* Ref.set(lastLoggedSignatureRef, signature);\n if (messages.length === 0) return;\n yield* log(dedupeWatcherMessages(messages));\n});\n\nconst syncLoop = Effect.fnUntraced(function* (\n initialFunctionPaths: FunctionPaths.FunctionPaths,\n watcher: Watcher.Watcher,\n) {\n const functionPathsRef = yield* Ref.make(initialFunctionPaths);\n const lastLoggedErrorsRef = yield* Ref.make<string>(\"\");\n const lastLoggedWarningsRef = yield* Ref.make<string>(\"\");\n const phaseRef = yield* Ref.make<SyncState.Phase>(\n SyncState.Phase.Bootstrapping(),\n );\n const optionalPendingRef = yield* Ref.make(HashSet.empty<OptionalFile>());\n const logMessages = Effect.gen(function* () {\n const { errors, warnings } = yield* watcher.diagnostics;\n yield* logChangedWatcherMessages(\n errors,\n lastLoggedErrorsRef,\n logCoalescedBuildErrors,\n );\n yield* logChangedWatcherMessages(\n warnings,\n lastLoggedWarningsRef,\n logCoalescedBuildWarnings,\n );\n });\n\n return yield* Effect.forever(\n Effect.gen(function* () {\n yield* Effect.logDebug(\"Running sync loop…\");\n const taken = yield* watcher.next;\n\n const phase = yield* Ref.get(phaseRef);\n const firstSync = SyncState.Phase.$is(\"Bootstrapping\")(phase);\n if (!firstSync) yield* logMessages;\n\n if (!SyncState.isDirty(taken)) return;\n\n const declared = yield* isDeclared;\n const pending = SyncState.forBackend(\n {\n ...taken,\n optional: yield* Ref.updateAndGet(\n optionalPendingRef,\n HashSet.union(taken.optional),\n ),\n },\n {\n declared,\n component: (yield* ConvexDirectory.target).kind === \"component\",\n },\n );\n const optional = pending.optional;\n const operation = SyncState.plan(phase, pending);\n yield* Effect.logDebug(\"Planned development sync\").pipe(\n Effect.annotateLogs({\n phase: phase._tag,\n work: pending.work._tag,\n operation: operation._tag,\n }),\n );\n if (\n !firstSync &&\n !(\n SyncState.Operation.$is(\"Validate\")(operation) &&\n operation.paths.length === 0\n )\n )\n yield* logPending(\"Dependencies may have changed, reloading…\");\n\n const regenerate = <R>(\n generation: Effect.Effect<\n GenerationSnapshot.GenerationSnapshot,\n Effect.Error<typeof Evaluation.generateSnapshot>,\n R\n >,\n ) =>\n Effect.gen(function* () {\n const current = yield* generation.pipe(\n Effect.tap((snapshot) =>\n Effect.gen(function* () {\n const nextFunctionPaths =\n GenerationSnapshot.functionPaths(snapshot);\n const previous = yield* Ref.get(functionPathsRef);\n yield* logFunctionPathDiff(previous, nextFunctionPaths);\n yield* Ref.set(functionPathsRef, nextFunctionPaths);\n }),\n ),\n Evaluation.catchAndLog,\n );\n if (Option.isNone(current)) {\n return SyncState.Outcome.GenerationFailed();\n }\n const refreshed = yield* watcher.refresh.pipe(Effect.result);\n if (Result.isFailure(refreshed)) {\n yield* Console.error(\n `Dependency watcher could not ${refreshed.failure.operation}: ${globalThis.String(refreshed.failure.cause)}`,\n );\n return SyncState.Outcome.ReconciliationFailed();\n }\n if (!Watcher.isRefreshSuccessful(refreshed.success)) {\n yield* logMessages;\n return SyncState.Outcome.ReconciliationFailed();\n }\n return SyncState.Outcome.Succeeded({ snapshot: current.value });\n });\n const preserved = <R>(\n generation: Effect.Effect<\n GenerationSnapshot.GenerationSnapshot,\n Effect.Error<typeof Evaluation.generateSnapshot>,\n R\n >,\n ) =>\n preserveComponentOutput(generation, watcher.duringRestore).pipe(\n Effect.tapErrorTag(\n \"ComponentNodeGroupError\",\n () => watcher.discardRestoreEchoes,\n ),\n Effect.catchTags({\n RemoveBusyError: (error) =>\n Effect.fail(\n new Evaluation.EvaluationError({\n diagnostic: renderCodegenError(error),\n }),\n ),\n // Output that cannot be restored leaves nothing to serve.\n PlatformError: Effect.die,\n }),\n );\n const validate = (\n paths: ReadonlyArray<ImplModulePath>,\n snapshot: GenerationSnapshot.GenerationSnapshot,\n ) =>\n Effect.gen(function* () {\n if (Array.isReadonlyArrayNonEmpty(paths)) {\n const validated = yield* Evaluation.validate(paths).pipe(\n Evaluation.catchAndLog,\n );\n if (Option.isNone(validated)) {\n return SyncState.Outcome.ValidationFailed({ paths, snapshot });\n }\n }\n return SyncState.Outcome.Succeeded({ snapshot });\n });\n const outcome = yield* SyncState.Operation.$match(operation, {\n Generate: () => regenerate(preserved(Evaluation.generateSnapshot)),\n Validate: ({ paths, snapshot }) => validate(paths, snapshot),\n Update: ({ snapshot, declarations, paths }) =>\n regenerate(\n preserved(\n Evaluation.updateDeclarations(snapshot, declarations, paths),\n ),\n ),\n });\n yield* Ref.set(phaseRef, SyncState.transition(outcome));\n if (SyncState.shouldRetry(phase, outcome)) {\n yield* watcher.requestRetry;\n }\n if (!SyncState.Outcome.$is(\"Succeeded\")(outcome)) return;\n\n const dirtyOptionalFiles = [\n ...(HashSet.has(optional, \"Http\")\n ? [syncOptionalFile(generateHttp, \"http.ts\")]\n : []),\n ...(HashSet.has(optional, \"Crons\")\n ? [syncOptionalFile(generateCrons, \"crons.ts\")]\n : []),\n ...(HashSet.has(optional, \"Auth\")\n ? [syncOptionalFile(generateAuthConfig, \"auth.config.ts\")]\n : []),\n ];\n\n yield* Array.isReadonlyArrayNonEmpty(dirtyOptionalFiles)\n ? Effect.all(dirtyOptionalFiles, { concurrency: \"unbounded\" })\n : Effect.void;\n yield* Ref.set(optionalPendingRef, HashSet.empty());\n\n if (SyncState.needsDeploymentNotification(phase))\n yield* touchConvexSchema;\n\n if (!SyncState.isDirty(yield* watcher.pending)) {\n yield* logSuccess(\"Generated files are up-to-date\");\n }\n }),\n );\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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"}
@@ -47,7 +47,7 @@ const runtimeSchemaEffect = Effect.fnUntraced(function* ({ tableModules, compone
47
47
  yield* Effect.forEach(tableModules, ({ tableName, importPath }) => cbw.writeLine(`import ${tableName} from "${importPath}";`));
48
48
  }
49
49
  yield* cbw.blankLine();
50
- if (component) yield* cbw.writeLine(`import { target as $target } from "./id";`);
50
+ if (component) yield* cbw.writeLine(`import { target as $target } from "./id.js";`);
51
51
  if (tableModules.length === 0) yield* cbw.writeLine(`const databaseSchema: $DatabaseSchema.DatabaseSchema${component ? "<{}, typeof $target>" : ""} = $DatabaseSchema.make({}${component ? ", $target" : ""});`);
52
52
  else {
53
53
  yield* cbw.writeLine(`const databaseSchema: $DatabaseSchema.DatabaseSchema<{`);
@@ -145,7 +145,7 @@ const tableWrapper = ({ tableName, unnamedImportPath, component = false }) => ta
145
145
  const tableWrapperEffect = Effect.fnUntraced(function* ({ tableName, unnamedImportPath, component = false }) {
146
146
  const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
147
147
  yield* cbw.writeLine(`import unnamed from "${unnamedImportPath}";`);
148
- if (component) yield* cbw.writeLine(`import { scope } from "../id";`);
148
+ if (component) yield* cbw.writeLine(`import { scope } from "../id.js";`);
149
149
  yield* cbw.blankLine();
150
150
  yield* cbw.writeLine(`export default unnamed("${tableName}"${component ? ", scope" : ""});`);
151
151
  return yield* cbw.toString();
@@ -162,14 +162,15 @@ const httpEffect = Effect.fnUntraced(function* ({ httpImportPath }) {
162
162
  * Emit `convex/http.ts` for a declared backend: the Convex router serving
163
163
  * `confect/http.ts`'s routes, typed by the generated database schema.
164
164
  */
165
- const declaredHttp = Effect.fnUntraced(function* ({ schemaImportPath, httpImportPath }) {
165
+ const declaredHttp = Effect.fnUntraced(function* ({ schemaImportPath, httpImportPath, runtimeImportPath }) {
166
166
  const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
167
167
  yield* cbw.writeLine("// Generated by `confect codegen` from confect/http.ts. Do not edit.");
168
168
  yield* cbw.writeLine(`import { HttpRouter } from "@confect/server";`);
169
169
  yield* cbw.writeLine(`import schema from "${schemaImportPath}";`);
170
170
  yield* cbw.writeLine(`import http from "${httpImportPath}";`);
171
+ if (runtimeImportPath !== void 0) yield* cbw.writeLine(`import observability from "${runtimeImportPath}";`);
171
172
  yield* cbw.newLine();
172
- yield* cbw.writeLine(`export default HttpRouter.forSchema(schema)(http.routes, { api: http.api });`);
173
+ yield* cbw.writeLine(`export default HttpRouter.forSchema(schema)(http.routes, { api: http.api${runtimeImportPath === void 0 ? "" : ", observability"} });`);
173
174
  return yield* cbw.toString();
174
175
  });
175
176
  const crons = ({ cronsImportPath }) => cronsEffect({ cronsImportPath });
@@ -232,8 +233,8 @@ const refsEffect = Effect.fnUntraced(function* ({ specImportPath }) {
232
233
  const componentContract = Effect.fnUntraced(function* ({ tableNames }) {
233
234
  const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
234
235
  yield* cbw.writeLine("import { Component } from \"@confect/core\";");
235
- yield* cbw.writeLine("import spec from \"./spec\";");
236
- yield* cbw.writeLine("import { scope } from \"./id\";");
236
+ yield* cbw.writeLine("import spec from \"./spec.js\";");
237
+ yield* cbw.writeLine("import { scope } from \"./id.js\";");
237
238
  yield* cbw.blankLine();
238
239
  const names = Array.map([
239
240
  ...tableNames,
@@ -278,26 +279,37 @@ const docsEffect = Effect.fnUntraced(function* ({ schemaImportPath, tables }) {
278
279
  yield* cbw.writeLine(`}`);
279
280
  return yield* cbw.toString();
280
281
  });
281
- const registeredFunctionsForGroup = ({ spec, schemaImportPath, specImportPath, implImportPath }) => registeredFunctionsForGroupEffect({
282
+ const registeredFunctionsForGroup = ({ spec, schemaImportPath, specImportPath, implImportPath, groupPath = "", required = [], runtimeImportPath }) => registeredFunctionsForGroupEffect({
282
283
  spec,
283
284
  schemaImportPath,
284
285
  specImportPath,
285
- implImportPath
286
+ implImportPath,
287
+ groupPath,
288
+ required,
289
+ runtimeImportPath
286
290
  });
287
- const registeredFunctionsForGroupEffect = Effect.fnUntraced(function* ({ spec, schemaImportPath, specImportPath, implImportPath }) {
291
+ const registeredFunctionsForGroupEffect = Effect.fnUntraced(function* ({ spec, schemaImportPath, specImportPath, implImportPath, groupPath = "", required = [], runtimeImportPath }) {
288
292
  const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
293
+ if (runtimeImportPath !== void 0) {
294
+ yield* cbw.writeLine("import * as RegisteredFunction from \"@confect/server/RegisteredFunction\";");
295
+ yield* cbw.writeLine("import * as Layer from \"effect/Layer\";");
296
+ yield* cbw.writeLine(`import observability from "${runtimeImportPath}";`);
297
+ }
289
298
  const useNode = spec.runtime === "Node";
290
299
  const hasConfectFunctions = (group) => Object.values(group.functions).some((functionSpec) => functionSpec.functionProvenance._tag === "Confect") || Object.values(group.groups).some(hasConfectFunctions);
291
300
  const forwarding = !useNode && hasConfectFunctions(spec);
292
301
  if (useNode) yield* cbw.writeLine(`import { RegisteredNodeFunction } from "@confect/server/node";`);
293
302
  else if (!forwarding) yield* cbw.writeLine(`import { RegisteredFunctions } from "@confect/server";`);
294
303
  else yield* cbw.writeLine(`import { ConvexFunctionDefinitions, RegisteredConvexFunction, type RegisteredFunctions } from "@confect/server";`);
304
+ if (required.length > 0) yield* cbw.writeLine(`import { GroupImpl } from "@confect/server";`);
295
305
  yield* cbw.writeLine(`import databaseSchema from "${schemaImportPath}";`);
296
306
  yield* cbw.writeLine(`import groupLayer from "${implImportPath}";`);
297
307
  yield* cbw.blankLine();
308
+ const finalizedLayer = required.length === 0 ? "groupLayer" : `groupLayer.pipe(GroupImpl.finalize({ required: [${required.map(({ key }) => `{ key: ${JSON.stringify(key)} }`).join(", ")}], groupPath: ${JSON.stringify(groupPath)} }))`;
309
+ const groupLayer = runtimeImportPath === void 0 ? finalizedLayer : `${finalizedLayer}.pipe(Layer.merge(Layer.succeed(RegisteredFunction.Observability, observability)))`;
298
310
  const specType = `typeof import("${specImportPath}")["default"]`;
299
- if (useNode) yield* cbw.writeLine(`export default RegisteredNodeFunction.buildForGroup<${specType}>(databaseSchema, groupLayer);`);
300
- else if (!forwarding) yield* cbw.writeLine(`export default RegisteredFunctions.buildForGroup<${specType}>(databaseSchema, groupLayer);`);
311
+ if (useNode) yield* cbw.writeLine(`export default RegisteredNodeFunction.buildForGroup<${specType}>(databaseSchema, ${groupLayer});`);
312
+ else if (!forwarding) yield* cbw.writeLine(`export default RegisteredFunctions.buildForGroup<${specType}>(databaseSchema, ${groupLayer});`);
301
313
  else {
302
314
  const bindings = (group, path) => `{
303
315
  ${[...Object.entries(group.functions).map(([name, functionSpec]) => {
@@ -311,7 +323,7 @@ ${[...Object.entries(group.functions).map(([name, functionSpec]) => {
311
323
  }`;
312
324
  yield* cbw.writeLine(`const forward = <Ctx, Args, Returns>(handler: (ctx: Ctx, args: Args) => Promise<Returns>) => (ctx: Ctx, args: Args) => handler(ctx, args);
313
325
 
314
- const definitions = ConvexFunctionDefinitions.buildForGroup<${specType}>(databaseSchema, groupLayer);
326
+ const definitions = ConvexFunctionDefinitions.buildForGroup<${specType}>(databaseSchema, ${groupLayer});
315
327
 
316
328
  export default ${bindings(spec, "definitions")} as RegisteredFunctions.RegisteredFunctionsForGroupSpec<${specType}>;`);
317
329
  }
@@ -327,7 +339,7 @@ const servicesEffect = Effect.fnUntraced(function* ({ schemaImportPath, componen
327
339
  yield* cbw.indent(Effect.gen(function* () {
328
340
  yield* cbw.writeLine("ActionCtx as ActionCtx_,");
329
341
  yield* cbw.writeLine("ActionRunner as ActionRunner_,");
330
- if (!component) yield* cbw.writeLine("Auth as Auth_,");
342
+ yield* cbw.writeLine("Auth as Auth_,");
331
343
  yield* cbw.writeLine("type DataModel,");
332
344
  yield* cbw.writeLine("DatabaseReader as DatabaseReader_,");
333
345
  yield* cbw.writeLine("DatabaseWriter as DatabaseWriter_,");
@@ -349,13 +361,15 @@ const servicesEffect = Effect.fnUntraced(function* ({ schemaImportPath, componen
349
361
  }));
350
362
  yield* cbw.writeLine(`} from "@confect/server";`);
351
363
  yield* cbw.writeLine(`import type schemaDefinition from "${schemaImportPath}";`);
352
- yield* cbw.writeLine(`import type { Docs } from "./docs";`);
353
- if (component) yield* cbw.writeLine(`import type { scope } from "./id";`);
364
+ yield* cbw.writeLine(`import type { Docs } from "./docs.js";`);
365
+ if (component) yield* cbw.writeLine(`import type { scope } from "./id.js";`);
354
366
  yield* cbw.blankLine();
355
367
  if (!component) {
356
368
  yield* cbw.writeLine("export const Auth = Auth_.Auth;");
357
369
  yield* cbw.writeLine("export type Auth = typeof Auth.Identifier;");
358
370
  }
371
+ yield* cbw.writeLine("export const MutationAuth = Auth_.MutationAuth;");
372
+ yield* cbw.writeLine("export type MutationAuth = typeof MutationAuth.Identifier;");
359
373
  yield* cbw.blankLine();
360
374
  yield* cbw.writeLine("export const ExecutionMetadata = ExecutionMetadata_.ExecutionMetadata;");
361
375
  yield* cbw.writeLine("export type ExecutionMetadata = typeof ExecutionMetadata.Identifier;");