@weapnl/js-junction 0.0.2 → 0.0.3

package/index.d.ts

@@ -53,7 +53,7 @@ declare class Mixins {
     scope(name: string, ...params: any[]): this;
     scopes(...params: any[]): this;
     search(value: any, columns?: any[]): this;
-    where(column: string, operator: string, value: any): this;
+    where(column: string, operator: string, value?: any): this;
     wheres(...params: any[]): this;
     whereIn(column: string, values: any[]): this;
     whereIns(...params: any[]): this;
@@ -84,7 +84,8 @@ declare class Request extends Mixins {
     onUnauthorized(callback?: (response: Response) => void): this;
     onForbidden(callback?: (response: Response) => void): this;
     triggerResponseEvents(response: Response, successResponse?: any): Promise<void>;
-    customParameters(parameters?: any[]): this;
+    customParameters(parameters?: object): this;
+    setApi(api: Api): this;
 }
 
 export class Model extends Request {

package/package.json

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

package/src/connection.js

@@ -6,6 +6,7 @@ export default class Connection {
         this._abortController = null;
 
         this._config = {};
+        this._api = null;
 
         this.running = false;
         this.canceled = false;
@@ -24,6 +25,10 @@ export default class Connection {
         this._config = config;
     }
 
+    setApi (api) {
+        this._api = api;
+    }
+
     async get (query, params) {
         return this._execute(query, 'get', params);
     }
@@ -48,7 +53,7 @@ export default class Connection {
         }
 
         const config = {
-            url: api.baseUrl + url,
+            url: (this._api ? this._api.baseUrl : api.baseUrl) + url,
             method,
             ...({
                 [method === 'get' ? 'params' : 'data']: data,

package/src/index.js

@@ -7,6 +7,6 @@ window._ = _;
 const api = new Api();
 window.api = api;
 
-export { Model };
+export { Model, Api };
 
 export default api;

package/src/mixins/filterMixin.js

@@ -56,6 +56,18 @@ const filterMixin = {
         return this;
     },
 
+    scopes (input) {
+        input.forEach(scope => {
+            if (Array.isArray(scope)) {
+                this.scope(...scope);
+            } else {
+                this.scope(scope);
+            }
+        });
+
+        return this;
+    },
+
     search (value, columns = []) {
         if (! Array.isArray(columns)) columns = [columns];
 
@@ -76,8 +88,12 @@ const filterMixin = {
         return this;
     },
 
-    wheres (...params) {
-        return this.where(...params);
+    wheres (input) {
+        input.forEach(where => {
+            this.where(...where);
+        });
+
+        return this;
     },
 
     whereIn (column, values) {
@@ -88,8 +104,12 @@ const filterMixin = {
         return this;
     },
 
-    whereIns (...params) {
-        return this.whereIn(...params);
+    whereIns (input) {
+        input.forEach(whereIn => {
+            this.whereIn(...whereIn);
+        });
+
+        return this;
     },
 
     pluck (fields) {

package/src/request.js

@@ -8,6 +8,7 @@ import actionMixin from './mixins/actionMixin';
 import filterMixin from './mixins/filterMixin';
 import modifierMixin from './mixins/modifierMixin';
 import paginationMixin from './mixins/paginationMixin';
+import Api from './api';
 
 /**
  * @mixes actionMixin
@@ -163,7 +164,7 @@ export default class Request {
             this._modifiers.toObject(),
             this._pagination.toObject(),
             this._action.toObject(),
-            ...this._customParameters,
+            _.merge(...this._customParameters),
         ]));
     }
 
@@ -261,12 +262,12 @@ export default class Request {
     /**
      * Add custom parameters to the request.
      *
-     * @param {Array} parameters
+     * @param {Object} parameters
      *
      * @returns {this} The current instance.
      */
-    customParameters (parameters = []) {
-        this._customParameters.push(...parameters);
+    customParameters (parameters = {}) {
+        this._customParameters.push(parameters);
 
         return this;
     }
@@ -309,6 +310,17 @@ export default class Request {
 
         return formData;
     }
+
+    /**
+     * @param {Api} api
+     *
+     * @returns {this} The current instance.
+     */
+    setApi (api) {
+        this._connection.setApi(api);
+
+        return this;
+    }
 }
 
 Object.assign(Request.prototype, actionMixin);