Merge pull request #1452 from YusukeHirao/hotfix/#1451

Fix element type detection
markuplint · Feb 10, 2024 · fd522e8 · fd522e8
2 parents 6172b30 + 3274a51
commit fd522e8
Show file tree

Hide file tree

Showing 48 changed files with 240 additions and 136 deletions.
diff --git a/packages/@markuplint/astro-parser/package.json b/packages/@markuplint/astro-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/astro-parser",
-	"version": "4.0.1",
+	"version": "4.0.2",
 	"description": "astro parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,8 +21,8 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0",
-		"@markuplint/parser-utils": "4.0.0",
+		"@markuplint/ml-ast": "4.0.1",
+		"@markuplint/parser-utils": "4.0.1",
 		"astro-eslint-parser": "^0.16.2"
 	},
 	"devDependencies": {

diff --git a/packages/@markuplint/astro-parser/src/parser.spec.ts b/packages/@markuplint/astro-parser/src/parser.spec.ts
@@ -638,4 +638,10 @@ describe('Issue', () => {
 			'[1:23]>[1:29](22,28)div: </div>',
 		]);
 	});
+
+	test('#1451', () => {
+		expect(parse('<div></div>').nodeList[0].elementType).toBe('html');
+		expect(parse('<x-div></x-div>').nodeList[0].elementType).toBe('web-component');
+		expect(parse('<Div></Div>').nodeList[0].elementType).toBe('authored');
+	});
 });
diff --git a/packages/@markuplint/astro-parser/src/parser.ts b/packages/@markuplint/astro-parser/src/parser.ts
@@ -263,6 +263,18 @@ class AstroParser extends Parser<Node, State> {
 		};
 	}
 
+	/**
+	 * > Variable names must be capitalized. For example, use `Element`, not `element`.
+	 * > Otherwise, Astro will try to render your variable name as a literal HTML tag.
+	 *
+	 * @see https://docs.astro.build/en/basics/astro-syntax/#dynamic-html
+	 * @param nodeName
+	 * @param defaultPattern
+	 */
+	detectElementType(nodeName: string) {
+		return super.detectElementType(nodeName, /^[A-Z]/);
+	}
+
 	#updateScopeNS(
 		// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 		originNode: Node,

diff --git a/packages/@markuplint/cli-utils/package.json b/packages/@markuplint/cli-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/cli-utils",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "Utilities for CLI of Markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",

diff --git a/packages/@markuplint/create-rule/package.json b/packages/@markuplint/create-rule/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/create-rule",
-	"version": "4.0.2",
+	"version": "4.0.3",
 	"description": "Rule generator for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,8 +25,8 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/cli-utils": "4.0.0",
-		"@markuplint/ml-core": "4.0.2",
+		"@markuplint/cli-utils": "4.0.1",
+		"@markuplint/ml-core": "4.0.3",
 		"glob": "^10.3.6",
 		"prettier": "^3.2.5",
 		"ts-node": "^10.9.2",

diff --git a/packages/@markuplint/ejs-parser/package.json b/packages/@markuplint/ejs-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ejs-parser",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "EJS parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,9 +21,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0"
+		"@markuplint/html-parser": "4.0.1"
 	},
 	"devDependencies": {
-		"@markuplint/parser-utils": "4.0.0"
+		"@markuplint/parser-utils": "4.0.1"
 	}
 }
diff --git a/packages/@markuplint/erb-parser/package.json b/packages/@markuplint/erb-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/erb-parser",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "eRuby template parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,9 +21,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0"
+		"@markuplint/html-parser": "4.0.1"
 	},
 	"devDependencies": {
-		"@markuplint/parser-utils": "4.0.0"
+		"@markuplint/parser-utils": "4.0.1"
 	}
 }
diff --git a/packages/@markuplint/esm-adapter/package.json b/packages/@markuplint/esm-adapter/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/esm-adapter",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "A library for utilizing ESM-converted Markuplint modules through a subprocess from a CJS environment",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",

diff --git a/packages/@markuplint/file-resolver/package.json b/packages/@markuplint/file-resolver/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "4.0.2",
+	"version": "4.0.3",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -27,14 +27,14 @@
 		"@types/node": "20.11.17"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0",
