@optique/core 0.7.13 → 0.7.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/facade.cjs CHANGED
@@ -285,9 +285,26 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
285
285
  completion: require_primitives.constant(false),
286
286
  result: originalParser
287
287
  }));
288
+ const mainParserIndex = parsers.length - 1;
289
+ let combined;
288
290
  if (parsers.length === 1) return parsers[0];
289
- else if (parsers.length === 2) return require_constructs.longestMatch(parsers[0], parsers[1]);
290
- else return require_constructs.longestMatch(...parsers);
291
+ else if (parsers.length === 2) combined = require_constructs.longestMatch(parsers[0], parsers[1]);
292
+ else combined = require_constructs.longestMatch(...parsers);
293
+ const topUsage = combined.usage[0];
294
+ if (topUsage?.type === "exclusive" && mainParserIndex > 0) {
295
+ const terms = [...topUsage.terms];
296
+ const [mainTerm] = terms.splice(mainParserIndex, 1);
297
+ const lenientCount = (helpParsers.helpOption ? 1 : 0) + (versionParsers.versionOption ? 1 : 0);
298
+ terms.splice(lenientCount, 0, mainTerm);
299
+ combined = {
300
+ ...combined,
301
+ usage: [{
302
+ ...topUsage,
303
+ terms
304
+ }]
305
+ };
306
+ }
307
+ return combined;
291
308
  }
292
309
  /**
293
310
  * Classifies the parsing result into a discriminated union for cleaner handling.
package/dist/facade.js CHANGED
@@ -285,9 +285,26 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers, com
285
285
  completion: constant(false),
286
286
  result: originalParser
287
287
  }));
288
+ const mainParserIndex = parsers.length - 1;
289
+ let combined;
288
290
  if (parsers.length === 1) return parsers[0];
289
- else if (parsers.length === 2) return longestMatch(parsers[0], parsers[1]);
290
- else return longestMatch(...parsers);
291
+ else if (parsers.length === 2) combined = longestMatch(parsers[0], parsers[1]);
292
+ else combined = longestMatch(...parsers);
293
+ const topUsage = combined.usage[0];
294
+ if (topUsage?.type === "exclusive" && mainParserIndex > 0) {
295
+ const terms = [...topUsage.terms];
296
+ const [mainTerm] = terms.splice(mainParserIndex, 1);
297
+ const lenientCount = (helpParsers.helpOption ? 1 : 0) + (versionParsers.versionOption ? 1 : 0);
298
+ terms.splice(lenientCount, 0, mainTerm);
299
+ combined = {
300
+ ...combined,
301
+ usage: [{
302
+ ...topUsage,
303
+ terms
304
+ }]
305
+ };
306
+ }
307
+ return combined;
291
308
  }
292
309
  /**
293
310
  * Classifies the parsing result into a discriminated union for cleaner handling.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optique/core",
3
- "version": "0.7.13",
3
+ "version": "0.7.14",
4
4
  "description": "Type-safe combinatorial command-line interface parser",
5
5
  "keywords": [
6
6
  "CLI",