Move sync and async operations to their own files

vfile · Aug 6, 2018 · a7fe5d7 · a7fe5d7
1 parent 0ab1913
commit a7fe5d7
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 104 deletions.
diff --git a/lib/async.js b/lib/async.js
@@ -0,0 +1,90 @@
+'use strict'
+
+var fs = require('fs')
+var path = require('path')
+var vfile = require('./core')
+
+exports.read = read
+exports.write = write
+
+/* Create a virtual file and read it in, asynchronously. */
+function read(description, options, callback) {
+  var file = vfile(description)
+
+  if (!callback && typeof options === 'function') {
+    callback = options
+    options = null
+  }
+
+  if (!callback) {
+    return new Promise(executor)
+  }
+
+  executor(resolve, callback)
+
+  function resolve(result) {
+    callback(null, result)
+  }
+
+  function executor(resolve, reject) {
+    var fp
+
+    try {
+      fp = path.resolve(file.cwd, file.path)
+    } catch (err) {
+      return reject(err)
+    }
+
+    fs.readFile(fp, options, done)
+
+    function done(err, res) {
+      if (err) {
+        reject(err)
+      } else {
+        file.contents = res
+        resolve(file)
+      }
+    }
+  }
+}
+
+/* Create a virtual file and write it out, asynchronously. */
+function write(description, options, callback) {
+  var file = vfile(description)
+
+  /* Weird, right? Otherwise `fs` doesn’t accept it. */
+  if (!callback && typeof options === 'function') {
+    callback = options
+    options = undefined
+  }
+
+  if (!callback) {
+    return new Promise(executor)
+  }
+
+  executor(resolve, callback)
+
+  function resolve(result) {
+    callback(null, result)
+  }
+
+  function executor(resolve, reject) {
+    var fp
+
+    try {
+      fp = path.resolve(file.cwd, file.path)
+    } catch (err) {
+      return reject(err)
+    }
+
+    fs.writeFile(fp, file.contents || '', options, done)
+
+    function done(err) {
+      if (err) {
+        reject(err)
+      } else {
+        resolve()
+      }
+    }
+  }
+}
diff --git a/lib/fs.js b/lib/fs.js
@@ -1,110 +1,12 @@
 'use strict'
 
-var fs = require('fs')
-var path = require('path')
 var vfile = require('./core')
+var sync = require('./sync')
+var async = require('./async')
 
 module.exports = vfile
 
-vfile.read = read
-vfile.readSync = readSync
-vfile.write = write
-vfile.writeSync = writeSync
-
-/* Create a virtual file and read it in, asynchronously. */
-function read(description, options, callback) {
-  var file = vfile(description)
-
-  if (!callback && typeof options === 'function') {
-    callback = options
-    options = null
-  }
-
-  if (!callback) {
-    return new Promise(executor)
-  }
-
-  executor(null, callback)
-
-  function executor(resolve, reject) {
-    var fp
-
-    try {
-      fp = path.resolve(file.cwd, file.path)
-    } catch (err) {
-      return reject(err)
-    }
-
-    fs.readFile(fp, options, done)
-
-    function done(err, res) {
-      if (err) {
-        reject(err)
-      } else {
-        file.contents = res
-
-        if (resolve) {
-          resolve(file)
-        } else {
-          callback(null, file)
-        }
-      }
-    }
-  }
-}
-
-/* Create a virtual file and read it in, synchronously. */
-function readSync(description, options) {
-  var file = vfile(description)
-  file.contents = fs.readFileSync(path.resolve(file.cwd, file.path), options)
-  return file
-}
-
-/* Create a virtual file and write it out, asynchronously. */
-function write(description, options, callback) {
-  var file = vfile(description)
-
-  /* Weird, right? Otherwise `fs` doesn’t accept it. */
-  if (!callback && typeof options === 'function') {
-    callback = options
-    options = undefined
-  }
-
-  if (!callback) {
-    return new Promise(executor)
-  }
-
-  executor(null, callback)
-
-  function executor(resolve, reject) {
-    var fp
-
-    try {
-      fp = path.resolve(file.cwd, file.path)
-    } catch (err) {
-      return reject(err)
-    }
-
-    fs.writeFile(fp, file.contents || '', options, done)
-
-    function done(err) {
-      if (err) {
-        reject(err)
-      } else if (resolve) {
-        resolve()
-      } else {
-        callback()
-      }
-    }
-  }
-}
-
-/* Create a virtual file and write it out, synchronously. */
-function writeSync(description, options) {
-  var file = vfile(description)
-  fs.writeFileSync(
-    path.resolve(file.cwd, file.path),
-    file.contents || '',
-    options
-  )
-}
+vfile.read = async.read
+vfile.readSync = sync.read
+vfile.write = async.write
+vfile.writeSync = sync.write
diff --git a/lib/sync.js b/lib/sync.js
@@ -0,0 +1,25 @@
+'use strict'
+
+var fs = require('fs')
+var path = require('path')
+var vfile = require('./core')
+
+exports.read = readSync
+exports.write = writeSync
+
+/* Create a virtual file and read it in, synchronously. */
+function readSync(description, options) {
+  var file = vfile(description)
+  file.contents = fs.readFileSync(path.resolve(file.cwd, file.path), options)
+  return file
+}
+
+/* Create a virtual file and write it out, synchronously. */
+function writeSync(description, options) {
+  var file = vfile(description)
+  fs.writeFileSync(
+    path.resolve(file.cwd, file.path),
+    file.contents || '',
+    options
+  )
+}