Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: use argv-iterator #16

Merged
merged 13 commits into from
Oct 31, 2022
Prev Previous commit
Next Next commit
refactor
  • Loading branch information
privatenumber committed Oct 31, 2022
commit 9adab97b00b29bcebaba9e3cd7797928ad38c22c
28 changes: 14 additions & 14 deletions src/type-flag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,18 @@ export const typeFlag = <Schemas extends Flags>(
const { ignoreUnknown } = options;
const [flagRegistry, flags] = createRegistry(schemas);
const unknownFlags: ParsedFlags['unknownFlags'] = {};
const parsed: ParsedFlags = {
flags,
unknownFlags,
_: Object.assign([], {
[DOUBLE_DASH]: [],
}),
};
const _ = [] as unknown as ParsedFlags['_'];
_[DOUBLE_DASH] = [];

argvIterator(argv, {
onFlag(name, explicitValue, index) {
if (hasOwn(flagRegistry, name)) {
const [parser, values] = flagRegistry[name];
const flagValue = normalizeBoolean(parser, explicitValue);
const getFollowingValue = (value?: string | boolean) => {
const parsedValue = applyParser(parser, value || '');
values.push(parsedValue);
values.push(
applyParser(parser, value || ''),
);
};

return (
Expand All @@ -68,7 +64,7 @@ export const typeFlag = <Schemas extends Flags>(
: getFollowingValue(flagValue)
);
} if (ignoreUnknown) {
parsed._.push(argv[index]);
_.push(argv[index]);
} else {
if (!hasOwn(unknownFlags, name)) {
unknownFlags[name] = [];
Expand All @@ -81,18 +77,22 @@ export const typeFlag = <Schemas extends Flags>(
},

onArgument(argvElement) {
parsed._.push(argvElement);
_.push(argvElement);
},

// merge with onArgument?
onEoF(args) {
parsed._.push(...args);
parsed._[DOUBLE_DASH] = args;
_.push(...args);
_[DOUBLE_DASH] = args;
},
});

type Result = TypeFlag<Schemas>;
return parsed as {
return {
flags,
unknownFlags,
_,
} as {
// This exposes the content of "TypeFlag<T>" in type hints
[Key in keyof Result]: Result[Key];
};
Expand Down