@ezs/basics 2.6.1 → 2.7.1

package/README.md

@@ -20,6 +20,7 @@ npm install @ezs/basics
 -   [CSVParse](#csvparse)
 -   [CSVString](#csvstring)
 -   [FILELoad](#fileload)
+-   [FILEMerge](#filemerge)
 -   [FILESave](#filesave)
 -   [INIString](#inistring)
 -   [JSONParse](#jsonparse)
@@ -251,6 +252,37 @@ Output:
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
+### FILEMerge
+
+Take `Object` or `Buffer` and throw only one document
+
+```json
+[ fi1e1.csv, file2.csv ]
+```
+
+Script:
+
+```ini
+[use]
+plugin = basics
+
+[FILELoad]
+[FILEMerge]
+[replace]
+path = contentOfFile1AndFile2
+value = self()
+```
+
+Output:
+
+```json
+[
+(...)
+]
+```
+
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+
 ### FILESave
 
 Take data, convert it to buffer and append it to file
@@ -591,6 +623,7 @@ It returns to the output stream
 
 -   `path` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Regex to select the files to extract (optional, default `"**\/*.json"`)
 -   `json` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Parse as JSON the content of each file (optional, default `true`)
+-   `text` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** The content of each file is converted to a string (otherwise it remains a buffer) (optional, default `true`)
 -   `compress` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Enable gzip compression (optional, default `false`)
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<{id: [String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String), value: [String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)}>** 

package/lib/file-merge.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = FILEMerge;
+/**
+ * Take `Object` or `Buffer` and throw only one document
+ *
+ * ```json
+ * [ fi1e1.csv, file2.csv ]
+ * ```
+ *
+ * Script:
+ *
+ * ```ini
+ * [use]
+ * plugin = basics
+ *
+ * [FILELoad]
+ * [FILEMerge]
+ * [replace]
+ * path = contentOfFile1AndFile2
+ * value = self()
+ *
+ * ```
+ *
+ * Output:
+ *
+ * ```json
+ * [
+ * (...)
+ * ]
+ * ```
+ *
+ * @name FILEMerge
+ * @returns {Object}
+ */
+function FILEMerge(data, feed) {
+  if (this.isFirst()) {
+    this.chunks = [];
+    this.length = 0;
+    this.isBuffer = Buffer.isBuffer(data);
+  }
+  if (this.isLast()) {
+    feed.write(this.isBuffer ? Buffer.concat(this.chunks, this.length) : this.chunks.join(''));
+    feed.close();
+    return;
+  }
+  if (this.isBuffer) {
+    this.length += data.length;
+  } else {
+    this.length = this.chunks.length;
+  }
+  this.chunks.push(data);
+  feed.end();
+}

package/lib/index.js

@@ -37,6 +37,7 @@ var _tarDump = _interopRequireDefault(require("./tar-dump"));
 var _iniString = _interopRequireDefault(require("./ini-string"));
 var _fileSave = _interopRequireDefault(require("./file-save"));
 var _fileLoad = _interopRequireDefault(require("./file-load"));
+var _fileMerge = _interopRequireDefault(require("./file-merge"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const funcs = {
   BUFObject: _bufObject.default,
@@ -72,6 +73,7 @@ const funcs = {
   INIString: _iniString.default,
   FILESave: _fileSave.default,
   FILELoad: _fileLoad.default,
+  FILEMerge: _fileMerge.default,
   // aliases
   bufferify: _bufObject.default.BUFObject,
   concat: _txtConcat.default.TXTConcat,

package/lib/tar-extract.js

@@ -25,6 +25,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @name TARExtract
  * @param {String} [path="**\/*.json"] Regex to select the files to extract
  * @param {String} [json=true] Parse as JSON the content of each file
+ * @param {Boolean} [text=true] The content of each file is converted to a string (otherwise it remains a buffer)
  * @param {Boolean} [compress=false] Enable gzip compression
  * @returns {{id: String, value: String}[]}
  */
@@ -34,7 +35,8 @@ function TARExtract(data, feed) {
     const {
       ezs
     } = this;
-    const json = this.getParam('json', true);
+    const text = this.getParam('text', true);
+    const json = text ? this.getParam('json', true) : false;
     const compress = this.getParam('compress', false);
     this.input = ezs.createStream(ezs.objectMode());
     this.output = ezs.createStream(ezs.objectMode());
@@ -43,11 +45,21 @@ function TARExtract(data, feed) {
       extract.on('entry', async (header, stream, next) => {
         if (_micromatch.default.isMatch(header.name, filesPatern)) {
           try {
-            const contentRaw = await (0, _getStream.default)(stream);
             if (json) {
-              const contentJson = JSON.parse(contentRaw);
+              const contentText = await (0, _getStream.default)(stream);
+              const contentJson = JSON.parse(contentText);
               return (0, _streamWrite.default)(this.output, contentJson, () => next());
             }
+            if (text) {
+              const contentText = await (0, _getStream.default)(stream);
+              return (0, _streamWrite.default)(this.output, {
+                id: header.name,
+                value: contentText
+              }, () => next());
+            }
+            const contentRaw = await (0, _getStream.default)(stream, {
+              encoding: 'buffer'
+            });
             return (0, _streamWrite.default)(this.output, {
               id: header.name,
               value: contentRaw

package/lib/url-connect.js

@@ -88,7 +88,15 @@ async function URLConnect(data, feed) {
         }
         if (json) {
           const bodyOutRaw = await (0, _getStream.default)(response.body);
-          const bodyOutArray = JSON.parse(bodyOutRaw);
+          if (bodyOutRaw === '') {
+            throw new Error('URL returned an empty response');
+          }
+          let bodyOutArray;
+          try {
+            bodyOutArray = JSON.parse(bodyOutRaw);
+          } catch (e) {
+            throw new Error(`URL returned an invalid JSON response (${bodyOutRaw})`);
+          }
           return (0, _from.default)(bodyOutArray).pipe(output);
         }
         return response.body.pipe(output);

package/package.json

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