From b57b7ac8ea11b9af5324f73a96ae450566d22f4a Mon Sep 17 00:00:00 2001 From: TheoryOfNekomata Date: Sun, 13 Aug 2023 00:15:26 +0800 Subject: [PATCH] Format code Format more sections of the code. --- packages/core/.eslintrc | 3 +- packages/core/src/systems/en-US.ts | 100 ++++++++++++++++------------- 2 files changed, 56 insertions(+), 47 deletions(-) diff --git a/packages/core/.eslintrc b/packages/core/.eslintrc index e479339..216dd0a 100644 --- a/packages/core/.eslintrc +++ b/packages/core/.eslintrc @@ -2,7 +2,8 @@ "root": true, "rules": { "indent": ["error", "tab"], - "no-tabs": "off" + "no-tabs": "off", + "no-continue": "off" }, "extends": [ "lxsmnsyc/typescript" diff --git a/packages/core/src/systems/en-US.ts b/packages/core/src/systems/en-US.ts index 7a0d1e5..fb36361 100644 --- a/packages/core/src/systems/en-US.ts +++ b/packages/core/src/systems/en-US.ts @@ -132,7 +132,7 @@ const makeTensName = (tens: number, ones: number) => { } if (tens === 1) { - return TEN_PLUS_ONES[ones] as TenPlusOnesName; + return TEN_PLUS_ONES[ones] as unknown as TenPlusOnesName; } if (ones === 0) { @@ -172,7 +172,12 @@ const makeDecillionsPrefix = (decillions: number, millions: number, milliaCount: return `${onesPrefix}${tensName}` as const; }; -const makeCentillionsPrefix = (centillions: number, decillions: number, millions: number, milliaCount: number) => { +const makeCentillionsPrefix = ( + centillions: number, + decillions: number, + millions: number, + milliaCount: number, +) => { if (centillions === 0) { return makeDecillionsPrefix(decillions, millions, milliaCount); } @@ -210,10 +215,10 @@ const getGroupName = (place: number, shortenMillia: boolean) => { return [ [c + firstGroup[0], currentPlace], - ...acc.slice(1) + ...acc.slice(1), ]; }, - [] + [], ) .map(([group, groupPlace]) => [group.padStart(3, '0'), groupPlace] as const) .filter(([group]) => group !== '000') @@ -248,7 +253,11 @@ const getGroupName = (place: number, shortenMillia: boolean) => { return `${groupGroups}${ILLION_SUFFIX}` as const; }; -export const makeGroup = (group: string, place: number, options?: Record): string => { +export const makeGroup = ( + group: string, + place: number, + options?: Record, +): string => { const makeHundredsArgs = group .padStart(3, '0') .split('') @@ -274,7 +283,8 @@ export const group = (value: string): Group[] => { decimalPoint: DECIMAL_POINT, groupingSymbol: GROUPING_SYMBOL, exponentDelimiter, - }) + }, + ) .split(exponentDelimiter); const exponent = Number(exponentString); const significantDigits = significand.replace(DECIMAL_POINT, ''); @@ -288,7 +298,7 @@ export const group = (value: string): Group[] => { lastGroupDigits[currentPlaceInGroup] = c; return [...acc.slice(0, -1) ?? [], [ lastGroupDigits.join(''), - currentPlace + currentPlace, ]]; } return [...acc, [c.padEnd(3, '0'), currentPlace]]; @@ -316,8 +326,8 @@ export const makeNegative = (s: string) => ( `${NEGATIVE} ${s}` ); -export const tokenize = (s: string) => ( - s.split(' ').filter((s) => s.length > 0) +export const tokenize = (stringValue: string) => ( + stringValue.split(' ').filter((maybeToken) => maybeToken.length > 0) ); const FINAL_TOKEN = ''; @@ -328,9 +338,7 @@ const getGroupFromGroupName = (groupName: string) => { } const groupNameBase = groupName.replace(ILLION_SUFFIX, ''); - const specialMillions = MILLIONS_SPECIAL_PREFIXES.findIndex((p) => { - return groupNameBase === p; - }); + const specialMillions = MILLIONS_SPECIAL_PREFIXES.findIndex((p) => groupNameBase === p); if (specialMillions > -1) { return 1 + specialMillions; @@ -338,7 +346,7 @@ const getGroupFromGroupName = (groupName: string) => { let groupNameCurrent = groupNameBase; - let millias = [0]; + const millias = [0]; let milliaIndex = 0; while (groupNameCurrent.length > 0) { @@ -346,9 +354,9 @@ const getGroupFromGroupName = (groupName: string) => { break; } - const centillions = CENTILLIONS_PREFIXES.findIndex((p) => { - return p.length > 0 && groupNameCurrent.startsWith(p); - }); + const centillions = CENTILLIONS_PREFIXES.findIndex((p) => ( + p.length > 0 && groupNameCurrent.startsWith(p) + )); if (centillions > -1) { milliaIndex = 0; @@ -357,9 +365,9 @@ const getGroupFromGroupName = (groupName: string) => { continue; } - const decillions = DECILLIONS_PREFIXES.findIndex((p) => { - return p.length > 0 && groupNameCurrent.startsWith(p); - }); + const decillions = DECILLIONS_PREFIXES.findIndex((p) => ( + p.length > 0 && groupNameCurrent.startsWith(p) + )); if (decillions > -1) { milliaIndex = 0; @@ -368,9 +376,9 @@ const getGroupFromGroupName = (groupName: string) => { continue; } - const millions = MILLIONS_PREFIXES.findIndex((p) => { - return p.length > 0 && groupNameCurrent.startsWith(p); - }); + const millions = MILLIONS_PREFIXES.findIndex((p) => ( + p.length > 0 && groupNameCurrent.startsWith(p) + )); if (millions > -1) { milliaIndex = 0; @@ -407,7 +415,7 @@ const getGroupFromGroupName = (groupName: string) => { millias .map((s) => s.toString().padStart(3, '0')) .reverse() - .join('') + .join(''), ); return 1 + bigGroupPlace; @@ -415,11 +423,11 @@ const getGroupFromGroupName = (groupName: string) => { enum ParseGroupsMode { INITIAL = 'unknown', - ONES = 'ones', - TENS = 'tens', - TEN_PLUS_ONES = 'tenPlusOnes', - HUNDRED = 'hundred', - THOUSAND = 'thousand', + ONES_MODE = 'ones', + TENS_MODE = 'tens', + TEN_PLUS_ONES_MODE = 'tenPlusOnes', + HUNDRED_MODE = 'hundred', + THOUSAND_MODE = 'thousand', DONE = 'done', } @@ -435,7 +443,7 @@ export const parseGroups = (tokens: string[]) => { const lastGroup = acc.groups.at(-1) ?? ['000', 0]; if (token === THOUSAND || token.endsWith(ILLION_SUFFIX)) { - if (acc.mode === ParseGroupsMode.ONES) { + if (acc.mode === ParseGroupsMode.ONES_MODE) { const ones = ONES.findIndex((o) => o === acc.lastToken); lastGroup[0] = `${lastGroup[0].slice(0, 2)}${ones}`; } @@ -446,24 +454,24 @@ export const parseGroups = (tokens: string[]) => { ...acc, groups: [...acc.groups.slice(0, -1), lastGroup], lastToken: token, - mode: ParseGroupsMode.THOUSAND, - } + mode: ParseGroupsMode.THOUSAND_MODE, + }; } if (token === HUNDRED) { - if (acc.mode === ParseGroupsMode.ONES) { + if (acc.mode === ParseGroupsMode.ONES_MODE) { const hundreds = ONES.findIndex((o) => o === acc.lastToken); lastGroup[0] = `${hundreds}${lastGroup[0].slice(1)}`; return { ...acc, groups: [...acc.groups.slice(0, -1), lastGroup], - mode: ParseGroupsMode.HUNDRED, + mode: ParseGroupsMode.HUNDRED_MODE, }; } } if (token === FINAL_TOKEN) { - if (acc.mode === ParseGroupsMode.ONES) { + if (acc.mode === ParseGroupsMode.ONES_MODE) { const ones = ONES.findIndex((o) => o === acc.lastToken); lastGroup[0] = `${lastGroup[0].slice(0, 2)}${ones}`; lastGroup[1] = 0; @@ -476,19 +484,19 @@ export const parseGroups = (tokens: string[]) => { } if (ONES.includes(token as OnesName)) { - if (acc.mode === ParseGroupsMode.THOUSAND) { + if (acc.mode === ParseGroupsMode.THOUSAND_MODE) { return { ...acc, lastToken: token, - mode: ParseGroupsMode.ONES, + mode: ParseGroupsMode.ONES_MODE, groups: [...acc.groups, ['000', 0]], - } + }; } return { ...acc, lastToken: token, - mode: ParseGroupsMode.ONES, - } + mode: ParseGroupsMode.ONES_MODE, + }; } const tenPlusOnes = TEN_PLUS_ONES.findIndex((t) => t === token); @@ -497,8 +505,8 @@ export const parseGroups = (tokens: string[]) => { return { ...acc, lastToken: token, - mode: ParseGroupsMode.TEN_PLUS_ONES, - groups: [...acc.groups.slice(0, -1), lastGroup] + mode: ParseGroupsMode.TEN_PLUS_ONES_MODE, + groups: [...acc.groups.slice(0, -1), lastGroup], }; } @@ -508,7 +516,7 @@ export const parseGroups = (tokens: string[]) => { return { ...acc, lastToken: token, - mode: ParseGroupsMode.TENS, + mode: ParseGroupsMode.TENS_MODE, groups: [...acc.groups.slice(0, -1), lastGroup], }; } @@ -533,11 +541,11 @@ export const combineGroups = (groups: Group[]) => { const firstGroup = groupsSorted[0]; const firstGroupPlace = firstGroup[1]; const digits = groupsSorted.reduce( - (s, group) => { - const [groupDigits] = group; - return `${s}${groupDigits}`; + (previousDigits, thisGroup) => { + const [groupDigits] = thisGroup; + return `${previousDigits}${groupDigits}`; }, - '' + '', ).replace(/^0+/, '') || '0'; const firstGroupDigits = firstGroup[0]; const firstGroupDigitsWithoutZeroes = firstGroupDigits.replace(/^0+/, '');