hereby 1.8.8 → 1.8.9

package/dist/cli/loadHerebyfile.js

@@ -3,30 +3,29 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 import pc from "picocolors";
 import { Task } from "../index.js";
-import { UserError } from "./utils.js";
+import { findUp, UserError } from "./utils.js";
 const herebyfileRegExp = /^herebyfile\.m?js$/i;
 export function findHerebyfile(dir) {
-    const root = path.parse(dir).root;
-    while (true) {
-        const entries = fs.readdirSync(dir);
-        const matching = entries.filter((e) => herebyfileRegExp.test(e));
+    const result = findUp(dir, (dir) => {
+        const entries = fs.readdirSync(dir, { withFileTypes: true });
+        const matching = entries.filter((e) => herebyfileRegExp.test(e.name));
         if (matching.length > 1) {
-            throw new UserError(`Found more than one Herebyfile: ${matching.join(", ")}`);
+            throw new UserError(`Found more than one Herebyfile: ${matching.map((e) => e.name).join(", ")}`);
         }
         if (matching.length === 1) {
-            const candidate = path.join(dir, matching[0]);
-            const stat = fs.statSync(candidate);
-            if (!stat.isFile()) {
-                throw new UserError(`${matching[0]} is not a file.`);
+            const candidate = matching[0];
+            if (!candidate.isFile()) {
+                throw new UserError(`${candidate.name} is not a file.`);
             }
-            return candidate;
+            return path.join(dir, candidate.name);
         }
-        if (entries.includes("package.json")) {
-            break; // TODO: Is this actually desirable? What about monorepos?
+        if (entries.some((e) => e.name === "package.json")) {
+            return false; // TODO: Is this actually desirable? What about monorepos?
         }
-        if (dir === root)
-            break;
-        dir = path.dirname(dir);
+        return undefined;
+    });
+    if (result) {
+        return result;
     }
     throw new UserError("Unable to find Herebyfile.");
 }
@@ -58,7 +57,7 @@ export async function loadHerebyfile(herebyfilePath) {
     // We check this here by walking the DAG, as some dependencies may not be
     // exported and therefore would not be seen by the above loop.
     checkTaskInvariants(exportedTasks);
-    const tasks = new Map([...exportedTasks.values()].map((task) => [task.options.name, task]));
+    const tasks = new Map([...exportedTasks].map((task) => [task.options.name, task]));
     return { tasks, defaultTask };
 }
 function checkTaskInvariants(tasks) {

package/dist/cli/utils.js

@@ -1,7 +1,6 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 export function compareTaskNames(a, b) {
     return compareStrings(a.options.name, b.options.name);
 }
@@ -17,6 +16,18 @@ export function simplifyPath(p) {
     }
     return p;
 }
+export function findUp(p, predicate) {
+    const root = path.parse(p).root;
+    while (true) {
+        const result = predicate(p);
+        if (result !== undefined)
+            return result;
+        if (p === root)
+            break;
+        p = path.dirname(p);
+    }
+    return undefined;
+}
 /**
  * UserError is a special error that, when caught in the CLI will be printed
  * as a message only, without stacktrace. Use this instead of process.exit.
@@ -49,11 +60,9 @@ export async function real() {
             process.exitCode = code;
         },
         version: async () => {
-            const { resolve } = await import("import-meta-resolve");
-            const packageJsonPath = fileURLToPath(await resolve("hereby/package.json", import.meta.url));
-            const packageJson = await fs.promises.readFile(packageJsonPath, "utf8");
-            const { version } = JSON.parse(packageJson);
-            return version;
+            const packageJsonURL = new URL("../../package.json", import.meta.url);
+            const packageJson = await fs.promises.readFile(packageJsonURL, "utf8");
+            return JSON.parse(packageJson).version;
         },
         resolve: async (specifier, parent) => {
             const { resolve } = await import("import-meta-resolve");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hereby",
-    "version": "1.8.8",
+    "version": "1.8.9",
     "description": "A simple task runner",
     "repository": "github:jakebailey/hereby",
     "type": "module",
@@ -48,26 +48,26 @@
     },
     "devDependencies": {
         "@ava/typescript": "^3.0.1",
-        "@changesets/cli": "^2.26.2",
+        "@changesets/cli": "^2.27.1",
         "@tsconfig/node12": "^12.1.0",
-        "@types/command-line-usage": "^5.0.3",
-        "@types/minimist": "^1.2.4",
-        "@types/node": "^20.8.10",
-        "@types/tmp": "^0.2.5",
-        "@typescript-eslint/eslint-plugin": "^6.9.1",
-        "@typescript-eslint/parser": "^6.9.1",
+        "@types/command-line-usage": "^5.0.4",
+        "@types/minimist": "^1.2.5",
+        "@types/node": "^20.10.6",
+        "@types/tmp": "^0.2.6",
+        "@typescript-eslint/eslint-plugin": "^6.17.0",
+        "@typescript-eslint/parser": "^6.17.0",
         "ava": "~5.0.1",
         "c8": "^8.0.1",
-        "dprint": "^0.42.5",
-        "eslint": "^8.52.0",
+        "dprint": "^0.45.0",
+        "eslint": "^8.56.0",
         "eslint-plugin-ava": "^14.0.0",
         "eslint-plugin-simple-import-sort": "^10.0.0",
-        "eslint-plugin-unicorn": "^49.0.0",
+        "eslint-plugin-unicorn": "^50.0.1",
         "execa": "^6.1.0",
-        "moq.ts": "^10.0.8",
+        "moq.ts": "^10.1.0",
         "rimraf": "^5.0.5",
         "tmp": "^0.2.1",
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.3"
     },
     "overrides": {
         "ava": {