@onehat/data 1.4.0 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.4.0",
+	"version": "1.4.4",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -4,8 +4,9 @@ import EventEmitter from '@onehat/events';
 import Repository from '../Repository';
 import Command from './Command';
 import moment from 'relative-time-parser'; // Notice this version of moment is imported from 'relative-time-parser', and may be out of sync with our general 'moment' package
-// import { uuid } from 'uuidv4';
-import uuid from 'uuid-random'; // TEMP, until Expo supports cypto.getRandomValues() - https://github.com/uuidjs/uuid/issues/375
+import {
+	v4 as uuid,
+} from 'uuid';
 import _ from 'lodash';
 
 export const MODE_LOCAL_MIRROR = 'MODE_LOCAL_MIRROR';

package/src/Repository/OneBuild.js

@@ -4,6 +4,21 @@ import AjaxRepository from './Ajax';
 import qs from 'qs';
 import _ from 'lodash';
 
+const nonConditionFilters = [
+	'q',
+	'hydrate',
+	'fields',
+	'distinct',
+	'leftJoinWith',
+	'join',
+	'where',
+	'matching',
+	'contain',
+	'order',
+	'limit',
+	'page',
+];
+
 /**
  * This class contains overrides of specific functions in
  * AjaxRepository that are unique to OneBuild.
@@ -129,12 +144,16 @@ class OneBuildRepository extends AjaxRepository {
 		// Clear existing "conditions" params
 		if (!_.isEmpty(this._params)) {
 			this._params = _.omitBy(this._params, (value, key) => {
-				return key.match(/^conditions/);
+				return key.match(/^conditions/) || _.includes(nonConditionFilters, key);
 			});
 		}
 
 		_.each(this.filters, (filter, ix) => {
-			this.setParam('conditions[' + filter.name + ']', filter.value);
+			if (_.includes(nonConditionFilters, filter.name)) {
+				this.setParam(filter.name, filter.value);
+			} else {
+				this.setParam('conditions[' + filter.name + ']', filter.value);
+			}
 		});
 
 		if (this.isLoaded) {

package/src/Repository/Repository.js

@@ -2,8 +2,9 @@
 
 import EventEmitter from '@onehat/events';
 import Entity from '../Entity';
-// import { uuid } from 'uuidv4';
-import uuid from 'uuid-random'; // TEMP, until Expo supports cypto.getRandomValues() - https://github.com/uuidjs/uuid/issues/375
+import {
+	v4 as uuid,
+} from 'uuid';
 import _ from 'lodash';
 
 /**