massarg 2.0.0-pre.3 → 2.0.0-pre.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.
- package/command.d.ts +27 -4
- package/command.d.ts.map +1 -1
- package/command.js +51 -6
- package/command.js.map +1 -1
- package/help.d.ts +239 -52
- package/help.d.ts.map +1 -1
- package/help.js +119 -50
- package/help.js.map +1 -1
- package/massarg.d.ts +1 -1
- package/massarg.d.ts.map +1 -1
- package/massarg.js.map +1 -1
- package/option.d.ts +64 -20
- package/option.d.ts.map +1 -1
- package/option.js +52 -53
- package/option.js.map +1 -1
- package/package.json +2 -2
- package/utils.d.ts.map +1 -1
- package/utils.js +3 -3
- package/utils.js.map +1 -1
package/option.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MassargHelpFlag = exports.MassargFlag = exports.MassargNumber = exports.MassargOption = exports.ArrayOptionConfig = exports.TypedOptionConfig = exports.OptionConfig = void 0;
|
|
3
|
+
exports.MassargHelpFlag = exports.MassargFlag = exports.MassargNumber = exports.MassargOption = exports.NEGATE_SHORT_PREFIX = exports.NEGATE_FULL_PREFIX = exports.OPT_SHORT_PREFIX = exports.OPT_FULL_PREFIX = exports.ArrayOptionConfig = exports.TypedOptionConfig = exports.FlagConfig = exports.OptionConfig = void 0;
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
5
|
const error_1 = require("./error");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
@@ -43,6 +43,12 @@ const OptionConfig = (type) => zod_1.z.object({
|
|
|
43
43
|
outputName: zod_1.z.string().optional(),
|
|
44
44
|
});
|
|
45
45
|
exports.OptionConfig = OptionConfig;
|
|
46
|
+
exports.FlagConfig = (0, exports.OptionConfig)(zod_1.z.any())
|
|
47
|
+
.omit({ parse: true, isDefault: true })
|
|
48
|
+
.merge(zod_1.z.object({
|
|
49
|
+
/** Whether the flag can be negated, e.g. `--no-verbose` */
|
|
50
|
+
negatable: zod_1.z.boolean().optional(),
|
|
51
|
+
}));
|
|
46
52
|
const TypedOptionConfig = (type) => (0, exports.OptionConfig)(type).merge(zod_1.z.object({
|
|
47
53
|
type: zod_1.z.enum(['number']).optional(),
|
|
48
54
|
}));
|
|
@@ -58,10 +64,10 @@ zod_1.z.object({
|
|
|
58
64
|
}));
|
|
59
65
|
exports.ArrayOptionConfig = ArrayOptionConfig;
|
|
60
66
|
// TODO turn to options
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
67
|
+
exports.OPT_FULL_PREFIX = '--';
|
|
68
|
+
exports.OPT_SHORT_PREFIX = '-';
|
|
69
|
+
exports.NEGATE_FULL_PREFIX = '--no-';
|
|
70
|
+
exports.NEGATE_SHORT_PREFIX = '^';
|
|
65
71
|
/**
|
|
66
72
|
* An option that can be passed to a command.
|
|
67
73
|
*
|
|
@@ -94,6 +100,7 @@ class MassargOption {
|
|
|
94
100
|
this.parse = options.parse ?? ((x) => x);
|
|
95
101
|
this.isArray = options.array ?? false;
|
|
96
102
|
this.isDefault = options.isDefault ?? false;
|
|
103
|
+
this.isRequired = options.required ?? false;
|
|
97
104
|
this.outputName = options.outputName;
|
|
98
105
|
}
|
|
99
106
|
static fromTypedConfig(config) {
|
|
@@ -106,11 +113,10 @@ class MassargOption {
|
|
|
106
113
|
getOutputName() {
|
|
107
114
|
return this.outputName || (0, utils_1.toCamelCase)(this.name);
|
|
108
115
|
}
|
|
109
|
-
|
|
110
|
-
// TODO: support --option=value
|
|
116
|
+
parseDetails(argv, options, prefixes) {
|
|
111
117
|
let input = '';
|
|
112
118
|
try {
|
|
113
|
-
if (!this._match(argv[0])) {
|
|
119
|
+
if (!this._match(argv[0], prefixes)) {
|
|
114
120
|
throw new error_1.ParseError({
|
|
115
121
|
path: [this.name],
|
|
116
122
|
code: 'invalid_option',
|
|
@@ -139,48 +145,31 @@ class MassargOption {
|
|
|
139
145
|
const aliases = this.aliases.length ? `|${this.aliases.join('|-')}` : '';
|
|
140
146
|
return `--${this.name}${aliases} ${this.description}`;
|
|
141
147
|
}
|
|
142
|
-
_match(arg) {
|
|
143
|
-
|
|
144
|
-
return false;
|
|
145
|
-
// full prefix
|
|
146
|
-
if (arg.startsWith(OPT_FULL_PREFIX)) {
|
|
147
|
-
// negate full prefix
|
|
148
|
-
if (arg.startsWith(`--${NEGATE_FULL_PREFIX}`)) {
|
|
149
|
-
return this.name === arg.slice(`--${NEGATE_FULL_PREFIX}`.length);
|
|
150
|
-
}
|
|
151
|
-
return this.name === arg.slice(OPT_FULL_PREFIX.length);
|
|
152
|
-
}
|
|
153
|
-
// short prefix
|
|
154
|
-
if (arg.startsWith(OPT_SHORT_PREFIX) || arg.startsWith(NEGATE_SHORT_PREFIX)) {
|
|
155
|
-
return this.aliases.includes(arg.slice(OPT_SHORT_PREFIX.length));
|
|
156
|
-
}
|
|
157
|
-
// negate short prefix
|
|
158
|
-
if (arg.startsWith(NEGATE_SHORT_PREFIX)) {
|
|
159
|
-
return this.aliases.includes(arg.slice(NEGATE_SHORT_PREFIX.length));
|
|
160
|
-
}
|
|
161
|
-
// no prefix
|
|
162
|
-
return false;
|
|
148
|
+
_match(arg, prefixes) {
|
|
149
|
+
return MassargOption.findNameInArg(arg, prefixes) !== '<blank>';
|
|
163
150
|
}
|
|
164
|
-
_isOption(arg) {
|
|
165
|
-
return (arg.startsWith(
|
|
166
|
-
arg.startsWith(
|
|
167
|
-
arg.startsWith(
|
|
151
|
+
_isOption(arg, prefixes) {
|
|
152
|
+
return (arg.startsWith(prefixes.optionPrefix) ||
|
|
153
|
+
arg.startsWith(prefixes.aliasPrefix) ||
|
|
154
|
+
arg.startsWith(prefixes.negateFlagPrefix) ||
|
|
155
|
+
arg.startsWith(prefixes.negateAliasPrefix));
|
|
168
156
|
}
|
|
169
|
-
static
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
}
|
|
175
|
-
return arg.slice(OPT_FULL_PREFIX.length);
|
|
157
|
+
static findNameInArg(arg, prefixes) {
|
|
158
|
+
const { optionPrefix, aliasPrefix, negateFlagPrefix, negateAliasPrefix } = prefixes;
|
|
159
|
+
// negate full prefix
|
|
160
|
+
if (arg.startsWith(negateFlagPrefix)) {
|
|
161
|
+
return arg.slice(negateFlagPrefix.length);
|
|
176
162
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
return arg.slice(OPT_SHORT_PREFIX.length);
|
|
163
|
+
if (arg.startsWith(optionPrefix)) {
|
|
164
|
+
return arg.slice(optionPrefix.length);
|
|
180
165
|
}
|
|
181
166
|
// negate short prefix
|
|
182
|
-
if (arg.startsWith(
|
|
183
|
-
return arg.slice(
|
|
167
|
+
if (arg.startsWith(negateAliasPrefix)) {
|
|
168
|
+
return arg.slice(negateAliasPrefix.length);
|
|
169
|
+
}
|
|
170
|
+
// short prefix
|
|
171
|
+
if (arg.startsWith(aliasPrefix) || arg.startsWith(negateAliasPrefix)) {
|
|
172
|
+
return arg.slice(aliasPrefix.length);
|
|
184
173
|
}
|
|
185
174
|
return '<blank>';
|
|
186
175
|
}
|
|
@@ -209,9 +198,9 @@ class MassargNumber extends MassargOption {
|
|
|
209
198
|
parse: (value) => Number(value),
|
|
210
199
|
});
|
|
211
200
|
}
|
|
212
|
-
|
|
201
|
+
parseDetails(argv, options, prefixes) {
|
|
213
202
|
try {
|
|
214
|
-
const { argv: _argv, value } = super.
|
|
203
|
+
const { argv: _argv, value } = super.parseDetails(argv, options, prefixes);
|
|
215
204
|
if (isNaN(value)) {
|
|
216
205
|
throw new error_1.ParseError({
|
|
217
206
|
path: [this.name],
|
|
@@ -245,7 +234,7 @@ exports.MassargNumber = MassargNumber;
|
|
|
245
234
|
*
|
|
246
235
|
* A flag can be negated by prefixing it with `no-`. For example, `--no-verbose`,
|
|
247
236
|
* or by prefixing the alias with `^` instead of `-`. This is configurable via the command's
|
|
248
|
-
* configuration.
|
|
237
|
+
* configuration. To turn this behavior on, set `negatable: true` in the flag's configuration.
|
|
249
238
|
*
|
|
250
239
|
* @example
|
|
251
240
|
* ```ts
|
|
@@ -263,11 +252,21 @@ class MassargFlag extends MassargOption {
|
|
|
263
252
|
...options,
|
|
264
253
|
parse: () => true,
|
|
265
254
|
});
|
|
255
|
+
this.negatable = options.negatable ?? false;
|
|
266
256
|
}
|
|
267
|
-
|
|
257
|
+
parseDetails(argv, options, prefixes) {
|
|
268
258
|
try {
|
|
269
|
-
const isNegation = argv[0]?.startsWith(
|
|
270
|
-
|
|
259
|
+
const isNegation = argv[0]?.startsWith(prefixes.negateAliasPrefix) ||
|
|
260
|
+
argv[0]?.startsWith(prefixes.negateFlagPrefix);
|
|
261
|
+
if (!this.negatable && isNegation) {
|
|
262
|
+
throw new error_1.ParseError({
|
|
263
|
+
path: [this.name],
|
|
264
|
+
code: 'invalid_option',
|
|
265
|
+
message: `Option ${this.name} cannot be negated`,
|
|
266
|
+
received: JSON.stringify(argv[0]),
|
|
267
|
+
});
|
|
268
|
+
}
|
|
269
|
+
if (!this._match(argv[0], prefixes)) {
|
|
271
270
|
throw new error_1.ParseError({
|
|
272
271
|
path: [this.name],
|
|
273
272
|
code: 'invalid_option',
|
|
@@ -277,9 +276,9 @@ class MassargFlag extends MassargOption {
|
|
|
277
276
|
}
|
|
278
277
|
argv.shift();
|
|
279
278
|
if (isNegation) {
|
|
280
|
-
return { key: this.
|
|
279
|
+
return { key: this.getOutputName(), value: false, argv };
|
|
281
280
|
}
|
|
282
|
-
return { key: this.
|
|
281
|
+
return { key: this.getOutputName(), value: true, argv };
|
|
283
282
|
}
|
|
284
283
|
catch (e) {
|
|
285
284
|
if ((0, error_1.isZodError)(e)) {
|
package/option.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option.js","sourceRoot":"","sources":["../src/option.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AACvB,mCAAgD;AAChD,mCAAqC;AAG9B,MAAM,YAAY,GAAG,CAC1B,IAA2B,EAC3B,EAAE,CACF,OAAC,CAAC,MAAM,CAAC;IACP,yBAAyB;IACzB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,8DAA8D;IAC9D,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,kCAAkC;IAClC,YAAY,EAAE,OAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAChC,oFAAoF;IACpF,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE;IAC3B;;;OAGG;IACH,KAAK,EAAE,OAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAEnE;IACD;;;;;;OAMG;IACH,KAAK,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC7B;;OAEG;IACH,QAAQ,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChC;;;;;OAKG;IACH,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACjC,yFAAyF;IACzF,MAAM,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC9B,sFAAsF;IACtF,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAA;AA1CS,QAAA,YAAY,gBA0CrB;
|
|
1
|
+
{"version":3,"file":"option.js","sourceRoot":"","sources":["../src/option.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "massarg",
|
|
3
|
-
"version": "2.0.0-pre.
|
|
3
|
+
"version": "2.0.0-pre.4",
|
|
4
4
|
"description": "Flexible, powerful, and simple command/argument parser for CLI applications",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"shell",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"dev": "tsc --watch",
|
|
20
20
|
"cmd": "ts-node src/sample.ts",
|
|
21
21
|
"test": "jest",
|
|
22
|
-
"doc": "typedoc
|
|
22
|
+
"doc": "typedoc",
|
|
23
23
|
"deploy-doc": "pnpm doc && gh-pages -d docs",
|
|
24
24
|
"semantic-release": "semantic-release"
|
|
25
25
|
},
|
package/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAEnB,gBAAgB;AAChB,wBAAgB,SAAS,CAAC,CAAC,EACzB,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,SAAS,EACjC,OAAO,EAAE,OAAO,GACf,CAAC,CAKH;AACD,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEvF,2EAA2E;AAC3E,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI;KAC3B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/E,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,GAAG,IAAI,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,UA4B7D;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,EAAE,EAAE,MAAM,SAAI,GAAG,MAAM,CAKvE;AAED,gBAAgB;AAChB,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAGhG;AAED,gBAAgB;AAChB,wBAAgB,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,CAYvF;AACD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AAEnB,gBAAgB;AAChB,wBAAgB,SAAS,CAAC,CAAC,EACzB,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,SAAS,EACjC,OAAO,EAAE,OAAO,GACf,CAAC,CAKH;AACD,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEvF,2EAA2E;AAC3E,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI;KAC3B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/E,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,GAAG,IAAI,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,UA4B7D;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,EAAE,EAAE,MAAM,SAAI,GAAG,MAAM,CAKvE;AAED,gBAAgB;AAChB,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAGhG;AAED,gBAAgB;AAChB,wBAAgB,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,CAYvF;AACD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAYhD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI/C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD"}
|
package/utils.js
CHANGED
|
@@ -90,15 +90,15 @@ exports.deepMerge = deepMerge;
|
|
|
90
90
|
* regular spaced strings.
|
|
91
91
|
*/
|
|
92
92
|
function splitWords(str) {
|
|
93
|
-
return str
|
|
93
|
+
return (str
|
|
94
94
|
.replace(/([a-z])([A-Z])/g, '$1 $2')
|
|
95
|
-
.replace(/([a-zA-Z])([0-9])/g, '$1 $2')
|
|
95
|
+
// .replace(/([a-zA-Z])([0-9])/g, '$1 $2')
|
|
96
96
|
.replace(/([0-9])([a-zA-Z])/g, '$1 $2')
|
|
97
97
|
.replace(/([a-z])([_-])/g, '$1 $2')
|
|
98
98
|
.replace(/([_-])([a-zA-Z])/g, '$1 $2')
|
|
99
99
|
.split(/[_-]/)
|
|
100
100
|
.map((s) => s.trim())
|
|
101
|
-
.filter(Boolean);
|
|
101
|
+
.filter(Boolean));
|
|
102
102
|
}
|
|
103
103
|
exports.splitWords = splitWords;
|
|
104
104
|
function toCamelCase(str) {
|
package/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|