@markuplint/ml-spec 3.0.0-alpha.82 → 3.0.0-dev.176

package/{src/specs/get-spec-by-tag-name.spec.ts → test/specs/get-spec-by-tag-name.spec.js}

@@ -1,6 +1,6 @@
-import specs from '@markuplint/html-spec';
+const { specs } = require('@markuplint/html-spec');
 
-import { getSpecByTagName } from './get-spec-by-tag-name';
+const { getSpecByTagName } = require('../../lib/specs/get-spec-by-tag-name');
 
 const divSpec = {
 	conditional: [
@@ -8,26 +8,26 @@ const divSpec = {
 			condition: 'dl > div',
 			contents: [
 				{
-					zeroOrMore: '#script-supporting',
+					zeroOrMore: ':model(script-supporting)',
 				},
 				{
 					oneOrMore: 'dt',
 				},
 				{
-					zeroOrMore: '#script-supporting',
+					zeroOrMore: ':model(script-supporting)',
 				},
 				{
 					oneOrMore: 'dd',
 				},
 				{
-					zeroOrMore: '#script-supporting',
+					zeroOrMore: ':model(script-supporting)',
 				},
 			],
 		},
 	],
 	contents: [
 		{
-			zeroOrMore: '#flow',
+			oneOrMore: ':model(flow)',
 		},
 	],
 };
