hereby 1.8.7 → 1.8.9

package/README.md

@@ -11,7 +11,7 @@
 
 `hereby` is a simple task runner.
 
-```
+```console
 $ npm i -D hereby
 $ yarn add -D hereby
 ```
@@ -73,7 +73,7 @@ export const bundle = task({
 
 Given the above Herebyfile:
 
-```
+```console
 $ hereby build        # Run the "build" task
 $ hereby test         # Run the "test" task, which depends on "build".
 $ hereby              # Run the default exported task.
@@ -84,7 +84,7 @@ $ hereby test bundle  # Run the "test" and "bundle" tasks in parallel.
 
 `hereby` also supports a handful of flags:
 
-```
+```console
 -h, --help          Display this usage guide.
 --herebyfile path   A path to a Herebyfile. Optional.
 -T, --tasks         Print a listing of the available tasks.
@@ -125,7 +125,7 @@ anyway).
 To run tasks in a specific order and more than once, run `hereby` multiple
 times:
 
-```
+```console
 $ hereby build
 $ hereby clean
 $ hereby build

package/dist/cli/formatTasks.js

@@ -2,13 +2,13 @@ import commandLineUsage from "command-line-usage";
 import pc from "picocolors";
 import { compareTaskNames } from "./utils.js";
 export function formatTasks(format, tasks, defaultTask) {
-    tasks = tasks.filter(isTaskVisible).sort(compareTaskNames);
+    const visibleTasks = [...tasks].filter(isTaskVisible).sort(compareTaskNames);
     if (format === "simple") {
-        return tasks.map((task) => task.options.name).join("\n");
+        return visibleTasks.map((task) => task.options.name).join("\n");
     }
     return commandLineUsage({
         header: "Available tasks",
-        content: tasks.map((task) => {
+        content: visibleTasks.map((task) => {
             var _a;
             const name = task === defaultTask
                 ? `${pc.green(task.options.name)} (default)`

package/dist/cli/index.js

@@ -35,7 +35,7 @@ async function mainWorker(d) {
         d.log(getUsage());
         return;
     }
-    let herebyfilePath = (_a = args.herebyfile) !== null && _a !== void 0 ? _a : (await findHerebyfile(d.cwd()));
+    let herebyfilePath = (_a = args.herebyfile) !== null && _a !== void 0 ? _a : findHerebyfile(d.cwd());
     herebyfilePath = path.resolve(d.cwd(), herebyfilePath);
     if (await reexec(d, herebyfilePath)) {
         return;
@@ -47,7 +47,7 @@ async function mainWorker(d) {
     d.chdir(path.dirname(herebyfilePath));
     const herebyfile = await loadHerebyfile(herebyfilePath);
     if (args.printTasks) {
-        d.log(formatTasks(args.printTasks, herebyfile.tasks, herebyfile.defaultTask));
+        d.log(formatTasks(args.printTasks, herebyfile.tasks.values(), herebyfile.defaultTask));
         return;
     }
     const tasks = await selectTasks(d, herebyfile, herebyfilePath, args.run);
@@ -79,14 +79,13 @@ export async function selectTasks(d, herebyfile, herebyfilePath, taskNames) {
         }
         return [herebyfile.defaultTask];
     }
-    const allTasks = new Map(herebyfile.tasks.map((task) => [task.options.name, task]));
     const tasks = [];
     for (const name of taskNames) {
-        const task = allTasks.get(name);
+        const task = herebyfile.tasks.get(name);
         if (!task) {
             let message = `Task "${name}" does not exist or is not exported from ${d.simplifyPath(herebyfilePath)}.`;
             const { closest, distance } = await import("fastest-levenshtein");
-            const candidate = closest(name, [...allTasks.keys()]);
+            const candidate = closest(name, [...herebyfile.tasks.keys()]);
             if (distance(name, candidate) < name.length * 0.4) {
                 message += ` Did you mean "${candidate}"?`;
             }

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";
-function isHerebyfile(p) {
-    p = p.toLowerCase();
-    return p === "herebyfile.mjs" || p === "herebyfile.js";
-}
-export async function findHerebyfile(dir) {
-    const root = path.parse(dir).root;
-    for (; dir !== root; dir = path.dirname(dir)) {
-        const entries = await fs.promises.readdir(dir);
-        const matching = entries.filter(isHerebyfile);
+import { findUp, UserError } from "./utils.js";
+const herebyfileRegExp = /^herebyfile\.m?js$/i;
+export function findHerebyfile(dir) {
+    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 = await fs.promises.stat(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;
+        if (entries.some((e) => e.name === "package.json")) {
+            return false; // TODO: Is this actually desirable? What about monorepos?
         }
+        return undefined;
+    });
+    if (result) {
+        return result;
     }
     throw new UserError("Unable to find Herebyfile.");
 }
@@ -55,14 +54,11 @@ export async function loadHerebyfile(herebyfilePath) {
     if (exportedTasks.size === 0) {
         throw new UserError("No tasks found. Did you forget to export your tasks?");
     }
-    const tasks = [...exportedTasks.values()];
     // 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(tasks);
-    return {
-        tasks,
-        defaultTask,
-    };
+    checkTaskInvariants(exportedTasks);
+    const tasks = new Map([...exportedTasks].map((task) => [task.options.name, task]));
+    return { tasks, defaultTask };
 }
 function checkTaskInvariants(tasks) {
     const checkedTasks = new Set();

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.7",
+    "version": "1.8.9",
     "description": "A simple task runner",
     "repository": "github:jakebailey/hereby",
     "type": "module",
@@ -48,25 +48,26 @@
     },
     "devDependencies": {
         "@ava/typescript": "^3.0.1",
+        "@changesets/cli": "^2.27.1",
         "@tsconfig/node12": "^12.1.0",
-        "@types/command-line-usage": "^5.0.2",
-        "@types/minimist": "^1.2.2",
-        "@types/node": "^20.5.9",
-        "@types/tmp": "^0.2.3",
-        "@typescript-eslint/eslint-plugin": "^6.6.0",
-        "@typescript-eslint/parser": "^6.6.0",
+        "@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.40.2",
-        "eslint": "^8.48.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": "^48.0.1",
+        "eslint-plugin-unicorn": "^50.0.1",
         "execa": "^6.1.0",
-        "moq.ts": "^10.0.6",
-        "rimraf": "^5.0.1",
+        "moq.ts": "^10.1.0",
+        "rimraf": "^5.0.5",
         "tmp": "^0.2.1",
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.3"
     },
     "overrides": {
         "ava": {
@@ -101,17 +102,5 @@
             "html",
             "lcov"
         ]
-    },
-    "release-it": {
-        "npm": {
-            "publish": false
-        },
-        "git": {
-            "commitMessage": "Release v${version}",
-            "tagName": "v${version}"
-        },
-        "hooks": {
-            "before:init": "npm run build && npm run test"
-        }
     }
 }