@forwardimpact/libutil 0.1.63 → 0.1.65

package/bin/fit-download-bundle.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env bun
 
 import { spawn } from "node:child_process";
 import { createScriptConfig } from "@forwardimpact/libconfig";

package/bin/fit-tiktoken.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env bun
 import { countTokens } from "@forwardimpact/libutil";
 
 /**

package/finder.js

@@ -47,6 +47,25 @@ export class Finder {
     return null;
   }
 
+  /**
+   * Resolve a data directory by upward traversal, with HOME fallback.
+   * @param {string} baseName - Directory name to find (e.g. "data")
+   * @param {string} homeDir - User home directory path
+   * @returns {string} Absolute path to found directory
+   */
+  findData(baseName, homeDir) {
+    const cwd = this.#process.cwd();
+    const found = this.findUpward(cwd, baseName);
+    if (found) return found;
+
+    const homePath = path.join(homeDir, ".fit", baseName);
+    if (fs.existsSync(homePath)) return homePath;
+
+    throw new Error(
+      `No ${baseName} directory found from ${cwd} or ${homePath}.`,
+    );
+  }
+
   /**
    * Find the project root directory
    * @param {string} startPath - Starting directory path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/libutil",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "description": "Utility functions and utilities for Guide",
   "license": "Apache-2.0",
   "author": "D. Olsson <hi@senzilla.io>",
@@ -11,10 +11,10 @@
     "fit-tiktoken": "./bin/fit-tiktoken.js"
   },
   "engines": {
-    "node": ">=22.0.0"
+    "bun": ">=1.2.0"
   },
   "scripts": {
-    "test": "node --test test/*.test.js"
+    "test": "bun run node --test test/*.test.js"
   },
   "dependencies": {
     "@forwardimpact/libtelemetry": "^0.1.22"

package/test/finder.test.js

@@ -257,6 +257,79 @@ describe("Finder", () => {
     });
   });
 
+  describe("findData", () => {
+    test("finds data/ in CWD via findUpward", () => {
+      const dataDir = path.join(tempDir, "data");
+      fs.mkdirSync(dataDir);
+
+      const cwdFinder = new Finder(fsPromises, mockLogger, {
+        cwd: () => tempDir,
+      });
+      const result = cwdFinder.findData("data", "/nonexistent-home");
+
+      assert.strictEqual(result, dataDir);
+    });
+
+    test("finds data/ in a parent directory via findUpward", () => {
+      const dataDir = path.join(tempDir, "data");
+      fs.mkdirSync(dataDir);
+      const subDir = path.join(tempDir, "products", "pathway");
+      fs.mkdirSync(subDir, { recursive: true });
+
+      const cwdFinder = new Finder(fsPromises, mockLogger, {
+        cwd: () => subDir,
+      });
+      const result = cwdFinder.findData("data", "/nonexistent-home");
+
+      assert.strictEqual(result, dataDir);
+    });
+
+    test("falls back to ~/.fit/data/ when CWD traversal fails", () => {
+      const fakeHome = path.join(tempDir, "fakehome");
+      const homeFitData = path.join(fakeHome, ".fit", "data");
+      fs.mkdirSync(homeFitData, { recursive: true });
+
+      const isolatedDir = path.join(tempDir, "isolated");
+      fs.mkdirSync(isolatedDir);
+
+      const cwdFinder = new Finder(fsPromises, mockLogger, {
+        cwd: () => isolatedDir,
+      });
+      const result = cwdFinder.findData("data", fakeHome);
+
+      assert.strictEqual(result, homeFitData);
+    });
+
+    test("throws when neither CWD traversal nor HOME fallback finds directory", () => {
+      const isolatedDir = path.join(tempDir, "isolated");
+      fs.mkdirSync(isolatedDir);
+
+      const cwdFinder = new Finder(fsPromises, mockLogger, {
+        cwd: () => isolatedDir,
+      });
+
+      assert.throws(() => cwdFinder.findData("data", "/nonexistent-home"), {
+        message: /No data directory found/,
+      });
+    });
+
+    test("CWD takes priority over HOME when both exist", () => {
+      const cwdData = path.join(tempDir, "data");
+      fs.mkdirSync(cwdData);
+
+      const fakeHome = path.join(tempDir, "fakehome");
+      const homeFitData = path.join(fakeHome, ".fit", "data");
+      fs.mkdirSync(homeFitData, { recursive: true });
+
+      const cwdFinder = new Finder(fsPromises, mockLogger, {
+        cwd: () => tempDir,
+      });
+      const result = cwdFinder.findData("data", fakeHome);
+
+      assert.strictEqual(result, cwdData);
+    });
+  });
+
   describe("findPackagePath", () => {
     test("finds package in local monorepo structure", () => {
       // Create mock monorepo structure

package/test/logger.test.js

@@ -97,28 +97,6 @@ describe("Logger", () => {
     assert.strictEqual(consoleOutput.length, 0);
   });
 
-  test(
-    "logs message with data object",
-    { skip: "Future PR will fix this" },
-    () => {
-      process.env.DEBUG = "test";
-      const logger = new Logger("test");
-
-      logger.debug("ProcessMethod", "Processing", {
-        items: "50/200",
-        retry: "2/3",
-      });
-
-      assert.strictEqual(consoleOutput.length, 1);
-      assert.ok(consoleOutput[0].includes("DEBUG"));
-      assert.ok(consoleOutput[0].includes("test"));
-      assert.ok(consoleOutput[0].includes("ProcessMethod"));
-      assert.ok(consoleOutput[0].includes("Processing"));
-      assert.ok(consoleOutput[0].includes('items="50/200"'));
-      assert.ok(consoleOutput[0].includes('retry="2/3"'));
-    },
-  );
-
   test("handles empty data object", () => {
     process.env.DEBUG = "test";
     const logger = new Logger("test");
@@ -140,87 +118,6 @@ describe("Logger", () => {
     assert.ok(consoleOutput[0].match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/));
   });
 
-  test(
-    "extracts trace context from error objects",
-    { skip: "Future PR will fix this" },
-    () => {
-      process.env.DEBUG = "test";
-      const logger = new Logger("test");
-
-      // Create error with trace context (as added by Tracer)
-      const error = new Error("Test error");
-      Object.defineProperties(error, {
-        trace_id: {
-          value: "abc123def456",
-          enumerable: false,
-          writable: false,
-        },
-        span_id: {
-          value: "789xyz012",
-          enumerable: false,
-          writable: false,
-        },
-        service_name: {
-          value: "test-service",
-          enumerable: false,
-          writable: false,
-        },
-      });
-
-      logger.error("TestMethod", error);
-
-      assert.strictEqual(consoleOutput.length, 1);
-      assert.ok(consoleOutput[0].includes("ERROR"));
-      assert.ok(consoleOutput[0].includes("Test error"));
-      assert.ok(
-        consoleOutput[0].includes("trace_id=abc123def456"),
-        "Should include trace_id in structured data",
-      );
-      assert.ok(
-        consoleOutput[0].includes("span_id=789xyz012"),
-        "Should include span_id in structured data",
-      );
-      assert.ok(
-        consoleOutput[0].includes("service_name=test-service"),
-        "Should include service_name in structured data",
-      );
-    },
-  );
-
-  test(
-    "merges trace context with provided attributes",
-    { skip: "Future PR will fix this" },
-    () => {
-      process.env.DEBUG = "test";
-      const logger = new Logger("test");
-
-      const error = new Error("Test error");
-      Object.defineProperty(error, "trace_id", {
-        value: "trace123",
-        enumerable: false,
-        writable: false,
-      });
-
-      logger.error("TestMethod", error, { retry: "1/3", status: "500" });
-
-      assert.strictEqual(consoleOutput.length, 1);
-      assert.ok(consoleOutput[0].includes("ERROR"));
-      assert.ok(consoleOutput[0].includes("Test error"));
-      assert.ok(
-        consoleOutput[0].includes('trace_id="abc123def456"'),
-        "Should include trace_id in structured data",
-      );
-      assert.ok(
-        consoleOutput[0].includes('span_id="789xyz012"'),
-        "Should include span_id in structured data",
-      );
-      assert.ok(
-        consoleOutput[0].includes('service_name="test-service"'),
-        "Should include service_name in structured data",
-      );
-    },
-  );
-
   test("merges trace context with provided attributes", () => {
     process.env.DEBUG = "test";
     const logger = new Logger("test");