-		"@markuplint/ml-ast": "4.0.0",
-		"@markuplint/ml-config": "4.0.0",
-		"@markuplint/ml-core": "4.0.2",
-		"@markuplint/ml-spec": "4.0.0",
-		"@markuplint/parser-utils": "4.0.0",
-		"@markuplint/selector": "4.0.0",
-		"@markuplint/shared": "4.0.0",
+		"@markuplint/html-parser": "4.0.1",
+		"@markuplint/ml-ast": "4.0.1",
+		"@markuplint/ml-config": "4.0.1",
+		"@markuplint/ml-core": "4.0.3",
+		"@markuplint/ml-spec": "4.0.1",
+		"@markuplint/parser-utils": "4.0.1",
+		"@markuplint/selector": "4.0.1",
+		"@markuplint/shared": "4.0.1",
 		"cosmiconfig": "^9.0.0",
 		"debug": "^4.3.4",
 		"glob": "^10.3.6",

diff --git a/packages/@markuplint/html-parser/package.json b/packages/@markuplint/html-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/html-parser",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "HTML parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,8 +25,8 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0",
-		"@markuplint/parser-utils": "4.0.0",
+		"@markuplint/ml-ast": "4.0.1",
+		"@markuplint/parser-utils": "4.0.1",
 		"parse5": "7.1.2",
 		"type-fest": "^4.10.2"
 	}

diff --git a/packages/@markuplint/html-spec/package.json b/packages/@markuplint/html-spec/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/html-spec",
-	"version": "4.0.1",
+	"version": "4.0.2",
 	"description": "A specification of HTML Living Standard for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -17,10 +17,10 @@
 		"gen:prettier": "prettier --write index.json"
 	},
 	"devDependencies": {
-		"@markuplint/spec-generator": "4.0.0",
-		"@markuplint/test-tools": "4.0.0"
+		"@markuplint/spec-generator": "4.0.1",
+		"@markuplint/test-tools": "4.0.1"
 	},
 	"dependencies": {
-		"@markuplint/ml-spec": "4.0.0"
+		"@markuplint/ml-spec": "4.0.1"
 	}
 }
diff --git a/packages/@markuplint/i18n/package.json b/packages/@markuplint/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/i18n",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "Internationalization for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",

diff --git a/packages/@markuplint/jsx-parser/package.json b/packages/@markuplint/jsx-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/jsx-parser",
-	"version": "4.0.2",
+	"version": "4.0.3",
 	"description": "JSX parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,9 +21,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0",
-		"@markuplint/ml-ast": "4.0.0",
-		"@markuplint/parser-utils": "4.0.0",
+		"@markuplint/html-parser": "4.0.1",
+		"@markuplint/ml-ast": "4.0.1",
+		"@markuplint/parser-utils": "4.0.1",
 		"@typescript-eslint/types": "^6.21.0",
 		"@typescript-eslint/typescript-estree": "^6.21.0"
 	}

