Update: Use new mkdirpStream in dest & symlink

Author: erikkemperman

lib/dest/index.js

@@ -4,8 +4,8 @@ var lead = require('lead');
 var pumpify = require('pumpify');
 var prepare = require('vinyl-prepare');
 
+var fo = require('../file-operations');
 var sourcemap = require('./sourcemap');
-var makeDirs = require('./make-dirs');
 var writeContents = require('./write-contents');
 
 function dest(outFolder, opt) {
@@ -16,7 +16,7 @@ function dest(outFolder, opt) {
   var saveStream = pumpify.obj(
     prepare.dest(outFolder, opt),
     sourcemap(opt),
-    makeDirs(opt),
+    fo.mkdirpStream(opt),
     writeContents(opt)
   );
 

lib/dest/make-dirs.js

@@ -6,6 +6,8 @@ var fs = require('graceful-fs');
 var path = require('path');
 var assign = require('object-assign');
 var date = require('value-or-function').date;
+var number = require('value-or-function').number;
+var through = require('through2');
 var FlushWriteStream = require('flush-write-stream');
 
 var constants = require('./constants');
@@ -321,6 +323,25 @@ function mkdirp(dirpath, customMode, callback) {
   }
 }
 
+function mkdirpStream(opt) {
+
+  function makeFileDirs(file, enc, callback) {
+    // TODO: Can this be put on file.stat?
+    var dirMode = number(opt.dirMode, file);
+
+    mkdirp(file.dirname, dirMode, onMkdirp);
+
+    function onMkdirp(mkdirpErr) {
+      if (mkdirpErr) {
+        return callback(mkdirpErr);
+      }
+      callback(null, file);
+    }
+  }
+
+  return through.obj(makeFileDirs);
+}
+
 function createWriteStream(path, options, flush) {
   return new WriteStream(path, options, flush);
 }
@@ -427,5 +448,6 @@ module.exports = {
   updateMetadata: updateMetadata,
   writeFile: writeFile,
   mkdirp: mkdirp,
+  mkdirpStream: mkdirpStream,
   createWriteStream: createWriteStream,
 };

lib/file-operations.js

@@ -13,7 +13,6 @@ var lead = require('lead');
 
 var fo = require('../file-operations');
 
-var number = valueOrFunction.number;
 var boolean = valueOrFunction.boolean;
 
 var isWindows = (os.platform() === 'win32');
@@ -51,19 +50,7 @@ function symlink(outFolder, opt) {
       srcPath = path.relative(file.base, srcPath);
     }
 
-    // TODO: make DRY with .dest()
-    var dirMode = number(opt.dirMode, file);
-    var writeFolder = path.dirname(file.path);
-
-    fo.mkdirp(writeFolder, dirMode, onMkdirp);
-
-    function onMkdirp(mkdirpErr) {
-      if (mkdirpErr) {
-        return callback(mkdirpErr);
-      }
-
-      fs.symlink(srcPath, file.path, symType, onSymlink);
-    }
+    fs.symlink(srcPath, file.path, symType, onSymlink);
 
     function onSymlink(symlinkErr) {
       if (isErrorFatal(symlinkErr)) {
@@ -75,6 +62,7 @@ function symlink(outFolder, opt) {
 
   var stream = pumpify.obj(
     prepare.dest(outFolder, opt),
+    fo.mkdirpStream(opt),
     through.obj(linkFile)
   );