🔄 Refactor cli and oxa-types (#45)

Author: rowanc1

packages/oxa-core/.gitignore

@@ -1 +1,2 @@
-src/version.ts
+dist/
+src/schema.json

packages/oxa-core/package.json

@@ -9,16 +9,13 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
-    },
-    "./schema.json": "./dist/schema.json"
+    }
   },
   "files": [
     "dist"
   ],
   "scripts": {
-    "copy:version": "echo \"const version = '\"$npm_package_version\"';\nexport default version;\" > src/version.ts",
-    "build": "pnpm run copy:version && tsc && cp ../../schema/schema.json dist/ && pnpm run build:bundle",
-    "build:bundle": "esbuild src/cli.ts --bundle --platform=node --target=node22 --format=cjs --outfile=dist/cli.bundle.cjs --banner:js='#!/usr/bin/env node' --log-override:empty-import-meta=silent",
+    "build": "cp ../../schema/schema.json src/schema.json && tsc",
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
     "clean": "rm -rf dist",
@@ -31,16 +28,12 @@
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "better-ajv-errors": "^2.0.2",
-    "commander": "^14.0.0",
     "js-yaml": "^4.1.0",
     "oxa-types": "workspace:*"
   },
   "devDependencies": {
     "@oxa/conformance": "workspace:*",
-    "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.0.0",
-    "esbuild": "^0.25.0",
-    "execa": "^9.5.0"
+    "@types/js-yaml": "^4.0.9"
   },
   "keywords": [
     "oxa",
@@ -58,7 +51,6 @@
     "url": "git+https://github.com/oxa-dev/oxa.git",
     "directory": "packages/oxa-core"
   },
-  "engines": {
-    "node": ">=22"
-  }
+  "engines": {}
+
 }

packages/oxa-core/src/convert.test.ts

@@ -1,11 +1,25 @@
-import { describe, it, expect, vi } from "vitest";
+import { describe, it, expect } from "vitest";
 import { readFileSync } from "fs";
 import { dirname, relative, resolve } from "path";
 import { fileURLToPath } from "url";
+import type { Session } from "./types.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const REPO_ROOT = resolve(__dirname, "../../..");
 