@@ -43,11 +43,11 @@ test('svg:svg', () => {
 		contents: [
 			{
 				zeroOrMore: [
-					'#SVGAnimation',
-					'#SVGDescriptive',
-					'#SVGPaintServer',
-					'#SVGShape',
-					'#SVGStructural',
+					':model(SVGAnimation)',
+					':model(SVGDescriptive)',
+					':model(SVGPaintServer)',
+					':model(SVGShape)',
+					':model(SVGStructural)',
 					'svg|a',
 					'svg|clipPath',
 					'svg|filter',

package/test/specs/resolve-version.spec.js

@@ -0,0 +1,34 @@
+const { resolveVersion } = require('../../lib/specs/resolve-version');
+
+test('output', () => {
+	const aria = {
+		implicitRole: 'button',
+		permittedRoles: false,
+	};
+	const resolved = resolveVersion(aria, '1.1');
+	expect(resolved.implicitRole).toBe('button');
+});
+
+test('output the specified version', () => {
+	const aria = {
+		implicitRole: 'button',
+		permittedRoles: false,
+		1.1: {
+			implicitRole: 'link',
+		},
+	};
+	const resolved = resolveVersion(aria, '1.1');
+	expect(resolved.implicitRole).toBe('link');
+});
+
+test('output the latest undefined version', () => {
+	const aria = {
+		implicitRole: 'button',
+		permittedRoles: false,
+		1.1: {
+			implicitRole: 'link',
+		},
+	};
+	const resolved = resolveVersion(aria, '1.3');
+	expect(resolved.implicitRole).toBe('button');
+});

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

@@ -0,0 +1,61 @@
+const htmlSpec = require('@markuplint/html-spec');
+
+const { schemaToSpec } = require('../../lib/specs/schema-to-spec');
+
+describe('schemaToSpec', () => {
+	test('specs', () => {
+		const exAttr = {
+			ref: 'N/A',
+			type: 'Boolean',
+			description: 'For the unit test.',
+		};
+		const exAttr2 = {
+			ref: 'N/A',
+			type: 'Boolean',
+			description: 'For the unit test. Override.',
+		};
+		const mergedSpec = schemaToSpec([
+			htmlSpec,
+			{
+				specs: [
+					{
+						name: 'a',
+						attributes: { 'extended-attr': exAttr },
+					},
+				],
+			},
+			{
+				specs: [
+					{
+						name: 'a',
+						attributes: { 'extended-attr': exAttr2 },
+					},
+				],
+			},
+		]);
+		const aElAttrs = mergedSpec.specs.find(el => el.name === 'a').attributes;
+		expect(aElAttrs['extended-attr']).toStrictEqual(exAttr2);
+	});
+
+	test('globalAttrs.extends', () => {
+		const keyAttr = {
+			type: 'NoEmptyAny',
+			description: 'A special attribute for list rendering',
+			condition: '[v-for]',
+		};
+		const mergedSpec = schemaToSpec([
+			htmlSpec,
+			{
+				def: {
+					'#globalAttrs': {
+						'#extends': {
+							key: keyAttr,
+						},
+					},
+				},
+			},
+		]);
+		const key = mergedSpec.def['#globalAttrs']['#HTMLGlobalAttrs']['key'];
+		expect(key).toStrictEqual(keyAttr);
+	});
+});

package/test/utils/resolve-namespace.spec.js

@@ -0,0 +1,37 @@
+const { resolveNamespace } = require('../../lib/utils/resolve-namespace');
+
+test('tag', () => {
+	expect(resolveNamespace('a')).toStrictEqual({
+		localName: 'a',
+		localNameWithNS: 'a',
+		namespace: 'html',
+		namespaceURI: 'http://www.w3.org/1999/xhtml',
+	});
+	expect(resolveNamespace('svg:a')).toStrictEqual({
+		localName: 'a',
+		localNameWithNS: 'svg:a',
+		namespace: 'svg',
+		namespaceURI: 'http://www.w3.org/2000/svg',
+	});
+});
+
+test('attr', () => {
+	expect(resolveNamespace('href', 'http://www.w3.org/1999/xhtml')).toStrictEqual({
+		localName: 'href',
+		localNameWithNS: 'href',
+		namespace: 'html',
+		namespaceURI: 'http://www.w3.org/1999/xhtml',
+	});
+	expect(resolveNamespace('href', 'http://www.w3.org/2000/svg')).toStrictEqual({
+		localName: 'href',
+		localNameWithNS: 'svg:href',
+		namespace: 'svg',
+		namespaceURI: 'http://www.w3.org/2000/svg',
+	});
+	expect(resolveNamespace('xlink:href', 'http://www.w3.org/2000/svg')).toStrictEqual({
+		localName: 'href',
+		localNameWithNS: 'xlink:href',
+		namespace: 'xlink',
+		namespaceURI: 'http://www.w3.org/1999/xlink',
+	});
+});

package/lib/dom-traverse/focusability-computation.d.ts

@@ -1 +0,0 @@
-export declare function isFocusable(el: Element): boolean;

package/lib/dom-traverse/focusability-computation.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFocusable = void 0;
-const tabbable_1 = require("tabbable");
-function isFocusable(el) {
-    return (0, tabbable_1.isFocusable)(el, { displayCheck: 'none' });
-}
-exports.isFocusable = isFocusable;

package/lib/dom-traverse/get-aria.d.ts

@@ -1,9 +0,0 @@
-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;

package/lib/dom-traverse/get-aria.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getARIA = void 0;
-const html_spec_1 = require("../specs/html-spec");
-const resolve_version_1 = require("../specs/resolve-version");
-const cache = new Map();
-function getARIA(specs, localName, namespace, version, matches) {
-    var _a, _b, _c, _d, _e;
-    const aria = getVersionResolvedARIA(specs, localName, namespace, version);
-    if (!aria) {
-        return null;
-    }
-    const conditions = aria.conditions;
-    if (!conditions) {
-        return aria;
-    }
-    const conds = Object.keys(conditions);
-    let { implicitRole, permittedRoles, implicitProperties, properties, namingProhibited } = aria;
-    for (const cond of conds) {
-        if (!matches(cond)) {
-            continue;
-        }
-        const condARIA = conditions[cond];
-        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;
-        properties = (_d = condARIA.properties) !== null && _d !== void 0 ? _d : properties;
-        namingProhibited = (_e = condARIA.namingProhibited) !== null && _e !== void 0 ? _e : namingProhibited;
-    }
-    return {
-        implicitRole,
-        permittedRoles,
-        implicitProperties,
-        properties,
-        namingProhibited,
-    };
-}
-exports.getARIA = getARIA;
-function getVersionResolvedARIA(specs, localName, namespace, version) {
-    var _a;
-    const key = localName + namespace + version;
-    let aria = cache.get(key);
-    if (aria !== undefined) {
-        return aria;
-    }
-    const spec = (_a = (0, html_spec_1.htmlSpec)(specs, localName, namespace)) === null || _a === void 0 ? void 0 : _a.aria;
-    if (!spec) {
-        cache.set(key, null);
-        return null;
-    }
-    aria = (0, resolve_version_1.resolveVersion)(spec, version);
-    cache.set(key, aria);
-    return aria;
-}

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

@@ -1,5 +0,0 @@
-import type { MLMLSpec } from '../types';
-export declare function ariaSpec(specs: Readonly<MLMLSpec>): {
-	roles: import('../types').ARIRRoleAttribute[];
-	ariaAttrs: import('../types').ARIAAttribute[];
-};

package/lib/specs/aria-spec.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ariaSpec = void 0;
-function ariaSpec(specs) {
-    const roles = specs.def['#roles'];
-    const ariaAttrs = specs.def['#ariaAttrs'];
-    return {
-        roles,
-        ariaAttrs,
-    };
-}
-exports.ariaSpec = ariaSpec;

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

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

package/lib/specs/get-spec.js

@@ -1,85 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSpec = void 0;
-const utils_1 = require("../utils");
-/**
- * Merging HTML-spec schema and extended spec schemas
- *
- * Ex: `@markuplint/html-spec` + `{ specs: ["@markuplint/vue-spec"] }` in cofigure files.
- *
- * @param schemas `MLDocument.schemas`
- */
-function getSpec(schemas) {
-    var _a, _b, _c;
-    const [main, ...extendedSpecs] = schemas;
-    const result = { ...main };
-    for (const extendedSpec of extendedSpecs) {
-        if (extendedSpec.cites) {
-            result.cites = [...result.cites, ...extendedSpec.cites];
-        }
-        if (extendedSpec.def) {
-            if (extendedSpec.def['#ariaAttrs']) {
-                result.def['#ariaAttrs'] = [...result.def['#ariaAttrs'], ...extendedSpec.def['#ariaAttrs']];
-            }
-            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']) || {}),
-                };
-            }
-            if (extendedSpec.def['#roles']) {
-                result.def['#roles'] = [...result.def['#roles'], ...extendedSpec.def['#roles']];
-            }
-            if (extendedSpec.def['#contentModels']) {
-                const keys = new Set([
-                    ...Object.keys(result.def['#contentModels']),
-                    ...Object.keys(extendedSpec.def['#contentModels']),
-                ]);
-                for (const modelName of keys) {
-                    const mainModel = result.def['#contentModels'][modelName];
-                    const exModel = extendedSpec.def['#contentModels'][modelName];
-                    result.def['#contentModels'][modelName] = [...(mainModel || []), ...(exModel || [])];
-                }
-            }
-        }
-        if (extendedSpec.specs) {
-            const exSpecs = extendedSpec.specs.slice();
-            const specs = [];
-            for (const elSpec of result.specs) {
-                const tagName = elSpec.name.toLowerCase();
-                const index = exSpecs.findIndex(spec => spec.name.toLowerCase() === tagName);
-                if (index === -1) {
-                    specs.push(elSpec);
-                    continue;
-                }
-                const exSpec = exSpecs.splice(index, 1)[0];
-                specs.push({
-                    ...elSpec,
-                    ...exSpec,
-                    globalAttrs: {
-                        ...elSpec.globalAttrs,
-                        ...exSpec.globalAttrs,
-                    },
-                    attributes: mergeAttrSpec(elSpec.attributes, exSpec.attributes),
-                    categories: (0, utils_1.mergeArray)(elSpec.categories, exSpec.categories),
-                });
-            }
-            result.specs = specs;
-        }
-    }
-    return result;
-}
-exports.getSpec = getSpec;
-function mergeAttrSpec(std, ex = {}) {
-    const result = {};
-    const keys = Array.from(new Set([...Object.keys(std), ...Object.keys(ex)]));
-    for (const key of keys) {
-        const _std = std[key];
-        const _ex = ex[key];
-        result[key] = {
-            ..._std,
-            ..._ex,
-        };
-    }
-    return result;
-}

package/lib/specs/html-spec.d.ts

@@ -1,6 +0,0 @@
-import type { ElementSpec, MLMLSpec } from '../types';
-export declare function htmlSpec(
-	specs: Readonly<MLMLSpec>,
-	localName: string,
-	namespace: string | null,
-): ElementSpec | null;

package/lib/specs/html-spec.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.htmlSpec = void 0;
-const resolve_namespace_1 = require("../utils/resolve-namespace");
-const cache = new Map();
-function htmlSpec(specs, localName, namespace) {
-    const { localNameWithNS } = (0, resolve_namespace_1.resolveNamespace)(localName, namespace || undefined);
-    let spec = cache.get(localNameWithNS);
-    if (spec !== undefined) {
-        return spec;
-    }
-    spec = specs.specs.find(spec => spec.name === localNameWithNS) || null;
-    cache.set(localNameWithNS, spec);
-    return spec;
-}
-exports.htmlSpec = htmlSpec;

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

@@ -1,9 +0,0 @@
-import type { NamespaceURI } from '@markuplint/ml-ast';
-declare type NamespacedElementName = {
-	localNameWithNS: string;
-	localName: string;
-	namespace: 'html' | 'svg' | 'mml';
-	namespaceURI: NamespaceURI;
-};
-export declare function resolveNamespace(localName: string, namespaceURI?: string): NamespacedElementName;
-export {};

package/lib/specs/resolve-namespace.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveNamespace = void 0;
-const utils_1 = require("../utils");
-const cache = new Map();
-function resolveNamespace(localName, namespaceURI = 'http://www.w3.org/1999/xhtml') {
-    const cached = cache.get(localName + namespaceURI);
-    if (cached) {
-        return cached;
-    }
-    const name = localName.split(':')[1] || localName;
-    const ns = (0, utils_1.getNS)(namespaceURI || null);
-    const result = {
-        localNameWithNS: `${ns === 'html' ? '' : `${ns}:`}${name}`,
-        localName: name,
-        namespace: ns,
-        namespaceURI: [
-            'http://www.w3.org/1999/xhtml',
-            'http://www.w3.org/2000/svg',
-            'http://www.w3.org/1998/Math/MathML',
-        ].find(ns => namespaceURI) || 'http://www.w3.org/1999/xhtml',
-    };
-    cache.set(localName + namespaceURI, result);
-    return result;
-}
-exports.resolveNamespace = resolveNamespace;

package/lib/types/permitted-structres.d.ts

@@ -1,64 +0,0 @@
-/**
- * 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.
- */
-export declare type PermittedContent = PermittedContentRequire | PermittedContentOptional | PermittedContentOneOrMore | PermittedContentZeroOrMore | PermittedContentChoice | PermittedContentInterleave;
-export declare type Target = ContentType | ContentType[];
-export declare type ContentType = string | Category;
-export declare type Category = '#text' | '#phrasing' | '#flow' | '#interactive' | '#heading' | '#sectioning' | '#metadata' | '#transparent' | '#embedded' | '#palpable' | '#script-supporting' | '#SVGAnimation' | '#SVGBasicShapes' | '#SVGContainer' | '#SVGDescriptive' | '#SVGFilterPrimitive' | '#SVGFont' | '#SVGGradient' | '#SVGGraphics' | '#SVGGraphicsReferencing' | '#SVGLightSource' | '#SVGNeverRendered' | '#SVGNone' | '#SVGPaintServer' | '#SVGRenderable' | '#SVGShape' | '#SVGStructural' | '#SVGStructurallyExternal' | '#SVGTextContent' | '#SVGTextContentChild' | '#SVGOtherXMLNamespace';
-export declare type PermittedContentSpec = PermittedContent[];
-export interface ContentModelsSchema {
-    __contentModel?: ContentModel;
-}
-export interface ContentModel {
-    contents: PermittedContentSpec | boolean;
-    descendantOf?: string;
-    conditional?: {
-        condition: string;
-        contents: PermittedContentSpec | boolean;
-    }[];
-}
-export interface PermittedContentRequire {
-    require: Target;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
-    max?: number;
-    min?: number;
-    _TODO_?: string;
-}
-export interface PermittedContentOptional {
-    optional: Target;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
-    max?: number;
-    _TODO_?: string;
-}
-export interface PermittedContentOneOrMore {
-    oneOrMore: Target | PermittedContentSpec;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
-    max?: number;
-    _TODO_?: string;
-}
-export interface PermittedContentZeroOrMore {
-    zeroOrMore: Target | PermittedContentSpec;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
-    max?: number;
-    _TODO_?: string;
-}
-export interface PermittedContentChoice {
-    choice: [PermittedContentSpec, PermittedContentSpec] | [PermittedContentSpec, PermittedContentSpec, PermittedContentSpec] | [PermittedContentSpec, PermittedContentSpec, PermittedContentSpec, PermittedContentSpec] | [
-        PermittedContentSpec,
-        PermittedContentSpec,
-        PermittedContentSpec,
-        PermittedContentSpec,
-        PermittedContentSpec
-    ];
-    _TODO_?: string;
-}
-export interface PermittedContentInterleave {
-    interleave: [PermittedContentSpec, PermittedContentSpec, ...PermittedContentSpec[]];
-    _TODO_?: string;
-}

package/lib/utils.d.ts

@@ -1,8 +0,0 @@
-declare type NamedDefinition =
-	| string
-	| {
-			name: string;
-	  };
-export declare function getNS(namespaceURI: string | null): 'svg' | 'mml' | 'html';
-export declare function mergeArray<T extends NamedDefinition>(a: T[], b: T[] | null | undefined): T[];
-export {};

package/lib/utils.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeArray = exports.getNS = void 0;
-function getNS(namespaceURI) {
-    switch (namespaceURI) {
-        case 'http://www.w3.org/2000/svg': {
-            return 'svg';
-        }
-        case 'http://www.w3.org/1998/Math/MathML': {
-            return 'mml';
-        }
-        default: {
-            return 'html';
-        }
-    }
-}
-exports.getNS = getNS;
-function mergeArray(a, b) {
-    if (!b) {
-        return a;
-    }
-    const result = a.slice();
-    for (const bItem of b) {
-        const bName = getName(bItem);
-        const aIndex = result.findIndex(item => getName(item) === bName);
-        if (aIndex === -1) {
-            result.push(bItem);
-            continue;
-        }
-        const aItem = result.splice(aIndex, 1)[0];
-        if (typeof bItem === 'string') {
-            continue;
-        }
-        if (typeof aItem === 'string') {
-            result.push(bItem);
-            continue;
-        }
-        const exItem = {
-            ...aItem,
-            ...bItem,
-        };
-        result.push(exItem);
-    }
-    return result;
-}
-exports.mergeArray = mergeArray;
-function getName(def) {
-    const result = typeof def === 'string' ? def : def.name;
-    return result.toLowerCase().trim();
-}