@markuplint/ml-spec 3.0.0-canary.5 → 3.0.0-dev.176

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+export * from './constant/aria-version';
 export * from './dom-traverse/accname-computation';
 export * from './dom-traverse/get-attr-specs';
 export * from './dom-traverse/get-computed-aria-props';
@@ -11,8 +12,10 @@ export * from './dom-traverse/is-exposed';
 export * from './dom-traverse/may-be-focusable';
 export * from './specs/aria-specs';
 export * from './specs/content-model-category-to-tag-names';
+export * from './specs/get-aria';
 export * from './specs/get-role-spec';
 export * from './specs/get-spec-by-tag-name';
+export * from './specs/is-nothing-content-model';
 export * from './specs/is-palpable-elements';
 export * from './specs/is-void-element';
 export * from './specs/schema-to-spec';
@@ -21,3 +24,4 @@ export * from './types/aria';
 export * from './types/attributes';
 export * from './types/permitted-structures';
 export * from './utils/resolve-namespace';
+export * from './utils/validateAriaVersion';

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./constant/aria-version"), exports);
 tslib_1.__exportStar(require("./dom-traverse/accname-computation"), exports);
 tslib_1.__exportStar(require("./dom-traverse/get-attr-specs"), exports);
 tslib_1.__exportStar(require("./dom-traverse/get-computed-aria-props"), exports);
@@ -14,8 +15,10 @@ tslib_1.__exportStar(require("./dom-traverse/is-exposed"), exports);
 tslib_1.__exportStar(require("./dom-traverse/may-be-focusable"), exports);
 tslib_1.__exportStar(require("./specs/aria-specs"), exports);
 tslib_1.__exportStar(require("./specs/content-model-category-to-tag-names"), exports);
+tslib_1.__exportStar(require("./specs/get-aria"), exports);
 tslib_1.__exportStar(require("./specs/get-role-spec"), exports);
 tslib_1.__exportStar(require("./specs/get-spec-by-tag-name"), exports);
+tslib_1.__exportStar(require("./specs/is-nothing-content-model"), exports);
 tslib_1.__exportStar(require("./specs/is-palpable-elements"), exports);
 tslib_1.__exportStar(require("./specs/is-void-element"), exports);
 tslib_1.__exportStar(require("./specs/schema-to-spec"), exports);
@@ -24,3 +27,4 @@ tslib_1.__exportStar(require("./types/aria"), exports);
 tslib_1.__exportStar(require("./types/attributes"), exports);
 tslib_1.__exportStar(require("./types/permitted-structures"), exports);
 tslib_1.__exportStar(require("./utils/resolve-namespace"), exports);
+tslib_1.__exportStar(require("./utils/validateAriaVersion"), exports);

package/lib/specs/aria-specs.d.ts

@@ -1,6 +1,9 @@
 import type { ARIAVersion, MLMLSpec } from '../types';
