@markuplint/ml-spec 2.1.1 → 3.0.0-alpha.1

package/src/specs/get-spec-by-tag-name.spec.ts

@@ -0,0 +1,68 @@
+import { specs } from '@markuplint/html-spec';
+
+import { getSpecByTagName } from './get-spec-by-tag-name';
+
+const divSpec = {
+	conditional: [
+		{
+			condition: 'dl > div',
+			contents: [
+				{
+					zeroOrMore: ':model(script-supporting)',
+				},
+				{
+					oneOrMore: 'dt',
+				},
+				{
+					zeroOrMore: ':model(script-supporting)',
+				},
+				{
+					oneOrMore: 'dd',
+				},
+				{
+					zeroOrMore: ':model(script-supporting)',
+				},
+			],
+		},
+	],
+	contents: [
+		{
+			oneOrMore: ':model(flow)',
+		},
+	],
+};
+
+test('html:div', () => {
+	expect(getSpecByTagName(specs, 'div', null)?.contentModel).toStrictEqual(divSpec);
+	expect(getSpecByTagName(specs, 'div', 'unknown-namespace')?.contentModel).toStrictEqual(divSpec);
+	expect(getSpecByTagName(specs, 'div', 'http://www.w3.org/1999/xhtml')?.contentModel).toStrictEqual(divSpec);
+});
+
+test('svg:svg', () => {
+	expect(getSpecByTagName(specs, 'svg', 'http://www.w3.org/2000/svg')?.contentModel).toStrictEqual({
+		contents: [
+			{
+				zeroOrMore: [
+					':model(SVGAnimation)',
+					':model(SVGDescriptive)',
+					':model(SVGPaintServer)',
+					':model(SVGShape)',
+					':model(SVGStructural)',
+					'svg|a',
+					'svg|clipPath',
+					'svg|filter',
+					'svg|foreignObject',
+					'svg|image',
+					'svg|marker',
+					'svg|mask',
+					'svg|script',
+					'svg|style',
+					'svg|switch',
+					'svg|text',
+					'svg|view',
+				],
+			},
+		],
+	});
+	expect(getSpecByTagName(specs, 'svg', null)).toBe(null);
+});

package/src/specs/get-spec-by-tag-name.ts

@@ -0,0 +1,20 @@
+import type { ElementSpec } from '../types';
+
+import { resolveNamespace } from '../utils/resolve-namespace';
+
+const cache = new Map<string, any>();
+
+export function getSpecByTagName<K extends keyof ElementSpec = keyof ElementSpec>(
+	specs: Readonly<Pick<ElementSpec, 'name' | K>[]>,
+	localName: string,
+	namespace: string | null,
+) {
+	const { localNameWithNS } = resolveNamespace(localName, namespace || undefined);
+	let spec: Pick<ElementSpec, 'name' | K> | null | undefined = cache.get(localNameWithNS);
+	if (spec !== undefined) {
+		return spec;
+	}
+	spec = specs.find(spec => spec.name === localNameWithNS) || null;
+	cache.set(localNameWithNS, spec);
+	return spec;
+}

package/src/specs/is-presentational.ts

@@ -0,0 +1,6 @@
+export function isPresentational(roleName?: string) {
+	if (!roleName) {
+		return false;
+	}
+	return ['presentation', 'none'].includes(roleName);
+}

package/src/specs/resolve-version.ts

@@ -0,0 +1,20 @@
+import type { ARIAVersion } from '../types';
+import type { ARIA } from '../types/aria';
+
+export function resolveVersion(aria: ARIA, version: ARIAVersion): Omit<ARIA, ARIAVersion> {
+	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.2' ? aria[version]?.namingProhibited ?? aria.namingProhibited : aria.namingProhibited;
+	const conditions = aria[version]?.conditions ?? aria.conditions;
+	return {
+		implicitRole,
+		permittedRoles,
+		implicitProperties,
+		properties,
+		namingProhibited,
+		conditions,
+	};
+}

package/src/{get-spec.spec.ts → specs/schema-to-spec.spec.ts}

@@ -1,6 +1,6 @@
 import htmlSpec from '@markuplint/html-spec';
 
