Refactor code-style

wooorm · wooorm · commit 29e8dc685643 · 2021-05-02T18:13:56.000+02:00
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,3 @@
 {
-  "presets": [
-    ["@babel/env"]
-  ]
+  "presets": [["@babel/env"]]
 }
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ yarn-error.log
 .DS_Store
 /dist
 /coverage
+yarn.lock
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,4 @@
+coverage/
+dist/
+*.html
+*.md
diff --git a/package.json b/package.json
@@ -37,24 +37,33 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@rollup/plugin-babel": "^5.0.0",
-    "babel-eslint": "^10.0.0",
     "babel-jest": "^26.0.0",
-    "eslint": "^7.0.0",
-    "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-plugin-import": "^2.0.0",
     "glob": "^7.0.0",
     "jest-cli": "^26.0.0",
+    "prettier": "^2.0.0",
     "remark-cli": "^9.0.0",
     "remark-preset-wooorm": "^8.0.0",
-    "rollup": "^2.0.0"
+    "rollup": "^2.0.0",
+    "xo": "^0.39.0"
   },
   "scripts": {
     "build": "rollup -c",
-    "format": "remark . -qfo && eslint . --fix",
+    "format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",
     "test:api": "jest",
     "test:dev": "jest --watchAll",
     "test": "yarn build && yarn format && yarn test:api"
   },
+  "prettier": {
+    "tabWidth": 2,
+    "useTabs": false,
+    "singleQuote": true,
+    "bracketSpacing": false,
+    "semi": false,
+    "trailingComma": "none"
+  },
+  "xo": {
+    "prettier": true
+  },
   "jest": {
     "collectCoverage": true,
     "coveragePathIgnorePatterns": [
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,23 +1,19 @@
-import babel from '@rollup/plugin-babel';
-import pkg from './package.json';
+import babel from '@rollup/plugin-babel'
+import pkg from './package.json'
 
-export default {
+const config = {
   input: 'src/index.js',
   output: [
-    { file: pkg.main, format: 'cjs' },
-    { file: pkg.module, format: 'es' },
+    {file: pkg.main, format: 'cjs'},
+    {file: pkg.module, format: 'es'}
   ],
   plugins: [
     babel({
-      presets: [
-        ['@babel/preset-env', { modules: false }],
-      ],
-      babelrc: false,
-    }),
+      presets: [['@babel/preset-env', {modules: false}]],
+      babelrc: false
+    })
   ],
-  external: [
-    'hastscript/html',
-    'hastscript/svg',
-    'web-namespaces',
-  ],
-};
+  external: ['hastscript/html', 'hastscript/svg', 'web-namespaces']
+}
+
+export default config
diff --git a/src/__fixtures__/doctype-nameless/index.json b/src/__fixtures__/doctype-nameless/index.json
@@ -27,4 +27,4 @@
       ]
     }
   ]
-}
+}
diff --git a/src/__fixtures__/doctype/index.json b/src/__fixtures__/doctype/index.json
@@ -27,4 +27,4 @@
       ]
     }
   ]
