@ezs/basics 2.5.0 → 2.5.2

package/lib/url-request.js

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = URLRequest;
-
 var _lodash = _interopRequireDefault(require("lodash.set"));
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _url = require("url");
-
 var _nodeAbortController = _interopRequireDefault(require("node-abort-controller"));
-
 var _parseHeaders = _interopRequireDefault(require("parse-headers"));
-
 var _asyncRetry = _interopRequireDefault(require("async-retry"));
-
 var _request = _interopRequireDefault(require("./request"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Take `Object` as parameters of URL, throw each chunk from the result
  *
@@ -62,7 +53,6 @@ async function URLRequest(data, feed) {
   if (this.isLast()) {
     return feed.close();
   }
-
   const url = this.getParam('url');
   const json = Boolean(this.getParam('json', true));
   const target = [].concat(this.getParam('target')).filter(Boolean).shift();
@@ -81,30 +71,25 @@ async function URLRequest(data, feed) {
   const options = {
     retries
   };
-
   if (url) {
     cURL.search = new _url.URLSearchParams(data);
   }
-
   const onError = e => {
     controller.abort();
-
     if (noerror) {
       (0, _debug.default)('ezs')(`Ignore item #${this.getIndex()} [URLRequest] <${e}>`);
       return feed.send(data);
     }
-
     (0, _debug.default)('ezs')(`Break item #${this.getIndex()} [URLRequest] <${e}>`);
     return feed.send(e);
   };
-
   try {
     const response = await (0, _asyncRetry.default)((0, _request.default)(cURL.href, parameters), options);
     const func = json ? 'json' : 'text';
     const value = await response[func]();
-
     if (target) {
-      const result = typeof data === 'object' ? { ...data
+      const result = typeof data === 'object' ? {
+        ...data
       } : {
         url: data
       };
@@ -112,7 +97,6 @@ async function URLRequest(data, feed) {
       inserts.forEach(i => (0, _lodash.default)(result, i, response.headers.get(i)));
       return feed.send(result);
     }
-
     inserts.forEach(i => (0, _lodash.default)(value, i, response.headers.get(i)));
     return feed.send(value);
   } catch (e) {

package/lib/url-stream.js

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = URLStream;
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _url = require("url");
-
 var _nodeAbortController = _interopRequireDefault(require("node-abort-controller"));
-
 var _JSONStream = _interopRequireDefault(require("JSONStream"));
-
 var _parseHeaders = _interopRequireDefault(require("parse-headers"));
-
 var _asyncRetry = _interopRequireDefault(require("async-retry"));
-
 var _request = _interopRequireDefault(require("./request"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Take `String` as URL, throw each chunk from the result or
  * Take `Object` as parameters of URL, throw each chunk from the result
@@ -91,7 +82,6 @@ async function URLStream(data, feed) {
   if (this.isLast()) {
     return feed.close();
   }
-
   const url = this.getParam('url');
   const path = this.getParam('path', '*');
   const retries = Number(this.getParam('retries', 5));
@@ -108,23 +98,18 @@ async function URLStream(data, feed) {
   const options = {
     retries
   };
-
   if (url) {
     cURL.search = new _url.URLSearchParams(data);
   }
-
   const onError = e => {
     controller.abort();
-
     if (noerror) {
       (0, _debug.default)('ezs')(`Ignore item #${this.getIndex()} [URLStream] <${e}>`);
       return feed.send(data);
     }
-
     (0, _debug.default)('ezs')(`Break item #${this.getIndex()} [URLStream] <${e}>`);
     return feed.send(e);
   };
-
   try {
     const response = await (0, _asyncRetry.default)((0, _request.default)(cURL.href, parameters), options);
     const output = path ? response.body.pipe(_JSONStream.default.parse(path)) : response.body;

package/lib/url-string.js

@@ -4,16 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _url = require("url");
-
 function URLString(data, feed) {
   if (this.isLast()) {
     return feed.close();
   }
-
   return feed.send((0, _url.format)(data));
 }
+
 /**
  * Take an `Object` representing an URL and stringify it.
  *
@@ -22,8 +20,6 @@ function URLString(data, feed) {
  * @name URLString
  * @returns {String}
  */
-
-
 var _default = {
   URLString
 };

package/lib/xml-convert.js

@@ -4,22 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _xmlMapping = _interopRequireDefault(require("xml-mapping"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function XMLConvert(data, feed) {
   if (this.isLast()) {
     return feed.close();
   }
-
   const func = this.getParam('invert', false) ? 'dump' : 'load';
   const opts = {
     header: this.getParam('prologue', false)
   };
   feed.send(_xmlMapping.default[func](data, opts));
 }
+
 /**
  * Convert each chunk as XML String to JSON Object
  *
@@ -90,8 +87,6 @@ function XMLConvert(data, feed) {
  * @param {String} [prologue=false] add XML prologue
  * @returns {Object}
  */
-
-
 var _default = {
   XMLConvert
 };

package/lib/xml-parse.js

@@ -4,20 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _xmlSplitter = _interopRequireDefault(require("xml-splitter"));
-
 var _streamWrite = _interopRequireDefault(require("stream-write"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function XMLParse(data, feed) {
   if (!this.handle) {
     const separator = this.getParam('separator', '/');
     this.handle = new _xmlSplitter.default(separator);
     this.handle.on('data', obj => feed.write(obj));
   }
-
   if (!this.isLast()) {
     (0, _streamWrite.default)(this.handle.stream, data, () => feed.end());
   } else {
@@ -33,6 +28,7 @@ function XMLParse(data, feed) {
      */
   }
 }
+
 /**
  * Take `String` as XML input, parse it and split it in multi document at each path found
  *
@@ -60,8 +56,6 @@ function XMLParse(data, feed) {
  * @param {String} [separator="/"] choose a character for flatten keys
  * @returns {Object}
  */
-
-
 var _default = {
   XMLParse
 };

package/lib/xml-string.js

@@ -4,35 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _xmlMapping = _interopRequireDefault(require("xml-mapping"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function XMLString(data, feed) {
   const rootElement = this.getParam('rootElement', 'items');
   const contentElement = this.getParam('contentElement', 'item');
-
   if (this.isLast()) {
     const endTag = rootElement.length > 0 ? `</${rootElement}>` : '';
     if (endTag) feed.write(endTag);
     return feed.close();
   }
-
   if (this.isFirst()) {
     const prologue = this.getParam('prologue', false) ? '<?xml version="1.0" encoding="UTF-8"?>\n' : '';
     const rootNamespace = [].concat(this.getParam('rootNamespace')).filter(Boolean).map(ns => ns.replace('://', '§§§')).map(ns => ns.split(':')).map(ns => ns[1] ? [`:${ns[0]}`, ns[1]] : ['', ns[0]]).map(ns => [ns[0], ns[1].replace('§§§', '://').trim()]).reduce((prev, cur) => `${prev} xmlns${cur[0]}="${encodeURI(cur[1])}"`, '');
     const beginTag = rootElement.length > 0 ? `${prologue}<${rootElement}${rootNamespace}>` : '';
-
     if (beginTag) {
       feed.write(beginTag);
     }
   }
-
   feed.send(_xmlMapping.default.dump({
     [contentElement]: data
   }));
 }
+
 /**
  * Transform an `Object` into an XML string.
  *
@@ -58,8 +52,6 @@ function XMLString(data, feed) {
  * @param {Boolean} [prologue=false] Add XML prologue `<?xml`
  * @returns {String}
  */
-
-
 var _default = {
   XMLString
 };

package/lib/zip-extract.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ZIPExtract;
-
 var _unzipper = _interopRequireDefault(require("unzipper"));
-
 var _micromatch = _interopRequireDefault(require("micromatch"));
-
 var _streamWrite = _interopRequireDefault(require("stream-write"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Take the content of a zip file, extract some files.
  * The JSON object is sent to the output stream for each file.
@@ -31,7 +26,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 function ZIPExtract(data, feed) {
   const filesPatern = this.getParam('path', '**/*.json');
-
   if (this.isFirst()) {
     const {
       ezs
@@ -46,12 +40,10 @@ function ZIPExtract(data, feed) {
           value: content
         }, () => entry.autodrain());
       }
-
       return entry.autodrain();
     }).promise();
     this.whenFinish = feed.flow(this.output);
   }
-
   if (this.isLast()) {
     this.whenEnd.finally(() => this.output.end());
     this.whenFinish.finally(() => feed.close());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ezs/basics",
   "description": "Basics statements for EZS",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "author": "Nicolas Thouvenin <nthouvenin@gmail.com>",
   "bugs": "https://github.com/Inist-CNRS/ezs/issues",
   "dependencies": {
@@ -33,8 +33,7 @@
     "tmp-filepath": "2.0.0",
     "unzipper": "0.10.11",
     "xml-mapping": "1.7.2",
-    "xml-splitter": "1.2.1",
-    "yajson-stream": "1.3.3"
+    "xml-splitter": "1.2.1"
   },
   "devDependencies": {
     "pako": "2.0.4"
@@ -42,7 +41,7 @@
   "directories": {
     "test": "test"
   },
-  "gitHead": "c2694cd502cc4daaf7b9faa74eca46f7893771d8",
+  "gitHead": "8fe234cec9142250dc5d73c37c3370c6ca3e0d70",
   "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
   "keywords": [
     "ezs"