Refactor mdast(1) to externalise to-vfile

Author: wooorm

lib/cli/file-set-pipeline/stdin.js

@@ -12,19 +12,10 @@
  * Dependencies.
  */
 
-var path = require('path');
 var debug = require('debug')('mdast:cli:file-set-pipeline:stdin');
-var VFile = require('vfile');
+var toVFile = require('to-vfile');
 var concat = require('concat-stream');
 
-/*
- * Methods.
- */
-
-var basename = path.basename;
-var extname = path.extname;
-var dirname = path.dirname;
-
 /*
  * Constants.
  */
@@ -70,21 +61,13 @@ function stdin(program, callback) {
     process.stdin.pipe(concat({
         'encoding': 'string'
     }, function (value) {
-        var filePath = program.filePath;
-        var extension = filePath && extname(filePath);
-        var file = new VFile(filePath ? {
-            'directory': dirname(filePath),
-            'filename': basename(filePath, extension),
-            'extension': extension.slice(1)
-        } : {});
+        var file = toVFile(program.filePath || '');
         var space = file.namespace('mdast:cli');
 
         debug('Read from stdin');
 
         file.contents = value;
-
         file.quiet = true;
-
         space.exists = true;
         space.isFile = true;
         space.providedByUser = true;

lib/cli/file-set.js

@@ -12,19 +12,10 @@
  * Dependencies.
  */
 
-var path = require('path');
 var ware = require('ware');
-var VFile = require('vfile');
+var toVFile = require('to-vfile');
 var filePipeline = require('./file-pipeline');
 
-/*
- * Methods.
- */
-
-var basename = path.basename;
-var extname = path.extname;
-var dirname = path.dirname;
-
 /**
  * Utility invoked when a single file has completed it's
  * pipeline, invoking `fileSet.done` when all files are
@@ -166,16 +157,9 @@ function add(file) {
     var paths = self.originalPaths;
     var originalPath;
     var context;
-    var extension;
 
     if (typeof file === 'string') {
-        extension = extname(file);
-
-        file = new VFile({
-            'directory': dirname(file),
-            'filename': basename(file, extension),
-            'extension': extension.slice(1)
-        });
+        file = toVFile(file);
     }
 
     originalPath = file.filePath();

lib/cli/traverser.js

@@ -18,7 +18,7 @@ var fs = require('fs');
 var path = require('path');
 var debug = require('debug')('mdast:cli:traverse');
 var minimatch = require('minimatch');
-var VFile = require('vfile');
+var toVFile = require('to-vfile');
 var Ignore = require('./ignore');
 
 /*
@@ -30,9 +30,6 @@ var stat = fs.statSync;
 var exists = fs.existsSync;
 var resolve = path.resolve;
 var join = path.join;
-var basename = path.basename;
-var extname = path.extname;
-var dirname = path.dirname;
 var concat = [].concat;
 
 /*
@@ -92,18 +89,10 @@ function Traverse(options) {
  * @return {File}
  */
 function toFile(filePath) {
-    var extension = extname(filePath);
-    var name = basename(filePath, extension);
     var real = exists(filePath);
-    var directory = dirname(filePath);
+    var file = toVFile(filePath);
     var space;
 
-    var file = new VFile({
-        'directory': directory,
-        'filename': name,
-        'extension': extension.slice(1)
-    });
-
     space = file.namespace('mdast:cli');
 
     file.quiet = true;

package.json

@@ -31,6 +31,7 @@
     "minimatch": "^2.0.0",
     "repeat-string": "^1.5.0",
     "text-table": "^0.2.0",
+    "to-vfile": "^1.0.0",
     "trim": "^0.0.1",
     "trim-trailing-lines": "^1.0.0",
     "unified": "^1.0.0",