@optique/core 0.10.0-dev.376 → 0.10.0-dev.378

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.
Files changed (5) hide show
  1. package/dist/dependency.cjs +33 -9
  2. package/dist/dependency.js +33 -9
  3. package/dist/facade.cjs +5 -5
  4. package/dist/facade.js +5 -5
  5. package/package.json +1 -1
package/dist/dependency.cjs CHANGED
@@ -241,8 +241,12 @@ function createSyncDerivedFromParser(sourceId, options) {
241
241
  try {
242
242
  derivedParser = options.factory(...dependencyValue);
243
243
  } catch {
244
- const sourceValues = options.defaultValues();
245
- derivedParser = options.factory(...sourceValues);
244
+ try {
245
+ const sourceValues = options.defaultValues();
246
+ derivedParser = options.factory(...sourceValues);
247
+ } catch {
248
+ return;
249
+ }
246
250
  }
247
251
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
248
252
  }
@@ -294,8 +298,12 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
294
298
  try {
295
299
  derivedParser = options.factory(...dependencyValue);
296
300
  } catch {
297
- const sourceValues = options.defaultValues();
298
- derivedParser = options.factory(...sourceValues);
301
+ try {
302
+ const sourceValues = options.defaultValues();
303
+ derivedParser = options.factory(...sourceValues);
304
+ } catch {
305
+ return;
306
+ }
299
307
  }
300
308
  if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
301
309
  }
@@ -347,8 +355,12 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
347
355
  try {
348
356
  derivedParser = options.factory(...dependencyValue);
349
357
  } catch {
350
- const sourceValues = options.defaultValues();
351
- derivedParser = options.factory(...sourceValues);
358
+ try {
359
+ const sourceValues = options.defaultValues();
360
+ derivedParser = options.factory(...sourceValues);
361
+ } catch {
362
+ return;
363
+ }
352
364
  }
353
365
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
354
366
  }
@@ -411,7 +423,11 @@ function createSyncDerivedParser(sourceId, options) {
411
423
  try {
412
424
  derivedParser = options.factory(dependencyValue);
413
425
  } catch {
414
- derivedParser = options.factory(options.defaultValue());
426
+ try {
427
+ derivedParser = options.factory(options.defaultValue());
428
+ } catch {
429
+ return;
430
+ }
415
431
  }
416
432
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
417
433
  }
@@ -460,7 +476,11 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
460
476
  try {
461
477
  derivedParser = options.factory(dependencyValue);
462
478
  } catch {
463
- derivedParser = options.factory(options.defaultValue());
479
+ try {
480
+ derivedParser = options.factory(options.defaultValue());
481
+ } catch {
482
+ return;
483
+ }
464
484
  }
465
485
  if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
466
486
  }
@@ -509,7 +529,11 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
509
529
  try {
510
530
  derivedParser = options.factory(dependencyValue);
511
531
  } catch {
512
- derivedParser = options.factory(options.defaultValue());
532
+ try {
533
+ derivedParser = options.factory(options.defaultValue());
534
+ } catch {
535
+ return;
536
+ }
513
537
  }
514
538
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
515
539
  }
package/dist/dependency.js CHANGED
@@ -241,8 +241,12 @@ function createSyncDerivedFromParser(sourceId, options) {
241
241
  try {
242
242
  derivedParser = options.factory(...dependencyValue);
243
243
  } catch {
244
- const sourceValues = options.defaultValues();
245
- derivedParser = options.factory(...sourceValues);
244
+ try {
245
+ const sourceValues = options.defaultValues();
246
+ derivedParser = options.factory(...sourceValues);
247
+ } catch {
248
+ return;
249
+ }
246
250
  }
247
251
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
248
252
  }
@@ -294,8 +298,12 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
294
298
  try {
295
299
  derivedParser = options.factory(...dependencyValue);
296
300
  } catch {
297
- const sourceValues = options.defaultValues();
298
- derivedParser = options.factory(...sourceValues);
301
+ try {
302
+ const sourceValues = options.defaultValues();
303
+ derivedParser = options.factory(...sourceValues);
304
+ } catch {
305
+ return;
306
+ }
299
307
  }
300
308
  if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
301
309
  }
@@ -347,8 +355,12 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
347
355
  try {
348
356
  derivedParser = options.factory(...dependencyValue);
349
357
  } catch {
350
- const sourceValues = options.defaultValues();
351
- derivedParser = options.factory(...sourceValues);
358
+ try {
359
+ const sourceValues = options.defaultValues();
360
+ derivedParser = options.factory(...sourceValues);
361
+ } catch {
362
+ return;
363
+ }
352
364
  }
