@markuplint/ml-spec 5.0.0-alpha.1 → 5.0.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/ARCHITECTURE.ja.md +8 -8
  2. package/ARCHITECTURE.md +8 -8
  3. package/CHANGELOG.md +6 -0
  4. package/README.md +1 -1
  5. package/lib/algorithm/html/content-model-category-to-tag-names.js +11 -1
  6. package/lib/types/permitted-structures.d.ts +1 -1
  7. package/lib/utils/get-spec-by-tag-name.d.ts +1 -1
  8. package/lib/utils/get-spec.d.ts +1 -1
  9. package/package.json +5 -5
package/ARCHITECTURE.ja.md CHANGED
@@ -146,16 +146,16 @@ flowchart TD
146
146
 
147
147
  型システムは、マークアップ言語仕様・要素仕様・ARIA ロール・属性の構造を定義します。
148
148
 
149
- | ファイル | 役割 |
150
- | ------------------------------- | ------------------------------------------------------------------------------------------------- |
151
- | `types/index.ts` | 手書き型: `MLMLSpec`, `ElementSpec`, `ExtendedSpec`, `ARIARole`, `ComputedRole` 等 |
152
- | `types/aria.ts` | 生成型: `ARIA`, `PermittedRoles`, `ImplicitRole`, `PermittedARIAProperties`, `ImplicitProperties` |
153
- | `types/attributes.ts` | 生成型: `AttributeType`, `GlobalAttributes`, `AttributeJSON`, `List`, `Enum`, `Number` |
154
- | `types/permitted-structures.ts` | 生成型: `PermittedContentPattern`, `ContentModel`, `Category`（HTML 13 + SVG 19 カテゴリ） |
149
+ | ファイル | 役割 |
150
+ | ------------------------------- | ----------------------------------------------------------------------------------------------------- |
151
+ | `types/index.ts` | 手書き型: `MLMLSpec`, `ElementSpec`, `ExtendedSpec`, `ARIARole`, `ComputedRole` 等 |
152
+ | `types/aria.ts` | 生成型: `ARIA`, `PermittedRoles`, `ImplicitRole`, `PermittedARIAProperties`, `ImplicitProperties` |
153
+ | `types/attributes.ts` | 生成型: `AttributeType`, `GlobalAttributes`, `AttributeJSON`, `List`, `Enum`, `Number` |
154
+ | `types/permitted-structures.ts` | 生成型: `PermittedContentPattern`, `ContentModel`, `Category`（HTML 13 + SVG 19 + MathML 3 カテゴリ） |
155
155
 
156
156
  ### 2. ARIA アルゴリズム
157
157
 
158
- ARIA アルゴリズムは WAI-ARIA, HTML-AAM, SVG-AAM, AccName 1.2 仕様に基づくロール計算とアクセシビリティツリー管理を実装します。
158
+ ARIA アルゴリズムは WAI-ARIA, HTML-AAM, SVG-AAM, MathML-AAM, AccName 1.2 仕様に基づくロール計算とアクセシビリティツリー管理を実装します。
159
159
 
160
160
  | ファイル | 役割 |
161
161
  | -------------------------------- | ------------------------------------------------------------------------------- |
@@ -183,7 +183,7 @@ HTML アルゴリズムは HTML Living Standard に基づくコンテンツモ
183
183
  | `get-content-model.ts` | 条件付きパターン評価を含むコンテンツモデルの取得 |
184
184
  | `content-model-category-to-tag-names.ts` | コンテンツモデルカテゴリをソート済みタグ名配列に変換 |
185
185
  | `get-selectors-by-content-model-category.ts` | コンテンツモデルカテゴリを CSS セレクタにマッピング |
186
- | `is-palpable-elements.ts` | SVG/露出可能要素拡張付きパルパブルコンテンツ検出 |
186
+ | `is-palpable-elements.ts` | SVG/MathML/露出可能要素拡張付きパルパブルコンテンツ検出 |
187
187
  | `is-void-element.ts` | ボイド要素判定（13 の HTML ボイド要素） |
188
188
  | `is-nothing-content-model.ts` | 「Nothing」コンテンツモデル判定（void + iframe + template） |
189
189
  | `may-be-focusable.ts` | フォーカス可能性ヒューリスティック（interactive + tabindex + contenteditable） |
package/ARCHITECTURE.md CHANGED
@@ -146,16 +146,16 @@ flowchart TD
146
146
 
147
147
  The type system defines the structure of markup language specifications, element specs, ARIA roles, and attributes.
148
148
 
