@confect/cli 7.0.0 → 9.0.0-next.0

package/src/log.ts

@@ -5,6 +5,27 @@ import type * as FunctionPath from "./FunctionPath";
 import * as GroupPath from "./GroupPath";
 import { ProjectRoot } from "./ProjectRoot";
 
+// --- Path styling ---
+
+/**
+ * Render a relative path as an AnsiDoc with the directory portion
+ * dimmed (`Ansi.blackBright`) and the file leaf rendered in the
+ * default terminal color. Used inline anywhere a file path appears
+ * in a CLI message.
+ */
+export const formatPathDoc = (relativePath: string): AnsiDoc.AnsiDoc => {
+  const lastSep = Math.max(
+    relativePath.lastIndexOf("/"),
+    relativePath.lastIndexOf("\\"),
+  );
+  const dir = lastSep < 0 ? "" : relativePath.slice(0, lastSep + 1);
+  const leaf = lastSep < 0 ? relativePath : relativePath.slice(lastSep + 1);
+  return AnsiDoc.hcat([
+    pipe(AnsiDoc.text(dir), AnsiDoc.annotate(Ansi.blackBright)),
+    AnsiDoc.text(leaf),
+  ]);
+};
+
 // --- File operation logs ---
 
 const logFile = (char: string, color: Ansi.Ansi) => (fullPath: string) =>

package/src/templates.ts

@@ -1,42 +1,36 @@
-import type { Options as CodeBlockWriterOptions } from "code-block-writer";
-import CodeBlockWriter_ from "code-block-writer";
-import { Array, Effect } from "effect";
-import type * as GroupPath from "./GroupPath";
+import { Array, Effect, Option } from "effect";
+import { CodeBlockWriter } from "./CodeBlockWriter";
+import {
+  collectImportBindings,
+  type SpecAssemblyNode,
+} from "./SpecAssemblyNode";
 
 export const functions = ({
-  groupPath,
   functionNames,
   registeredFunctionsImportPath,
-  registeredFunctionsVariableName = "registeredFunctions",
-  registeredFunctionsLookupPath,
   useNode = false,
 }: {
-  groupPath: GroupPath.GroupPath;
   functionNames: string[];
   registeredFunctionsImportPath: string;
-  registeredFunctionsVariableName?: string;
-  registeredFunctionsLookupPath?: readonly string[];
   useNode?: boolean;
 }) =>
   Effect.gen(function* () {
     const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
 
-    const lookupPath = registeredFunctionsLookupPath ?? groupPath.pathSegments;
-
     if (useNode) {
       yield* cbw.writeLine(`"use node";`);
       yield* cbw.blankLine();
     }
 
     yield* cbw.writeLine(
-      `import ${registeredFunctionsVariableName} from "${registeredFunctionsImportPath}";`,
+      `import registeredFunctions from "${registeredFunctionsImportPath}";`,
     );
     yield* cbw.newLine();
-    for (const functionName of functionNames) {
-      yield* cbw.writeLine(
-        `export const ${functionName} = ${registeredFunctionsVariableName}.${Array.join([...lookupPath, functionName], ".")};`,
-      );
-    }
+    yield* Effect.forEach(functionNames, (functionName) =>
+      cbw.writeLine(
+        `export const ${functionName} = registeredFunctions.${functionName};`,
+      ),
+    );
 
     return yield* cbw.toString();
   });
