hereby 1.8.5 → 1.8.7

package/dist/cli/formatTasks.js

@@ -1,6 +1,6 @@
 import commandLineUsage from "command-line-usage";
 import pc from "picocolors";
-import { compareStrings, compareTaskNames } from "./utils.js";
+import { compareTaskNames } from "./utils.js";
 export function formatTasks(format, tasks, defaultTask) {
     tasks = tasks.filter(isTaskVisible).sort(compareTaskNames);
     if (format === "simple") {
@@ -13,16 +13,10 @@ export function formatTasks(format, tasks, defaultTask) {
             const name = task === defaultTask
                 ? `${pc.green(task.options.name)} (default)`
                 : pc.blue(task.options.name);
-            let descriptionParts;
-            if (task.options.description) {
-                descriptionParts = [task.options.description];
-            }
-            const deps = (_a = task.options.dependencies) === null || _a === void 0 ? void 0 : _a.filter(isTaskVisible);
-            if (deps && deps.length > 0) {
-                const depNames = deps
-                    .map((task) => task.options.name)
-                    .sort(compareStrings)
-                    .map((v) => pc.blue(v));
+            let descriptionParts = task.options.description ? [task.options.description] : undefined;
+            const deps = (_a = task.options.dependencies) === null || _a === void 0 ? void 0 : _a.filter(isTaskVisible).sort(compareTaskNames);
+            if (deps === null || deps === void 0 ? void 0 : deps.length) {
+                const depNames = deps.map((task) => pc.blue(task.options.name));
                 (descriptionParts !== null && descriptionParts !== void 0 ? descriptionParts : (descriptionParts = [])).push(`Depends on: ${depNames.join(", ")}`);
             }
             return { name, description: descriptionParts === null || descriptionParts === void 0 ? void 0 : descriptionParts.join("\n") };

package/dist/cli/index.js

@@ -1,11 +1,12 @@
 import path from "node:path";
+import util from "node:util";
 import pc from "picocolors";
 import { formatTasks } from "./formatTasks.js";
 import { findHerebyfile, loadHerebyfile } from "./loadHerebyfile.js";
 import { getUsage, parseArgs } from "./parseArgs.js";
 import { reexec } from "./reexec.js";
 import { Runner } from "./runner.js";
-import { compareTaskNames, ExitCodeError, UserError } from "./utils.js";
+import { ExitCodeError, UserError } from "./utils.js";
 export async function main(d) {
     try {
         await mainWorker(d);
@@ -13,14 +14,18 @@ export async function main(d) {
     catch (e) {
         if (e instanceof ExitCodeError) {
             d.setExitCode(e.exitCode);
+            return;
         }
-        else if (e instanceof UserError) {
+        if (e instanceof UserError) {
             d.error(`${pc.red("Error")}: ${e.message}`);
-            d.setExitCode(1);
+        }
+        else if (util.types.isNativeError(e) && e.stack) {
+            d.error(e.stack);
         }
         else {
-            throw e;
+            d.error(`${e}`);
         }
+        d.setExitCode(1);
     }
 }
 async function mainWorker(d) {
@@ -68,30 +73,27 @@ async function mainWorker(d) {
 }
 // Exported for testing.
 export async function selectTasks(d, herebyfile, herebyfilePath, taskNames) {
-    const allTasks = new Map();
-    for (const task of herebyfile.tasks) {
-        allTasks.set(task.options.name, task);
+    if (taskNames.length === 0) {
+        if (!herebyfile.defaultTask) {
+            throw new UserError(`No default task has been exported from ${d.simplifyPath(herebyfilePath)}; please specify a task name.`);
+        }
+        return [herebyfile.defaultTask];
     }
-    if (taskNames.length > 0) {
-        const tasks = [];
-        for (const name of taskNames) {
-            const task = allTasks.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()]);
-                if (distance(name, candidate) < name.length * 0.4) {
-                    message += ` Did you mean "${candidate}"?`;
-                }
-                throw new UserError(message);
+    const allTasks = new Map(herebyfile.tasks.map((task) => [task.options.name, task]));
+    const tasks = [];
+    for (const name of taskNames) {
+        const task = allTasks.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()]);
+            if (distance(name, candidate) < name.length * 0.4) {
+                message += ` Did you mean "${candidate}"?`;
             }
-            tasks.push(task);
+            throw new UserError(message);
         }
-        return tasks.sort(compareTaskNames);
-    }
-    if (!herebyfile.defaultTask) {
-        throw new UserError(`No default task has been exported from ${d.simplifyPath(herebyfilePath)}; please specify a task name.`);
+        tasks.push(task);
     }
-    return [herebyfile.defaultTask];
+    return tasks;
 }
 //# sourceMappingURL=index.js.map

package/dist/cli/loadHerebyfile.js

@@ -4,14 +4,15 @@ import { pathToFileURL } from "node:url";
 import pc from "picocolors";
 import { Task } from "../index.js";
 import { UserError } from "./utils.js";
-const filenames = ["Herebyfile", "herebyfile"];
-const extensions = ["mjs", "js"];
-const allFilenames = new Set(extensions.flatMap((e) => filenames.map((f) => `${f}.${e}`)));
+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((e) => allFilenames.has(e));
+        const matching = entries.filter(isHerebyfile);
         if (matching.length > 1) {
             throw new UserError(`Found more than one Herebyfile: ${matching.join(", ")}`);
         }

package/dist/cli/reexec.js

@@ -15,15 +15,6 @@ export async function reexec(d, herebyfilePath) {
     // Rather than trying to fix this by messing around with Node's resolution
     // (which won't work in ESM anyway), instead opt to figure out the location
     // of hereby as imported by the Herebyfile, and then "reexec" it by importing.
-    if (d.isPnP) {
-        // When we are running within PnP, we can't really figure out what to
-        // do. import-meta-resolve doesn't implement this, so we can't do
-        // anything until import.meta.resolve is no longer experimental.
-        //
-        // Just assume that everything is okay; we will error later if there's
-        // a mismatch.
-        return false;
-    }
     const thisCLI = await d.resolve(cliExportName, import.meta.url);
     let otherCLI;
     try {

package/dist/cli/runner.js

@@ -1,11 +1,10 @@
-import assert from "node:assert";
 import pc from "picocolors";
 export class Runner {
-    constructor(d) {
+    constructor(_d) {
+        this._d = _d;
         this._addedTasks = new Map();
         this._errored = false;
         this._startTimes = new Map();
-        this._d = d;
     }
     async runTasks(...tasks) {
         // Using allSettled here so that we don't immediately exit; it could be
@@ -55,7 +54,7 @@ export class Runner {
         if (this._errored) {
             return; // Skip logging.
         }
-        const took = Date.now() - checkDefined(this._startTimes.get(task));
+        const took = Date.now() - this._startTimes.get(task);
         this._d.log(`Finished ${pc.green(task.options.name)} in ${this._d.prettyMilliseconds(took)}`);
     }
     onTaskError(task, e) {
@@ -63,12 +62,8 @@ export class Runner {
             return; // Skip logging.
         }
         this._errored = true;
-        const took = Date.now() - checkDefined(this._startTimes.get(task));
+        const took = Date.now() - this._startTimes.get(task);
         this._d.error(`Error in ${pc.red(task.options.name)} in ${this._d.prettyMilliseconds(took)}\n${e}`);
     }
 }
-function checkDefined(value) {
-    assert(value !== undefined);
-    return value;
-}
 //# sourceMappingURL=runner.js.map

package/dist/cli/utils.js

@@ -6,13 +6,11 @@ export function compareTaskNames(a, b) {
     return compareStrings(a.options.name, b.options.name);
 }
 // eslint-disable-next-line @typescript-eslint/unbound-method
-export const compareStrings = new Intl.Collator(undefined, { numeric: true }).compare;
+const compareStrings = new Intl.Collator(undefined, { numeric: true }).compare;
 // Exported for testing.
 export function simplifyPath(p) {
-    let homedir = os.homedir();
-    if (!p.endsWith(path.sep)) {
-        homedir += path.sep;
-    }
+    p = path.normalize(p);
+    const homedir = path.normalize(os.homedir() + path.sep);
     if (p.startsWith(homedir)) {
         p = p.slice(homedir.length);
         return `~${path.sep}${p}`;
@@ -24,9 +22,6 @@ export function simplifyPath(p) {
  * as a message only, without stacktrace. Use this instead of process.exit.
  */
 export class UserError extends Error {
-    constructor(message) {
-        super(message);
-    }
 }
 /**
  * When thrown, ExitCodeError causes the process to exit with a specific error code,
@@ -39,7 +34,6 @@ export class ExitCodeError {
     }
 }
 export async function real() {
-    const importResolve = memoize(async () => (await import("import-meta-resolve")).resolve);
     const { default: prettyMilliseconds } = await import("pretty-ms");
     /* eslint-disable no-restricted-globals */
     return {
@@ -55,24 +49,18 @@ export async function real() {
             process.exitCode = code;
         },
         version: async () => {
-            // Not bothering to memoize this function; it will only be called once.
-            const resolve = await importResolve();
+            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;
         },
-        isPnP: !!process.versions["pnp"],
         resolve: async (specifier, parent) => {
-            const resolve = await importResolve();
+            const { resolve } = await import("import-meta-resolve");
             return resolve(specifier, parent);
         },
         prettyMilliseconds,
     };
     /* eslint-enable no-restricted-globals */
 }
-function memoize(fn) {
-    let value;
-    return () => (value !== null && value !== void 0 ? value : (value = fn()));
-}
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hereby",
-    "version": "1.8.5",
+    "version": "1.8.7",
     "description": "A simple task runner",
     "repository": "github:jakebailey/hereby",
     "type": "module",
@@ -30,6 +30,7 @@
     "engines": {
         "node": ">= 12.20"
     },
+    "preferUnplugged": true,
     "files": [
         "README.md",
         "LICENSE",
@@ -50,14 +51,14 @@
         "@tsconfig/node12": "^12.1.0",
         "@types/command-line-usage": "^5.0.2",
         "@types/minimist": "^1.2.2",
-        "@types/node": "^14.18.54",
+        "@types/node": "^20.5.9",
         "@types/tmp": "^0.2.3",
-        "@typescript-eslint/eslint-plugin": "^6.2.1",
-        "@typescript-eslint/parser": "^6.2.1",
+        "@typescript-eslint/eslint-plugin": "^6.6.0",
+        "@typescript-eslint/parser": "^6.6.0",
         "ava": "~5.0.1",
         "c8": "^8.0.1",
         "dprint": "^0.40.2",
-        "eslint": "^8.46.0",
+        "eslint": "^8.48.0",
         "eslint-plugin-ava": "^14.0.0",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unicorn": "^48.0.1",
@@ -65,7 +66,7 @@
         "moq.ts": "^10.0.6",
         "rimraf": "^5.0.1",
         "tmp": "^0.2.1",
-        "typescript": "^5.1.6"
+        "typescript": "^5.2.2"
     },
     "overrides": {
         "ava": {