353
365
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
354
366
  }
@@ -411,7 +423,11 @@ function createSyncDerivedParser(sourceId, options) {
411
423
  try {
412
424
  derivedParser = options.factory(dependencyValue);
413
425
  } catch {
414
- derivedParser = options.factory(options.defaultValue());
426
+ try {
427
+ derivedParser = options.factory(options.defaultValue());
428
+ } catch {
429
+ return;
430
+ }
415
431
  }
416
432
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
417
433
  }
@@ -460,7 +476,11 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
460
476
  try {
461
477
  derivedParser = options.factory(dependencyValue);
462
478
  } catch {
463
- derivedParser = options.factory(options.defaultValue());
479
+ try {
480
+ derivedParser = options.factory(options.defaultValue());
481
+ } catch {
482
+ return;
483
+ }
464
484
  }
465
485
  if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
466
486
  }
@@ -509,7 +529,11 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
509
529
  try {
510
530
  derivedParser = options.factory(dependencyValue);
511
531
  } catch {
512
- derivedParser = options.factory(options.defaultValue());
532
+ try {
533
+ derivedParser = options.factory(options.defaultValue());
534
+ } catch {
535
+ return;
536
+ }
513
537
  }
514
538
  if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
515
539
  }
package/dist/facade.cjs CHANGED
@@ -927,19 +927,19 @@ async function runWith(parser, programName, contexts, options) {
927
927
  }
928
928
  const augmentedParser1 = injectAnnotationsIntoParser(parser, phase1Annotations);
929
929
  let firstPassResult;
930
+ let firstPassFailed = false;
930
931
  try {
931
932
  if (parser.$mode === "async") firstPassResult = await require_parser.parseAsync(augmentedParser1, args);
932
933
  else firstPassResult = require_parser.parseSync(augmentedParser1, args);
933
934
  if (typeof firstPassResult === "object" && firstPassResult !== null && "success" in firstPassResult) {
934
935
  const result = firstPassResult;
935
936
  if (result.success) firstPassResult = result.value;
936
- else {
937
- const augmentedParser = injectAnnotationsIntoParser(parser, phase1Annotations);
938
- if (parser.$mode === "async") return runParser(augmentedParser, programName, args, options);
939
- return Promise.resolve(runParser(augmentedParser, programName, args, options));
940
- }
937
+ else firstPassFailed = true;
941
938
  }
942
939
  } catch {
940
+ firstPassFailed = true;
941
+ }
942
+ if (firstPassFailed) {
943
943
  const augmentedParser = injectAnnotationsIntoParser(parser, phase1Annotations);
944
944
  if (parser.$mode === "async") return runParser(augmentedParser, programName, args, options);
945
945
  return Promise.resolve(runParser(augmentedParser, programName, args, options));
package/dist/facade.js CHANGED
@@ -927,19 +927,19 @@ async function runWith(parser, programName, contexts, options) {
927
927
  }
928
928
  const augmentedParser1 = injectAnnotationsIntoParser(parser, phase1Annotations);
929
929
  let firstPassResult;
930
+ let firstPassFailed = false;
930
931
  try {
931
932
  if (parser.$mode === "async") firstPassResult = await parseAsync(augmentedParser1, args);
932
933
  else firstPassResult = parseSync(augmentedParser1, args);
933
934
  if (typeof firstPassResult === "object" && firstPassResult !== null && "success" in firstPassResult) {
934
935
  const result = firstPassResult;
935
936
  if (result.success) firstPassResult = result.value;
936
- else {
937
- const augmentedParser = injectAnnotationsIntoParser(parser, phase1Annotations);
938
- if (parser.$mode === "async") return runParser(augmentedParser, programName, args, options);
939
- return Promise.resolve(runParser(augmentedParser, programName, args, options));
940
- }
937
+ else firstPassFailed = true;
941
938
  }
942
939
  } catch {
940
+ firstPassFailed = true;
941
+ }
942
+ if (firstPassFailed) {
943
943
  const augmentedParser = injectAnnotationsIntoParser(parser, phase1Annotations);
944
944
  if (parser.$mode === "async") return runParser(augmentedParser, programName, args, options);
945
945
  return Promise.resolve(runParser(augmentedParser, programName, args, options));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optique/core",
3
- "version": "0.10.0-dev.376+22c0802c",
3
+ "version": "0.10.0-dev.378+995d618d",
4
4
  "description": "Type-safe combinatorial command-line interface parser",
5
5
  "keywords": [
6
6
  "CLI",