craft-native 0.0.75 → 0.0.76

package/dist/cli.js

@@ -2124,90 +2124,6 @@ class Telemetry {
   }
 }
 var telemetry = new Telemetry;
-function parseArgv(argv, opts = {}) {
-  const result = { _: [] };
-  const alias = opts.alias || {};
-  const booleans = new Set(opts.boolean || []);
-  const aliasOf = {};
-  for (const key of Object.keys(alias)) {
-    for (const a of alias[key]) {
-      aliasOf[a] = key;
-    }
-  }
-  for (const b of booleans) {
-    if (alias[b]) {
-      for (const a of alias[b])
-        booleans.add(a);
-    }
-  }
-  function setKey(key, value) {
-    const canonical = aliasOf[key] || key;
-    result[canonical] = value;
-    if (alias[canonical]) {
-      for (const a of alias[canonical])
-        result[a] = value;
-    }
-    if (aliasOf[key] && alias[aliasOf[key]]) {
-      for (const a of alias[aliasOf[key]])
-        result[a] = value;
-    }
-    result[key] = value;
-  }
-  for (let i = 0;i < argv.length; i++) {
-    const arg = argv[i];
-    if (arg === "--") {
-      result._.push(...argv.slice(i + 1));
-      break;
-    }
-    if (arg.startsWith("--")) {
-      const eqIdx = arg.indexOf("=");
-      if (eqIdx !== -1) {
-        const key = arg.slice(2, eqIdx);
-        const value = arg.slice(eqIdx + 1);
-        setKey(key, value);
-      } else {
-        const key = arg.slice(2);
-        if (key.startsWith("no-")) {
-          const actualKey = key.slice(3);
-          setKey(actualKey, false);
-          continue;
-        }
-        const canonical = aliasOf[key] || key;
-        if (booleans.has(canonical) || booleans.has(key)) {
-          setKey(key, true);
-        } else {
-          const next = argv[i + 1];
-          if (next !== undefined && !next.startsWith("-")) {
-            setKey(key, next);
-            i++;
-          } else {
-            setKey(key, true);
-          }
-        }
-      }
-    } else if (arg.startsWith("-") && arg.length > 1) {
-      const chars = arg.slice(1);
-      for (let j = 0;j < chars.length; j++) {
-        const ch = chars[j];
-        const canonical = aliasOf[ch] || ch;
-        if (j === chars.length - 1 && !booleans.has(canonical) && !booleans.has(ch)) {
-          const next = argv[i + 1];
-          if (next !== undefined && !next.startsWith("-")) {
-            setKey(ch, next);
-            i++;
-          } else {
-            setKey(ch, true);
-          }
-        } else {
-          setKey(ch, true);
-        }
-      }
-    } else {
-      result._.push(arg);
-    }
-  }
-  return result;
-}
 function removeBrackets(v) {
   return v.replace(/[<[].+/, "").trim();
 }
@@ -2304,9 +2220,13 @@ function camelcaseOptionName(name) {
 class ClappError extends Error {
   exitCode = 2;
   isUsageError = true;
-  constructor(message) {
+  usage;
+  constructor(message, usage) {
     super(message);
     this.name = this.constructor.name;
+    if (usage !== undefined) {
+      this.usage = usage;
+    }
     if (typeof Error.captureStackTrace === "function") {
       Error.captureStackTrace(this, this.constructor);
     } else {
@@ -2323,6 +2243,12 @@ ${this.stack}`;
     return this.message;
   }
 }
+function isClappError(err) {
+  if (err instanceof ClappError) {
+    return true;
+  }
+  return !!err && typeof err === "object" && err.name === "ClappError" && typeof err.message === "string";
+}
 function isUnicodeSupported() {
   const { env } = process22;
   const { TERM, TERM_PROGRAM } = env;
@@ -2404,6 +2330,99 @@ function levenshteinDistance(a, b) {
 function findSimilarCommands(input, commands, maxDistance = 2, maxSuggestions = 3) {
   return commands.map((cmd) => ({ cmd, distance: levenshteinDistance(input, cmd) })).filter(({ distance }) => distance <= maxDistance).sort((a, b) => a.distance - b.distance).slice(0, maxSuggestions).map(({ cmd }) => cmd);
 }
+function parseArgv(argv, opts = {}) {
+  const result = { _: [] };
+  const alias = opts.alias || {};
+  const booleans = new Set(opts.boolean || []);
+  const aliasOf = {};
+  for (const key of Object.keys(alias)) {
+    for (const a of alias[key]) {
+      aliasOf[a] = key;
+    }
+  }
+  for (const b of booleans) {
+    if (alias[b]) {
+      for (const a of alias[b])
+        booleans.add(a);
+    }
+  }
+  function merge(existing, value) {
+    if (existing === undefined)
+      return value;
+    if (typeof value === "boolean")
+      return value;
+    return Array.isArray(existing) ? [...existing, value] : [existing, value];
+  }
+  function setKey(key, value) {
+    const canonical = aliasOf[key] || key;
+    const merged = merge(result[canonical], value);
+    result[canonical] = merged;
+    if (alias[canonical]) {
+      for (const a of alias[canonical])
+        result[a] = merged;
+    }
+    if (aliasOf[key] && alias[aliasOf[key]]) {
+      for (const a of alias[aliasOf[key]])
+        result[a] = merged;
+    }
+    result[key] = merged;
+  }
+  for (let i = 0;i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === "--") {
+      result._.push(...argv.slice(i + 1));
+      break;
+    }
+    if (arg.startsWith("--")) {
+      const eqIdx = arg.indexOf("=");
+      if (eqIdx !== -1) {
+        const key = camelcase(arg.slice(2, eqIdx));
+        const value = arg.slice(eqIdx + 1);
+        setKey(key, value);
+      } else {
+        const rawKey = arg.slice(2);
+        if (rawKey.startsWith("no-")) {
+          const actualKey = camelcase(rawKey.slice(3));
+          setKey(actualKey, false);
+          continue;
+        }
+        const key = camelcase(rawKey);
+        const canonical = aliasOf[key] || key;
+        if (booleans.has(canonical) || booleans.has(key)) {
+          setKey(key, true);
+        } else {
+          const next = argv[i + 1];
+          if (next !== undefined && !next.startsWith("-")) {
+            setKey(key, next);
+            i++;
+          } else {
+            setKey(key, true);
+          }
+        }
+      }
+    } else if (arg.startsWith("-") && arg.length > 1) {
+      const chars = arg.slice(1);
+      for (let j = 0;j < chars.length; j++) {
+        const ch = chars[j];
+        const canonical = aliasOf[ch] || ch;
+        if (j === chars.length - 1 && !booleans.has(canonical) && !booleans.has(ch)) {
+          const next = argv[i + 1];
+          if (next !== undefined && !next.startsWith("-")) {
+            setKey(ch, next);
+            i++;
+          } else {
+            setKey(ch, true);
+          }
+        } else {
+          setKey(ch, true);
+        }
+      }
+    } else {
+      result._.push(arg);
+    }
+  }
+  return result;
+}
 
 class Option {
   rawName;
@@ -2551,9 +2570,9 @@ class Command {
     return this.namespace ? `${this.namespace}:${this.name}` : this.name;
   }
   hasOption(name) {
-    name = name.split(".")[0];
+    const normalized = camelcaseOptionName(name.split(".")[0]);
     return !!this.options.find((option) => {
-      return option.names.includes(name);
+      return option.names.some((optionName) => camelcaseOptionName(optionName) === normalized);
     });
   }
   outputHelp() {
@@ -2588,6 +2607,7 @@ class Command {
         }
       }
       let commandBody = "";
+      noNamespaceCommands.sort((a, b) => a.rawName < b.rawName ? -1 : a.rawName > b.rawName ? 1 : 0);
       if (noNamespaceCommands.length > 0) {
         commandBody += noNamespaceCommands.map((command) => {
           return `  ${padRight(command.rawName, longestCommandName.length)}  ${command.description}`;
@@ -2614,12 +2634,14 @@ class Command {
         body: commandBody
       });
       sections.push({
-        title: `For more info, run any command with the \`--help\` flag`,
-        body: commands.map((command) => `  $ ${name}${command.displayName === "" ? "" : ` ${command.displayName}`} --help`).join(`
-`)
+        body: `Run \`${name} <command> --help\` for command details.`
       });
     }
-    let options = this.isGlobalCommand ? globalOptions : [...this.options, ...globalOptions || []];
+    const localOptionNames = new Set(this.options.flatMap((option) => option.names));
+    let options = this.isGlobalCommand ? globalOptions : [
+      ...this.options,
+      ...(globalOptions || []).filter((option) => !option.names.some((name2) => localOptionNames.has(name2)))
+    ];
     if (!this.isGlobalCommand && !this.isDefaultCommand) {
       options = options.filter((option) => option.name !== "version");
     }
@@ -2663,6 +2685,9 @@ ${section.body}` : section.body;
       console.log(`${name}/${versionNumber} ${platformInfo3}`);
     }
   }
+  get usageLine() {
+    return `$ ${this.cli.name} ${this.usageText || this.rawName}`;
+  }
   checkRequiredArgs() {
     const minimalArgsCount = this.args.filter((arg) => arg.required).length;
     if (this.cli.args.length < minimalArgsCount) {
@@ -2671,7 +2696,7 @@ ${section.body}` : section.body;
       const argNames = missingArgs.map((arg) => `<${arg.value}>`).join(" ");
       throw new ClappError(`Missing required argument${missingArgs.length > 1 ? "s" : ""}: ${argNames}
 
-` + `Run \`${this.cli.name} ${this.rawName} --help\` for usage information.`);
+` + `Run \`${this.cli.name} ${this.rawName} --help\` for usage information.`, this.usageLine);
     }
   }
   checkUnknownOptions() {
@@ -2681,8 +2706,9 @@ ${section.body}` : section.body;
         if (name !== "--" && !this.hasOption(name) && !globalCommand.hasOption(name)) {
           const allOptions = [...globalCommand.options, ...this.options];
           const allOptionNames = allOptions.flatMap((opt) => opt.names);
+          const normalizedName = camelcaseOptionName(name.split(".")[0]);
           const optionFlag = name.length > 1 ? `--${name}` : `-${name}`;
-          const suggestions = findSimilarCommands(name, allOptionNames);
+          const suggestions = findSimilarCommands(normalizedName, allOptionNames);
           let errorMsg = `Unknown option \`${optionFlag}\``;
           if (suggestions.length > 0) {
             errorMsg += `
@@ -2697,7 +2723,7 @@ Did you mean one of these?`;
           errorMsg += `
 
 Run \`${this.cli.name} ${this.rawName} --help\` to see available options.`;
-          throw new ClappError(errorMsg);
+          throw new ClappError(errorMsg, this.usageLine);
         }
       }
     }
