refactor: use set in _collections

svg · Dec 24, 2023 · 17edd37 · 17edd37
1 parent 2c408ce
commit 17edd37
Show file tree

Hide file tree

Showing 24 changed files with 810 additions and 758 deletions.
diff --git a/lib/parser.js b/lib/parser.js
@@ -213,7 +213,7 @@ const parseSvg = (data, from) => {
   sax.ontext = (text) => {
     if (current.type === 'element') {
       // prevent trimming of meaningful whitespace inside textual tags
-      if (textElems.includes(current.name)) {
+      if (textElems.has(current.name)) {
         /**
          * @type {XastText}
          */

diff --git a/lib/stringifier.js b/lib/stringifier.js
@@ -235,7 +235,7 @@ const stringifyElement = (node, config, state) => {
       tagCloseStart = defaults.tagCloseStart;
       tagCloseEnd = defaults.tagCloseEnd;
       openIndent = '';
-    } else if (textElems.includes(node.name)) {
+    } else if (textElems.has(node.name)) {
       tagOpenEnd = defaults.tagOpenEnd;
       tagCloseStart = defaults.tagCloseStart;
       closeIndent = '';

diff --git a/lib/style.js b/lib/style.js
@@ -130,7 +130,9 @@ const parseStyleDeclarations = (css) => {
 };
 
 /**
- * @type {(stylesheet: Stylesheet, node: XastElement) => ComputedStyles}
+ * @param {Stylesheet} stylesheet
+ * @param {XastElement} node
+ * @returns {ComputedStyles}
  */
 const computeOwnStyle = (stylesheet, node) => {
   /** @type {ComputedStyles} */
@@ -139,7 +141,7 @@ const computeOwnStyle = (stylesheet, node) => {
 
   // collect attributes
   for (const [name, value] of Object.entries(node.attributes)) {
-    if (attrsGroups.presentation.includes(name)) {
+    if (attrsGroups.presentation.has(name)) {
       computedStyle[name] = { type: 'static', inherited: false, value };
       importantStyles.set(name, false);
     }
@@ -217,29 +219,31 @@ exports.compareSpecificity = compareSpecificity;
  * @type {(root: XastRoot) => Stylesheet}
  */
 const collectStylesheet = (root) => {
-  /** @type {Array<StylesheetRule>} */
+  /** @type {StylesheetRule[]} */
   const rules = [];
   /** @type {Map<XastElement, XastParent>} */
   const parents = new Map();
+
   visit(root, {
     element: {
       enter: (node, parentNode) => {
-        // store parents
         parents.set(node, parentNode);
-        // find and parse all styles
-        if (node.name === 'style') {
+
+        if (node.name !== 'style') {
+          return;
+        }
+
+        if (
+          node.attributes.type == null ||
+          node.attributes.type === '' ||
+          node.attributes.type === 'text/css'
+        ) {
           const dynamic =
             node.attributes.media != null && node.attributes.media !== 'all';
-          if (
-            node.attributes.type == null ||
-            node.attributes.type === '' ||
-            node.attributes.type === 'text/css'
-          ) {
-            const children = node.children;
-            for (const child of children) {
-              if (child.type === 'text' || child.type === 'cdata') {
-                rules.push(...parseStylesheet(child.value, dynamic));
-              }
+
+          for (const child of node.children) {
+            if (child.type === 'text' || child.type === 'cdata') {
+              rules.push(...parseStylesheet(child.value, dynamic));
             }
           }
         }
@@ -253,21 +257,21 @@ const collectStylesheet = (root) => {
 exports.collectStylesheet = collectStylesheet;
 
 /**
- * @type {(stylesheet: Stylesheet, node: XastElement) => ComputedStyles}
+ * @param {Stylesheet} stylesheet
+ * @param {XastElement} node
+ * @returns {ComputedStyles}
  */
 const computeStyle = (stylesheet, node) => {
   const { parents } = stylesheet;
-  // collect inherited styles
   const computedStyles = computeOwnStyle(stylesheet, node);
   let parent = parents.get(node);
   while (parent != null && parent.type !== 'root') {
     const inheritedStyles = computeOwnStyle(stylesheet, parent);
     for (const [name, computed] of Object.entries(inheritedStyles)) {
       if (
         computedStyles[name] == null &&
-        // ignore not inheritable styles
-        inheritableAttrs.includes(name) === true &&
-        presentationNonInheritableGroupAttrs.includes(name) === false
+        inheritableAttrs.has(name) &&
+        !presentationNonInheritableGroupAttrs.has(name)
       ) {
         computedStyles[name] = { ...computed, inherited: true };
       }

diff --git a/lib/svgo/tools.js b/lib/svgo/tools.js
@@ -204,7 +204,7 @@ exports.includesUrlReference = includesUrlReference;
 const findReferences = (attribute, value) => {
   const results = [];
 
-  if (referencesProps.includes(attribute)) {
+  if (referencesProps.has(attribute)) {
     const matches = value.matchAll(regReferencesUrl);
     for (const match of matches) {
       results.push(match[2]);