@markuplint/ml-spec 3.14.0 → 4.0.0-alpha.10

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

@@ -1,4 +1,4 @@
-import type { ARIAVersion, Matches, MLMLSpec } from '../types';
+import type { ARIAVersion, Matches, MLMLSpec } from '../types/index.js';
 /**
  * Getting permitted ARIA roles.
  *
@@ -6,13 +6,7 @@ import type { ARIAVersion, Matches, MLMLSpec } from '../types';
  * - If `true`, this mean is "Any".
  * - If `false`, this mean is "No".
  */
-export declare function getPermittedRoles(
-	specs: MLMLSpec,
-	localName: string,
-	namespace: string | null,
-	version: ARIAVersion,
-	matches: Matches,
-): readonly {
-	readonly name: string;
-	readonly 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,10 +1,8 @@
-"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");
+// @ts-ignore
+import { isPlainObject } from 'is-plain-object';
+import { mergeArray } from '../utils/merge-array.js';
+import { ariaSpecs } from './aria-specs.js';
+import { getARIA } from './get-aria.js';
 /**
  * Getting permitted ARIA roles.
  *
@@ -12,16 +10,16 @@ const get_aria_1 = require("./get-aria");
  * - If `true`, this mean is "Any".
  * - If `false`, this mean is "No".
  */
