Skip to content

Some performance improvement and refactoring #470

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

Merged
merged 7 commits into from
Nov 7, 2022
Merged

Some performance improvement and refactoring #470

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0115aeb
perf: remove `substring` from while loop
RAX7 Oct 31, 2022
43a1c5b
perf: replace `Array.filter` with `Array.some`
RAX7 Oct 31, 2022
97421c3
perf: reuse existing `Map`
RAX7 Oct 31, 2022
aa59447
refactor: better naming for some functions and add error handling
RAX7 Oct 31, 2022
c7c49ba
revert: functions renaming
RAX7 Nov 1, 2022
3358665
fix: trim strings with only ASCIIWhitespaces or c0ControlCodes
RAX7 Nov 7, 2022
17fcb66
perf: better fix
RAX7 Nov 7, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 84 additions & 39 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,23 +353,27 @@ export function parseSrc(input) {
throw new Error("Must be non-empty");
}

let startOffset = 0;
let value = input;
let start = 0;
for (; start < input.length && isASCIIWhitespace(input[start]); start++);

while (isASCIIWhitespace(value.substring(0, 1))) {
startOffset += 1;
value = value.substring(1, value.length);
if (start === input.length) {
throw new Error("Must be non-empty");
}

while (isASCIIWhitespace(value.substring(value.length - 1, value.length))) {
value = value.substring(0, value.length - 1);
}
let end = input.length - 1;
for (; end > -1 && isASCIIWhitespace(input[end]); end--);
end += 1;

if (!value) {
throw new Error("Must be non-empty");
let value = input;
if (start !== 0 || end !== value.length) {
value = value.substring(start, end);

if (!value) {
throw new Error("Must be non-empty");
}
}

return { value, startOffset };
return { value, startOffset: start };
}

const WINDOWS_ABS_PATH_REGEXP = /^[a-zA-Z]:[\\/]|^\\\\/;
Expand Down Expand Up @@ -572,7 +576,7 @@ function linkHrefFilter(tag, attribute, attributes) {

rel = rel.toLowerCase();

const usedRels = rel.split(" ").filter((value) => value);
const usedRels = rel.split(" ").filter(Boolean);
const allowedRels = [
"stylesheet",
"icon",
Expand All @@ -585,7 +589,7 @@ function linkHrefFilter(tag, attribute, attributes) {
"preload",
];

return allowedRels.filter((value) => usedRels.includes(value)).length > 0;
return allowedRels.some((value) => usedRels.includes(value));
}

const META = new Map([
Expand Down Expand Up @@ -695,7 +699,16 @@ export function srcType(options) {
);
}

source = c0ControlCodesExclude(source);
try {
source = c0ControlCodesExclude(source);
} catch (error) {
throw new HtmlSourceError(
`Bad value for attribute "${options.attribute}" on element "${options.tag}": ${error.message}`,
options.attributeStartOffset,
options.attributeEndOffset,
options.html
);
}

if (!isUrlRequestable(source.value)) {
return [];
Expand Down Expand Up @@ -726,7 +739,16 @@ export function srcsetType(options) {
sourceSet.forEach((sourceItem) => {
let { source } = sourceItem;

source = c0ControlCodesExclude(source);
try {
source = c0ControlCodesExclude(source);
} catch (error) {
throw new HtmlSourceError(
`Bad value for attribute "${options.attribute}" on element "${options.tag}": ${error.message}`,
options.attributeStartOffset,
options.attributeEndOffset,
options.html
);
}

if (!isUrlRequestable(source.value)) {
return false;
Expand Down Expand Up @@ -778,7 +800,16 @@ function metaContentType(options) {
);
}

source = c0ControlCodesExclude(source);
try {
source = c0ControlCodesExclude(source);
} catch (error) {
throw new HtmlSourceError(
`Bad value for attribute "icon-uri" on element "${options.tag}": ${error.message}`,
options.attributeStartOffset,
options.attributeEndOffset,
options.html
);
}

({ value } = source);
startOffset += source.startOffset;
Expand All @@ -805,7 +836,7 @@ function metaContentType(options) {
// let source;
//
// try {
// source = parseSrc(options.value);
// source = trimASCIIWhitespace(options.value);
// } catch (error) {
// throw new HtmlSourceError(
// `Bad value for attribute "${options.attribute}" on element "${options.tag}": ${error.message}`,
Expand All @@ -815,7 +846,16 @@ function metaContentType(options) {
// );
// }
//
// source = c0ControlCodesExclude(source);
// try {
// source = c0ControlCodesExclude(source);
// } catch (error) {
// throw new HtmlSourceError(
// `Bad value for attribute "${options.attribute}" on element "${options.tag}": ${error.message}`,
// options.attributeStartOffset,
// options.attributeEndOffset,
// options.html
// );
// }
//
// if (!isUrlRequestable(source.value)) {
// return [];
Expand Down Expand Up @@ -1062,17 +1102,13 @@ function normalizeSourcesList(sources) {
for (const source of sources) {
if (source === "...") {
for (const [tag, attributes] of defaultSources.entries()) {
let newAttributes;

const existingAttributes = result.get(tag);

if (existingAttributes) {
newAttributes = new Map([...existingAttributes, ...attributes]);
attributes.forEach(([k, v]) => existingAttributes.set(k, v));
} else {
newAttributes = new Map(attributes);
result.set(tag, new Map(attributes));
}

result.set(tag, newAttributes);
}

// eslint-disable-next-line no-continue
Expand All @@ -1084,10 +1120,6 @@ function normalizeSourcesList(sources) {
tag = tag.toLowerCase();
attribute = attribute.toLowerCase();

if (!result.has(tag)) {
result.set(tag, new Map());
}

let typeFn;

// eslint-disable-next-line default-case
Expand All @@ -1100,7 +1132,14 @@ function normalizeSourcesList(sources) {
break;
}

result.get(tag).set(attribute, {
let attrMap = result.get(tag);

if (!attrMap) {
attrMap = new Map();
result.set(tag, attrMap);
}

attrMap.set(attribute, {
type: typeFn,
filter: source.filter,
});
Expand Down Expand Up @@ -1265,26 +1304,32 @@ function isASCIIC0group(character) {
}

export function c0ControlCodesExclude(source) {
let { value, startOffset } = source;
let { value } = source;

if (!value) {
throw new Error("Must be non-empty");
}

while (isASCIIC0group(value.substring(0, 1))) {
startOffset += 1;
value = value.substring(1, value.length);
}
let start = 0;
for (; start < value.length && isASCIIC0group(value[start]); start++);

while (isASCIIC0group(value.substring(value.length - 1, value.length))) {
value = value.substring(0, value.length - 1);
if (start === value.length) {
throw new Error("Must be non-empty");
}

if (!value) {
throw new Error("Must be non-empty");
let end = value.length - 1;
for (; end > -1 && isASCIIC0group(value[end]); end--);
end += 1;

if (start !== 0 || end !== value.length) {
value = value.substring(start, end);

if (!value) {
throw new Error("Must be non-empty");
}
}

return { value, startOffset };
return { value, startOffset: source.startOffset + start };
}

export function traverse(root, callback) {
Expand Down