@optique/core 0.10.0-dev.305 → 0.10.0-dev.309

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 (15) hide show
  1. package/dist/constructs.cjs +36 -49
  2. package/dist/constructs.js +37 -50
  3. package/dist/dependency.cjs +86 -86
  4. package/dist/dependency.d.cts +35 -35
  5. package/dist/dependency.d.ts +35 -35
  6. package/dist/dependency.js +74 -74
  7. package/dist/index.cjs +12 -12
  8. package/dist/index.d.cts +2 -2
  9. package/dist/index.d.ts +2 -2
  10. package/dist/index.js +2 -2
  11. package/dist/modifiers.cjs +11 -11
  12. package/dist/modifiers.js +12 -12
  13. package/dist/primitives.cjs +10 -10
  14. package/dist/primitives.js +11 -11
  15. package/package.json +1 -1
package/dist/modifiers.cjs CHANGED
@@ -92,9 +92,9 @@ function optional(parser) {
92
92
  }
93
93
  const innerHasWrappedDependency = require_dependency.isWrappedDependencySource(parser);
94
94
  const innerHasDirectDependency = require_dependency.isPendingDependencySourceState(syncParser.initialState);
95
- const wrappedDependencyMarker = innerHasWrappedDependency ? { [require_dependency.WrappedDependencySourceMarker]: parser[require_dependency.WrappedDependencySourceMarker] } : innerHasDirectDependency ? { [require_dependency.WrappedDependencySourceMarker]: syncParser.initialState } : {};
96
- const hasWrappedDependencySource = require_dependency.WrappedDependencySourceMarker in wrappedDependencyMarker;
97
- const wrappedPendingState = hasWrappedDependencySource ? wrappedDependencyMarker[require_dependency.WrappedDependencySourceMarker] : void 0;
95
+ const wrappedDependencyMarker = innerHasWrappedDependency ? { [require_dependency.wrappedDependencySourceMarker]: parser[require_dependency.wrappedDependencySourceMarker] } : innerHasDirectDependency ? { [require_dependency.wrappedDependencySourceMarker]: syncParser.initialState } : {};
96
+ const hasWrappedDependencySource = require_dependency.wrappedDependencySourceMarker in wrappedDependencyMarker;
97
+ const wrappedPendingState = hasWrappedDependencySource ? wrappedDependencyMarker[require_dependency.wrappedDependencySourceMarker] : void 0;
98
98
  return {
99
99
  $mode: parser.$mode,
100
100
  $valueType: [],
@@ -200,7 +200,7 @@ function withDefault(parser, defaultValue, options) {
200
200
  for await (const s of suggestions) yield s;
201
201
  }
202
202
  const innerInitialState = syncParser.initialState;
203
- const wrappedDependencyMarker = require_dependency.isPendingDependencySourceState(innerInitialState) ? { [require_dependency.WrappedDependencySourceMarker]: innerInitialState } : require_dependency.isWrappedDependencySource(parser) ? { [require_dependency.WrappedDependencySourceMarker]: parser[require_dependency.WrappedDependencySourceMarker] } : {};
203
+ const wrappedDependencyMarker = require_dependency.isPendingDependencySourceState(innerInitialState) ? { [require_dependency.wrappedDependencySourceMarker]: innerInitialState } : require_dependency.isWrappedDependencySource(parser) ? { [require_dependency.wrappedDependencySourceMarker]: parser[require_dependency.wrappedDependencySourceMarker] } : {};
204
204
  return {
205
205
  $mode: parser.$mode,
206
206
  $valueType: [],
@@ -226,7 +226,7 @@ function withDefault(parser, defaultValue, options) {
226
226
  return require_dependency.createDependencySourceState({
227
227
  success: true,
228
228
  value
229
- }, res[require_dependency.DependencyId]);
229
+ }, res[require_dependency.dependencyId]);
230
230
  } catch (error) {
231
231
  return {
232
232
  success: false,
@@ -251,11 +251,11 @@ function withDefault(parser, defaultValue, options) {
251
251
  }
252
252
  if (require_dependency.isWrappedDependencySource(parser)) try {
253
253
  const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
254
- const pendingState = parser[require_dependency.WrappedDependencySourceMarker];
254
+ const pendingState = parser[require_dependency.wrappedDependencySourceMarker];
255
255
  return require_dependency.createDependencySourceState({
256
256
  success: true,
257
257
  value
258
- }, pendingState[require_dependency.DependencyId]);
258
+ }, pendingState[require_dependency.dependencyId]);
259
259
  } catch (error) {
260
260
  return {
261
261
  success: false,
@@ -284,7 +284,7 @@ function withDefault(parser, defaultValue, options) {
284
284
  return require_dependency.createDependencySourceState({
285
285
  success: true,
286
286
  value
287
- }, res[require_dependency.DependencyId]);
287
+ }, res[require_dependency.dependencyId]);
288
288
  } catch (error) {
289
289
  return {
290
290
  success: false,
@@ -312,7 +312,7 @@ function withDefault(parser, defaultValue, options) {
312
312
  return require_dependency.createDependencySourceState({
313
313
  success: true,
314
314
  value
315
- }, state[0][require_dependency.DependencyId]);
315
+ }, state[0][require_dependency.dependencyId]);
316
316
  } catch (error) {
317
317
  return {
318
318
  success: false,
@@ -402,8 +402,8 @@ function map(parser, transform) {
402
402
  return res;
403
403
  };
404
404
  const dependencyMarkers = require_dependency.isWrappedDependencySource(parser) ? {
405
- [require_dependency.WrappedDependencySourceMarker]: parser[require_dependency.WrappedDependencySourceMarker],
406
- [require_dependency.TransformsDependencyValueMarker]: true
405
+ [require_dependency.wrappedDependencySourceMarker]: parser[require_dependency.wrappedDependencySourceMarker],
406
+ [require_dependency.transformsDependencyValueMarker]: true
407
407
  } : {};
408
408
  return {
409
409
  ...parser,
package/dist/modifiers.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { formatMessage, message, text } from "./message.js";
2
- import { DependencyId, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDependencySourceState, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.js";
2
+ import { createDependencySourceState, dependencyId, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue, transformsDependencyValueMarker, wrappedDependencySourceMarker } from "./dependency.js";
3
3
 
4
4
  //#region src/modifiers.ts
5
5
  /**
@@ -92,9 +92,9 @@ function optional(parser) {
92
92
  }
93
93
  const innerHasWrappedDependency = isWrappedDependencySource(parser);
94
94
  const innerHasDirectDependency = isPendingDependencySourceState(syncParser.initialState);
95
- const wrappedDependencyMarker = innerHasWrappedDependency ? { [WrappedDependencySourceMarker]: parser[WrappedDependencySourceMarker] } : innerHasDirectDependency ? { [WrappedDependencySourceMarker]: syncParser.initialState } : {};
96
- const hasWrappedDependencySource = WrappedDependencySourceMarker in wrappedDependencyMarker;
97
- const wrappedPendingState = hasWrappedDependencySource ? wrappedDependencyMarker[WrappedDependencySourceMarker] : void 0;
95
+ const wrappedDependencyMarker = innerHasWrappedDependency ? { [wrappedDependencySourceMarker]: parser[wrappedDependencySourceMarker] } : innerHasDirectDependency ? { [wrappedDependencySourceMarker]: syncParser.initialState } : {};
96
+ const hasWrappedDependencySource = wrappedDependencySourceMarker in wrappedDependencyMarker;
97
+ const wrappedPendingState = hasWrappedDependencySource ? wrappedDependencyMarker[wrappedDependencySourceMarker] : void 0;
98
98
  return {
99
99
  $mode: parser.$mode,
100
100
  $valueType: [],
@@ -200,7 +200,7 @@ function withDefault(parser, defaultValue, options) {
200
200
  for await (const s of suggestions) yield s;
201
201
  }
202
202
  const innerInitialState = syncParser.initialState;
203
- const wrappedDependencyMarker = isPendingDependencySourceState(innerInitialState) ? { [WrappedDependencySourceMarker]: innerInitialState } : isWrappedDependencySource(parser) ? { [WrappedDependencySourceMarker]: parser[WrappedDependencySourceMarker] } : {};
203
+ const wrappedDependencyMarker = isPendingDependencySourceState(innerInitialState) ? { [wrappedDependencySourceMarker]: innerInitialState } : isWrappedDependencySource(parser) ? { [wrappedDependencySourceMarker]: parser[wrappedDependencySourceMarker] } : {};
204
204
  return {
205
205
  $mode: parser.$mode,
206
206
  $valueType: [],
@@ -226,7 +226,7 @@ function withDefault(parser, defaultValue, options) {
226
226
  return createDependencySourceState({
227
227
  success: true,
228
228
  value
229
- }, res[DependencyId]);
229
+ }, res[dependencyId]);
230
230
  } catch (error) {
231
231
  return {
232
232
  success: false,
@@ -251,11 +251,11 @@ function withDefault(parser, defaultValue, options) {
251
251
  }
252
252
  if (isWrappedDependencySource(parser)) try {
253
253
  const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
254
- const pendingState = parser[WrappedDependencySourceMarker];
254
+ const pendingState = parser[wrappedDependencySourceMarker];
255
255
  return createDependencySourceState({
256
256
  success: true,
257
257
  value
258
- }, pendingState[DependencyId]);
258
+ }, pendingState[dependencyId]);
259
259
  } catch (error) {
260
260
  return {
261
261
  success: false,
@@ -284,7 +284,7 @@ function withDefault(parser, defaultValue, options) {
284
284
  return createDependencySourceState({
285
285
  success: true,
286
286
  value
287
- }, res[DependencyId]);
287
+ }, res[dependencyId]);
288
288
  } catch (error) {
289
289
  return {
290
290
  success: false,
@@ -312,7 +312,7 @@ function withDefault(parser, defaultValue, options) {
312
312
  return createDependencySourceState({
313
313
  success: true,
314
314
  value
315
- }, state[0][DependencyId]);
315
+ }, state[0][dependencyId]);
316
316
  } catch (error) {
317
317
  return {
318
318
  success: false,
@@ -402,8 +402,8 @@ function map(parser, transform) {
402
402
  return res;
403
403
  };
404
404
  const dependencyMarkers = isWrappedDependencySource(parser) ? {
405
- [WrappedDependencySourceMarker]: parser[WrappedDependencySourceMarker],
406
- [TransformsDependencyValueMarker]: true
405
+ [wrappedDependencySourceMarker]: parser[wrappedDependencySourceMarker],
406
+ [transformsDependencyValueMarker]: true
407
407
  } : {};
408
408
  return {
409
409
  ...parser,
package/dist/primitives.cjs CHANGED
@@ -15,7 +15,7 @@ const require_valueparser = require('./valueparser.cjs');
15
15
  */
16
16
  function createOptionParseState(rawInput, valueParser, parseResult) {
17
17
  if (require_dependency.isDerivedValueParser(valueParser)) return require_dependency.createDeferredParseState(rawInput, valueParser, parseResult);
18
- if (require_dependency.isDependencySource(valueParser)) return require_dependency.createDependencySourceState(parseResult, valueParser[require_dependency.DependencyId]);
18
+ if (require_dependency.isDependencySource(valueParser)) return require_dependency.createDependencySourceState(parseResult, valueParser[require_dependency.dependencyId]);
19
19
  return parseResult;
20
20
  }
21
21
  /**
@@ -59,12 +59,12 @@ function constant(value) {
59
59
  */
60
60
  function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry) {
61
61
  if (!valueParser.suggest) return;
62
- if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.SuggestWithDependency in valueParser) {
62
+ if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.suggestWithDependency in valueParser) {
63
63
  const derived = valueParser;
64
- const suggestWithDep = derived[require_dependency.SuggestWithDependency];
64
+ const suggestWithDep = derived[require_dependency.suggestWithDependency];
65
65
  if (suggestWithDep && dependencyRegistry) {
66
- const depIds = require_dependency.DependencyIds in derived ? derived[require_dependency.DependencyIds] : [derived[require_dependency.DependencyId]];
67
- const defaults = require_dependency.DefaultValues in derived ? derived[require_dependency.DefaultValues]?.() : void 0;
66
+ const depIds = require_dependency.dependencyIds in derived ? derived[require_dependency.dependencyIds] : [derived[require_dependency.dependencyId]];
67
+ const defaults = require_dependency.defaultValues in derived ? derived[require_dependency.defaultValues]?.() : void 0;
68
68
  const registry = dependencyRegistry;
69
69
  const dependencyValues = [];
70
70
  let hasAnyValue = false;
@@ -140,12 +140,12 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
140
140
  */
141
141
  async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependencyRegistry) {
142
142
  if (!valueParser.suggest) return;
143
- if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.SuggestWithDependency in valueParser) {
143
+ if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.suggestWithDependency in valueParser) {
144
144
  const derived = valueParser;
145
- const suggestWithDep = derived[require_dependency.SuggestWithDependency];
145
+ const suggestWithDep = derived[require_dependency.suggestWithDependency];
146
146
  if (suggestWithDep && dependencyRegistry) {
147
- const depIds = require_dependency.DependencyIds in derived ? derived[require_dependency.DependencyIds] : [derived[require_dependency.DependencyId]];
148
- const defaults = require_dependency.DefaultValues in derived ? derived[require_dependency.DefaultValues]?.() : void 0;
147
+ const depIds = require_dependency.dependencyIds in derived ? derived[require_dependency.dependencyIds] : [derived[require_dependency.dependencyId]];
148
+ const defaults = require_dependency.defaultValues in derived ? derived[require_dependency.defaultValues]?.() : void 0;
149
149
  const registry = dependencyRegistry;
150
150
  const dependencyValues = [];
151
151
  let hasAnyValue = false;
@@ -275,7 +275,7 @@ function option(...args) {
275
275
  initialState: valueParser == null ? {
276
276
  success: true,
277
277
  value: false
278
- } : require_dependency.isDependencySource(valueParser) ? require_dependency.createPendingDependencySourceState(valueParser[require_dependency.DependencyId]) : {
278
+ } : require_dependency.isDependencySource(valueParser) ? require_dependency.createPendingDependencySourceState(valueParser[require_dependency.dependencyId]) : {
279
279
  success: false,
280
280
  error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : require_message.message`Missing option ${require_message.optionNames(optionNames$1)}.`
281
281
  },
package/dist/primitives.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { message, metavar, optionName, optionNames } from "./message.js";
2
- import { DefaultValues, DependencyId, DependencyIds, SuggestWithDependency, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState } from "./dependency.js";
2
+ import { createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, dependencyId, dependencyIds, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, suggestWithDependency } from "./dependency.js";
3
3
  import { extractCommandNames, extractOptionNames } from "./usage.js";
4
4
  import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, findSimilar } from "./suggestion.js";
5
5
  import { isValueParser } from "./valueparser.js";
@@ -15,7 +15,7 @@ import { isValueParser } from "./valueparser.js";
15
15
  */
16
16
  function createOptionParseState(rawInput, valueParser, parseResult) {
17
17
  if (isDerivedValueParser(valueParser)) return createDeferredParseState(rawInput, valueParser, parseResult);
18
- if (isDependencySource(valueParser)) return createDependencySourceState(parseResult, valueParser[DependencyId]);
18
+ if (isDependencySource(valueParser)) return createDependencySourceState(parseResult, valueParser[dependencyId]);
19
19
  return parseResult;
20
20
  }
21
21
  /**
@@ -59,12 +59,12 @@ function constant(value) {
59
59
  */
60
60
  function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry) {
61
61
  if (!valueParser.suggest) return;
62
- if (isDerivedValueParser(valueParser) && SuggestWithDependency in valueParser) {
62
+ if (isDerivedValueParser(valueParser) && suggestWithDependency in valueParser) {
63
63
  const derived = valueParser;
64
- const suggestWithDep = derived[SuggestWithDependency];
64
+ const suggestWithDep = derived[suggestWithDependency];
65
65
  if (suggestWithDep && dependencyRegistry) {
66
- const depIds = DependencyIds in derived ? derived[DependencyIds] : [derived[DependencyId]];
67
- const defaults = DefaultValues in derived ? derived[DefaultValues]?.() : void 0;
66
+ const depIds = dependencyIds in derived ? derived[dependencyIds] : [derived[dependencyId]];
67
+ const defaults = defaultValues in derived ? derived[defaultValues]?.() : void 0;
68
68
  const registry = dependencyRegistry;
69
69
  const dependencyValues = [];
70
70
  let hasAnyValue = false;
@@ -140,12 +140,12 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
140
140
  */
141
141
  async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependencyRegistry) {
142
142
  if (!valueParser.suggest) return;
143
- if (isDerivedValueParser(valueParser) && SuggestWithDependency in valueParser) {
143
+ if (isDerivedValueParser(valueParser) && suggestWithDependency in valueParser) {
144
144
  const derived = valueParser;
145
- const suggestWithDep = derived[SuggestWithDependency];
145
+ const suggestWithDep = derived[suggestWithDependency];
146
146
  if (suggestWithDep && dependencyRegistry) {
147
- const depIds = DependencyIds in derived ? derived[DependencyIds] : [derived[DependencyId]];
148
- const defaults = DefaultValues in derived ? derived[DefaultValues]?.() : void 0;
147
+ const depIds = dependencyIds in derived ? derived[dependencyIds] : [derived[dependencyId]];
148
+ const defaults = defaultValues in derived ? derived[defaultValues]?.() : void 0;
149
149
  const registry = dependencyRegistry;
150
150
  const dependencyValues = [];
151
151
  let hasAnyValue = false;
@@ -275,7 +275,7 @@ function option(...args) {
275
275
  initialState: valueParser == null ? {
276
276
  success: true,
277
277
  value: false
278
- } : isDependencySource(valueParser) ? createPendingDependencySourceState(valueParser[DependencyId]) : {
278
+ } : isDependencySource(valueParser) ? createPendingDependencySourceState(valueParser[dependencyId]) : {
279
279
  success: false,
280
280
  error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : message`Missing option ${optionNames(optionNames$1)}.`
281
281
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optique/core",
3
- "version": "0.10.0-dev.305+aeb3e4c8",
3
+ "version": "0.10.0-dev.309+f750e8e5",
4
4
  "description": "Type-safe combinatorial command-line interface parser",
5
5
  "keywords": [
6
6
  "CLI",