Pass through context data to before

Author: doesdev

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. Dates are d
 > 2022-04-21
 
 - Add `throttle` option
+- Pass `contextData` through to `before` function call
 
 ### [1.8.1](https://github.com/doesdev/get-scrud/compare/1.8.0...1.8.1)
 

index.js

@@ -97,6 +97,16 @@ var bodyToQuery = function bodyToQuery() {
   }).join('&');
 };
 
+var ensurePromise = function ensurePromise(fn) {
+  return new Promise(function (resolve, reject) {
+    try {
+      return resolve(fn());
+    } catch (ex) {
+      return reject(ex);
+    }
+  });
+};
+
 var actions = {
   search: function search(id, body) {
     return ['GET', "?".concat(bodyToQuery(body))];
@@ -173,7 +183,7 @@ var source = (function () {
     });
   };
 
-  var getScrud = function getScrud(api, action, id, body, jwt) {
+  var getScrud = function getScrud(api, action, id, body, jwt, contextData) {
     if (api && _typeof(api) === 'object') return setOpts(api);
     return new Promise(function (resolve, reject) {
       if (!Number.isInteger(id) && typeof id !== 'string') {
@@ -221,7 +231,11 @@ var source = (function () {
       if (jwt) options.headers.Authorization = "Bearer ".concat(jwt);
 
       if (opts.before) {
-        return opts.before(api, action, options).then(function () {
+        var before = function before() {
+          return opts.before(api, action, options, contextData);
+        };
+
+        return ensurePromise(before).then(function () {
           return sendRequest(options).then(resolve).catch(handleError);
         }).catch(handleError);
       }
@@ -230,9 +244,13 @@ var source = (function () {
     });
   };
 
-  actionList.forEach(function (a) {
-    getScrud[a] = function (api, id, body, jwt) {
-      return getScrud(api, a, id, body, jwt);
+  actionList.forEach(function (action) {
+    getScrud[action] = function (api) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      return getScrud.apply(void 0, [api, action].concat(args));
     };
   });
   if (opts.cache) cached = getScrud;

module.js

@@ -89,6 +89,16 @@ var bodyToQuery = function bodyToQuery() {
   }).join('&');
 };
 
+var ensurePromise = function ensurePromise(fn) {
+  return new Promise(function (resolve, reject) {
+    try {
+      return resolve(fn());
+    } catch (ex) {
+      return reject(ex);
+    }
+  });
+};
+
 var actions = {
   search: function search(id, body) {
     return ['GET', "?".concat(bodyToQuery(body))];
@@ -165,7 +175,7 @@ var source = (function () {
     });
   };
 
-  var getScrud = function getScrud(api, action, id, body, jwt) {
+  var getScrud = function getScrud(api, action, id, body, jwt, contextData) {
     if (api && _typeof(api) === 'object') return setOpts(api);
     return new Promise(function (resolve, reject) {
       if (!Number.isInteger(id) && typeof id !== 'string') {
@@ -213,7 +223,11 @@ var source = (function () {
       if (jwt) options.headers.Authorization = "Bearer ".concat(jwt);
 
       if (opts.before) {
-        return opts.before(api, action, options).then(function () {
+        var before = function before() {
+          return opts.before(api, action, options, contextData);
+        };
+
+        return ensurePromise(before).then(function () {
           return sendRequest(options).then(resolve).catch(handleError);
         }).catch(handleError);
       }
@@ -222,9 +236,13 @@ var source = (function () {
     });
   };
 
-  actionList.forEach(function (a) {
-    getScrud[a] = function (api, id, body, jwt) {
-      return getScrud(api, a, id, body, jwt);
+  actionList.forEach(function (action) {
+    getScrud[action] = function (api) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      return getScrud.apply(void 0, [api, action].concat(args));
     };
   });
   if (opts.cache) cached = getScrud;

source.js

@@ -21,6 +21,14 @@ const bodyToQuery = (body = {}) => {
   }).join('&')
 }
 
+const ensurePromise = (fn) => new Promise((resolve, reject) => {
+  try {
+    return resolve(fn())
+  } catch (ex) {
+    return reject(ex)
+  }
+})
+
 const actions = {
   search: (id, body) => ['GET', `?${bodyToQuery(body)}`],
   create: (id, body) => ['POST', null],
@@ -87,7 +95,7 @@ export default (opts = {}) => {
     })
   }
 
-  const getScrud = (api, action, id, body, jwt) => {
+  const getScrud = (api, action, id, body, jwt, contextData) => {
     if (api && typeof api === 'object') return setOpts(api)
 
     return new Promise((resolve, reject) => {
@@ -135,7 +143,9 @@ export default (opts = {}) => {
       if (jwt) options.headers.Authorization = `Bearer ${jwt}`
 
       if (opts.before) {
-        return opts.before(api, action, options).then(() => {
+        const before = () => opts.before(api, action, options, contextData)
+
+        return ensurePromise(before).then(() => {
           return sendRequest(options).then(resolve).catch(handleError)
         }).catch(handleError)
       }
@@ -144,8 +154,8 @@ export default (opts = {}) => {
     })
   }
 
-  actionList.forEach((a) => {
-    getScrud[a] = (api, id, body, jwt) => getScrud(api, a, id, body, jwt)
+  actionList.forEach((action) => {
+    getScrud[action] = (api, ...args) => getScrud(api, action, ...args)
   })
 
   if (opts.cache) cached = getScrud

test.js

@@ -210,6 +210,15 @@ test('before hook is called', async (assert) => {
 
   const optsB = { host: 'localhost', port, jwt, before: noError }
   await assert.notThrowsAsync(() => getScrud(optsB)('a', 'create', 1, { a: 1 }))
+
+  let contextData
+
+  const setContext = (_0, _1, _3, ctx) => { contextData = ctx }
+  const optsC = { host: 'localhost', port, jwt, before: setContext }
+
+  assert.falsy(contextData)
+  await getScrud(optsC)('a', 'create', 1, { a: 1 }, undefined, true)
+  assert.truthy(contextData)
 })
 
 test('throttle options apply as expected', async (assert) => {