@@ -92,21 +86,24 @@ export const refs = ({
   nodeSpecImportPath,
 }: {
   specImportPath: string;
-  nodeSpecImportPath?: string;
+  nodeSpecImportPath: Option.Option<string>;
 }) =>
   Effect.gen(function* () {
     const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
 
     yield* cbw.writeLine(`import { Refs } from "@confect/core";`);
     yield* cbw.writeLine(`import spec from "${specImportPath}";`);
-    if (nodeSpecImportPath !== undefined) {
-      yield* cbw.writeLine(`import nodeSpec from "${nodeSpecImportPath}";`);
-    }
+    yield* Option.match(nodeSpecImportPath, {
+      onNone: () => Effect.void,
+      onSome: (nodeSpecImportPath_) =>
+        cbw.writeLine(`import nodeSpec from "${nodeSpecImportPath_}";`),
+    });
     yield* cbw.blankLine();
     yield* cbw.writeLine(
-      nodeSpecImportPath !== undefined
-        ? `export default Refs.make(spec, nodeSpec);`
-        : `export default Refs.make(spec);`,
+      Option.match(nodeSpecImportPath, {
+        onSome: () => `export default Refs.make(spec, nodeSpec);`,
+        onNone: () => `export default Refs.make(spec);`,
+      }),
     );
 
     return yield* cbw.toString();
@@ -151,45 +148,43 @@ export const nodeApi = ({
     return yield* cbw.toString();
   });
 
-export const registeredFunctions = ({
+export const registeredFunctionsForGroup = ({
+  apiImportPath,
+  groupPathDot,
   implImportPath,
+  layerExportName,
+  useNode = false,
 }: {
+  apiImportPath: string;
+  groupPathDot: string;
   implImportPath: string;
+  layerExportName: string;
+  useNode?: boolean;
 }) =>
   Effect.gen(function* () {
     const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
 
-    yield* cbw.writeLine(
-      `import { RegisteredConvexFunction, RegisteredFunctions } from "@confect/server";`,
-    );
-    yield* cbw.writeLine(`import impl from "${implImportPath}";`);
-    yield* cbw.blankLine();
-    yield* cbw.writeLine(
-      `export default RegisteredFunctions.make(impl, RegisteredConvexFunction.make);`,
-    );
-
-    return yield* cbw.toString();
-  });
-
-export const nodeRegisteredFunctions = ({
-  nodeImplImportPath,
-}: {
-  nodeImplImportPath: string;
-}) =>
-  Effect.gen(function* () {
-    const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
+    if (useNode) {
+      yield* cbw.writeLine(
+        `import { RegisteredFunctions } from "@confect/server";`,
+      );
+      yield* cbw.writeLine(
+        `import { RegisteredNodeFunction } from "@confect/server/node";`,
+      );
+    } else {
+      yield* cbw.writeLine(
+        `import { RegisteredConvexFunction, RegisteredFunctions } from "@confect/server";`,
+      );
+    }
 
-    yield* cbw.writeLine(
-      `import { RegisteredFunctions } from "@confect/server";`,
-    );
-    yield* cbw.writeLine(
-      `import { RegisteredNodeFunction } from "@confect/server/node";`,
-    );
-    yield* cbw.blankLine();
-    yield* cbw.writeLine(`import nodeImpl from "${nodeImplImportPath}";`);
+    yield* cbw.writeLine(`import api from "${apiImportPath}";`);
+    yield* cbw.writeLine(`import ${layerExportName} from "${implImportPath}";`);
     yield* cbw.blankLine();
+    const quotedGroupPath = `"${groupPathDot.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
     yield* cbw.writeLine(
-      `export default RegisteredFunctions.make(nodeImpl, RegisteredNodeFunction.make);`,
+      useNode
+        ? `export default RegisteredFunctions.buildForGroup(api, ${quotedGroupPath}, ${layerExportName}, RegisteredNodeFunction.make);`
+        : `export default RegisteredFunctions.buildForGroup(api, ${quotedGroupPath}, ${layerExportName}, RegisteredConvexFunction.make);`,
     );
 
     return yield* cbw.toString();
@@ -382,64 +377,101 @@ export const services = ({ schemaImportPath }: { schemaImportPath: string }) =>
     return yield* cbw.toString();
   });
 
-class CodeBlockWriter {
-  private readonly writer: CodeBlockWriter_;
-
-  constructor(opts?: Partial<CodeBlockWriterOptions>) {
-    this.writer = new CodeBlockWriter_(opts);
-  }
-
-  indent<E = never, R = never>(
-    eff: Effect.Effect<void, E, R>,
-  ): Effect.Effect<void, E, R> {
-    return Effect.gen(this, function* () {
-      const indentationLevel = this.writer.getIndentationLevel();
-      this.writer.setIndentationLevel(indentationLevel + 1);
-      yield* eff;
-      this.writer.setIndentationLevel(indentationLevel);
-    });
-  }
+const writeChildAddGroupAt = (
+  cbw: CodeBlockWriter,
+  child: SpecAssemblyNode,
+  groupFactory: string,
+): Effect.Effect<void> =>
+  Effect.gen(function* () {
+    yield* cbw.write(".addGroupAt(");
+    yield* cbw.quote(child.segment);
+    yield* cbw.write(", ");
+    yield* writeGroupAssembly(cbw, child, groupFactory);
+    yield* cbw.write(")");
+  });
 
-  writeLine<E = never, R = never>(line: string): Effect.Effect<void, E, R> {
-    return Effect.sync(() => {
-      this.writer.writeLine(line);
-    });
-  }
+const writeGroupFactoryCall = (
+  cbw: CodeBlockWriter,
+  node: SpecAssemblyNode,
+  groupFactory: string,
+): Effect.Effect<void> =>
+  Effect.gen(function* () {
+    yield* cbw.write(groupFactory);
+    yield* cbw.write("(");
+    yield* cbw.quote(node.segment);
+    yield* cbw.write(")");
 
-  write<E = never, R = never>(text: string): Effect.Effect<void, E, R> {
-    return Effect.sync(() => {
-      this.writer.write(text);
-    });
-  }
+    yield* Effect.forEach(node.children, (child) =>
+      writeChildAddGroupAt(cbw, child, groupFactory),
+    );
+  });
 
-  quote<E = never, R = never>(text: string): Effect.Effect<void, E, R> {
-    return Effect.sync(() => {
-      this.writer.quote(text);
-    });
-  }
-
-  conditionalWriteLine<E = never, R = never>(
-    condition: boolean,
-    text: string,
-  ): Effect.Effect<void, E, R> {
-    return Effect.sync(() => {
-      this.writer.conditionalWriteLine(condition, text);
-    });
-  }
+const writeGroupAssembly: (
+  cbw: CodeBlockWriter,
+  node: SpecAssemblyNode,
+  groupFactory: string,
+) => Effect.Effect<void> = (cbw, node, groupFactory) =>
+  node.children.length === 0
+    ? Option.match(node.importBinding, {
+        onNone: () => writeGroupFactoryCall(cbw, node, groupFactory),
+        onSome: (binding) => cbw.write(binding.exportName),
+      })
+    : writeGroupFactoryCall(cbw, node, groupFactory);
+
+const writeRootAddAt = (
+  cbw: CodeBlockWriter,
+  node: SpecAssemblyNode,
+  groupFactory: string,
+): Effect.Effect<void> =>
+  Effect.gen(function* () {
+    yield* cbw.write(".addAt(");
+    yield* cbw.quote(node.segment);
+    yield* cbw.write(", ");
 
-  newLine<E = never, R = never>(): Effect.Effect<void, E, R> {
-    return Effect.sync(() => {
-      this.writer.newLine();
-    });
-  }
+    yield* writeGroupAssembly(cbw, node, groupFactory);
 
-  blankLine<E = never, R = never>(): Effect.Effect<void, E, R> {
-    return Effect.sync(() => {
-      this.writer.blankLine();
-    });
-  }
+    yield* cbw.write(")");
+  });
+
+export const assembledSpec = ({
+  nodes,
+  runtime,
+}: {
+  nodes: ReadonlyArray<SpecAssemblyNode>;
+  runtime: "Convex" | "Node";
+}) =>
+  Effect.gen(function* () {
+    const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
+
+    const needsGroupSpec = Array.some(
+      nodes,
+      (node) => node.children.length > 0,
+    );
+    yield* cbw.writeLine(
+      needsGroupSpec
+        ? `import { GroupSpec, Spec } from "@confect/core";`
+        : `import { Spec } from "@confect/core";`,
+    );
+
+    yield* Effect.forEach(collectImportBindings(nodes), (binding) =>
+      cbw.writeLine(
+        `import ${binding.exportName} from "${binding.importPath}";`,
+      ),
+    );
+
+    yield* cbw.blankLine();
 
-  toString<E = never, R = never>(): Effect.Effect<string, E, R> {
-    return Effect.sync(() => this.writer.toString());
-  }
-}
+    const specFactory =
+      runtime === "Convex" ? "Spec.make()" : "Spec.makeNode()";
+    const groupFactory =
+      runtime === "Convex" ? "GroupSpec.makeAt" : "GroupSpec.makeNodeAt";
+
+    yield* cbw.write(`export default ${specFactory}`);
+    yield* Effect.forEach(nodes, (node) =>
+      writeRootAddAt(cbw, node, groupFactory),
+    );
+    yield* cbw.write(";");
+    yield* cbw.newLine();
+
+    return yield* cbw.toString();
+  });

package/src/utils.ts

@@ -3,15 +3,16 @@ import { FileSystem, Path } from "@effect/platform";
 import type { PlatformError } from "@effect/platform/Error";
 import {
   Array,
+  Context,
   Effect,
   HashSet,
   Option,
   Order,
   pipe,
   Record,
+  Ref,
   String,
 } from "effect";
-import * as esbuild from "esbuild";
 import * as FunctionPaths from "./FunctionPaths";
 import * as GroupPath from "./GroupPath";
 import * as GroupPaths from "./GroupPaths";
@@ -20,6 +21,24 @@ import { ConfectDirectory } from "./ConfectDirectory";
 import { ConvexDirectory } from "./ConvexDirectory";
 import * as templates from "./templates";
 
+/**
+ * Tracks whether the current codegen run wrote anything to disk. Set to
+ * `true` by every helper that actually overwrites a file (skipping the
+ * content-unchanged case). `codegenHandler` provides a fresh `Ref` per
+ * run and reads it back to report `anyWritesHappened`; callers outside a
+ * codegen pass hit the cached default `Ref` and need not interact with
+ * the tracker.
+ */
+export class WriteTracker extends Context.Reference<WriteTracker>()(
+  "@confect/cli/WriteTracker",
+  { defaultValue: () => Ref.unsafeMake(false) },
+) {}
+
+const markWritten = Effect.gen(function* () {
+  const tracker = yield* WriteTracker;
+  yield* Ref.set(tracker, true);
+});
+
 export const removePathExtension = (pathStr: string) =>
   Effect.gen(function* () {
     const path = yield* Path.Path;
@@ -27,59 +46,11 @@ export const removePathExtension = (pathStr: string) =>
     return String.slice(0, -path.extname(pathStr).length)(pathStr);
   });
 
-export const EXTERNAL_PACKAGES = [
-  "@confect/core",
-  "@confect/server",
-  "effect",
-  "@effect/*",
-];
-
-const isExternalImport = (path: string) =>
-  EXTERNAL_PACKAGES.some((p) => {
-    if (p.endsWith("/*")) {
-      return path.startsWith(p.slice(0, -1));
-    }
-    return path === p || path.startsWith(p + "/");
-  });
-
-const absoluteExternalsPlugin: esbuild.Plugin = {
-  name: "absolute-externals",
-  setup(build) {
-    build.onResolve({ filter: /.*/ }, async (args) => {
-      if (args.kind !== "import-statement" && args.kind !== "dynamic-import")
-        return;
-      if (!isExternalImport(args.path)) return;
-      const resolved = import.meta.resolve(
-        args.path,
-        "file://" + args.resolveDir + "/",
-      );
-      return { path: resolved, external: true };
-    });
-  },
-};
-
-/**
- * Bundle a TypeScript entry point with esbuild and import the result via a
- * data URL. This handles extensionless `.ts` imports regardless of whether the
- * user's project sets `"type": "module"` in package.json.
- */
-export const bundleAndImport = (entryPoint: string) =>
+/** Ensures a relative path is a valid ESM/TS module specifier (e.g. `spec` → `./spec`). */
+export const toModuleImportPath = (relativePath: string) =>
   Effect.gen(function* () {
-    const result = yield* Effect.promise(() =>
-      esbuild.build({
-        entryPoints: [entryPoint],
-        bundle: true,
-        write: false,
-        platform: "node",
-        format: "esm",
-        logLevel: "silent",
-        plugins: [absoluteExternalsPlugin],
-      }),
-    );
-    const code = result.outputFiles[0]!.text;
-    const dataUrl =
-      "data:text/javascript;base64," + Buffer.from(code).toString("base64");
-    return yield* Effect.promise(() => import(dataUrl));
+    const withoutExt = yield* removePathExtension(relativePath);
+    return withoutExt.startsWith(".") ? withoutExt : `./${withoutExt}`;
   });
 
 export const writeFileStringAndLog = (filePath: string, contents: string) =>
@@ -87,12 +58,14 @@ export const writeFileStringAndLog = (filePath: string, contents: string) =>
     const fs = yield* FileSystem.FileSystem;
     if (!(yield* fs.exists(filePath))) {
       yield* fs.writeFileString(filePath, contents);
+      yield* markWritten;
       yield* logFileAdded(filePath);
       return;
     }
     const existing = yield* fs.readFileString(filePath);
     if (existing !== contents) {
       yield* fs.writeFileString(filePath, contents);
+      yield* markWritten;
       yield* logFileModified(filePath);
     }
   });
@@ -128,28 +101,73 @@ export const writeFileString = (
 
     if (!(yield* fs.exists(filePath))) {
       yield* fs.writeFileString(filePath, contents);
+      yield* markWritten;
       return "Added";
     }
     const existing = yield* fs.readFileString(filePath);
     if (existing !== contents) {
       yield* fs.writeFileString(filePath, contents);
+      yield* markWritten;
       return "Modified";
     }
     return "Unchanged";
   });
 
+export const removePathIfExists = (
+  filePath: string,
+): Effect.Effect<void, PlatformError, FileSystem.FileSystem> =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+
+    if (!(yield* fs.exists(filePath))) {
+      return;
+    }
+
+    yield* fs
+      .remove(filePath)
+      .pipe(
+        Effect.catchTag("SystemError", (error) =>
+          error.reason === "NotFound" ? Effect.void : Effect.fail(error),
+        ),
+      );
+  });
+
+/**
+ * Bump the mtime of `convex/schema.ts` so the Convex CLI's chokidar watcher
+ * emits a `change` event after every successful Confect codegen run. Without
+ * this, a codegen that doesn't change any file content (for example,
+ * recovering from a transient broken state in `confect/`) leaves Convex
+ * stuck on its previous error because nothing it observes has changed.
+ */
+export const touchConvexSchema = Effect.gen(function* () {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const convexDirectory = yield* ConvexDirectory.get;
+  const schemaPath = path.join(convexDirectory, "schema.ts");
+
+  if (!(yield* fs.exists(schemaPath))) {
+    return;
+  }
+
+  const now = new Date();
+  yield* fs.utimes(schemaPath, now, now);
+});
+
 export const generateGroupModule = ({
   groupPath,
   functionNames,
+  registeredFunctionsImportPath,
+  useNode = false,
 }: {
   groupPath: GroupPath.GroupPath;
   functionNames: string[];
+  registeredFunctionsImportPath: string;
+  useNode?: boolean;
 }) =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const convexDirectory = yield* ConvexDirectory.get;
-    const confectDirectory = yield* ConfectDirectory.get;
 
     const relativeModulePath = yield* GroupPath.modulePath(groupPath);
     const modulePath = path.join(convexDirectory, relativeModulePath);
@@ -159,42 +177,21 @@ export const generateGroupModule = ({
       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), registeredFunctionsPath),
-    );
-    const registeredFunctionsVariableName = isNodeGroup
-      ? "nodeRegisteredFunctions"
-      : "registeredFunctions";
-
     const functionsContentsString = yield* templates.functions({
-      groupPath,
       functionNames,
       registeredFunctionsImportPath,
-      registeredFunctionsVariableName,
-      useNode: isNodeGroup,
-      ...(isNodeGroup
-        ? {
-            registeredFunctionsLookupPath: groupPath.pathSegments.slice(1),
-          }
-        : {}),
+      useNode,
     });
 
     if (!(yield* fs.exists(modulePath))) {
       yield* fs.writeFileString(modulePath, functionsContentsString);
+      yield* markWritten;
       return "Added" as const;
     }
     const existing = yield* fs.readFileString(modulePath);
     if (existing !== functionsContentsString) {
       yield* fs.writeFileString(modulePath, functionsContentsString);
+      yield* markWritten;
       return "Modified" as const;
     }
     return "Unchanged" as const;
@@ -220,6 +217,7 @@ export const generateFunctions = (spec: Spec.AnyWithProps) =>
   Effect.gen(function* () {
     const path = yield* Path.Path;
     const convexDirectory = yield* ConvexDirectory.get;
+    const confectDirectory = yield* ConfectDirectory.get;
 
     const groupPathsFromFs = yield* getGroupPathsFromFs;
     const functionPaths = FunctionPaths.make(spec);
@@ -242,12 +240,30 @@ export const generateFunctions = (spec: Spec.AnyWithProps) =>
           ),
           Array.map((fn) => fn.name),
         );
-        const result = yield* generateGroupModule({ groupPath, functionNames });
+        const relativeModulePath = yield* GroupPath.modulePath(groupPath);
+        const modulePath = path.join(convexDirectory, relativeModulePath);
+        const registrySegments =
+          groupPath.pathSegments[0] === "node"
+            ? groupPath.pathSegments.slice(1)
+            : groupPath.pathSegments;
+        const registeredFunctionsPath =
+          path.join(
+            confectDirectory,
+            "_generated",
+            "registeredFunctions",
+            ...registrySegments,
+          ) + ".ts";
+        const registeredFunctionsImportPath = yield* toModuleImportPath(
+          path.relative(path.dirname(modulePath), registeredFunctionsPath),
+        );
+        const result = yield* generateGroupModule({
+          groupPath,
+          functionNames,
+          registeredFunctionsImportPath,
+          useNode: groupPath.pathSegments[0] === "node",
+        });
         if (result === "Modified") {
-          const relativeModulePath = yield* GroupPath.modulePath(groupPath);
-          yield* logFileModified(
-            path.join(convexDirectory, relativeModulePath),
-          );
+          yield* logFileModified(modulePath);
         }
       }),
     );
@@ -300,7 +316,6 @@ const getGroupPathsFromFs = Effect.gen(function* () {
 
 export const removeGroups = (groupPaths: GroupPaths.GroupPaths) =>
   Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const convexDirectory = yield* ConvexDirectory.get;
 
@@ -312,7 +327,7 @@ export const removeGroups = (groupPaths: GroupPaths.GroupPaths) =>
 
           yield* Effect.logDebug(`Removing group '${relativeModulePath}'...`);
 
-          yield* fs.remove(modulePath);
+          yield* removePathIfExists(modulePath);
           yield* Effect.logDebug(`Group '${relativeModulePath}' removed`);
         }),
       ),
@@ -326,6 +341,9 @@ export const writeGroups = (
 ) =>
   Effect.forEach(groupPaths, (groupPath) =>
     Effect.gen(function* () {
+      const path = yield* Path.Path;
+      const convexDirectory = yield* ConvexDirectory.get;
+      const confectDirectory = yield* ConfectDirectory.get;
       const group = yield* GroupPath.getGroupSpec(spec, groupPath);
 
       const functionNames = pipe(
@@ -340,10 +358,25 @@ export const writeGroups = (
         Array.map((fn) => fn.name),
       );
 
+      const relativeModulePath = yield* GroupPath.modulePath(groupPath);
+      const modulePath = path.join(convexDirectory, relativeModulePath);
+      const registeredFunctionsPath =
+        path.join(
+          confectDirectory,
+          "_generated",
+          "registeredFunctions",
+          ...groupPath.pathSegments,
+        ) + ".ts";
+      const registeredFunctionsImportPath = yield* toModuleImportPath(
+        path.relative(path.dirname(modulePath), registeredFunctionsPath),
+      );
+
       yield* Effect.logDebug(`Generating group ${groupPath}...`);
       yield* generateGroupModule({
         groupPath,
         functionNames,
+        registeredFunctionsImportPath,
+        useNode: groupPath.pathSegments[0] === "node",
       });
       yield* Effect.logDebug(`Group ${groupPath} generated`);
     }),