citty 0.0.2 → 0.1.1

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-const scule = require('scule');
 const tty = require('tty');
 
-function _interopNamespaceDefault(e) {
+function _interopNamespaceCompat(e) {
+  if (e && typeof e === 'object' && 'default' in e) return e;
   const n = Object.create(null);
   if (e) {
     for (const k in e) {
@@ -14,7 +14,7 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
+const tty__namespace = /*#__PURE__*/_interopNamespaceCompat(tty);
 
 function toArray(val) {
   if (Array.isArray(val)) {
@@ -46,6 +46,70 @@ class CLIError extends Error {
   }
 }
 
+const NUMBER_CHAR_RE = /\d/;
+const STR_SPLITTERS = ["-", "_", "/", "."];
+function isUppercase(char = "") {
+  if (NUMBER_CHAR_RE.test(char)) {
+    return void 0;
+  }
+  return char.toUpperCase() === char;
+}
+function splitByCase(string_, separators) {
+  const splitters = separators ?? STR_SPLITTERS;
+  const parts = [];
+  if (!string_ || typeof string_ !== "string") {
+    return parts;
+  }
+  let buff = "";
+  let previousUpper;
+  let previousSplitter;
+  for (const char of string_) {
+    const isSplitter = splitters.includes(char);
+    if (isSplitter === true) {
+      parts.push(buff);
+      buff = "";
+      previousUpper = void 0;
+      continue;
+    }
+    const isUpper = isUppercase(char);
+    if (previousSplitter === false) {
+      if (previousUpper === false && isUpper === true) {
+        parts.push(buff);
+        buff = char;
+        previousUpper = isUpper;
+        continue;
+      }
+      if (previousUpper === true && isUpper === false && buff.length > 1) {
+        const lastChar = buff[buff.length - 1];
+        parts.push(buff.slice(0, Math.max(0, buff.length - 1)));
+        buff = lastChar + char;
+        previousUpper = isUpper;
+        continue;
+      }
+    }
+    buff += char;
+    previousUpper = isUpper;
+    previousSplitter = isSplitter;
+  }
+  parts.push(buff);
+  return parts;
+}
+function upperFirst(string_) {
+  return !string_ ? "" : string_[0].toUpperCase() + string_.slice(1);
+}
+function lowerFirst(string_) {
+  return !string_ ? "" : string_[0].toLowerCase() + string_.slice(1);
+}
+function pascalCase(string_) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => upperFirst(p)).join("");
+}
+function camelCase(string_) {
+  return lowerFirst(pascalCase(string_));
+}
+function kebabCase(string_, joiner) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => p.toLowerCase()).join(joiner ?? "-");
+}
+
 function toArr(any) {
   return any == void 0 ? [] : Array.isArray(any) ? any : [any];
 }
@@ -164,6 +228,7 @@ function parseArgs(rawArgs, argsDef) {
   const parseOptions = {
     boolean: [],
     string: [],
+    mixed: [],
     alias: {},
     default: {}
   };
@@ -172,7 +237,11 @@ function parseArgs(rawArgs, argsDef) {
     if (arg.type === "positional") {
       continue;
     }
-    parseOptions[arg.type || "boolean"].push(arg.name);
+    if (arg.type === "string") {
+      parseOptions.string.push(arg.name);
+    } else if (arg.type === "boolean") {
+      parseOptions.boolean.push(arg.name);
+    }
     if (arg.default !== void 0) {
       parseOptions.default[arg.name] = arg.default;
     }
@@ -181,10 +250,10 @@ function parseArgs(rawArgs, argsDef) {
     }
   }
   const parsed = parseRawArgs(rawArgs, parseOptions);
-  const [, ...positionalArguments] = parsed._;
+  const [...positionalArguments] = parsed._;
   const parsedArgsProxy = new Proxy(parsed, {
     get(target, prop) {
-      return target[prop] ?? target[scule.camelCase(prop)] ?? target[scule.kebabCase(prop)];
+      return target[prop] ?? target[camelCase(prop)] ?? target[kebabCase(prop)];
     }
   });
   for (const [, arg] of args.entries()) {
@@ -253,7 +322,7 @@ async function runCommand(cmd, opts) {
     const subCommand = await resolveValue(subCommands[subCommandName]);
     if (subCommand) {
       await runCommand(subCommand, {
-        rawArgs: opts.rawArgs.slice(subCommandArgIndex)
+        rawArgs: opts.rawArgs.slice(subCommandArgIndex + 1)
       });
     }
   }
@@ -270,7 +339,7 @@ async function resolveSubCommand(cmd, rawArgs, parent) {
     if (subCommand) {
       return resolveSubCommand(
         subCommand,
-        rawArgs.slice(subCommandArgIndex),
+        rawArgs.slice(subCommandArgIndex + 1),
         cmd
       );
     }

package/dist/index.d.ts

@@ -22,7 +22,7 @@ type ParsedArgs<T extends ArgsDef = ArgsDef> = {
     [K in keyof T]: T[K] extends {
         type: "positional";
     } ? K : never;
-}[keyof T], string | boolean> & Record<{
+}[keyof T], string> & Record<{
     [K in keyof T]: T[K] extends {
         type: "string";
     } ? K : never;
@@ -30,7 +30,7 @@ type ParsedArgs<T extends ArgsDef = ArgsDef> = {
     [K in keyof T]: T[K] extends {
         type: "boolean";
     } ? K : never;
-}[keyof T], boolean>;
+}[keyof T], boolean> & Record<string, string | boolean>;
 interface CommandMeta {
     name?: string;
     version?: string;

package/dist/index.mjs

@@ -1,4 +1,3 @@
-import { camelCase, kebabCase } from 'scule';
 import * as tty from 'tty';
 
 function toArray(val) {
@@ -31,6 +30,70 @@ class CLIError extends Error {
   }
 }
 
+const NUMBER_CHAR_RE = /\d/;
+const STR_SPLITTERS = ["-", "_", "/", "."];
+function isUppercase(char = "") {
+  if (NUMBER_CHAR_RE.test(char)) {
+    return void 0;
+  }
+  return char.toUpperCase() === char;
+}
+function splitByCase(string_, separators) {
+  const splitters = separators ?? STR_SPLITTERS;
+  const parts = [];
+  if (!string_ || typeof string_ !== "string") {
+    return parts;
+  }
+  let buff = "";
+  let previousUpper;
+  let previousSplitter;
+  for (const char of string_) {
+    const isSplitter = splitters.includes(char);
+    if (isSplitter === true) {
+      parts.push(buff);
+      buff = "";
+      previousUpper = void 0;
+      continue;
+    }
+    const isUpper = isUppercase(char);
+    if (previousSplitter === false) {
+      if (previousUpper === false && isUpper === true) {
+        parts.push(buff);
+        buff = char;
+        previousUpper = isUpper;
+        continue;
+      }
+      if (previousUpper === true && isUpper === false && buff.length > 1) {
+        const lastChar = buff[buff.length - 1];
+        parts.push(buff.slice(0, Math.max(0, buff.length - 1)));
+        buff = lastChar + char;
+        previousUpper = isUpper;
+        continue;
+      }
+    }
+    buff += char;
+    previousUpper = isUpper;
+    previousSplitter = isSplitter;
+  }
+  parts.push(buff);
+  return parts;
+}
+function upperFirst(string_) {
+  return !string_ ? "" : string_[0].toUpperCase() + string_.slice(1);
+}
+function lowerFirst(string_) {
+  return !string_ ? "" : string_[0].toLowerCase() + string_.slice(1);
+}
+function pascalCase(string_) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => upperFirst(p)).join("");
+}
+function camelCase(string_) {
+  return lowerFirst(pascalCase(string_));
+}
+function kebabCase(string_, joiner) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => p.toLowerCase()).join(joiner ?? "-");
+}
+
 function toArr(any) {
   return any == void 0 ? [] : Array.isArray(any) ? any : [any];
 }
@@ -149,6 +212,7 @@ function parseArgs(rawArgs, argsDef) {
   const parseOptions = {
     boolean: [],
     string: [],
+    mixed: [],
     alias: {},
     default: {}
   };
@@ -157,7 +221,11 @@ function parseArgs(rawArgs, argsDef) {
     if (arg.type === "positional") {
       continue;
     }
-    parseOptions[arg.type || "boolean"].push(arg.name);
+    if (arg.type === "string") {
+      parseOptions.string.push(arg.name);
+    } else if (arg.type === "boolean") {
+      parseOptions.boolean.push(arg.name);
+    }
     if (arg.default !== void 0) {
       parseOptions.default[arg.name] = arg.default;
     }
@@ -166,7 +234,7 @@ function parseArgs(rawArgs, argsDef) {
     }
   }
   const parsed = parseRawArgs(rawArgs, parseOptions);
-  const [, ...positionalArguments] = parsed._;
+  const [...positionalArguments] = parsed._;
   const parsedArgsProxy = new Proxy(parsed, {
     get(target, prop) {
       return target[prop] ?? target[camelCase(prop)] ?? target[kebabCase(prop)];
@@ -238,7 +306,7 @@ async function runCommand(cmd, opts) {
     const subCommand = await resolveValue(subCommands[subCommandName]);
     if (subCommand) {
       await runCommand(subCommand, {
-        rawArgs: opts.rawArgs.slice(subCommandArgIndex)
+        rawArgs: opts.rawArgs.slice(subCommandArgIndex + 1)
       });
     }
   }
@@ -255,7 +323,7 @@ async function resolveSubCommand(cmd, rawArgs, parent) {
     if (subCommand) {
       return resolveSubCommand(
         subCommand,
-        rawArgs.slice(subCommandArgIndex),
+        rawArgs.slice(subCommandArgIndex + 1),
         cmd
       );
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "citty",
-  "version": "0.0.2",
+  "version": "0.1.1",
   "description": "Elegant CLI Builder",
   "repository": "unjs/citty",
   "license": "MIT",
@@ -29,21 +29,19 @@
     "release": "pnpm test && changelogen --release --push && npm publish",
     "test": "pnpm lint && vitest run --coverage"
   },
-  "dependencies": {
-    "scule": "^1.0.0"
-  },
   "devDependencies": {
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@vitest/coverage-c8": "^0.29.8",
     "changelogen": "^0.5.2",
     "colorette": "^2.0.19",
-    "eslint": "^8.36.0",
+    "eslint": "^8.37.0",
     "eslint-config-unjs": "^0.1.0",
     "jiti": "^1.18.2",
     "prettier": "^2.8.7",
-    "typescript": "^5.0.2",
-    "unbuild": "^1.1.2",
+    "scule": "^1.0.0",
+    "typescript": "^5.0.3",
+    "unbuild": "^1.2.0",
     "vitest": "^0.29.8"
   },
-  "packageManager": "pnpm@8.0.0"
+  "packageManager": "pnpm@8.1.0"
 }