html-validate 6.0.2 → 6.1.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # html-validate changelog
 
+## [6.1.0](https://gitlab.com/html-validate/html-validate/compare/v6.0.2...v6.1.0) (2021-10-02)
+
+### Features
+
+- **rules:** `allowed-links` support `include` and `exclude` ([a3f7b6a](https://gitlab.com/html-validate/html-validate/commit/a3f7b6aa2414ab41239ec1aed6d463502575bb13))
+
+### Bug Fixes
+
+- handle multiline templating strings ([cddf7d5](https://gitlab.com/html-validate/html-validate/commit/cddf7d5e66ad3ce3f49b32b5dea873b04f9b6f7d)), closes [#134](https://gitlab.com/html-validate/html-validate/issues/134)
+
 ### [6.0.2](https://gitlab.com/html-validate/html-validate/compare/v6.0.1...v6.0.2) (2021-09-27)
 
 ### Bug Fixes

package/dist/cjs/core.js

@@ -2864,7 +2864,7 @@ var TRANSFORMER_API;
 })(TRANSFORMER_API || (TRANSFORMER_API = {}));
 
 const name = "html-validate";
-const version = "6.0.2";
+const version = "6.1.0";
 const homepage = "https://html-validate.org";
 const bugs = {
 	url: "https://gitlab.com/html-validate/html-validate/issues/new"
@@ -3154,24 +3154,60 @@ const description = {
     ["absolute" /* ABSOLUTE */]: "Absolute links are not allowed by current configuration.",
     ["anchor" /* ANCHOR */]: null,
 };
+function parseAllow(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    return {
+        /* eslint-disable security/detect-non-literal-regexp */
+        include: value.include ? value.include.map((it) => new RegExp(it)) : null,
+        exclude: value.exclude ? value.exclude.map((it) => new RegExp(it)) : null,
+        /* eslint-enable security/detect-non-literal-regexp */
+    };
+}
+/**
+ * @internal
+ */
+function matchList(value, list) {
+    if (list.include && !list.include.some((it) => it.test(value))) {
+        return false;
+    }
+    if (list.exclude && list.exclude.some((it) => it.test(value))) {
+        return false;
+    }
+    return true;
+}
 class AllowedLinks extends Rule {
     constructor(options) {
         super({ ...defaults$p, ...options });
+        this.allowExternal = parseAllow(this.options.allowExternal);
+        this.allowRelative = parseAllow(this.options.allowRelative);
+        this.allowAbsolute = parseAllow(this.options.allowAbsolute);
     }
     static schema() {
+        const booleanOrObject = {
+            anyOf: [
+                { type: "boolean" },
+                {
+                    type: "object",
+                    properties: {
+                        include: {
+                            type: "array",
+                            items: { type: "string" },
+                        },
+                        exclude: {
+                            type: "array",
+                            items: { type: "string" },
+                        },
+                    },
+                },
+            ],
+        };
         return {
-            allowAbsolute: {
-                type: "boolean",
-            },
-            allowBase: {
-                type: "boolean",
-            },
-            allowExternal: {
-                type: "boolean",
-            },
-            allowRelative: {
-                type: "boolean",
-            },
+            allowExternal: { ...booleanOrObject },
+            allowRelative: { ...booleanOrObject },
+            allowAbsolute: { ...booleanOrObject },
+            allowBase: { type: "boolean" },
         };
     }
     documentation(context) {
@@ -3193,16 +3229,16 @@ class AllowedLinks extends Rule {
                     /* anchor links are always allowed by this rule */
                     break;
                 case "absolute" /* ABSOLUTE */:
-                    this.handleAbsolute(event, style);
+                    this.handleAbsolute(link, event, style);
                     break;
                 case "external" /* EXTERNAL */:
-                    this.handleExternal(event, style);
+                    this.handleExternal(link, event, style);
                     break;
                 case "relative-base" /* RELATIVE_BASE */:
-                    this.handleRelativeBase(event, style);
+                    this.handleRelativeBase(link, event, style);
                     break;
                 case "relative-path" /* RELATIVE_PATH */:
-                    this.handleRelativePath(event, style);
+                    this.handleRelativePath(link, event, style);
                     break;
             }
         });
@@ -3236,28 +3272,49 @@ class AllowedLinks extends Rule {
                 return "relative-base" /* RELATIVE_BASE */;
         }
     }
-    handleAbsolute(event, style) {
-        const { allowAbsolute } = this.options;
-        if (!allowAbsolute) {
+    handleAbsolute(target, event, style) {
+        const { allowAbsolute } = this;
+        if (allowAbsolute === true) {
+            return;
+        }
+        else if (allowAbsolute === false) {
             this.report(event.target, "Link destination must not be absolute url", event.valueLocation, style);
         }
+        else if (!matchList(target, allowAbsolute)) {
+            this.report(event.target, "Absolute link to this destination is not allowed by current configuration", event.valueLocation, style);
+        }
     }
-    handleExternal(event, style) {
-        const { allowExternal } = this.options;
-        if (!allowExternal) {
+    handleExternal(target, event, style) {
+        const { allowExternal } = this;
+        if (allowExternal === true) {
+            return;
+        }
+        else if (allowExternal === false) {
             this.report(event.target, "Link destination must not be external url", event.valueLocation, style);
         }
+        else if (!matchList(target, allowExternal)) {
+            this.report(event.target, "External link to this destination is not allowed by current configuration", event.valueLocation, style);
+        }
     }
-    handleRelativePath(event, style) {
-        const { allowRelative } = this.options;
-        if (!allowRelative) {
+    handleRelativePath(target, event, style) {
+        const { allowRelative } = this;
+        if (allowRelative === true) {
+            return false;
+        }
+        else if (allowRelative === false) {
             this.report(event.target, "Link destination must not be relative url", event.valueLocation, style);
+            return true;
         }
+        else if (!matchList(target, allowRelative)) {
+            this.report(event.target, "Relative link to this destination is not allowed by current configuration", event.valueLocation, style);
+            return true;
+        }
+        return false;
     }
-    handleRelativeBase(event, style) {
-        const { allowRelative, allowBase } = this.options;
-        if (!allowRelative) {
-            this.report(event.target, "Link destination must not be relative url", event.valueLocation, style);
+    handleRelativeBase(target, event, style) {
+        const { allowBase } = this.options;
+        if (this.handleRelativePath(target, event, style)) {
+            return;
         }
         else if (!allowBase) {
             this.report(event.target, "Relative links must be relative to current folder", event.valueLocation, style);
@@ -3494,7 +3551,7 @@ const MATCH_XML_TAG = /^<\?xml.*?\?>\s+/;
 const MATCH_TAG_OPEN = /^<(\/?)([a-zA-Z0-9\-:]+)/; // https://www.w3.org/TR/html/syntax.html#start-tags
 const MATCH_TAG_CLOSE = /^\/?>/;
 const MATCH_TEXT = /^[^]*?(?=(?:[ \t]*(?:\r\n|\r|\n)|<[^ ]|$))/;
-const MATCH_TEMPLATING = /^(?:<%.*?%>|<\?.*?\?>|<\$.*?\$>)/;
+const MATCH_TEMPLATING = /^(?:<%.*?%>|<\?.*?\?>|<\$.*?\$>)/s;
 const MATCH_TAG_LOOKAHEAD = /^[^]*?(?=<|$)/;
 const MATCH_ATTR_START = /^([^\t\r\n\f \/><"'=]+)/; // https://www.w3.org/TR/html/syntax.html#elements-attributes
 const MATCH_ATTR_SINGLE = /^(\s*=\s*)'([^']*?)(')/;
@@ -6159,7 +6216,7 @@ const defaults$9 = {
 };
 const textRegexp = /([<>]|&(?![a-zA-Z0-9#]+;))/g;
 const unquotedAttrRegexp = /([<>"'=`]|&(?![a-zA-Z0-9#]+;))/g;
-const matchTemplate = /^(<%.*?%>|<\?.*?\?>|<\$.*?\$>)$/;
+const matchTemplate = /^(<%.*?%>|<\?.*?\?>|<\$.*?\$>)$/s;
 const replacementTable = new Map([
     ['"', "&quot;"],
     ["&", "&amp;"],