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

package/src/log.ts

@@ -66,41 +66,18 @@ export const logFunctionRemoved = logFunction("-", Ansi.red);
 
 // --- Process status logs ---
 
-const logStatus =
-  (
-    char: string,
-    charColor: Ansi.Ansi,
-    messageText: string,
-    messageColor: Ansi.Ansi,
-  ) =>
-  (message: string) =>
-    Console.log(
-      pipe(
-        AnsiDoc.char(char),
-        AnsiDoc.annotate(charColor),
-        AnsiDoc.catWithSpace(
-          pipe(
-            AnsiDoc.char(" "),
-            AnsiDoc.cat(AnsiDoc.text(messageText)),
-            AnsiDoc.cat(AnsiDoc.char(" ")),
-            AnsiDoc.annotate(messageColor),
-          ),
-        ),
-        AnsiDoc.catWithSpace(AnsiDoc.text(message)),
-        AnsiDoc.render({ style: "pretty" }),
-      ),
-    );
+const logStatus = (char: string, charColor: Ansi.Ansi) => (message: string) =>
+  Console.log(
+    pipe(
+      AnsiDoc.char(char),
+      AnsiDoc.annotate(charColor),
+      AnsiDoc.catWithSpace(AnsiDoc.text(message)),
+      AnsiDoc.render({ style: "pretty" }),
+    ),
+  );
+
+export const logSuccess = logStatus("✔︎", Ansi.green);
+
+export const logFailure = logStatus("✘", Ansi.red);
 
-export const logCompleted = logStatus(
-  "✔︎",
-  Ansi.green,
-  "SUCCESS",
-  Ansi.combine(Ansi.green, Ansi.bgGreenBright),
-);
-
-export const logFailed = logStatus(
-  "✘",
-  Ansi.red,
-  "FAILURE",
-  Ansi.combine(Ansi.red, Ansi.bgRedBright),
-);
+export const logPending = logStatus("⭘", Ansi.yellow);

package/src/templates.ts

@@ -7,21 +7,34 @@ 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 registeredFunctions from "${registeredFunctionsImportPath}";`,
+      `import ${registeredFunctionsVariableName} from "${registeredFunctionsImportPath}";`,
     );
     yield* cbw.newLine();
     for (const functionName of functionNames) {
       yield* cbw.writeLine(
-        `export const ${functionName} = registeredFunctions.${Array.join([...groupPath.pathSegments, functionName], ".")};`,
+        `export const ${functionName} = ${registeredFunctionsVariableName}.${Array.join([...lookupPath, functionName], ".")};`,
       );
     }
 
@@ -85,15 +98,26 @@ export const authConfig = ({ authImportPath }: { authImportPath: string }) =>
     return yield* cbw.toString();
   });
 
-export const refs = ({ specImportPath }: { specImportPath: string }) =>
+export const refs = ({
+  specImportPath,
+  nodeSpecImportPath,
+}: {
+  specImportPath: string;
+  nodeSpecImportPath?: 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* cbw.blankLine();
     yield* cbw.writeLine(
-      `export const { public: api, internal } = Refs.make(spec);`,
+      nodeSpecImportPath !== undefined
+        ? `export default Refs.make(spec, nodeSpec);`
+        : `export default Refs.make(spec);`,
     );
 
     return yield* cbw.toString();
@@ -118,6 +142,26 @@ export const api = ({
     return yield* cbw.toString();
   });
 
+export const nodeApi = ({
+  schemaImportPath,
+  nodeSpecImportPath,
+}: {
+  schemaImportPath: string;
+  nodeSpecImportPath: string;
+}) =>
+  Effect.gen(function* () {
+    const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
+
+    yield* cbw.writeLine(`import { Api } from "@confect/server";`);
+    yield* cbw.blankLine();
+    yield* cbw.writeLine(`import schema from "${schemaImportPath}";`);
+    yield* cbw.writeLine(`import nodeSpec from "${nodeSpecImportPath}";`);
+    yield* cbw.blankLine();
+    yield* cbw.writeLine(`export default Api.make(schema, nodeSpec);`);
+
+    return yield* cbw.toString();
+  });
+
 export const registeredFunctions = ({
   implImportPath,
 }: {
@@ -127,11 +171,37 @@ export const registeredFunctions = ({
     const cbw = new CodeBlockWriter({ indentNumberOfSpaces: 2 });
 
     yield* cbw.writeLine(
-      `import { RegisteredFunctions } from "@confect/server";`,
+      `import { RegisteredConvexFunction, RegisteredFunctions } from "@confect/server";`,
     );
     yield* cbw.writeLine(`import impl from "${implImportPath}";`);
     yield* cbw.blankLine();
-    yield* cbw.writeLine(`export default RegisteredFunctions.make(impl);`);
+    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 });
+
+    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.blankLine();
+    yield* cbw.writeLine(
+      `export default RegisteredFunctions.make(nodeImpl, RegisteredNodeFunction.make);`,
+    );
 
     return yield* cbw.toString();
   });

package/src/utils.ts

@@ -103,19 +103,33 @@ 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",
-      "registeredFunctions.ts",
+      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),
+          }
+        : {}),
     });
 
     if (!(yield* fs.exists(modulePath))) {