@optique/core 0.9.0-dev.196 → 0.9.0-dev.201

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.
@@ -776,8 +776,16 @@ function merge(...args) {
776
776
  return require_suggestion.deduplicateSuggestions(suggestions);
777
777
  },
778
778
  getDocFragments(state, _defaultValue) {
779
- const fragments = parsers.flatMap((p) => {
780
- const parserState = p.initialState === void 0 ? { kind: "unavailable" } : state.kind === "unavailable" ? { kind: "unavailable" } : {
779
+ const fragments = parsers.flatMap((p, i) => {
780
+ let parserState;
781
+ if (p.initialState === void 0) {
782
+ const key = `__parser_${i}`;
783
+ if (state.kind === "available" && state.state && typeof state.state === "object" && key in state.state) parserState = {
784
+ kind: "available",
785
+ state: state.state[key]
786
+ };
787
+ else parserState = { kind: "unavailable" };
788
+ } else parserState = state.kind === "unavailable" ? { kind: "unavailable" } : {
781
789
  kind: "available",
782
790
  state: state.state
783
791
  };
@@ -776,8 +776,16 @@ function merge(...args) {
776
776
  return deduplicateSuggestions(suggestions);
777
777
  },
778
778
  getDocFragments(state, _defaultValue) {
779
- const fragments = parsers.flatMap((p) => {
780
- const parserState = p.initialState === void 0 ? { kind: "unavailable" } : state.kind === "unavailable" ? { kind: "unavailable" } : {
779
+ const fragments = parsers.flatMap((p, i) => {
780
+ let parserState;
781
+ if (p.initialState === void 0) {
782
+ const key = `__parser_${i}`;
783
+ if (state.kind === "available" && state.state && typeof state.state === "object" && key in state.state) parserState = {
784
+ kind: "available",
785
+ state: state.state[key]
786
+ };
787
+ else parserState = { kind: "unavailable" };
788
+ } else parserState = state.kind === "unavailable" ? { kind: "unavailable" } : {
781
789
  kind: "available",
782
790
  state: state.state
783
791
  };
package/dist/parser.cjs CHANGED
@@ -95,6 +95,26 @@ function suggest(parser, args) {
95
95
  return Array.from(parser.suggest(context, prefix));
96
96
  }
97
97
  /**
98
+ * Recursively searches for a command within nested exclusive usage terms.
99
+ * When the command is found, returns the expanded usage terms for that command.
100
+ *
101
+ * @param term The usage term to search in
102
+ * @param commandName The command name to find
103
+ * @returns The expanded usage terms if found, null otherwise
104
+ */
105
+ function findCommandInExclusive(term, commandName) {
106
+ if (term.type !== "exclusive") return null;
107
+ for (const termGroup of term.terms) {
108
+ const firstTerm = termGroup[0];
109
+ if (firstTerm?.type === "command" && firstTerm.name === commandName) return termGroup;
110
+ if (firstTerm?.type === "exclusive") {
111
+ const found = findCommandInExclusive(firstTerm, commandName);
112
+ if (found) return [...found, ...termGroup.slice(1)];
113
+ }
114
+ }
115
+ return null;
116
+ }
117
+ /**
98
118
  * Generates a documentation page for a parser based on its current state after
99
119
  * attempting to parse the provided arguments. This function is useful for
100
120
  * creating help documentation that reflects the current parsing context.
@@ -157,14 +177,11 @@ function getDocPage(parser, args = []) {
157
177
  if (i >= usage.length) break;
158
178
  const term = usage[i];
159
179
  if (term.type === "exclusive") {
160
- for (const termGroup of term.terms) {
161
- const firstTerm = termGroup[0];
162
- if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
163
- usage.splice(i, 1, ...termGroup);
164
- i += termGroup.length;
165
- break;
166
- }
167
- if (usage[i] === term) i++;
180
+ const found = findCommandInExclusive(term, arg);
181
+ if (found) {
182
+ usage.splice(i, 1, ...found);
183
+ i += found.length;
184
+ } else i++;
168
185
  } else i++;
169
186
  }
170
187
  return {
package/dist/parser.js CHANGED
@@ -95,6 +95,26 @@ function suggest(parser, args) {
95
95
  return Array.from(parser.suggest(context, prefix));
96
96
  }
97
97
  /**
98
+ * Recursively searches for a command within nested exclusive usage terms.
99
+ * When the command is found, returns the expanded usage terms for that command.
100
+ *
101
+ * @param term The usage term to search in
102
+ * @param commandName The command name to find
103
+ * @returns The expanded usage terms if found, null otherwise
104
+ */
105
+ function findCommandInExclusive(term, commandName) {
106
+ if (term.type !== "exclusive") return null;
107
+ for (const termGroup of term.terms) {
108
+ const firstTerm = termGroup[0];
109
+ if (firstTerm?.type === "command" && firstTerm.name === commandName) return termGroup;
110
+ if (firstTerm?.type === "exclusive") {
111
+ const found = findCommandInExclusive(firstTerm, commandName);
112
+ if (found) return [...found, ...termGroup.slice(1)];
113
+ }
114
+ }
115
+ return null;
116
+ }
117
+ /**
98
118
  * Generates a documentation page for a parser based on its current state after
99
119
  * attempting to parse the provided arguments. This function is useful for
100
120
  * creating help documentation that reflects the current parsing context.
@@ -157,14 +177,11 @@ function getDocPage(parser, args = []) {
157
177
  if (i >= usage.length) break;
158
178
  const term = usage[i];
159
179
  if (term.type === "exclusive") {
160
- for (const termGroup of term.terms) {
161
- const firstTerm = termGroup[0];
162
- if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
163
- usage.splice(i, 1, ...termGroup);
164
- i += termGroup.length;
165
- break;
166
- }
167
- if (usage[i] === term) i++;
180
+ const found = findCommandInExclusive(term, arg);
181
+ if (found) {
182
+ usage.splice(i, 1, ...found);
183
+ i += found.length;
184
+ } else i++;
168
185
  } else i++;
169
186
  }
170
187
  return {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optique/core",
3
- "version": "0.9.0-dev.196+882caf54",
3
+ "version": "0.9.0-dev.201+a103c62c",
4
4
  "description": "Type-safe combinatorial command-line interface parser",
5
5
  "keywords": [
6
6
  "CLI",