args-tokens 0.4.0 → 0.5.0

package/lib/cjs/index.d.ts

@@ -1,6 +1,6 @@
-export * from './parse.js';
+export { parse } from './parse.js';
 export { parseArgs } from './parser.js';
 export { resolveArgs } from './resolver.js';
-export type * from './parse';
+export type { ParsedArgs, ParseOptions } from './parse';
 export type { ArgToken, ParserOptions } from './parser';
 export type { ArgOptionSchema } from './resolver';

package/lib/cjs/index.js

@@ -1,21 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveArgs = exports.parseArgs = void 0;
-__exportStar(require("./parse.js"), exports);
+exports.resolveArgs = exports.parseArgs = exports.parse = void 0;
+var parse_js_1 = require("./parse.js");
+Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return parse_js_1.parse; } });
 var parser_js_1 = require("./parser.js");
 Object.defineProperty(exports, "parseArgs", { enumerable: true, get: function () { return parser_js_1.parseArgs; } });
 var resolver_js_1 = require("./resolver.js");

package/lib/cjs/parse.d.ts

@@ -3,7 +3,7 @@ import type { ArgOptions, ArgValues } from './resolver';
 /**
  * Parse options for {@link parse} function
  */
-interface ParseOptions<O extends ArgOptions> extends ParserOptions {
+export interface ParseOptions<O extends ArgOptions> extends ParserOptions {
     /**
      * Command line options, about details see {@link ArgOptions}
      */
@@ -12,7 +12,7 @@ interface ParseOptions<O extends ArgOptions> extends ParserOptions {
 /**
  * Parsed command line arguments
  */
-type ParsedArgs<T extends ArgOptions> = {
+export type ParsedArgs<T extends ArgOptions> = {
     /**
      * Parsed values, same as `values` in {@link resolveArgs}
      */
@@ -38,4 +38,3 @@ type ParsedArgs<T extends ArgOptions> = {
  * @returns parsed values
  */
 export declare function parse<O extends ArgOptions>(args: string[], options?: ParseOptions<O>): ParsedArgs<O>;
-export {};

package/lib/cjs/resolver.js

@@ -9,9 +9,10 @@ function resolveArgs(options, tokens) {
     const positionals = [];
     const longOptionTokens = [];
     const shortOptionTokens = [];
+    let currentLongOption;
     let currentShortOption;
     const expandableShortOptions = [];
-    function toValue() {
+    function toShortValue() {
         if (expandableShortOptions.length === 0) {
             return undefined;
         }
@@ -21,28 +22,44 @@ function resolveArgs(options, tokens) {
             return value;
         }
     }
-    function applyShortOptionValue() {
+    function applyLongOptionValue(value = undefined) {
+        if (currentLongOption) {
+            currentLongOption.value = value;
+            longOptionTokens.push({ ...currentLongOption });
+            currentLongOption = undefined;
+        }
+    }
+    function applyShortOptionValue(value = undefined) {
         if (currentShortOption) {
-            currentShortOption.value = toValue();
+            currentShortOption.value = value || toShortValue();
             shortOptionTokens.push({ ...currentShortOption });
             currentShortOption = undefined;
         }
     }
     /**
-     * separate tokens into positionals, long options, and short options, after that resolve values
+     * analyze phase to resolve value
+     * separate tokens into positionals, long and short options, after that resolve values
      */
     // eslint-disable-next-line unicorn/no-for-loop
     for (let i = 0; i < tokens.length; i++) {
         const token = tokens[i];
         if (token.kind === 'positional') {
             positionals.push(token.value);
-            applyShortOptionValue(); // check if previous short option is not resolved
+            // check if previous option is not resolved
+            applyLongOptionValue(token.value);
+            applyShortOptionValue(token.value);
         }
         else if (token.kind === 'option') {
             if (token.rawName) {
                 if ((0, parser_js_1.hasLongOptionPrefix)(token.rawName)) {
-                    longOptionTokens.push({ ...token });
-                    applyShortOptionValue(); // check if previous short option is not resolved
+                    if (token.inlineValue) {
+                        longOptionTokens.push({ ...token });
+                    }
+                    else {
+                        currentLongOption = { ...token };
+                    }
+                    // check if previous short option is not resolved
+                    applyShortOptionValue();
                 }
                 else if ((0, parser_js_1.isShortOption)(token.rawName)) {
                     if (currentShortOption) {
@@ -50,13 +67,17 @@ function resolveArgs(options, tokens) {
                             expandableShortOptions.push({ ...token });
                         }
                         else {
-                            currentShortOption.value = toValue();
+                            currentShortOption.value = toShortValue();
                             shortOptionTokens.push({ ...currentShortOption });
                             currentShortOption = { ...token };
                         }
+                        // check if previous long option is not resolved
+                        applyLongOptionValue();
                     }
                     else {
                         currentShortOption = { ...token };
+                        // check if previous long option is not resolved
+                        applyLongOptionValue();
                     }
                 }
             }
@@ -67,15 +88,20 @@ function resolveArgs(options, tokens) {
                     shortOptionTokens.push({ ...currentShortOption });
                     currentShortOption = undefined;
                 }
+                // check if previous long option is not resolved
+                applyLongOptionValue();
             }
         }
         else {
-            applyShortOptionValue(); // check if previous short option is not resolved
+            // check if previous option is not resolved
+            applyLongOptionValue();
+            applyShortOptionValue();
         }
     }
     /**
-     * check if the last short option is not resolved
+     * check if the last long or short option is not resolved
      */
+    applyLongOptionValue();
     applyShortOptionValue();
     /**
      * resolve values
@@ -90,7 +116,11 @@ function resolveArgs(options, tokens) {
             // eslint-disable-next-line unicorn/no-null
             if (option === token.name && token.rawName != null && (0, parser_js_1.hasLongOptionPrefix)(token.rawName)) {
                 validateRequire(token, option, schema);
-                if (schema.type !== 'boolean') {
+                if (schema.type === 'boolean') {
+                    // NOTE: re-set value to undefined, because long boolean type option is set on analyze phase
+                    token.value = undefined;
+                }
+                else {
                     validateValue(token, option, schema);
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
@@ -105,7 +135,11 @@ function resolveArgs(options, tokens) {
             // eslint-disable-next-line unicorn/no-null
             if (schema.short === token.name && token.rawName != null && (0, parser_js_1.isShortOption)(token.rawName)) {
                 validateRequire(token, option, schema);
-                if (schema.type !== 'boolean') {
+                if (schema.type === 'boolean') {
+                    // NOTE: re-set value to undefined, because short boolean type option is set on analyze phase
+                    token.value = undefined;
+                }
+                else {
                     validateValue(token, option, schema);
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access

package/lib/esm/index.d.ts

@@ -1,6 +1,6 @@
-export * from './parse.js';
+export { parse } from './parse.js';
 export { parseArgs } from './parser.js';
 export { resolveArgs } from './resolver.js';
-export type * from './parse';
+export type { ParsedArgs, ParseOptions } from './parse';
 export type { ArgToken, ParserOptions } from './parser';
 export type { ArgOptionSchema } from './resolver';

package/lib/esm/index.js

@@ -1,3 +1,3 @@
-export * from './parse.js';
+export { parse } from './parse.js';
 export { parseArgs } from './parser.js';
 export { resolveArgs } from './resolver.js';

package/lib/esm/parse.d.ts

@@ -3,7 +3,7 @@ import type { ArgOptions, ArgValues } from './resolver';
 /**
  * Parse options for {@link parse} function
  */
-interface ParseOptions<O extends ArgOptions> extends ParserOptions {
+export interface ParseOptions<O extends ArgOptions> extends ParserOptions {
     /**
      * Command line options, about details see {@link ArgOptions}
      */
@@ -12,7 +12,7 @@ interface ParseOptions<O extends ArgOptions> extends ParserOptions {
 /**
  * Parsed command line arguments
  */
-type ParsedArgs<T extends ArgOptions> = {
+export type ParsedArgs<T extends ArgOptions> = {
     /**
      * Parsed values, same as `values` in {@link resolveArgs}
      */
@@ -38,4 +38,3 @@ type ParsedArgs<T extends ArgOptions> = {
  * @returns parsed values
  */
 export declare function parse<O extends ArgOptions>(args: string[], options?: ParseOptions<O>): ParsedArgs<O>;
-export {};

package/lib/esm/resolver.js

@@ -6,9 +6,10 @@ export function resolveArgs(options, tokens) {
     const positionals = [];
     const longOptionTokens = [];
     const shortOptionTokens = [];
+    let currentLongOption;
     let currentShortOption;
     const expandableShortOptions = [];
-    function toValue() {
+    function toShortValue() {
         if (expandableShortOptions.length === 0) {
             return undefined;
         }
@@ -18,28 +19,44 @@ export function resolveArgs(options, tokens) {
             return value;
         }
     }
-    function applyShortOptionValue() {
+    function applyLongOptionValue(value = undefined) {
+        if (currentLongOption) {
+            currentLongOption.value = value;
+            longOptionTokens.push({ ...currentLongOption });
+            currentLongOption = undefined;
+        }
+    }
+    function applyShortOptionValue(value = undefined) {
         if (currentShortOption) {
-            currentShortOption.value = toValue();
+            currentShortOption.value = value || toShortValue();
             shortOptionTokens.push({ ...currentShortOption });
             currentShortOption = undefined;
         }
     }
     /**
-     * separate tokens into positionals, long options, and short options, after that resolve values
+     * analyze phase to resolve value
+     * separate tokens into positionals, long and short options, after that resolve values
      */
     // eslint-disable-next-line unicorn/no-for-loop
     for (let i = 0; i < tokens.length; i++) {
         const token = tokens[i];
         if (token.kind === 'positional') {
             positionals.push(token.value);
-            applyShortOptionValue(); // check if previous short option is not resolved
+            // check if previous option is not resolved
+            applyLongOptionValue(token.value);
+            applyShortOptionValue(token.value);
         }
         else if (token.kind === 'option') {
             if (token.rawName) {
                 if (hasLongOptionPrefix(token.rawName)) {
-                    longOptionTokens.push({ ...token });
-                    applyShortOptionValue(); // check if previous short option is not resolved
+                    if (token.inlineValue) {
+                        longOptionTokens.push({ ...token });
+                    }
+                    else {
+                        currentLongOption = { ...token };
+                    }
+                    // check if previous short option is not resolved
+                    applyShortOptionValue();
                 }
                 else if (isShortOption(token.rawName)) {
                     if (currentShortOption) {
@@ -47,13 +64,17 @@ export function resolveArgs(options, tokens) {
                             expandableShortOptions.push({ ...token });
                         }
                         else {
-                            currentShortOption.value = toValue();
+                            currentShortOption.value = toShortValue();
                             shortOptionTokens.push({ ...currentShortOption });
                             currentShortOption = { ...token };
                         }
+                        // check if previous long option is not resolved
+                        applyLongOptionValue();
                     }
                     else {
                         currentShortOption = { ...token };
+                        // check if previous long option is not resolved
+                        applyLongOptionValue();
                     }
                 }
             }
@@ -64,15 +85,20 @@ export function resolveArgs(options, tokens) {
                     shortOptionTokens.push({ ...currentShortOption });
                     currentShortOption = undefined;
                 }
+                // check if previous long option is not resolved
+                applyLongOptionValue();
             }
         }
         else {
-            applyShortOptionValue(); // check if previous short option is not resolved
+            // check if previous option is not resolved
+            applyLongOptionValue();
+            applyShortOptionValue();
         }
     }
     /**
-     * check if the last short option is not resolved
+     * check if the last long or short option is not resolved
      */
+    applyLongOptionValue();
     applyShortOptionValue();
     /**
      * resolve values
@@ -87,7 +113,11 @@ export function resolveArgs(options, tokens) {
             // eslint-disable-next-line unicorn/no-null
             if (option === token.name && token.rawName != null && hasLongOptionPrefix(token.rawName)) {
                 validateRequire(token, option, schema);
-                if (schema.type !== 'boolean') {
+                if (schema.type === 'boolean') {
+                    // NOTE: re-set value to undefined, because long boolean type option is set on analyze phase
+                    token.value = undefined;
+                }
+                else {
                     validateValue(token, option, schema);
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
@@ -102,7 +132,11 @@ export function resolveArgs(options, tokens) {
             // eslint-disable-next-line unicorn/no-null
             if (schema.short === token.name && token.rawName != null && isShortOption(token.rawName)) {
                 validateRequire(token, option, schema);
-                if (schema.type !== 'boolean') {
+                if (schema.type === 'boolean') {
+                    // NOTE: re-set value to undefined, because short boolean type option is set on analyze phase
+                    token.value = undefined;
+                }
+                else {
                     validateValue(token, option, schema);
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "args-tokens",
   "description": "parseArgs tokens compatibility and more high-performance parser",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"

package/lib/cjs/resolver.test-d.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/cjs/resolver.test-d.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const vitest_1 = require("vitest");
-(0, vitest_1.test)('ArgValues', () => {
-    (0, vitest_1.expectTypeOf)().toEqualTypeOf();
-});

package/lib/esm/resolver.test-d.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/esm/resolver.test-d.js

@@ -1,4 +0,0 @@
-import { expectTypeOf, test } from 'vitest';
-test('ArgValues', () => {
-    expectTypeOf().toEqualTypeOf();
-});