Merge pull request #112 from YusukeHirao/features/mdn-update/20201109

Update specs.
markuplint · Nov 9, 2020 · 94ff2ee · 94ff2ee
2 parents c3df548 + 094effa
commit 94ff2ee
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 99 deletions.
diff --git a/packages/@markuplint/html-spec/gen/html-elements.ts b/packages/@markuplint/html-spec/gen/html-elements.ts
@@ -104,7 +104,7 @@ export async function getHTMLElement(link: string) {
 	return spec;
 }
 
-export function getAttributes($: CheerioStatic, heading: string, tagName: string): Attribute[] {
+export function getAttributes($: cheerio.Root, heading: string, tagName: string): Attribute[] {
 	const $heading = $(heading);
 	const $outline = getThisOutline($, $heading);
 	const { attributes } = getAttribute(tagName);
@@ -162,7 +162,7 @@ export function getAttributes($: CheerioStatic, heading: string, tagName: string
 	return result;
 }
 
-function getProperty($: CheerioStatic, prop: string) {
+function getProperty($: cheerio.Root, prop: string) {
 	const $tr = $('#wikiArticle table.properties tr') || $('#Technical_summary').next('table tr');
 	const $th = $(
 		$tr
@@ -177,7 +177,7 @@ function getProperty($: CheerioStatic, prop: string) {
 		.replace(/(?:\r?\n|\s)+/gi, ' ');
 }
 
-function getThisOutline($: CheerioStatic, $start: Cheerio) {
+function getThisOutline($: cheerio.Root, $start: cheerio.Cheerio) {
 	const $container = $('<div></div>');
 	let $next = $start.next();
 	const els = [$start.clone()];
@@ -189,7 +189,7 @@ function getThisOutline($: CheerioStatic, $start: Cheerio) {
 	return $container;
 }
 
-function getItsHeading($start: Cheerio) {
+function getItsHeading($start: cheerio.Cheerio) {
 	let $needle = upToPrevOrParent($start);
 	while ($needle.length) {
 		if (isHeading($needle)) {
@@ -200,15 +200,15 @@ function getItsHeading($start: Cheerio) {
 	return null;
 }
 
-function upToPrevOrParent($start: Cheerio) {
+function upToPrevOrParent($start: cheerio.Cheerio) {
 	let $needle = $start.prev();
 	if (!$needle.length) {
 		$needle = $start.parent();
 	}
 	return $needle;
 }
 
-function isHeading($el: Cheerio) {
+function isHeading($el: cheerio.Cheerio) {
 	return /^h[1-6]$/i.test($el[0].tagName);
 }
 

diff --git a/packages/@markuplint/html-spec/index.json b/packages/@markuplint/html-spec/index.json
diff --git a/packages/@markuplint/html-spec/package.json b/packages/@markuplint/html-spec/package.json
@@ -15,13 +15,13 @@
 		"gen": "ts-node gen/index.ts; prettier --write index.json"
 	},
 	"devDependencies": {
-		"@types/cheerio": "^0.22.18",
-		"@types/cli-progress": "^3.7.0",
+		"@types/cheerio": "^0.22.22",
+		"@types/cli-progress": "^3.8.0",
 		"@types/node-fetch": "^2.5.7",
 		"cheerio": "^1.0.0-rc.3",
 		"cli-progress": "^3.8.2",
-		"fast-xml-parser": "^3.17.2",
-		"node-fetch": "^2.6.0"
+		"fast-xml-parser": "^3.17.4",
+		"node-fetch": "^2.6.1"
 	},
 	"dependencies": {
 		"@markuplint/ml-spec": "^1.0.0-alpha.11"

diff --git a/packages/@markuplint/html-spec/src/attributes/iframe.json b/packages/@markuplint/html-spec/src/attributes/iframe.json
@@ -55,11 +55,6 @@
 			"name": "referrerpolicy",
 			"type": "ReferrerPolicy"
 		},
-		{
-			"name": "importance",
-			"type": "String",
-			"enum": ["auto", "high", "low"]
-		},
 		{
 			"name": "loading",
 			"type": "String",

diff --git a/packages/@markuplint/html-spec/src/attributes/img.json b/packages/@markuplint/html-spec/src/attributes/img.json
@@ -19,11 +19,6 @@
 			"name": "height",
 			"type": "Uint"
 		},
-		{
-			"name": "importance",
-			"type": "String",
-			"enum": ["auto", "high", "low"]
-		},
 		{
 			"name": "ismap",
 			"type": "Boolean",

diff --git a/packages/@markuplint/html-spec/src/attributes/link.json b/packages/@markuplint/html-spec/src/attributes/link.json
@@ -65,14 +65,6 @@
 			"condition": {
 				"self": "[rel=mask-icon]"
 			}
-		},
-		{
-			"name": "importance",
-			"type": "String",
-			"enum": ["auto", "high", "low"],
-			"condition": {
-				"self": ["[rel=preload]", "[rel=prefetch]"]
-			}
 		}
 	]
 }