-function getPermittedRoles(specs, localName, namespace, version, matches) {
-    const aria = (0, get_aria_1.getARIA)(specs, localName, namespace, version, matches);
+export function getPermittedRoles(specs, localName, namespace, version, matches) {
+    const aria = getARIA(specs, localName, namespace, version, matches);
     if (!aria) {
         return [];
     }
     const { implicitRole, permittedRoles } = aria;
-    const { roles, graphicsRoles } = (0, aria_specs_1.ariaSpecs)(specs, version);
+    const { roles, graphicsRoles } = ariaSpecs(specs, version);
     let permittedRoleList = [];
     if (permittedRoles === true) {
-        permittedRoleList = (0, merge_array_1.mergeArray)(permittedRoleList, roles
+        permittedRoleList = mergeArray(permittedRoleList, roles
             .filter(role => !role.isAbstract)
             .map(role => ({
             name: role.name,
@@ -29,14 +27,14 @@ function getPermittedRoles(specs, localName, namespace, version, matches) {
     }
     if (isAAMInfo(permittedRoles)) {
         if (permittedRoles['core-aam']) {
-            permittedRoleList = (0, merge_array_1.mergeArray)(permittedRoleList, roles
+            permittedRoleList = mergeArray(permittedRoleList, roles
                 .filter(role => !role.isAbstract)
                 .map(role => ({
                 name: role.name,
             })));
         }
         if (permittedRoles['graphics-aam']) {
-            permittedRoleList = (0, merge_array_1.mergeArray)(permittedRoleList, graphicsRoles
+            permittedRoleList = mergeArray(permittedRoleList, graphicsRoles
                 .filter(role => !role.isAbstract)
                 .map(role => ({
                 name: role.name,
@@ -44,7 +42,7 @@ function getPermittedRoles(specs, localName, namespace, version, matches) {
         }
     }
     else if (typeof permittedRoles !== 'boolean') {
-        permittedRoleList = (0, merge_array_1.mergeArray)(permittedRoleList, permittedRoles.map(role => {
+        permittedRoleList = mergeArray(permittedRoleList, permittedRoles.map(role => {
             if (typeof role === 'string') {
                 return {
                     name: role,
@@ -57,9 +55,8 @@ function getPermittedRoles(specs, localName, namespace, version, matches) {
         return permittedRoleList;
     }
     const implicitRoles = implicitRole === 'presentation' || implicitRole === 'none' ? ['none', 'presentation'] : [implicitRole];
-    return (0, merge_array_1.mergeArray)(implicitRoles.map(r => ({ name: r })), permittedRoleList);
+    return mergeArray(implicitRoles.map(r => ({ name: r })), permittedRoleList);
 }
-exports.getPermittedRoles = getPermittedRoles;
 function isAAMInfo(permittedRoles) {
-    return (0, is_plain_object_1.isPlainObject)(permittedRoles);
+    return isPlainObject(permittedRoles);
 }

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

@@ -1,12 +1,5 @@
-import type { ARIAVersion, ARIARoleInSchema, MLMLSpec, ARIARole } from '../types';
+import type { ARIAVersion, ARIARoleInSchema, MLMLSpec, ARIARole } from '../types/index.js';
 import type { NamespaceURI } from '@markuplint/ml-ast';
-export declare function getRoleSpec(
-	specs: 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

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRoleSpec = void 0;
-const aria_specs_1 = require("./aria-specs");
-function getRoleSpec(specs, roleName, namespace, version) {
-    var _a, _b, _c, _d;
+import { ariaSpecs } from './aria-specs.js';
+export function getRoleSpec(specs, roleName, namespace, version) {
     const role = getRoleByName(specs, roleName, namespace, version);
     if (!role) {
         return null;
@@ -12,19 +8,18 @@ function getRoleSpec(specs, roleName, namespace, version) {
     return {
         name: role.name,
         isAbstract: !!role.isAbstract,
-        requiredContextRole: (_a = role.requiredContextRole) !== null && _a !== void 0 ? _a : [],
-        requiredOwnedElements: (_b = role.requiredOwnedElements) !== null && _b !== void 0 ? _b : [],
+        requiredContextRole: role.requiredContextRole ?? [],
+        requiredOwnedElements: role.requiredOwnedElements ?? [],
         accessibleNameRequired: !!role.accessibleNameRequired,
         accessibleNameFromAuthor: !!role.accessibleNameFromAuthor,
         accessibleNameFromContent: !!role.accessibleNameFromContent,
         accessibleNameProhibited: !!role.accessibleNameProhibited,
         childrenPresentational: !!role.childrenPresentational,
-        ownedProperties: (_c = role.ownedProperties) !== null && _c !== void 0 ? _c : [],
-        prohibitedProperties: (_d = role.prohibitedProperties) !== null && _d !== void 0 ? _d : [],
+        ownedProperties: role.ownedProperties ?? [],
+        prohibitedProperties: role.prohibitedProperties ?? [],
         superClassRoles,
     };
 }
-exports.getRoleSpec = getRoleSpec;
 function recursiveTraverseSuperClassRoles(specs, roleName, namespace, version) {
     const roles = [];
     const superClassRoles = getSuperClassRoles(specs, roleName, namespace, version);
@@ -38,12 +33,13 @@ function recursiveTraverseSuperClassRoles(specs, roleName, namespace, version) {
     return roles;
 }
 function getSuperClassRoles(specs, roleName, namespace, version) {
-    var _a, _b;
     const role = getRoleByName(specs, roleName, namespace, version);
-    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);
+    return (role?.generalization
+        ?.map(roleName => getRoleByName(specs, roleName, namespace, version))
+        .filter((role) => !!role) ?? null);
 }
 function getRoleByName(specs, roleName, namespace, version) {
-    const { roles, graphicsRoles } = (0, aria_specs_1.ariaSpecs)(specs, version);
+    const { roles, graphicsRoles } = ariaSpecs(specs, version);
     let role = roles.find(r => r.name === roleName);
     if (!role && namespace === 'http://www.w3.org/2000/svg') {
         role = graphicsRoles.find(r => r.name === roleName);

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';
+import type { MLMLSpec } from '../types/index.js';
+import type { Category } from '../types/permitted-structures.js';
 export declare function getSelectorsByContentModelCategory(specs: MLMLSpec, category: Category): ReadonlyArray<string>;

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

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

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

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

@@ -1,17 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSpecByTagName = void 0;
-const resolve_namespace_1 = require("../utils/resolve-namespace");
+import { resolveNamespace } from '../utils/resolve-namespace.js';
 const cache = new Map();
-function getSpecByTagName(specs, localName, namespace) {
-    var _a;
-    const { localNameWithNS } = (0, resolve_namespace_1.resolveNamespace)(localName, namespace !== null && namespace !== void 0 ? namespace : undefined);
+export function getSpecByTagName(specs, localName, namespace) {
+    const { localNameWithNS } = resolveNamespace(localName, namespace ?? undefined);
     let spec = cache.get(localNameWithNS);
     if (spec !== undefined) {
         return spec;
     }
-    spec = (_a = specs.find(spec => spec.name === localNameWithNS)) !== null && _a !== void 0 ? _a : null;
+    spec = specs.find(spec => spec.name === localNameWithNS) ?? null;
     cache.set(localNameWithNS, spec);
     return spec;
 }
-exports.getSpecByTagName = getSpecByTagName;

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

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNothingContentModel = void 0;
-const is_void_element_1 = require("./is-void-element");
+import { isVoidElement } from './is-void-element.js';
 /**
  * @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(
+export 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);
+    return isVoidElement(el) || ['iframe', 'template'].includes(el.localName);
 }
-exports.isNothingContentModel = isNothingContentModel;

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

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

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

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPalpableElement = void 0;
 /**
  * Exposable content models and elements
  *
@@ -31,19 +28,17 @@ const exposableElementsThatAreNoBelongingAModel = [
     'thead',
     'tr',
 ];
-function isPalpableElement(
+export 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((_d = (_c = specs.def['#contentModels']['#SVGRenderable']) === null || _c === void 0 ? void 0 : _c.join(',')) !== null && _d !== void 0 ? _d : '');
+    const conditions = [specs.def['#contentModels']['#palpable']?.join(',') ?? ''];
+    if (options?.extendsSvg !== false /* default true */) {
+        conditions.push(specs.def['#contentModels']['#SVGRenderable']?.join(',') ?? '');
     }
-    if (options === null || options === void 0 ? void 0 : options.extendsExposableElements /* default false */) {
+    if (options?.extendsExposableElements /* default false */) {
         conditions.push(exposableElementsThatAreNoBelongingAModel.join(','));
     }
     return conditions.some(condition => {
         return el.matches(condition);
     });
 }
-exports.isPalpableElement = isPalpableElement;

package/lib/specs/is-presentational.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPresentational = void 0;
-function isPresentational(roleName) {
+export function isPresentational(roleName) {
     if (!roleName) {
         return false;
     }
     return ['presentation', 'none'].includes(roleName);
 }
-exports.isPresentational = isPresentational;

package/lib/specs/is-void-element.d.ts

@@ -1 +1,3 @@
-export declare function isVoidElement(el: Element): boolean;
+export declare function isVoidElement(el: {
+    readonly localName: string;
+}): boolean;

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

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVoidElement = void 0;
 /**
  * @see https://html.spec.whatwg.org/multipage/syntax.html#void-elements
  */
-const voidElements = [
+const voidElements = new Set([
     'area',
     'base',
     'br',
@@ -18,10 +15,7 @@ const voidElements = [
     'source',
     'track',
     'wbr',
-];
-function isVoidElement(
-// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-el) {
-    return voidElements.includes(el.localName);
+]);
+export function isVoidElement(el) {
+    return voidElements.has(el.localName);
 }
-exports.isVoidElement = isVoidElement;

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

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

package/lib/specs/resolve-version.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVersion = void 0;
-function resolveVersion(aria, version) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    const implicitRole = (_b = (_a = aria[version]) === null || _a === void 0 ? void 0 : _a.implicitRole) !== null && _b !== void 0 ? _b : aria.implicitRole;
-    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.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;
+export function resolveVersion(aria, version) {
+    const implicitRole = aria[version]?.implicitRole ?? aria.implicitRole;
+    const permittedRoles = aria[version]?.permittedRoles ?? aria.permittedRoles;
+    const implicitProperties = aria[version]?.implicitProperties ?? aria.implicitProperties;
+    const properties = aria[version]?.properties ?? aria.properties;
+    const namingProhibited = version === '1.1' ? aria.namingProhibited : aria[version]?.namingProhibited ?? aria.namingProhibited;
+    const conditions = aria[version]?.conditions ?? aria.conditions;
     return {
         implicitRole,
         permittedRoles,
@@ -18,4 +14,3 @@ function resolveVersion(aria, version) {
         conditions,
     };
 }
-exports.resolveVersion = resolveVersion;

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

@@ -1,4 +1,4 @@
-import type { ElementSpec, ExtendedSpec, MLMLSpec } from '../types';
+import type { ElementSpec, ExtendedSpec, MLMLSpec } from '../types/index.js';
 /**
  * Merging HTML-spec schema and extended spec schemas
  *
@@ -7,7 +7,7 @@ import type { ElementSpec, ExtendedSpec, MLMLSpec } from '../types';
  * @param schemas `MLDocument.schemas`
  */
 export declare function schemaToSpec(schemas: readonly [MLMLSpec, ...ExtendedSpec[]]): {
-	cites: import('../types').Cites;
-	def: import('../types').SpecDefs;
-	specs: readonly ElementSpec[];
+    cites: import("../types/index.js").Cites;
+    def: import("../types/index.js").SpecDefs;
+    specs: readonly ElementSpec[];
 };

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

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.schemaToSpec = void 0;
-const merge_array_1 = require("../utils/merge-array");
+import { mergeArray } from '../utils/merge-array.js';
 /**
  * Merging HTML-spec schema and extended spec schemas
  *
@@ -9,8 +6,7 @@ const merge_array_1 = require("../utils/merge-array");
  *
  * @param schemas `MLDocument.schemas`
  */
-function schemaToSpec(schemas) {
-    var _a, _b, _c, _d, _e;
+export function schemaToSpec(schemas) {
     const [main, ...extendedSpecs] = schemas;
     const result = { ...main };
     for (const extendedSpec of extendedSpecs) {
@@ -19,30 +15,30 @@ function schemaToSpec(schemas) {
         }
         if (extendedSpec.def) {
             const def = { ...result.def };
-            if ((_a = extendedSpec.def['#globalAttrs']) === null || _a === void 0 ? void 0 : _a['#extends']) {
+            if (extendedSpec.def['#globalAttrs']?.['#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']?.['#HTMLGlobalAttrs'],
+                    ...extendedSpec.def['#globalAttrs']?.['#extends'],
                 };
                 def['#globalAttrs'] = gAttrs;
             }
             if (extendedSpec.def['#aria']) {
                 def['#aria'] = {
                     '1.1': {
-                        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),
+                        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),
                     },
                     '1.2': {
-                        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),
+                        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),
                     },
                     '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),
+                        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),
                     },
                 };
             }
@@ -55,14 +51,14 @@ function schemaToSpec(schemas) {
                 for (const modelName of keys) {
                     const mainModel = def['#contentModels'][modelName];
                     const exModel = extendedSpec.def['#contentModels'][modelName];
-                    models[modelName] = [...(mainModel !== null && mainModel !== void 0 ? mainModel : []), ...(exModel !== null && exModel !== void 0 ? exModel : [])];
+                    models[modelName] = [...(mainModel ?? []), ...(exModel ?? [])];
                 }
                 def['#contentModels'] = models;
             }
             result.def = def;
         }
         if (extendedSpec.specs) {
-            const exSpecs = extendedSpec.specs.slice();
+            const exSpecs = [...extendedSpec.specs];
             const specs = [];
             for (const elSpec of result.specs) {
                 const tagName = elSpec.name.toLowerCase();
@@ -77,10 +73,10 @@ function schemaToSpec(schemas) {
                     ...exSpec,
                     globalAttrs: {
                         ...elSpec.globalAttrs,
-                        ...exSpec === null || exSpec === void 0 ? void 0 : exSpec.globalAttrs,
+                        ...exSpec?.globalAttrs,
                     },
-                    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),
+                    attributes: mergeAttrSpec(elSpec.attributes, exSpec?.attributes),
+                    categories: mergeArray(elSpec.categories, exSpec?.categories),
                 });
             }
             result.specs = specs;
@@ -88,10 +84,9 @@ function schemaToSpec(schemas) {
     }
     return result;
 }
-exports.schemaToSpec = schemaToSpec;
 function mergeAttrSpec(std, ex = {}) {
     const result = {};
-    const keys = Array.from(new Set([...Object.keys(std), ...Object.keys(ex)]));
+    const keys = [...new Set([...Object.keys(std), ...Object.keys(ex)])];
     for (const key of keys) {
         const _std = std[key];
         const _ex = ex[key];