@travetto/model-firestore 7.0.0-rc.2 → 7.0.0-rc.3

package/README.md

@@ -47,7 +47,7 @@ export class FirestoreModelConfig {
   emulator?: string;
   projectId: string;
   namespace?: string;
-  autoCreate?: boolean;
+  modifyStorage?: boolean;
   credentials?: FirestoreModelConfigCredentials;
 
   async postConstruct(): Promise<void> {
@@ -56,7 +56,7 @@ export class FirestoreModelConfig {
     }
     if (this.credentialsFile && !this.credentials) {
       this.credentials = FirestoreModelConfigCredentials.from(
-        JSON.parse(await RuntimeResources.read(this.credentialsFile))
+        await RuntimeResources.readJSON(this.credentialsFile)
       );
       await SchemaValidator.validate(FirestoreModelConfigCredentials, this.credentials);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-firestore",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.3",
   "description": "Firestore backing for the travetto model module.",
   "keywords": [
     "typescript",
@@ -26,10 +26,10 @@
   },
   "dependencies": {
     "@google-cloud/firestore": "^7.11.6",
-    "@travetto/cli": "^7.0.0-rc.2",
-    "@travetto/config": "^7.0.0-rc.2",
-    "@travetto/model": "^7.0.0-rc.2",
-    "@travetto/runtime": "^7.0.0-rc.2"
+    "@travetto/cli": "^7.0.0-rc.3",
+    "@travetto/config": "^7.0.0-rc.3",
+    "@travetto/model": "^7.0.0-rc.3",
+    "@travetto/runtime": "^7.0.0-rc.3"
   },
   "travetto": {
     "displayName": "Firestore Model Support"

package/src/config.ts

@@ -1,4 +1,4 @@
-import { RuntimeResources } from '@travetto/runtime';
+import { Runtime, RuntimeResources } from '@travetto/runtime';
 import { Config } from '@travetto/config';
 import { Schema, SchemaValidator } from '@travetto/schema';
 
@@ -14,18 +14,22 @@ export class FirestoreModelConfig {
   databaseURL?: string;
   credentialsFile?: string;
   emulator?: string;
-  projectId: string;
+  projectId?: string;
   namespace?: string;
-  autoCreate?: boolean;
+  modifyStorage?: boolean;
   credentials?: FirestoreModelConfigCredentials;
 
   async postConstruct(): Promise<void> {
+    if (!this.databaseURL && !Runtime.production) {
+      this.projectId ??= 'trv-local-dev';
+      this.emulator ??= 'localhost:7000'; // From docker
+    }
     if (this.emulator) {
       process.env.FIRESTORE_EMULATOR_HOST = this.emulator;
     }
     if (this.credentialsFile && !this.credentials) {
       this.credentials = FirestoreModelConfigCredentials.from(
-        JSON.parse(await RuntimeResources.read(this.credentialsFile))
+        await RuntimeResources.readJSON(this.credentialsFile)
       );
       await SchemaValidator.validate(FirestoreModelConfigCredentials, this.credentials);
     }

package/src/service.ts

@@ -1,6 +1,6 @@
 import { DocumentData, FieldValue, Firestore, PartialWithFieldValue, Query } from '@google-cloud/firestore';
 
-import { ShutdownManager, type Class, type DeepPartial } from '@travetto/runtime';
+import { JSONUtil, ShutdownManager, type Class, type DeepPartial } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 import {
   ModelCrudSupport, ModelRegistryIndex, ModelStorageSupport,
@@ -13,7 +13,7 @@ import { FirestoreModelConfig } from './config.ts';
 const clone = structuredClone;
 
 const toSimpleObject = <T>(input: T, missingValue: unknown = null): PartialWithFieldValue<DocumentData> =>
-  JSON.parse(JSON.stringify(input, (_, value) => value ?? null), (_, value) => value ?? missingValue);
+  JSONUtil.parseSafe(JSON.stringify(input, (_, value) => value ?? null), (_, value) => value ?? missingValue);
 
 /**
  * A model service backed by Firestore