@clerc/utils 0.40.0 → 0.42.0

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as _clerc_core from '@clerc/core';
-import { I18N, Commands, CommandType, TranslateFn, Command, RootType, Root } from '@clerc/core';
+import { I18N, Commands, CommandType, TranslateFunction, Command, RootType, Root } from '@clerc/core';
 
-type Equals<X, Y> = (<T>() => T extends X ? 1 : 2) extends (<T>() => T extends Y ? 1 : 2) ? true : false;
+type Equals<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 type Dict<T> = Record<string, T>;
 type ToArray<T> = T extends any[] ? T : [T];
 type MaybeArray<T> = T | T[];
@@ -9,16 +9,16 @@ declare const toArray: <T>(a: MaybeArray<T>) => T[];
 type AlphabetLowercase = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" | "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z";
 type Numeric = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9";
 type AlphaNumeric = AlphabetLowercase | Uppercase<AlphabetLowercase> | Numeric;
-type CamelCase<Word extends string> = Word extends `${infer FirstCharacter}${infer Rest}` ? (FirstCharacter extends AlphaNumeric ? `${FirstCharacter}${CamelCase<Rest>}` : Capitalize<CamelCase<Rest>>) : Word;
+type CamelCase<Word extends string> = Word extends `${infer FirstCharacter}${infer Rest}` ? FirstCharacter extends AlphaNumeric ? `${FirstCharacter}${CamelCase<Rest>}` : Capitalize<CamelCase<Rest>> : Word;
 declare const camelCase: (word: string) => string;
 type KebabCase<T extends string, A extends string = ""> = T extends `${infer Prefix}${infer Suffix}` ? KebabCase<Suffix, `${A}${Prefix extends Lowercase<Prefix> ? "" : "-"}${Lowercase<Prefix>}`> : A;
 declare const kebabCase: <T extends string>(s: T) => KebabCase<T, "">;
 declare const gracefulFlagName: (n: string) => string;
 declare const gracefulVersion: (v: string) => string;
-declare const arrayEquals: <T>(arr1: T[], arr2: T[]) => boolean;
-declare const arrayStartsWith: <T>(arr: T[], start: T[]) => boolean;
-declare const semanticArray: (arr: string[], { add, t }: I18N) => string;
-declare function resolveCommandStrict(commands: Commands, name: CommandType | string[], t: TranslateFn): [Command<string | RootType> | undefined, string[] | RootType | undefined];
+declare function arrayEquals<T>(array1: T[], array2: T[]): boolean;
+declare function arrayStartsWith<T>(array: T[], start: T[]): boolean;
+declare function semanticArray(array: string[], { add, t }: I18N): string;
+declare function resolveCommandStrict(commands: Commands, name: CommandType | string[], t: TranslateFunction): [Command<string | RootType> | undefined, string[] | RootType | undefined];
 declare function resolveSubcommandsByParent(commands: Commands, parent: string | string[], depth?: number): Command<string, _clerc_core.CommandOptions<string[], MaybeArray<string | typeof Root>, _clerc_core.Flags>>[];
 declare const resolveRootCommands: (commands: Commands) => Command<string, _clerc_core.CommandOptions<string[], MaybeArray<string | typeof Root>, _clerc_core.Flags>>[];
 

package/dist/index.js

