@markuplint/ml-spec 4.10.2 → 5.0.0-alpha.0

package/lib/utils/get-ns.d.ts

@@ -1,2 +1,9 @@
 import type { Namespace } from '@markuplint/ml-ast';
+/**
+ * Maps a full namespace URI string to its shorthand `Namespace` identifier.
+ * Returns `'html'` as the default for any unrecognized or null namespace.
+ *
+ * @param namespaceURI - The full namespace URI, or null
+ * @returns The shorthand namespace identifier (`'html'`, `'svg'`, `'mml'`, or `'xlink'`)
+ */
 export declare function getNS(namespaceURI: string | null): Namespace;

package/lib/utils/get-ns.js

@@ -1,3 +1,10 @@
+/**
+ * Maps a full namespace URI string to its shorthand `Namespace` identifier.
+ * Returns `'html'` as the default for any unrecognized or null namespace.
+ *
+ * @param namespaceURI - The full namespace URI, or null
+ * @returns The shorthand namespace identifier (`'html'`, `'svg'`, `'mml'`, or `'xlink'`)
+ */
 export function getNS(namespaceURI) {
     switch (namespaceURI) {
         case 'http://www.w3.org/2000/svg': {

package/lib/utils/get-spec-by-tag-name.d.ts

@@ -10,4 +10,4 @@ import type { ElementSpec } from '../types/index.js';
  * @param namespace - The namespace URI string, or null for HTML namespace
  * @returns The matching element specification, or null if not found
  */
-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;
+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;

package/lib/utils/merge-array.d.ts

@@ -1,5 +1,15 @@
 type NamedDefinition = string | {
     readonly name: string;
 };
+/**
+ * Merges two arrays of named definitions by name, with items from `b` overriding
+ * matching items in `a`. When both items are objects, their properties are merged;
+ * when the overriding item is a string, the existing item is kept as-is.
+ *
+ * @template T - A named definition type (string or object with a `name` property)
+ * @param a - The base array of named definitions
+ * @param b - The array of named definitions to merge in, or null/undefined to skip
+ * @returns A new array with items from `b` merged into `a` by name
+ */
 export declare function mergeArray<T extends NamedDefinition>(a: readonly T[], b: readonly T[] | null | undefined): readonly T[];
 export {};

package/lib/utils/merge-array.js

@@ -1,3 +1,13 @@
+/**
+ * Merges two arrays of named definitions by name, with items from `b` overriding
+ * matching items in `a`. When both items are objects, their properties are merged;
+ * when the overriding item is a string, the existing item is kept as-is.
+ *
+ * @template T - A named definition type (string or object with a `name` property)
+ * @param a - The base array of named definitions
+ * @param b - The array of named definitions to merge in, or null/undefined to skip
+ * @returns A new array with items from `b` merged into `a` by name
+ */
 export function mergeArray(a, b) {
     if (!b) {
         return a;

package/lib/utils/resolve-version.d.ts

@@ -1,4 +1,15 @@
 import type { ARIA } from '../types/aria.js';
 import type { ARIAVersion } from '../types/index.js';
 import type { ReadonlyDeep } from 'type-fest';
+/**
+ * Resolves an element's ARIA specification by merging version-specific overrides
+ * on top of the base properties. For each ARIA property (implicitRole, permittedRoles,
+ * etc.), the version-specific value takes precedence over the base value.
+ * `namingProhibited` is special-cased: ARIA 1.1 always uses the base value since
+ * `namingProhibited` was introduced in ARIA 1.2.
+ *
+ * @param aria - The element's full ARIA specification including version-specific blocks
+ * @param version - The ARIA specification version to resolve for
+ * @returns The resolved ARIA specification with version-specific overrides applied
+ */
 export declare function resolveVersion(aria: ReadonlyDeep<ARIA>, version: ARIAVersion): Omit<ReadonlyDeep<ARIA>, ARIAVersion>;

package/lib/utils/resolve-version.js

@@ -1,3 +1,14 @@
+/**
+ * Resolves an element's ARIA specification by merging version-specific overrides
+ * on top of the base properties. For each ARIA property (implicitRole, permittedRoles,
+ * etc.), the version-specific value takes precedence over the base value.
+ * `namingProhibited` is special-cased: ARIA 1.1 always uses the base value since
+ * `namingProhibited` was introduced in ARIA 1.2.
+ *
+ * @param aria - The element's full ARIA specification including version-specific blocks
+ * @param version - The ARIA specification version to resolve for
+ * @returns The resolved ARIA specification with version-specific overrides applied
+ */
 export function resolveVersion(aria, version) {
     const implicitRole = aria[version]?.implicitRole ?? aria.implicitRole;
     const permittedRoles = aria[version]?.permittedRoles ?? aria.permittedRoles;

package/lib/utils/schema-to-spec.d.ts

@@ -13,4 +13,6 @@ export declare function schemaToSpec(schemas: readonly [MLMLSpec, ...ExtendedSpe
     cites: import("../types/index.js").Cites;
     def: import("../types/index.js").SpecDefs;
     specs: readonly ElementSpec[];
+    directivePatterns?: readonly import("../types/index.js").DirectivePattern[];
+    useIDLAttributeNames?: boolean;
 };

package/lib/utils/schema-to-spec.js

@@ -19,10 +19,12 @@ export function schemaToSpec(schemas) {
         if (extendedSpec.def) {
             const def = { ...result.def };
             if (extendedSpec.def['#globalAttrs']?.['#extends']) {
-                const gAttrs = { ...def['#globalAttrs'] };
-                gAttrs['#HTMLGlobalAttrs'] = {
-                    ...def['#globalAttrs']?.['#HTMLGlobalAttrs'],
-                    ...extendedSpec.def['#globalAttrs']?.['#extends'],
+                const gAttrs = {
+                    ...def['#globalAttrs'],
+                    '#HTMLGlobalAttrs': {
+                        ...def['#globalAttrs']?.['#HTMLGlobalAttrs'],
+                        ...extendedSpec.def['#globalAttrs']?.['#extends'],
+                    },
                 };
                 def['#globalAttrs'] = gAttrs;
             }
@@ -32,16 +34,19 @@ export function schemaToSpec(schemas) {
                         roles: mergeArray(def['#aria']['1.1'].roles, extendedSpec.def['#aria']['1.1'].roles),
                         props: mergeArray(def['#aria']['1.1'].props, extendedSpec.def['#aria']['1.1'].props),
                         graphicsRoles: mergeArray(def['#aria']['1.1'].graphicsRoles, extendedSpec.def['#aria']['1.1'].graphicsRoles),
+                        dpubRoles: mergeArray(def['#aria']['1.1'].dpubRoles, extendedSpec.def['#aria']['1.1'].dpubRoles),
                     },
                     '1.2': {
                         roles: mergeArray(def['#aria']['1.2'].roles, extendedSpec.def['#aria']['1.2'].roles),
                         props: mergeArray(def['#aria']['1.2'].props, extendedSpec.def['#aria']['1.2'].props),
                         graphicsRoles: mergeArray(def['#aria']['1.2'].graphicsRoles, extendedSpec.def['#aria']['1.2'].graphicsRoles),
+                        dpubRoles: mergeArray(def['#aria']['1.2'].dpubRoles, extendedSpec.def['#aria']['1.2'].dpubRoles),
                     },
                     '1.3': {
                         roles: mergeArray(def['#aria']['1.3'].roles, extendedSpec.def['#aria']['1.3'].roles),
                         props: mergeArray(def['#aria']['1.3'].props, extendedSpec.def['#aria']['1.3'].props),
                         graphicsRoles: mergeArray(def['#aria']['1.3'].graphicsRoles, extendedSpec.def['#aria']['1.3'].graphicsRoles),
+                        dpubRoles: mergeArray(def['#aria']['1.3'].dpubRoles, extendedSpec.def['#aria']['1.3'].dpubRoles),
                     },
                 };
             }
@@ -60,6 +65,12 @@ export function schemaToSpec(schemas) {
             }
             result.def = def;
         }
+        if (extendedSpec.directivePatterns) {
+            result.directivePatterns = [...(result.directivePatterns ?? []), ...extendedSpec.directivePatterns];
+        }
+        if (extendedSpec.useIDLAttributeNames != null) {
+            result.useIDLAttributeNames = extendedSpec.useIDLAttributeNames;
+        }
         if (extendedSpec.specs) {
             const exSpecs = [...extendedSpec.specs];
             const specs = [];

package/package.json

@@ -1,10 +1,13 @@
 {
 	"name": "@markuplint/ml-spec",
-	"version": "4.10.2",
+	"version": "5.0.0-alpha.0",
 	"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>",
 	"license": "MIT",
+	"engines": {
+		"node": ">=22"
+	},
 	"type": "module",
 	"exports": {
 		".": {
@@ -31,15 +34,14 @@
 		"schema:prettier": "npx prettier --write \"./schemas/*.json\" \"./src/types/*.ts\" --log-level warn"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.4.11",
-		"@markuplint/types": "4.8.2",
-		"dom-accessibility-api": "0.7.1",
+		"@markuplint/ml-ast": "5.0.0-alpha.0",
+		"@markuplint/types": "5.0.0-alpha.0",
 		"is-plain-object": "5.0.0",
-		"type-fest": "4.41.0"
+		"type-fest": "5.4.4"
 	},
 	"devDependencies": {
-		"@markuplint/test-tools": "4.5.23",
+		"@markuplint/test-tools": "5.0.0-alpha.0",
 		"json-schema-to-typescript": "15.0.4"
 	},
-	"gitHead": "193ee7c1262bbed95424e38efdf1a8e56ff049f4"
+	"gitHead": "13dcfc84ec83d87360c720e253383b60767e1b56"
 }