@confect/cli 6.0.0 → 8.0.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @confect/cli
 
+## 8.0.0
+
+### Minor Changes
+
+- 4bb2722: Bump Effect ecosystem to latest. `@effect/platform` is now `^0.96.1` and `@effect/platform-node` is now `^0.106.0` in `@confect/server`'s peer dependencies; `effect` peer is now `^3.21.2` across packages. Consumers must upgrade `@effect/platform`, `@effect/platform-node`, and `effect` in lockstep when bumping `@confect/server`.
+- 40c1cff: Switch sibling `@confect/*` peer-dependency specifiers from `workspace:*` to `workspace:^`. Published peer ranges are now caret-based (e.g. `^7.0.0`) instead of exact-pinned, so non-major upgrades of one `@confect/*` package no longer fall out of range for its peer dependents.
+
+  Paired with the Changesets `onlyUpdatePeerDependentsWhenOutOfRange` flag, this prevents the entire `@confect/*` family from being promoted to a major bump on every release when only minor/patch changes are present.
+
+  `@confect/cli` additionally moves `@effect/platform` from `peerDependencies` to `dependencies`, since the CLI consumes it as an internal implementation detail (for `FileSystem`/`Path`) rather than exposing it in its public API. Consumers no longer need to install `@effect/platform` themselves to use the CLI.
+
+### Patch Changes
+
+- f308edd: Fix `confect codegen` and `confect dev` failing with "Cannot find package '@confect/core'" / "'@confect/server'" when the user's spec or impl files are bundled. The internal esbuild plugin used `import.meta.resolve(specifier, parent)` to resolve external imports, but Node silently ignores the second argument, so resolution always walked up from the CLI's own bundled file instead of from the user's project. Switched to `createRequire` keyed on the importing file's directory so external packages resolve out of the user's `node_modules`.
+- Updated dependencies [4bb2722]
+- Updated dependencies [40c1cff]
+  - @confect/core@8.0.0
+
+## 7.0.0
+
+### Patch Changes
+
+- Updated dependencies [90094d0]
+  - @confect/core@7.0.0
+  - @confect/server@7.0.0
+
 ## 6.0.0
 
 ### Patch Changes

package/dist/confect/codegen.mjs

