args-tokens 0.4.1 → 0.6.0

package/README.md

@@ -8,7 +8,7 @@
 
 ## 🐱 Motivation
 
-- Although Node.js's [`parseArgs`](https://nodejs.org/api/util.html#utilparseargsconfig) can return tokens, tokens that the short options are not in the format I expect. Of course, I recoginize the background of [this issue](https://github.com/pkgjs/parseargs/issues/78).
+- Although Node.js [`parseArgs`](https://nodejs.org/api/util.html#utilparseargsconfig) can return tokens, that the short options are not in the format I expect. Of course, I recoginize the background of [this issue](https://github.com/pkgjs/parseargs/issues/78).
 - `parseArgs` gives the command line args parser a useful util, so the resolution of the options values and the parsing of the tokens are tightly coupled. As a result, Performance is sacrificed. Of course, I recoginize that's the trade-off.
 
 ## ⏱️ Benchmark
@@ -167,7 +167,7 @@ const tokens = parseArgs(['--foo', 'bar', '-x', '--bar=baz'])
 console.log('tokens:', tokens)
 ```
 
-## Resolve args value with tokens and arg option schema
+## Resolve args values with tokens and arg option schema
 
 `resolveArgs` is a useful function when you want to resolve values from the tokens obtained by `parseArgs`.
 
@@ -281,7 +281,7 @@ If you are interested in contributing to `args-tokens`, I highly recommend check
 
 This project is inspired by:
 
-- [`utils.parseArgs`](https://nodejs.org/api/util.html#utilparseargsconfig), created by Node.js contributors and [OpenJS Foundation](https://openjsf.org/)
+- [`util.parseArgs`](https://nodejs.org/api/util.html#utilparseargsconfig), created by Node.js contributors and [OpenJS Foundation](https://openjsf.org/)
 - [`pkgjs/parseargs`](https://github.com/pkgjs/parseargs), created by Node.js CLI package maintainers and Node.js community.
 
 ## ©️ License

package/lib/cjs/index.d.ts

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

package/lib/cjs/index.js

@@ -1,4 +1,6 @@
 "use strict";
+// SPDX-License-Identifier: MIT
+// Modifier: kazuya kawaguchi (a.k.a. kazupon)
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveArgs = exports.parseArgs = exports.parse = void 0;
 var parse_js_1 = require("./parse.js");

package/lib/cjs/parse.js

@@ -1,4 +1,6 @@
 "use strict";
+// SPDX-License-Identifier: MIT
+// Modifier: kazuya kawaguchi (a.k.a. kazupon)
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = parse;
 const parser_js_1 = require("./parser.js");

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

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

package/lib/esm/index.js

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+// Modifier: kazuya kawaguchi (a.k.a. kazupon)
 export { parse } from './parse.js';
 export { parseArgs } from './parser.js';
 export { resolveArgs } from './resolver.js';

package/lib/esm/parse.js

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+// Modifier: kazuya kawaguchi (a.k.a. kazupon)
 import { parseArgs } from './parser.js';
 import { resolveArgs } from './resolver.js';
 const DEFAULT_OPTIONS = {

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.1",
+  "version": "0.6.0",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -70,10 +70,10 @@
     "@eslint/markdown": "^6.2.2",
     "@kazupon/eslint-config": "^0.19.0",
     "@kazupon/prettier-config": "^0.1.1",
-    "@types/node": "^22.13.1",
-    "@vitest/eslint-plugin": "^1.1.28",
-    "bumpp": "^10.0.2",
-    "eslint": "^9.20.0",
+    "@types/node": "^22.13.4",
+    "@vitest/eslint-plugin": "^1.1.31",
+    "bumpp": "^10.0.3",
+    "eslint": "^9.20.1",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-jsonc": "^2.19.1",
     "eslint-plugin-promise": "^7.2.1",
@@ -82,11 +82,11 @@
     "eslint-plugin-yml": "^1.16.0",
     "gh-changelogen": "^0.2.8",
     "jsr": "^0.13.3",
-    "knip": "^5.44.0",
+    "knip": "^5.44.1",
     "lint-staged": "^15.4.3",
     "mitata": "^1.0.34",
     "pkg-pr-new": "^0.0.39",
-    "prettier": "^3.5.0",
+    "prettier": "^3.5.1",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.24.0",
     "vitest": "^3.0.5"

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();
-});