@@ -1 +1,68 @@
-import{Root as o,resolveFlattenCommands as y}from"@clerc/core";const d={en:{"utils.and":"%s and %s"},"zh-CN":{"utils.and":"%s \u548C %s"}},u=e=>Array.isArray(e)?e:[e],A=e=>e.replace(/[\W_]([a-z\d])?/gi,(t,n)=>n?n.toUpperCase():""),m=e=>e.replace(/([A-Z])/g,(t,n)=>`-${n.toLowerCase()}`),C=e=>e.length<=1?`-${e}`:`--${m(e)}`,p=e=>e.length===0?"":e.startsWith("v")?e:`v${e}`,i=(e,t)=>t.length!==e.length?!1:e.every((n,r)=>n===t[r]),f=(e,t)=>t.length>e.length?!1:i(e.slice(0,t.length),t),v=(e,{add:t,t:n})=>(t(d),e.length<=1?e[0]:n("utils.and",e.slice(0,-1).join(", "),e[e.length-1]));function b(e,t,n){if(t===o)return[e[o],o];const r=u(t),l=y(e,n);let s,a;return l.forEach((h,c)=>{c===o||a===o||i(r,c)&&(s=h,a=c)}),[s,a]}function g(e,t,n=1/0){const r=t===""?[]:Array.isArray(t)?t:t.split(" ");return Object.values(e).filter(l=>{const s=l.name.split(" ");return f(s,r)&&s.length-r.length<=n})}const N=e=>g(e,"",1);export{i as arrayEquals,f as arrayStartsWith,A as camelCase,C as gracefulFlagName,p as gracefulVersion,m as kebabCase,b as resolveCommandStrict,N as resolveRootCommands,g as resolveSubcommandsByParent,v as semanticArray,u as toArray};
+import { Root, resolveFlattenCommands } from '@clerc/core';
+
+const locales = {
+  "en": {
+    "utils.and": "%s and %s"
+  },
+  "zh-CN": {
+    "utils.and": "%s \u548C %s"
+  }
+};
+
+const toArray = (a) => Array.isArray(a) ? a : [a];
+const camelCase = (word) => word.replace(/[\W_]([a-z\d])?/gi, (_, c) => c ? c.toUpperCase() : "");
+const kebabCase = (s) => s.replace(/([A-Z])/g, (_, c) => `-${c.toLowerCase()}`);
+const gracefulFlagName = (n) => n.length <= 1 ? `-${n}` : `--${kebabCase(n)}`;
+const gracefulVersion = (v) => v.length === 0 ? "" : v.startsWith("v") ? v : `v${v}`;
+function arrayEquals(array1, array2) {
+  if (array2.length !== array1.length) {
+    return false;
+  }
+  return array1.every((item, index) => item === array2[index]);
+}
+function arrayStartsWith(array, start) {
+  if (start.length > array.length) {
+    return false;
+  }
+  return arrayEquals(array.slice(0, start.length), start);
+}
+function semanticArray(array, { add, t }) {
+  add(locales);
+  if (array.length <= 1) {
+    return array[0];
+  }
+  return t(
+    "utils.and",
+    array.slice(0, -1).join(", "),
+    array[array.length - 1]
+  );
+}
+function resolveCommandStrict(commands, name, t) {
+  if (name === Root) {
+    return [commands[Root], Root];
+  }
+  const nameArray = toArray(name);
+  const commandsMap = resolveFlattenCommands(commands, t);
+  let current;
+  let currentName;
+  for (const [k, v] of commandsMap.entries()) {
+    if (k === Root || currentName === Root) {
+      continue;
+    }
+    if (arrayEquals(nameArray, k)) {
+      current = v;
+      currentName = k;
+    }
+  }
+  return [current, currentName];
+}
+function resolveSubcommandsByParent(commands, parent, depth = Infinity) {
+  const parentArray = parent === "" ? [] : Array.isArray(parent) ? parent : parent.split(" ");
+  return Object.values(commands).filter((c) => {
+    const commandNameArray = c.name.split(" ");
+    return arrayStartsWith(commandNameArray, parentArray) && commandNameArray.length - parentArray.length <= depth;
+  });
+}
+const resolveRootCommands = (commands) => resolveSubcommandsByParent(commands, "", 1);
+
+export { arrayEquals, arrayStartsWith, camelCase, gracefulFlagName, gracefulVersion, kebabCase, resolveCommandStrict, resolveRootCommands, resolveSubcommandsByParent, semanticArray, toArray };

package/package.json

@@ -1,28 +1,28 @@
 {
   "name": "@clerc/utils",
-  "version": "0.40.0",
+  "version": "0.42.0",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve)",
+  "type": "module",
   "description": "Clerc utils",
   "keywords": [
-    "cli",
-    "clerc",
-    "clerc-utils",
-    "utils",
+    "args",
     "arguments",
     "argv",
-    "args",
+    "clerc",
+    "clerc-utils",
+    "cli",
     "terminal",
+    "utils",
     "utils"
   ],
-  "type": "module",
-  "homepage": "https://github.com/so1ve/clerc/tree/main/packages/utils#readme",
+  "homepage": "https://github.com/clercjs/clerc/tree/main/packages/utils#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/so1ve/clerc.git",
+    "url": "git+https://github.com/clercjs/clerc.git",
     "directory": "/"
   },
   "bugs": {
-    "url": "https://github.com/so1ve/clerc/issues"
+    "url": "https://github.com/clercjs/clerc/issues"
   },
   "license": "MIT",
   "sideEffects": false,
@@ -41,14 +41,14 @@
   "publishConfig": {
     "access": "public"
   },
+  "devDependencies": {
+    "type-fest": "^4.0.0"
+  },
   "peerDependencies": {
     "@clerc/core": "*"
   },
-  "devDependencies": {
-    "type-fest": "^3.8.0"
-  },
   "scripts": {
-    "build": "pkgroll --minify",
+    "build": "pkgroll",
     "watch": "pkgroll --watch"
   }
 }