+function createTestSession(): Session & { messages: string[] } {
+  const messages: string[] = [];
+  return {
+    messages,
+    log: {
+      debug: (...args: unknown[]) => messages.push(String(args.join(" "))),
+      info: (...args: unknown[]) => messages.push(String(args.join(" "))),
+      warn: (...args: unknown[]) => messages.push(String(args.join(" "))),
+      error: (...args: unknown[]) => messages.push(String(args.join(" "))),
+    },
+  };
+}
+
 const lexiconFiles = {
   facet: {
     id: "pub.oxa.richtext.facet",
@@ -154,7 +168,7 @@ function documentNode(
   } satisfies TestDocumentNode;
 }
 
-async function flatten(inlines: unknown[]) {
+async function flatten(inlines: unknown[], session?: Session) {
   const convertModule = await import("./convert.js").catch((error) => {
     if (error instanceof Error && error.message.includes("/src/convert.js")) {
       return undefined;
@@ -170,10 +184,10 @@ async function flatten(inlines: unknown[]) {
     "Expected packages/oxa-core/src/convert.ts to export flattenInlines",
   ).toBeTypeOf("function");
 
-  return flattenInlines!(inlines as never);
+  return flattenInlines!(session ?? createTestSession(), inlines as never);
 }
 
-async function map(block: unknown) {
+async function map(block: unknown, session?: Session) {
   const convertModule = await import("./convert.js");
   const mapBlock = convertModule.mapBlock;
 
@@ -182,10 +196,14 @@ async function map(block: unknown) {
     "Expected packages/oxa-core/src/convert.ts to export mapBlock",
   ).toBeTypeOf("function");
 
-  return mapBlock!(block as never);
+  return mapBlock!(session ?? createTestSession(), block as never);
 }
 
-async function convertDocument(document: unknown, options?: unknown) {
+async function convertDocument(
+  document: unknown,
+  options?: unknown,
+  session?: Session,
+) {
   const convertModule = await import("./convert.js");
   const oxaToAtproto = convertModule.oxaToAtproto;
 
@@ -194,7 +212,11 @@ async function convertDocument(document: unknown, options?: unknown) {
     "Expected packages/oxa-core/src/convert.ts to export oxaToAtproto",
   ).toBeTypeOf("function");
 
-  return oxaToAtproto!(document as never, options as never);
+  return oxaToAtproto!(
+    session ?? createTestSession(),
+    document as never,
+    options as never,
+  );
 }
 
 function readLexicon(filePath: string): LexiconDoc {
@@ -208,12 +230,6 @@ function readLexicon(filePath: string): LexiconDoc {
   }
 }
 
-function stderrOutput(writeSpy: ReturnType<typeof vi.spyOn>) {
-  return writeSpy.mock.calls
-    .map(([chunk]: [unknown, ...unknown[]]) => String(chunk))
-    .join("");
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getLexiconDefs(filePath: string): Record<string, any> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -402,29 +418,25 @@ describe("mapBlock", () => {
   });
 
   it("warns and omits unknown block types instead of coercing them into known ATProto blocks", async () => {
-    const writeSpy = vi
-      .spyOn(process.stderr, "write")
-      .mockImplementation(() => true);
+    const session = createTestSession();
 
-    try {
-      await expect(
-        map({
-          type: "Callout",
-          children: [text("Should be dropped")],
-          id: "callout-1",
-          classes: ["note"],
-          data: { severity: "warning" },
-        }),
-      ).resolves.toBeUndefined();
+    const result = await map(
+      {
+        type: "Callout",
+        children: [text("Should be dropped")],
+        id: "callout-1",
+        classes: ["note"],
+        data: { severity: "warning" },
+      },
+      session,
+    );
 
-      expect(writeSpy).toHaveBeenCalled();
+    expect(result).toBeUndefined();
+    expect(session.messages.length).toBeGreaterThan(0);
 
-      const warning = stderrOutput(writeSpy);
-      expect(warning).toContain("unknown block type");
-      expect(warning).toContain("Callout");
-    } finally {
-      writeSpy.mockRestore();
-    }
+    const warning = session.messages.join("\n");
+    expect(warning).toContain("unknown block type");
+    expect(warning).toContain("Callout");
   });
 });
 
@@ -507,50 +519,45 @@ describe("oxaToAtproto", () => {
         tags: ["oxa", "atproto"],
       },
     };
-    const writeSpy = vi
-      .spyOn(process.stderr, "write")
-      .mockImplementation(() => true);
-
-    try {
-      const converted = await convertDocument(
-        {
-          type: "Document",
-          metadata,
-          children: [
-            paragraph([text("Keep this paragraph")]),
-            {
-              type: "Callout",
-              children: [text("Drop this block")],
-              data: { severity: "warning" },
-            },
-          ],
-        },
-        { createdAt },
-      );
+    const session = createTestSession();
 
-      expect(converted).toEqual({
-        $type: "pub.oxa.document.document",
+    const converted = await convertDocument(
+      {
+        type: "Document",
         metadata,
         children: [
+          paragraph([text("Keep this paragraph")]),
           {
-            $type: "pub.oxa.document.defs#paragraph",
-            text: "Keep this paragraph",
-            facets: [],
+            type: "Callout",
+            children: [text("Drop this block")],
+            data: { severity: "warning" },
           },
         ],
-        createdAt,
-      });
-      expect(converted.metadata).toBe(metadata);
-      expect("title" in converted).toBe(false);
+      },
+      { createdAt },
+      session,
+    );
+
+    expect(converted).toEqual({
+      $type: "pub.oxa.document.document",
+      metadata,
+      children: [
+        {
+          $type: "pub.oxa.document.defs#paragraph",
+          text: "Keep this paragraph",
+          facets: [],
+        },
+      ],
+      createdAt,
+    });
+    expect(converted.metadata).toBe(metadata);
+    expect("title" in converted).toBe(false);
 
-      expect(writeSpy).toHaveBeenCalled();
+    expect(session.messages.length).toBeGreaterThan(0);
 
-      const warning = stderrOutput(writeSpy);
-      expect(warning).toContain("unknown block type");
-      expect(warning).toContain("Callout");
-    } finally {
-      writeSpy.mockRestore();
-    }
+    const warning = session.messages.join("\n");
+    expect(warning).toContain("unknown block type");
+    expect(warning).toContain("Callout");
   });
 });
 
@@ -769,39 +776,36 @@ describe("flattenInlines", () => {
     );
   });
 
-  it("warns to stderr and drops inline id, classes, and data properties on formatting nodes", async () => {
-    const writeSpy = vi
-      .spyOn(process.stderr, "write")
-      .mockImplementation(() => true);
+  it("warns and drops inline id, classes, and data properties on formatting nodes", async () => {
+    const session = createTestSession();
 
-    try {
-      const richText = await flatten([
+    const richText = await flatten(
+      [
         strong([text("styled")], {
           id: "inline-id",
           classes: ["callout", "accent"],
           data: { note: "keep warning only" },
         }),
-      ]);
+      ],
+      session,
+    );
 
-      expect(richText).toEqual({
-        text: "styled",
-        facets: [
-          {
-            index: { byteStart: 0, byteEnd: 6 },
-            features: [{ $type: "pub.oxa.richtext.facet#strong" }],
-          },
-        ],
-      });
+    expect(richText).toEqual({
+      text: "styled",
+      facets: [
+        {
+          index: { byteStart: 0, byteEnd: 6 },
+          features: [{ $type: "pub.oxa.richtext.facet#strong" }],
+        },
+      ],
+    });
 
-      expect(writeSpy).toHaveBeenCalled();
+    expect(session.messages.length).toBeGreaterThan(0);
 
-      const warning = stderrOutput(writeSpy);
-      expect(warning).toContain("Strong");
-      expect(warning).toContain("id");
-      expect(warning).toContain("classes");
-      expect(warning).toContain("data");
-    } finally {
-      writeSpy.mockRestore();
-    }
+    const warning = session.messages.join("\n");
+    expect(warning).toContain("Strong");
+    expect(warning).toContain("id");
+    expect(warning).toContain("classes");
+    expect(warning).toContain("data");
   });
 });