Merge pull request #129 from blond/issue-128

fix(tar-stream): provide target stats for symlink
yandex · Jan 17, 2018 · 8ee10ed · 8ee10ed
2 parents 697677b + 2ec763b
commit 8ee10ed
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/lib/streams/abstract-writable-stream.js b/lib/streams/abstract-writable-stream.js
@@ -93,21 +93,21 @@ module.exports = class AbstractWritableStream extends stream.Writable {
 
             const file = Object.assign({ relative, stats: lstats }, chunk);
 
-            const addDirectory = () => {
+            const addDirectory = (dirInfo) => {
                 // ignore empty dir
                 if (!this._emptyDirs) {
                     return callback();
                 }
 
-                return this.addDirectory(file, callback);
+                return this.addDirectory(dirInfo, callback);
             };
-            const addFile = () => {
+            const addFile = (fileInfo) => {
                 // ignore empty file
                 if (!this._emptyFiles && lstats.size === 0) {
                     return callback();
                 }
 
-                this.addFile(file, callback);
+                this.addFile(fileInfo, callback);
             };
 
             if (lstats.isSymbolicLink()) {
@@ -117,10 +117,12 @@ module.exports = class AbstractWritableStream extends stream.Writable {
                             return callback(error);
                         }
 
+                        const targetFile = Object.assign({}, file, { stats });
+
                         if (stats.isDirectory()) {
-                            addDirectory();
+                            addDirectory(targetFile);
                         } else {
-                            addFile();
+                            addFile(targetFile);
                         }
                     });
                 }
@@ -129,10 +131,10 @@ module.exports = class AbstractWritableStream extends stream.Writable {
             }
 
             if (lstats.isDirectory()) {
-                return addDirectory();
+                return addDirectory(file);
             }
 
-            addFile();
+            addFile(file);
         });
     }
 };
diff --git a/test/streams/tar-stream.test.js b/test/streams/tar-stream.test.js
@@ -161,6 +161,23 @@ test('should take into broken symlinks', async t => {
     t.deepEqual(files, [{ path: 'symlink.txt', contents: null, linkpath: '../no-file' }]);
 });
 
+test('should follow symlink', async t => {
+    mockFs({
+        'file-1.txt': 'Hi!',
+        'source-dir': {
+            'symlink.txt': mockFs.symlink({
+                path: '../file-1.txt'
+            })
+        }
+    });
+
+    await packFiles(['symlink.txt'], { followSymlinks: true });
+
+    const files = await parseFiles(resdir);
+
+    t.deepEqual(files, [{ path: 'symlink.txt', contents: 'Hi!' }]);
+});
+
 test('should include empty file', async t => {
     mockFs({
         'source-dir': {