Skip to content

fix: add null checks to list numbering functions #1904

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.

Sign up for GitHub

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

Open
lloyd-lighthouse wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add null checks to list numbering functions #1904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions shared/common/list-numbering/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,17 @@ export const generateOrderedListIndex = ({
return handler ? handler(listLevel, lvlText, customFormat) : null;
};

const createNumbering = (values: string[], lvlText: string): string => {
const createNumbering = (values: string[], lvlText: string | null): string | null => {
if (lvlText == null) return null;
return values.reduce<string>((acc, value, index) => {
return Number(value) > 9
? acc.replace(/^0/, '').replace(`%${index + 1}`, value)
: acc.replace(`%${index + 1}`, value);
}, lvlText);
};

const generateNumbering = (path: number[], lvlText: string, formatter: NumberFormatter): string => {
const generateNumbering = (path: number[], lvlText: string | null, formatter: NumberFormatter): string | null => {
if (lvlText == null) return null;
const formattedValues = path.map((entry, idx) => formatter(entry, idx));
return createNumbering(formattedValues, lvlText);
};
Expand All @@ -74,7 +76,8 @@ const decimalZeroFormatter: NumberFormatter = (value, idx) => {
return `0${value}`;
};

const generateFromCustom = (path: number[], lvlText: string, customFormat: string): string => {
const generateFromCustom = (path: number[], lvlText: string | null, customFormat: string): string | null => {
if (lvlText == null) return null;
if (customFormat.match(/(?:[0]+\d,\s){3}\.{3}/) == null) {
return generateNumbering(path, lvlText, numberToStringFormatter);
}
Expand Down