@onehat/data 1.8.18 → 1.8.20

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.8.18",
+	"version": "1.8.20",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
@@ -37,9 +37,9 @@
 	"dependencies": {
 		"@onehat/events": "^1.6.5",
 		"accounting-js": "^1.1.1",
-		"axios": "^0.27.2",
-		"chrono-node": "^2.3.9",
-		"fast-xml-parser": "^4.0.9",
+		"axios": "^1.1.3",
+		"chrono-node": "^2.4.1",
+		"fast-xml-parser": "^4.0.11",
 		"he": "^1.2.0",
 		"js-base64": "^3.7.2",
 		"lodash": "^4.17.21",
@@ -47,21 +47,21 @@
 		"numeral": "^2.0.6",
 		"qs": "^6.11.0",
 		"relative-time-parser": "^1.0.15",
-		"uuid": "^8.3.2"
+		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.16.7",
-		"@babel/node": "^7.16.8",
-		"@babel/plugin-proposal-class-properties": "^7.16.7",
-		"@babel/plugin-transform-runtime": "^7.16.8",
-		"@babel/preset-env": "^7.16.8",
-		"@babel/register": "^7.16.9",
-		"@babel/runtime": "^7.16.7",
+		"@babel/core": "^7.20.2",
+		"@babel/node": "^7.20.2",
+		"@babel/plugin-proposal-class-properties": "^7.18.6",
+		"@babel/plugin-transform-runtime": "^7.19.6",
+		"@babel/preset-env": "^7.20.2",
+		"@babel/register": "^7.18.9",
+		"@babel/runtime": "^7.20.0",
 		"@cypress/webpack-preprocessor": "^5.11.0",
-		"babel-loader": "^8.2.2",
+		"babel-loader": "^9.1.0",
 		"cypress": "5.2.0",
 		"ink-docstrap": "^1.3.2",
-		"jsdoc": "^3.6.6",
-		"webpack": "^4.44.2"
+		"jsdoc": "^4.0.0",
+		"webpack": "^5.75.0"
 	}
 }

package/src/Integration/ReactNative/Repository/AsyncStorage.js

@@ -42,12 +42,10 @@ class AsyncStorageRepository extends OfflineRepository {
 					value = result; // Invalid JSON, just return raw result
 				}
 			}
-			
 			return value;
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
-				console.log('_storageGetValue error', msg);
 				debugger;
 			}
 		}
@@ -67,7 +65,7 @@ class AsyncStorageRepository extends OfflineRepository {
 			const results = await AsyncStorage.multiGet(this._namespace(keys));
 
 			if (this.debugMode) {
-				console.log(this.name, 'AsyncStorage.multiGet results', results);
+				console.log(this.name, 'AsyncStorage.multiGet results', name, results);
 			}
 
 			let values = [];
@@ -84,7 +82,6 @@ class AsyncStorageRepository extends OfflineRepository {
 						// Delete the index to this record
 						const re = new RegExp('^' + this.name + '\-' + '(.*)'),
 							matches = key.match(re);
-debugger;
 						const id = parseInt(matches, 10);
 						this._deleteFromIndex(id);
 					} else {
@@ -101,7 +98,6 @@ debugger;
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
-				console.log('_storageGetMultiple error', msg);
 				debugger;
 			}
 		}
@@ -121,7 +117,6 @@ debugger;
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
-				console.log('_storageSetValue error', msg);
 				debugger;
 			}
 		}
@@ -154,7 +149,6 @@ debugger;
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
-				console.log('_storageSetMultiple error', msg);
 				debugger;
 			}
 		}
@@ -175,7 +169,6 @@ debugger;
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
-				console.log('_storageDeleteValue error', msg);
 				debugger;
 			}
 		}
@@ -196,19 +189,16 @@ debugger;
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
-				console.log('_storageDeleteMultiple error', msg);
 				debugger;
 			}
 		}
 	}
 
