@markuplint/ml-spec 3.4.0 → 3.5.0

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

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

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,4 @@
 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/schema-to-spec.d.ts

@@ -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: ElementSpec[];
+    cites: import("../types").Cites;
+    def: import("../types").SpecDefs;
+    specs: readonly ElementSpec[];
 };

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

@@ -10,7 +10,7 @@ const merge_array_1 = require("../utils/merge-array");
  * @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,43 @@ 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),
                     },
                 };
             }
             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();

package/lib/types/aria.d.ts

@@ -10,141 +10,128 @@ export type ImplicitRole = false | string;
 /**
  * If `true`, this mean is "Any". If `false`, this mean is "No".
  */
-export type PermittedRoles =
-	| boolean
-	| (
-			| string
-			| {
-					name: string;
-					deprecated?: true;
-					[k: string]: unknown;
-			  }
-	  )[]
-	| {
-			'core-aam'?: true;
-			'graphics-aam'?: true;
-	  };
+export type PermittedRoles = boolean | (string | {
+    name: string;
+    deprecated?: true;
+    [k: string]: unknown;
+})[] | PermittedARIAAAMInfo;
 /**
  * If set false:
  * > No role or aria-* attributes
  */
-export type PermittedARIAProperties =
-	| false
-	| {
-			global?: true;
-			/**
-			 * Set true if the spec says "and any aria-* attributes applicable to the allowed roles."
-			 */
-			role?: true | string | [string, ...string[]];
-			/**
-			 * @minItems 1
-			 */
-			only?: [
-				(
-					| string
-					| {
-							name: string;
-							value?: string;
-					  }
-				),
-				...(
-					| string
-					| {
-							name: string;
-							value?: string;
-					  }
-				)[],
-			];
-			/**
-			 * @minItems 1
-			 */
-			without?: [
-				{
-					type: 'not-recommended' | 'should-not' | 'must-not';
-					name: string;
-					value?: string;
-					alt?: {
-						method: 'remove-attr' | 'set-attr';
-						target: string;
-					};
-				},
-				...{
-					type: 'not-recommended' | 'should-not' | 'must-not';
-					name: string;
-					value?: string;
-					alt?: {
-						method: 'remove-attr' | 'set-attr';
-						target: string;
-					};
-				}[],
-			];
-	  };
+export type PermittedARIAProperties = false | {
+    global?: true;
+    /**
+     * Set true if the spec says "and any aria-* attributes applicable to the allowed roles."
+     */
+    role?: true | string | [string, ...string[]];
+    /**
+     * @minItems 1
+     */
+    only?: [
+        (string | {
+            name: string;
+            value?: string;
+        }),
+        ...(string | {
+            name: string;
+            value?: string;
+        })[]
+    ];
+    /**
+     * @minItems 1
+     */
+    without?: [
+        {
+            type: 'not-recommended' | 'should-not' | 'must-not';
+            name: string;
+            value?: string;
+            alt?: {
+                method: 'remove-attr' | 'set-attr';
+                target: string;
+            };
+        },
+        ...{
+            type: 'not-recommended' | 'should-not' | 'must-not';
+            name: string;
+            value?: string;
+            alt?: {
+                method: 'remove-attr' | 'set-attr';
+                target: string;
+            };
+        }[]
+    ];
+};
 export interface AriaSchema {
-	_?: ARIA;
-	[k: string]: unknown;
+    _?: ARIA;
+    [k: string]: unknown;
 }
 export interface ARIA {
-	implicitRole: ImplicitRole;
-	permittedRoles: PermittedRoles;
-	namingProhibited?: true;
-	implicitProperties?: ImplicitProperties;
-	properties?: PermittedARIAProperties;
-	conditions?: {
-		/**
-		 * This interface was referenced by `undefined`'s JSON-Schema definition
-		 * via the `patternProperty` ".+".
-		 */
-		[k: string]: {
-			implicitRole?: ImplicitRole;
-			permittedRoles?: PermittedRoles;
-			namingProhibited?: true;
-			implicitProperties?: ImplicitProperties;
-			properties?: PermittedARIAProperties;
-		};
-	};
-	'1.2'?: {
-		implicitRole?: ImplicitRole;
-		permittedRoles?: PermittedRoles;
-		namingProhibited?: true;
-		implicitProperties?: ImplicitProperties;
-		properties?: PermittedARIAProperties;
-		conditions?: {
-			/**
-			 * This interface was referenced by `undefined`'s JSON-Schema definition
-			 * via the `patternProperty` ".+".
-			 */
-			[k: string]: {
-				implicitRole?: ImplicitRole;
-				permittedRoles?: PermittedRoles;
-				namingProhibited?: true;
-				implicitProperties?: ImplicitProperties;
-				properties?: PermittedARIAProperties;
-			};
-		};
-	};
-	'1.1'?: {
-		implicitRole?: ImplicitRole;
-		permittedRoles?: PermittedRoles;
-		implicitProperties?: ImplicitProperties;
-		properties?: PermittedARIAProperties;
-		conditions?: {
-			/**
-			 * This interface was referenced by `undefined`'s JSON-Schema definition
-			 * via the `patternProperty` ".+".
-			 */
-			[k: string]: {
-				implicitRole?: ImplicitRole;
-				permittedRoles?: PermittedRoles;
-				implicitProperties?: ImplicitProperties;
-				properties?: PermittedARIAProperties;
-			};
-		};
-	};
+    implicitRole: ImplicitRole;
+    permittedRoles: PermittedRoles;
+    namingProhibited?: true;
+    implicitProperties?: ImplicitProperties;
+    properties?: PermittedARIAProperties;
+    conditions?: {
+        /**
+         * This interface was referenced by `undefined`'s JSON-Schema definition
+         * via the `patternProperty` ".+".
+         */
+        [k: string]: {
+            implicitRole?: ImplicitRole;
+            permittedRoles?: PermittedRoles;
+            namingProhibited?: true;
+            implicitProperties?: ImplicitProperties;
+            properties?: PermittedARIAProperties;
+        };
+    };
+    '1.2'?: {
+        implicitRole?: ImplicitRole;
+        permittedRoles?: PermittedRoles;
+        namingProhibited?: true;
+        implicitProperties?: ImplicitProperties;
+        properties?: PermittedARIAProperties;
+        conditions?: {
+            /**
+             * This interface was referenced by `undefined`'s JSON-Schema definition
+             * via the `patternProperty` ".+".
+             */
+            [k: string]: {
+                implicitRole?: ImplicitRole;
+                permittedRoles?: PermittedRoles;
+                namingProhibited?: true;
+                implicitProperties?: ImplicitProperties;
+                properties?: PermittedARIAProperties;
+            };
+        };
+    };
+    '1.1'?: {
+        implicitRole?: ImplicitRole;
+        permittedRoles?: PermittedRoles;
+        implicitProperties?: ImplicitProperties;
+        properties?: PermittedARIAProperties;
+        conditions?: {
+            /**
+             * This interface was referenced by `undefined`'s JSON-Schema definition
+             * via the `patternProperty` ".+".
+             */
+            [k: string]: {
+                implicitRole?: ImplicitRole;
+                permittedRoles?: PermittedRoles;
+                implicitProperties?: ImplicitProperties;
+                properties?: PermittedARIAProperties;
+            };
+        };
+    };
+}
+export interface PermittedARIAAAMInfo {
+    'core-aam'?: true;
+    'graphics-aam'?: true;
 }
 export interface ImplicitProperties {
-	/**
-	 * This interface was referenced by `ImplicitProperties`'s JSON-Schema definition
-	 * via the `patternProperty` "^aria-.+".
-	 */
-	[k: string]: string;
+    /**
+     * This interface was referenced by `ImplicitProperties`'s JSON-Schema definition
+     * via the `patternProperty` "^aria-.+".
+     */
+    [k: string]: string;
 }