diff --git a/README.md b/README.md
index c3bb0cb7..81bcc7ad 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,7 @@ Supported tags and attributes:
- the `href` attribute of the `link` tag when the `rel` attribute contains `stylesheet`, `icon`, `shortcut icon`, `mask-icon`, `apple-touch-icon`, `apple-touch-icon-precomposed`, `apple-touch-startup-image`, `manifest`, `prefetch`, `preload` or when the `itemprop` attribute is `image`, `logo`, `screenshot`, `thumbnailurl`, `contenturl`, `downloadurl`, `duringmedia`, `embedurl`, `installurl`, `layoutimage`
- the `imagesrcset` attribute of the `link` tag when the `rel` attribute contains `stylesheet`, `icon`, `shortcut icon`, `mask-icon`, `apple-touch-icon`, `apple-touch-icon-precomposed`, `apple-touch-startup-image`, `manifest`, `prefetch`, `preload`
- the `content` attribute of the `meta` tag when the `name` attribute is `msapplication-tileimage`, `msapplication-square70x70logo`, `msapplication-square150x150logo`, `msapplication-wide310x150logo`, `msapplication-square310x310logo`, `msapplication-config`, `twitter:image` or when the `property` attribute is `og:image`, `og:image:url`, `og:image:secure_url`, `og:audio`, `og:audio:secure_url`, `og:video`, `og:video:secure_url`, `vk:image` or when the `itemprop` attribute is `image`, `logo`, `screenshot`, `thumbnailurl`, `contenturl`, `downloadurl`, `duringmedia`, `embedurl`, `installurl`, `layoutimage`
+- the `icon-uri` value component in `content` attribute of the `meta` tag when the `name` attribute is `msapplication-task`
#### `Boolean`
diff --git a/src/plugins/sources-plugin.js b/src/plugins/sources-plugin.js
index 311d4bd0..c662f2ae 100644
--- a/src/plugins/sources-plugin.js
+++ b/src/plugins/sources-plugin.js
@@ -1,15 +1,13 @@
import SAXParser from 'parse5-sax-parser';
-import HtmlSourceError from '../HtmlSourceError';
import {
getFilter,
- parseSrc,
- parseSrcset,
normalizeUrl,
requestify,
isUrlRequestable,
- c0ControlCodesExclude,
stringifyRequest,
+ typeSrc,
+ typeSrcset,
} from '../utils';
export default (options) =>
@@ -46,7 +44,7 @@ export default (options) =>
const { tagName, attrs, sourceCodeLocation } = node;
attrs.forEach((attribute) => {
- const { value, prefix } = attribute;
+ const { prefix } = attribute;
let { name } = attribute;
name = prefix ? `${prefix}:${name}` : name;
@@ -72,96 +70,49 @@ export default (options) =>
target[target.length - 1] !== '"' &&
target[target.length - 1] !== "'";
+ const result = [];
+
// eslint-disable-next-line default-case
switch (type) {
case 'src': {
- let source;
-
- try {
- source = parseSrc(value);
- } catch (error) {
- options.errors.push(
- new HtmlSourceError(
- `Bad value for attribute "${attribute.name}" on element "${tagName}": ${error.message}`,
- sourceCodeLocation.attrs[name].startOffset,
- sourceCodeLocation.attrs[name].endOffset,
- html
- )
- );
-
- return;
- }
-
- source = c0ControlCodesExclude(source);
-
- if (!isUrlRequestable(source.value)) {
- return;
- }
-
- const startOffset =
- sourceCodeLocation.attrs[name].startOffset +
- target.indexOf(source.value, name.length);
-
- sources.push({
- name,
- value: source.value,
- unquoted,
- startIndex: startOffset,
- endIndex: startOffset + source.value.length,
- });
-
+ typeSrc({ name, attribute, node, target, html, options }).forEach(
+ (i) => {
+ result.push(i);
+ }
+ );
break;
}
case 'srcset': {
- let sourceSet;
-
- try {
- sourceSet = parseSrcset(value);
- } catch (error) {
- options.errors.push(
- new HtmlSourceError(
- `Bad value for attribute "${attribute.name}" on element "${tagName}": ${error.message}`,
- sourceCodeLocation.attrs[name].startOffset,
- sourceCodeLocation.attrs[name].endOffset,
- html
- )
- );
-
- return;
- }
-
- sourceSet = sourceSet.map((item) => {
- return {
- source: c0ControlCodesExclude(item.source),
- };
+ typeSrcset({
+ name,
+ attribute,
+ node,
+ target,
+ html,
+ options,
+ }).forEach((i) => {
+ result.push(i);
});
+ break;
+ }
- let searchFrom = name.length;
-
- sourceSet.forEach((sourceItem) => {
- const { source } = sourceItem;
-
- if (!isUrlRequestable(source.value)) {
- return;
+ default: {
+ type({ name, attribute, node, target, html, options }).forEach(
+ (i) => {
+ result.push(i);
}
+ );
+ }
+ }
- const startOffset =
- sourceCodeLocation.attrs[name].startOffset +
- target.indexOf(source.value, searchFrom);
-
- searchFrom = target.indexOf(source.value, searchFrom) + 1;
-
- sources.push({
- name,
- value: source.value,
- unquoted,
- startIndex: startOffset,
- endIndex: startOffset + source.value.length,
- });
+ for (const i of result) {
+ if (i) {
+ sources.push({
+ ...i,
+ name,
+ unquoted,
});
-
- break;
}
}
});
diff --git a/src/utils.js b/src/utils.js
index b79f8e20..21eba663 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,5 +1,7 @@
import path from 'path';
+import HtmlSourceError from './HtmlSourceError';
+
function isASCIIWhitespace(character) {
return (
// Horizontal tab
@@ -608,6 +610,7 @@ const META = new Map([
'layoutimage',
]),
],
+ ['name', new Set(['msapplication-task'])],
]);
function linkItempropFilter(tag, attribute, attributes) {
@@ -658,6 +661,183 @@ function metaContentFilter(tag, attribute, attributes) {
return false;
}
+export function typeSrc({ name, attribute, node, target, html, options }) {
+ const { tagName, sourceCodeLocation } = node;
+ const { value } = attribute;
+ const result = [];
+ let source;
+
+ try {
+ source = parseSrc(value);
+ } catch (error) {
+ options.errors.push(
+ new HtmlSourceError(
+ `Bad value for attribute "${attribute.name}" on element "${tagName}": ${error.message}`,
+ sourceCodeLocation.attrs[name].startOffset,
+ sourceCodeLocation.attrs[name].endOffset,
+ html
+ )
+ );
+
+ return result;
+ }
+
+ source = c0ControlCodesExclude(source);
+
+ if (!isUrlRequestable(source.value)) {
+ return result;
+ }
+
+ const startOffset =
+ sourceCodeLocation.attrs[name].startOffset +
+ target.indexOf(source.value, name.length);
+
+ result.push({
+ value: source.value,
+ startIndex: startOffset,
+ endIndex: startOffset + source.value.length,
+ });
+
+ return result;
+}
+
+export function typeSrcset({ name, attribute, node, target, html, options }) {
+ const { tagName, sourceCodeLocation } = node;
+ const { value } = attribute;
+ const result = [];
+ let sourceSet;
+
+ try {
+ sourceSet = parseSrcset(value);
+ } catch (error) {
+ options.errors.push(
+ new HtmlSourceError(
+ `Bad value for attribute "${attribute.name}" on element "${tagName}": ${error.message}`,
+ sourceCodeLocation.attrs[name].startOffset,
+ sourceCodeLocation.attrs[name].endOffset,
+ html
+ )
+ );
+
+ return result;
+ }
+
+ sourceSet = sourceSet.map((item) => {
+ return {
+ source: c0ControlCodesExclude(item.source),
+ };
+ });
+
+ let searchFrom = name.length;
+
+ sourceSet.forEach((sourceItem) => {
+ const { source } = sourceItem;
+
+ if (!isUrlRequestable(source.value)) {
+ return false;
+ }
+
+ const startOffset =
+ sourceCodeLocation.attrs[name].startOffset +
+ target.indexOf(source.value, searchFrom);
+
+ searchFrom = target.indexOf(source.value, searchFrom) + 1;
+
+ result.push({
+ value: source.value,
+ startIndex: startOffset,
+ endIndex: startOffset + source.value.length,
+ });
+
+ return false;
+ });
+
+ return result;
+}
+
+function typeMsapplicationTask({
+ name,
+ attribute,
+ node,
+ target,
+ html,
+ options,
+}) {
+ const { tagName, sourceCodeLocation } = node;
+ const [content] = typeSrc({ name, attribute, node, target, html, options });
+ const result = [];
+
+ if (!content) {
+ return result;
+ }
+
+ let startIndex = 0;
+ let endIndex = 0;
+ let foundIconUri;
+ let source;
+
+ content.value.split(';').forEach((i) => {
+ if (foundIconUri) {
+ return;
+ }
+
+ if (!i.includes('icon-uri')) {
+ // +1 because of ";"
+ startIndex += i.length + 1;
+ return;
+ }
+
+ foundIconUri = true;
+
+ const [, aValue] = i.split('=');
+
+ try {
+ source = parseSrc(aValue);
+ } catch (error) {
+ options.errors.push(
+ new HtmlSourceError(
+ `Bad value for attribute "icon-uri" on element "${tagName}": ${error.message}`,
+ sourceCodeLocation.attrs[name].startOffset,
+ sourceCodeLocation.attrs[name].endOffset,
+ html
+ )
+ );
+
+ return;
+ }
+
+ // +1 because of "="
+ startIndex += i.indexOf('=') + source.startIndex + 1;
+ endIndex = startIndex + source.value.length;
+ });
+
+ if (!source) {
+ return result;
+ }
+
+ result.push({
+ ...content,
+ startIndex: content.startIndex + startIndex,
+ endIndex: content.startIndex + endIndex,
+ name: 'icon-uri',
+ value: source.value,
+ });
+
+ return result;
+}
+
+function metaContentType({ name, attribute, node, target, html, options }) {
+ const isMsapplicationTask = node.attrs.filter(
+ (i) =>
+ i.name.toLowerCase() === 'name' &&
+ i.value.toLowerCase() === 'msapplication-task'
+ );
+
+ return isMsapplicationTask.length === 0
+ ? typeSrc({ name, attribute, node, target, html, options })
+ : typeMsapplicationTask({ name, attribute, node, target, html, options });
+}
+
const defaultAttributes = [
{
tag: 'audio',
@@ -699,7 +879,7 @@ const defaultAttributes = [
{
tag: 'meta',
attribute: 'content',
- type: 'src',
+ type: metaContentType,
filter: metaContentFilter,
},
{
diff --git a/test/__snapshots__/esModule-option.test.js.snap b/test/__snapshots__/esModule-option.test.js.snap
index 527eb8c0..da87abd8 100644
--- a/test/__snapshots__/esModule-option.test.js.snap
+++ b/test/__snapshots__/esModule-option.test.js.snap
@@ -23,7 +23,7 @@ var ___HTML_LOADER_IMPORT_14___ = new URL(\\"aliasImageWithSpace\\", import.meta
var ___HTML_LOADER_IMPORT_15___ = new URL(\\"./webpack.svg\\", import.meta.url);
var ___HTML_LOADER_IMPORT_16___ = new URL(\\"./pixel.png?url\\", import.meta.url);
var ___HTML_LOADER_IMPORT_17___ = new URL(\\"./site.webmanifest\\", import.meta.url);
-var ___HTML_LOADER_IMPORT_18___ = new URL(\\"./browserconfig.xml\\", import.meta.url);
+var ___HTML_LOADER_IMPORT_18___ = new URL(\\"./favicon.ico\\", import.meta.url);
var ___HTML_LOADER_IMPORT_19___ = new URL(\\"./sound.mp3\\", import.meta.url);
var ___HTML_LOADER_IMPORT_20___ = new URL(\\"./video.mp4\\", import.meta.url);
var ___HTML_LOADER_IMPORT_21___ = new URL(\\"./nested/image3.png\\", import.meta.url);
@@ -61,7 +61,7 @@ var ___HTML_LOADER_REPLACEMENT_28___ = ___HTML_LOADER_GET_SOURCE_FROM_IMPORT___(
var ___HTML_LOADER_REPLACEMENT_29___ = ___HTML_LOADER_GET_SOURCE_FROM_IMPORT___(___HTML_LOADER_IMPORT_20___);
var ___HTML_LOADER_REPLACEMENT_30___ = ___HTML_LOADER_GET_SOURCE_FROM_IMPORT___(___HTML_LOADER_IMPORT_21___);
var ___HTML_LOADER_REPLACEMENT_31___ = ___HTML_LOADER_GET_SOURCE_FROM_IMPORT___(___HTML_LOADER_IMPORT_22___);
-var code = \\"\\\\n\\\\nMy First Heading
\\\\nMy first paragraph.
\\\\nAn Unordered HTML List
\\\\n\\\\n\\\\n - Coffee
\\\\n - Tea
\\\\n - Milk
\\\\n
\\\\n\\\\nAn Ordered HTML List
\\\\n\\\\n\\\\n - Coffee
\\\\n - Tea
\\\\n - Milk
\\\\n
\\\\n\\\\n\\\\n\\\\n\\\\n\\\\nFoo
\\\\n\\\\n\\\\nBAR
\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n![](\\\\\\"\\")
\\\\n![](\\" + ___HTML_LOADER_REPLACEMENT_0___ + \\")
\\\\n![](\\")
\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n![](\\\\\\"//image.png\\\\\\")
\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n \\\\n \\\\n \\\\n\\\\n\\\\n\\\\n\\\\n