@optique/core 0.5.0-dev.80 → 0.5.0-dev.82

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
@@ -78,7 +78,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
78
78
  const { buffer, optionsTerminated } = context;
79
79
  if (optionsTerminated) return {
80
80
  success: false,
81
- error: require_message.message`Options terminated`,
81
+ error: require_message.message`Options terminated.`,
82
82
  consumed: 0
83
83
  };
84
84
  let helpFound = false;
@@ -96,26 +96,33 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
96
96
  }
97
97
  if (helpFound && versionIndex > helpIndex) return {
98
98
  success: false,
99
- error: require_message.message`Version option wins`,
99
+ error: require_message.message`Version option wins.`,
100
100
  consumed: 0
101
101
  };
102
- if (helpFound) return {
103
- success: true,
104
- next: {
105
- ...context,
106
- buffer: [],
107
- state: {
108
- help: true,
109
- version: false,
110
- commands: [],
111
- helpFlag: true
112
- }
113
- },
114
- consumed: buffer.slice(0)
115
- };
102
+ if (helpFound) {
103
+ const commands = [];
104
+ for (let i = 0; i < helpIndex; i++) {
105
+ const arg = buffer[i];
106
+ if (!arg.startsWith("-")) commands.push(arg);
107
+ }
108
+ return {
109
+ success: true,
110
+ next: {
111
+ ...context,
112
+ buffer: [],
113
+ state: {
114
+ help: true,
115
+ version: false,
116
+ commands,
117
+ helpFlag: true
118
+ }
119
+ },
120
+ consumed: buffer.slice(0)
121
+ };
122
+ }
116
123
  return {
117
124
  success: false,
118
- error: require_message.message`Flag --help not found`,
125
+ error: require_message.message`Flag ${require_message.optionName("--help")} not found.`,
119
126
  consumed: 0
120
127
  };
121
128
  },
@@ -142,7 +149,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
142
149
  const { buffer, optionsTerminated } = context;
143
150
  if (optionsTerminated) return {
144
151
  success: false,
145
- error: require_message.message`Options terminated`,
152
+ error: require_message.message`Options terminated.`,
146
153
  consumed: 0
147
154
  };
148
155
  let versionFound = false;
@@ -160,7 +167,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
160
167
  }
161
168
  if (versionFound && helpIndex > versionIndex) return {
162
169
  success: false,
163
- error: require_message.message`Help option wins`,
170
+ error: require_message.message`Help option wins.`,
164
171
  consumed: 0
165
172
  };
166
173
  if (versionFound) return {
@@ -178,7 +185,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
178
185
  };
179
186
  return {
180
187
  success: false,
181
- error: require_message.message`Flag --version not found`,
188
+ error: require_message.message`Flag ${require_message.optionName("--version")} not found.`,
182
189
  consumed: 0
183
190
  };
184
191
  },
package/dist/facade.js CHANGED
@@ -1,4 +1,4 @@
1
- import { formatMessage, message } from "./message.js";
1
+ import { formatMessage, message, optionName } from "./message.js";
2
2
  import { longestMatch, object } from "./constructs.js";
3
3
  import { formatUsage } from "./usage.js";
4
4
  import { formatDocPage } from "./doc.js";
@@ -78,7 +78,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
78
78
  const { buffer, optionsTerminated } = context;
79
79
  if (optionsTerminated) return {
80
80
  success: false,
81
- error: message`Options terminated`,
81
+ error: message`Options terminated.`,
82
82
  consumed: 0
83
83
  };
84
84
  let helpFound = false;
@@ -96,26 +96,33 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
96
96
  }
97
97
  if (helpFound && versionIndex > helpIndex) return {
98
98
  success: false,
99
- error: message`Version option wins`,
99
+ error: message`Version option wins.`,
100
100
  consumed: 0
101
101
  };
102
- if (helpFound) return {
103
- success: true,
104
- next: {
105
- ...context,
106
- buffer: [],
107
- state: {
108
- help: true,
109
- version: false,
110
- commands: [],
111
- helpFlag: true
112
- }
113
- },
114
- consumed: buffer.slice(0)
115
- };
102
+ if (helpFound) {
103
+ const commands = [];
104
+ for (let i = 0; i < helpIndex; i++) {
105
+ const arg = buffer[i];
106
+ if (!arg.startsWith("-")) commands.push(arg);
107
+ }
108
+ return {
109
+ success: true,
110
+ next: {
111
+ ...context,
112
+ buffer: [],
113
+ state: {
114
+ help: true,
115
+ version: false,
116
+ commands,
117
+ helpFlag: true
118
+ }
119
+ },
120
+ consumed: buffer.slice(0)
121
+ };
122
+ }
116
123
  return {
117
124
  success: false,
118
- error: message`Flag --help not found`,
125
+ error: message`Flag ${optionName("--help")} not found.`,
119
126
  consumed: 0
120
127
  };
121
128
  },
@@ -142,7 +149,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
142
149
  const { buffer, optionsTerminated } = context;
143
150
  if (optionsTerminated) return {
144
151
  success: false,
145
- error: message`Options terminated`,
152
+ error: message`Options terminated.`,
146
153
  consumed: 0
147
154
  };
148
155
  let versionFound = false;
@@ -160,7 +167,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
160
167
  }
161
168
  if (versionFound && helpIndex > versionIndex) return {
162
169
  success: false,
163
- error: message`Help option wins`,
170
+ error: message`Help option wins.`,
164
171
  consumed: 0
165
172
  };
166
173
  if (versionFound) return {
@@ -178,7 +185,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
178
185
  };
179
186
  return {
180
187
  success: false,
181
- error: message`Flag --version not found`,
188
+ error: message`Flag ${optionName("--version")} not found.`,
182
189
  consumed: 0
183
190
  };
184
191
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optique/core",
3
- "version": "0.5.0-dev.80+65e05a5c",
3
+ "version": "0.5.0-dev.82+3a10f0da",
4
4
  "description": "Type-safe combinatorial command-line interface parser",
5
5
  "keywords": [
6
6
  "CLI",