@markuplint/ml-spec 4.0.0-alpha.3 → 4.0.0-dev.28

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

@@ -9,10 +9,10 @@ el, version) {
         return {};
     }
     const props = {};
-    role.ownedProperties.forEach(ownedProp => {
+    for (const ownedProp of role.ownedProperties) {
         const spec = ariaSpecs.props.find(propSpec => propSpec.name === ownedProp.name);
         if (!spec) {
-            return;
+            continue;
         }
         if (el.hasAttribute(spec.name)) {
             const attrValue = el.getAttribute(spec.name);
@@ -24,7 +24,7 @@ el, version) {
                     required: !!ownedProp.required,
                     from: 'aria-attr',
                 };
-                return;
+                continue;
             }
         }
         const equivalentHtmlAttr = spec.equivalentHtmlAttrs?.[0];
@@ -40,7 +40,7 @@ el, version) {
                     required: !!ownedProp.required,
                     from: 'html-attr',
                 };
-                return;
+                continue;
             }
         }
         let defaultValue = spec.defaultValue;
@@ -57,7 +57,7 @@ el, version) {
             required: !!ownedProp.required,
             from: 'default',
         };
-    });
+    }
     return props;
 }
 function isValidAriaValue(spec, role, value, enumList) {
@@ -81,7 +81,7 @@ function isValidAriaValue(spec, role, value, enumList) {
         }
         case 'integer':
         case 'number': {
-            return !isNaN(parseFloat(value));
+            return !Number.isNaN(Number.parseFloat(value));
         }
         case 'token':
         case 'token list': {

package/lib/dom-traverse/get-computed-role.js

@@ -116,9 +116,7 @@ el, version, assumeSingleNode = false) {
         // It is an SVG element.
         el.namespaceURI === 'http://www.w3.org/2000/svg') {
         const accname = getAccname(el).trim() ||
-            Array.from(el.children)
-                .find(child => ['title', 'desc'].includes(child.localName))
-                ?.textContent?.trim();
+            [...el.children].find(child => ['title', 'desc'].includes(child.localName))?.textContent?.trim();
         if (!accname) {
             return {
                 el,
@@ -181,18 +179,18 @@ el, version, assumeSingleNode = false) {
      */
     if (explicitRole.role) {
         const nonPresentationalAncestor = getNonPresentationalAncestor(el, specs, version);
-        if (nonPresentationalAncestor.role && nonPresentationalAncestor.role?.requiredOwnedElements.length > 0) {
-            if (nonPresentationalAncestor.role.requiredOwnedElements.some(expected => {
+        if (nonPresentationalAncestor.role &&
+            nonPresentationalAncestor.role?.requiredOwnedElements.length > 0 &&
+            nonPresentationalAncestor.role.requiredOwnedElements.some(expected => {
                 // const ancestor = nonPresentationalAncestor.el;
                 // const ancestorImplicitRole = getImplicitRole(specs, ancestor, version);
                 // console.log({ nonPresentationalAncestor, ancestorImplicitRole });
                 return isRequiredOwnedElement(implicitRole.el, implicitRole.role, expected, specs, version);
             })) {
-                return {
-                    ...implicitRole,
-                    errorType: 'REQUIRED_OWNED_ELEMENT_MUST_NOT_BE_PRESENTATIONAL',
-                };
-            }
+            return {
+                ...implicitRole,
+                errorType: 'REQUIRED_OWNED_ELEMENT_MUST_NOT_BE_PRESENTATIONAL',
+            };
         }
     }
     /**
@@ -206,7 +204,7 @@ el, version, assumeSingleNode = false) {
      * > and an explicit non-presentational role is applied.
      */
     const { props } = ariaSpecs(specs, version);
-    for (const attr of Array.from(el.attributes)) {
+    for (const attr of el.attributes) {
         if (props.find(p => p.name === attr.name)?.isGlobal) {
             return {
                 ...implicitRole,

package/lib/dom-traverse/has-required-owned-elements.js

@@ -66,7 +66,7 @@ function getClosestNonPresentationalDescendants(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 el, specs, version) {
     const owned = [];
-    for (const child of Array.from(el.children)) {
+    for (const child of el.children) {
         const implicitRole = getImplicitRole(specs, child, version);
         const explicitRole = getExplicitRole(specs, child, version);
         const computed = explicitRole.role ? explicitRole : implicitRole;

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

@@ -165,7 +165,7 @@ el, specs, version) {
             results.push(true);
         }
         // Has a global WAI-ARIA attribute
-        for (const attr of Array.from(el.attributes)) {
+        for (const attr of el.attributes) {
             if (globalAria.some(aria => aria.name === attr.localName)) {
                 results.push(true);
                 break;

package/lib/index.d.ts

@@ -25,4 +25,4 @@ export * from './types/aria.js';
 export * from './types/attributes.js';
 export * from './types/permitted-structures.js';
 export * from './utils/resolve-namespace.js';
-export * from './utils/validateAriaVersion.js';
+export * from './utils/validate-aria-version.js';

package/lib/index.js

@@ -25,4 +25,4 @@ export * from './types/aria.js';
 export * from './types/attributes.js';
 export * from './types/permitted-structures.js';
 export * from './utils/resolve-namespace.js';
-export * from './utils/validateAriaVersion.js';
+export * from './utils/validate-aria-version.js';

package/lib/specs/get-aria.js

@@ -67,5 +67,5 @@ function optimizePermittedRoles(permittedRoles) {
     if (unique.has('none')) {
         unique.add('presentation');
     }
-    return Array.from(unique).sort();
+    return [...unique].sort();
 }

package/lib/specs/get-attr-specs.js

@@ -37,13 +37,13 @@ export function getAttrSpecs(localName, namespace, schema) {
             if (!global) {
                 continue;
             }
-            catAttrs.forEach(selectedName => {
+            for (const selectedName of catAttrs) {
                 const selected = global[selectedName];
                 attrs[selectedName] = {
                     ...attrs[selectedName],
                     ...selected,
                 };
-            });
+            }
             continue;
         }
     }

package/lib/specs/is-void-element.js

@@ -1,7 +1,7 @@
 /**
  * @see https://html.spec.whatwg.org/multipage/syntax.html#void-elements
  */
-const voidElements = [
+const voidElements = new Set([
     'area',
     'base',
     'br',
@@ -15,9 +15,9 @@ const voidElements = [
     'source',
     'track',
     'wbr',
-];
+]);
 export function isVoidElement(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 el) {
-    return voidElements.includes(el.localName);
+    return voidElements.has(el.localName);
 }

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

@@ -18,8 +18,8 @@ export function schemaToSpec(schemas) {
             if (extendedSpec.def['#globalAttrs']?.['#extends']) {
                 const gAttrs = { ...def['#globalAttrs'] };
                 gAttrs['#HTMLGlobalAttrs'] = {
-                    ...(def['#globalAttrs']?.['#HTMLGlobalAttrs'] ?? {}),
-                    ...(extendedSpec.def['#globalAttrs']?.['#extends'] ?? {}),
+                    ...def['#globalAttrs']?.['#HTMLGlobalAttrs'],
+                    ...extendedSpec.def['#globalAttrs']?.['#extends'],
                 };
                 def['#globalAttrs'] = gAttrs;
             }
@@ -58,7 +58,7 @@ export function schemaToSpec(schemas) {
             result.def = def;
         }
         if (extendedSpec.specs) {
-            const exSpecs = extendedSpec.specs.slice();
+            const exSpecs = [...extendedSpec.specs];
             const specs = [];
             for (const elSpec of result.specs) {
                 const tagName = elSpec.name.toLowerCase();
@@ -86,7 +86,7 @@ export function schemaToSpec(schemas) {
 }
 function mergeAttrSpec(std, ex = {}) {
     const result = {};
-    const keys = Array.from(new Set([...Object.keys(std), ...Object.keys(ex)]));
+    const keys = [...new Set([...Object.keys(std), ...Object.keys(ex)])];
     for (const key of keys) {
         const _std = std[key];
         const _ex = ex[key];

package/lib/utils/merge-array.js

@@ -2,7 +2,7 @@ export function mergeArray(a, b) {
     if (!b) {
         return a;
     }
-    const result = a.slice();
+    const result = [...a];
     for (const bItem of b) {
         const bName = getName(bItem);
         const aIndex = result.findIndex(item => getName(item) === bName);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-spec",
-	"version": "4.0.0-alpha.3",
+	"version": "4.0.0-dev.28+0131de5e",
 	"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>",
@@ -30,16 +30,15 @@
 		"schema": "run-s schema:*"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0-alpha.3",
-		"@markuplint/types": "4.0.0-alpha.3",
+		"@markuplint/ml-ast": "4.0.0-dev.28+0131de5e",
+		"@markuplint/types": "4.0.0-dev.28+0131de5e",
 		"dom-accessibility-api": "^0.6.3",
 		"is-plain-object": "^5.0.0",
-		"tslib": "^2.6.2",
-		"type-fest": "^4.3.1"
+		"type-fest": "^4.5.0"
 	},
 	"devDependencies": {
 		"@markuplint/test-tools": "4.0.0-alpha.3",
 		"json-schema-to-typescript": "13.1.1"
 	},
-	"gitHead": "380836f7adc1ff7e8eaf9d869e68d29eee8f3b7e"
+	"gitHead": "0131de5ea9dd6d3fd5472d7b414b66644c758881"
 }