@markuplint/ml-spec 3.0.0 → 3.1.0

package/lib/dom-traverse/is-exposed.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isExposed = void 0;
 const aria_specs_1 = require("../specs/aria-specs");
 const get_spec_by_tag_name_1 = require("../specs/get-spec-by-tag-name");
-const is_palpable_elements_1 = require("../specs/is-palpable-elements");
 const is_presentational_1 = require("../specs/is-presentational");
 const resolve_namespace_1 = require("../utils/resolve-namespace");
 const get_computed_role_1 = require("./get-computed-role");
@@ -29,7 +28,7 @@ function isExposed(el, specs, version) {
     }
     // According to HTML and SVG Specs with **the author's interpretation**
     {
-        if (!(0, is_palpable_elements_1.isPalpableElement)(el, specs, { extendsSvg: true, extendsExposableElements: true })) {
+        if (!isExposedElement(el, specs)) {
             return false;
         }
     }
@@ -187,3 +186,19 @@ function hasDisplayNodeOrVisibilityHidden(el) {
     // TODO: Improve accuracy
     return /display\s*:\s*none|visibility\s*:\s*hidden/gi.test(style);
 }
+function isExposedElement(el, specs) {
+    var _a;
+    const svgRenderedConditions = (_a = specs.def['#contentModels']['#SVGRenderable']) === null || _a === void 0 ? void 0 : _a.join(',');
+    if (svgRenderedConditions && el.matches(svgRenderedConditions)) {
+        return true;
+    }
+    return isNotMetaOrHiddenHTMLElement(el, specs);
+}
+function isNotMetaOrHiddenHTMLElement(el, specs) {
+    var _a;
+    const metadataConditions = (_a = specs.def['#contentModels']['#metadata']) === null || _a === void 0 ? void 0 : _a.join(',');
+    if (metadataConditions && el.matches(metadataConditions)) {
+        return false;
+    }
+    return !el.matches('input[type=hidden i]');
+}

package/lib/types/attributes.d.ts

@@ -12,8 +12,7 @@ export interface AttributesSchema {
 }
 export interface GlobalAttributes {
     '#HTMLGlobalAttrs'?: boolean;
-    '#GlobalEventAttrs'?: boolean | ('onabort' | 'onauxclick' | 'onbeforeinput' | 'onbeforematch' | 'onblur' | 'oncancel' | 'oncanplay' | 'oncanplaythrough' | 'onchange' | 'onclick' | 'onclose' | 'oncontextlost' | 'oncompositionstart' | 'oncompositionupdate' | 'oncompositionend' | 'oncontextmenu' | 'oncontextrestored' | 'oncuechange' | 'ondblclick' | 'ondrag' | 'ondragend' | 'ondragenter' | 'ondragleave' | 'ondragover' | 'ondragstart' | 'ondrop' | 'ondurationchange' | 'onemptied' | 'onended' | 'onerror' | 'onfocus' | 'onformdata' | 'onfocusin' | 'onfocusout' | 'oninput' | 'oninvalid' | 'onkeydown' | 'onkeypress' | 'onkeyup' | 'onload' | 'onloadeddata' | 'onloadedmetadata' | 'onloadstart' | 'onmousedown' | 'onmouseenter' | 'onmouseleave' | 'onmousemove' | 'onmouseout' | 'onmouseover' | 'onmouseup' | 'onpause' | 'onplay' | 'onplaying' | 'onprogress' | 'onratechange' | 'onreset' | 'onresize' | 'onscroll' | 'onsecuritypolicyviolation' | 'onseeked' | 'onseeking' | 'onselect' | 'onslotchange' | 'onstalled' | 'onsubmit' | 'onsuspend' | 'ontimeupdate' | 'ontoggle' | 'onvolumechange' | 'onwaiting' | 'onwebkitanimationend' | 'onwebkitanimationiteration' | 'onwebkitanimationstart' | 'onwebkittransitionend' | 'onunload' | 'onwheel')[];
-    '#DocumentElementEventAttrs'?: boolean | ('oncopy' | 'oncut' | 'onpaste')[];
+    '#GlobalEventAttrs'?: boolean | ('onabort' | 'onauxclick' | 'onbeforeinput' | 'onbeforematch' | 'onblur' | 'oncancel' | 'oncanplay' | 'oncanplaythrough' | 'onchange' | 'onclick' | 'onclose' | 'oncompositionend' | 'oncompositionstart' | 'oncompositionupdate' | 'oncontextlost' | 'oncontextmenu' | 'oncontextrestored' | 'oncopy' | 'oncuechange' | 'oncut' | 'ondblclick' | 'ondrag' | 'ondragend' | 'ondragenter' | 'ondragleave' | 'ondragover' | 'ondragstart' | 'ondrop' | 'ondurationchange' | 'onemptied' | 'onended' | 'onerror' | 'onfocus' | 'onfocusin' | 'onfocusout' | 'onformdata' | 'oninput' | 'oninvalid' | 'onkeydown' | 'onkeypress' | 'onkeyup' | 'onload' | 'onloadeddata' | 'onloadedmetadata' | 'onloadstart' | 'onmousedown' | 'onmouseenter' | 'onmouseleave' | 'onmousemove' | 'onmouseout' | 'onmouseover' | 'onmouseup' | 'onpaste' | 'onpause' | 'onplay' | 'onplaying' | 'onprogress' | 'onratechange' | 'onreset' | 'onresize' | 'onscroll' | 'onsecuritypolicyviolation' | 'onseeked' | 'onseeking' | 'onselect' | 'onslotchange' | 'onstalled' | 'onsubmit' | 'onsuspend' | 'ontimeupdate' | 'ontoggle' | 'onunload' | 'onvolumechange' | 'onwaiting' | 'onwebkitanimationend' | 'onwebkitanimationiteration' | 'onwebkitanimationstart' | 'onwebkittransitionend' | 'onwheel')[];
     /**
      * @minItems 0
      */

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

@@ -19,13 +19,13 @@ export interface ContentModel {
     }[];
 }
 export interface PermittedContentRequire {
-    require: Model;
+    require: Model | PermittedContentPattern[];
     max?: number;
     min?: number;
     _TODO_?: string;
 }
 export interface PermittedContentOptional {
-    optional: Model;
+    optional: Model | PermittedContentPattern[];
     max?: number;
     _TODO_?: string;
 }
@@ -40,6 +40,10 @@ export interface PermittedContentZeroOrMore {
     _TODO_?: string;
 }
 export interface PermittedContentChoice {
+    /**
+     * @minItems 2
+     * @maxItems 5
+     */
     choice: [PermittedContentPattern[], PermittedContentPattern[]] | [PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[]] | [PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[]] | [
         PermittedContentPattern[],
         PermittedContentPattern[],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-spec",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"description": "Types and schema that specs of the Markup languages for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -16,7 +16,7 @@
 		"dev": "tsc --build --watch",
 		"clean": "tsc --build --clean",
 		"schema:gen": "ts-node ./gen/gen.ts; prettier --write './schemas/*.json';",
-		"schema:content-models": "json2ts ./schemas/content-models.schema.json > ./src/types/permitted-structres.ts; prettier --write ./src/types/permitted-structres.ts; eslint --fix --config ../../../.eslintrc ./src/types/permitted-structres.ts",
+		"schema:content-models": "json2ts ./schemas/content-models.schema.json > ./src/types/permitted-structures.ts; prettier --write ./src/types/permitted-structures.ts; eslint --fix --config ../../../.eslintrc ./src/types/permitted-structures.ts",
 		"schema:attributes": "json2ts ./schemas/attributes.schema.json --cwd ./schemas > ./src/types/attributes.ts; prettier --write ./src/types/attributes.ts; eslint --fix --config ../../../.eslintrc ./src/types/attributes.ts",
 		"schema:aria": "json2ts ./schemas/aria.schema.json --cwd ./schemas > ./src/types/aria.ts; prettier --write ./src/types/aria.ts; eslint --fix --config ../../../.eslintrc ./src/types/aria.ts",
 		"schema": "run-s schema:*"
@@ -31,5 +31,5 @@
 		"@markuplint/types": "3.0.0",
 		"json-schema-to-typescript": "^11.0.2"
 	},
-	"gitHead": "51af6a64bb8da54376a138f19e3f15a2f759a967"
+	"gitHead": "0e75df6944f453bc19d2a6e05ad264788a8dc149"
 }

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

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

package/lib/types/permitted-structres.js

@@ -1,8 +0,0 @@
-"use strict";
-/* 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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });