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.

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

Jump to bottom

Performance - Drastically improve worst case regex performance #51

Merged
merged 3 commits into from
Oct 28, 2023
Merged

Performance - Drastically improve worst case regex performance #51

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cbdcae
Performance - Drastically improve worst case regex performance
adam-arthur Jan 16, 2023
158ea17
Update index.js
sindresorhus Jan 20, 2023
312bc5a
Update index.js
sindresorhus Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ const wrapWord = (rows, word, columns) => {

if (ESCAPES.has(character)) {
isInsideEscape = true;
isInsideLinkEscape = characters.slice(index + 1).join('').startsWith(ANSI_ESCAPE_LINK);

const ansiEscapeLinkCandidate = characters.slice(index + 1, index + 1 + ANSI_ESCAPE_LINK.length).join('');
isInsideLinkEscape = ansiEscapeLinkCandidate === ANSI_ESCAPE_LINK;
}

if (isInsideEscape) {
Expand Down Expand Up @@ -164,13 +166,17 @@ const exec = (string, columns, options = {}) => {
rows = rows.map(row => stringVisibleTrimSpacesRight(row));
}

const pre = [...rows.join('\n')];
const preString = rows.join('\n');
const pre = [...preString];

// We need to keep a separate index as `String#slice()` works on Unicode code units, while `pre` is an array of codepoints.
let preStringIndex = 0;

for (const [index, character] of pre.entries()) {
returnValue += character;

if (ESCAPES.has(character)) {
const {groups} = new RegExp(`(?:\\${ANSI_CSI}(?<code>\\d+)m|\\${ANSI_ESCAPE_LINK}(?<uri>.*)${ANSI_ESCAPE_BELL})`).exec(pre.slice(index).join('')) || {groups: {}};
const {groups} = new RegExp(`(?:\\${ANSI_CSI}(?<code>\\d+)m|\\${ANSI_ESCAPE_LINK}(?<uri>.*)${ANSI_ESCAPE_BELL})`).exec(preString.slice(preStringIndex)) || {groups: {}};
if (groups.code !== undefined) {
const code = Number.parseFloat(groups.code);
escapeCode = code === END_CODE ? undefined : code;
Expand Down Expand Up @@ -198,6 +204,8 @@ const exec = (string, columns, options = {}) => {
returnValue += wrapAnsiHyperlink(escapeUrl);
}
}

preStringIndex += character.length;
}

return returnValue;
Expand Down