From 8c3def7475dabb63ab5646a659bd54ac7e402227 Mon Sep 17 00:00:00 2001 From: "alxjrvs@gmail.com" Date: Fri, 20 Sep 2024 18:01:08 -0400 Subject: [PATCH] normalizeArgument --- src/parameterizeRollArgument/index.ts | 4 ++-- ...{parseIntoRollOptions.ts => normalizeArgument.ts} | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) rename src/parameterizeRollArgument/{parseIntoRollOptions.ts => normalizeArgument.ts} (74%) diff --git a/src/parameterizeRollArgument/index.ts b/src/parameterizeRollArgument/index.ts index 04117a6dd..d7abb9846 100644 --- a/src/parameterizeRollArgument/index.ts +++ b/src/parameterizeRollArgument/index.ts @@ -2,12 +2,12 @@ import { RandsumRollArgument, RandsumRollParameters } from '~types' import { D } from '~src/D' import { formatDescription } from '~utils/formatDescription' import { formatNotation } from '~utils/formatNotation' -import { parseIntoRollOptions } from './parseIntoRollOptions' +import { normalizeArgument } from './normalizeArgument' function parameterizeRollArgument( argument: RandsumRollArgument ): RandsumRollParameters { - const options = parseIntoRollOptions(argument) + const options = normalizeArgument(argument) const die = new D(options.sides) return { options, diff --git a/src/parameterizeRollArgument/parseIntoRollOptions.ts b/src/parameterizeRollArgument/normalizeArgument.ts similarity index 74% rename from src/parameterizeRollArgument/parseIntoRollOptions.ts rename to src/parameterizeRollArgument/normalizeArgument.ts index 802616fa6..6d05b9408 100644 --- a/src/parameterizeRollArgument/parseIntoRollOptions.ts +++ b/src/parameterizeRollArgument/normalizeArgument.ts @@ -7,9 +7,7 @@ import { import { RandsumRollArgument, RandsumRollOptions } from '~types' import { parseNotation } from '~utils/parseNotation' -function parseIntoRollOptions( - argument: RandsumRollArgument -): RandsumRollOptions { +function normalizeArgument(argument: RandsumRollArgument): RandsumRollOptions { if (isD(argument)) { return { quantity: 1, @@ -25,19 +23,17 @@ function parseIntoRollOptions( return parseNotation(argument) } - const defaultQuantity = 1 - if (Array.isArray(argument)) { return { - quantity: defaultQuantity, + quantity: 1, sides: argument.map(String) } } return { - quantity: defaultQuantity, + quantity: 1, sides: Number(argument || 20) } } -export { parseIntoRollOptions } +export { normalizeArgument }