-	_clearAll = async () => {
-		await AsyncStorage.clear();
-		this._keyedEntities = {};
-		this.reload();
+	clearAll = async () => {
+		await this.load([]);
 	}
 
-	_getAllKeys = async () => {
+	getAllKeys = async () => {
 		return await AsyncStorage.getAllKeys();
 	}
 

package/src/Integration/ReactNative/Repository/SecureStore.js

@@ -3,97 +3,101 @@
  * and is subject to the terms and conditions defined in
  * file 'LICENSE.txt', which is part of this source code package.
  */
- import OfflineRepository from '@onehat/data/src/Repository/Offline.js';
- import * as SecureStore from 'expo-secure-store'; // see: https://docs.expo.io/versions/latest/sdk/securestore/
- import _ from 'lodash';
- 
- /**
-  * Repository representing Expo's SecureStore
-  * Uses expo-secure-store package
-  */
- class SecureStoreRepository extends OfflineRepository {
- 
-	 constructor(config = {}) {
-		 super(...arguments);
-		 _.merge(this, config);
-	 }
- 
-	 _storageGetValue = async (name) => {
-		 try {
-			 
-			 if (this.debugMode) {
-				 console.log(this.name, 'SecureStore.get', name);
-			 }
- 
-			 const result = await SecureStore.getItemAsync(this._namespace(name));
- 
-			 if (this.debugMode) {
-				 console.log(this.name, 'SecureStore.get results', name, result);
-			 }
- 
-			 let value;
-			 if (!_.isNil(result)) {
-				 try {
-					 value = JSON.parse(result);
-				 } catch (e) {
-					 value = result; // Invalid JSON, just return raw result
-				 }
-			 }
-			 return value;
-		 } catch (error) {
-			 if (this.debugMode) {
-				 const msg = error && error.message;
-				 debugger;
-			 }
-		 }
-	 }
- 
-	 _storageSetValue = async (name, value) => {
-		 try {
-			 if (!_.isString(value)) {
-				 value = JSON.stringify(value);
-			 }
-			 if (this.debugMode) {
-				 console.log(this.name, 'SecureStore.set', name, value);
-			 }
- 
-			 const result = await SecureStore.setItemAsync(this._namespace(name), value);
- 
-			 // if (this.debugMode) {
-			 // 	console.log(this.name, 'SecureStore.set results', name, result);
-			 // }
-			 return result;
-		 } catch (error) {
-			 if (this.debugMode) {
-				 const msg = error && error.message;
-				 debugger;
-			 }
-		 }
-	 }
- 
-	 _storageDeleteValue = async (name) => {
-		 try {
-			 if (this.debugMode) {
-				 console.log(this.name, 'SecureStore.delete', name);
-			 }
- 
-			 const result = await SecureStore.deleteItemAsync(this._namespace(name));
- 
-			 // if (this.debugMode) {
-			 // 	console.log(this.name, 'SecureStore.delete results', name, result);
-			 // }
-			 return result;
-		 } catch (error) {
-			 if (this.debugMode) {
-				 const msg = error && error.message;
-				 debugger;
-			 }
-		 }
-	 }
- 
- };
- 
- SecureStoreRepository.className = 'SecureStore';
- SecureStoreRepository.type = 'secure';
- 
- export default SecureStoreRepository;
+import OfflineRepository from '@onehat/data/src/Repository/Offline.js';
+import * as SecureStore from 'expo-secure-store'; // see: https://docs.expo.io/versions/latest/sdk/securestore/
+import _ from 'lodash';
+
+/**
+ * Repository representing Expo's SecureStore
+ * Uses expo-secure-store package
+ */
+class SecureStoreRepository extends OfflineRepository {
+
+	constructor(config = {}) {
+		super(...arguments);
+		_.merge(this, config);
+	}
+
+	_storageGetValue = async (name) => {
+		try {
+			
+			if (this.debugMode) {
+				console.log(this.name, 'SecureStore.get', name);
+			}
+
+			const result = await SecureStore.getItemAsync(this._namespace(name));
+
+			if (this.debugMode) {
+				console.log(this.name, 'SecureStore.get results', name, result);
+			}
+
+			let value;
+			if (!_.isNil(result)) {
+				try {
+					value = JSON.parse(result);
+				} catch (e) {
+					value = result; // Invalid JSON, just return raw result
+				}
+			}
+			return value;
+		} catch (error) {
+			// if (this.debugMode) {
+			// 	const msg = error && error.message;
+			// 	debugger;
+			// }
+		}
+	}
+
+	_storageSetValue = async (name, value) => {
+		try {
+			if (!_.isString(value)) {
+				value = JSON.stringify(value);
+			}
+			if (this.debugMode) {
+				console.log(this.name, 'SecureStore.set', name, value);
+			}
+
+			const result = await SecureStore.setItemAsync(this._namespace(name), value);
+
+			// if (this.debugMode) {
+			// 	console.log(this.name, 'SecureStore.set results', name, result);
+			// }
+			return result;
+		} catch (error) {
+			// if (this.debugMode) {
+			// 	const msg = error && error.message;
+			// 	debugger;
+			// }
+		}
+	}
+
+	_storageDeleteValue = async (name) => {
+		try {
+			if (this.debugMode) {
+				console.log(this.name, 'SecureStore.delete', name);
+			}
+
+			const result = await SecureStore.deleteItemAsync(this._namespace(name));
+
+			// if (this.debugMode) {
+			// 	console.log(this.name, 'SecureStore.delete results', name, result);
+			// }
+			return result;
+		} catch (error) {
+			// if (this.debugMode) {
+			// 	const msg = error && error.message;
+			// 	debugger;
+			// }
+		}
+	}
+
+	clearAll = async () => {
+		await this.load([]);
+	}
+
+};
+
+SecureStoreRepository.className = 'SecureStore';
+SecureStoreRepository.type = 'secure';
+
+export default SecureStoreRepository;

package/src/OneHatData.js

@@ -13,6 +13,8 @@ import {
 } from './Schema';
 import _ from 'lodash';
 
+export let concurrentAsyncRequests = 0; // global counter
+
 /**
  * OneHatData represents a collection of Repositories.
  * It is the top-level object for this module.
@@ -56,6 +58,12 @@ export class OneHatData extends EventEmitter {
 		 * @private
 		 */
 		this.uniqueRepositoriesMap = {};
+
+		/**
+		 * @member {Object} maxConcurrentAsyncRequests - Object map of all unique Repositories, with signature of { mapName: id }
+		 * @public
+		 */
+		this.maxConcurrentAsyncRequests = 500; // Total number of async requests allowed, before we start making them synchronous
 		
 		/**
 		 * @member {boolean} isDestroyed - Whether this object has been destroyed
@@ -77,13 +85,18 @@ export class OneHatData extends EventEmitter {
 	 * Sets global config settings that will be passed into all Repositories.
 	 * Chainable.
 	 * @param {object} globals - Schema config object
+	 * @param {boolean} merge - Whether to merge or replace the globals
 	 * @return this
 	 */
-	setRepositoryGlobals = (globals) => {
+	setRepositoryGlobals = (globals, merge = true) => {
 		if (this.isDestroyed) {
 			throw new Error('this.setRepositoryGlobals is no longer valid. OneHatData has been destroyed.');
 		}
-		_.assign(this._repositoryGlobals, globals);
+		if (merge) {
+			_.merge(this._repositoryGlobals, globals);
+		} else {
+			_.assign(this._repositoryGlobals, globals);
+		}
 		return this;
 	}