@weapnl/js-junction 0.0.2 → 0.0.4

package/index.d.ts

@@ -53,10 +53,12 @@ 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;
+    whereNotIn(column: string, values: any[]): this;
+    whereNotIns(...params: any[]): this;
     pluck(fields: any[]): this;
 
     appends(appends: string | string[]): this;
@@ -84,7 +86,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.4",
   "description": "This project allows you to easily consume API's built with Junction.",
   "main": "./src/index.js",
   "scripts": {

package/src/builder/properties/accessors.js

@@ -4,11 +4,13 @@ import Caster from '../caster';
  * @implements {Property}
  */
 export default class Accessors {
+    #model;
+
     /**
      * @param {Model} model Instance of the model.
      */
     constructor (model) {
-        this.model = model;
+        this.#model = model;
 
         _.each(model.constructor.accessors(), (options, key) => {
             this.set(key, _.has(options, 'default') ? options.default : null);
@@ -19,7 +21,7 @@ export default class Accessors {
      * @param {Object} json.
      */
     fromJson (json) {
-        _.each(this.model.constructor.accessors(), (options, key) => {
+        _.each(this.#model.constructor.accessors(), (options, key) => {
             let value = _.get(json, options.jsonKey ?? _.snakeCase(key), _.get(json, _.camelCase(key)));
 
             if (_.isNil(value)) {
@@ -38,7 +40,7 @@ export default class Accessors {
     toJson () {
         const json = {};
 
-        _.each(this.model.constructor.accessors(), (options, key) => {
+        _.each(this.#model.constructor.accessors(), (options, key) => {
             let jsonValue = this.get(key);
 
             jsonValue = Accessors._getCastedToJsonValue(jsonValue, options);
@@ -55,7 +57,7 @@ export default class Accessors {
      * @returns {*} The value of the attribute.
      */
     get (attribute) {
-        return _.get(this.model, attribute);
+        return _.get(this.#model, attribute);
     }
 
     /**
@@ -65,7 +67,7 @@ export default class Accessors {
      * @returns {*} The value that was set.
      */
     set (attribute, value) {
-        this.model[attribute] = value;
+        this.#model[attribute] = value;
 
         return value;
     }

package/src/builder/properties/attributes.js

@@ -4,11 +4,13 @@ import Caster from '../caster';
  * @implements {Property}
  */
 export default class Attributes {
+    #model;
+
     /**
      * @param {Model} model Instance of the model.
      */
     constructor (model) {
-        this.model = model;
+        this.#model = model;
 
         _.each(model.constructor.attributes(), (options, key) => {
             this.set(key, _.has(options, 'default') ? options.default : null);
@@ -19,7 +21,7 @@ export default class Attributes {
      * @param {Object} json.
      */
     fromJson (json) {
-        _.each(this.model.constructor.attributes(), (options, key) => {
+        _.each(this.#model.constructor.attributes(), (options, key) => {
             let value = _.get(json, options.jsonKey ?? _.snakeCase(key), _.get(json, _.camelCase(key)));
 
             if (_.isNil(value)) {
@@ -38,7 +40,7 @@ export default class Attributes {
     toJson () {
         const json = {};
 
-        _.each(this.model.constructor.attributes(), (options, key) => {
+        _.each(this.#model.constructor.attributes(), (options, key) => {
             let jsonValue = this.get(key);
 
             jsonValue = Attributes._getCastedToJsonValue(jsonValue, options);
@@ -55,7 +57,7 @@ export default class Attributes {
      * @returns {*} The value of the attribute.
      */
     get (attribute) {
-        return _.get(this.model, attribute);
+        return _.get(this.#model, attribute);
     }
 
     /**
@@ -66,7 +68,7 @@ export default class Attributes {
      */
     set (attribute, value = null) {
         if (_.isObject(attribute)) {
-            _.each(this.model.constructor.attributes(), (options, key) => {
+            _.each(this.#model.constructor.attributes(), (options, key) => {
                 if (! _.has(attribute, key)) return;
 
                 this.set(key, attribute[key]);
@@ -75,7 +77,7 @@ export default class Attributes {
             return this;
         }
 
-        this.model[attribute] = value;
+        this.#model[attribute] = value;
 
         return this;
     }

package/src/builder/properties/counts.js

@@ -2,11 +2,13 @@
  * @implements {Property}
  */
 export default class Counts {
+    #model;
+
     /**
      * @param {Model} model Instance of the model.
      */
     constructor (model) {
-        this.model = model;
+        this.#model = model;
 
         _.each(model.constructor.counts(), (options, key) => {
             this.set(this.key(key, true), _.has(options, 'default') ? options.default : null);
@@ -17,7 +19,7 @@ export default class Counts {
      * @param {Object} json.
      */
     fromJson (json) {
-        _.each(this.model.constructor.counts(), (options, key) => {
+        _.each(this.#model.constructor.counts(), (options, key) => {
             let value = _.get(json, this.key(key));
 
             value = value !== undefined
@@ -34,7 +36,7 @@ export default class Counts {
     toJson () {
         const json = {};
 
-        _.each(this.model.constructor.counts(), (options, key) => {
+        _.each(this.#model.constructor.counts(), (options, key) => {
             _.set(json, key, this.get(key));
         });
 
@@ -47,7 +49,7 @@ export default class Counts {
      * @returns {*} The value of the attribute.
      */
     get (attribute) {
-        return _.get(this.model, this.key(attribute, true));
+        return _.get(this.#model, this.key(attribute, true));
     }
 
     /**
@@ -57,7 +59,7 @@ export default class Counts {
      * @returns {*} The value that was set.
      */
     set (attribute, value) {
-        this.model[this.key(attribute, true)] = value;
+        this.#model[this.key(attribute, true)] = value;
 
         return value;
     }

package/src/builder/properties/relations.js

@@ -4,11 +4,13 @@ import Caster from '../caster';
  * @implements {Property}
  */
 export default class Relations {
+    #model;
+
     /**
      * @param {Model} model Instance of the model.
      */
     constructor (model) {
-        this.model = model;
+        this.#model = model;
 
         _.each(model.constructor.relations(), (options, key) => {
             this.set(key, _.has(options, 'default') ? options.default : null);
@@ -19,7 +21,7 @@ export default class Relations {
      * @param {Object} json.
      */
     fromJson (json) {
-        _.each(this.model.constructor.relations(), (options, key) => {
+        _.each(this.#model.constructor.relations(), (options, key) => {
             let value = _.get(json, options.jsonKey ?? _.snakeCase(key), _.get(json, _.camelCase(key)));
 
             value = value
@@ -36,7 +38,7 @@ export default class Relations {
     toJson () {
         const json = {};
 
-        _.each(this.model.constructor.relations(), (options, key) => {
+        _.each(this.#model.constructor.relations(), (options, key) => {
             let jsonValue = this.get(key);
 
             jsonValue = Relations._getCastedToJsonValue(jsonValue, options);
@@ -53,7 +55,7 @@ export default class Relations {
      * @returns {*} The value of the relation.
      */
     get (relation) {
-        return _.get(this.model, relation);
+        return _.get(this.#model, relation);
     }
 
     /**
@@ -64,7 +66,7 @@ export default class Relations {
      */
     set (relation, value = null) {
         if (_.isObject(relation)) {
-            _.each(this.model.constructor.relations(), (options, key) => {
+            _.each(this.#model.constructor.relations(), (options, key) => {
                 if (! _.has(relation, key)) return;
 
                 this.set(key, relation[key]);
@@ -73,7 +75,7 @@ export default class Relations {
             return this;
         }
 
-        this.model[relation] = value;
+        this.#model[relation] = value;
 
         return this;
     }

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/filters/filters.js

@@ -5,6 +5,7 @@ import Scopes from './scopes';
 import Search from './search';
 import Wheres from './wheres';
 import WhereIn from './whereIn';
+import WhereNotIn from './whereNotIn';
 import Count from './count';
 import Pluck from './pluck';
 
@@ -18,13 +19,14 @@ export default class Filters {
         this.search = new Search();
         this.wheres = new Wheres();
         this.whereIn = new WhereIn();
+        this.whereNotIn = new WhereNotIn();
         this.pluck = new Pluck();
     }
 
     toObject () {
         const items = [];
 
-        for (let i = 0, filters = ['count', 'limit', 'order', 'relations', 'scopes', 'search', 'wheres', 'whereIn', 'pluck']; i < filters.length; i++) {
+        for (let i = 0, filters = ['count', 'limit', 'order', 'relations', 'scopes', 'search', 'wheres', 'whereIn', 'whereNotIn', 'pluck']; i < filters.length; i++) {
             if (this[filters[i]].filled()) items.push(this[filters[i]].toObject());
         }
 

package/src/filters/whereIn.js

@@ -1,7 +1,7 @@
 import Filter from './filter';
 import Format from '../utilities/format';
 
-export default class Relations extends Filter {
+export default class WhereIn extends Filter {
     constructor () {
         super();
 

package/src/filters/whereNotIn.js

@@ -0,0 +1,31 @@
+import Filter from './filter';
+import Format from '../utilities/format';
+
+export default class WhereNotIn extends Filter {
+    constructor () {
+        super();
+
+        this._whereNotIns = [];
+    }
+
+    filled () {
+        return this._whereNotIns.length > 0;
+    }
+
+    add (column, values) {
+        this._whereNotIns.push({
+            column: Format.snakeCase(column),
+            values,
+        });
+    }
+
+    toObject () {
+        const data = {};
+
+        if (this.filled()) {
+            data.where_not_in = this._whereNotIns;
+        }
+
+        return 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,28 @@ const filterMixin = {
         return this;
     },
 
-    whereIns (...params) {
-        return this.whereIn(...params);
+    whereIns (input) {
+        input.forEach(whereIn => {
+            this.whereIn(...whereIn);
+        });
+
+        return this;
+    },
+
+    whereNotIn (column, values) {
+        if (! Array.isArray(values)) values = [values];
+
+        this._filters.whereNotIn.add(column, values);
+
+        return this;
+    },
+
+    whereNotIns (input) {
+        input.forEach(whereIn => {
+            this.whereNotIn(...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);