@travetto/model-firestore 2.0.1 → 2.1.0

package/README.md

@@ -61,10 +61,6 @@ export class FirestoreModelConfig {
     if (this.emulator) {
       process.env.FIRESTORE_EMULATOR_HOST = this.emulator;
     }
-    if (typeof this.credentials === 'string') {
-      this.credentialsFile = this.credentials;
-      delete this.credentials;
-    }
     if (this.credentialsFile && !this.credentials) {
       this.credentials = JSON.parse(await ResourceManager.read(this.credentialsFile, 'utf8'));
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/model-firestore",
   "displayName": "Firestore Model Support",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Firestore backing for the travetto model module.",
   "keywords": [
     "typescript",
@@ -26,9 +26,9 @@
     "directory": "module/model-firestore"
   },
   "dependencies": {
-    "@travetto/config": "^2.0.1",
-    "@travetto/model": "^2.0.1",
-    "@google-cloud/firestore": "^4.12.2"
+    "@travetto/config": "^2.1.0",
+    "@travetto/model": "^2.1.0",
+    "@google-cloud/firestore": "^5.0.2"
   },
   "private": false,
   "publishConfig": {

package/src/config.ts

@@ -20,10 +20,6 @@ export class FirestoreModelConfig {
     if (this.emulator) {
       process.env.FIRESTORE_EMULATOR_HOST = this.emulator;
     }
-    if (typeof this.credentials === 'string') {
-      this.credentialsFile = this.credentials;
-      delete this.credentials;
-    }
     if (this.credentialsFile && !this.credentials) {
       this.credentials = JSON.parse(await ResourceManager.read(this.credentialsFile, 'utf8'));
     }

package/src/service.ts

@@ -5,8 +5,7 @@ import { DeepPartial } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import {
   ModelCrudSupport, ModelRegistry, ModelStorageSupport,
-  ModelIndexedSupport, ModelType, NotFoundError, SubTypeNotSupportedError,
-  OptionalId
+  ModelIndexedSupport, ModelType, NotFoundError, OptionalId
 } from '@travetto/model';
 
 import { ModelCrudUtil } from '@travetto/model/src/internal/service/crud';
@@ -77,27 +76,21 @@ export class FirestoreModelService implements ModelCrudSupport, ModelStorageSupp
   }
 
   async update<T extends ModelType>(cls: Class<T>, item: T) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
     item = await ModelCrudUtil.preStore(cls, item, this);
     await this.#getCollection(cls).doc(item.id).update(clone(item));
     return item;
   }
 
   async upsert<T extends ModelType>(cls: Class<T>, item: OptionalId<T>) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
     const prepped = await ModelCrudUtil.preStore(cls, item, this);
     await this.#getCollection(cls).doc(prepped.id).set(clone(prepped));
     return prepped;
   }
 
   async updatePartial<T extends ModelType>(cls: Class<T>, item: Partial<T> & { id: string }, view?: string) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
     const id = item.id;
     item = await ModelCrudUtil.naivePartialUpdate(cls, item, view, async () => ({} as unknown as T));
     const cleaned = toSimpleObj(item, FieldValue.delete());
@@ -106,9 +99,7 @@ export class FirestoreModelService implements ModelCrudSupport, ModelStorageSupp
   }
 
   async delete<T extends ModelType>(cls: Class<T>, id: string) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
     try {
       await this.#getCollection(cls).doc(id).delete({ exists: true } as unknown as Precondition);
     } catch (err) {
@@ -134,9 +125,7 @@ export class FirestoreModelService implements ModelCrudSupport, ModelStorageSupp
 
   // Indexed
   async #getIdByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
 
     const { fields } = ModelIndexedUtil.computeIndexParts(cls, idx, body);
     const query = fields.reduce((q, { path, value }) => q.where(path.join('.'), '==', value),
@@ -164,9 +153,7 @@ export class FirestoreModelService implements ModelCrudSupport, ModelStorageSupp
   }
 
   async * listByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
 
     const { fields, sorted } = ModelIndexedUtil.computeIndexParts(cls, idx, body, { emptySortValue: null });
     let query = fields.reduce((q, { path, value }) =>