argue-cli 2.0.0-1 → 2.0.0-2

package/dist/args.d.ts

@@ -1,4 +1,4 @@
-import { AliasArgRef, ArgRef, PrimitiveConstructor, OptionsReaderState, OptionsReaderNext, OptionResult } from './types';
+import { AliasArgRef, ArgRef, PrimitiveConstructor, OptionsReaderState, OptionsReaderRead, OptionResult } from './types';
 /**
  * Describe argument with aliases.
  * @param name - Main name.
@@ -13,5 +13,5 @@ export declare function alias<T extends string>(name: T, alias: string, ...restA
  * @param type - Value type.
  * @returns Option reader.
  */
-export declare function option<T extends string, K extends PrimitiveConstructor>(argRef: ArgRef<T>, type: K): (option: string, next: OptionsReaderNext, options: OptionsReaderState) => OptionResult<T, K> | null;
+export declare function option<T extends string, K extends PrimitiveConstructor>(argRef: ArgRef<T>, type: K): (option: string, read: OptionsReaderRead, options: OptionsReaderState) => OptionResult<T, K> | null;
 //# sourceMappingURL=args.d.ts.map

package/dist/index.cjs

@@ -105,33 +105,33 @@ const ARGV_START_INDEX = 2;
  * @returns Option reader.
  */ function option(argRef, type) {
     if (type === String) {
-        return (option1, next)=>{
+        return (option1, read)=>{
             const argName = matchArgName(argRef, option1);
             if (argName) {
                 return {
-                    [argName]: next(true)
+                    [argName]: read()
                 };
             }
             return null;
         };
     }
     if (type === Number) {
-        return (option2, next)=>{
+        return (option2, read)=>{
             const argName = matchArgName(argRef, option2);
             if (argName) {
                 return {
-                    [argName]: parseFloat(next(true))
+                    [argName]: parseFloat(read())
                 };
             }
             return null;
         };
     }
     if (type === Array) {
-        return (option3, next, options)=>{
+        return (option3, read, options)=>{
             const argName = matchArgName(argRef, option3);
             if (argName) {
                 const prevValues = options[argName];
-                const values = next(true).split(',');
+                const values = read().split(',');
                 return {
                     [argName]: Array.isArray(prevValues) ? prevValues.concat(values) : values
                 };
@@ -162,7 +162,7 @@ function createOptionReader(optionReaders) {
             return readOption;
         }
         var ref;
-        return (option, next, options)=>(ref = readOption(option, next, options)) !== null && ref !== void 0 ? ref : readNextOption(option, next, options)
+        return (option, read, options)=>(ref = readOption(option, read, options)) !== null && ref !== void 0 ? ref : readNextOption(option, read, options)
         ;
     }, null);
     return optionReader;
@@ -172,16 +172,27 @@ function createOptionReader(optionReaders) {
  * @param optionReaders
  * @returns Options with values.
  */ function readOptions(...optionReaders) {
-    if (!argv.length || !optionReaders.length) {
+    if (!argv.length) {
         return {};
     }
     const readOption = createOptionReader(optionReaders);
+    if (!readOption) {
+        return {};
+    }
     const options = {};
     let i = 0;
     let arg = argv[i];
-    const next = (required = false)=>{
+    let optionResult;
+    const next = ()=>{
         arg = argv[++i];
-        if (required && !arg) {
+    };
+    const remove = ()=>{
+        argv.splice(i--, 1);
+    };
+    const read = ()=>{
+        next();
+        remove();
+        if (!arg) {
             throw new Error('Unexpected end of arguments');
         }
         return arg;
@@ -189,7 +200,11 @@ function createOptionReader(optionReaders) {
     // eslint-disable-next-line no-unmodified-loop-condition
     while(arg){
         if (isOption(arg)) {
-            Object.assign(options, readOption === null || readOption === void 0 ? void 0 : readOption(removePrefix(arg), next, options));
+            optionResult = readOption(removePrefix(arg), read, options);
+            if (optionResult) {
+                remove();
+                Object.assign(options, optionResult);
+            }
         }
         next();
     }

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../src/argv.ts","../src/utils.ts","../src/core.ts","../src/args.ts","../src/options.ts"],"sourcesContent":["\nconst ARGV_START_INDEX = 2\n\n/**\n * Internal state of arguments.\n */\nexport const argv = process.argv.slice(ARGV_START_INDEX)\n\n/**\n * Reset arguments state.\n */\nexport function resetArgs() {\n  argv.splice(0, argv.length)\n  argv.push(...process.argv.slice(ARGV_START_INDEX))\n}\n\n/**\n * Set arguments state.\n * @param args\n */\nexport function setArgs(...args: string[]) {\n  argv.splice(0, argv.length)\n  argv.push(...args)\n}\n","\nimport { ArgRef } from './types'\n\ntype FlatMerge<T> = T extends infer U ? { [K in keyof U]: U[K] } : never\n\nexport type Merge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? FlatMerge<NonNullable<L> & Merge<R>>\n  : unknown\n\nexport type UnionMerge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? L | Merge<R>\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  : any\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AnyFunction = (...args: any[]) => any\n\nexport type ReturnTypes<T extends readonly [...AnyFunction[]]> = T extends [infer L, ...infer R]\n  ? L extends AnyFunction\n    ? R extends AnyFunction[]\n      ? [ReturnType<L>, ...ReturnTypes<R>]\n      : []\n    : []\n  : []\n\n/**\n * Match reference with argument.\n * @param argRef\n * @param arg\n * @returns Full name or null.\n */\nexport function matchArgName<T extends string>(argRef: ArgRef<T>, arg: string) {\n  if (typeof argRef === 'string') {\n    return argRef === arg\n      ? argRef\n      : null\n  }\n\n  if (argRef.name === arg) {\n    return argRef.name\n  }\n\n  return argRef.aliases.includes(arg)\n    ? argRef.name\n    : null\n}\n\n/**\n * Find full argument name in references.\n * @param argRefs\n * @param arg\n * @returns Found argument's full name or null.\n */\nexport function findArgName<T extends string>(argRefs: [...ArgRef<T>[]], arg: string) {\n  let argRef: ArgRef<T>\n  let argName: T | null\n\n  for (argRef of argRefs) {\n    argName = matchArgName(argRef, arg)\n\n    if (argName) {\n      return argName\n    }\n  }\n\n  return null\n}\n","import { argv } from './argv'\nimport { ArgRef } from './types'\nimport { findArgName } from './utils'\n\n/**\n * Read next argument.\n * Throws error if no next argument.\n * @returns Next argument.\n */\nexport function read() {\n  const value = argv.shift()\n\n  if (!value) {\n    throw new Error('Unexpected end of arguments')\n  }\n\n  return value\n}\n\n/**\n * Expectation of the end.\n * Throws an error if there are more arguments left.\n */\nexport function end() {\n  if (argv.length) {\n    throw new Error(`Unexpected argument \"${argv[0]}\"`)\n  }\n}\n\n/**\n * Expect one of the given arguments.\n * @param argRefs\n * @returns Expected full argument name.\n */\nexport function expect<T extends string>(...argRefs: [...ArgRef<T>[]]) {\n  const arg = read()\n  const argName = findArgName(argRefs, arg)\n\n  if (!argName) {\n    throw new Error(`Unexpected argument \"${arg}\"`)\n  }\n\n  return argName\n}\n","import {\n  AliasArgRef,\n  ArgRef,\n  PrimitiveConstructor,\n  OptionsReaderState,\n  OptionsReaderNext,\n  OptionResult\n} from './types'\nimport { matchArgName } from './utils'\n\n/**\n * Describe argument with aliases.\n * @param name - Main name.\n * @param alias - Alias name.\n * @param restAliases - Rest aliases.\n * @returns Description of argument with aliases..\n */\nexport function alias<T extends string>(name: T, alias: string, ...restAliases: string[]): AliasArgRef<T> {\n  return {\n    name,\n    aliases: [alias, ...restAliases]\n  }\n}\n\n/**\n * Describe option with value.\n * @param argRef - Option name.\n * @param type - Value type.\n * @returns Option reader.\n */\nexport function option<T extends string, K extends PrimitiveConstructor>(argRef: ArgRef<T>, type: K) {\n  if (type === String) {\n    return (option: string, next: OptionsReaderNext) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: next(true)\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Number) {\n    return (option: string, next: OptionsReaderNext) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: parseFloat(next(true))\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Array) {\n    return (option: string, next: OptionsReaderNext, options: OptionsReaderState) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        const prevValues = options[argName]\n        const values = next(true).split(',')\n\n        return {\n          [argName]: Array.isArray(prevValues)\n            ? prevValues.concat(values)\n            : values\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  return (option: string) => {\n    const argName = matchArgName(argRef, option)\n\n    if (argName) {\n      return {\n        [argName]: true\n      } as OptionResult<T, K>\n    }\n\n    return null\n  }\n}\n","import { argv } from './argv'\nimport { OptionReader } from './types'\nimport { Merge, ReturnTypes, UnionMerge } from './utils'\n\nfunction isOption(arg: string) {\n  return /^--?[^-].*/.test(arg)\n}\n\nfunction removePrefix(arg: string) {\n  return arg.replace(/^--?/, '')\n}\n\nfunction createOptionReader<T extends OptionReader[]>(optionReaders: [...T]) {\n  const optionReader = optionReaders.reduceRight<OptionReader | null>(\n    (readNextOption, readOption) => {\n      if (!readNextOption) {\n        return readOption\n      }\n\n      return (option, next, options) => readOption(option, next, options) ?? readNextOption(option, next, options)\n    },\n    null\n  )\n\n  return optionReader as OptionReader<UnionMerge<ReturnTypes<T>>> | null\n}\n\n/**\n * Read options from arguments.\n * @param optionReaders\n * @returns Options with values.\n */\nexport function readOptions<T extends OptionReader[]>(...optionReaders: [...T]): Partial<Merge<ReturnTypes<T>>> {\n  if (!argv.length || !optionReaders.length) {\n    return {}\n  }\n\n  const readOption = createOptionReader(optionReaders)\n  const options = {}\n  let i = 0\n  let arg = argv[i]\n  const next = (required = false) => {\n    arg = argv[++i]\n\n    if (required && !arg) {\n      throw new Error('Unexpected end of arguments')\n    }\n\n    return arg\n  }\n\n  // eslint-disable-next-line no-unmodified-loop-condition\n  while (arg) {\n    if (isOption(arg)) {\n      Object.assign(options, readOption?.(removePrefix(arg), next, options))\n    }\n\n    next()\n  }\n\n  return options\n}\n"],"names":["ARGV_START_INDEX","argv","process","slice","resetArgs","splice","length","push","setArgs","args","matchArgName","argRef","arg","name","aliases","includes","findArgName","argRefs","argName","read","value","shift","Error","end","expect","alias","restAliases","option","type","String","next","Number","parseFloat","Array","options","prevValues","values","split","isArray","concat","isOption","test","removePrefix","replace","createOptionReader","optionReaders","optionReader","reduceRight","readNextOption","readOption","readOptions","i","required","Object","assign"],"mappings":";;;;AACA,MAAMA,gBAAgB,GAAG,CAAC;AAE1B;;IAGY,MAACC,IAAI,GAAGC,OAAO,CAACD,IAAI,CAACE,KAAK,CAACH,gBAAgB;AAEvD;;aAGgBI,SAAS,GAAG;IAC1BH,IAAI,CAACI,MAAM,CAAC,CAAC,EAAEJ,IAAI,CAACK,MAAM;IAC1BL,IAAI,CAACM,IAAI,IAAIL,OAAO,CAACD,IAAI,CAACE,KAAK,CAACH,gBAAgB;AAClD,CAAC;AAED;;;aAIgBQ,OAAO,IAAIC,IAAI,EAAY;IACzCR,IAAI,CAACI,MAAM,CAAC,CAAC,EAAEJ,IAAI,CAACK,MAAM;IAC1BL,IAAI,CAACM,IAAI,IAAIE,IAAI;AACnB;;ACEA;;;;;aAMgBC,YAAY,CAAmBC,MAAiB,EAAEC,GAAW,EAAE;IAC7E,IAAI,OAAOD,MAAM,KAAK,UAAU;QAC9B,OAAOA,MAAM,KAAKC,GAAG,GACjBD,MAAM,GACN,IAAI;KACT;IAED,IAAIA,MAAM,CAACE,IAAI,KAAKD,GAAG,EAAE;QACvB,OAAOD,MAAM,CAACE,IAAI;KACnB;IAED,OAAOF,MAAM,CAACG,OAAO,CAACC,QAAQ,CAACH,GAAG,IAC9BD,MAAM,CAACE,IAAI,GACX,IAAI;AACV,CAAC;AAED;;;;;aAMgBG,WAAW,CAAmBC,OAAyB,EAAEL,GAAW,EAAE;IACpF,IAAID,MAAM;IACV,IAAIO,OAAO;IAEX,KAAKP,MAAM,IAAIM,OAAO,CAAE;QACtBC,OAAO,GAAGR,YAAY,CAACC,MAAM,EAAEC,GAAG;QAElC,IAAIM,OAAO,EAAE;YACX,OAAOA,OAAO;SACf;KACF;IAED,OAAO,IAAI;AACb;;AC9DA;;;;aAKgBC,IAAI,GAAG;IACrB,MAAMC,KAAK,GAAGnB,IAAI,CAACoB,KAAK;IAExB,KAAKD,KAAK,EAAE;QACV,MAAM,IAAIE,KAAK,CAAC;KACjB;IAED,OAAOF,KAAK;AACd,CAAC;AAED;;;aAIgBG,GAAG,GAAG;IACpB,IAAItB,IAAI,CAACK,MAAM,EAAE;QACf,MAAM,IAAIgB,KAAK,EAAE,qBAAqB,EAAErB,IAAI,CAAC,CAAC,EAAE,CAAC;KAClD;AACH,CAAC;AAED;;;;aAKgBuB,MAAM,IAAsBP,OAAO,EAAoB;IACrE,MAAML,GAAG,GAAGO,IAAI;IAChB,MAAMD,OAAO,GAAGF,WAAW,CAACC,OAAO,EAAEL,GAAG;IAExC,KAAKM,OAAO,EAAE;QACZ,MAAM,IAAII,KAAK,EAAE,qBAAqB,EAAEV,GAAG,CAAC,CAAC;KAC9C;IAED,OAAOM,OAAO;AAChB;;ACjCA;;;;;;aAOgBO,KAAK,CAAmBZ,IAAO,EAAEY,MAAa,KAAKC,WAAW,EAA4B;IACxG,OAAO;QACLb,IAAI;QACJC,OAAO,EAAE;YAACW,MAAK;eAAKC,WAAW;SAAC;KACjC;AACH,CAAC;AAED;;;;;aAMgBC,MAAM,CAAmDhB,MAAiB,EAAEiB,IAAO,EAAE;IACnG,IAAIA,IAAI,KAAKC,MAAM,EAAE;QACnB,QAAQF,OAAc,EAAEG,IAAuB,GAAK;YAClD,MAAMZ,OAAO,GAAGR,YAAY,CAACC,MAAM,EAAEgB,OAAM;YAE3C,IAAIT,OAAO,EAAE;gBACX,OAAO;qBACJA,OAAO,GAAGY,IAAI,CAAC,IAAI;iBACrB;aACF;YAED,OAAO,IAAI;SACZ;KACF;IAED,IAAIF,IAAI,KAAKG,MAAM,EAAE;QACnB,QAAQJ,OAAc,EAAEG,IAAuB,GAAK;YAClD,MAAMZ,OAAO,GAAGR,YAAY,CAACC,MAAM,EAAEgB,OAAM;YAE3C,IAAIT,OAAO,EAAE;gBACX,OAAO;qBACJA,OAAO,GAAGc,UAAU,CAACF,IAAI,CAAC,IAAI;iBAChC;aACF;YAED,OAAO,IAAI;SACZ;KACF;IAED,IAAIF,IAAI,KAAKK,KAAK,EAAE;QAClB,QAAQN,OAAc,EAAEG,IAAuB,EAAEI,OAA2B,GAAK;YAC/E,MAAMhB,OAAO,GAAGR,YAAY,CAACC,MAAM,EAAEgB,OAAM;YAE3C,IAAIT,OAAO,EAAE;gBACX,MAAMiB,UAAU,GAAGD,OAAO,CAAChB,OAAO;gBAClC,MAAMkB,MAAM,GAAGN,IAAI,CAAC,IAAI,EAAEO,KAAK,CAAC;gBAEhC,OAAO;qBACJnB,OAAO,GAAGe,KAAK,CAACK,OAAO,CAACH,UAAU,IAC/BA,UAAU,CAACI,MAAM,CAACH,MAAM,IACxBA,MAAM;iBACX;aACF;YAED,OAAO,IAAI;SACZ;KACF;IAED,QAAQT,OAAc,GAAK;QACzB,MAAMT,OAAO,GAAGR,YAAY,CAACC,MAAM,EAAEgB,OAAM;QAE3C,IAAIT,OAAO,EAAE;YACX,OAAO;iBACJA,OAAO,GAAG,IAAI;aAChB;SACF;QAED,OAAO,IAAI;KACZ;AACH;;SCrFSsB,QAAQ,CAAC5B,GAAW,EAAE;IAC7B,oBAAoB6B,IAAI,CAAC7B,GAAG;AAC9B,CAAC;SAEQ8B,YAAY,CAAC9B,GAAW,EAAE;IACjC,OAAOA,GAAG,CAAC+B,OAAO,SAAS;AAC7B,CAAC;SAEQC,kBAAkB,CAA2BC,aAAqB,EAAE;IAC3E,MAAMC,YAAY,GAAGD,aAAa,CAACE,WAAW,EAC3CC,cAAc,EAAEC,UAAU,GAAK;QAC9B,KAAKD,cAAc,EAAE;YACnB,OAAOC,UAAU;SAClB;YAEiCA,GAAiC;QAAnE,QAAQtB,MAAM,EAAEG,IAAI,EAAEI,OAAO,IAAKe,GAAiC,GAAjCA,UAAU,CAACtB,MAAM,EAAEG,IAAI,EAAEI,OAAO,eAAhCe,GAAiC,cAAjCA,GAAiC,GAAID,cAAc,CAACrB,MAAM,EAAEG,IAAI,EAAEI,OAAO;;KAC5G,EACD,IAAI;IAGN,OAAOY,YAAY;AACrB,CAAC;AAED;;;;aAKgBI,WAAW,IAA8BL,aAAa,EAA0C;IAC9G,KAAK5C,IAAI,CAACK,MAAM,KAAKuC,aAAa,CAACvC,MAAM,EAAE;QACzC,OAAO,EAAE;KACV;IAED,MAAM2C,UAAU,GAAGL,kBAAkB,CAACC,aAAa;IACnD,MAAMX,OAAO,GAAG,EAAE;IAClB,IAAIiB,CAAC,GAAG,CAAC;IACT,IAAIvC,GAAG,GAAGX,IAAI,CAACkD,CAAC;IAChB,MAAMrB,IAAI,IAAIsB,QAAQ,GAAG,KAAK,GAAK;QACjCxC,GAAG,GAAGX,IAAI,GAAGkD,CAAC;QAEd,IAAIC,QAAQ,KAAKxC,GAAG,EAAE;YACpB,MAAM,IAAIU,KAAK,CAAC;SACjB;QAED,OAAOV,GAAG;KACX;;UAGMA,GAAG,CAAE;QACV,IAAI4B,QAAQ,CAAC5B,GAAG,GAAG;YACjByC,MAAM,CAACC,MAAM,CAACpB,OAAO,EAAEe,UAAU,aAAVA,UAAU,KAAVA,KAAAA,CAA8C,GAA9CA,KAAAA,CAA8C,GAA9CA,UAAU,CAAGP,YAAY,CAAC9B,GAAG,GAAGkB,IAAI,EAAEI,OAAO;SACrE;QAEDJ,IAAI;KACL;IAED,OAAOI,OAAO;AAChB;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","sources":["../src/argv.ts","../src/utils.ts","../src/core.ts","../src/args.ts","../src/options.ts"],"sourcesContent":["\nconst ARGV_START_INDEX = 2\n\n/**\n * Internal state of arguments.\n */\nexport const argv = process.argv.slice(ARGV_START_INDEX)\n\n/**\n * Reset arguments state.\n */\nexport function resetArgs() {\n  argv.splice(0, argv.length)\n  argv.push(...process.argv.slice(ARGV_START_INDEX))\n}\n\n/**\n * Set arguments state.\n * @param args\n */\nexport function setArgs(...args: string[]) {\n  argv.splice(0, argv.length)\n  argv.push(...args)\n}\n","\nimport { ArgRef } from './types'\n\ntype FlatMerge<T> = T extends infer U ? { [K in keyof U]: U[K] } : never\n\nexport type Merge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? FlatMerge<NonNullable<L> & Merge<R>>\n  : unknown\n\nexport type UnionMerge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? L | Merge<R>\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  : any\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AnyFunction = (...args: any[]) => any\n\nexport type ReturnTypes<T extends readonly [...AnyFunction[]]> = T extends [infer L, ...infer R]\n  ? L extends AnyFunction\n    ? R extends AnyFunction[]\n      ? [ReturnType<L>, ...ReturnTypes<R>]\n      : []\n    : []\n  : []\n\n/**\n * Match reference with argument.\n * @param argRef\n * @param arg\n * @returns Full name or null.\n */\nexport function matchArgName<T extends string>(argRef: ArgRef<T>, arg: string) {\n  if (typeof argRef === 'string') {\n    return argRef === arg\n      ? argRef\n      : null\n  }\n\n  if (argRef.name === arg) {\n    return argRef.name\n  }\n\n  return argRef.aliases.includes(arg)\n    ? argRef.name\n    : null\n}\n\n/**\n * Find full argument name in references.\n * @param argRefs\n * @param arg\n * @returns Found argument's full name or null.\n */\nexport function findArgName<T extends string>(argRefs: [...ArgRef<T>[]], arg: string) {\n  let argRef: ArgRef<T>\n  let argName: T | null\n\n  for (argRef of argRefs) {\n    argName = matchArgName(argRef, arg)\n\n    if (argName) {\n      return argName\n    }\n  }\n\n  return null\n}\n","import { argv } from './argv'\nimport { ArgRef } from './types'\nimport { findArgName } from './utils'\n\n/**\n * Read next argument.\n * Throws error if no next argument.\n * @returns Next argument.\n */\nexport function read() {\n  const value = argv.shift()\n\n  if (!value) {\n    throw new Error('Unexpected end of arguments')\n  }\n\n  return value\n}\n\n/**\n * Expectation of the end.\n * Throws an error if there are more arguments left.\n */\nexport function end() {\n  if (argv.length) {\n    throw new Error(`Unexpected argument \"${argv[0]}\"`)\n  }\n}\n\n/**\n * Expect one of the given arguments.\n * @param argRefs\n * @returns Expected full argument name.\n */\nexport function expect<T extends string>(...argRefs: [...ArgRef<T>[]]) {\n  const arg = read()\n  const argName = findArgName(argRefs, arg)\n\n  if (!argName) {\n    throw new Error(`Unexpected argument \"${arg}\"`)\n  }\n\n  return argName\n}\n","import {\n  AliasArgRef,\n  ArgRef,\n  PrimitiveConstructor,\n  OptionsReaderState,\n  OptionsReaderRead,\n  OptionResult\n} from './types'\nimport { matchArgName } from './utils'\n\n/**\n * Describe argument with aliases.\n * @param name - Main name.\n * @param alias - Alias name.\n * @param restAliases - Rest aliases.\n * @returns Description of argument with aliases..\n */\nexport function alias<T extends string>(name: T, alias: string, ...restAliases: string[]): AliasArgRef<T> {\n  return {\n    name,\n    aliases: [alias, ...restAliases]\n  }\n}\n\n/**\n * Describe option with value.\n * @param argRef - Option name.\n * @param type - Value type.\n * @returns Option reader.\n */\nexport function option<T extends string, K extends PrimitiveConstructor>(argRef: ArgRef<T>, type: K) {\n  if (type === String) {\n    return (option: string, read: OptionsReaderRead) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: read()\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Number) {\n    return (option: string, read: OptionsReaderRead) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: parseFloat(read())\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Array) {\n    return (option: string, read: OptionsReaderRead, options: OptionsReaderState) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        const prevValues = options[argName]\n        const values = read().split(',')\n\n        return {\n          [argName]: Array.isArray(prevValues)\n            ? prevValues.concat(values)\n            : values\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  return (option: string) => {\n    const argName = matchArgName(argRef, option)\n\n    if (argName) {\n      return {\n        [argName]: true\n      } as OptionResult<T, K>\n    }\n\n    return null\n  }\n}\n","import { argv } from './argv'\nimport { OptionReader, OptionResult } from './types'\nimport { Merge, ReturnTypes, UnionMerge } from './utils'\n\nfunction isOption(arg: string) {\n  return /^--?[^-].*/.test(arg)\n}\n\nfunction removePrefix(arg: string) {\n  return arg.replace(/^--?/, '')\n}\n\nfunction createOptionReader<T extends OptionReader[]>(optionReaders: [...T]) {\n  const optionReader = optionReaders.reduceRight<OptionReader | null>(\n    (readNextOption, readOption) => {\n      if (!readNextOption) {\n        return readOption\n      }\n\n      return (option, read, options) => readOption(option, read, options) ?? readNextOption(option, read, options)\n    },\n    null\n  )\n\n  return optionReader as OptionReader<UnionMerge<ReturnTypes<T>>> | null\n}\n\n/**\n * Read options from arguments.\n * @param optionReaders\n * @returns Options with values.\n */\nexport function readOptions<T extends OptionReader[]>(...optionReaders: [...T]): Partial<Merge<ReturnTypes<T>>> {\n  if (!argv.length) {\n    return {}\n  }\n\n  const readOption = createOptionReader(optionReaders)\n\n  if (!readOption) {\n    return {}\n  }\n\n  const options = {}\n  let i = 0\n  let arg = argv[i]\n  let optionResult: OptionResult | null\n  const next = () => {\n    arg = argv[++i]\n  }\n  const remove = () => {\n    argv.splice(i--, 1)\n  }\n  const read = () => {\n    next()\n    remove()\n\n    if (!arg) {\n      throw new Error('Unexpected end of arguments')\n    }\n\n    return arg\n  }\n\n  // eslint-disable-next-line no-unmodified-loop-condition\n  while (arg) {\n    if (isOption(arg)) {\n      optionResult = readOption(removePrefix(arg), read, options)\n\n      if (optionResult) {\n        remove()\n        Object.assign(options, optionResult)\n      }\n    }\n\n    next()\n  }\n\n  return options\n}\n"],"names":["ARGV_START_INDEX","argv","process","slice","resetArgs","splice","length","push","setArgs","args","matchArgName","argRef","arg","name","aliases","includes","findArgName","argRefs","argName","read","value","shift","Error","end","expect","alias","restAliases","option","type","String","Number","parseFloat","Array","options","prevValues","values","split","isArray","concat","isOption","test","removePrefix","replace","createOptionReader","optionReaders","optionReader","reduceRight","readNextOption","readOption","readOptions","i","optionResult","next","remove","Object","assign"],"mappings":"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"}

package/dist/index.js

@@ -101,33 +101,33 @@ const ARGV_START_INDEX = 2;
  * @returns Option reader.
  */ function option(argRef, type) {
     if (type === String) {
-        return (option1, next)=>{
+        return (option1, read)=>{
             const argName = matchArgName(argRef, option1);
             if (argName) {
                 return {
-                    [argName]: next(true)
+                    [argName]: read()
                 };
             }
             return null;
         };
     }
     if (type === Number) {
-        return (option2, next)=>{
+        return (option2, read)=>{
             const argName = matchArgName(argRef, option2);
             if (argName) {
                 return {
-                    [argName]: parseFloat(next(true))
+                    [argName]: parseFloat(read())
                 };
             }
             return null;
         };
     }
     if (type === Array) {
-        return (option3, next, options)=>{
+        return (option3, read, options)=>{
             const argName = matchArgName(argRef, option3);
             if (argName) {
                 const prevValues = options[argName];
-                const values = next(true).split(',');
+                const values = read().split(',');
                 return {
                     [argName]: Array.isArray(prevValues) ? prevValues.concat(values) : values
                 };
@@ -157,7 +157,7 @@ function createOptionReader(optionReaders) {
         if (!readNextOption) {
             return readOption;
         }
-        return (option, next, options)=>readOption(option, next, options) ?? readNextOption(option, next, options)
+        return (option, read, options)=>readOption(option, read, options) ?? readNextOption(option, read, options)
         ;
     }, null);
     return optionReader;
@@ -167,16 +167,27 @@ function createOptionReader(optionReaders) {
  * @param optionReaders
  * @returns Options with values.
  */ function readOptions(...optionReaders) {
-    if (!argv.length || !optionReaders.length) {
+    if (!argv.length) {
         return {};
     }
     const readOption = createOptionReader(optionReaders);
+    if (!readOption) {
+        return {};
+    }
     const options = {};
     let i = 0;
     let arg = argv[i];
-    const next = (required = false)=>{
+    let optionResult;
+    const next = ()=>{
         arg = argv[++i];
-        if (required && !arg) {
+    };
+    const remove = ()=>{
+        argv.splice(i--, 1);
+    };
+    const read = ()=>{
+        next();
+        remove();
+        if (!arg) {
             throw new Error('Unexpected end of arguments');
         }
         return arg;
@@ -184,7 +195,11 @@ function createOptionReader(optionReaders) {
     // eslint-disable-next-line no-unmodified-loop-condition
     while(arg){
         if (isOption(arg)) {
-            Object.assign(options, readOption === null || readOption === void 0 ? void 0 : readOption(removePrefix(arg), next, options));
+            optionResult = readOption(removePrefix(arg), read, options);
+            if (optionResult) {
+                remove();
+                Object.assign(options, optionResult);
+            }
         }
         next();
     }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/argv.ts","../src/utils.ts","../src/core.ts","../src/args.ts","../src/options.ts"],"sourcesContent":["\nconst ARGV_START_INDEX = 2\n\n/**\n * Internal state of arguments.\n */\nexport const argv = process.argv.slice(ARGV_START_INDEX)\n\n/**\n * Reset arguments state.\n */\nexport function resetArgs() {\n  argv.splice(0, argv.length)\n  argv.push(...process.argv.slice(ARGV_START_INDEX))\n}\n\n/**\n * Set arguments state.\n * @param args\n */\nexport function setArgs(...args: string[]) {\n  argv.splice(0, argv.length)\n  argv.push(...args)\n}\n","\nimport { ArgRef } from './types'\n\ntype FlatMerge<T> = T extends infer U ? { [K in keyof U]: U[K] } : never\n\nexport type Merge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? FlatMerge<NonNullable<L> & Merge<R>>\n  : unknown\n\nexport type UnionMerge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? L | Merge<R>\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  : any\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AnyFunction = (...args: any[]) => any\n\nexport type ReturnTypes<T extends readonly [...AnyFunction[]]> = T extends [infer L, ...infer R]\n  ? L extends AnyFunction\n    ? R extends AnyFunction[]\n      ? [ReturnType<L>, ...ReturnTypes<R>]\n      : []\n    : []\n  : []\n\n/**\n * Match reference with argument.\n * @param argRef\n * @param arg\n * @returns Full name or null.\n */\nexport function matchArgName<T extends string>(argRef: ArgRef<T>, arg: string) {\n  if (typeof argRef === 'string') {\n    return argRef === arg\n      ? argRef\n      : null\n  }\n\n  if (argRef.name === arg) {\n    return argRef.name\n  }\n\n  return argRef.aliases.includes(arg)\n    ? argRef.name\n    : null\n}\n\n/**\n * Find full argument name in references.\n * @param argRefs\n * @param arg\n * @returns Found argument's full name or null.\n */\nexport function findArgName<T extends string>(argRefs: [...ArgRef<T>[]], arg: string) {\n  let argRef: ArgRef<T>\n  let argName: T | null\n\n  for (argRef of argRefs) {\n    argName = matchArgName(argRef, arg)\n\n    if (argName) {\n      return argName\n    }\n  }\n\n  return null\n}\n","import { argv } from './argv'\nimport { ArgRef } from './types'\nimport { findArgName } from './utils'\n\n/**\n * Read next argument.\n * Throws error if no next argument.\n * @returns Next argument.\n */\nexport function read() {\n  const value = argv.shift()\n\n  if (!value) {\n    throw new Error('Unexpected end of arguments')\n  }\n\n  return value\n}\n\n/**\n * Expectation of the end.\n * Throws an error if there are more arguments left.\n */\nexport function end() {\n  if (argv.length) {\n    throw new Error(`Unexpected argument \"${argv[0]}\"`)\n  }\n}\n\n/**\n * Expect one of the given arguments.\n * @param argRefs\n * @returns Expected full argument name.\n */\nexport function expect<T extends string>(...argRefs: [...ArgRef<T>[]]) {\n  const arg = read()\n  const argName = findArgName(argRefs, arg)\n\n  if (!argName) {\n    throw new Error(`Unexpected argument \"${arg}\"`)\n  }\n\n  return argName\n}\n","import {\n  AliasArgRef,\n  ArgRef,\n  PrimitiveConstructor,\n  OptionsReaderState,\n  OptionsReaderNext,\n  OptionResult\n} from './types'\nimport { matchArgName } from './utils'\n\n/**\n * Describe argument with aliases.\n * @param name - Main name.\n * @param alias - Alias name.\n * @param restAliases - Rest aliases.\n * @returns Description of argument with aliases..\n */\nexport function alias<T extends string>(name: T, alias: string, ...restAliases: string[]): AliasArgRef<T> {\n  return {\n    name,\n    aliases: [alias, ...restAliases]\n  }\n}\n\n/**\n * Describe option with value.\n * @param argRef - Option name.\n * @param type - Value type.\n * @returns Option reader.\n */\nexport function option<T extends string, K extends PrimitiveConstructor>(argRef: ArgRef<T>, type: K) {\n  if (type === String) {\n    return (option: string, next: OptionsReaderNext) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: next(true)\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Number) {\n    return (option: string, next: OptionsReaderNext) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: parseFloat(next(true))\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Array) {\n    return (option: string, next: OptionsReaderNext, options: OptionsReaderState) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        const prevValues = options[argName]\n        const values = next(true).split(',')\n\n        return {\n          [argName]: Array.isArray(prevValues)\n            ? prevValues.concat(values)\n            : values\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  return (option: string) => {\n    const argName = matchArgName(argRef, option)\n\n    if (argName) {\n      return {\n        [argName]: true\n      } as OptionResult<T, K>\n    }\n\n    return null\n  }\n}\n","import { argv } from './argv'\nimport { OptionReader } from './types'\nimport { Merge, ReturnTypes, UnionMerge } from './utils'\n\nfunction isOption(arg: string) {\n  return /^--?[^-].*/.test(arg)\n}\n\nfunction removePrefix(arg: string) {\n  return arg.replace(/^--?/, '')\n}\n\nfunction createOptionReader<T extends OptionReader[]>(optionReaders: [...T]) {\n  const optionReader = optionReaders.reduceRight<OptionReader | null>(\n    (readNextOption, readOption) => {\n      if (!readNextOption) {\n        return readOption\n      }\n\n      return (option, next, options) => readOption(option, next, options) ?? readNextOption(option, next, options)\n    },\n    null\n  )\n\n  return optionReader as OptionReader<UnionMerge<ReturnTypes<T>>> | null\n}\n\n/**\n * Read options from arguments.\n * @param optionReaders\n * @returns Options with values.\n */\nexport function readOptions<T extends OptionReader[]>(...optionReaders: [...T]): Partial<Merge<ReturnTypes<T>>> {\n  if (!argv.length || !optionReaders.length) {\n    return {}\n  }\n\n  const readOption = createOptionReader(optionReaders)\n  const options = {}\n  let i = 0\n  let arg = argv[i]\n  const next = (required = false) => {\n    arg = argv[++i]\n\n    if (required && !arg) {\n      throw new Error('Unexpected end of arguments')\n    }\n\n    return arg\n  }\n\n  // eslint-disable-next-line no-unmodified-loop-condition\n  while (arg) {\n    if (isOption(arg)) {\n      Object.assign(options, readOption?.(removePrefix(arg), next, options))\n    }\n\n    next()\n  }\n\n  return options\n}\n"],"names":["ARGV_START_INDEX","argv","process","slice","resetArgs","splice","length","push","setArgs","args","matchArgName","argRef","arg","name","aliases","includes","findArgName","argRefs","argName","read","value","shift","Error","end","expect","alias","restAliases","option","type","String","next","Number","parseFloat","Array","options","prevValues","values","split","isArray","concat","isOption","test","removePrefix","replace","createOptionReader","optionReaders","optionReader","reduceRight","readNextOption","readOption","readOptions","i","required","Object","assign"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../src/argv.ts","../src/utils.ts","../src/core.ts","../src/args.ts","../src/options.ts"],"sourcesContent":["\nconst ARGV_START_INDEX = 2\n\n/**\n * Internal state of arguments.\n */\nexport const argv = process.argv.slice(ARGV_START_INDEX)\n\n/**\n * Reset arguments state.\n */\nexport function resetArgs() {\n  argv.splice(0, argv.length)\n  argv.push(...process.argv.slice(ARGV_START_INDEX))\n}\n\n/**\n * Set arguments state.\n * @param args\n */\nexport function setArgs(...args: string[]) {\n  argv.splice(0, argv.length)\n  argv.push(...args)\n}\n","\nimport { ArgRef } from './types'\n\ntype FlatMerge<T> = T extends infer U ? { [K in keyof U]: U[K] } : never\n\nexport type Merge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? FlatMerge<NonNullable<L> & Merge<R>>\n  : unknown\n\nexport type UnionMerge<T extends readonly [...unknown[]]> = T extends [infer L, ...infer R]\n  ? L | Merge<R>\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  : any\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AnyFunction = (...args: any[]) => any\n\nexport type ReturnTypes<T extends readonly [...AnyFunction[]]> = T extends [infer L, ...infer R]\n  ? L extends AnyFunction\n    ? R extends AnyFunction[]\n      ? [ReturnType<L>, ...ReturnTypes<R>]\n      : []\n    : []\n  : []\n\n/**\n * Match reference with argument.\n * @param argRef\n * @param arg\n * @returns Full name or null.\n */\nexport function matchArgName<T extends string>(argRef: ArgRef<T>, arg: string) {\n  if (typeof argRef === 'string') {\n    return argRef === arg\n      ? argRef\n      : null\n  }\n\n  if (argRef.name === arg) {\n    return argRef.name\n  }\n\n  return argRef.aliases.includes(arg)\n    ? argRef.name\n    : null\n}\n\n/**\n * Find full argument name in references.\n * @param argRefs\n * @param arg\n * @returns Found argument's full name or null.\n */\nexport function findArgName<T extends string>(argRefs: [...ArgRef<T>[]], arg: string) {\n  let argRef: ArgRef<T>\n  let argName: T | null\n\n  for (argRef of argRefs) {\n    argName = matchArgName(argRef, arg)\n\n    if (argName) {\n      return argName\n    }\n  }\n\n  return null\n}\n","import { argv } from './argv'\nimport { ArgRef } from './types'\nimport { findArgName } from './utils'\n\n/**\n * Read next argument.\n * Throws error if no next argument.\n * @returns Next argument.\n */\nexport function read() {\n  const value = argv.shift()\n\n  if (!value) {\n    throw new Error('Unexpected end of arguments')\n  }\n\n  return value\n}\n\n/**\n * Expectation of the end.\n * Throws an error if there are more arguments left.\n */\nexport function end() {\n  if (argv.length) {\n    throw new Error(`Unexpected argument \"${argv[0]}\"`)\n  }\n}\n\n/**\n * Expect one of the given arguments.\n * @param argRefs\n * @returns Expected full argument name.\n */\nexport function expect<T extends string>(...argRefs: [...ArgRef<T>[]]) {\n  const arg = read()\n  const argName = findArgName(argRefs, arg)\n\n  if (!argName) {\n    throw new Error(`Unexpected argument \"${arg}\"`)\n  }\n\n  return argName\n}\n","import {\n  AliasArgRef,\n  ArgRef,\n  PrimitiveConstructor,\n  OptionsReaderState,\n  OptionsReaderRead,\n  OptionResult\n} from './types'\nimport { matchArgName } from './utils'\n\n/**\n * Describe argument with aliases.\n * @param name - Main name.\n * @param alias - Alias name.\n * @param restAliases - Rest aliases.\n * @returns Description of argument with aliases..\n */\nexport function alias<T extends string>(name: T, alias: string, ...restAliases: string[]): AliasArgRef<T> {\n  return {\n    name,\n    aliases: [alias, ...restAliases]\n  }\n}\n\n/**\n * Describe option with value.\n * @param argRef - Option name.\n * @param type - Value type.\n * @returns Option reader.\n */\nexport function option<T extends string, K extends PrimitiveConstructor>(argRef: ArgRef<T>, type: K) {\n  if (type === String) {\n    return (option: string, read: OptionsReaderRead) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: read()\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Number) {\n    return (option: string, read: OptionsReaderRead) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        return {\n          [argName]: parseFloat(read())\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  if (type === Array) {\n    return (option: string, read: OptionsReaderRead, options: OptionsReaderState) => {\n      const argName = matchArgName(argRef, option)\n\n      if (argName) {\n        const prevValues = options[argName]\n        const values = read().split(',')\n\n        return {\n          [argName]: Array.isArray(prevValues)\n            ? prevValues.concat(values)\n            : values\n        } as OptionResult<T, K>\n      }\n\n      return null\n    }\n  }\n\n  return (option: string) => {\n    const argName = matchArgName(argRef, option)\n\n    if (argName) {\n      return {\n        [argName]: true\n      } as OptionResult<T, K>\n    }\n\n    return null\n  }\n}\n","import { argv } from './argv'\nimport { OptionReader, OptionResult } from './types'\nimport { Merge, ReturnTypes, UnionMerge } from './utils'\n\nfunction isOption(arg: string) {\n  return /^--?[^-].*/.test(arg)\n}\n\nfunction removePrefix(arg: string) {\n  return arg.replace(/^--?/, '')\n}\n\nfunction createOptionReader<T extends OptionReader[]>(optionReaders: [...T]) {\n  const optionReader = optionReaders.reduceRight<OptionReader | null>(\n    (readNextOption, readOption) => {\n      if (!readNextOption) {\n        return readOption\n      }\n\n      return (option, read, options) => readOption(option, read, options) ?? readNextOption(option, read, options)\n    },\n    null\n  )\n\n  return optionReader as OptionReader<UnionMerge<ReturnTypes<T>>> | null\n}\n\n/**\n * Read options from arguments.\n * @param optionReaders\n * @returns Options with values.\n */\nexport function readOptions<T extends OptionReader[]>(...optionReaders: [...T]): Partial<Merge<ReturnTypes<T>>> {\n  if (!argv.length) {\n    return {}\n  }\n\n  const readOption = createOptionReader(optionReaders)\n\n  if (!readOption) {\n    return {}\n  }\n\n  const options = {}\n  let i = 0\n  let arg = argv[i]\n  let optionResult: OptionResult | null\n  const next = () => {\n    arg = argv[++i]\n  }\n  const remove = () => {\n    argv.splice(i--, 1)\n  }\n  const read = () => {\n    next()\n    remove()\n\n    if (!arg) {\n      throw new Error('Unexpected end of arguments')\n    }\n\n    return arg\n  }\n\n  // eslint-disable-next-line no-unmodified-loop-condition\n  while (arg) {\n    if (isOption(arg)) {\n      optionResult = readOption(removePrefix(arg), read, options)\n\n      if (optionResult) {\n        remove()\n        Object.assign(options, optionResult)\n      }\n    }\n\n    next()\n  }\n\n  return options\n}\n"],"names":["ARGV_START_INDEX","argv","process","slice","resetArgs","splice","length","push","setArgs","args","matchArgName","argRef","arg","name","aliases","includes","findArgName","argRefs","argName","read","value","shift","Error","end","expect","alias","restAliases","option","type","String","Number","parseFloat","Array","options","prevValues","values","split","isArray","concat","isOption","test","removePrefix","replace","createOptionReader","optionReaders","optionReader","reduceRight","readNextOption","readOption","readOptions","i","optionResult","next","remove","Object","assign"],"mappings":"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"}

package/dist/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAc,MAAM,SAAS,CAAA;AAyBxD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAAE,EAAE,GAAG,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CA6B9G"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAgB,MAAM,SAAS,CAAA;AACpD,OAAO,EAAE,KAAK,EAAE,WAAW,EAAc,MAAM,SAAS,CAAA;AAyBxD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAAE,EAAE,GAAG,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CA+C9G"}

package/dist/types.d.ts

@@ -6,9 +6,9 @@ export interface AliasArgRef<T extends string> {
 export declare type ArgRef<T extends string> = SimpleArgRef<T> | AliasArgRef<T>;
 export declare type ArgRefName<T extends ArgRef<string>> = T extends AliasArgRef<string> ? T['name'] : T;
 export declare type OptionsReaderState = Record<string, unknown>;
-export declare type OptionsReaderNext = <T extends boolean>(required?: T) => (T extends true ? string : string | undefined);
+export declare type OptionsReaderRead = () => string;
 export declare type PrimitiveConstructor = StringConstructor | NumberConstructor | ArrayConstructor | BooleanConstructor;
 export declare type OptionValueType<T extends PrimitiveConstructor> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends ArrayConstructor ? string[] : boolean;
-export declare type OptionResult<T extends string, K extends PrimitiveConstructor> = Record<T, OptionValueType<K>>;
-export declare type OptionReader<T extends OptionResult<string, PrimitiveConstructor> = OptionResult<string, PrimitiveConstructor>> = (option: string, next: OptionsReaderNext, options: OptionsReaderState) => T | null;
+export declare type OptionResult<T extends string = string, K extends PrimitiveConstructor = PrimitiveConstructor> = Record<T, OptionValueType<K>>;
+export declare type OptionReader<T extends OptionResult = OptionResult> = (option: string, read: OptionsReaderRead, options: OptionsReaderState) => T | null;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAA;AAE9C,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,MAAM;IAC3C,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;AAEvE,oBAAY,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,IAC7C,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,GACzB,CAAC,CAAC,MAAM,CAAC,GACT,CAAC,CAAA;AAEP,oBAAY,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAExD,oBAAY,iBAAiB,GAC3B,CAAC,CAAC,SAAS,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,CACnC,CAAC,SAAS,IAAI,GACV,MAAM,GACN,MAAM,GAAG,SAAS,CACvB,CAAA;AAEH,oBAAY,oBAAoB,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,kBAAkB,CAAA;AAEhH,oBAAY,eAAe,CAAC,CAAC,SAAS,oBAAoB,IACxD,CAAC,SAAS,iBAAiB,GACvB,MAAM,GACN,CAAC,SAAS,iBAAiB,GACzB,MAAM,GACN,CAAC,SAAS,gBAAgB,GACxB,MAAM,EAAE,GACR,OAAO,CAAA;AAEjB,oBAAY,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,oBAAoB,IAAI,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;AAE1G,oBAAY,YAAY,CAAC,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,oBAAoB,CAAC,IACxH,CACE,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,kBAAkB,KACxB,CAAC,GAAG,IAAI,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAA;AAE9C,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,MAAM;IAC3C,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;AAEvE,oBAAY,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,IAC7C,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,GACzB,CAAC,CAAC,MAAM,CAAC,GACT,CAAC,CAAA;AAEP,oBAAY,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAExD,oBAAY,iBAAiB,GAAG,MAAM,MAAM,CAAA;AAE5C,oBAAY,oBAAoB,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,kBAAkB,CAAA;AAEhH,oBAAY,eAAe,CAAC,CAAC,SAAS,oBAAoB,IACxD,CAAC,SAAS,iBAAiB,GACvB,MAAM,GACN,CAAC,SAAS,iBAAiB,GACzB,MAAM,GACN,CAAC,SAAS,gBAAgB,GACxB,MAAM,EAAE,GACR,OAAO,CAAA;AAEjB,oBAAY,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,IAAI,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;AAE1I,oBAAY,YAAY,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,IAC5D,CACE,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,kBAAkB,KACxB,CAAC,GAAG,IAAI,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "argue-cli",
   "type": "module",
-  "version": "2.0.0-1",
+  "version": "2.0.0-2",
   "description": "A thin and strongly typed CLI argument parser for Node.js.",
   "author": "dangreen",
   "license": "MIT",