-}
+}
diff --git a/src/__fixtures__/svg/index.json b/src/__fixtures__/svg/index.json
@@ -85,9 +85,7 @@
                           "type": "element",
                           "tagName": "text",
                           "properties": {
-                            "systemLanguage": [
-                              "en"
-                            ]
+                            "systemLanguage": ["en"]
                           },
                           "children": [
                             {
diff --git a/src/index.js b/src/index.js
@@ -1,37 +1,37 @@
-import ns from 'web-namespaces';
-import h from 'hastscript/html';
-import s from 'hastscript/svg';
+import ns from 'web-namespaces'
+import h from 'hastscript/html.js'
+import s from 'hastscript/svg.js'
 
-const ELEMENT_NODE = 1;
-const TEXT_NODE = 3;
-const COMMENT_NODE = 8;
-const DOCUMENT_NODE = 9;
-const DOCUMENT_TYPE_NODE = 10;
-const DOCUMENT_FRAGMENT_NODE = 11;
+const ELEMENT_NODE = 1
+const TEXT_NODE = 3
+const COMMENT_NODE = 8
+const DOCUMENT_NODE = 9
+const DOCUMENT_TYPE_NODE = 10
+const DOCUMENT_FRAGMENT_NODE = 11
 
 function transform(value) {
-  const node = value || {};
+  const node = value || {}
 
   switch (node.nodeType) {
     case ELEMENT_NODE:
-      return element(node);
+      return element(node)
     case DOCUMENT_NODE:
     case DOCUMENT_FRAGMENT_NODE:
-      return root(node);
+      return root(node)
     case TEXT_NODE:
-      return text(node);
+      return text(node)
     case COMMENT_NODE:
-      return comment(node);
+      return comment(node)
     case DOCUMENT_TYPE_NODE:
-      return doctype(node);
+      return doctype(node)
     default:
-      return null;
+      return null
   }
 }
 
 // Transform a document.
 function root(node) {
-  return { type: 'root', children: all(node) };
+  return {type: 'root', children: all(node)}
 }
 
 // Transform a doctype.
@@ -40,59 +40,60 @@ function doctype(node) {
     type: 'doctype',
     name: node.name || '',
     public: node.publicId || null,
-    system: node.systemId || null,
-  };
+    system: node.systemId || null
+  }
 }
 
 // Transform text.
 function text(node) {
-  return { type: 'text', value: node.nodeValue };
+  return {type: 'text', value: node.nodeValue}
 }
 
 // Transform a comment.
 function comment(node) {
-  return { type: 'comment', value: node.nodeValue };
+  return {type: 'comment', value: node.nodeValue}
 }
 
 // Transform an element.
 function element(node) {
-  const space = node.namespaceURI;
-  const fn = space === ns.svg ? s : h;
-  const tagName = space === ns.html ? node.tagName.toLowerCase() : node.tagName;
-  const content = space === ns.html && tagName === 'template' ? node.content : node;
-  const attributes = node.getAttributeNames();
-  const { length } = attributes;
-  const props = {};
-  let index = 0;
+  const space = node.namespaceURI
+  const fn = space === ns.svg ? s : h
+  const tagName = space === ns.html ? node.tagName.toLowerCase() : node.tagName
+  const content =
+    space === ns.html && tagName === 'template' ? node.content : node
+  const attributes = node.getAttributeNames()
+  const {length} = attributes
+  const props = {}
+  let index = 0
 
   while (index < length) {
-    const key = attributes[index];
-    props[key] = node.getAttribute(key);
-    index += 1;
+    const key = attributes[index]
+    props[key] = node.getAttribute(key)
+    index += 1
   }
 
-  return fn(tagName, props, all(content));
+  return fn(tagName, props, all(content))
 }
 
 function all(node) {
-  const nodes = node.childNodes;
-  const { length } = nodes;
-  const children = [];
-  let index = 0;
+  const nodes = node.childNodes
+  const {length} = nodes
+  const children = []
+  let index = 0
 
   while (index < length) {
-    const child = transform(nodes[index]);
+    const child = transform(nodes[index])
 
     if (child !== null) {
-      children.push(child);
+      children.push(child)
     }
 
-    index += 1;
+    index += 1
   }
 
-  return children;
+  return children
 }
 
 export default function fromDOM(node) {
-  return transform(node) || { type: 'root', children: [] };
+  return transform(node) || {type: 'root', children: []}
 }
diff --git a/src/index.test.js b/src/index.test.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`	`1`	`{`
`2`		`- "presets": [`
`3`		`- ["@babel/env"]`
`4`		`- ]`
	`2`	`+ "presets": [["@babel/env"]]`
`5`	`3`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +coverage/
 +dist/
 +*.html
 +*.md
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@`
`27`	`27`	`]`
`28`	`28`	`}`
`29`	`29`	`]`
`30`		`-}`
	`30`	`+}`