@onehat/data 1.4.1 → 1.4.5

package/package.json

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

package/src/OneHatData.js

@@ -282,12 +282,15 @@ export class OneHatData extends EventEmitter {
 		if (this.isDestroyed) {
 			throw new Error('this.createRepositories is no longer valid. OneHatData has been destroyed.');
 		}
-		let promises = [];
-		_.each(schemas, (schema) => {
-			promises.push( this.createRepository({ schema, }, bound) );
-		});
-
-		await Promise.all(promises);
+		const schemasArray = _.map(schemas, (schema) => schema);
+		let i, schema, repository;
+		for (i = 0; i < schemasArray.length; i++) {
+			schema = schemasArray[i];
+			repository = await this.createRepository({ schema, }, bound);
+			if (!repository) {
+				throw new Error('Repository could not be created');
+			}
+		}
 		return this;
 	}
 

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) {