refactor: use left-phalange-api

Author: fisker

package.json

@@ -20,25 +20,18 @@
   ],
   "license": "MIT",
   "files": [
-    "bin",
-    "lib"
+    "bin"
   ],
   "bin": {
     "left-phalange": "bin/cli",
     "lp": "bin/cli"
   },
   "dependencies": {
-    "@iarna/toml": "^2.2.3",
     "ansi-colors": "^3.2.4",
     "clipboardy": "^2.0.0",
-    "esm": "^3.2.25",
     "get-stdin": "^7.0.0",
-    "import-fresh": "^3.0.0",
-    "ini": "^1.3.5",
-    "js-yaml": "^3.13.1",
-    "json5": "^2.1.0",
+    "left-phalange-api": "^1.1.1",
     "meow": "^5.0.0",
-    "parse-json": "^4.0.0",
     "update-notifier": "^3.0.0"
   },
   "config": {
@@ -74,12 +67,14 @@
     "ava": "^1.4.1",
     "cz-conventional-changelog-emoji": "^0.1.0",
     "eslint": "^5.16.0",
+    "esm": "^3.2.25",
+    "execa": "^1.0.0",
     "husky": "^2.3.0",
     "lint-staged": "^8.1.7",
     "markdownlint-cli": "^0.16.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^1.17.1",
-    "rollup": "^1.12.3",
+    "rollup": "^1.12.4",
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-filesize": "^6.1.0",
     "rollup-plugin-json": "^4.0.0",

readme.md

@@ -59,6 +59,10 @@ lp --help
 - toml
 - yaml
 
+## Related
+
+- [left-phalange-api](https://github.com/fisker/left-phalange-api) - API for this module
+
 ## License
 
 MIT © [fisker Cheung](https://github.com/fisker)

rollup.config.js

@@ -7,24 +7,13 @@ const plugins = [cjs(), json(), filesize()]
 
 const external = ['path', 'fs', ...Object.keys(dependencies)]
 
-export default [
-  {
-    input: 'src/index.js',
-    output: {
-      file: 'lib/index.js',
-      format: 'cjs',
-    },
-    external,
-    plugins,
+export default {
+  input: 'src/index.js',
+  output: {
+    file: 'bin/cli',
+    format: 'cjs',
+    banner: '#!/usr/bin/env node',
   },
-  {
-    input: 'src/cli.js',
-    output: {
-      file: 'bin/cli',
-      format: 'cjs',
-      banner: '#!/usr/bin/env node',
-    },
-    external,
-    plugins,
-  },
-]
+  external,
+  plugins,
+}

src/cli.js

@@ -1,12 +1,5 @@
 import meow from 'meow'
-import updateNotifier from 'update-notifier'
 import colors from 'ansi-colors'
-import {join, isAbsolute} from 'path'
-import getStdin from 'get-stdin'
-import {writeSync as copyToClipboard} from 'clipboardy'
-import transform from '.'
-
-updateNotifier({pkg: require('../package.json')}).notify()
 
 const cli = meow(
   `
@@ -25,7 +18,7 @@ const cli = meow(
   Examples
     $ lp data.toml > data.json
     $ cat data.yaml | lp -p
-`,
+  `,
   {
     flags: {
       pretty: {
@@ -54,48 +47,4 @@ const cli = meow(
   }
 )
 
-function processor(
-  file,
-  {
-    pretty = false,
-    input: inputType,
-    output: outputType = 'json',
-    copy = false,
-  } = {}
-) {
-  const input = {
-    type: inputType,
-  }
-
-  const output = {
-    type: outputType,
-    pretty,
-  }
-
-  if (file) {
-    file = isAbsolute(file) ? file : join(process.cwd(), file)
-    input.file = file
-    showResult(input, output, copy)
-  } else {
-    getStdin().then(content => {
-      if (content) {
-        input.content = content
-        showResult(input, output, copy)
-      } else {
-        cli.showHelp()
-      }
-    })
-  }
-}
-
-function showResult(input, output, copy) {
-  const result = transform(input, output)
-
-  if (copy) {
-    copyToClipboard(result)
-  } else {
-    console.log(result)
-  }
-}
-
-processor(cli.input[0], cli.flags)
+export default cli

src/index.js

@@ -1,13 +1,28 @@
+import getStdin from 'get-stdin'
+import cli from './cli'
 import load from './load'
-import parse from './parse'
 import stringify from './stringify'
+import parse from './parse'
+import showResult from './show-result'
+import update from './update'
 
-function transform(input, output = {}) {
-  const {file, content, type} = input
+update()
 
-  const data = file ? load(file, type) : parse(content, type)
+const file = cli.input[0]
+const {flags} = cli
 
-  return stringify(data, output)
+if (file) {
+  const data = load(file, flags)
+  const result = stringify(data, flags)
+  showResult(result, flags)
+} else {
+  getStdin().then(content => {
+    if (content) {
+      const data = parse(content, flags)
+      const result = stringify(data, flags)
+      showResult(result, flags)
+    } else {
+      cli.showHelp()
+    }
+  })
 }
-
-export default transform

src/load.js

@@ -1,9 +1,12 @@
-import * as loaders from './loader'
-import {getFileType} from './utils'
+import {join, isAbsolute} from 'path'
+import {load} from 'left-phalange-api'
 
-function loadFile(file, type) {
-  type = type || getFileType(file)
-  return loaders[type](file)
+function loadFileData(file, {input} = {}) {
+  file = isAbsolute(file) ? file : join(process.cwd(), file)
+  const data = load(file, {
+    type: input,
+  })
+  return data
 }
 
-export default loadFile
+export default loadFileData

src/loader/cjs.js

@@ -1,7 +1,9 @@
-import * as parsers from './parser'
+import {parse} from 'left-phalange-api'
 
-function parse(content, type = 'yaml') {
-  return parsers[type](content)
+function parseData(content, {input} = {}) {
+  return parse(content, {
+    type: input,
+  })
 }
 
-export default parse
+export default parseData

src/loader/esm-require.js

@@ -0,0 +1,11 @@
+import {writeSync as copyToClipboard} from 'clipboardy'
+
+function showResult(result, {copy = false} = {}) {
+  if (copy) {
+    copyToClipboard(result)
+  } else {
+    console.log(result)
+  }
+}
+
+export default showResult

src/loader/index.js

@@ -1,7 +1,10 @@
-import * as printers from './printer'
+import {stringify} from 'left-phalange-api'
 
-function stringify(data, {type = 'json', ...options}) {
-  return printers[type](data, options)
+function stringifyData(data, {output, pretty} = {}) {
+  return stringify(data, {
+    type: output,
+    pretty,
+  })
 }
 
-export default stringify
+export default stringifyData

src/parse.js

@@ -0,0 +1,7 @@
+import updateNotifier from 'update-notifier'
+
+function update() {
+  updateNotifier({pkg: require('../package.json')}).notify()
+}
+
+export default update