Refactor code-style

Author: wooorm

src/index.js

@@ -1,21 +1,16 @@
 import h from 'hastscript';
 
 const ELEMENT_NODE = 1;
-// const ATTRIBUTE_NODE = 2;
 const TEXT_NODE = 3;
-// const CDATA_SECTION_NODE = 4;
-// const ENTITY_REFERENCE_NODE = 5;
-// const ENTITY_NODE = 6;
-// const PROCESSING_INSTRUCTION_NODE = 7;
 const COMMENT_NODE = 8;
 const DOCUMENT_NODE = 9;
 const DOCUMENT_TYPE_NODE = 10;
 const DOCUMENT_FRAGMENT_NODE = 11;
-// const NOTATION_NODE = 12;
 
 function transform(el) {
   const children = [];
   const length = el.childNodes ? el.childNodes.length : 0;
+
   for (let i = 0; i < length; i += 1) {
     children.push(transform(el.childNodes[i]));
   }
@@ -52,16 +47,12 @@ function transform(el) {
   }
 }
 
-/**
- * Transform a document
- */
+// Transform a document.
 function root(el, children) {
   return { type: 'root', children };
 }
 
-/**
- * Transform a DOCTYPE
- */
+// Transform a doctype.
 function doctype(el) {
   return {
     type: 'doctype',
@@ -71,23 +62,17 @@ function doctype(el) {
   };
 }
 
-/**
- * Transform text node
- */
+// Transform text.
 function text(el) {
   return { type: 'text', value: el.nodeValue };
 }
 
-/**
- * Transform a comment node
- */
+// Transform a comment.
 function comment(el) {
   return { type: 'comment', value: el.data };
 }
 
-/**
- * Transform an element
- */
+// Transform an element.
 function element(el, children) {
   const tagName = el.tagName.toLowerCase();
   const props = {};

src/index.test.js

@@ -4,28 +4,11 @@ import glob from 'glob';
 
 import fromDOM from './index';
 
-function createFragmentFromHtml(htmlString) {
-  const fragment = document.createDocumentFragment();
-  const tempEl = document.createElement('body');
-  tempEl.innerHTML = htmlString;
-  let child = tempEl.firstChild;
-  while (child) {
-    fragment.appendChild(child);
-    child = tempEl.firstChild;
-  }
-  return fragment;
-}
-
-function createDocumentFromHtml(htmlString) {
-  const parser = new DOMParser();
-  return parser.parseFromString(htmlString, 'text/html');
-}
-
 describe('hast-util-from-dom', () => {
   it('should transform a complete document', () => {
-    const fixtureHtml = '<title>Hello!</title><h1>World!';
-    const parsedActual = fromDOM(createDocumentFromHtml(fixtureHtml));
-    const parsedExpected = {
+    const actual = fromDOM(doc('<title>Hello!</title><h1>World!'));
+
+    expect(actual).toEqual({
       type: 'root',
       children: [{
         type: 'element',
@@ -58,14 +41,13 @@ describe('hast-util-from-dom', () => {
           },
         ],
       }],
-    };
-    expect(parsedActual).toEqual(parsedExpected);
+    });
   });
 
   it('should transform a fragment', () => {
-    const fixtureHtml = '<title>Hello!</title><h1>World!';
-    const parsedActual = fromDOM(createFragmentFromHtml(fixtureHtml));
-    const parsedExpected = {
+    const actual = fromDOM(fragment('<title>Hello!</title><h1>World!'));
+
+    expect(actual).toEqual({
       type: 'root',
       children: [
         {
@@ -81,30 +63,53 @@ describe('hast-util-from-dom', () => {
           children: [{ type: 'text', value: 'World!' }],
         },
       ],
-    };
-    expect(parsedActual).toEqual(parsedExpected);
+    });
   });
 });
 
 describe('fixtures', () => {
-  const FIXTURES_PATH = path.join(__dirname, '__fixtures__');
-  const fixturePaths = glob.sync(path.join(FIXTURES_PATH, '**/*/'));
+  const root = path.join(__dirname, '__fixtures__');
+  const fixturePaths = glob.sync(path.join(root, '**/*/'));
+
   fixturePaths.forEach((fixturePath) => {
-    const fixture = path.relative(FIXTURES_PATH, fixturePath);
-    const fixtureInput = path.join(fixturePath, 'index.html');
-    const fixtureOutput = path.join(fixturePath, 'index.json');
+    const fixture = path.relative(root, fixturePath);
+    const input = path.join(fixturePath, 'index.html');
+    const output = path.join(fixturePath, 'index.json');
 
     test(fixture, () => {
-      const fixtureHtml = fs.readFileSync(fixtureInput);
-      const parsedActual = fromDOM(createDocumentFromHtml(fixtureHtml));
+      const fixtureHtml = fs.readFileSync(input);
+      const actual = fromDOM(doc(fixtureHtml));
       let parsedExpected;
+
       try {
-        parsedExpected = JSON.parse(fs.readFileSync(fixtureOutput));
+        parsedExpected = JSON.parse(fs.readFileSync(output));
       } catch (e) {
-        fs.writeFileSync(fixtureOutput, JSON.stringify(parsedActual, null, 2));
+        fs.writeFileSync(output, JSON.stringify(actual, null, 2));
         return;
       }
-      expect(parsedActual).toEqual(parsedExpected);
+
+      expect(actual).toEqual(parsedExpected);
     });
   });
 });
+
+function fragment(htmlString) {
+  const node = document.createDocumentFragment();
+  const tempEl = document.createElement('body');
+
+  tempEl.innerHTML = htmlString;
+
+  let child = tempEl.firstChild;
+
+  while (child) {
+    node.appendChild(child);
+    child = tempEl.firstChild;
+  }
+
+  return node;
+}
+
+function doc(htmlString) {
+  const parser = new DOMParser();
+  return parser.parseFromString(htmlString, 'text/html');
+}