149
- | File | Purpose |
150
- | ------------------------------- | ---------------------------------------------------------------------------------------------------- |
151
- | `types/index.ts` | Hand-written types: `MLMLSpec`, `ElementSpec`, `ExtendedSpec`, `ARIARole`, `ComputedRole`, etc. |
152
- | `types/aria.ts` | Generated: `ARIA`, `PermittedRoles`, `ImplicitRole`, `PermittedARIAProperties`, `ImplicitProperties` |
153
- | `types/attributes.ts` | Generated: `AttributeType`, `GlobalAttributes`, `AttributeJSON`, `List`, `Enum`, `Number` |
154
- | `types/permitted-structures.ts` | Generated: `PermittedContentPattern`, `ContentModel`, `Category` (HTML 13 + SVG 19 categories) |
149
+ | File | Purpose |
150
+ | ------------------------------- | --------------------------------------------------------------------------------------------------------- |
151
+ | `types/index.ts` | Hand-written types: `MLMLSpec`, `ElementSpec`, `ExtendedSpec`, `ARIARole`, `ComputedRole`, etc. |
152
+ | `types/aria.ts` | Generated: `ARIA`, `PermittedRoles`, `ImplicitRole`, `PermittedARIAProperties`, `ImplicitProperties` |
153
+ | `types/attributes.ts` | Generated: `AttributeType`, `GlobalAttributes`, `AttributeJSON`, `List`, `Enum`, `Number` |
154
+ | `types/permitted-structures.ts` | Generated: `PermittedContentPattern`, `ContentModel`, `Category` (HTML 13 + SVG 19 + MathML 3 categories) |
155
155
 
156
156
  ### 2. ARIA Algorithms
157
157
 
158
- ARIA algorithms implement WAI-ARIA, HTML-AAM, SVG-AAM, and AccName 1.2 specifications for role computation and accessibility tree management.
158
+ ARIA algorithms implement WAI-ARIA, HTML-AAM, SVG-AAM, MathML-AAM, and AccName 1.2 specifications for role computation and accessibility tree management.
159
159
 
160
160
  | File | Purpose |
161
161
  | -------------------------------- | --------------------------------------------------------------------------------- |
@@ -183,7 +183,7 @@ HTML algorithms implement content model evaluation and element classification fr
183
183
  | `get-content-model.ts` | Retrieves content model with conditional pattern evaluation |
184
184
  | `content-model-category-to-tag-names.ts` | Converts content model category to sorted tag name array |
185
185
  | `get-selectors-by-content-model-category.ts` | Maps content model category to CSS selectors |
186
- | `is-palpable-elements.ts` | Palpable content detection with SVG/exposable extensions |
186
+ | `is-palpable-elements.ts` | Palpable content detection with SVG/MathML/exposable extensions |
187
187
  | `is-void-element.ts` | Void element check (13 HTML void elements) |
188
188
  | `is-nothing-content-model.ts` | "Nothing" content model check (void + iframe + template) |
189
189
  | `may-be-focusable.ts` | Focusability heuristic (interactive + tabindex + contenteditable) |
