@onehat/data 1.23.1 → 1.23.2

package/cypress/e2e/OneHatData.cy.js

@@ -29,16 +29,6 @@ async function beforeEach(that) {
 	that.repository = that.oneHatData.getRepositoryById('foo');
 }
 
-async function waitForRepositoryInitialization(repository, timeout = 2000) {
-	const start = Date.now();
-	while (!repository.isInitialized) {
-		if (Date.now() - start > timeout) {
-			throw new Error('Repository did not initialize in time: ' + repository.name);
-		}
-		await new Promise((resolve) => setTimeout(resolve, 5));
-	}
-}
-
 function afterEach(that) {
 	that.oneHatData.destroy();
 }
@@ -278,36 +268,34 @@ describe('OneHatData', function() {
 
 			const
 				repo1 = that.oneHatData.getRepository('bar'),
-				repo2 = that.oneHatData.getRepository('bar', true);
+				repo2 = await that.oneHatData.getUniqueRepository('bar');
 			expect(repo1 !== repo2).to.be.true;
+			expect(repo2.isInitialized).to.be.true;
 
 			afterEach(that);
 		})();
 	});
 
-	it('getRepositoryAsync returns initialized unique repository', function() {
+	it('getRepository(name, true) throws migration error', function() {
 		(async () => {
 			const that = {};
 			await beforeEach(that);
 
-			const repository = await that.oneHatData.getRepositoryAsync('bar', true);
-
-			expect(repository).to.be.ok;
-			expect(repository.isUnique).to.be.true;
-			expect(repository.isInitialized).to.be.true;
+			expect(() => that.oneHatData.getRepository('bar', true)).to.throw('Use await this.getUniqueRepository(name) instead.');
 
 			afterEach(that);
 		})();
 	});
 
-	it('getRepositoryAsync returns initialized bound repository', function() {
+	it('getUniqueRepository returns initialized unique repository', function() {
 		(async () => {
 			const that = {};
 			await beforeEach(that);
 
-			const repository = await that.oneHatData.getRepositoryAsync('bar');
+			const repository = await that.oneHatData.getUniqueRepository('bar');
 
-			expect(repository).to.be.eq(that.repository);
+			expect(repository).to.be.ok;
+			expect(repository.isUnique).to.be.true;
 			expect(repository.isInitialized).to.be.true;
 
 			afterEach(that);
@@ -321,9 +309,7 @@ describe('OneHatData', function() {
 
 			const
 				boundRepository = that.oneHatData.getRepository('bar'),
-				uniqueRepository = that.oneHatData.getRepository('bar', true);
-
-			await waitForRepositoryInitialization(uniqueRepository);
+				uniqueRepository = await that.oneHatData.getUniqueRepository('bar');
 
 			boundRepository.filter('key', 'bound-only');
 			expect(boundRepository.hasFilterValue('key', 'bound-only')).to.be.true;
@@ -338,7 +324,7 @@ describe('OneHatData', function() {
 		})();
 	});
 
-	it('getRepository unique allows pre-init setBaseParams for Ajax repositories', function() {
+	it('getUniqueRepository allows setBaseParams for Ajax repositories', function() {
 		(async () => {
 			const that = {};
 			await beforeEach(that);
@@ -362,7 +348,7 @@ describe('OneHatData', function() {
 			});
 			await that.oneHatData.createRepository('meters', true);
 
-			const uniqueRepository = that.oneHatData.getRepository('meters', true);
+			const uniqueRepository = await that.oneHatData.getUniqueRepository('meters');
 
 			expect(() => {
 				uniqueRepository.setBaseParams({
@@ -376,6 +362,41 @@ describe('OneHatData', function() {
 		})();
 	});
 
+	it('getOrCreateUniqueRepository reuses existing mapped repository', function() {
+		(async () => {
+			const that = {};
+			await beforeEach(that);
+
+			const repository1 = await that.oneHatData.getOrCreateUniqueRepository('partsMap', 'bar');
+			const repository2 = await that.oneHatData.getOrCreateUniqueRepository('partsMap', 'bar');
+
+			expect(repository1).to.be.eq(repository2);
+			expect(repository1.isUnique).to.be.true;
+
+			afterEach(that);
+		})();
+	});
+
+	it('getOrCreateUniqueRepository recreates repository when mapped id is stale', function() {
+		(async () => {
+			const that = {};
+			await beforeEach(that);
+
+			const repository1 = await that.oneHatData.getOrCreateUniqueRepository('partsMap', 'bar');
+			const originalId = repository1.id;
+
+			that.oneHatData.deleteRepository(originalId);
+
+			const repository2 = await that.oneHatData.getOrCreateUniqueRepository('partsMap', 'bar');
+
+			expect(repository2).to.be.ok;
+			expect(repository2.id).to.not.eq(originalId);
+			expect(that.oneHatData.uniqueRepositoryIdsMap.partsMap).to.be.eq(repository2.id);
+
+			afterEach(that);
+		})();
+	});
+
 	it('getRepositoriesBy', function() {
 		(async function() {
 			await beforeEach();

package/package.json

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

package/src/Integration/ReactNative/useOneHatData.js

@@ -35,7 +35,7 @@ export default function useOneHatData(schemaName, uniqueRepository = false) {
 
 			if (uniqueRepository) {
 				if (_.isString(schemaName)) {
-					repository = await oneHatData.getRepositoryAsync(schemaName, true);
+					repository = await oneHatData.getUniqueRepository(schemaName);
 				} else {
 					repository = await oneHatData.createRepository(schemaName);
 					repository.isUnique = true;
@@ -49,7 +49,7 @@ export default function useOneHatData(schemaName, uniqueRepository = false) {
 					repository = await oneHatData.createRepository(schemaName)
 				}
 			} else {
-				repository = await oneHatData.getRepositoryAsync(schemaName); // Get initialized bound Repository for this schema
+				repository = oneHatData.getRepository(schemaName); // Get bound Repository for this schema
 			}
 
 			if (!isMounted || !repository) {

package/src/OneHatData.js

@@ -479,247 +479,70 @@ export class OneHatData extends EventEmitter {
 		if (this.isDestroyed) {
 			throw new Error('this.getRepository is no longer valid. OneHatData has been destroyed.');
 		}
+		if (unique) {
+			throw new Error('this.getRepository(name, true) is no longer supported. Use await this.getUniqueRepository(name) instead.');
+		}
 		const schema = this.getSchema(name);
 		if (!schema) {
 			return null;
 		}
-		if (unique) {
-			return this._createUniqueRepositorySync(name);
-		}
 		return schema.getBoundRepository();
 	}
 
 	/**
-	 * Async variant of getRepository.
-	 * Useful when unique repositories are needed in frameworks that expect
-	 * fully initialized objects before first use.
+	 * Gets a fully initialized unique Repository for the supplied schema.
 	 * @param {string} name - Name of Schema
-	 * @param {boolean} unique - Whether to create a unique repository
-	 * @param {number} timeout - Max ms to wait for initialization
 	 * @return {Promise<Repository>} repository
 	 */
-	getRepositoryAsync = async (name, unique = false, timeout = 10000) => {
-		if (this.isDestroyed) {
-			throw new Error('this.getRepositoryAsync is no longer valid. OneHatData has been destroyed.');
-		}
-
-		const repository = this.getRepository(name, unique);
-		if (!repository) {
-			return null;
-		}
-
-		await this._waitForRepositoryInitialization(repository, timeout);
-		return repository;
-	}
-
-	/**
-	 * Creates an unbound unique Repository synchronously.
-	 * It returns the instance immediately and initializes in background.
-	 * @param {string} name - Name of Schema
-	 * @return {Repository} repository
-	 */
-	_createUniqueRepositorySync = (name) => {
+	getUniqueRepository = async (name) => {
 		if (this.isDestroyed) {
-			throw new Error('this._createUniqueRepositorySync is no longer valid. OneHatData has been destroyed.');
+			throw new Error('this.getUniqueRepository is no longer valid. OneHatData has been destroyed.');
 		}
 
 		const schema = this.getSchema(name);
 		if (!schema) {
-			return null;
+			throw new Error('this.getUniqueRepository: Schema not found. Name: ' + name);
 		}
 
 		const boundRepository = schema.getBoundRepository();
 		if (!boundRepository) {
-			return null;
-		}
-
-		const id = uuid();
-		const schemaRepositoryDef = _.isString(schema.repository) ? { type: schema.repository } : schema.repository;
-
-		// Keep behavioral overrides while omitting mutable runtime state and nested repo instances.
-		const safeOverrides = _.omit(boundRepository.originalConfig || {}, [
-			'id',
-			'name',
-			'isUnique',
-			'local',
-			'remote',
-			'entities',
-			'filters',
-			'sorters',
-			'page',
-			'previousPage',
-			'pageTotal',
-			'pageStart',
-			'pageEnd',
-			'totalPages',
-			'total',
-			'isFiltered',
-			'isInitialized',
-			'isLoaded',
-			'isLoading',
-			'lastLoaded',
-			'hash',
-		]);
-
-		const config = _.merge({}, schemaRepositoryDef, this._repositoryGlobals, safeOverrides, {
-			schema,
-			id,
-			name: boundRepository.name + '-' + id,
-			isUnique: true,
-		});
-
-		const repository = this._createRepositorySync(config);
-
-		this.repositories[repository.id] = repository;
-		this._initializeRepositoryInBackground(repository);
-
-		if (repository.isRegisteredEvent('logout')) { // OneBuild repository emits this
-			this.relayEventsFrom(repository, ['logout']);
-		}
-		if (repository.isRegisteredEvent(CROSS_TAB_EVENT_NAME)) {
-			this.relayEventsFrom(repository, [CROSS_TAB_EVENT_NAME]);
-		}
-
-		this.emit('createRepository', repository);
-		return repository;
-	}
-
-	/**
-	 * Creates a Repository instance synchronously.
-	 * Used when we must return a repository instance immediately.
-	 * @param {object} config - Repository config object
-	 * @return {Repository} repository
-	 * @private
-	 */
-	_createRepositorySync = (config) => {
-		if (this.isDestroyed) {
-			throw new Error('this._createRepositorySync is no longer valid. OneHatData has been destroyed.');
-		}
-
-		const workingConfig = _.merge({}, config);
-
-		if (workingConfig.type === 'lfr') {
-			const generalConfig = _.omit(workingConfig, ['type', 'local', 'remote']);
-
-			let localConfig = workingConfig.local;
-			let remoteConfig = workingConfig.remote;
-
-			if (_.isString(localConfig)) {
-				localConfig = {
-					type: localConfig,
-				};
-			}
-			if (_.isString(remoteConfig)) {
-				remoteConfig = {
-					type: remoteConfig,
-				};
-			}
-
-			if (workingConfig.mode === MODE_COMMAND_QUEUE) {
-				generalConfig.isPaginated = false;
-				remoteConfig.type = 'command';
-			}
-
-			localConfig = _.merge({}, generalConfig, localConfig);
-			remoteConfig = _.merge({}, generalConfig, remoteConfig);
-
-			const localRepository = this._createRepositorySync(localConfig);
-			const remoteRepository = this._createRepositorySync(remoteConfig);
-
-			workingConfig.local = localRepository;
-			workingConfig.remote = remoteRepository;
-		}
-
-		const RepositoryType = this._repositoryTypes[workingConfig.type];
-		if (!RepositoryType) {
-			throw new Error('Repository type does not exist');
-		}
-
-		return new RepositoryType(workingConfig, this);
-	}
-
-	/**
-	 * Initializes repositories in the proper dependency order.
-	 * @param {Repository} repository - Repository instance
-	 * @private
-	 */
-	_initializeRepositoryInBackground = (repository) => {
-		repository._initializationError = null;
-		repository._initializationPromise = Promise.resolve()
-			.then(async () => {
-				if (repository && repository.type === 'lfr') {
-					if (repository.local && _.isFunction(repository.local.initialize)) {
-						await repository.local.initialize();
-					}
-					if (repository.remote && _.isFunction(repository.remote.initialize)) {
-						await repository.remote.initialize();
-					}
-				}
-				await repository.initialize();
-			})
-			.catch((error) => {
-				repository._initializationError = error;
-				repository.emit('error', error);
+			throw new Error('this.getUniqueRepository: Schema does not have a bound Repository. Name: ' + name);
+		}
+
+		const
+			id = uuid(),
+			schemaRepositoryDef = _.isString(schema.repository) ? { type: schema.repository } : schema.repository,
+			safeOverrides = _.omit(boundRepository.originalConfig || {}, [ // Keep behavioral overrides while omitting mutable runtime state and nested repo instances.
+				'id',
+				'name',
+				'isUnique',
+				'local',
+				'remote',
+				'entities',
+				'filters',
+				'sorters',
+				'page',
+				'previousPage',
+				'pageTotal',
+				'pageStart',
+				'pageEnd',
+				'totalPages',
+				'total',
+				'isFiltered',
+				'isInitialized',
+				'isLoaded',
+				'isLoading',
+				'lastLoaded',
+				'hash',
+			]),
+			config = _.merge({}, schemaRepositoryDef, this._repositoryGlobals, safeOverrides, {
+				schema,
+				id,
+				name: boundRepository.name + '-' + id,
+				isUnique: true,
 			});
-		return repository._initializationPromise;
-	}
 
-	/**
-	 * Waits for repository initialization if currently pending.
-	 * @param {Repository} repository - Repository instance
-	 * @param {number} timeout - Max ms to wait for initialization
-	 * @return {Promise<Repository>} repository
-	 * @private
-	 */
-	_waitForRepositoryInitialization = async (repository, timeout = 10000) => {
-		if (!repository) {
-			return null;
-		}
-
-		if (repository._initializationPromise) {
-			await repository._initializationPromise;
-		}
-
-		if (repository._initializationError) {
-			throw repository._initializationError;
-		}
-
-		if (repository.isInitialized === true) {
-			return repository;
-		}
-
-		if (repository.isInitializing && _.isFunction(repository.on) && _.isFunction(repository.off)) {
-			await new Promise((resolve, reject) => {
-				const timeoutId = setTimeout(() => {
-					repository.off('initialize', handleInitialize);
-					repository.off('error', handleError);
-					reject(new Error('Timed out waiting for repository initialization: ' + repository.name));
-				}, timeout);
-
-				const handleInitialize = () => {
-					clearTimeout(timeoutId);
-					repository.off('initialize', handleInitialize);
-					repository.off('error', handleError);
-					resolve();
-				};
-
-				const handleError = (error) => {
-					clearTimeout(timeoutId);
-					repository.off('initialize', handleInitialize);
-					repository.off('error', handleError);
-					reject(error || new Error('Repository initialization failed: ' + repository.name));
-				};
-
-				repository.on('initialize', handleInitialize);
-				repository.on('error', handleError);
-			});
-		}
-
-		if (repository._initializationError) {
-			throw repository._initializationError;
-		}
-
-		return repository;
+		return await this.createRepository(config);
 	}
 
 	/**
@@ -730,13 +553,17 @@ export class OneHatData extends EventEmitter {
 	 */
 	getOrCreateUniqueRepository = async (mapName, schemaName) => {
 		if (this.isDestroyed) {
-			throw new Error('this.getUniqueRepository is no longer valid. OneHatData has been destroyed.');
+			throw new Error('this.getOrCreateUniqueRepository is no longer valid. OneHatData has been destroyed.');
 		}
 		
 		// Try to get it
 		let id = this.uniqueRepositoryIdsMap[mapName];
 		if (id) {
-			return this.getRepositoryById(id);
+			const existingRepository = this.getRepositoryById(id);
+			if (existingRepository) {
+				return existingRepository;
+			}
+			delete this.uniqueRepositoryIdsMap[mapName];
 		}
 
 		// Try to create it
@@ -744,11 +571,8 @@ export class OneHatData extends EventEmitter {
 		if (!schema) {
 			return null;
 		}
-
-		const repository = await this.createRepository(schemaName);
+		const repository = await this.getUniqueRepository(schemaName);
 		id = repository.id;
-		repository.name += '-' + id;
-		repository.isUnique = true;
 		this.uniqueRepositoryIdsMap[mapName] = repository.id;
 		return repository;
 	}

package/src/Repository/Ajax.js

@@ -141,58 +141,51 @@ class AjaxRepository extends Repository {
 	}
 
 	async initialize() {
-		this.isInitializing = true;
-		try {
 
-			this.registerEvents([
-				'beforeLoad',
-			]);
+		this.registerEvents([
+			'beforeLoad',
+		]);
 
-			// Respond to Repository events
-			this.on('beforeSave', this._onBeforeSave);
+		// Respond to Repository events
+		this.on('beforeSave', this._onBeforeSave);
 
 
-			// Create Reader
-			let readerConfig;
-			if (this.reader && this.reader.type) {
-				readerConfig = this.reader;
-			} else if (_.isString(this.reader)) {
-				readerConfig = {
-					type: this.reader,
-				};
-			}
-			if (readerConfig && ReaderTypes[readerConfig.type]) {
-				const Reader = ReaderTypes[readerConfig.type];
-				this.reader = new Reader(readerConfig);
-			} else {
-				this.reader = null;
-			}
+		// Create Reader
+		let readerConfig;
+		if (this.reader && this.reader.type) {
+			readerConfig = this.reader;
+		} else if (_.isString(this.reader)) {
+			readerConfig = {
+				type: this.reader,
+			};
+		}
+		if (readerConfig && ReaderTypes[readerConfig.type]) {
+			const Reader = ReaderTypes[readerConfig.type];
+			this.reader = new Reader(readerConfig);
+		} else {
+			this.reader = null;
+		}
 
-			// Create Writer
-			let writerConfig;
-			if (this.writer && this.writer.type) {
-				writerConfig = this.writer;
-			} else if (_.isString(this.writer)) {
-				writerConfig = {
-					type: this.writer,
-				};
-			}
-			if (writerConfig && WriterTypes[writerConfig.type]) {
-				const Writer = WriterTypes[writerConfig.type];
-				this.writer = new Writer(writerConfig);
-			} else {
-				this.writer = null;
-			}
+		// Create Writer
+		let writerConfig;
+		if (this.writer && this.writer.type) {
+			writerConfig = this.writer;
+		} else if (_.isString(this.writer)) {
+			writerConfig = {
+				type: this.writer,
+			};
+		}
+		if (writerConfig && WriterTypes[writerConfig.type]) {
+			const Writer = WriterTypes[writerConfig.type];
+			this.writer = new Writer(writerConfig);
+		} else {
+			this.writer = null;
+		}
 
-			// Initialize query params
-			this._setInitialQueryParams();
+		// Initialize query params
+		this._setInitialQueryParams();
 
-			await super.initialize();
-		} finally {
-			if (!this.isInitialized) {
-				this.isInitializing = false;
-			}
-		}
+		await super.initialize();
 	}
 
 	/**
@@ -234,7 +227,6 @@ class AjaxRepository extends Repository {
 	 * @param {boolean} isBaseParam - Whether param is a base param (to be sent on every request).
 	 */
 	setParam(name, value, isBaseParam = false) {
-		this._assertInitialized('setParam');
 		const
 			re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
@@ -271,7 +263,6 @@ class AjaxRepository extends Repository {
 	 * @param {boolean} isBaseParam - Whether param is a base param (to be sent on every request).
 	 */
 	setValuelessParam(name, isBaseParam = false) {
-		this._assertInitialized('setValuelessParam');
 		const
 			re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
@@ -299,7 +290,6 @@ class AjaxRepository extends Repository {
 	 * @param {object} params - Params to set. Key is parameter name, value is parameter value
 	 */
 	setParams(params) {
-		this._assertInitialized('setParams');
 		const oThis = this;
 		_.each(params, (value, name) => {
 			oThis.setParam(name, value);
@@ -311,7 +301,6 @@ class AjaxRepository extends Repository {
 	 * @param {string} name - Param name
 	 */
 	hasBaseParam(name) {
-		this._assertInitialized('hasBaseParam');
 		if (this._baseParams.hasOwnProperty(name)) {
 			return true;
 		}
@@ -335,7 +324,6 @@ class AjaxRepository extends Repository {
 	 * @param {string} name - Param name
 	 */
 	getBaseParam(name) {
-		this._assertInitialized('getBaseParam');
 		if (!this.hasBaseParam(name)) {
 			return null;
 		}
@@ -363,7 +351,6 @@ class AjaxRepository extends Repository {
 	 * @param {object} params - Params to set. Key is parameter name, value is parameter value
 	 */
 	getBaseParams() {
-		this._assertInitialized('getBaseParams');
 		return this._baseParams;
 	}
 
@@ -371,7 +358,6 @@ class AjaxRepository extends Repository {
 	 * Returns current value of any baseParam query conditions
 	 */
 	getBaseParamConditions() {
-		this._assertInitialized('getBaseParamConditions');
 		const
 			existingConditions = this._baseParams.conditions || {},
 			convertedConditions = {};
@@ -385,7 +371,6 @@ class AjaxRepository extends Repository {
 	 * Returns current value of any param query conditions
 	 */
 	getParamConditions() {
-		this._assertInitialized('getParamConditions');
 		const
 			existingConditions = this._params.conditions || {},
 			convertedConditions = {};
@@ -400,7 +385,6 @@ class AjaxRepository extends Repository {
 	 * @param {string} name - Param name
 	 */
 	hasParam(name) {
-		this._assertInitialized('hasParam');
 		if (this._params.hasOwnProperty(name)) {
 			return true;
 		}
@@ -425,7 +409,6 @@ class AjaxRepository extends Repository {
 	 * @param {any} value - Param value to set.
 	 */
 	setBaseParam(name, value) {
-		this._assertInitialized('setBaseParam');
 		this.setParam(name, value, true);
 	}
 
@@ -434,7 +417,6 @@ class AjaxRepository extends Repository {
 	 * @param {object} params - Base params to set. Key is parameter name, value is parameter value
 	 */
 	setBaseParams(params) {
-		this._assertInitialized('setBaseParams');
 		const oThis = this;
 		_.each(params, (value, name) => {
 			oThis.setBaseParam(name, value);
@@ -447,7 +429,6 @@ class AjaxRepository extends Repository {
 	 * @param {boolean} reload - Whether to reload repository. Defaults to false.
 	 */
 	clearParams(reload = false, clearBase = false) {
-		this._assertInitialized('clearParams');
 		this._params = {};
 		if (clearBase) {
 			this._baseParams = {};
@@ -463,7 +444,6 @@ class AjaxRepository extends Repository {
 	 * Refreshes entities.
 	 */
 	_onChangeSorters() {
-		this._assertInitialized('_onChangeSorters');
 		const sorter = this.sorters[0];
 		this.setBaseParam(this.paramSort, sorter.name);
 		this.setBaseParam(this.paramDirection, sorter.direction);
@@ -478,7 +458,6 @@ class AjaxRepository extends Repository {
 	 * Refreshes entities.
 	 */
 	_onChangeFilters() {
-		this._assertInitialized('_onChangeFilters');
 		const oThis = this;
 		_.each(this.filters, (value, name) => {
 			oThis.setParam(name, value);
@@ -494,7 +473,6 @@ class AjaxRepository extends Repository {
 	 * Refreshes entities.
 	 */
 	_onChangePagination() {
-		this._assertInitialized('_onChangePagination');
 		this.setBaseParam(this.paramPageNum, this.isPaginated ? this.page : null);
 		this.setBaseParam(this.paramPageSize, this.isPaginated ? this.pageSize : null);
 
@@ -534,7 +512,6 @@ class AjaxRepository extends Repository {
 	 * @fires beforeLoad,changeData,load,error
 	 */
 	async load(params, callback = null) {
-		this._assertInitialized('load');
 		if (this.isTree) {
 			return this.loadRootNodes();
 		}
@@ -707,7 +684,6 @@ class AjaxRepository extends Repository {
 	}
 
 	showMore(params = {}, callback) {
-		this._assertInitialized('showMore');
 		params.showMore = true;
 		return this.load(params, callback);
 	}
@@ -720,7 +696,6 @@ class AjaxRepository extends Repository {
 	 * @fires reloadEntity,beforeLoad,changeData,load,error
 	 */
 	async reloadEntity(entity, callback = null) { // use this notation so we can override it in subclasses
-		this._assertInitialized('reloadEntity');
 		if (this.isDestroyed) {
 			this.throwError('this.reloadEntity is no longer valid. Repository has been destroyed.');
 			return;
@@ -784,7 +759,6 @@ class AjaxRepository extends Repository {
 	 * @private
 	 */
 	_getReloadEntityParams(entity) {
-		this._assertInitialized('_getReloadEntityParams');
 		const params = {
 			id: entity.id,
 		};
@@ -796,7 +770,6 @@ class AjaxRepository extends Repository {
 	 * @private
 	 */
 	_onBeforeSave() {
-		this._assertInitialized('_onBeforeSave');
 		this._operations = {
 			add: false,
 			edit: false,
@@ -1198,8 +1171,6 @@ class AjaxRepository extends Repository {
 	 * @private
 	 */
 	_send(method, url, data, options = {}) {
-		this._assertInitialized('_send');
-
 		if (!url) {
 			this.throwError('No url submitted');
 			return;
@@ -1279,7 +1250,6 @@ class AjaxRepository extends Repository {
 	 * since the server normally sorts, and they haven't yet gone to server.
 	 */
 	sortInMemory() {
-		this._assertInitialized('sortInMemory');
 		const sorters = this.sorters;
 		let sortNames = [],
 			sortDirections = [];

package/src/Repository/Repository.js

@@ -373,29 +373,6 @@ export default class Repository extends EventEmitter {
 		}
 	}
 
-	/**
-	 * Throws when operational methods are used before initialization completes.
-	 * @param {string} methodName - Name of the method being guarded
-	 * @private
-	 */
-	_assertInitialized(methodName) {
-		const strictMethods = {
-			add: true,
-			addMultiple: true,
-			save: true,
-			delete: true,
-			load: true,
-			reloadEntity: true,
-			_send: true,
-		};
-		if (!strictMethods[methodName]) {
-			return;
-		}
-		if (!this.isInitialized && !this.isInitializing) {
-			throw new Error('Repository ' + this.name + ' is not initialized. Cannot call ' + methodName + ' yet.');
-		}
-	}
-
 	/**
 	 * Creates the methods for this Repository, based on Schema.
 	 * @private
@@ -622,7 +599,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.sort is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('sort');
 		// Assemble sorting definition objects
 		let sorters = [];
 		if (_.isNil(arg1)) {
@@ -683,7 +659,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.setSorters is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('setSorters');
 		if (!this.allowsMultiSort && sorters.length > 1) {
 			this.throwError('Cannot have more than one sorter at a time.');
 			return;
@@ -793,7 +768,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.filter is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('filter');
 
 		if (_.isNil(arg1)) {
 			return this.clearFilters();
@@ -870,7 +844,6 @@ export default class Repository extends EventEmitter {
 	 * @return this
 	 */
 	setFilters(filters, clearFirst = true) {
-		this._assertInitialized('setFilters');
 		const parsed = _.map(filters, (value, name) => {
 			return {
 				name,
@@ -891,7 +864,6 @@ export default class Repository extends EventEmitter {
 	 * - repository.clearFilters(['first_name', 'last_name']); // Clear multiple filters
 	 */
 	clearFilters(filtersToClear) {
-		this._assertInitialized('clearFilters');
 		let filters = [];
 		if (filtersToClear) {
 			if (_.isString(filtersToClear)) {
@@ -914,7 +886,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this._setFilters is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('_setFilters');
 		if (!_.isEqual(this.filters, filters)) {
 			this.filters = filters;
 			this.resetPagination();
@@ -1154,7 +1125,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.add is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('add');
 		if (!this.canAdd) {
 			this.throwError('Adding has been disabled on this repository.');
 			return;
@@ -1242,8 +1212,6 @@ export default class Repository extends EventEmitter {
 	 * @return {array} entities - new Entity objects
 	 */
 	async addMultiple(allData, isPersisted = false) {
-		this._assertInitialized('addMultiple');
-
 		if (!this.canAdd) {
 			this.throwError('Adding has been disabled on this repository.');
 			return;
@@ -1428,7 +1396,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getByIx is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getByIx');
 		return this.entities[ix];
 	}
 	
@@ -1444,7 +1411,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getByRange is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getByRange');
 		return _.slice(this.entities, startIx, endIx+1);
 	}
 
@@ -1458,7 +1424,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getById is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getById');
 		if (_.isNil(id)) {
 			return null;
 		}
@@ -1475,7 +1440,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getIxById is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getIxById');
 		if (_.isNil(id)) {
 			return null;
 		}
@@ -1497,7 +1461,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getBy is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getBy');
 		return _.filter(this.entities, filter);
 	}
 
@@ -1515,7 +1478,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getFirstBy is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getFirstBy');
 		return _.find(this.entities, filter);
 	}
 
@@ -1561,7 +1523,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getEntities is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getEntities');
 		return this.entities;
 	}
 	/* */
@@ -1577,7 +1538,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getPagedEntities is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('getEntitiesOnPage');
 		const entities = this.getEntities();
 		if (!this.isPaginated) {
 			return entities;
@@ -1817,7 +1777,6 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.save is no longer valid. Repository has been destroyed.');
 			return;
 		}
-		this._assertInitialized('save');
 
 		this.emit('beforeSave'); // So subclasses can prep anything needed for saving
 	
@@ -2062,7 +2021,6 @@ export default class Repository extends EventEmitter {
 	 * @fires delete
 	 */
 	async delete(entities, moveSubtreeUp = false) {
-		this._assertInitialized('delete');
 		if (this.isDestroyed) {
 			this.throwError('this.delete is no longer valid. Repository has been destroyed.');
 			return;