Merge pull request #57 from addyosmani/xmr/dev

Use destructuring more and minor tweaks
addyosmani · Sep 12, 2023 · 5210b92 · 5210b92
2 parents 02f5fbd + 2447039
commit 5210b92
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -87,8 +87,8 @@ const srcs = oust.raw(htmlString, '...');
 
 /*
 -> [
-  {value: '...', $el: '...'},
-  {value: '...', $el: '...'},
+  {$el: '...', type: '...', value: '...'},
+  {$el: '...', type: '...', value: '...'},
   ...
  ]
 */

diff --git a/index.js b/index.js
@@ -51,7 +51,7 @@ const types = {
   },
 };
 
-function oust(src, type, raw = false) {
+function oust(src, type, raw) {
   if (typeof src !== 'string' || !type) {
     throw new Error('`src` and `type` required');
   }
@@ -65,33 +65,25 @@ function oust(src, type, raw = false) {
     }
   }
 
-  const chosenTypes = typeArray.map(type => ({...types[type], type}));
-  const selector = chosenTypes.map(type => type.selector).join(', ');
   const $ = cheerio.load(src);
+  const chosenTypes = typeArray.map(type => ({...types[type], type}));
+  const $selector = $(chosenTypes.map(type => type.selector).join(', '));
 
-  return Array.prototype.map.call($(selector), element => {
-    const $element = $(element);
-    const chosenType = chosenTypes.find(type => $element.is(type.selector));
-
+  return [...$selector].map(element => {
+    const $el = $(element);
+    const {type, method, attribute} = chosenTypes.find(type => $el.is(type.selector));
     let value = '';
-    if (chosenType.method && $element[chosenType.method]) {
-      value = $element[chosenType.method]();
-    } else if (chosenType.attribute) {
-      value = $element.attr(chosenType.attribute);
-    }
 
-    if (raw === true) {
-      return {
-        $el: $element,
-        type: chosenType.type,
-        value,
-      };
+    if (method && $el[method]) {
+      value = $el[method]();
+    } else if (attribute) {
+      value = $el.attr(attribute);
     }
 
-    return value;
+    return raw ? {$el, type, value} : value;
   });
 }
 
-module.exports = (src, type) => oust(src, type);
+module.exports = (src, type) => oust(src, type, false);
 
 module.exports.raw = (src, type) => oust(src, type, true);
diff --git a/package.json b/package.json
@@ -51,7 +51,8 @@
     "space": 2,
     "rules": {
       "capitalized-comments": "off",
-      "unicorn/prefer-module": "off"
+      "unicorn/prefer-module": "off",
+      "unicorn/prevent-abbreviations": "off"
     }
   }
 }
diff --git a/test/index.js b/test/index.js
@@ -20,7 +20,7 @@ test('should return an array of stylesheet link hrefs', () => {
   assert.equal(links, expected);
 });
 
-test('should return an array of refs when passed a HTML string', () => {
+test('should return an array of refs when passed an HTML string', () => {
   const fixture = '<html><link rel="stylesheet" href="styles/main.css"></html>';
   const links = oust(fixture, 'stylesheets');
   const expected = ['styles/main.css'];