hereby 1.7.1 → 1.8.0

package/dist/cli/formatTasks.js

@@ -1,36 +1,35 @@
 import commandLineUsage from "command-line-usage";
 import pc from "picocolors";
-import { stringSorter, taskSorter } from "./utils.js";
+import { compareStrings, compareTaskNames } from "./utils.js";
 export function formatTasks(format, tasks, defaultTask) {
-    tasks = [...tasks]
-        .filter((task) => !task.options.hiddenFromTaskList)
-        .sort(taskSorter);
+    tasks = tasks.filter(isTaskVisible).sort(compareTaskNames);
     if (format === "simple") {
         return tasks.map((task) => task.options.name).join("\n");
     }
-    const sections = [];
-    sections.push({
+    return commandLineUsage({
         header: "Available tasks",
         content: tasks.map((task) => {
             var _a;
             const name = task === defaultTask
                 ? `${pc.green(task.options.name)} (default)`
                 : pc.blue(task.options.name);
-            const descriptionParts = [];
+            let descriptionParts;
             if (task.options.description) {
-                descriptionParts.push(task.options.description);
+                descriptionParts = [task.options.description];
             }
-            const deps = (_a = task.options.dependencies) === null || _a === void 0 ? void 0 : _a.filter((task) => !task.options.hiddenFromTaskList);
+            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(stringSorter)
+                    .sort(compareStrings)
                     .map((v) => pc.blue(v));
-                descriptionParts.push(`Depends on: ${depNames.join(", ")}`);
+                (descriptionParts !== null && descriptionParts !== void 0 ? descriptionParts : (descriptionParts = [])).push(`Depends on: ${depNames.join(", ")}`);
             }
-            return { name, description: descriptionParts.join("\n") };
+            return { name, description: descriptionParts === null || descriptionParts === void 0 ? void 0 : descriptionParts.join("\n") };
         }),
     });
-    return commandLineUsage(sections);
+}
+function isTaskVisible(task) {
+    return !task.options.hiddenFromTaskList;
 }
 //# sourceMappingURL=formatTasks.js.map

package/dist/cli/index.js

@@ -5,7 +5,7 @@ import { findHerebyfile, loadHerebyfile } from "./loadHerebyfile.js";
 import { getUsage, parseArgs } from "./parseArgs.js";
 import { reexec } from "./reexec.js";
 import { Runner } from "./runner.js";
-import { ExitCodeError, UserError } from "./utils.js";
+import { compareTaskNames, ExitCodeError, UserError } from "./utils.js";
 export async function main(d) {
     try {
         await mainWorker(d);
@@ -46,7 +46,7 @@ async function mainWorker(d) {
         return;
     }
     const tasks = await selectTasks(d, herebyfile, herebyfilePath, args.run);
-    const taskNames = tasks.map((t) => t.options.name).sort().map((name) => pc.blue(name)).join(", ");
+    const taskNames = tasks.map((task) => pc.blue(task.options.name)).join(", ");
     d.log(`Using ${pc.yellow(d.simplifyPath(herebyfilePath))} to run ${taskNames}`);
     const start = Date.now();
     let errored = false;
@@ -72,7 +72,7 @@ export async function selectTasks(d, herebyfile, herebyfilePath, taskNames) {
     for (const task of herebyfile.tasks) {
         allTasks.set(task.options.name, task);
     }
-    if (taskNames && taskNames.length > 0) {
+    if (taskNames.length > 0) {
         const tasks = [];
         for (const name of taskNames) {
             const task = allTasks.get(name);
@@ -87,7 +87,7 @@ export async function selectTasks(d, herebyfile, herebyfilePath, taskNames) {
             }
             tasks.push(task);
         }
-        return tasks;
+        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.`);

package/dist/cli/loadHerebyfile.js

@@ -30,6 +30,8 @@ export async function findHerebyfile(dir) {
     throw new UserError("Unable to find Herebyfile.");
 }
 export async function loadHerebyfile(herebyfilePath) {
+    // Note: calling pathToFileURL is required on Windows to disambiguate URLs
+    // from drive letters.
     const herebyfile = await import(pathToFileURL(herebyfilePath).toString());
     const exportedTasks = new Set();
     let defaultTask;

package/dist/cli/parseArgs.js

@@ -1,24 +1,20 @@
-import commandLineArgs from "command-line-args";
 import commandLineUsage from "command-line-usage";
+import minimist from "minimist";
 export function parseArgs(argv) {
-    const idx = argv.indexOf("--");
-    if (idx !== -1) {
-        argv = argv.slice(0, idx);
-    }
-    const options = commandLineArgs([
-        { name: "run", multiple: true, defaultOption: true, type: String },
-        { name: "herebyfile", type: String },
-        { name: "tasks", alias: "T", type: Boolean },
-        { name: "tasks-simple", type: Boolean },
-        { name: "help", alias: "h", type: Boolean },
-        { name: "version", type: Boolean },
-    ], {
-        argv,
-        stopAtFirstUnknown: true,
+    let parseUnknownAsTask = true;
+    const options = minimist(argv, {
+        "--": true,
+        string: ["herebyfile"],
+        boolean: ["tasks", "tasks-simple", "help", "version"],
+        alias: {
+            "h": "help",
+            "T": "tasks",
+        },
+        unknown: (name) => parseUnknownAsTask && (parseUnknownAsTask = !name.startsWith("-")),
     });
     return {
         help: options["help"],
-        run: options["run"],
+        run: options["_"],
         herebyfile: options["herebyfile"],
         printTasks: options["tasks"] ? "normal" : (options["tasks-simple"] ? "simple" : undefined),
         version: options["version"],

package/dist/cli/utils.js

@@ -2,12 +2,11 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-export function taskSorter(a, b) {
-    return stringSorter(a.options.name, b.options.name);
-}
-export function stringSorter(a, b) {
-    return a.localeCompare(b);
+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;
 // Exported for testing.
 export function simplifyPath(p) {
     let homedir = os.homedir();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hereby",
-    "version": "1.7.1",
+    "version": "1.8.0",
     "description": "A simple task runner",
     "repository": "github:jakebailey/hereby",
     "type": "module",
@@ -38,18 +38,18 @@
         "./dist/index.d.ts"
     ],
     "dependencies": {
-        "command-line-args": "^5.2.1",
         "command-line-usage": "^6.1.3",
         "fastest-levenshtein": "^1.0.16",
         "import-meta-resolve": "^2.2.1",
+        "minimist": "^1.2.7",
         "picocolors": "^1.0.0",
         "pretty-ms": "^8.0.0"
     },
     "devDependencies": {
         "@ava/typescript": "^3.0.1",
         "@tsconfig/node12": "^1.0.11",
-        "@types/command-line-args": "^5.2.0",
         "@types/command-line-usage": "^5.0.2",
+        "@types/minimist": "^1.2.2",
         "@types/node": "^14.18.36",
         "@types/tmp": "^0.2.3",
         "@typescript-eslint/eslint-plugin": "^5.48.2",