@@ -5,8 +5,7 @@ import { api, nodeApi, nodeRegisteredFunctions, refs, registeredFunctions, schem
 import { bundleAndImport, generateAuthConfig, generateCrons, generateFunctions, generateHttp, removePathExtension, writeFileStringAndLog } from "../utils.mjs";
 import { Effect, Match, Option } from "effect";
 import { Command } from "@effect/cli";
-import { Spec } from "@confect/core";
-import { DatabaseSchema } from "@confect/server";
+import { DatabaseSchema, Spec } from "@confect/core";
 import { FileSystem, Path } from "@effect/platform";
 
 //#region src/confect/codegen.ts
@@ -110,7 +109,7 @@ const generateSchema = Effect.gen(function* () {
 	const confectSchemaPath = path.join(confectDirectory, "schema.ts");
 	yield* bundleAndImport(confectSchemaPath).pipe(Effect.andThen((schemaModule) => {
 		const defaultExport = schemaModule.default;
-		return DatabaseSchema.isSchema(defaultExport) ? Effect.succeed(defaultExport) : Effect.die("Invalid schema module");
+		return DatabaseSchema.isDatabaseSchema(defaultExport) ? Effect.succeed(defaultExport) : Effect.die("Invalid schema module");
 	}));
 	const convexSchemaPath = path.join(convexDirectory, "schema.ts");
 	const importPathWithoutExt = yield* removePathExtension(path.relative(path.dirname(convexSchemaPath), confectSchemaPath));

package/dist/confect/codegen.mjs.map

@@ -1 +1 @@
-{"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 {\n  logFileAdded,\n  logFileModified,\n  logFileRemoved,\n  logPending,\n  logSuccess,\n} from \"../log\";\nimport { ConfectDirectory } from \"../ConfectDirectory\";\nimport { ConvexDirectory } from \"../ConvexDirectory\";\nimport * as templates from \"../templates\";\nimport {\n  bundleAndImport,\n  generateAuthConfig,\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 nodeSpecPath = yield* getNodeSpecPath;\n\n  if (!(yield* fs.exists(nodeSpecPath))) {\n    return Option.none<Spec.AnyWithPropsWithRuntime<\"Node\">>();\n  }\n\n  const nodeSpecModule = yield* bundleAndImport(nodeSpecPath);\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(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\n  const specModule = yield* bundleAndImport(specPath);\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\n  yield* bundleAndImport(confectSchemaPath).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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"}
+{"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 { DatabaseSchema, Spec } from \"@confect/core\";\nimport { Command } from \"@effect/cli\";\nimport { FileSystem, Path } from \"@effect/platform\";\nimport { Effect, Match, Option } from \"effect\";\nimport {\n  logFileAdded,\n  logFileModified,\n  logFileRemoved,\n  logPending,\n  logSuccess,\n} from \"../log\";\nimport { ConfectDirectory } from \"../ConfectDirectory\";\nimport { ConvexDirectory } from \"../ConvexDirectory\";\nimport * as templates from \"../templates\";\nimport {\n  bundleAndImport,\n  generateAuthConfig,\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 nodeSpecPath = yield* getNodeSpecPath;\n\n  if (!(yield* fs.exists(nodeSpecPath))) {\n    return Option.none<Spec.AnyWithPropsWithRuntime<\"Node\">>();\n  }\n\n  const nodeSpecModule = yield* bundleAndImport(nodeSpecPath);\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(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\n  const specModule = yield* bundleAndImport(specPath);\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\n  yield* bundleAndImport(confectSchemaPath).pipe(\n    Effect.andThen((schemaModule) => {\n      const defaultExport = schemaModule.default;\n\n      return DatabaseSchema.isDatabaseSchema(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":";;;;;;;;;;;AAwBA,MAAM,kBAAkB,OAAO,IAAI,aAAa;CAC9C,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;AACjD,QAAO,KAAK,KAAK,kBAAkB,cAAc;EACjD;AAEF,MAAM,eAAe,OAAO,IAAI,aAAa;CAC3C,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,eAAe,OAAO;AAE5B,KAAI,EAAE,OAAO,GAAG,OAAO,aAAa,EAClC,QAAO,OAAO,MAA4C;CAI5D,MAAM,YADiB,OAAO,gBAAgB,aAAa,EAC3B;AAEhC,KAAI,CAAC,KAAK,WAAW,SAAS,CAC5B,QAAO,OAAO,OAAO,IAAI,gDAAgD;AAG3E,QAAO,OAAO,KAAK,SAAS;EAC5B;AAEF,MAAa,UAAU,QAAQ,KAAK,WAAW,EAAE,QAC/C,OAAO,IAAI,aAAa;AACtB,QAAO,WAAW,2BAA2B;AAC7C,QAAO;AACP,QAAO,WAAW,iCAAiC;EACnD,CACH,CAAC,KACA,QAAQ,gBACN,0GACD,CACF;AAED,MAAa,iBAAiB,OAAO,IAAI,aAAa;AACpD,QAAO;AACP,QAAO,OAAO,IACZ;EACE;EACA;EACA;EACA;EACA;EACA;EACD,EACD,EAAE,aAAa,aAAa,CAC7B;CACD,MAAM,CAAC,iBAAiB,OAAO,OAAO,IACpC;EACE;EACA;EACA,aAAa,aAAa;EAC1B,aAAa,cAAc;EAC3B,aAAa,mBAAmB;EACjC,EACD,EAAE,aAAa,aAAa,CAC7B;AACD,QAAO;EACP;AAEF,MAAM,oCAAoC,OAAO,IAAI,aAAa;CAChE,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;AAEjD,KAAI,EAAE,OAAO,GAAG,OAAO,KAAK,KAAK,kBAAkB,aAAa,CAAC,GAAG;AAClE,SAAO,GAAG,cAAc,KAAK,KAAK,kBAAkB,aAAa,EAAE,EACjE,WAAW,MACZ,CAAC;AACF,SAAO,aAAa,KAAK,KAAK,kBAAkB,aAAa,GAAG,IAAI;;EAEtE;AAEF,MAAM,cAAc,OAAO,IAAI,aAAa;CAC1C,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,UAAU,KAAK,KAAK,kBAAkB,cAAc,SAAS;CACnE,MAAM,SAAS,KAAK,QAAQ,QAAQ;CAEpC,MAAM,mBAAmB,OAAO,oBAC9B,KAAK,SAAS,QAAQ,KAAK,KAAK,kBAAkB,YAAY,CAAC,CAChE;CAED,MAAM,iBAAiB,OAAO,oBAC5B,KAAK,SAAS,QAAQ,KAAK,KAAK,kBAAkB,UAAU,CAAC,CAC9D;AAOD,QAAO,sBAAsB,SALT,OAAOA,IAAc;EACvC;EACA;EACD,CAAC,CAEgD;EAClD;AAEF,MAAa,kBAAkB,OAAO,IAAI,aAAa;CACrD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,eAAe,OAAO;CAC5B,MAAM,cAAc,KAAK,KAAK,kBAAkB,cAAc,aAAa;AAE3E,KAAI,EAAE,OAAO,GAAG,OAAO,aAAa,GAAG;AACrC,MAAI,OAAO,GAAG,OAAO,YAAY,EAAE;AACjC,UAAO,GAAG,OAAO,YAAY;AAC7B,UAAO,eAAe,YAAY;;AAEpC;;CAGF,MAAM,aAAa,KAAK,QAAQ,YAAY;CAE5C,MAAM,mBAAmB,OAAO,oBAC9B,KAAK,SAAS,YAAY,KAAK,KAAK,kBAAkB,YAAY,CAAC,CACpE;CAED,MAAM,qBAAqB,OAAO,oBAChC,KAAK,SAAS,YAAY,aAAa,CACxC;AAOD,QAAO,sBAAsB,aALL,OAAOC,QAAkB;EAC/C;EACA;EACD,CAAC,CAEwD;EAC1D;AAEF,MAAM,0BAA0B,OAAO,IAAI,aAAa;CACtD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAKjD,MAAM,QADa,OAAO,gBAFT,KAAK,KAAK,kBAAkB,UAAU,CAEJ,EAC3B;AAExB,KAAI,CAAC,KAAK,aAAa,KAAK,CAC1B,QAAO,OAAO,OAAO,IAAI,8CAA8C;CAGzE,MAAM,eAAe,KAAK,KAAK,kBAAkB,cAAc;CAC/D,MAAM,iBAAiB,OAAO,GAAG,OAAO,aAAa;CACrD,MAAM,iBAAiB,OAAO;AAO9B,QAAO,OAAO,kBALK,OAAO,MAAM,gBAAgB;EAC9C,cAAc;EACd,SAAS,aAAc,iBAAiB,KAAK,MAAM,MAAM,SAAS,GAAG;EACtE,CAAC,CAEyC;EAC3C;AAEF,MAAM,iBAAiB,OAAO,IAAI,aAAa;CAC7C,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CACjD,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,MAAM,oBAAoB,KAAK,KAAK,kBAAkB,YAAY;AAElE,QAAO,gBAAgB,kBAAkB,CAAC,KACxC,OAAO,SAAS,iBAAiB;EAC/B,MAAM,gBAAgB,aAAa;AAEnC,SAAO,eAAe,iBAAiB,cAAc,GACjD,OAAO,QAAQ,cAAc,GAC7B,OAAO,IAAI,wBAAwB;GACvC,CACH;CAED,MAAM,mBAAmB,KAAK,KAAK,iBAAiB,YAAY;CAMhE,MAAM,uBAAuB,OAAO,oBAJT,KAAK,SAC9B,KAAK,QAAQ,iBAAiB,EAC9B,kBACD,CAC0E;AAK3E,QAAO,sBAAsB,kBAJN,OAAOC,OAAiB,EAC7C,kBAAkB,sBACnB,CAAC,CAE4D;EAC9D;AAEF,MAAM,mBAAmB,OAAO,IAAI,aAAa;CAC/C,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,4BAA4B,KAAK,KAAK,kBAAkB,aAAa;CAE3E,MAAM,eAAe,KAAK,KAAK,2BAA2B,cAAc;CACxE,MAAM,mBAAmB,KAAK,SAC5B,KAAK,QAAQ,aAAa,EAC1B,KAAK,KAAK,kBAAkB,SAAS,CACtC;AAMD,QAAO,sBAAsB,cAJE,OAAOC,SAAmB,EACvD,kBACD,CAAC,CAEgE;EAClE;AAEF,MAAM,8BAA8B,OAAO,IAAI,aAAa;CAC1D,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,4BAA4B,KAAK,KAAK,kBAAkB,aAAa;CAE3E,MAAM,0BAA0B,KAAK,KACnC,2BACA,yBACD;CACD,MAAM,iBAAiB,OAAO,oBAC5B,KAAK,SACH,KAAK,QAAQ,wBAAwB,EACrC,KAAK,KAAK,kBAAkB,UAAU,CACvC,CACF;AAMD,QAAO,sBACL,yBALkC,OAAOC,oBAA8B,EACvE,gBACD,CAAC,CAKD;EACD;AAEF,MAAa,kCAAkC,OAAO,IAAI,aAAa;CACrE,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,eAAe,KAAK,KAAK,kBAAkB,cAAc;CAC/D,MAAM,eAAe,OAAO;CAC5B,MAAM,8BAA8B,KAAK,KACvC,kBACA,cACA,6BACD;CAED,MAAM,iBAAiB,OAAO,GAAG,OAAO,aAAa;CACrD,MAAM,iBAAiB,OAAO,GAAG,OAAO,aAAa;AAErD,KAAI,CAAC,kBAAkB,CAAC,gBAAgB;AACtC,MAAI,OAAO,GAAG,OAAO,4BAA4B,EAAE;AACjD,UAAO,GAAG,OAAO,4BAA4B;AAC7C,UAAO,eAAe,4BAA4B;;AAEpD;;CAGF,MAAM,qBAAqB,OAAO,oBAChC,KAAK,SAAS,KAAK,QAAQ,4BAA4B,EAAE,aAAa,CACvE;AAOD,QAAO,sBACL,6BALA,OAAOC,wBAAkC,EACvC,oBACD,CAAC,CAKH;EACD;AAEF,MAAM,eAAe,OAAO,IAAI,aAAa;CAC3C,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,4BAA4B,KAAK,KAAK,kBAAkB,aAAa;CAC3E,MAAM,WAAW,KAAK,KAAK,2BAA2B,UAAU;CAChE,MAAM,UAAU,KAAK,QAAQ,SAAS;CAEtC,MAAM,iBAAiB,OAAO,oBAC5B,KAAK,SAAS,SAAS,KAAK,KAAK,kBAAkB,UAAU,CAAC,CAC/D;CAED,MAAM,eAAe,OAAO;CAE5B,MAAM,sBADiB,OAAO,GAAG,OAAO,aAAa,IAEjD,OAAO,oBAAoB,KAAK,SAAS,SAAS,aAAa,CAAC,GAChE;AAOJ,QAAO,sBAAsB,UALR,OAAOC,KAAe;EACzC;EACA,GAAI,uBAAuB,OAAO,EAAE,GAAG,EAAE,oBAAoB;EAC9D,CAAC,CAEkD;EACpD;AAEF,MAAM,gBAAgB,WACpB,OAAO,KACL,OAAO,IACL,OAAO,MAAM;CACX,cAAc,OAAO;CACrB,SAAS,EAAE,QAAQ,qBACjB,MAAM,MAAM,OAAO,CAAC,KAClB,MAAM,KAAK,eAAe,aAAa,eAAe,CAAC,EACvD,MAAM,KAAK,kBAAkB,gBAAgB,eAAe,CAAC,EAC7D,MAAM,KAAK,mBAAmB,OAAO,KAAK,EAC1C,MAAM,WACP;CACJ,CAAC,CACH,CACF"}

package/dist/package.mjs

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

package/dist/utils.mjs

@@ -5,8 +5,10 @@ import { ConfectDirectory } from "./ConfectDirectory.mjs";
 import { authConfig, crons, functions, http } from "./templates.mjs";
 import { GroupPaths } from "./GroupPaths.mjs";
 import { groupPaths, make } from "./FunctionPaths.mjs";
+import { createRequire } from "node:module";
 import { Array, Effect, HashSet, Option, Order, Record, String, pipe } from "effect";
 import { FileSystem, Path } from "@effect/platform";
+import { pathToFileURL } from "node:url";
 import * as esbuild from "esbuild";
 
 //#region src/utils.ts
@@ -30,8 +32,9 @@ const absoluteExternalsPlugin = {
 		build.onResolve({ filter: /.*/ }, async (args) => {
 			if (args.kind !== "import-statement" && args.kind !== "dynamic-import") return;
 			if (!isExternalImport(args.path)) return;
+			const parentFile = pathToFileURL(args.resolveDir + "/_").href;
 			return {
-				path: import.meta.resolve(args.path, "file://" + args.resolveDir + "/"),
+				path: pathToFileURL(createRequire(parentFile).resolve(args.path)).href,
 				external: true
 			};
 		});
@@ -94,13 +97,13 @@ const generateGroupModule = ({ groupPath, functionNames }) => Effect.gen(functio
 	const convexDirectory = yield* ConvexDirectory.get;
 	const confectDirectory = yield* ConfectDirectory.get;
 	const relativeModulePath = yield* modulePath(groupPath);
-	const modulePath$2 = path.join(convexDirectory, relativeModulePath);
-	const directoryPath = path.dirname(modulePath$2);
+	const modulePath$1 = path.join(convexDirectory, relativeModulePath);
+	const directoryPath = path.dirname(modulePath$1);
 	if (!(yield* fs.exists(directoryPath))) yield* fs.makeDirectory(directoryPath, { recursive: true });
 	const isNodeGroup = groupPath.pathSegments[0] === "node";
 	const registeredFunctionsFileName = isNodeGroup ? "nodeRegisteredFunctions.ts" : "registeredFunctions.ts";
 	const registeredFunctionsPath = path.join(confectDirectory, "_generated", registeredFunctionsFileName);
-	const registeredFunctionsImportPath = yield* removePathExtension(path.relative(path.dirname(modulePath$2), registeredFunctionsPath));
+	const registeredFunctionsImportPath = yield* removePathExtension(path.relative(path.dirname(modulePath$1), registeredFunctionsPath));
 	const registeredFunctionsVariableName = isNodeGroup ? "nodeRegisteredFunctions" : "registeredFunctions";
 	const functionsContentsString = yield* functions({
 		groupPath,
@@ -110,12 +113,12 @@ const generateGroupModule = ({ groupPath, functionNames }) => Effect.gen(functio
 		useNode: isNodeGroup,
 		...isNodeGroup ? { registeredFunctionsLookupPath: groupPath.pathSegments.slice(1) } : {}
 	});
-	if (!(yield* fs.exists(modulePath$2))) {
-		yield* fs.writeFileString(modulePath$2, functionsContentsString);
+	if (!(yield* fs.exists(modulePath$1))) {
+		yield* fs.writeFileString(modulePath$1, functionsContentsString);
 		return "Added";
 	}
-	if ((yield* fs.readFileString(modulePath$2)) !== functionsContentsString) {
-		yield* fs.writeFileString(modulePath$2, functionsContentsString);
+	if ((yield* fs.readFileString(modulePath$1)) !== functionsContentsString) {
+		yield* fs.writeFileString(modulePath$1, functionsContentsString);
 		return "Modified";
 	}
 	return "Unchanged";
@@ -171,9 +174,9 @@ const removeGroups = (groupPaths) => Effect.gen(function* () {
 	const convexDirectory = yield* ConvexDirectory.get;
 	yield* Effect.all(HashSet.map(groupPaths, (groupPath) => Effect.gen(function* () {
 		const relativeModulePath = yield* modulePath(groupPath);
-		const modulePath$1 = path.join(convexDirectory, relativeModulePath);
+		const modulePath$2 = path.join(convexDirectory, relativeModulePath);
 		yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);
-		yield* fs.remove(modulePath$1);
+		yield* fs.remove(modulePath$2);
 		yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);
 	})), { concurrency: "unbounded" });
 });

package/dist/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","names":["GroupPath.modulePath","modulePath","templates.functions","FunctionPaths.make","FunctionPaths.groupPaths","GroupPath.getGroupSpec","GroupPath.fromGroupModulePath","templates.http","templates.crons","templates.authConfig"],"sources":["../src/utils.ts"],"sourcesContent":["import type { FunctionSpec, Spec } from \"@confect/core\";\nimport { FileSystem, Path } from \"@effect/platform\";\nimport type { PlatformError } from \"@effect/platform/Error\";\nimport {\n  Array,\n  Effect,\n  HashSet,\n  Option,\n  Order,\n  pipe,\n  Record,\n  String,\n} from \"effect\";\nimport * as esbuild from \"esbuild\";\nimport * as FunctionPaths from \"./FunctionPaths\";\nimport * as GroupPath from \"./GroupPath\";\nimport * as GroupPaths from \"./GroupPaths\";\nimport { logFileAdded, logFileModified, logFileRemoved } from \"./log\";\nimport { ConfectDirectory } from \"./ConfectDirectory\";\nimport { ConvexDirectory } from \"./ConvexDirectory\";\nimport * as templates from \"./templates\";\n\nexport const removePathExtension = (pathStr: string) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n\n    return String.slice(0, -path.extname(pathStr).length)(pathStr);\n  });\n\nexport const EXTERNAL_PACKAGES = [\n  \"@confect/core\",\n  \"@confect/server\",\n  \"effect\",\n  \"@effect/*\",\n];\n\nconst isExternalImport = (path: string) =>\n  EXTERNAL_PACKAGES.some((p) => {\n    if (p.endsWith(\"/*\")) {\n      return path.startsWith(p.slice(0, -1));\n    }\n    return path === p || path.startsWith(p + \"/\");\n  });\n\nconst absoluteExternalsPlugin: esbuild.Plugin = {\n  name: \"absolute-externals\",\n  setup(build) {\n    build.onResolve({ filter: /.*/ }, async (args) => {\n      if (args.kind !== \"import-statement\" && args.kind !== \"dynamic-import\")\n        return;\n      if (!isExternalImport(args.path)) return;\n      const resolved = import.meta.resolve(\n        args.path,\n        \"file://\" + args.resolveDir + \"/\",\n      );\n      return { path: resolved, external: true };\n    });\n  },\n};\n\n/**\n * Bundle a TypeScript entry point with esbuild and import the result via a\n * data URL. This handles extensionless `.ts` imports regardless of whether the\n * user's project sets `\"type\": \"module\"` in package.json.\n */\nexport const bundleAndImport = (entryPoint: string) =>\n  Effect.gen(function* () {\n    const result = yield* Effect.promise(() =>\n      esbuild.build({\n        entryPoints: [entryPoint],\n        bundle: true,\n        write: false,\n        platform: \"node\",\n        format: \"esm\",\n        logLevel: \"silent\",\n        plugins: [absoluteExternalsPlugin],\n      }),\n    );\n    const code = result.outputFiles[0]!.text;\n    const dataUrl =\n      \"data:text/javascript;base64,\" + Buffer.from(code).toString(\"base64\");\n    return yield* Effect.promise(() => import(dataUrl));\n  });\n\nexport const writeFileStringAndLog = (filePath: string, contents: string) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    if (!(yield* fs.exists(filePath))) {\n      yield* fs.writeFileString(filePath, contents);\n      yield* logFileAdded(filePath);\n      return;\n    }\n    const existing = yield* fs.readFileString(filePath);\n    if (existing !== contents) {\n      yield* fs.writeFileString(filePath, contents);\n      yield* logFileModified(filePath);\n    }\n  });\n\nexport const findProjectRoot = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n\n  const startDir = path.resolve(\".\");\n  const root = path.parse(startDir).root;\n\n  const directories = Array.unfold(startDir, (dir) =>\n    dir === root\n      ? Option.none()\n      : Option.some([dir, path.dirname(dir)] as const),\n  );\n\n  const projectRoot = yield* Effect.findFirst(directories, (dir) =>\n    fs.exists(path.join(dir, \"package.json\")),\n  );\n\n  return Option.getOrElse(projectRoot, () => startDir);\n});\n\nexport type WriteChange = \"Added\" | \"Modified\" | \"Unchanged\";\n\nexport const writeFileString = (\n  filePath: string,\n  contents: string,\n): Effect.Effect<WriteChange, PlatformError, FileSystem.FileSystem> =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n\n    if (!(yield* fs.exists(filePath))) {\n      yield* fs.writeFileString(filePath, contents);\n      return \"Added\";\n    }\n    const existing = yield* fs.readFileString(filePath);\n    if (existing !== contents) {\n      yield* fs.writeFileString(filePath, contents);\n      return \"Modified\";\n    }\n    return \"Unchanged\";\n  });\n\nexport const generateGroupModule = ({\n  groupPath,\n  functionNames,\n}: {\n  groupPath: GroupPath.GroupPath;\n  functionNames: string[];\n}) =>\n  Effect.gen(function* () {\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\n    const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n    const modulePath = path.join(convexDirectory, relativeModulePath);\n\n    const directoryPath = path.dirname(modulePath);\n    if (!(yield* fs.exists(directoryPath))) {\n      yield* fs.makeDirectory(directoryPath, { recursive: true });\n    }\n\n    const isNodeGroup = groupPath.pathSegments[0] === \"node\";\n    const registeredFunctionsFileName = isNodeGroup\n      ? \"nodeRegisteredFunctions.ts\"\n      : \"registeredFunctions.ts\";\n    const registeredFunctionsPath = path.join(\n      confectDirectory,\n      \"_generated\",\n      registeredFunctionsFileName,\n    );\n    const registeredFunctionsImportPath = yield* removePathExtension(\n      path.relative(path.dirname(modulePath), registeredFunctionsPath),\n    );\n    const registeredFunctionsVariableName = isNodeGroup\n      ? \"nodeRegisteredFunctions\"\n      : \"registeredFunctions\";\n\n    const functionsContentsString = yield* templates.functions({\n      groupPath,\n      functionNames,\n      registeredFunctionsImportPath,\n      registeredFunctionsVariableName,\n      useNode: isNodeGroup,\n      ...(isNodeGroup\n        ? {\n            registeredFunctionsLookupPath: groupPath.pathSegments.slice(1),\n          }\n        : {}),\n    });\n\n    if (!(yield* fs.exists(modulePath))) {\n      yield* fs.writeFileString(modulePath, functionsContentsString);\n      return \"Added\" as const;\n    }\n    const existing = yield* fs.readFileString(modulePath);\n    if (existing !== functionsContentsString) {\n      yield* fs.writeFileString(modulePath, functionsContentsString);\n      return \"Modified\" as const;\n    }\n    return \"Unchanged\" as const;\n  });\n\nconst logGroupPaths = <R>(\n  groupPaths: GroupPaths.GroupPaths,\n  logFn: (fullPath: string) => Effect.Effect<void, never, R>,\n) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    yield* Effect.forEach(groupPaths, (gp) =>\n      Effect.gen(function* () {\n        const relativeModulePath = yield* GroupPath.modulePath(gp);\n        yield* logFn(path.join(convexDirectory, relativeModulePath));\n      }),\n    );\n  });\n\nexport const generateFunctions = (spec: Spec.AnyWithProps) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    const groupPathsFromFs = yield* getGroupPathsFromFs;\n    const functionPaths = FunctionPaths.make(spec);\n    const groupPathsFromSpec = FunctionPaths.groupPaths(functionPaths);\n\n    const overlappingGroupPaths = GroupPaths.GroupPaths.make(\n      HashSet.intersection(groupPathsFromFs, groupPathsFromSpec),\n    );\n    yield* Effect.forEach(overlappingGroupPaths, (groupPath) =>\n      Effect.gen(function* () {\n        const group = yield* GroupPath.getGroupSpec(spec, groupPath);\n        const functionNames = pipe(\n          group.functions,\n          Record.values,\n          Array.sortBy(\n            Order.mapInput(\n              Order.string,\n              (fn: FunctionSpec.AnyWithProps) => fn.name,\n            ),\n          ),\n          Array.map((fn) => fn.name),\n        );\n        const result = yield* generateGroupModule({ groupPath, functionNames });\n        if (result === \"Modified\") {\n          const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n          yield* logFileModified(\n            path.join(convexDirectory, relativeModulePath),\n          );\n        }\n      }),\n    );\n\n    const extinctGroupPaths = GroupPaths.GroupPaths.make(\n      HashSet.difference(groupPathsFromFs, groupPathsFromSpec),\n    );\n    yield* removeGroups(extinctGroupPaths);\n    yield* logGroupPaths(extinctGroupPaths, logFileRemoved);\n\n    const newGroupPaths = GroupPaths.GroupPaths.make(\n      HashSet.difference(groupPathsFromSpec, groupPathsFromFs),\n    );\n    yield* writeGroups(spec, newGroupPaths);\n    yield* logGroupPaths(newGroupPaths, logFileAdded);\n\n    return functionPaths;\n  });\n\nconst getGroupPathsFromFs = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const convexDirectory = yield* ConvexDirectory.get;\n\n  const RESERVED_CONVEX_TS_FILE_NAMES = new Set([\n    \"schema.ts\",\n    \"http.ts\",\n    \"crons.ts\",\n    \"auth.config.ts\",\n    \"convex.config.ts\",\n  ]);\n\n  const allConvexPaths = yield* fs.readDirectory(convexDirectory, {\n    recursive: true,\n  });\n  const groupPathArray = yield* pipe(\n    allConvexPaths,\n    Array.filter(\n      (convexPath) =>\n        path.extname(convexPath) === \".ts\" &&\n        !RESERVED_CONVEX_TS_FILE_NAMES.has(path.basename(convexPath)) &&\n        path.basename(path.dirname(convexPath)) !== \"_generated\",\n    ),\n    Effect.forEach((groupModulePath) =>\n      GroupPath.fromGroupModulePath(groupModulePath),\n    ),\n  );\n  return pipe(groupPathArray, HashSet.fromIterable, GroupPaths.GroupPaths.make);\n});\n\nexport const removeGroups = (groupPaths: GroupPaths.GroupPaths) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    const path = yield* Path.Path;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    yield* Effect.all(\n      HashSet.map(groupPaths, (groupPath) =>\n        Effect.gen(function* () {\n          const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n          const modulePath = path.join(convexDirectory, relativeModulePath);\n\n          yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);\n\n          yield* fs.remove(modulePath);\n          yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);\n        }),\n      ),\n      { concurrency: \"unbounded\" },\n    );\n  });\n\nexport const writeGroups = (\n  spec: Spec.AnyWithProps,\n  groupPaths: GroupPaths.GroupPaths,\n) =>\n  Effect.forEach(groupPaths, (groupPath) =>\n    Effect.gen(function* () {\n      const group = yield* GroupPath.getGroupSpec(spec, groupPath);\n\n      const functionNames = pipe(\n        group.functions,\n        Record.values,\n        Array.sortBy(\n          Order.mapInput(\n            Order.string,\n            (fn: FunctionSpec.AnyWithProps) => fn.name,\n          ),\n        ),\n        Array.map((fn) => fn.name),\n      );\n\n      yield* Effect.logDebug(`Generating group ${groupPath}...`);\n      yield* generateGroupModule({\n        groupPath,\n        functionNames,\n      });\n      yield* Effect.logDebug(`Group ${groupPath} generated`);\n    }),\n  );\n\nconst generateOptionalFile = (\n  confectFile: string,\n  convexFile: string,\n  generateContents: (importPath: string) => Effect.Effect<string>,\n) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    const path = yield* Path.Path;\n    const confectDirectory = yield* ConfectDirectory.get;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    const confectFilePath = path.join(confectDirectory, confectFile);\n\n    if (!(yield* fs.exists(confectFilePath))) {\n      return Option.none();\n    }\n\n    const convexFilePath = path.join(convexDirectory, convexFile);\n    const relativeImportPath = path.relative(\n      path.dirname(convexFilePath),\n      confectFilePath,\n    );\n    const importPathWithoutExt = yield* removePathExtension(relativeImportPath);\n    const contents = yield* generateContents(importPathWithoutExt);\n    const change = yield* writeFileString(convexFilePath, contents);\n    return Option.some({ change, convexFilePath });\n  });\n\nexport const generateHttp = generateOptionalFile(\n  \"http.ts\",\n  \"http.ts\",\n  (importPath) => templates.http({ httpImportPath: importPath }),\n);\n\nexport const generateCrons = generateOptionalFile(\n  \"crons.ts\",\n  \"crons.ts\",\n  (importPath) => templates.crons({ cronsImportPath: importPath }),\n);\n\nexport const generateAuthConfig = generateOptionalFile(\n  \"auth.ts\",\n  \"auth.config.ts\",\n  (importPath) => templates.authConfig({ authImportPath: importPath }),\n);\n"],"mappings":";;;;;;;;;;;;AAsBA,MAAa,uBAAuB,YAClC,OAAO,IAAI,aAAa;CACtB,MAAM,OAAO,OAAO,KAAK;AAEzB,QAAO,OAAO,MAAM,GAAG,CAAC,KAAK,QAAQ,QAAQ,CAAC,OAAO,CAAC,QAAQ;EAC9D;AAEJ,MAAa,oBAAoB;CAC/B;CACA;CACA;CACA;CACD;AAED,MAAM,oBAAoB,SACxB,kBAAkB,MAAM,MAAM;AAC5B,KAAI,EAAE,SAAS,KAAK,CAClB,QAAO,KAAK,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;AAExC,QAAO,SAAS,KAAK,KAAK,WAAW,IAAI,IAAI;EAC7C;AAEJ,MAAM,0BAA0C;CAC9C,MAAM;CACN,MAAM,OAAO;AACX,QAAM,UAAU,EAAE,QAAQ,MAAM,EAAE,OAAO,SAAS;AAChD,OAAI,KAAK,SAAS,sBAAsB,KAAK,SAAS,iBACpD;AACF,OAAI,CAAC,iBAAiB,KAAK,KAAK,CAAE;AAKlC,UAAO;IAAE,MAJQ,OAAO,KAAK,QAC3B,KAAK,MACL,YAAY,KAAK,aAAa,IAC/B;IACwB,UAAU;IAAM;IACzC;;CAEL;;;;;;AAOD,MAAa,mBAAmB,eAC9B,OAAO,IAAI,aAAa;CAYtB,MAAM,QAXS,OAAO,OAAO,cAC3B,QAAQ,MAAM;EACZ,aAAa,CAAC,WAAW;EACzB,QAAQ;EACR,OAAO;EACP,UAAU;EACV,QAAQ;EACR,UAAU;EACV,SAAS,CAAC,wBAAwB;EACnC,CAAC,CACH,EACmB,YAAY,GAAI;CACpC,MAAM,UACJ,iCAAiC,OAAO,KAAK,KAAK,CAAC,SAAS,SAAS;AACvE,QAAO,OAAO,OAAO,cAAc,OAAO,SAAS;EACnD;AAEJ,MAAa,yBAAyB,UAAkB,aACtD,OAAO,IAAI,aAAa;CACtB,MAAM,KAAK,OAAO,WAAW;AAC7B,KAAI,EAAE,OAAO,GAAG,OAAO,SAAS,GAAG;AACjC,SAAO,GAAG,gBAAgB,UAAU,SAAS;AAC7C,SAAO,aAAa,SAAS;AAC7B;;AAGF,MADiB,OAAO,GAAG,eAAe,SAAS,MAClC,UAAU;AACzB,SAAO,GAAG,gBAAgB,UAAU,SAAS;AAC7C,SAAO,gBAAgB,SAAS;;EAElC;AAEJ,MAAa,kBAAkB,OAAO,IAAI,aAAa;CACrD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CAEzB,MAAM,WAAW,KAAK,QAAQ,IAAI;CAClC,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC;CAElC,MAAM,cAAc,MAAM,OAAO,WAAW,QAC1C,QAAQ,OACJ,OAAO,MAAM,GACb,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAU,CACnD;CAED,MAAM,cAAc,OAAO,OAAO,UAAU,cAAc,QACxD,GAAG,OAAO,KAAK,KAAK,KAAK,eAAe,CAAC,CAC1C;AAED,QAAO,OAAO,UAAU,mBAAmB,SAAS;EACpD;AAIF,MAAa,mBACX,UACA,aAEA,OAAO,IAAI,aAAa;CACtB,MAAM,KAAK,OAAO,WAAW;AAE7B,KAAI,EAAE,OAAO,GAAG,OAAO,SAAS,GAAG;AACjC,SAAO,GAAG,gBAAgB,UAAU,SAAS;AAC7C,SAAO;;AAGT,MADiB,OAAO,GAAG,eAAe,SAAS,MAClC,UAAU;AACzB,SAAO,GAAG,gBAAgB,UAAU,SAAS;AAC7C,SAAO;;AAET,QAAO;EACP;AAEJ,MAAa,uBAAuB,EAClC,WACA,oBAKA,OAAO,IAAI,aAAa;CACtB,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAC/C,MAAM,mBAAmB,OAAO,iBAAiB;CAEjD,MAAM,qBAAqB,OAAOA,WAAqB,UAAU;CACjE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,mBAAmB;CAEjE,MAAM,gBAAgB,KAAK,QAAQA,aAAW;AAC9C,KAAI,EAAE,OAAO,GAAG,OAAO,cAAc,EACnC,QAAO,GAAG,cAAc,eAAe,EAAE,WAAW,MAAM,CAAC;CAG7D,MAAM,cAAc,UAAU,aAAa,OAAO;CAClD,MAAM,8BAA8B,cAChC,+BACA;CACJ,MAAM,0BAA0B,KAAK,KACnC,kBACA,cACA,4BACD;CACD,MAAM,gCAAgC,OAAO,oBAC3C,KAAK,SAAS,KAAK,QAAQA,aAAW,EAAE,wBAAwB,CACjE;CACD,MAAM,kCAAkC,cACpC,4BACA;CAEJ,MAAM,0BAA0B,OAAOC,UAAoB;EACzD;EACA;EACA;EACA;EACA,SAAS;EACT,GAAI,cACA,EACE,+BAA+B,UAAU,aAAa,MAAM,EAAE,EAC/D,GACD,EAAE;EACP,CAAC;AAEF,KAAI,EAAE,OAAO,GAAG,OAAOD,aAAW,GAAG;AACnC,SAAO,GAAG,gBAAgBA,cAAY,wBAAwB;AAC9D,SAAO;;AAGT,MADiB,OAAO,GAAG,eAAeA,aAAW,MACpC,yBAAyB;AACxC,SAAO,GAAG,gBAAgBA,cAAY,wBAAwB;AAC9D,SAAO;;AAET,QAAO;EACP;AAEJ,MAAM,iBACJ,YACA,UAEA,OAAO,IAAI,aAAa;CACtB,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;AAE/C,QAAO,OAAO,QAAQ,aAAa,OACjC,OAAO,IAAI,aAAa;EACtB,MAAM,qBAAqB,OAAOD,WAAqB,GAAG;AAC1D,SAAO,MAAM,KAAK,KAAK,iBAAiB,mBAAmB,CAAC;GAC5D,CACH;EACD;AAEJ,MAAa,qBAAqB,SAChC,OAAO,IAAI,aAAa;CACtB,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,MAAM,mBAAmB,OAAO;CAChC,MAAM,gBAAgBG,KAAmB,KAAK;CAC9C,MAAM,qBAAqBC,WAAyB,cAAc;CAElE,MAAM,mCAA8C,KAClD,QAAQ,aAAa,kBAAkB,mBAAmB,CAC3D;AACD,QAAO,OAAO,QAAQ,wBAAwB,cAC5C,OAAO,IAAI,aAAa;AActB,OADe,OAAO,oBAAoB;GAAE;GAAW,eAXjC,MADR,OAAOC,aAAuB,MAAM,UAAU,EAEpD,WACN,OAAO,QACP,MAAM,OACJ,MAAM,SACJ,MAAM,SACL,OAAkC,GAAG,KACvC,CACF,EACD,MAAM,KAAK,OAAO,GAAG,KAAK,CAC3B;GACqE,CAAC,MACxD,YAAY;GACzB,MAAM,qBAAqB,OAAOL,WAAqB,UAAU;AACjE,UAAO,gBACL,KAAK,KAAK,iBAAiB,mBAAmB,CAC/C;;GAEH,CACH;CAED,MAAM,+BAA0C,KAC9C,QAAQ,WAAW,kBAAkB,mBAAmB,CACzD;AACD,QAAO,aAAa,kBAAkB;AACtC,QAAO,cAAc,mBAAmB,eAAe;CAEvD,MAAM,2BAAsC,KAC1C,QAAQ,WAAW,oBAAoB,iBAAiB,CACzD;AACD,QAAO,YAAY,MAAM,cAAc;AACvC,QAAO,cAAc,eAAe,aAAa;AAEjD,QAAO;EACP;AAEJ,MAAM,sBAAsB,OAAO,IAAI,aAAa;CAClD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,MAAM,gCAAgC,IAAI,IAAI;EAC5C;EACA;EACA;EACA;EACA;EACD,CAAC;AAiBF,QAAO,KAZgB,OAAO,KAHP,OAAO,GAAG,cAAc,iBAAiB,EAC9D,WAAW,MACZ,CAAC,EAGA,MAAM,QACH,eACC,KAAK,QAAQ,WAAW,KAAK,SAC7B,CAAC,8BAA8B,IAAI,KAAK,SAAS,WAAW,CAAC,IAC7D,KAAK,SAAS,KAAK,QAAQ,WAAW,CAAC,KAAK,aAC/C,EACD,OAAO,SAAS,oBACdM,oBAA8B,gBAAgB,CAC/C,CACF,EAC2B,QAAQ,yBAAoC,KAAK;EAC7E;AAEF,MAAa,gBAAgB,eAC3B,OAAO,IAAI,aAAa;CACtB,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,kBAAkB,OAAO,gBAAgB;AAE/C,QAAO,OAAO,IACZ,QAAQ,IAAI,aAAa,cACvB,OAAO,IAAI,aAAa;EACtB,MAAM,qBAAqB,OAAON,WAAqB,UAAU;EACjE,MAAMC,eAAa,KAAK,KAAK,iBAAiB,mBAAmB;AAEjE,SAAO,OAAO,SAAS,mBAAmB,mBAAmB,MAAM;AAEnE,SAAO,GAAG,OAAOA,aAAW;AAC5B,SAAO,OAAO,SAAS,UAAU,mBAAmB,WAAW;GAC/D,CACH,EACD,EAAE,aAAa,aAAa,CAC7B;EACD;AAEJ,MAAa,eACX,MACA,eAEA,OAAO,QAAQ,aAAa,cAC1B,OAAO,IAAI,aAAa;CAGtB,MAAM,gBAAgB,MAFR,OAAOI,aAAuB,MAAM,UAAU,EAGpD,WACN,OAAO,QACP,MAAM,OACJ,MAAM,SACJ,MAAM,SACL,OAAkC,GAAG,KACvC,CACF,EACD,MAAM,KAAK,OAAO,GAAG,KAAK,CAC3B;AAED,QAAO,OAAO,SAAS,oBAAoB,UAAU,KAAK;AAC1D,QAAO,oBAAoB;EACzB;EACA;EACD,CAAC;AACF,QAAO,OAAO,SAAS,SAAS,UAAU,YAAY;EACtD,CACH;AAEH,MAAM,wBACJ,aACA,YACA,qBAEA,OAAO,IAAI,aAAa;CACtB,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,mBAAmB,OAAO,iBAAiB;CACjD,MAAM,kBAAkB,OAAO,gBAAgB;CAE/C,MAAM,kBAAkB,KAAK,KAAK,kBAAkB,YAAY;AAEhE,KAAI,EAAE,OAAO,GAAG,OAAO,gBAAgB,EACrC,QAAO,OAAO,MAAM;CAGtB,MAAM,iBAAiB,KAAK,KAAK,iBAAiB,WAAW;CAO7D,MAAM,SAAS,OAAO,gBAAgB,gBADrB,OAAO,iBADK,OAAO,oBAJT,KAAK,SAC9B,KAAK,QAAQ,eAAe,EAC5B,gBACD,CAC0E,CACb,CACC;AAC/D,QAAO,OAAO,KAAK;EAAE;EAAQ;EAAgB,CAAC;EAC9C;AAEJ,MAAa,eAAe,qBAC1B,WACA,YACC,eAAeE,KAAe,EAAE,gBAAgB,YAAY,CAAC,CAC/D;AAED,MAAa,gBAAgB,qBAC3B,YACA,aACC,eAAeC,MAAgB,EAAE,iBAAiB,YAAY,CAAC,CACjE;AAED,MAAa,qBAAqB,qBAChC,WACA,mBACC,eAAeC,WAAqB,EAAE,gBAAgB,YAAY,CAAC,CACrE"}
+{"version":3,"file":"utils.mjs","names":["GroupPath.modulePath","modulePath","templates.functions","FunctionPaths.make","FunctionPaths.groupPaths","GroupPath.getGroupSpec","GroupPath.fromGroupModulePath","templates.http","templates.crons","templates.authConfig"],"sources":["../src/utils.ts"],"sourcesContent":["import type { FunctionSpec, Spec } from \"@confect/core\";\nimport { createRequire } from \"node:module\";\nimport { pathToFileURL } from \"node:url\";\nimport { FileSystem, Path } from \"@effect/platform\";\nimport type { PlatformError } from \"@effect/platform/Error\";\nimport {\n  Array,\n  Effect,\n  HashSet,\n  Option,\n  Order,\n  pipe,\n  Record,\n  String,\n} from \"effect\";\nimport * as esbuild from \"esbuild\";\nimport * as FunctionPaths from \"./FunctionPaths\";\nimport * as GroupPath from \"./GroupPath\";\nimport * as GroupPaths from \"./GroupPaths\";\nimport { logFileAdded, logFileModified, logFileRemoved } from \"./log\";\nimport { ConfectDirectory } from \"./ConfectDirectory\";\nimport { ConvexDirectory } from \"./ConvexDirectory\";\nimport * as templates from \"./templates\";\n\nexport const removePathExtension = (pathStr: string) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n\n    return String.slice(0, -path.extname(pathStr).length)(pathStr);\n  });\n\nexport const EXTERNAL_PACKAGES = [\n  \"@confect/core\",\n  \"@confect/server\",\n  \"effect\",\n  \"@effect/*\",\n];\n\nconst isExternalImport = (path: string) =>\n  EXTERNAL_PACKAGES.some((p) => {\n    if (p.endsWith(\"/*\")) {\n      return path.startsWith(p.slice(0, -1));\n    }\n    return path === p || path.startsWith(p + \"/\");\n  });\n\nconst absoluteExternalsPlugin: esbuild.Plugin = {\n  name: \"absolute-externals\",\n  setup(build) {\n    build.onResolve({ filter: /.*/ }, async (args) => {\n      if (args.kind !== \"import-statement\" && args.kind !== \"dynamic-import\")\n        return;\n      if (!isExternalImport(args.path)) return;\n      // `import.meta.resolve`'s second argument is silently ignored in modern\n      // Node, so resolution would always walk up from the CLI's bundled file\n      // (`packages/cli/dist/utils.mjs`) instead of from the user's project.\n      // Use `createRequire` keyed on the importing file's directory so we\n      // resolve out of *their* `node_modules`. The synthetic filename is just\n      // a CommonJS resolution anchor; the file does not need to exist.\n      const parentFile = pathToFileURL(args.resolveDir + \"/_\").href;\n      const require_ = createRequire(parentFile);\n      const resolvedPath = require_.resolve(args.path);\n      const resolved = pathToFileURL(resolvedPath).href;\n      return { path: resolved, external: true };\n    });\n  },\n};\n\n/**\n * Bundle a TypeScript entry point with esbuild and import the result via a\n * data URL. This handles extensionless `.ts` imports regardless of whether the\n * user's project sets `\"type\": \"module\"` in package.json.\n */\nexport const bundleAndImport = (entryPoint: string) =>\n  Effect.gen(function* () {\n    const result = yield* Effect.promise(() =>\n      esbuild.build({\n        entryPoints: [entryPoint],\n        bundle: true,\n        write: false,\n        platform: \"node\",\n        format: \"esm\",\n        logLevel: \"silent\",\n        plugins: [absoluteExternalsPlugin],\n      }),\n    );\n    const code = result.outputFiles[0]!.text;\n    const dataUrl =\n      \"data:text/javascript;base64,\" + Buffer.from(code).toString(\"base64\");\n    return yield* Effect.promise(() => import(dataUrl));\n  });\n\nexport const writeFileStringAndLog = (filePath: string, contents: string) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    if (!(yield* fs.exists(filePath))) {\n      yield* fs.writeFileString(filePath, contents);\n      yield* logFileAdded(filePath);\n      return;\n    }\n    const existing = yield* fs.readFileString(filePath);\n    if (existing !== contents) {\n      yield* fs.writeFileString(filePath, contents);\n      yield* logFileModified(filePath);\n    }\n  });\n\nexport const findProjectRoot = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n\n  const startDir = path.resolve(\".\");\n  const root = path.parse(startDir).root;\n\n  const directories = Array.unfold(startDir, (dir) =>\n    dir === root\n      ? Option.none()\n      : Option.some([dir, path.dirname(dir)] as const),\n  );\n\n  const projectRoot = yield* Effect.findFirst(directories, (dir) =>\n    fs.exists(path.join(dir, \"package.json\")),\n  );\n\n  return Option.getOrElse(projectRoot, () => startDir);\n});\n\nexport type WriteChange = \"Added\" | \"Modified\" | \"Unchanged\";\n\nexport const writeFileString = (\n  filePath: string,\n  contents: string,\n): Effect.Effect<WriteChange, PlatformError, FileSystem.FileSystem> =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n\n    if (!(yield* fs.exists(filePath))) {\n      yield* fs.writeFileString(filePath, contents);\n      return \"Added\";\n    }\n    const existing = yield* fs.readFileString(filePath);\n    if (existing !== contents) {\n      yield* fs.writeFileString(filePath, contents);\n      return \"Modified\";\n    }\n    return \"Unchanged\";\n  });\n\nexport const generateGroupModule = ({\n  groupPath,\n  functionNames,\n}: {\n  groupPath: GroupPath.GroupPath;\n  functionNames: string[];\n}) =>\n  Effect.gen(function* () {\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\n    const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n    const modulePath = path.join(convexDirectory, relativeModulePath);\n\n    const directoryPath = path.dirname(modulePath);\n    if (!(yield* fs.exists(directoryPath))) {\n      yield* fs.makeDirectory(directoryPath, { recursive: true });\n    }\n\n    const isNodeGroup = groupPath.pathSegments[0] === \"node\";\n    const registeredFunctionsFileName = isNodeGroup\n      ? \"nodeRegisteredFunctions.ts\"\n      : \"registeredFunctions.ts\";\n    const registeredFunctionsPath = path.join(\n      confectDirectory,\n      \"_generated\",\n      registeredFunctionsFileName,\n    );\n    const registeredFunctionsImportPath = yield* removePathExtension(\n      path.relative(path.dirname(modulePath), registeredFunctionsPath),\n    );\n    const registeredFunctionsVariableName = isNodeGroup\n      ? \"nodeRegisteredFunctions\"\n      : \"registeredFunctions\";\n\n    const functionsContentsString = yield* templates.functions({\n      groupPath,\n      functionNames,\n      registeredFunctionsImportPath,\n      registeredFunctionsVariableName,\n      useNode: isNodeGroup,\n      ...(isNodeGroup\n        ? {\n            registeredFunctionsLookupPath: groupPath.pathSegments.slice(1),\n          }\n        : {}),\n    });\n\n    if (!(yield* fs.exists(modulePath))) {\n      yield* fs.writeFileString(modulePath, functionsContentsString);\n      return \"Added\" as const;\n    }\n    const existing = yield* fs.readFileString(modulePath);\n    if (existing !== functionsContentsString) {\n      yield* fs.writeFileString(modulePath, functionsContentsString);\n      return \"Modified\" as const;\n    }\n    return \"Unchanged\" as const;\n  });\n\nconst logGroupPaths = <R>(\n  groupPaths: GroupPaths.GroupPaths,\n  logFn: (fullPath: string) => Effect.Effect<void, never, R>,\n) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    yield* Effect.forEach(groupPaths, (gp) =>\n      Effect.gen(function* () {\n        const relativeModulePath = yield* GroupPath.modulePath(gp);\n        yield* logFn(path.join(convexDirectory, relativeModulePath));\n      }),\n    );\n  });\n\nexport const generateFunctions = (spec: Spec.AnyWithProps) =>\n  Effect.gen(function* () {\n    const path = yield* Path.Path;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    const groupPathsFromFs = yield* getGroupPathsFromFs;\n    const functionPaths = FunctionPaths.make(spec);\n    const groupPathsFromSpec = FunctionPaths.groupPaths(functionPaths);\n\n    const overlappingGroupPaths = GroupPaths.GroupPaths.make(\n      HashSet.intersection(groupPathsFromFs, groupPathsFromSpec),\n    );\n    yield* Effect.forEach(overlappingGroupPaths, (groupPath) =>\n      Effect.gen(function* () {\n        const group = yield* GroupPath.getGroupSpec(spec, groupPath);\n        const functionNames = pipe(\n          group.functions,\n          Record.values,\n          Array.sortBy(\n            Order.mapInput(\n              Order.string,\n              (fn: FunctionSpec.AnyWithProps) => fn.name,\n            ),\n          ),\n          Array.map((fn) => fn.name),\n        );\n        const result = yield* generateGroupModule({ groupPath, functionNames });\n        if (result === \"Modified\") {\n          const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n          yield* logFileModified(\n            path.join(convexDirectory, relativeModulePath),\n          );\n        }\n      }),\n    );\n\n    const extinctGroupPaths = GroupPaths.GroupPaths.make(\n      HashSet.difference(groupPathsFromFs, groupPathsFromSpec),\n    );\n    yield* removeGroups(extinctGroupPaths);\n    yield* logGroupPaths(extinctGroupPaths, logFileRemoved);\n\n    const newGroupPaths = GroupPaths.GroupPaths.make(\n      HashSet.difference(groupPathsFromSpec, groupPathsFromFs),\n    );\n    yield* writeGroups(spec, newGroupPaths);\n    yield* logGroupPaths(newGroupPaths, logFileAdded);\n\n    return functionPaths;\n  });\n\nconst getGroupPathsFromFs = Effect.gen(function* () {\n  const fs = yield* FileSystem.FileSystem;\n  const path = yield* Path.Path;\n  const convexDirectory = yield* ConvexDirectory.get;\n\n  const RESERVED_CONVEX_TS_FILE_NAMES = new Set([\n    \"schema.ts\",\n    \"http.ts\",\n    \"crons.ts\",\n    \"auth.config.ts\",\n    \"convex.config.ts\",\n  ]);\n\n  const allConvexPaths = yield* fs.readDirectory(convexDirectory, {\n    recursive: true,\n  });\n  const groupPathArray = yield* pipe(\n    allConvexPaths,\n    Array.filter(\n      (convexPath) =>\n        path.extname(convexPath) === \".ts\" &&\n        !RESERVED_CONVEX_TS_FILE_NAMES.has(path.basename(convexPath)) &&\n        path.basename(path.dirname(convexPath)) !== \"_generated\",\n    ),\n    Effect.forEach((groupModulePath) =>\n      GroupPath.fromGroupModulePath(groupModulePath),\n    ),\n  );\n  return pipe(groupPathArray, HashSet.fromIterable, GroupPaths.GroupPaths.make);\n});\n\nexport const removeGroups = (groupPaths: GroupPaths.GroupPaths) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    const path = yield* Path.Path;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    yield* Effect.all(\n      HashSet.map(groupPaths, (groupPath) =>\n        Effect.gen(function* () {\n          const relativeModulePath = yield* GroupPath.modulePath(groupPath);\n          const modulePath = path.join(convexDirectory, relativeModulePath);\n\n          yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);\n\n          yield* fs.remove(modulePath);\n          yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);\n        }),\n      ),\n      { concurrency: \"unbounded\" },\n    );\n  });\n\nexport const writeGroups = (\n  spec: Spec.AnyWithProps,\n  groupPaths: GroupPaths.GroupPaths,\n) =>\n  Effect.forEach(groupPaths, (groupPath) =>\n    Effect.gen(function* () {\n      const group = yield* GroupPath.getGroupSpec(spec, groupPath);\n\n      const functionNames = pipe(\n        group.functions,\n        Record.values,\n        Array.sortBy(\n          Order.mapInput(\n            Order.string,\n            (fn: FunctionSpec.AnyWithProps) => fn.name,\n          ),\n        ),\n        Array.map((fn) => fn.name),\n      );\n\n      yield* Effect.logDebug(`Generating group ${groupPath}...`);\n      yield* generateGroupModule({\n        groupPath,\n        functionNames,\n      });\n      yield* Effect.logDebug(`Group ${groupPath} generated`);\n    }),\n  );\n\nconst generateOptionalFile = (\n  confectFile: string,\n  convexFile: string,\n  generateContents: (importPath: string) => Effect.Effect<string>,\n) =>\n  Effect.gen(function* () {\n    const fs = yield* FileSystem.FileSystem;\n    const path = yield* Path.Path;\n    const confectDirectory = yield* ConfectDirectory.get;\n    const convexDirectory = yield* ConvexDirectory.get;\n\n    const confectFilePath = path.join(confectDirectory, confectFile);\n\n    if (!(yield* fs.exists(confectFilePath))) {\n      return Option.none();\n    }\n\n    const convexFilePath = path.join(convexDirectory, convexFile);\n    const relativeImportPath = path.relative(\n      path.dirname(convexFilePath),\n      confectFilePath,\n    );\n    const importPathWithoutExt = yield* removePathExtension(relativeImportPath);\n    const contents = yield* generateContents(importPathWithoutExt);\n    const change = yield* writeFileString(convexFilePath, contents);\n    return Option.some({ change, convexFilePath });\n  });\n\nexport const generateHttp = generateOptionalFile(\n  \"http.ts\",\n  \"http.ts\",\n  (importPath) => templates.http({ httpImportPath: importPath }),\n);\n\nexport const generateCrons = generateOptionalFile(\n  \"crons.ts\",\n  \"crons.ts\",\n  (importPath) => templates.crons({ cronsImportPath: importPath }),\n);\n\nexport const generateAuthConfig = generateOptionalFile(\n  \"auth.ts\",\n  \"auth.config.ts\",\n  (importPath) => templates.authConfig({ authImportPath: importPath }),\n);\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@confect/cli",
-  "version": "6.0.0",
+  "version": "8.0.0",
   "description": "Developer tooling for codegen and sync",
   "repository": {
     "type": "git",
@@ -38,22 +38,22 @@
   "author": "RJ Dellecese",
   "license": "ISC",
   "dependencies": {
-    "@effect/cli": "^0.73.2",
-    "@effect/platform-node": "0.104.1",
-    "@effect/platform-node-shared": "0.57.1",
-    "@effect/printer": "^0.47.0",
-    "@effect/printer-ansi": "^0.47.0",
+    "@effect/cli": "^0.75.1",
+    "@effect/platform": "0.96.1",
+    "@effect/platform-node": "0.106.0",
+    "@effect/platform-node-shared": "0.59.0",
+    "@effect/printer": "^0.49.0",
+    "@effect/printer-ansi": "^0.49.0",
     "code-block-writer": "^13.0.3",
     "esbuild": "^0.27.3"
   },
   "devDependencies": {
-    "@effect/language-service": "0.77.0",
-    "@effect/platform": "0.94.5",
-    "@effect/vitest": "0.27.0",
+    "@effect/language-service": "0.86.1",
+    "@effect/vitest": "0.29.0",
     "@eslint/js": "10.0.1",
     "@types/node": "25.3.3",
     "@vitest/coverage-v8": "3.2.4",
-    "effect": "3.19.19",
+    "effect": "3.21.2",
     "eslint": "10.0.2",
     "prettier": "3.8.1",
     "tsdown": "0.20.3",
@@ -64,10 +64,8 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.94.5",
-    "effect": "^3.19.16",
-    "@confect/core": "6.0.0",
-    "@confect/server": "6.0.0"
+    "effect": "^3.21.2",
+    "@confect/core": "^8.0.0"
   },
   "engines": {
     "node": ">=22",

package/src/confect/codegen.ts

@@ -1,5 +1,4 @@
-import { Spec } from "@confect/core";
-import { DatabaseSchema } from "@confect/server";
+import { DatabaseSchema, Spec } from "@confect/core";
 import { Command } from "@effect/cli";
 import { FileSystem, Path } from "@effect/platform";
 import { Effect, Match, Option } from "effect";
@@ -192,7 +191,7 @@ const generateSchema = Effect.gen(function* () {
     Effect.andThen((schemaModule) => {
       const defaultExport = schemaModule.default;
 
-      return DatabaseSchema.isSchema(defaultExport)
+      return DatabaseSchema.isDatabaseSchema(defaultExport)
         ? Effect.succeed(defaultExport)
         : Effect.die("Invalid schema module");
     }),

package/src/utils.ts

@@ -1,4 +1,6 @@
 import type { FunctionSpec, Spec } from "@confect/core";
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
 import { FileSystem, Path } from "@effect/platform";
 import type { PlatformError } from "@effect/platform/Error";
 import {
@@ -49,10 +51,16 @@ const absoluteExternalsPlugin: esbuild.Plugin = {
       if (args.kind !== "import-statement" && args.kind !== "dynamic-import")
         return;
       if (!isExternalImport(args.path)) return;
-      const resolved = import.meta.resolve(
-        args.path,
-        "file://" + args.resolveDir + "/",
-      );
+      // `import.meta.resolve`'s second argument is silently ignored in modern
+      // Node, so resolution would always walk up from the CLI's bundled file
+      // (`packages/cli/dist/utils.mjs`) instead of from the user's project.
+      // Use `createRequire` keyed on the importing file's directory so we
+      // resolve out of *their* `node_modules`. The synthetic filename is just
+      // a CommonJS resolution anchor; the file does not need to exist.
+      const parentFile = pathToFileURL(args.resolveDir + "/_").href;
+      const require_ = createRequire(parentFile);
+      const resolvedPath = require_.resolve(args.path);
+      const resolved = pathToFileURL(resolvedPath).href;
       return { path: resolved, external: true };
     });
   },