@ezs/basics 2.5.4 → 2.5.6

package/README.md

@@ -552,6 +552,7 @@ Take all recevied objects and build a tar file
 -   `location` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Location path to store files in the tarball (optional, default `data`)
 -   `json` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Convert to JSON the content of each chunk (optional, default `true`)
 -   `extension` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Choose extension fo each file (optional, default `json`)
+-   `additionalFile` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Path to an additional file that will be add to tarball
 -   `compress` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Enable gzip compression (optional, default `false`)
 
 ### TARExtract

package/lib/csv-parse.js

@@ -20,9 +20,9 @@ function CSVParse(data, feed) {
     this.whenFinish = feed.flow(this.input);
   }
   if (this.isLast()) {
-    this.decoder.end();
+    (0, _streamWrite.default)(this.input, this.decoder.end(), () => this.input.end());
     this.whenFinish.finally(() => feed.close());
-    return this.input.end();
+    return;
   }
   (0, _streamWrite.default)(this.input, Buffer.isBuffer(data) ? this.decoder.write(data) : data, () => feed.end());
 }

package/lib/tar-dump.js

@@ -4,10 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = TARDump;
+var _path = require("path");
+var _util = require("util");
+var _fs = require("fs");
 var _tarStream = _interopRequireDefault(require("tar-stream"));
 var _zlib = require("zlib");
 var _lodash = _interopRequireDefault(require("lodash.merge"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Avoid importing from fs/promise to be compatible with node 12
+const readFilePromise = (0, _util.promisify)(_fs.readFile);
 const eol = '\n';
 
 /**
@@ -23,6 +28,7 @@ const eol = '\n';
  * @param {String} [location=data] Location path to store files in the tarball
  * @param {String} [json=true] Convert to JSON the content of each chunk
  * @param {String} [extension=json] Choose extension fo each file
+ * @param {String} [additionalFile] Path to an additional file that will be add to tarball
  * @param {Boolean} [compress=false] Enable gzip compression
  */
 function TARDump(data, feed) {
@@ -46,7 +52,10 @@ function TARDump(data, feed) {
     this.pack.entry({
       name: 'manifest.json'
     }, JSON.stringify(manifest, null, '  '));
-    this.pack.finalize();
+    const additionalFiles = [].concat(this.getParam('additionalFile')).filter(Boolean).map(filename => this.ezs.getPath().map(dir => (0, _path.resolve)(dir, filename)).filter(Boolean).shift()).filter(Boolean).map(fullfilename => readFilePromise(fullfilename).then(fileContent => this.pack.entry({
+      name: (0, _path.basename)(fullfilename)
+    }, fileContent)));
+    Promise.all(additionalFiles).catch(e => feed.stop(e)).finally(() => this.pack.finalize());
     return;
   }
   const json = this.getParam('json', true);

package/lib/txt-parse.js

@@ -8,12 +8,16 @@ var _string_decoder = require("string_decoder");
 function TXTParse(data, feed) {
   if (!this.decoder) {
     this.decoder = new _string_decoder.StringDecoder('utf8');
+    this.remainder = '';
+    this.counter = 0;
   }
   if (this.isLast()) {
-    this.decoder.end();
+    this.remainder += this.decoder.end();
+    if (this.remainder && this.counter > 1) {
+      feed.write(this.remainder);
+    }
     return feed.end();
   }
-  this.remainder = this.remainder || '';
   let separator;
   try {
     const val = '"'.concat(this.getParam('separator', '\n')).concat('"');
@@ -34,6 +38,7 @@ function TXTParse(data, feed) {
   lines.forEach(line => {
     feed.write(line);
   });
+  this.counter += lines.length;
   feed.end();
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ezs/basics",
   "description": "Basics statements for EZS",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "author": "Nicolas Thouvenin <nthouvenin@gmail.com>",
   "bugs": "https://github.com/Inist-CNRS/ezs/issues",
   "dependencies": {
@@ -41,7 +41,7 @@
   "directories": {
     "test": "test"
   },
-  "gitHead": "722a99ed17ffc2ae86b91aeaf09b5126b164191b",
+  "gitHead": "2b6b66d47ce0e57ebadfe846c76e0990a992977d",
   "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
   "keywords": [
     "ezs"