@ezs/basics 1.22.0 → 1.22.2

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.2](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.22.1...@ezs/basics@1.22.2) (2022-09-14)
+
+
+### Bug Fixes
+
+* 🐛 feed.flow return a Promise ([e73f140](https://github.com/Inist-CNRS/ezs/commit/e73f14042eb60b464c9e021345e479d24ba0ec81))
+
+
+
+
+
+## [1.22.1](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.22.0...@ezs/basics@1.22.1) (2022-09-07)
+
+
+### Bug Fixes
+
+* 🐛 stop loop (and refactoring) ([2c162aa](https://github.com/Inist-CNRS/ezs/commit/2c162aa64a4603f79c5bdddbca8b58272278f745))
+
+
+
+
+
 # [1.22.0](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.21.0...@ezs/basics@1.22.0) (2022-09-05)
 
 

package/lib/file-load.js

@@ -46,7 +46,7 @@ var _os = require("os");
  * @param {Boolean} [compress=false] Enable gzip compression
  * @returns {Object}
  */
-function FILELoad(data, feed) {
+async function FILELoad(data, feed) {
   if (this.isLast()) {
     feed.close();
     return;
@@ -64,10 +64,7 @@ function FILELoad(data, feed) {
     return;
   }
 
-  if (compress) {
-    feed.flow((0, _fs.createReadStream)(file).pipe((0, _zlib.createGunzip)()));
-    return;
-  }
-
-  feed.flow((0, _fs.createReadStream)(file));
+  const stream = compress ? (0, _fs.createReadStream)(file).pipe((0, _zlib.createGunzip)()) : (0, _fs.createReadStream)(file);
+  await feed.flow(stream);
+  return;
 }

package/lib/file-save.js

@@ -19,6 +19,8 @@ var _makeDir = _interopRequireDefault(require("make-dir"));
 
 var _streamWrite = _interopRequireDefault(require("stream-write"));
 
+var _debug = _interopRequireDefault(require("debug"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -56,8 +58,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {Boolean} [compress=false] Enable gzip compression
  * @returns {Object}
  */
-async function FILESave(data, feed) {
-  if (!this.handle) {
+function FILESave(data, feed) {
+  const buf = Buffer.from(String(data));
+
+  if (this.isFirst()) {
     const identifier = String(this.getParam('identifier'));
     const location = this.getParam('location', (0, _os.tmpdir)());
     const compress = this.getParam('compress', false);
@@ -66,29 +70,37 @@ async function FILESave(data, feed) {
       _makeDir.default.sync(location);
     }
 
-    if (compress) {
-      this.filename = _path.default.resolve(location, `${identifier}.gz`);
-      this.handle = (0, _zlib.createGzip)();
-      this.handleEnd = this.handle.pipe((0, _fs.createWriteStream)(this.filename));
-    } else {
-      this.filename = _path.default.resolve(location, identifier);
-      this.handle = (0, _fs.createWriteStream)(this.filename);
-      this.handleEnd = this.handle;
-    }
-  }
+    const name = compress ? `${identifier}.gz` : identifier;
 
-  if (this.isLast()) {
-    this.handleEnd.on('close', () => {
-      (0, _fs.lstat)(this.filename, (err, stat) => {
-        feed.write({
-          filename: this.filename,
-          ...stat
+    const filename = _path.default.resolve(location, name);
+
+    this.input = compress ? (0, _zlib.createGzip)() : (0, _fs.createWriteStream)(filename);
+    this.whenFinish = new Promise((resolve, reject) => {
+      const output = compress ? this.input.pipe((0, _fs.createWriteStream)(filename)) : this.input;
+      output.once('error', err => {
+        (0, _debug.default)('ezs')(`WARNING: ${filename} not saved. ${err}`);
+        reject(err);
+      });
+      output.once('close', () => {
+        (0, _debug.default)('ezs')(`${filename} saved.`);
+        (0, _fs.lstat)(filename, (err, stat) => {
+          if (err) {
+            return reject(err);
+          }
+
+          return resolve({
+            filename,
+            ...stat
+          });
         });
-        return feed.close();
       });
     });
-    return this.handle.end();
   }
 
-  (0, _streamWrite.default)(this.handle, Buffer.from(String(data)), () => feed.end());
+  if (this.isLast()) {
+    this.input.end();
+    return this.whenFinish.then(stats => feed.write(stats)).catch(err => feed.stop(err)).finally(() => feed.close());
+  }
+
+  (0, _streamWrite.default)(this.input, buf, () => feed.end());
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ezs/basics",
   "description": "Basics statements for EZS",
-  "version": "1.22.0",
+  "version": "1.22.2",
   "author": "Nicolas Thouvenin <nthouvenin@gmail.com>",
   "bugs": "https://github.com/Inist-CNRS/ezs/issues",
   "dependencies": {
@@ -36,7 +36,7 @@
   "directories": {
     "test": "test"
   },
-  "gitHead": "ae3bd633484915926ad8dac4040e191635939a7d",
+  "gitHead": "51729dbb9364dc2a882af2a3cbccbb2e79de89d2",
   "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
   "keywords": [
     "ezs"