@travetto/model-firestore 3.0.0-rc.4 → 3.0.0-rc.7

package/README.md

@@ -1,5 +1,5 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
-<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model-firestore/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model-firestore/DOC.ts and execute "npx trv doc" to rebuild -->
 # Firestore Model Support
 ## Firestore backing for the travetto model module.
 
@@ -39,7 +39,7 @@ export class Init {
   
 **Code: Structure of FirestoreModelConfig**
 ```typescript
-import { ResourceManager } from '@travetto/base';
+import { CommonFileResourceProvider } from '@travetto/base';
 import { Config } from '@travetto/config';
 
 @Config('model.firestore')
@@ -62,11 +62,12 @@ export class FirestoreModelConfig {
       process.env.FIRESTORE_EMULATOR_HOST = this.emulator;
     }
     if (this.credentialsFile && !this.credentials) {
-      this.credentials = JSON.parse(await ResourceManager.read(this.credentialsFile, 'utf8'));
+      const resources = new CommonFileResourceProvider();
+      this.credentials = JSON.parse(await resources.read(this.credentialsFile));
     }
   }
 }
 ```
 
-  Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L9) annotation, and so these values can be overridden using the 
-  standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Environment-aware config management using yaml files")resolution paths.
+  Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L13) annotation, and so these values can be overridden using the 
+  standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Configuration support")resolution paths.

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@travetto/model-firestore",
-  "displayName": "Firestore Model Support",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.7",
   "description": "Firestore backing for the travetto model module.",
   "keywords": [
     "typescript",
@@ -16,19 +15,31 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
+    "__index__.ts",
     "src",
     "support"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/model-firestore"
   },
   "dependencies": {
-    "@travetto/config": "^3.0.0-rc.4",
-    "@travetto/model": "^3.0.0-rc.4",
-    "@google-cloud/firestore": "^5.0.2"
+    "@google-cloud/firestore": "^5.0.2",
+    "@travetto/base": "^3.0.0-rc.5",
+    "@travetto/config": "^3.0.0-rc.7",
+    "@travetto/model": "^3.0.0-rc.7"
+  },
+  "peerDependencies": {
+    "@travetto/command": "^3.0.0-rc.5"
+  },
+  "peerDependenciesMeta": {
+    "@travetto/command": {
+      "optional": true
+    }
+  },
+  "travetto": {
+    "displayName": "Firestore Model Support"
   },
   "private": false,
   "publishConfig": {

package/src/config.ts

@@ -1,4 +1,4 @@
-import { ResourceManager } from '@travetto/base';
+import { FileResourceProvider } from '@travetto/base';
 import { Config } from '@travetto/config';
 
 @Config('model.firestore')
@@ -21,7 +21,8 @@ export class FirestoreModelConfig {
       process.env.FIRESTORE_EMULATOR_HOST = this.emulator;
     }
     if (this.credentialsFile && !this.credentials) {
-      this.credentials = JSON.parse(await ResourceManager.read(this.credentialsFile, 'utf8'));
+      const resources = new FileResourceProvider({ includeCommon: true });
+      this.credentials = JSON.parse(await resources.read(this.credentialsFile));
     }
   }
 }

package/src/service.ts

@@ -1,6 +1,6 @@
 import { DocumentData, FieldValue, Firestore, PartialWithFieldValue, Query, UpdateData } from '@google-cloud/firestore';
 
-import { ShutdownManager, Util, Class } from '@travetto/base';
+import { ShutdownManager, type Class } from '@travetto/base';
 import { DeepPartial } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import {
@@ -10,10 +10,11 @@ import {
 
 import { ModelCrudUtil } from '@travetto/model/src/internal/service/crud';
 import { ModelIndexedUtil } from '@travetto/model/src/internal/service/indexed';
+import { ModelUtil } from '@travetto/model/src/internal/util';
 
 import { FirestoreModelConfig } from './config';
 
-const clone = <T>(inp: T): T => JSON.parse(JSON.stringify(inp));
+const clone = structuredClone;
 
 const toSimpleObj = <T>(inp: T, missingValue: unknown = null): PartialWithFieldValue<DocumentData> =>
   JSON.parse(JSON.stringify(inp, (_, v) => v ?? null), (_, v) => v ?? missingValue);
@@ -42,7 +43,7 @@ export class FirestoreModelService implements ModelCrudSupport, ModelStorageSupp
 
   async postConstruct(): Promise<void> {
     this.client = new Firestore(this.config);
-    ShutdownManager.onShutdown(this.constructor.ᚕid, () => this.client.terminate());
+    ShutdownManager.onShutdown(this, () => this.client.terminate());
   }
 
   // Storage
@@ -57,7 +58,7 @@ export class FirestoreModelService implements ModelCrudSupport, ModelStorageSupp
 
   // Crud
   uuid(): string {
-    return Util.uuid();
+    return ModelUtil.uuid();
   }
 
   async get<T extends ModelType>(cls: Class<T>, id: string): Promise<T> {

package/support/service.firestore.ts

@@ -1,7 +1,7 @@
-import { EnvUtil } from '@travetto/boot';
-import type { Service } from '@travetto/command/bin/lib/service';
+import { Env } from '@travetto/base';
+import type { Service } from '@travetto/command/support/bin/service';
 
-const version = EnvUtil.get('TRV_SERVICE_FIRESTORE', 'latest');
+const version = Env.get('FIRESTORE_VERSION', 'latest');
 
 export const service: Service = {
   name: 'firestore',