@optique/core 0.4.2 → 0.4.4

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 (3) hide show
  1. package/dist/facade.cjs +27 -20
  2. package/dist/facade.js +28 -21
  3. package/package.json +1 -1
package/dist/facade.cjs CHANGED
@@ -75,7 +75,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
75
75
  const { buffer, optionsTerminated } = context;
76
76
  if (optionsTerminated) return {
77
77
  success: false,
78
- error: require_message.message`Options terminated`,
78
+ error: require_message.message`Options terminated.`,
79
79
  consumed: 0
80
80
  };
81
81
  let helpFound = false;
@@ -93,26 +93,33 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
93
93
  }
94
94
  if (helpFound && versionIndex > helpIndex) return {
95
95
  success: false,
96
- error: require_message.message`Version option wins`,
96
+ error: require_message.message`Version option wins.`,
97
97
  consumed: 0
98
98
  };
99
- if (helpFound) return {
100
- success: true,
101
- next: {
102
- ...context,
103
- buffer: [],
104
- state: {
105
- help: true,
106
- version: false,
107
- commands: [],
108
- helpFlag: true
109
- }
110
- },
111
- consumed: buffer.slice(0)
112
- };
99
+ if (helpFound) {
100
+ const commands = [];
101
+ for (let i = 0; i < helpIndex; i++) {
102
+ const arg = buffer[i];
103
+ if (!arg.startsWith("-")) commands.push(arg);
104
+ }
105
+ return {
106
+ success: true,
107
+ next: {
108
+ ...context,
109
+ buffer: [],
110
+ state: {
111
+ help: true,
112
+ version: false,
113
+ commands,
114
+ helpFlag: true
115
+ }
116
+ },
117
+ consumed: buffer.slice(0)
118
+ };
119
+ }
113
120
  return {
114
121
  success: false,
115
- error: require_message.message`Flag --help not found`,
122
+ error: require_message.message`Flag ${require_message.optionName("--help")} not found.`,
116
123
  consumed: 0
117
124
  };
118
125
  },
@@ -139,7 +146,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
139
146
  const { buffer, optionsTerminated } = context;
140
147
  if (optionsTerminated) return {
141
148
  success: false,
142
- error: require_message.message`Options terminated`,
149
+ error: require_message.message`Options terminated.`,
143
150
  consumed: 0
144
151
  };
145
152
  let versionFound = false;
@@ -157,7 +164,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
157
164
  }
158
165
  if (versionFound && helpIndex > versionIndex) return {
159
166
  success: false,
160
- error: require_message.message`Help option wins`,
167
+ error: require_message.message`Help option wins.`,
161
168
  consumed: 0
162
169
  };
163
170
  if (versionFound) return {
@@ -175,7 +182,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
175
182
  };
176
183
  return {
177
184
  success: false,
178
- error: require_message.message`Flag --version not found`,
185
+ error: require_message.message`Flag ${require_message.optionName("--version")} not found.`,
179
186
  consumed: 0
180
187
  };
181
188
  },
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 { formatUsage } from "./usage.js";
3
3
  import { formatDocPage } from "./doc.js";
4
4
  import { string } from "./valueparser.js";
@@ -75,7 +75,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
75
75
  const { buffer, optionsTerminated } = context;
76
76
  if (optionsTerminated) return {
77
77
  success: false,
78
- error: message`Options terminated`,
78
+ error: message`Options terminated.`,
79
79
  consumed: 0
80
80
  };
81
81
  let helpFound = false;
@@ -93,26 +93,33 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
93
93
  }
94
94
  if (helpFound && versionIndex > helpIndex) return {
95
95
  success: false,
96
- error: message`Version option wins`,
96
+ error: message`Version option wins.`,
97
97
  consumed: 0
98
98
  };
99
- if (helpFound) return {
100
- success: true,
101
- next: {
102
- ...context,
103
- buffer: [],
104
- state: {
105
- help: true,
106
- version: false,
107
- commands: [],
108
- helpFlag: true
109
- }
110
- },
111
- consumed: buffer.slice(0)
112
- };
99
+ if (helpFound) {
100
+ const commands = [];
101
+ for (let i = 0; i < helpIndex; i++) {
102
+ const arg = buffer[i];
103
+ if (!arg.startsWith("-")) commands.push(arg);
104
+ }
105
+ return {
106
+ success: true,
107
+ next: {
108
+ ...context,
109
+ buffer: [],
110
+ state: {
111
+ help: true,
112
+ version: false,
113
+ commands,
114
+ helpFlag: true
115
+ }
116
+ },
117
+ consumed: buffer.slice(0)
118
+ };
119
+ }
113
120
  return {
114
121
  success: false,
115
- error: message`Flag --help not found`,
122
+ error: message`Flag ${optionName("--help")} not found.`,
116
123
  consumed: 0
117
124
  };
118
125
  },
@@ -139,7 +146,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
139
146
  const { buffer, optionsTerminated } = context;
140
147
  if (optionsTerminated) return {
141
148
  success: false,
142
- error: message`Options terminated`,
149
+ error: message`Options terminated.`,
143
150
  consumed: 0
144
151
  };
145
152
  let versionFound = false;
@@ -157,7 +164,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
157
164
  }
158
165
  if (versionFound && helpIndex > versionIndex) return {
159
166
  success: false,
160
- error: message`Help option wins`,
167
+ error: message`Help option wins.`,
161
168
  consumed: 0
162
169
  };
163
170
  if (versionFound) return {
@@ -175,7 +182,7 @@ function combineWithHelpVersion(originalParser, helpParsers, versionParsers) {
175
182
  };
176
183
  return {
177
184
  success: false,
178
- error: message`Flag --version not found`,
185
+ error: message`Flag ${optionName("--version")} not found.`,
179
186
  consumed: 0
180
187
  };
181
188
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optique/core",
3
- "version": "0.4.2",
3
+ "version": "0.4.4",
4
4
  "description": "Type-safe combinatorial command-line interface parser",
5
5
  "keywords": [
6
6
  "CLI",