@data-weave/backend-firestore 0.7.0 → 0.7.2

package/dist/FirestoreDataManager.d.ts

@@ -24,6 +24,7 @@ export declare class FirestoreDataManager<T extends FirestoreTypes.DocumentData,
     private readonly converter;
     private readonly opts?;
     private mergedConverter;
+    private metadataConverter;
     private collection;
     private collectionQuery;
     private managerOptions;
@@ -35,6 +36,15 @@ export declare class FirestoreDataManager<T extends FirestoreTypes.DocumentData,
     read(id: string, options?: FirestoreReadOptions): Promise<WithMetadata<T> | undefined>;
     create(data: WithFieldValue<WithoutId<T>>, options?: FirebaseCreateOptions): Promise<IdentifiableReference<WithMetadata<T>>>;
     private _update;
+    /**
+     * Update only the internal metadata fields of a document.
+     *
+     * Unlike {@link _update}, this bypasses the user-provided converter so it never re-serializes
+     * (and therefore never clobbers) user data. This matters because the user converter rebuilds the
+     * full document shape, which turns absent fields into `undefined` and can overwrite existing map
+     * fields with empty objects when Firestore strips the undefined values.
+     */
+    private _updateMetadata;
     update(id: string, data: WithoutId<Partial<WithFieldValue<T>>>, options?: FirestoreWriteOptions): Promise<void>;
     upsert(id: string, data: WithFieldValue<WithoutId<T>>, options?: FirestoreWriteOptions): Promise<void>;
     count(params?: QueryParams<SerializedT>): Promise<number>;

package/dist/FirestoreDataManager.js