diff --git a/packages/@markuplint/jsx-parser/src/index.spec.ts b/packages/@markuplint/jsx-parser/src/index.spec.ts
@@ -618,4 +618,10 @@ const C = () => {
 };`);
 		expect(nodeListToDebugMaps(doc.nodeList, true)).toStrictEqual(['[9:10]>[9:17](148,155)div: <div␣/>']);
 	});
+
+	test('#1451', () => {
+		expect(parse('<div></div>').nodeList[0].elementType).toBe('html');
+		expect(parse('<x-div></x-div>').nodeList[0].elementType).toBe('web-component');
+		expect(parse('<Div></Div>').nodeList[0].elementType).toBe('authored');
+	});
 });
diff --git a/packages/@markuplint/jsx-parser/src/parser.ts b/packages/@markuplint/jsx-parser/src/parser.ts
@@ -1,5 +1,5 @@
 import type { JSXComment, JSXNode } from './jsx.js';
-import type { ElementType, MLASTNodeTreeItem, MLASTParentNode } from '@markuplint/ml-ast';
+import type { MLASTNodeTreeItem, MLASTParentNode } from '@markuplint/ml-ast';
 import type { ChildToken, Token } from '@markuplint/parser-utils';
 
 import { getNamespace } from '@markuplint/html-parser';
@@ -289,14 +289,17 @@ class JSXParser extends Parser<JSXNode, State> {
 		});
 	}
 
-	detectElementType(nodeName: string): ElementType {
-		return super.detectElementType(
-			nodeName,
-			/**
-			 * @see https://reactjs.org/docs/jsx-in-depth.html#user-defined-components-must-be-capitalized
-			 */
-			/^[A-Z]|\./,
-		);
+	/**
+	 * > We recommend naming components with a capital letter.
+	 * > If you do have a component that starts with a lowercase letter,
+	 * > assign it to a capitalized variable before using it in JSX.
+	 *
+	 * @see https://reactjs.org/docs/jsx-in-depth.html#user-defined-components-must-be-capitalized
+	 * @param nodeName
+	 * @returns
+	 */
+	detectElementType(nodeName: string) {
+		return super.detectElementType(nodeName, /^[A-Z]|\./);
 	}
 }
 

diff --git a/packages/@markuplint/liquid-parser/package.json b/packages/@markuplint/liquid-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/liquid-parser",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "Liquid template parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,9 +21,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0"
+		"@markuplint/html-parser": "4.0.1"
 	},
 	"devDependencies": {
-		"@markuplint/parser-utils": "4.0.0"
+		"@markuplint/parser-utils": "4.0.1"
 	}
 }
diff --git a/packages/@markuplint/ml-ast/package.json b/packages/@markuplint/ml-ast/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-ast",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "The markuplint AST types.",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",

diff --git a/packages/@markuplint/ml-config/package.json b/packages/@markuplint/ml-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-config",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "JSON Schema and TypeScript types of markuplint configure JSON",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -24,9 +24,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0",
-		"@markuplint/selector": "4.0.0",
-		"@markuplint/shared": "4.0.0",
+		"@markuplint/ml-ast": "4.0.1",
+		"@markuplint/selector": "4.0.1",
+		"@markuplint/shared": "4.0.1",
 		"@types/mustache": "^4.2.5",
 		"deepmerge": "^4.3.1",
 		"is-plain-object": "^5.0.0",

diff --git a/packages/@markuplint/ml-core/package.json b/packages/@markuplint/ml-core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-core",
-	"version": "4.0.2",
+	"version": "4.0.3",
 	"description": "The core module of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -29,14 +29,14 @@
 	},
 	"dependencies": {
 		"@markuplint/config-presets": "4.0.1",
-		"@markuplint/html-parser": "4.0.0",
-		"@markuplint/html-spec": "4.0.1",
-		"@markuplint/i18n": "4.0.0",
-		"@markuplint/ml-ast": "4.0.0",
-		"@markuplint/ml-config": "4.0.0",
-		"@markuplint/ml-spec": "4.0.0",
-		"@markuplint/parser-utils": "4.0.0",
-		"@markuplint/selector": "4.0.0",
+		"@markuplint/html-parser": "4.0.1",
+		"@markuplint/html-spec": "4.0.2",
+		"@markuplint/i18n": "4.0.1",
+		"@markuplint/ml-ast": "4.0.1",
+		"@markuplint/ml-config": "4.0.1",
+		"@markuplint/ml-spec": "4.0.1",
+		"@markuplint/parser-utils": "4.0.1",
+		"@markuplint/selector": "4.0.1",
 		"@types/debug": "^4.1.12",
 		"debug": "^4.3.4",
 		"is-plain-object": "^5.0.0",

diff --git a/packages/@markuplint/ml-spec/package.json b/packages/@markuplint/ml-spec/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-spec",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "Types and schema that specs of the Markup languages for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -32,14 +32,14 @@
 		"schema:prettier": "prettier --write \"./schemas/*.json\" \"./src/types/*.ts\" --log-level warn"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0",
-		"@markuplint/types": "4.0.0",
+		"@markuplint/ml-ast": "4.0.1",
+		"@markuplint/types": "4.0.1",
 		"dom-accessibility-api": "^0.6.3",
 		"is-plain-object": "^5.0.0",
 		"type-fest": "^4.10.2"
 	},
 	"devDependencies": {
-		"@markuplint/test-tools": "4.0.0",
+		"@markuplint/test-tools": "4.0.1",
 		"json-schema-to-typescript": "13.1.2"
 	}
 }
diff --git a/packages/@markuplint/mustache-parser/package.json b/packages/@markuplint/mustache-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/mustache-parser",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "The mustache template parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,9 +21,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0"
+		"@markuplint/html-parser": "4.0.1"
 	},
 	"devDependencies": {
-		"@markuplint/parser-utils": "4.0.0"
+		"@markuplint/parser-utils": "4.0.1"
 	}
 }