Skip to content

Commit

Permalink
refactor(flags): remove camelCaseToParamCase method
Browse files Browse the repository at this point in the history
  • Loading branch information
c4spar committed Aug 23, 2020
1 parent 811e310 commit 4587284
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 0 additions & 4 deletions flags/_utils.ts
@@ -1,7 +1,3 @@
export function camelCaseToParamCase( str: string ): string {
return str.replace( /([a-z])([A-Z])/g, '$1-$2' ).toLowerCase();
}

export function paramCaseToCamelCase( str: string ): string {
return str.replace( /-([a-z])/g, g => g[ 1 ].toUpperCase() );
}
6 changes: 4 additions & 2 deletions flags/validate-flags.ts
@@ -1,4 +1,4 @@
import { camelCaseToParamCase, paramCaseToCamelCase } from './_utils.ts';
import { paramCaseToCamelCase } from './_utils.ts';
import { getOption } from './flags.ts';
import { IFlagArgument, IFlagOptions, IFlags, IFlagValue } from './types.ts';

Expand All @@ -20,9 +20,11 @@ interface IFlagOptionsMap {
export function validateFlags( flags: IFlagOptions[], values: IFlags, knownFlaks?: IFlags, allowEmpty?: boolean ): void {

const defaultValues: Record<string, boolean> = {};
const optionNames: Record<string, string> = {};
// Set default value's
for ( const option of flags ) {
const name: string = paramCaseToCamelCase( option.name );
optionNames[ name ] = option.name;
if ( typeof values[ name ] === 'undefined' && typeof option.default !== 'undefined' ) {
values[ name ] = typeof option.default === 'function' ? option.default() : option.default;
defaultValues[ option.name ] = true;
Expand All @@ -37,7 +39,7 @@ export function validateFlags( flags: IFlagOptions[], values: IFlags, knownFlaks

const options: IFlagOptionsMap[] = keys.map( name => ( {
name,
option: getOption( flags, camelCaseToParamCase( name ) )
option: getOption( flags, optionNames[ name ] )
} ) );

for ( const { name, option } of options ) {
Expand Down

0 comments on commit 4587284

Please sign in to comment.