html-validate 7.6.0 → 7.7.0

package/dist/es/html-validate.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import kleur from 'kleur';
 import minimist from 'minimist';
-import { t as name, v as version, e as SchemaValidationError, U as UserError, u as bugs } from './core.js';
+import { w as name, v as version, e as SchemaValidationError, U as UserError, x as bugs } from './core.js';
 import 'fs';
 import 'ajv';
 import 'deepmerge';

package/dist/es/index.d.ts

@@ -1,5 +1,5 @@
-import { s as Report, c as ConfigLoader, H as HtmlValidate, a as ConfigData } from './core.js';
-export { A as AttributeData, a2 as AttributeEvent, f as CSSStyleDeclaration, af as CompatibilityOptions, a4 as ConditionalEvent, C as Config, a as ConfigData, b as ConfigError, c as ConfigLoader, Q as ConfigReadyEvent, a7 as DOMLoadEvent, a8 as DOMReadyEvent, x as DeferredMessage, a5 as DirectiveEvent, a6 as DoctypeEvent, D as DynamicValue, a1 as ElementReadyEvent, O as Event, K as EventCallback, E as EventDump, J as EventHandler, ab as FileSystemConfigLoader, ac as Formatter, e as HtmlElement, H as HtmlValidate, aa as ListenEventMap, L as Location, u as Message, m as MetaCopyableProperty, M as MetaData, j as MetaDataTable, k as MetaElement, l as MetaTable, i as NestedError, N as NodeClosed, G as Parser, F as Plugin, P as ProcessElementContext, s as Report, t as Reporter, w as Result, R as Rule, n as RuleDocumentation, h as SchemaValidationError, S as Severity, r as Source, V as SourceReadyEvent, d as StaticConfigLoader, $ as TagCloseEvent, _ as TagEndEvent, Z as TagOpenEvent, a0 as TagReadyEvent, Y as TagStartEvent, B as TemplateExtractor, q as TextClassification, T as TextNode, g as TokenDump, X as TokenEvent, y as TransformContext, z as Transformer, a9 as TriggerEventMap, U as UserError, a3 as WhitespaceEvent, W as WrappedError, o as classifyNodeText, ae as compatibilityCheck, p as configPresets, ad as formatterFactory, I as ruleExists, v as version } from './core.js';
+import { x as Report, c as ConfigLoader, H as HtmlValidate, a as ConfigData } from './core.js';
+export { A as AttributeData, a6 as AttributeEvent, f as CSSStyleDeclaration, aj as CompatibilityOptions, a8 as ConditionalEvent, C as Config, a as ConfigData, b as ConfigError, c as ConfigLoader, Z as ConfigReadyEvent, ab as DOMLoadEvent, ac as DOMReadyEvent, F as DeferredMessage, a9 as DirectiveEvent, aa as DoctypeEvent, D as DynamicValue, a5 as ElementReadyEvent, Y as Event, X as EventCallback, E as EventDump, V as EventHandler, af as FileSystemConfigLoader, ag as Formatter, e as HtmlElement, H as HtmlValidate, ae as ListenEventMap, L as Location, z as Message, l as MetaAttribute, m as MetaAttributeAllowedCallback, o as MetaCopyableProperty, M as MetaData, j as MetaDataTable, k as MetaElement, n as MetaTable, i as NestedError, N as NodeClosed, O as Parser, K as Plugin, P as ProcessElementContext, x as Report, y as Reporter, B as Result, R as Rule, s as RuleDocumentation, h as SchemaValidationError, S as Severity, w as Source, _ as SourceReadyEvent, d as StaticConfigLoader, a3 as TagCloseEvent, a2 as TagEndEvent, a1 as TagOpenEvent, a4 as TagReadyEvent, a0 as TagStartEvent, J as TemplateExtractor, u as TextClassification, T as TextNode, g as TokenDump, $ as TokenEvent, G as TransformContext, I as Transformer, ad as TriggerEventMap, U as UserError, a7 as WhitespaceEvent, W as WrappedError, t as classifyNodeText, ai as compatibilityCheck, p as configPresets, q as defineMetadata, ah as formatterFactory, r as metadataHelper, Q as ruleExists, v as version } from './core.js';
 import 'ajv';
 
 interface ExpandOptions {

package/dist/es/index.js

@@ -1,4 +1,4 @@
-export { C as Config, a as ConfigError, b as ConfigLoader, D as DynamicValue, E as EventHandler, F as FileSystemConfigLoader, d as HtmlElement, H as HtmlValidate, g as MetaCopyableProperty, M as MetaTable, f as NestedError, N as NodeClosed, P as Parser, j as Reporter, R as Rule, e as SchemaValidationError, S as Severity, c as StaticConfigLoader, k as TemplateExtractor, i as TextClassification, T as TextNode, U as UserError, W as WrappedError, h as classifyNodeText, q as compatibilityCheck, p as configPresets, l as formatterFactory, r as ruleExists, v as version } from './core.js';
+export { C as Config, a as ConfigError, b as ConfigLoader, D as DynamicValue, E as EventHandler, F as FileSystemConfigLoader, d as HtmlElement, H as HtmlValidate, g as MetaCopyableProperty, M as MetaTable, f as NestedError, N as NodeClosed, P as Parser, k as Reporter, R as Rule, e as SchemaValidationError, S as Severity, c as StaticConfigLoader, l as TemplateExtractor, j as TextClassification, T as TextNode, U as UserError, W as WrappedError, i as classifyNodeText, t as compatibilityCheck, p as configPresets, h as defineMetadata, n as formatterFactory, m as metadataHelper, r as ruleExists, v as version } from './core.js';
 import 'fs';
 export { C as CLI } from './cli.js';
 import '@sidvind/better-ajv-errors';

package/dist/es/jest-lib.js

@@ -1,5 +1,5 @@
 import deepmerge from 'deepmerge';
-import { F as FileSystemConfigLoader, H as HtmlValidate, s as codeframe } from './core.js';
+import { F as FileSystemConfigLoader, H as HtmlValidate, u as codeframe } from './core.js';
 import kleur from 'kleur';
 import { toMatchSnapshot, toMatchInlineSnapshot } from 'jest-snapshot';
 import * as jestDiffDefault from 'jest-diff';

package/dist/es/jest.d.ts

@@ -1,4 +1,4 @@
-import { u as Message, a as ConfigData } from './core.js';
+import { z as Message, a as ConfigData } from './core.js';
 import 'ajv';
 
 declare global {

package/dist/es/test-utils.d.ts

@@ -1,4 +1,4 @@
-import { z as Transformer, r as Source } from './core.js';
+import { I as Transformer, w as Source } from './core.js';
 import 'ajv';
 
 /**

package/dist/schema/elements.json

@@ -260,6 +260,10 @@
               "type": "object",
               "additionalProperties": false,
               "properties": {
+                "allowed": {
+                  "function": true,
+                  "title": "Set to a function to evaluate if this attribute is allowed in this context"
+                },
                 "boolean": {
                   "type": "boolean",
                   "title": "Set to true if this is a boolean attribute"

package/elements/html5.js

@@ -1,6 +1,11 @@
 /* eslint-disable sonarjs/no-duplicate-string */
 
-module.exports = {
+const { defineMetadata, metadataHelper, DynamicValue } = require("html-validate");
+
+const { allowedIfAttributeIsPresent, allowedIfAttributeIsAbsent, allowedIfAttributeHasValue } =
+	metadataHelper;
+
+module.exports = defineMetadata({
 	"*": {
 		attributes: {
 			contenteditable: {
@@ -47,21 +52,44 @@ module.exports = {
 				deprecated: true,
 			},
 			download: {
+				allowed: allowedIfAttributeIsPresent("href"),
 				omit: true,
 				enum: ["/.+/"],
 			},
 			href: {
 				enum: ["/.*/"],
 			},
+			hreflang: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
+			itemprop: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
 			methods: {
 				deprecated: true,
 			},
 			name: {
 				deprecated: true,
 			},
+			ping: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
+			referrerpolicy: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
+			rel: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
 			shape: {
 				deprecated: true,
 			},
+			target: {
+				allowed: allowedIfAttributeIsPresent("href"),
+				enum: ["/[^_].*/", "_blank", "_self", "_parent", "_top"],
+			},
+			type: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
 			urn: {
 				deprecated: true,
 			},
@@ -108,12 +136,59 @@ module.exports = {
 		phrasing: ["isDescendant", "map"],
 		void: true,
 		attributes: {
+			alt: {},
+			coords: {
+				allowed(node) {
+					const attr = node.getAttribute("shape");
+					if (attr && attr.valueMatches("default", false)) {
+						return `cannot be used when "shape" attribute is "default"`;
+					} else {
+						return null;
+					}
+				},
+			},
+			download: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
 			nohref: {
 				deprecated: true,
 			},
+			itemprop: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
+			ping: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
+			referrerpolicy: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
+			rel: {
+				allowed: allowedIfAttributeIsPresent("href"),
+			},
 			shape: {
+				allowed(node) {
+					const attr = node.getAttribute("shape");
+					if (!attr || attr.value instanceof DynamicValue) {
+						return null;
+					}
+					const shape = attr.value || "rect";
+					switch (shape) {
+						case "circ":
+						case "circle":
+						case "poly":
+						case "polygon":
+						case "rect":
+						case "rectangle":
+							return allowedIfAttributeIsPresent("coords")(node);
+					}
+					return null;
+				},
 				enum: ["rect", "circle", "poly", "default"],
 			},
+			target: {
+				allowed: allowedIfAttributeIsPresent("href"),
+				enum: ["/[^_].*/", "_blank", "_self", "_parent", "_top"],
+			},
 		},
 		requiredAncestors: ["map"],
 	},
@@ -139,6 +214,13 @@ module.exports = {
 		interactive: ["hasAttribute", "controls"],
 		transparent: ["@flow"],
 		attributes: {
+			crossorigin: {
+				omit: true,
+				enum: ["anonymous", "use-credentials"],
+			},
+			itemprop: {
+				allowed: allowedIfAttributeIsPresent("src"),
+			},
 			preload: {
 				omit: true,
 				enum: ["none", "metadata", "auto"],
@@ -287,6 +369,24 @@ module.exports = {
 			disabled: {
 				boolean: true,
 			},
+			formaction: {
+				allowed: allowedIfAttributeHasValue("type", ["submit"], { defaultValue: "submit" }),
+			},
+			formenctype: {
+				allowed: allowedIfAttributeHasValue("type", ["submit"], { defaultValue: "submit" }),
+			},
+			formmethod: {
+				allowed: allowedIfAttributeHasValue("type", ["submit"], { defaultValue: "submit" }),
+				enum: ["get", "post", "dialog"],
+			},
+			formnovalidate: {
+				allowed: allowedIfAttributeHasValue("type", ["submit"], { defaultValue: "submit" }),
+				boolean: true,
+			},
+			formtarget: {
+				allowed: allowedIfAttributeHasValue("type", ["submit"], { defaultValue: "submit" }),
+				enum: ["/[^_].*/", "_blank", "_self", "_parent", "_top"],
+			},
 			type: {
 				required: true,
 				enum: ["submit", "reset", "button"],
@@ -547,6 +647,9 @@ module.exports = {
 			novalidate: {
 				boolean: true,
 			},
+			target: {
+				enum: ["/[^_].*/", "_blank", "_self", "_parent", "_top"],
+			},
 		},
 		permittedContent: ["@flow"],
 		permittedDescendants: [{ exclude: ["@form"] }],
@@ -837,6 +940,34 @@ module.exports = {
 			disabled: {
 				boolean: true,
 			},
+			formaction: {
+				allowed: allowedIfAttributeHasValue("type", ["submit", "image"], {
+					defaultValue: "submit",
+				}),
+			},
+			formenctype: {
+				allowed: allowedIfAttributeHasValue("type", ["submit", "image"], {
+					defaultValue: "submit",
+				}),
+			},
+			formmethod: {
+				allowed: allowedIfAttributeHasValue("type", ["submit", "image"], {
+					defaultValue: "submit",
+				}),
+				enum: ["get", "post", "dialog"],
+			},
+			formnovalidate: {
+				allowed: allowedIfAttributeHasValue("type", ["submit", "image"], {
+					defaultValue: "submit",
+				}),
+				boolean: true,
+			},
+			formtarget: {
+				allowed: allowedIfAttributeHasValue("type", ["submit", "image"], {
+					defaultValue: "submit",
+				}),
+				enum: ["/[^_].*/", "_blank", "_self", "_parent", "_top"],
+			},
 			hspace: {
 				deprecated: true,
 			},
@@ -918,6 +1049,7 @@ module.exports = {
 		interactive: true,
 		void: true,
 		labelable: true,
+		deprecated: true,
 	},
 
 	label: {
@@ -972,6 +1104,38 @@ module.exports = {
 		metadata: true,
 		void: true,
 		attributes: {
+			as: {
+				allowed: allowedIfAttributeHasValue("rel", ["preload", "modulepreload"]),
+				enum: [
+					"audio",
+					"audioworklet",
+					"document",
+					"embed",
+					"fetch",
+					"font",
+					"frame",
+					"iframe",
+					"image",
+					"manifest",
+					"object",
+					"paintworklet",
+					"report",
+					"script",
+					"serviceworker",
+					"sharedworker",
+					"style",
+					"track",
+					"video",
+					"webidentity",
+					"worker",
+					"xslt",
+				],
+			},
+			blocking: {
+				allowed: allowedIfAttributeHasValue("rel", ["stylesheet", "preload", "modulepreload"]),
+				list: true,
+				enum: ["render"],
+			},
 			charset: {
 				deprecated: true,
 			},
@@ -979,11 +1143,16 @@ module.exports = {
 				omit: true,
 				enum: ["anonymous", "use-credentials"],
 			},
+			disabled: {
+				allowed: allowedIfAttributeHasValue("rel", ["stylesheet"]),
+				boolean: true,
+			},
 			href: {
 				required: true,
 				enum: ["/.+/"],
 			},
 			integrity: {
+				allowed: allowedIfAttributeHasValue("rel", ["stylesheet", "preload", "modulepreload"]),
 				enum: ["/.+/"],
 			},
 			methods: {
@@ -1012,6 +1181,12 @@ module.exports = {
 		flow: true,
 		phrasing: true,
 		transparent: true,
+		attributes: {
+			name: {
+				required: true,
+				enum: ["/\\S+/"],
+			},
+		},
 	},
 
 	mark: {
@@ -1080,6 +1255,21 @@ module.exports = {
 		metadata: true,
 		void: true,
 		attributes: {
+			charset: {
+				enum: ["utf-8"],
+			},
+			content: {
+				allowed: allowedIfAttributeIsPresent("name", "http-equiv", "itemprop"),
+			},
+			itemprop: {
+				allowed: allowedIfAttributeIsAbsent("http-equiv", "name"),
+			},
+			name: {
+				allowed: allowedIfAttributeIsAbsent("http-equiv", "itemprop"),
+			},
+			"http-equiv": {
+				allowed: allowedIfAttributeIsAbsent("name", "itemprop"),
+			},
 			scheme: {
 				deprecated: true,
 			},
@@ -1156,6 +1346,10 @@ module.exports = {
 			archive: {
 				deprecated: true,
 			},
+			blocking: {
+				list: true,
+				enum: ["render"],
+			},
 			border: {
 				deprecated: true,
 			},
@@ -1173,6 +1367,7 @@ module.exports = {
 			},
 			data: {
 				enum: ["/.+/"],
+				required: true,
 			},
 			datafld: {
 				deprecated: true,
@@ -1189,6 +1384,9 @@ module.exports = {
 			hspace: {
 				deprecated: true,
 			},
+			name: {
+				enum: ["/[^_].*/"],
+			},
 			standby: {
 				deprecated: true,
 			},
@@ -1409,6 +1607,7 @@ module.exports = {
 				deprecated: true,
 			},
 			integrity: {
+				allowed: allowedIfAttributeIsPresent("src"),
 				enum: ["/.+/"],
 			},
 			language: {
@@ -1888,6 +2087,13 @@ module.exports = {
 		interactive: ["hasAttribute", "controls"],
 		transparent: ["@flow"],
 		attributes: {
+			crossorigin: {
+				omit: true,
+				enum: ["anonymous", "use-credentials"],
+			},
+			itemprop: {
+				allowed: allowedIfAttributeIsPresent("src"),
+			},
 			preload: {
 				omit: true,
 				enum: ["none", "metadata", "auto"],
@@ -1910,4 +2116,4 @@ module.exports = {
 			source: "html32",
 		},
 	},
-};
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-validate",
-  "version": "7.6.0",
+  "version": "7.7.0",
   "description": "Offline html5 validator",
   "keywords": [
     "html",
@@ -48,6 +48,7 @@
     "jest.{js,d.ts}",
     "test-utils.{js,d.ts}",
     "!dist/types/**",
+    "!tsconfig.json",
     "!**/*.snap",
     "!**/*.spec.{js,ts,d.ts}"
   ],
@@ -58,10 +59,10 @@
     "prebuild": "run-s codegen prebuild:*",
     "build": "run-s build:*",
     "postbuild": "bash scripts/pkg",
-    "prebuild:tsc": "tsc --build src",
-    "build:cjs": "rollup --config rollup.cjs.config.js",
-    "build:dts": "rollup --config rollup.dts.config.js",
-    "build:esm": "rollup --config rollup.esm.config.js",
+    "prebuild:tsc": "tsc --build src elements",
+    "build:cjs": "rollup --config rollup.cjs.config.mjs",
+    "build:dts": "rollup --config rollup.dts.config.mjs",
+    "build:esm": "rollup --config rollup.esm.config.mjs",
     "clean": "rm -rf dist public",
     "codegen": "node scripts/codegen",
     "compatibility": "scripts/compatibility.sh",
@@ -131,6 +132,9 @@
       "!src/jest/jest.ts",
       "!**/__fixtures__/**"
     ],
+    "moduleNameMapper": {
+      "^html-validate$": "<rootDir>/src/index.ts"
+    },
     "preset": "@html-validate/jest-config",
     "roots": [
       "<rootDir>/docs",
@@ -156,38 +160,38 @@
   },
   "devDependencies": {
     "@html-validate/commitlint-config": "3.0.6",
-    "@html-validate/eslint-config": "5.5.4",
-    "@html-validate/eslint-config-jest": "5.5.4",
-    "@html-validate/eslint-config-typescript": "5.5.4",
+    "@html-validate/eslint-config": "5.5.6",
+    "@html-validate/eslint-config-jest": "5.5.6",
+    "@html-validate/eslint-config-typescript": "5.5.6",
     "@html-validate/eslint-config-typescript-typeinfo": "5.5.0",
     "@html-validate/jest-config": "3.5.1",
     "@html-validate/prettier-config": "2.3.0",
     "@html-validate/release-scripts": "3.5.9",
-    "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-replace": "4.0.0",
-    "@rollup/plugin-typescript": "8.5.0",
-    "@rollup/plugin-virtual": "2.1.0",
+    "@rollup/plugin-json": "5.0.1",
+    "@rollup/plugin-replace": "5.0.1",
+    "@rollup/plugin-typescript": "9.0.2",
+    "@rollup/plugin-virtual": "3.0.1",
     "@types/babar": "0.2.1",
     "@types/babel__code-frame": "7.0.3",
     "@types/estree": "1.0.0",
     "@types/glob": "8.0.0",
-    "@types/jest": "29.0.3",
+    "@types/jest": "29.2.0",
     "@types/minimist": "1.2.2",
-    "@types/node": "14.18.31",
+    "@types/node": "14.18.32",
     "@types/prompts": "2.4.1",
     "@types/semver": "7.3.12",
     "@types/stream-buffers": "3.0.4",
     "babar": "0.2.3",
     "husky": "8.0.1",
-    "jest": "29.0.3",
-    "jest-diff": "29.0.3",
-    "jest-environment-jsdom": "29.0.3",
-    "jest-snapshot": "29.0.3",
+    "jest": "29.2.1",
+    "jest-diff": "29.2.1",
+    "jest-environment-jsdom": "29.2.1",
+    "jest-snapshot": "29.2.1",
     "npm-pkg-lint": "1.11.1",
     "npm-run-all": "4.1.5",
-    "rollup": "2.79.1",
+    "rollup": "3.2.3",
     "rollup-plugin-copy": "3.4.0",
-    "rollup-plugin-dts": "4.2.2",
+    "rollup-plugin-dts": "5.0.0",
     "stream-buffers": "3.0.2",
     "ts-jest": "29.0.3",
     "typescript": "4.8.4"