@weapnl/js-junction 0.0.7 → 0.0.9

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## v0.0.9
+- Added option to override the config of an request.
+- Added the body parameters to the post request.
+- Updated the requests variable from a object to an array.
+
+## v0.0.8
+- Model post requests.
+- Added onFinished callback.
+
 ## v0.0.7
 - Request cancel improvements.
 

package/README.md

@@ -292,20 +292,23 @@ let request = await api.request('users/files')
 ```javascript
 let request = await api.request('users')
     .onSuccess((data) => {
-        // Request successful
+        // Request successful.
     })
     .onUnauthorized((response) => {
-        // Missing or invalid token
+        // Missing or invalid token.
     })
     .onForbidden((response) => {
-        // Access not allowed
+        // Access not allowed.
     })
     .onValidationError((validation) => {
         // validation.message
         // validation.errors
     })
     .onError((response) => {
-        // Any other status code not caught by other callbacks
+        // Any other status code not caught by other callbacks.
+    })
+    .onFinished((response) => {
+        // After the request was finished (cancelled requests excluded).
     })
     .get();
 ```

package/index.d.ts

@@ -88,6 +88,7 @@ declare class Request extends Mixins {
     onForbidden(callback?: (response: Response) => void): this;
     triggerResponseEvents(response: Response, successResponse?: any): Promise<void>;
     customParameters(parameters?: object): this;
+    setConfig(config: object): this;
     setApi(api: Api): this;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapnl/js-junction",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "This project allows you to easily consume API's built with Junction.",
   "main": "./src/index.js",
   "scripts": {

package/src/api.js

@@ -6,7 +6,7 @@ export default class Api {
     constructor () {
         this.setHeader('X-Requested-With', 'XMLHttpRequest');
 
-        this._requests = {};
+        this._requests = [];
 
         this.host('/').suffix('');
 
@@ -15,6 +15,7 @@ export default class Api {
         this._onValidationError = () => {};
         this._onUnauthorized = () => {};
         this._onForbidden = () => {};
+        this._onFinished = () => {};
     }
 
     /**
@@ -84,7 +85,8 @@ export default class Api {
             .onError(this._onError)
             .onValidationError(this._onValidationError)
             .onUnauthorized(this._onUnauthorized)
-            .onForbidden(this._onForbidden);
+            .onForbidden(this._onForbidden)
+            .onFinished(this._onFinished);
 
         return request;
     }
@@ -212,6 +214,19 @@ export default class Api {
         return this;
     }
 
+    /**
+     * Set the default 'onFinished'. Can be overridden in the Request class.
+     *
+     * @param {function(Response)} callback
+     *
+     * @returns {this} The current instance.
+     */
+    onFinished (callback = () => {}) {
+        this._onFinished = callback;
+
+        return this;
+    }
+
     /**
      * @param {function(Response)} onSuccess
      * @param {function(Error)} onError

package/src/builder/model.js

@@ -118,8 +118,8 @@ export default class Model extends Request {
     async index () {
         this._connection.cancelRunning(this);
 
-        this._response = await this._connection.get(
-            this._queryString(),
+        this._response = await this._connection.post(
+            this._queryString() + '/index',
             this.bodyParameters,
         );
 
@@ -150,8 +150,8 @@ export default class Model extends Request {
 
         this._connection.cancelRunning(this);
 
-        this._response = await this._connection.get(
-            this._queryString(identifier),
+        this._response = await this._connection.post(
+            this._queryString(identifier) + '/show',
             this.bodyParameters,
         );
 

package/src/connection.js

@@ -25,6 +25,10 @@ export default class Connection {
         this._api.cancelRunning(request);
     }
 
+    getConfig () {
+        return this._config;
+    }
+
     setConfig (config) {
         this._config = config;
     }

package/src/request.js

@@ -30,6 +30,7 @@ export default class Request {
         this._onValidationError = () => {};
         this._onUnauthorized = () => {};
         this._onForbidden = () => {};
+        this._onFinished = () => {};
 
         this._connection = new Connection();
 
@@ -58,6 +59,17 @@ export default class Request {
         return this;
     }
 
+    /**
+     * @param {object} config
+     *
+     * @returns {this} The current instance.
+     */
+    setConfig (config) {
+        this._connection.setConfig(_.merge(this._connection.getConfig(), config));
+
+        return this;
+    }
+
     /**
      * @returns {this} The current instance.
      */
@@ -97,7 +109,7 @@ export default class Request {
 
         this._response = await this._connection.post(
             url,
-            data,
+            { ...data, ...this.bodyParameters },
         );
 
         await this.triggerResponseEvents(this._response);
@@ -153,7 +165,7 @@ export default class Request {
 
         this._connection.cancelRunning(this);
 
-        this._connection.setConfig({
+        this.setConfig({
             headers: {
                 'Content-Type': 'multipart/form-data',
             },
@@ -239,39 +251,56 @@ export default class Request {
         return this;
     }
 
+    /**
+     * @param {function(Response)} callback
+     *
+     * @returns {this} The current instance.
+     */
+    onFinished (callback = () => {}) {
+        this._onFinished = callback;
+
+        return this;
+    }
+
     /**
      * @param {Response} response
      * @param {*} successResponse
      */
     async triggerResponseEvents (response, successResponse = null) {
         if (response.statusCode >= 200 && response.statusCode < 300) {
-            if (! this._onSuccess) return;
+            if (this._onSuccess) {
+                await this._onSuccess(...[successResponse, response.data].filter((value) => !! value));
+            }
+        } else {
+            switch (response.statusCode) {
+                case 401:
+                    if (this._onUnauthorized) await this._onUnauthorized(response);
+                    break;
+                case 403:
+                    if (this._onForbidden) await this._onForbidden(response);
+                    break;
+                case 422:
+                    const validation = {
+                        message: response.validation.message,
+                        errors: {},
+                    };
+
+                    _.each(response.validation.errors, (value, key) => {
+                        return _.set(validation.errors, key, value);
+                    });
 
-            return await this._onSuccess(...[successResponse, response.data].filter((value) => !! value));
+                    if (this._onValidationError) await this._onValidationError(validation);
+                    break;
+                default:
+                    if (this._onError) await this._onError(response);
+                    break;
+            }
         }
 
-        switch (response.statusCode) {
-            case 401:
-                if (this._onUnauthorized) await this._onUnauthorized(response);
-                break;
-            case 403:
-                if (this._onForbidden) await this._onForbidden(response);
-                break;
-            case 422:
-                const validation = {
-                    message: response.validation.message,
-                    errors: {},
-                };
-
-                _.each(response.validation.errors, (value, key) => {
-                    return _.set(validation.errors, key, value);
-                });
-
-                if (this._onValidationError) await this._onValidationError(validation);
-                break;
-            default:
-                if (this._onError) await this._onError(response);
-                break;
+        if (response.statusCode !== 0) {
+            if (this._onFinished) {
+                await this._onFinished(response);
+            }
         }
     }