-import { getSpec } from './get-spec';
+import { schemaToSpec } from './schema-to-spec';
 
 describe('getSpec', () => {
 	test('Overriding', () => {
@@ -14,7 +14,7 @@ describe('getSpec', () => {
 			type: 'Boolean',
 			description: 'For the unit test. Override.',
 		} as const;
-		const mergedSpec = getSpec([
+		const mergedSpec = schemaToSpec([
 			htmlSpec,
 			{
 				specs: [

package/src/{get-spec.ts → specs/schema-to-spec.ts}

@@ -1,15 +1,15 @@
-import type { ElementSpec, ExtendedSpec, MLMLSpec, Attribute } from './types';
+import type { ElementSpec, ExtendedSpec, MLMLSpec, Attribute } from '../types';
 
-import { mergeArray } from './utils';
+import { mergeArray } from '../utils/merge-array';
 
 /**
  * Merging HTML-spec schema and extended spec schemas
  *
- * Ex: `@markuplint/html-spec` + `{ specs: ["@markuplint/vue-spec"] }` in cofigure files.
+ * Ex: `@markuplint/html-spec` + `{ specs: ["@markuplint/vue-spec"] }` in configure files.
  *
  * @param schemas `MLDocument.schemas`
  */
-export function getSpec(schemas: readonly [MLMLSpec, ...ExtendedSpec[]]) {
+export function schemaToSpec(schemas: readonly [MLMLSpec, ...ExtendedSpec[]]) {
 	const [main, ...extendedSpecs] = schemas;
 	const result = { ...main };
 	for (const extendedSpec of extendedSpecs) {
@@ -17,17 +17,31 @@ export function getSpec(schemas: readonly [MLMLSpec, ...ExtendedSpec[]]) {
 			result.cites = [...result.cites, ...extendedSpec.cites];
 		}
 		if (extendedSpec.def) {
-			if (extendedSpec.def['#ariaAttrs']) {
-				result.def['#ariaAttrs'] = [...result.def['#ariaAttrs'], ...extendedSpec.def['#ariaAttrs']];
-			}
 			if (extendedSpec.def['#globalAttrs']?.['#extends']) {
 				result.def['#globalAttrs']['#HTMLGlobalAttrs'] = {
 					...(result.def['#globalAttrs']?.['#HTMLGlobalAttrs'] || {}),
 					...(extendedSpec.def['#globalAttrs']?.['#extends'] || {}),
 				};
 			}
-			if (extendedSpec.def['#roles']) {
-				result.def['#roles'] = [...result.def['#roles'], ...extendedSpec.def['#roles']];
+			if (extendedSpec.def['#aria']) {
+				result.def['#aria'] = {
+					'1.1': {
+						roles: mergeArray(result.def['#aria']['1.1'].roles, extendedSpec.def['#aria']['1.1'].roles),
+						props: mergeArray(result.def['#aria']['1.1'].props, extendedSpec.def['#aria']['1.1'].props),
+						graphicsRoles: mergeArray(
+							result.def['#aria']['1.1'].graphicsRoles,
+							extendedSpec.def['#aria']['1.1'].graphicsRoles,
+						),
+					},
+					'1.2': {
+						roles: mergeArray(result.def['#aria']['1.2'].roles, extendedSpec.def['#aria']['1.2'].roles),
+						props: mergeArray(result.def['#aria']['1.2'].props, extendedSpec.def['#aria']['1.2'].props),
+						graphicsRoles: mergeArray(
+							result.def['#aria']['1.2'].graphicsRoles,
+							extendedSpec.def['#aria']['1.2'].graphicsRoles,
+						),
+					},
+				};
 			}
 			if (extendedSpec.def['#contentModels']) {
 				const keys = new Set([

package/src/types/aria.ts

@@ -0,0 +1,153 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+/**
+ * If `false`, this mean is "No corresponding role".
+ */
+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;
+	  };
+/**
+ * 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 interface AriaSchema {
+	_?: 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;
+			};
+		};
+	};
+}
+export interface ImplicitProperties {
+	/**
+	 * This interface was referenced by `ImplicitProperties`'s JSON-Schema definition
+	 * via the `patternProperty` "^aria-.+".
+	 */
+	[k: string]: string;
+}