#566

Build # #566

Build Type

push

Committed by

Commit Message

<a href="https://github.com/markuplint/markuplint/commit/<a class=hub.com/markuplint/markuplint/commit/927ac6e7570e571c91b47bf8c7dbd3a0d0bb3acc">927ac6e75<a href="https://github.com/markuplint/markuplint/commit/927ac6e7570e571c91b47bf8c7dbd3a0d0bb3acc">">Merge </a><a class="double-link" href="https://github.com/markuplint/markuplint/commit/<a class="double-link" href="https://github.com/markuplint/markuplint/commit/7c00212aa978d3c06dd13039f38c375b50ee0a32">7c00212aa</a>">7c00212aa</a><a href="https://github.com/markuplint/markuplint/commit/927ac6e7570e571c91b47bf8c7dbd3a0d0bb3acc"> into 792f22fea">792f22fea</a>

Run Details

2125 of 3193 branches covered (66.55%)

Branch coverage included in aggregate %.

139 of 139 new or added lines in 13 files covered. (100.0%)

3391 of 4694 relevant lines covered (72.24%)

94.28 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

37.31

/packages/@markuplint/ml-spec/src/get-spec.ts

import type { ElementSpec, ExtendedSpec, MLMLSpec } from './types';
import { mergeArray } from './utils';

/**
 * Merging HTML-spec schema and extended spec schemas
 *
 * Ex: `@markuplint/html-spec` + `{ specs: ["@markuplint/vue-spec"] }` in cofigure files.
 *
 * @param schemas `MLDocument.schemas`
 */
export function getSpec(schemas: readonly [MLMLSpec, ...ExtendedSpec[]]) {
        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 (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['#contentModels']) {
                                const keys = new Set([
                                        ...Object.keys(result.def['#contentModels']),
                                        ...Object.keys(extendedSpec.def['#contentModels']),
                                ]) as Set<keyof typeof result.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: ElementSpec[] = [];
                        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,
                                        attributes: mergeArray(elSpec.attributes, exSpec.attributes),
                                        categories: mergeArray(elSpec.categories, exSpec.categories),
                                });
                        }

                        result.specs = specs;
                }
        }

        return result;
}

1	import type { ElementSpec, ExtendedSpec, MLMLSpec } from './types';
2	import { mergeArray } from './utils';	1✔
3
4	/**
5	* Merging HTML-spec schema and extended spec schemas
6	*
7	* Ex: `@markuplint/html-spec` + `{ specs: ["@markuplint/vue-spec"] }` in cofigure files.
8	*
9	* @param schemas `MLDocument.schemas`
10	*/
11	export function getSpec(schemas: readonly [MLMLSpec, ...ExtendedSpec[]]) {	1✔
12	const [main, ...extendedSpecs] = schemas;	1✔
13	const result = { ...main };	1✔
14	for (const extendedSpec of extendedSpecs) {	1✔
15	if (extendedSpec.cites) {	2!
16	result.cites = [...result.cites, ...extendedSpec.cites];	×
17	}
18	if (extendedSpec.def) {	2!
19	if (extendedSpec.def['#ariaAttrs']) {	×
20	result.def['#ariaAttrs'] = [...result.def['#ariaAttrs'], ...extendedSpec.def['#ariaAttrs']];	×
21	}
22	if (extendedSpec.def['#globalAttrs']?.['#extends']) {	×
23	result.def['#globalAttrs']['#HTMLGlobalAttrs'] = [	×
24	...(result.def['#globalAttrs']?.['#HTMLGlobalAttrs'] \|\| []),	×
25	...extendedSpec.def['#globalAttrs']?.['#extends'],	×
26	];
27	}
28	if (extendedSpec.def['#roles']) {	×
29	result.def['#roles'] = [...result.def['#roles'], ...extendedSpec.def['#roles']];	×
30	}
31	if (extendedSpec.def['#contentModels']) {	×
32	const keys = new Set([	×
33	...Object.keys(result.def['#contentModels']),
34	...Object.keys(extendedSpec.def['#contentModels']),
35	]) as Set<keyof typeof result.def['#contentModels']>;
36	for (const modelName of keys) {	×
37	const mainModel = result.def['#contentModels'][modelName];	×
38	const exModel = extendedSpec.def['#contentModels'][modelName];	×
39	result.def['#contentModels'][modelName] = [...(mainModel \|\| []), ...(exModel \|\| [])];	×
40	}
41	}
42	}
43	if (extendedSpec.specs) {	2!
44	const exSpecs = extendedSpec.specs.slice();	2✔
45	const specs: ElementSpec[] = [];	2✔
46	for (const elSpec of result.specs) {	2✔
47	const tagName = elSpec.name.toLowerCase();	452✔
48	const index = exSpecs.findIndex(spec => spec.name.toLowerCase() === tagName);	452✔
49	if (index === -1) {	452✔
50	specs.push(elSpec);	450✔
51	continue;	450✔
52	}
53	const exSpec = exSpecs.splice(index, 1)[0];	2✔
54	specs.push({	2✔
55	...elSpec,
56	...exSpec,
57	attributes: mergeArray(elSpec.attributes, exSpec.attributes),
58	categories: mergeArray(elSpec.categories, exSpec.categories),
59	});
60	}
61
62	result.specs = specs;	2✔
63	}
64	}
65
66	return result;	1✔
67	}

markuplint / markuplint / #566

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous