@markuplint/html-spec 3.0.0-dev.25 → 3.0.0-dev.290

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/html-spec",
-	"version": "3.0.0-dev.25+a27e39aa",
+	"version": "3.0.0-dev.290+af676442",
 	"description": "A specification of HTML Living Standard for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -12,21 +12,16 @@
 		"access": "public"
 	},
 	"scripts": {
-		"gen": "ts-node gen/index.ts; prettier --write index.json"
+		"gen": "npm-run-all gen:*",
+		"gen:build": "node build.mjs",
+		"gen:prettier": "prettier --write index.json"
 	},
 	"devDependencies": {
-		"@types/cheerio": "^0.22.31",
-		"@types/cli-progress": "^3.11.0",
-		"@types/node-fetch": "2",
-		"ajv": "^8.11.2",
-		"cheerio": "^1.0.0-rc.12",
-		"cli-progress": "^3.11.2",
-		"fast-xml-parser": "^4.0.12",
-		"node-fetch": "2",
-		"strip-json-comments": "3"
+		"@markuplint/spec-generator": "4.0.0-alpha.2",
+		"@markuplint/test-tools": "4.0.0-alpha.2"
 	},
 	"dependencies": {
-		"@markuplint/ml-spec": "3.0.0-dev.25+a27e39aa"
+		"@markuplint/ml-spec": "3.0.0-dev.290+af676442"
 	},
-	"gitHead": "a27e39aa4362bce572d1893df2f1571705b62df1"
+	"gitHead": "af6764422feecb56d1d84659028f53daf685bb78"
 }

package/{src/structure.test.ts → test/structure.spec.mjs}

@@ -1,13 +1,16 @@
-import { readFile } from 'fs/promises';
-import path from 'path';
+import { readFile } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 
-import { resolveNamespace } from '@markuplint/ml-spec';
-import { getAttrSpecs } from '@markuplint/ml-spec/lib/specs/get-attr-specs';
-import Ajv, { type ValidateFunction } from 'ajv';
-import { sync as glob } from 'glob';
+import { resolveNamespace, getAttrSpecsByNames } from '@markuplint/ml-spec';
+import { glob } from '@markuplint/test-tools';
+import Ajv from 'ajv';
 import strip from 'strip-json-comments';
+import { describe, test, expect } from 'vitest';
 
-import htmlSpec, { specs } from '../index';
+import htmlSpec from '../index.js';
+
+const require = createRequire(import.meta.url);
 
 const schemas = {
 	element: {
@@ -37,14 +40,19 @@ const schemas = {
 };
 
 test('structure', () => {
-	specs.forEach(el => {
+	// eslint-disable-next-line import/no-named-as-default-member
+	htmlSpec.specs.forEach(el => {
 		const { localName, namespaceURI } = resolveNamespace(el.name);
-		getAttrSpecs(localName, namespaceURI, htmlSpec);
+		try {
+			getAttrSpecsByNames(localName, namespaceURI, htmlSpec);
+		} catch (e) {
+			throw el;
+		}
 	});
 });
 
 describe('schema', () => {
-	const map: [name: string, validator: ValidateFunction, targetFiles: string][] = [
+	const map = [
 		[
 			'spec.*.json',
 			new Ajv({
@@ -56,21 +64,23 @@ describe('schema', () => {
 					schemas.attributes,
 					schemas.types,
 				],
-			}).getSchema(schemas.element.$id)!,
+			}).getSchema(schemas.element.$id),
+			// eslint-disable-next-line no-restricted-globals
 			path.resolve(__dirname, 'spec.*.json'),
 		],
 		[
 			'spec-common.attributes.json',
 			new Ajv({
 				schemas: [schemas.globalAttributes, schemas.attributes, schemas.types],
-			}).getSchema(schemas.globalAttributes.$id)!,
+			}).getSchema(schemas.globalAttributes.$id),
+			// eslint-disable-next-line no-restricted-globals
 			path.resolve(__dirname, 'spec-common.attributes.json'),
 		],
 	];
 
 	for (const [testName, validator, targetFiles] of map) {
 		test(testName, async () => {
-			const files = glob(targetFiles);
+			const files = await glob(targetFiles);
 			for (const jsonPath of files) {
 				const json = JSON.parse(strip(await readFile(jsonPath, { encoding: 'utf-8' })));
 				const isValid = validator(json);