@weapnl/js-junction 0.0.3 → 0.0.4

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v0.0.4
+- Added support for whereNotIn.
+- Reactive bugfix, private property.
+
 ## v0.0.3
 - Added ability to override the api instance on requests.
 - Scopes & Wheres improvements.

package/README.md

@@ -192,6 +192,7 @@ const request = await new User()
     .search('john doe') // Search for 'john doe', on the searchable columns of the model (defined in the API)
     .search('john doe', ['name', 'email']) // Search for 'john doe' in columns 'name' and 'email'
     .whereIn('city', ['Gemert', 'Eindhoven', 'Amsterdam']) // Set where in clause
+    .whereNotIn('city', ['Rotterdam', 'London']) // Set where not in clause
     .where('name', '=', 'John') // Add where clause
     .where('name', 'John') // If no operator is given, '=' is used
     .appends('age') // Add accessor

package/index.d.ts

@@ -57,6 +57,8 @@ declare class Mixins {
     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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapnl/js-junction",
-  "version": "0.0.3",
+  "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/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/mixins/filterMixin.js

@@ -112,6 +112,22 @@ const filterMixin = {
         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) {
         if (! Array.isArray(fields)) fields = [fields];