@@ -2712,7 +2738,7 @@ Run \`${this.cli.name} ${this.rawName} --help\` to see available options.`;
         if (value === true || value === false && !hasNegated) {
           throw new ClappError(`Option \`${option.rawName}\` requires a value.
 
-` + `Example: ${this.cli.name} ${this.rawName} ${option.rawName} <value>`);
+` + `Example: ${this.cli.name} ${this.rawName} ${option.rawName} <value>`, this.usageLine);
         }
       }
     }
@@ -3018,6 +3044,25 @@ Received ${signal}, cleaning up...`);
           break;
         }
       }
+      if (shouldParse) {
+        const nextToken = slicedArgv[1];
+        if (nextToken && !nextToken.startsWith("-")) {
+          const joinedName = `${candidateName}:${nextToken}`;
+          for (const command of this.commands) {
+            if (command.isMatched(joinedName)) {
+              const parsed = this.mri(slicedArgv, command);
+              shouldParse = false;
+              const parsedInfo = {
+                ...parsed,
+                args: parsed.args.slice(2)
+              };
+              this.setParsedInfo(parsedInfo, command, joinedName);
+              this.emit(`command:${joinedName}`, command);
+              break;
+            }
+          }
+        }
+      }
     }
     if (shouldParse) {
       for (const command of this.commands) {
@@ -3043,7 +3088,7 @@ Received ${signal}, cleaning up...`);
     if (this.options.debug) {
       this.isDebug = true;
     }
-    if (this.options.noInteraction) {
+    if (this.options.noInteraction || this.options.interaction === false) {
       this.isNoInteraction = true;
     }
     if (this.options.env) {
@@ -3055,14 +3100,14 @@ Received ${signal}, cleaning up...`);
     if (this.options.force) {
       this.isForce = true;
     }
-    if (this.options.noEmoji !== undefined) {
-      this.useEmoji = !this.options.noEmoji;
+    if (this.options.noEmoji || this.options.emoji === false) {
+      this.useEmoji = false;
     }
     if (this.options.theme) {
       this.theme = String(this.options.theme);
     }
-    if (this.options.noCache !== undefined) {
-      this.isNoCache = Boolean(this.options.noCache);
+    if (this.options.noCache || this.options.cache === false) {
+      this.isNoCache = true;
     }
     if (this.options.help && this.showHelpOnExit) {
       this.outputHelp();
@@ -3143,18 +3188,16 @@ Received ${signal}, cleaning up...`);
     return this.parse(argv, { run: true, exitOnError: true });
   }
   handleUsageError(err) {
-    const isClappError = !!err && typeof err === "object" && err.name === "ClappError";
-    const isUsage = isClappError && err.isUsageError !== false;
-    if (!isUsage)
+    if (!isClappError(err) || err.isUsageError === false)
       return;
-    const e = err;
-    const raw = e.message ?? "command-line error";
+    const raw = err.message || "command-line error";
     const label = this.name ? `${this.name}: ` : "";
-    const suffix = /--help/.test(raw) ? "" : `
+    const suffix = /--help/.test(raw) ? "" : err.usage ? `
+Usage: ${err.usage}` : `
 Run \`${this.name ?? "cli"} --help\` for usage.`;
     process5.stderr.write(`${label}${raw}${suffix}
 `);
-    process5.exit(e.exitCode ?? 2);
+    process5.exit(err.exitCode ?? 2);
   }
   async runMatchedCommand() {
     const { args, options, matchedCommand: command } = this;
@@ -4072,7 +4115,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.75";
+var version = "0.0.76";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.75",
+  "version": "0.0.76",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",