package/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [5.0.0-alpha.2](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.1...v5.0.0-alpha.2) (2026-02-23)
7
+
8
+ ### Features
9
+
10
+ - **ml-spec:** add MathML content model categories and namespace support ([80f0945](https://github.com/markuplint/markuplint/commit/80f0945595aed48c9766423e83e8cd2b1c454a54))
11
+
6
12
  # [5.0.0-alpha.1](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.0...v5.0.0-alpha.1) (2026-02-22)
7
13
 
8
14
  ### Bug Fixes
package/README.md CHANGED
@@ -6,7 +6,7 @@
6
6
 
7
7
  This package serves as the foundational layer for markuplint's specification system, providing:
8
8
 
9
- - **Type definitions** for markup language specifications (HTML, ARIA, SVG)
9
+ - **Type definitions** for markup language specifications (HTML, ARIA, SVG, MathML)
10
10
  - **W3C specification algorithms** (HTML Standard, WAI-ARIA 1.1/1.2/1.3 compliance)
11
11
  - **JSON schemas** that define the structure of element specifications
12
12
  - **Runtime utilities** for specification resolution, attribute validation, and content model checking
package/lib/algorithm/html/content-model-category-to-tag-names.js CHANGED
@@ -13,7 +13,17 @@ export function contentModelCategoryToTagNames(contentModel, def) {
13
13
  if (cached) {
14
14
  return cached;
15
15
  }
16
- const tags = def['#contentModels'][contentModel];
16
+ let tags = def['#contentModels'][contentModel];
17
+ if (!tags) {
18
+ // Case-insensitive fallback for mixed-case categories (e.g., #MathMLPresentation, #SVGAnimation)
19
+ const lowerKey = contentModel.toLowerCase();
20
+ for (const key of Object.keys(def['#contentModels'])) {
21
+ if (key.toLowerCase() === lowerKey) {
22
+ tags = def['#contentModels'][key];
23
+ break;
24
+ }
25
+ }
26
+ }
17
27
  const sortedTag = Object.freeze(tags && Array.isArray(tags) ? tags.toSorted() : []);
18
28
  cache.set(contentModel, sortedTag);
19
29
  return sortedTag;
package/lib/types/permitted-structures.d.ts CHANGED
@@ -6,7 +6,7 @@
6
6
  export type PermittedContentPattern = PermittedContentRequire | PermittedContentOptional | PermittedContentOneOrMore | PermittedContentZeroOrMore | PermittedContentChoice | PermittedContentTransparent;
7
7
  export type Model = ContentType | ContentType[];
8
8
  export type ContentType = string | Category;
9
- export type Category = '#text' | '#phrasing' | '#flow' | '#interactive' | '#heading' | '#sectioning' | '#metadata' | '#embedded' | '#palpable' | '#script-supporting' | '#SVGAnimation' | '#SVGBasicShapes' | '#SVGContainer' | '#SVGDescriptive' | '#SVGFilterPrimitive' | '#SVGFont' | '#SVGGradient' | '#SVGGraphics' | '#SVGGraphicsReferencing' | '#SVGLightSource' | '#SVGNeverRendered' | '#SVGNone' | '#SVGPaintServer' | '#SVGRenderable' | '#SVGShape' | '#SVGStructural' | '#SVGStructurallyExternal' | '#SVGTextContent' | '#SVGTextContentChild';
9
+ export type Category = '#text' | '#phrasing' | '#flow' | '#interactive' | '#heading' | '#sectioning' | '#metadata' | '#embedded' | '#palpable' | '#script-supporting' | '#SVGAnimation' | '#SVGBasicShapes' | '#SVGContainer' | '#SVGDescriptive' | '#SVGFilterPrimitive' | '#SVGFont' | '#SVGGradient' | '#SVGGraphics' | '#SVGGraphicsReferencing' | '#SVGLightSource' | '#SVGNeverRendered' | '#SVGNone' | '#SVGPaintServer' | '#SVGRenderable' | '#SVGShape' | '#SVGStructural' | '#SVGStructurallyExternal' | '#SVGTextContent' | '#SVGTextContentChild' | '#MathMLPresentation' | '#MathMLScript' | '#MathMLTabular';
10
10
  export interface ContentModelsSchema {
11
11
  __contentModel?: ContentModel;
12
12
  }
package/lib/utils/get-spec-by-tag-name.d.ts CHANGED
@@ -10,4 +10,4 @@ import type { ElementSpec } from '../types/index.js';
10
10
  * @param namespace - The namespace URI string, or null for HTML namespace
11
11
  * @returns The matching element specification, or null if not found
12
12
  */
13
- export declare function getSpecByTagName<K extends keyof ElementSpec = keyof ElementSpec>(specs: readonly Pick<ElementSpec, 'name' | K>[], localName: string, namespace: string | null): Pick<ElementSpec, K | "name"> | null;
13
+ export declare function getSpecByTagName<K extends keyof ElementSpec = keyof ElementSpec>(specs: readonly Pick<ElementSpec, 'name' | K>[], localName: string, namespace: string | null): Pick<ElementSpec, "name" | K> | null;
package/lib/utils/get-spec.d.ts CHANGED
@@ -9,4 +9,4 @@ import type { ElementSpec } from '../types/index.js';
9
9
  * @param specs - The array of element specifications to search
10
10
  * @returns The matching element specification, or null if not found
11
11
  */
12
- export declare function getSpec<K extends keyof ElementSpec>(el: Element, specs: readonly Pick<ElementSpec, 'name' | K>[]): Pick<ElementSpec, K | "name"> | null;
12
+ export declare function getSpec<K extends keyof ElementSpec>(el: Element, specs: readonly Pick<ElementSpec, 'name' | K>[]): Pick<ElementSpec, "name" | K> | null;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@markuplint/ml-spec",
3
- "version": "5.0.0-alpha.1",
3
+ "version": "5.0.0-alpha.2",
4
4
  "description": "Types and schema that specs of the Markup languages for markuplint",
5
5
  "repository": "git@github.com:markuplint/markuplint.git",
6
6
  "author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -34,14 +34,14 @@
34
34
  "schema:prettier": "npx prettier --write \"./schemas/*.json\" \"./src/types/*.ts\" --log-level warn"
35
35
  },
36
36
  "dependencies": {
37
- "@markuplint/ml-ast": "5.0.0-alpha.1",
38
- "@markuplint/types": "5.0.0-alpha.1",
37
+ "@markuplint/ml-ast": "5.0.0-alpha.2",
38
+ "@markuplint/types": "5.0.0-alpha.2",
39
39
  "is-plain-object": "5.0.0",
40
40
  "type-fest": "5.4.4"
41
41
  },
42
42
  "devDependencies": {
43
- "@markuplint/test-tools": "5.0.0-alpha.1",
43
+ "@markuplint/test-tools": "5.0.0-alpha.2",
44
44
  "json-schema-to-typescript": "15.0.4"
45
45
  },
46
- "gitHead": "78a295e73a097a1ce09c777c06fa21ab68136387"
46
+ "gitHead": "31ccf1e81443ea3f93597d287595211f1823ddcf"
47
47
  }