-export declare function ariaSpecs(specs: Readonly<MLMLSpec>, version: ARIAVersion): {
-    roles: import("../types").ARIARoleInSchema[];
-    graphicsRoles: import("../types").ARIARoleInSchema[];
-    props: import("../types").ARIAProperty[];
+export declare function ariaSpecs(
+	specs: MLMLSpec,
+	version: ARIAVersion,
+): {
+	readonly roles: readonly import('../types').ARIARoleInSchema[];
+	readonly graphicsRoles: readonly import('../types').ARIARoleInSchema[];
+	readonly props: readonly import('../types').ARIAProperty[];
 };

package/lib/specs/content-model-category-to-tag-names.d.ts

@@ -1,3 +1,6 @@
 import type { MLMLSpec } from '../types';
 import type { Category } from '../types/permitted-structures';
-export declare function contentModelCategoryToTagNames(contentModel: Category, def: MLMLSpec['def']): ReadonlyArray<string>;
+export declare function contentModelCategoryToTagNames(
+	contentModel: Category,
+	def: MLMLSpec['def'],
+): ReadonlyArray<string>;

package/lib/specs/get-aria.d.ts

@@ -1,3 +1,10 @@
 import type { ARIAVersion, Matches, MLMLSpec } from '../types';
 import type { ARIA } from '../types/aria';
-export declare function getARIA(specs: Readonly<MLMLSpec>, localName: string, namespace: string | null, version: ARIAVersion, matches: Matches): Omit<ARIA, ARIAVersion | 'conditions'> | null;
+import type { ReadonlyDeep } from 'type-fest';
+export declare function getARIA(
+	specs: MLMLSpec,
+	localName: string,
+	namespace: string | null,
+	version: ARIAVersion,
+	matches: Matches,
+): Omit<ReadonlyDeep<ARIA>, ARIAVersion | 'conditions'> | null;

package/lib/specs/get-aria.js

@@ -21,6 +21,9 @@ function getARIA(specs, localName, namespace, version, matches) {
             continue;
         }
         const condARIA = conditions[cond];
+        if (!condARIA) {
+            continue;
+        }
         implicitRole = (_a = condARIA.implicitRole) !== null && _a !== void 0 ? _a : implicitRole;
         permittedRoles = (_b = condARIA.permittedRoles) !== null && _b !== void 0 ? _b : permittedRoles;
         implicitProperties = (_c = condARIA.implicitProperties) !== null && _c !== void 0 ? _c : implicitProperties;
@@ -49,8 +52,11 @@ function getVersionResolvedARIA(specs, localName, namespace, version) {
         return null;
     }
     aria = (0, resolve_version_1.resolveVersion)(spec, version);
-    if (aria.permittedRoles) {
-        aria.permittedRoles = optimizePermittedRoles(aria.permittedRoles);
+    if (aria.permittedRoles !== false) {
+        aria = {
+            ...aria,
+            permittedRoles: optimizePermittedRoles(aria.permittedRoles),
+        };
     }
     cache.set(key, aria);
     return aria;

package/lib/specs/get-attr-specs.d.ts

@@ -1,8 +1,12 @@
 import type { MLMLSpec, Attribute } from '../types';
 import type { NamespaceURI } from '@markuplint/ml-ast';
-export declare function getAttrSpecs(localName: string, namespace: NamespaceURI | null, schema: MLMLSpec): Attribute[] | null;
+export declare function getAttrSpecs(
+	localName: string,
+	namespace: NamespaceURI | null,
+	schema: MLMLSpec,
+): readonly Attribute[] | null;
 type HasName = {
-    name: string;
+	readonly name: string;
 };
 export declare function nameCompare(a: HasName | string, b: HasName | string): 1 | -1 | 0;
 export {};

package/lib/specs/get-attr-specs.js

@@ -8,7 +8,7 @@ function getAttrSpecs(localName, namespace, schema) {
     if (!schemaCache.has(schema)) {
         cacheMap.clear();
     }
-    const { localNameWithNS } = (0, resolve_namespace_1.resolveNamespace)(localName, namespace || undefined);
+    const { localNameWithNS } = (0, resolve_namespace_1.resolveNamespace)(localName, namespace !== null && namespace !== void 0 ? namespace : undefined);
     const cache = cacheMap.get(localNameWithNS);
     if (cache !== undefined) {
         return cache;
@@ -24,7 +24,7 @@ function getAttrSpecs(localName, namespace, schema) {
     for (const catName in elSpec.globalAttrs) {
         // @ts-ignore
         const catAttrs = elSpec.globalAttrs[catName];
-        if (!catAttrs) {
+        if (catAttrs === false) {
             continue;
         }
         if (typeof catAttrs === 'boolean') {
@@ -66,18 +66,6 @@ function getAttrSpecs(localName, namespace, schema) {
         const attr = attrs[name];
         return { name, type: 'Any', ...attr };
     });
-    for (const attr of attrList) {
-        if (!attr.type) {
-            throw new Error(`The type is empty in the ${attr.name} attribute of the ${localName} element,
-					'packages',
-					'@markuplint',
-					'html-spec',
-					'src',
-					'attributes',
-					nameWithNS.replace(':', '_') + '.json',
-				)})`);
-        }
-    }
     attrList.sort(nameCompare);
     cacheMap.set(localNameWithNS, attrList);
     return attrList;

package/lib/specs/get-implicit-role.d.ts

@@ -1,2 +1,8 @@
 import type { ARIAVersion, Matches, MLMLSpec } from '../types';
-export declare function getImplicitRole(specs: Readonly<MLMLSpec>, localName: string, namespace: string | null, version: ARIAVersion, matches: Matches): import("..").ImplicitRole;
+export declare function getImplicitRole(
+	specs: MLMLSpec,
+	localName: string,
+	namespace: string | null,
+	version: ARIAVersion,
+	matches: Matches,
+): import('..').ImplicitRole;

package/lib/specs/get-permitted-roles.d.ts

@@ -6,7 +6,13 @@ import type { ARIAVersion, Matches, MLMLSpec } from '../types';
  * - If `true`, this mean is "Any".
  * - If `false`, this mean is "No".
  */
-export declare function getPermittedRoles(specs: Readonly<MLMLSpec>, localName: string, namespace: string | null, version: ARIAVersion, matches: Matches): {
-    name: string;
-    deprecated?: boolean;
+export declare function getPermittedRoles(
+	specs: MLMLSpec,
+	localName: string,
+	namespace: string | null,
+	version: ARIAVersion,
+	matches: Matches,
+): readonly {
+	readonly name: string;
+	readonly deprecated?: boolean;
 }[];

package/lib/specs/get-permitted-roles.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPermittedRoles = void 0;
+const is_plain_object_1 = require("is-plain-object");
 const merge_array_1 = require("../utils/merge-array");
 const aria_specs_1 = require("./aria-specs");
 const get_aria_1 = require("./get-aria");
@@ -26,17 +27,7 @@ function getPermittedRoles(specs, localName, namespace, version, matches) {
             name: role.name,
         })));
     }
-    if (Array.isArray(permittedRoles)) {
-        permittedRoleList = (0, merge_array_1.mergeArray)(permittedRoleList, permittedRoles.map(role => {
-            if (typeof role === 'string') {
-                return {
-                    name: role,
-                };
-            }
-            return role;
-        }));
-    }
-    else if (!(typeof permittedRoles === 'boolean')) {
+    if (isAAMInfo(permittedRoles)) {
         if (permittedRoles['core-aam']) {
             permittedRoleList = (0, merge_array_1.mergeArray)(permittedRoleList, roles
                 .filter(role => !role.isAbstract)
@@ -52,10 +43,23 @@ function getPermittedRoles(specs, localName, namespace, version, matches) {
             })));
         }
     }
-    if (implicitRole) {
-        const implicitRoles = implicitRole === 'presentation' || implicitRole === 'none' ? ['none', 'presentation'] : [implicitRole];
-        return (0, merge_array_1.mergeArray)(implicitRoles.map(r => ({ name: r })), permittedRoleList);
+    else if (typeof permittedRoles !== 'boolean') {
+        permittedRoleList = (0, merge_array_1.mergeArray)(permittedRoleList, permittedRoles.map(role => {
+            if (typeof role === 'string') {
+                return {
+                    name: role,
+                };
+            }
+            return role;
+        }));
     }
-    return permittedRoleList;
+    if (implicitRole === false) {
+        return permittedRoleList;
+    }
+    const implicitRoles = implicitRole === 'presentation' || implicitRole === 'none' ? ['none', 'presentation'] : [implicitRole];
+    return (0, merge_array_1.mergeArray)(implicitRoles.map(r => ({ name: r })), permittedRoleList);
 }
 exports.getPermittedRoles = getPermittedRoles;
+function isAAMInfo(permittedRoles) {
+    return (0, is_plain_object_1.isPlainObject)(permittedRoles);
+}

package/lib/specs/get-role-spec.d.ts

@@ -1,5 +1,12 @@
 import type { ARIAVersion, ARIARoleInSchema, MLMLSpec, ARIARole } from '../types';
 import type { NamespaceURI } from '@markuplint/ml-ast';
-export declare function getRoleSpec(specs: Readonly<MLMLSpec>, roleName: string, namespace: NamespaceURI, version: ARIAVersion): (ARIARole & {
-    superClassRoles: ARIARoleInSchema[];
-}) | null;
+export declare function getRoleSpec(
+	specs: MLMLSpec,
+	roleName: string,
+	namespace: NamespaceURI,
+	version: ARIAVersion,
+):
+	| (ARIARole & {
+			superClassRoles: ARIARoleInSchema[];
+	  })
+	| null;

package/lib/specs/get-role-spec.js

@@ -38,9 +38,9 @@ function recursiveTraverseSuperClassRoles(specs, roleName, namespace, version) {
     return roles;
 }
 function getSuperClassRoles(specs, roleName, namespace, version) {
-    var _a;
+    var _a, _b;
     const role = getRoleByName(specs, roleName, namespace, version);
-    return (((_a = role === null || role === void 0 ? void 0 : role.generalization) === null || _a === void 0 ? void 0 : _a.map(roleName => getRoleByName(specs, roleName, namespace, version)).filter((role) => !!role)) || null);
+    return ((_b = (_a = role === null || role === void 0 ? void 0 : role.generalization) === null || _a === void 0 ? void 0 : _a.map(roleName => getRoleByName(specs, roleName, namespace, version)).filter((role) => !!role)) !== null && _b !== void 0 ? _b : null);
 }
 function getRoleByName(specs, roleName, namespace, version) {
     const { roles, graphicsRoles } = (0, aria_specs_1.ariaSpecs)(specs, version);

package/lib/specs/get-selectors-by-content-model-category.d.ts

@@ -1,3 +1,3 @@
 import type { MLMLSpec } from '../types';
 import type { Category } from '../types/permitted-structures';
-export declare function getSelectorsByContentModelCategory(specs: Readonly<MLMLSpec>, category: Category): ReadonlyArray<string>;
+export declare function getSelectorsByContentModelCategory(specs: MLMLSpec, category: Category): ReadonlyArray<string>;

package/lib/specs/get-selectors-by-content-model-category.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSelectorsByContentModelCategory = void 0;
 function getSelectorsByContentModelCategory(specs, category) {
     const selectors = specs.def['#contentModels'][category];
-    return selectors || [];
+    return selectors !== null && selectors !== void 0 ? selectors : [];
 }
 exports.getSelectorsByContentModelCategory = getSelectorsByContentModelCategory;

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

@@ -1,2 +1,6 @@
 import type { ElementSpec } from '../types';
-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, 'name' | K> | null;

package/lib/specs/get-spec-by-tag-name.js

@@ -4,12 +4,13 @@ exports.getSpecByTagName = void 0;
 const resolve_namespace_1 = require("../utils/resolve-namespace");
 const cache = new Map();
 function getSpecByTagName(specs, localName, namespace) {
-    const { localNameWithNS } = (0, resolve_namespace_1.resolveNamespace)(localName, namespace || undefined);
+    var _a;
+    const { localNameWithNS } = (0, resolve_namespace_1.resolveNamespace)(localName, namespace !== null && namespace !== void 0 ? namespace : undefined);
     let spec = cache.get(localNameWithNS);
     if (spec !== undefined) {
         return spec;
     }
-    spec = specs.find(spec => spec.name === localNameWithNS) || null;
+    spec = (_a = specs.find(spec => spec.name === localNameWithNS)) !== null && _a !== void 0 ? _a : null;
     cache.set(localNameWithNS, spec);
     return spec;
 }

package/lib/specs/is-nothing-content-model.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @see https://html.spec.whatwg.org/multipage/dom.html#the-nothing-content-model
+ * @see https://html.spec.whatwg.org/multipage/indices.html#elements-3
+ */
+export declare function isNothingContentModel(el: Element): boolean;

package/lib/specs/is-nothing-content-model.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNothingContentModel = void 0;
+const is_void_element_1 = require("./is-void-element");
+/**
+ * @see https://html.spec.whatwg.org/multipage/dom.html#the-nothing-content-model
+ * @see https://html.spec.whatwg.org/multipage/indices.html#elements-3
+ */
+function isNothingContentModel(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el) {
+    return (0, is_void_element_1.isVoidElement)(el) || ['iframe', 'template'].includes(el.localName);
+}
+exports.isNothingContentModel = isNothingContentModel;

package/lib/specs/is-palpable-elements.d.ts

@@ -1,5 +1,9 @@
 import type { MLMLSpec } from '../types';
-export declare function isPalpableElement(el: Element, specs: Readonly<MLMLSpec>, options?: {
-    extendsSvg?: boolean;
-    extendsExposableElements?: boolean;
-}): boolean;
+export declare function isPalpableElement(
+	el: Element,
+	specs: MLMLSpec,
+	options?: {
+		readonly extendsSvg?: boolean;
+		readonly extendsExposableElements?: boolean;
+	},
+): boolean;

package/lib/specs/is-palpable-elements.js

@@ -31,11 +31,13 @@ const exposableElementsThatAreNoBelongingAModel = [
     'thead',
     'tr',
 ];
-function isPalpableElement(el, specs, options) {
-    var _a, _b;
-    const conditions = [((_a = specs.def['#contentModels']['#palpable']) === null || _a === void 0 ? void 0 : _a.join(',')) || ''];
+function isPalpableElement(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, specs, options) {
+    var _a, _b, _c, _d;
+    const conditions = [(_b = (_a = specs.def['#contentModels']['#palpable']) === null || _a === void 0 ? void 0 : _a.join(',')) !== null && _b !== void 0 ? _b : ''];
     if ((options === null || options === void 0 ? void 0 : options.extendsSvg) !== false /* default true */) {
-        conditions.push(((_b = specs.def['#contentModels']['#SVGRenderable']) === null || _b === void 0 ? void 0 : _b.join(',')) || '');
+        conditions.push((_d = (_c = specs.def['#contentModels']['#SVGRenderable']) === null || _c === void 0 ? void 0 : _c.join(',')) !== null && _d !== void 0 ? _d : '');
     }
     if (options === null || options === void 0 ? void 0 : options.extendsExposableElements /* default false */) {
         conditions.push(exposableElementsThatAreNoBelongingAModel.join(','));

package/lib/specs/is-void-element.js

@@ -19,7 +19,9 @@ const voidElements = [
     'track',
     'wbr',
 ];
-function isVoidElement(el) {
+function isVoidElement(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el) {
     return voidElements.includes(el.localName);
 }
 exports.isVoidElement = isVoidElement;

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

@@ -1,3 +1,7 @@
 import type { ARIAVersion } from '../types';
 import type { ARIA } from '../types/aria';
-export declare function resolveVersion(aria: ARIA, version: ARIAVersion): Omit<ARIA, ARIAVersion>;
+import type { ReadonlyDeep } from 'type-fest';
+export declare function resolveVersion(
+	aria: ReadonlyDeep<ARIA>,
+	version: ARIAVersion,
+): Omit<ReadonlyDeep<ARIA>, ARIAVersion>;

package/lib/specs/resolve-version.js

@@ -7,7 +7,7 @@ function resolveVersion(aria, version) {
     const permittedRoles = (_d = (_c = aria[version]) === null || _c === void 0 ? void 0 : _c.permittedRoles) !== null && _d !== void 0 ? _d : aria.permittedRoles;
     const implicitProperties = (_f = (_e = aria[version]) === null || _e === void 0 ? void 0 : _e.implicitProperties) !== null && _f !== void 0 ? _f : aria.implicitProperties;
     const properties = (_h = (_g = aria[version]) === null || _g === void 0 ? void 0 : _g.properties) !== null && _h !== void 0 ? _h : aria.properties;
-    const namingProhibited = version === '1.2' ? (_k = (_j = aria[version]) === null || _j === void 0 ? void 0 : _j.namingProhibited) !== null && _k !== void 0 ? _k : aria.namingProhibited : aria.namingProhibited;
+    const namingProhibited = version === '1.1' ? aria.namingProhibited : (_k = (_j = aria[version]) === null || _j === void 0 ? void 0 : _j.namingProhibited) !== null && _k !== void 0 ? _k : aria.namingProhibited;
     const conditions = (_m = (_l = aria[version]) === null || _l === void 0 ? void 0 : _l.conditions) !== null && _m !== void 0 ? _m : aria.conditions;
     return {
         implicitRole,

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

@@ -2,12 +2,12 @@ import type { ElementSpec, ExtendedSpec, MLMLSpec } from '../types';
 /**
  * Merging HTML-spec schema and extended spec schemas
  *
- * Ex: `@markuplint/html-spec` + `{ specs: ["@markuplint/vue-spec"] }` in configure files.
+ * Ex: `@markuplint/html-spec` + `{ specs: { "\\.vue$": "@markuplint/vue-spec" } }` in configure files.
  *
  * @param schemas `MLDocument.schemas`
  */
 export declare function schemaToSpec(schemas: readonly [MLMLSpec, ...ExtendedSpec[]]): {
-    cites: import("../types").Cites;
-    def: import("../types").SpecDefs;
-    specs: ElementSpec[];
+	cites: import('../types').Cites;
+	def: import('../types').SpecDefs;
+	specs: readonly ElementSpec[];
 };

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

@@ -5,12 +5,12 @@ const merge_array_1 = require("../utils/merge-array");
 /**
  * Merging HTML-spec schema and extended spec schemas
  *
- * Ex: `@markuplint/html-spec` + `{ specs: ["@markuplint/vue-spec"] }` in configure files.
+ * Ex: `@markuplint/html-spec` + `{ specs: { "\\.vue$": "@markuplint/vue-spec" } }` in configure files.
  *
  * @param schemas `MLDocument.schemas`
  */
 function schemaToSpec(schemas) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const [main, ...extendedSpecs] = schemas;
     const result = { ...main };
     for (const extendedSpec of extendedSpecs) {
@@ -18,37 +18,48 @@ function schemaToSpec(schemas) {
             result.cites = [...result.cites, ...extendedSpec.cites];
         }
         if (extendedSpec.def) {
+            const def = { ...result.def };
             if ((_a = extendedSpec.def['#globalAttrs']) === null || _a === void 0 ? void 0 : _a['#extends']) {
-                result.def['#globalAttrs']['#HTMLGlobalAttrs'] = {
-                    ...(((_b = result.def['#globalAttrs']) === null || _b === void 0 ? void 0 : _b['#HTMLGlobalAttrs']) || {}),
-                    ...(((_c = extendedSpec.def['#globalAttrs']) === null || _c === void 0 ? void 0 : _c['#extends']) || {}),
+                const gAttrs = { ...def['#globalAttrs'] };
+                gAttrs['#HTMLGlobalAttrs'] = {
+                    ...((_c = (_b = def['#globalAttrs']) === null || _b === void 0 ? void 0 : _b['#HTMLGlobalAttrs']) !== null && _c !== void 0 ? _c : {}),
+                    ...((_e = (_d = extendedSpec.def['#globalAttrs']) === null || _d === void 0 ? void 0 : _d['#extends']) !== null && _e !== void 0 ? _e : {}),
                 };
+                def['#globalAttrs'] = gAttrs;
             }
             if (extendedSpec.def['#aria']) {
-                result.def['#aria'] = {
+                def['#aria'] = {
                     '1.1': {
-                        roles: (0, merge_array_1.mergeArray)(result.def['#aria']['1.1'].roles, extendedSpec.def['#aria']['1.1'].roles),
-                        props: (0, merge_array_1.mergeArray)(result.def['#aria']['1.1'].props, extendedSpec.def['#aria']['1.1'].props),
-                        graphicsRoles: (0, merge_array_1.mergeArray)(result.def['#aria']['1.1'].graphicsRoles, extendedSpec.def['#aria']['1.1'].graphicsRoles),
+                        roles: (0, merge_array_1.mergeArray)(def['#aria']['1.1'].roles, extendedSpec.def['#aria']['1.1'].roles),
+                        props: (0, merge_array_1.mergeArray)(def['#aria']['1.1'].props, extendedSpec.def['#aria']['1.1'].props),
+                        graphicsRoles: (0, merge_array_1.mergeArray)(def['#aria']['1.1'].graphicsRoles, extendedSpec.def['#aria']['1.1'].graphicsRoles),
                     },
                     '1.2': {
-                        roles: (0, merge_array_1.mergeArray)(result.def['#aria']['1.2'].roles, extendedSpec.def['#aria']['1.2'].roles),
-                        props: (0, merge_array_1.mergeArray)(result.def['#aria']['1.2'].props, extendedSpec.def['#aria']['1.2'].props),
-                        graphicsRoles: (0, merge_array_1.mergeArray)(result.def['#aria']['1.2'].graphicsRoles, extendedSpec.def['#aria']['1.2'].graphicsRoles),
+                        roles: (0, merge_array_1.mergeArray)(def['#aria']['1.2'].roles, extendedSpec.def['#aria']['1.2'].roles),
+                        props: (0, merge_array_1.mergeArray)(def['#aria']['1.2'].props, extendedSpec.def['#aria']['1.2'].props),
+                        graphicsRoles: (0, merge_array_1.mergeArray)(def['#aria']['1.2'].graphicsRoles, extendedSpec.def['#aria']['1.2'].graphicsRoles),
+                    },
+                    '1.3': {
+                        roles: (0, merge_array_1.mergeArray)(def['#aria']['1.3'].roles, extendedSpec.def['#aria']['1.3'].roles),
+                        props: (0, merge_array_1.mergeArray)(def['#aria']['1.3'].props, extendedSpec.def['#aria']['1.3'].props),
+                        graphicsRoles: (0, merge_array_1.mergeArray)(def['#aria']['1.3'].graphicsRoles, extendedSpec.def['#aria']['1.3'].graphicsRoles),
                     },
                 };
             }
             if (extendedSpec.def['#contentModels']) {
+                const models = { ...def['#contentModels'] };
                 const keys = new Set([
-                    ...Object.keys(result.def['#contentModels']),
+                    ...Object.keys(def['#contentModels']),
                     ...Object.keys(extendedSpec.def['#contentModels']),
                 ]);
                 for (const modelName of keys) {
-                    const mainModel = result.def['#contentModels'][modelName];
+                    const mainModel = def['#contentModels'][modelName];
                     const exModel = extendedSpec.def['#contentModels'][modelName];
-                    result.def['#contentModels'][modelName] = [...(mainModel || []), ...(exModel || [])];
+                    models[modelName] = [...(mainModel !== null && mainModel !== void 0 ? mainModel : []), ...(exModel !== null && exModel !== void 0 ? exModel : [])];
                 }
+                def['#contentModels'] = models;
             }
+            result.def = def;
         }
         if (extendedSpec.specs) {
             const exSpecs = extendedSpec.specs.slice();
@@ -66,10 +77,10 @@ function schemaToSpec(schemas) {
                     ...exSpec,
                     globalAttrs: {
                         ...elSpec.globalAttrs,
-                        ...exSpec.globalAttrs,
+                        ...exSpec === null || exSpec === void 0 ? void 0 : exSpec.globalAttrs,
                     },
-                    attributes: mergeAttrSpec(elSpec.attributes, exSpec.attributes),
-                    categories: (0, merge_array_1.mergeArray)(elSpec.categories, exSpec.categories),
+                    attributes: mergeAttrSpec(elSpec.attributes, exSpec === null || exSpec === void 0 ? void 0 : exSpec.attributes),
+                    categories: (0, merge_array_1.mergeArray)(elSpec.categories, exSpec === null || exSpec === void 0 ? void 0 : exSpec.categories),
                 });
             }
             result.specs = specs;