@onehat/data 1.19.28 → 1.19.30

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.19.28",
+	"version": "1.19.30",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
@@ -37,7 +37,6 @@
 	"homepage": "https://github.com/OneHatRepo/data#readme",
 	"dependencies": {
 		"@onehat/events": "^1.6.6",
-		"async-wait-until": "^2.0.12",
 		"accounting-js": "^1.1.1",
 		"axios": "^1.4.0",
 		"chrono-node": "^2.6.3",

package/src/Repository/Repository.js

@@ -7,7 +7,6 @@ import {
 	v4 as uuid,
 } from 'uuid';
 import moment from 'moment';
-import { waitUntil } from 'async-wait-until';
 import _ from 'lodash';
 
 /**
@@ -388,8 +387,28 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.waitUntilDoneLoading is no longer valid. Repository has been destroyed.');
 			return;
 		}
+
+		function delayUntil(fn, maxAttempts = 100, interval = 100) {
+			return new Promise((resolve, reject) => {
+				let currentAttempt = 0;
+				const checkCondition = async () => {
+					currentAttempt++;
+		
+					if (fn()) {
+						resolve();
+					} else if (currentAttempt < maxAttempts) {
+						setTimeout(checkCondition, interval);
+					} else {
+						reject(new Error('maxAttempts reached. Condition not met.'));
+					}
+				};
+		
+				checkCondition();
+			});
+		}
+		
 		
-		await waitUntil(() => !this.isLoading, { timeout });
+		await delayUntil(() => !this.isLoading);
 	}
 
 	/**
@@ -2194,6 +2213,7 @@ export default class Repository extends EventEmitter {
 		if (this.errorHandler) {
 			this.errorHandler(obj);
 		} else {
+			this.emit('error', obj);
 			throw Error(obj);
 		}
 	}