@ezs/basics 1.20.0 → 1.21.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.21.0](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.20.0...@ezs/basics@1.21.0) (2022-07-11)
+
+
+### Features
+
+* 🎸 add target option to URLRequest ([3861c5e](https://github.com/Inist-CNRS/ezs/commit/3861c5e10b4dcfd060b49fa9b23f2bcf98d8c942))
+
+
+
+
+
 # [1.20.0](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.19.0...@ezs/basics@1.20.0) (2022-06-24)
 
 

package/README.md

@@ -723,7 +723,7 @@ Output:
 ```json
 [
      {
-         "result": "a" 
+         "result": "a"
      }
  ]
 ```
@@ -732,9 +732,11 @@ Output:
 
 -   `url` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** URL to fetch
 -   `json` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** parse result as json (optional, default `true`)
+-   `target` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** choose the key to set
 -   `timeout` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** Timeout in milliseconds (optional, default `1000`)
 -   `noerror` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Ignore all errors, the target field will remain undefined (optional, default `false`)
 -   `retries` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** The maximum amount of times to retry the connection (optional, default `5`)
+-   `insert` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** a header response value in the result
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 

package/lib/url-fetch.js

@@ -44,7 +44,7 @@ async function URLFetch(data, feed) {
 
   const url = this.getParam('url');
   const path = this.getParam('path');
-  const target = this.getParam('target');
+  const target = [].concat(this.getParam('target')).filter(Boolean).shift();
   const json = Boolean(this.getParam('json', false));
   const retries = Number(this.getParam('retries', 5));
   const noerror = Boolean(this.getParam('noerror', false));
@@ -74,8 +74,10 @@ async function URLFetch(data, feed) {
     const func = json ? 'json' : 'text';
     const value = await response[func]();
 
-    if (target && typeof target === 'string' && typeof data === 'object') {
-      const result = { ...data
+    if (target) {
+      const result = typeof data === 'object' ? { ...data
+      } : {
+        input: data
       };
       (0, _lodash2.default)(result, target, value);
       return feed.send(result);

package/lib/url-request.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = URLRequest;
 
+var _lodash = _interopRequireDefault(require("lodash.set"));
+
 var _debug = _interopRequireDefault(require("debug"));
 
 var _url = require("url");
@@ -41,7 +43,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * ```json
  * [
  *      {
- *          "result": "a" 
+ *          "result": "a"
  *      }
  *  ]
  * ```
@@ -49,9 +51,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @name URLRequest
  * @param {String} [url] URL to fetch
  * @param {Boolean} [json=true] parse result as json
+ * @param {String} [target] choose the key to set
  * @param {Number} [timeout=1000] Timeout in milliseconds
  * @param {Boolean} [noerror=false] Ignore all errors, the target field will remain undefined
  * @param {Number} [retries=5] The maximum amount of times to retry the connection
+ * @param {String} [insert] a header response value in the result
  * @returns {Object}
  */
 async function URLRequest(data, feed) {
@@ -61,10 +65,12 @@ async function URLRequest(data, feed) {
 
   const url = this.getParam('url');
   const json = Boolean(this.getParam('json', true));
+  const target = [].concat(this.getParam('target')).filter(Boolean).shift();
   const retries = Number(this.getParam('retries', 5));
   const noerror = Boolean(this.getParam('noerror', false));
   const timeout = Number(this.getParam('timeout')) || 1000;
   const headers = (0, _parseHeaders.default)([].concat(this.getParam('header')).filter(Boolean).join('\n'));
+  const inserts = [].concat(this.getParam('insert')).filter(Boolean);
   const cURL = new _url.URL(url || data);
   const controller = new _nodeAbortController.default();
   const parameters = {
@@ -75,7 +81,10 @@ async function URLRequest(data, feed) {
   const options = {
     retries
   };
-  cURL.search = new _url.URLSearchParams(data);
+
+  if (url) {
+    cURL.search = new _url.URLSearchParams(data);
+  }
 
   const onError = e => {
     controller.abort();
@@ -93,7 +102,19 @@ async function URLRequest(data, feed) {
     const response = await (0, _asyncRetry.default)((0, _request.default)(cURL.href, parameters), options);
     const func = json ? 'json' : 'text';
     const value = await response[func]();
-    feed.send(value);
+
+    if (target) {
+      const result = typeof data === 'object' ? { ...data
+      } : {
+        url: data
+      };
+      (0, _lodash.default)(result, target, value);
+      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) {
     onError(e);
   }

package/package.json

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