@@ -18,6 +18,7 @@ class FirestoreDataManager {
     converter;
     opts;
     mergedConverter;
+    metadataConverter;
     collection;
     collectionQuery;
     managerOptions;
@@ -29,8 +30,9 @@ class FirestoreDataManager {
         this.collectionPath = collectionPath;
         this.converter = converter;
         this.opts = opts;
+        this.metadataConverter = new FirestoreMetadata_1.FirestoreMetadataConverter();
         // @ts-expect-error - Force merge FirestoreDataConverter and InternalFirestoreDataConverter
-        this.mergedConverter = new utils_1.MergeConverters(this.converter, new FirestoreMetadata_1.FirestoreMetadataConverter());
+        this.mergedConverter = new utils_1.MergeConverters(this.converter, this.metadataConverter);
         this.managerOptions = this.validateOptions({ ...defaultFirebaseDataManagerOptions, ...this.opts });
         this.refCache = this.managerOptions.refCache || new datamanager_1.MapCache(100);
         this.listCache = this.managerOptions.listCache || new datamanager_1.MapCache(100);
@@ -44,6 +46,7 @@ class FirestoreDataManager {
         this.referenceOptions = {
             readMode: this.managerOptions.readMode,
             snapshotOptions: this.managerOptions.snapshotOptions,
+            filterDeleted: this.managerOptions.deleteMode === 'soft',
         };
     }
     validateOptions(options) {
@@ -55,7 +58,11 @@ class FirestoreDataManager {
             const snapshot = await options.transaction.get(this.firestore.doc(this.collection, id));
             if (!(0, utils_1.checkIfReferenceExists)(snapshot))
                 return undefined;
-            return snapshot.data(this.referenceOptions.snapshotOptions);
+            const data = snapshot.data(this.referenceOptions.snapshotOptions);
+            if (this.managerOptions.deleteMode === 'soft' && data?.deleted === true) {
+                return undefined;
+            }
+            return data;
         }
         return await ref.resolve();
     }
@@ -104,6 +111,25 @@ class FirestoreDataManager {
         }
         return this.firestore.updateDoc(ref, serializedData);
     }
+    /**
+     * Update only the internal metadata fields of a document.
+     *
+     * Unlike {@link _update}, this bypasses the user-provided converter so it never re-serializes
+     * (and therefore never clobbers) user data. This matters because the user converter rebuilds the
+     * full document shape, which turns absent fields into `undefined` and can overwrite existing map
+     * fields with empty objects when Firestore strips the undefined values.
+     */
+    async _updateMetadata(id, metadata, options) {
+        const serializedData = this.metadataConverter.toFirestore({
+            ...metadata,
+            [FirestoreMetadata_1.FIRESTORE_KEYS.UPDATED_AT]: this.firestore.serverTimestamp(),
+        });
+        const ref = this.firestore.doc(this.collection, id);
+        if (options?.transaction) {
+            return options.transaction.update(ref, serializedData);
+        }
+        return this.firestore.updateDoc(ref, serializedData);
+    }
     async update(id, data, options) {
         await this._update(id, data, options);
     }
@@ -178,10 +204,7 @@ class FirestoreDataManager {
     }
     async delete(id, options) {
         if (this.managerOptions.deleteMode === 'soft') {
-            await this._update(id, {
-                ...{},
-                [FirestoreMetadata_1.FIRESTORE_KEYS.DELETED]: true,
-            }, options);
+            await this._updateMetadata(id, { [FirestoreMetadata_1.FIRESTORE_KEYS.DELETED]: true }, options);
             return;
         }
         if (options?.transaction) {

package/dist/FirestoreMetadata.d.ts

@@ -16,8 +16,8 @@ export type FirestoreSerializedMetadata = {
     [FIRESTORE_INTERAL_KEYS.UPDATED_AT]: FirestoreTypes.Timestamp;
 };
 export declare class FirestoreMetadataConverter implements InternalFirestoreDataConverter<Metadata, FirestoreSerializedMetadata> {
-    toFirestore(data: WithFieldValue<WithoutId<Metadata>>): {
-        __deleted: FirestoreTypes.FieldValue | FirestoreTypes.WithFieldValue<boolean>;
+    toFirestore(data: Partial<WithFieldValue<WithoutId<Metadata>>>): {
+        __deleted: boolean;
         __createdAt: FirestoreTypes.Timestamp;
         __updatedAt: FirestoreTypes.Timestamp;
     };

package/dist/FirestoreMetadata.js

@@ -16,6 +16,7 @@ var FIRESTORE_KEYS;
 class FirestoreMetadataConverter {
     toFirestore(data) {
         return {
+            // Cast: value may be absent on partial metadata writes; Firestore strips undefined fields
             [FIRESTORE_INTERAL_KEYS.DELETED]: data[FIRESTORE_KEYS.DELETED],
             // Cast: Firestore handles conversion from Date to Timestamp internally
             [FIRESTORE_INTERAL_KEYS.CREATED_AT]: data[FIRESTORE_KEYS.CREATED_AT],

package/dist/FirestoreReference.d.ts

@@ -4,6 +4,12 @@ export type { FirestoreReferenceContext } from './errors';
 export interface FirestoreReferenceOptions<T> extends LiveReferenceOptions<T> {
     readMode?: FirestoreReadMode;
     snapshotOptions?: FirestoreTypes.SnapshotOptions;
+    /**
+     * When true, documents flagged as soft-deleted (`__deleted === true`) are treated as
+     * non-existent and resolve to `undefined`. Set by the data manager when running in
+     * `deleteMode: 'soft'` so single-document reads stay consistent with list queries.
+     */
+    filterDeleted?: boolean;
 }
 export declare class FirestoreReference<T extends DocumentData, S extends DocumentData> extends LiveReference<T> {
     private readonly firestore;

package/dist/FirestoreReference.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreReference = void 0;
 const datamanager_1 = require("@data-weave/datamanager");
 const errors_1 = require("./errors");
+const FirestoreMetadata_1 = require("./FirestoreMetadata");
 const utils_1 = require("./utils");
 class FirestoreReference extends datamanager_1.LiveReference {
     firestore;
@@ -68,7 +69,12 @@ class FirestoreReference extends datamanager_1.LiveReference {
     parseDocumentSnapshot(docSnapshot) {
         if (!(0, utils_1.checkIfReferenceExists)(docSnapshot))
             throw new Error(`Document does not exist ${this.docRef.path}`);
-        return docSnapshot.data(this.options?.snapshotOptions);
+        const data = docSnapshot.data(this.options?.snapshotOptions);
+        const deletedFlag = data?.[FirestoreMetadata_1.FIRESTORE_KEYS.DELETED];
+        if (this.options?.filterDeleted && deletedFlag === true) {
+            return undefined;
+        }
+        return data;
     }
 }
 exports.FirestoreReference = FirestoreReference;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@data-weave/backend-firestore",
-    "version": "0.7.0",
+    "version": "0.7.2",
     "author": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
         "registry": "https://registry.npmjs.org/"
     },
     "devDependencies": {
-        "@data-weave/datamanager": "~0.7.0",
+        "@data-weave/datamanager": "~0.7.2",
         "@firebase/firestore": "^4.7.8",
         "@firebase/functions-types": "^0.6.3",
         "@google-cloud/firestore": "^7.11.1",