@prmichaelsen/firebase-admin-sdk-v8 2.0.16 → 2.0.19

package/dist/index.d.mts

@@ -287,18 +287,18 @@ declare function getUserFromToken(idToken: string): Promise<UserInfo>;
 declare function getAuth(): any;
 
 /**
- * Firebase Admin SDK v8 - Firestore REST API
- * Provides CRUD operations for Firestore using REST API
+ * Firebase Admin SDK v8 - Firestore CRUD Operations
+ * All Firestore document operations using REST API
  */
 
 /**
  * Set a document in Firestore (create or overwrite)
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @param {DataObject} data - Document data
- * @param {SetOptions} [options] - Set options (merge, mergeFields)
- * @returns {Promise<void>}
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @param data - Document data
+ * @param options - Set options (merge, mergeFields)
+ * @returns Promise that resolves when document is set
  * @throws {Error} If the operation fails
  *
  * @example
@@ -317,10 +317,10 @@ declare function setDocument(collectionPath: string, documentId: string, data: D
 /**
  * Add a document to Firestore collection
  *
- * @param {string} collectionPath - Collection path (e.g., 'users' or 'users/uid/posts')
- * @param {DataObject} data - Document data
- * @param {string} [documentId] - Optional document ID (auto-generated if not provided)
- * @returns {Promise<DocumentReference>} Document reference with id and path
+ * @param collectionPath - Collection path (e.g., 'users' or 'users/uid/posts')
+ * @param data - Document data
+ * @param documentId - Optional document ID (auto-generated if not provided)
+ * @returns Document reference with id and path
  * @throws {Error} If the operation fails
  *
  * @example
@@ -337,9 +337,9 @@ declare function addDocument(collectionPath: string, data: DataObject, documentI
 /**
  * Get a document from Firestore
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @returns {Promise<DataObject | null>} Document data or null if not found
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @returns Document data or null if not found
  * @throws {Error} If the operation fails
  *
  * @example
@@ -354,10 +354,10 @@ declare function getDocument(collectionPath: string, documentId: string): Promis
 /**
  * Update a document in Firestore
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @param {DataObject} data - Data to update
- * @returns {Promise<void>}
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @param data - Data to update
+ * @returns Promise that resolves when document is updated
  * @throws {Error} If the operation fails
  *
  * @example
@@ -372,9 +372,9 @@ declare function updateDocument(collectionPath: string, documentId: string, data
 /**
  * Delete a document from Firestore
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @returns {Promise<void>}
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @returns Promise that resolves when document is deleted
  * @throws {Error} If the operation fails
  *
  * @example
@@ -386,9 +386,9 @@ declare function deleteDocument(collectionPath: string, documentId: string): Pro
 /**
  * Query documents in a collection with advanced filtering
  *
- * @param {string} collectionPath - Collection path
- * @param {QueryOptions} [options] - Query options (where, orderBy, limit, etc.)
- * @returns {Promise<Array<{ id: string; data: DataObject }>>} Array of documents
+ * @param collectionPath - Collection path
+ * @param options - Query options (where, orderBy, limit, etc.)
+ * @returns Array of documents with id and data
  * @throws {Error} If the operation fails
  *
  * @example
@@ -410,8 +410,8 @@ declare function queryDocuments(collectionPath: string, options?: QueryOptions):
 /**
  * Perform batch write operations (set, update, delete)
  *
- * @param {BatchWrite[]} operations - Array of batch operations
- * @returns {Promise<BatchWriteResult>} Batch write result
+ * @param operations - Array of batch operations
+ * @returns Batch write result
  * @throws {Error} If the operation fails
  *
  * @example

package/dist/index.d.ts

@@ -287,18 +287,18 @@ declare function getUserFromToken(idToken: string): Promise<UserInfo>;
 declare function getAuth(): any;
 
 /**
- * Firebase Admin SDK v8 - Firestore REST API
- * Provides CRUD operations for Firestore using REST API
+ * Firebase Admin SDK v8 - Firestore CRUD Operations
+ * All Firestore document operations using REST API
  */
 
 /**
  * Set a document in Firestore (create or overwrite)
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @param {DataObject} data - Document data
- * @param {SetOptions} [options] - Set options (merge, mergeFields)
- * @returns {Promise<void>}
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @param data - Document data
+ * @param options - Set options (merge, mergeFields)
+ * @returns Promise that resolves when document is set
  * @throws {Error} If the operation fails
  *
  * @example
@@ -317,10 +317,10 @@ declare function setDocument(collectionPath: string, documentId: string, data: D
 /**
  * Add a document to Firestore collection
  *
- * @param {string} collectionPath - Collection path (e.g., 'users' or 'users/uid/posts')
- * @param {DataObject} data - Document data
- * @param {string} [documentId] - Optional document ID (auto-generated if not provided)
- * @returns {Promise<DocumentReference>} Document reference with id and path
+ * @param collectionPath - Collection path (e.g., 'users' or 'users/uid/posts')
+ * @param data - Document data
+ * @param documentId - Optional document ID (auto-generated if not provided)
+ * @returns Document reference with id and path
  * @throws {Error} If the operation fails
  *
  * @example
@@ -337,9 +337,9 @@ declare function addDocument(collectionPath: string, data: DataObject, documentI
 /**
  * Get a document from Firestore
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @returns {Promise<DataObject | null>} Document data or null if not found
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @returns Document data or null if not found
  * @throws {Error} If the operation fails
  *
  * @example
@@ -354,10 +354,10 @@ declare function getDocument(collectionPath: string, documentId: string): Promis
 /**
  * Update a document in Firestore
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @param {DataObject} data - Data to update
- * @returns {Promise<void>}
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @param data - Data to update
+ * @returns Promise that resolves when document is updated
  * @throws {Error} If the operation fails
  *
  * @example
@@ -372,9 +372,9 @@ declare function updateDocument(collectionPath: string, documentId: string, data
 /**
  * Delete a document from Firestore
  *
- * @param {string} collectionPath - Collection path
- * @param {string} documentId - Document ID
- * @returns {Promise<void>}
+ * @param collectionPath - Collection path
+ * @param documentId - Document ID
+ * @returns Promise that resolves when document is deleted
  * @throws {Error} If the operation fails
  *
  * @example
@@ -386,9 +386,9 @@ declare function deleteDocument(collectionPath: string, documentId: string): Pro
 /**
  * Query documents in a collection with advanced filtering
  *
- * @param {string} collectionPath - Collection path
- * @param {QueryOptions} [options] - Query options (where, orderBy, limit, etc.)
- * @returns {Promise<Array<{ id: string; data: DataObject }>>} Array of documents
+ * @param collectionPath - Collection path
+ * @param options - Query options (where, orderBy, limit, etc.)
+ * @returns Array of documents with id and data
  * @throws {Error} If the operation fails
  *
  * @example
@@ -410,8 +410,8 @@ declare function queryDocuments(collectionPath: string, options?: QueryOptions):
 /**
  * Perform batch write operations (set, update, delete)
  *
- * @param {BatchWrite[]} operations - Array of batch operations
- * @returns {Promise<BatchWriteResult>} Batch write result
+ * @param operations - Array of batch operations
+ * @returns Batch write result
  * @throws {Error} If the operation fails
  *
  * @example

package/dist/index.js

@@ -331,78 +331,6 @@ function getAuth() {
   };
 }
 
-// src/token-generation.ts
-function base64UrlEncode(str) {
-  return btoa(str).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
-}
-function base64UrlEncodeBuffer(buffer) {
-  return btoa(String.fromCharCode(...buffer)).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
-}
-async function createJWT(serviceAccount) {
-  const now = Math.floor(Date.now() / 1e3);
-  const expiry = now + 3600;
-  const header = {
-    alg: "RS256",
-    typ: "JWT"
-  };
-  const payload = {
-    iss: serviceAccount.client_email,
-    sub: serviceAccount.client_email,
-    aud: serviceAccount.token_uri,
-    iat: now,
-    exp: expiry,
-    scope: "https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/datastore https://www.googleapis.com/auth/firebase"
-  };
-  const encodedHeader = base64UrlEncode(JSON.stringify(header));
-  const encodedPayload = base64UrlEncode(JSON.stringify(payload));
-  const unsignedToken = `${encodedHeader}.${encodedPayload}`;
-  const pemContents = serviceAccount.private_key.replace("-----BEGIN PRIVATE KEY-----", "").replace("-----END PRIVATE KEY-----", "").replace(/\s/g, "");
-  const binaryDer = Uint8Array.from(atob(pemContents), (c) => c.charCodeAt(0));
-  const cryptoKey = await crypto.subtle.importKey(
-    "pkcs8",
-    binaryDer,
-    { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" },
-    false,
-    ["sign"]
-  );
-  const signature = await crypto.subtle.sign(
-    "RSASSA-PKCS1-v1_5",
-    cryptoKey,
-    new TextEncoder().encode(unsignedToken)
-  );
-  const encodedSignature = base64UrlEncodeBuffer(new Uint8Array(signature));
-  return `${unsignedToken}.${encodedSignature}`;
-}
-var cachedAccessToken = null;
-var tokenExpiry = 0;
-async function getAdminAccessToken() {
-  if (cachedAccessToken && Date.now() < tokenExpiry) {
-    return cachedAccessToken;
-  }
-  const serviceAccount = getServiceAccount();
-  const jwt = await createJWT(serviceAccount);
-  const response = await fetch(serviceAccount.token_uri, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer",
-      assertion: jwt
-    })
-  });
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`Failed to get access token: ${errorText}`);
-  }
-  const data = await response.json();
-  cachedAccessToken = data.access_token;
-  tokenExpiry = Date.now() + data.expires_in * 1e3 - 6e4;
-  return cachedAccessToken;
-}
-function clearTokenCache() {
-  cachedAccessToken = null;
-  tokenExpiry = 0;
-}
-
 // src/field-value.ts
 function serverTimestamp() {
   return {
@@ -443,8 +371,7 @@ var FieldValue = {
   delete: deleteField
 };
 
-// src/firestore-rest.ts
-var FIRESTORE_API = "https://firestore.googleapis.com/v1";
+// src/firestore/converters.ts
 function toFirestoreValue(value) {
   if (value === null || value === void 0) {
     return { nullValue: null };
@@ -504,58 +431,6 @@ function convertToFirestoreFormat(data) {
   }
   return result;
 }
-function extractFieldTransforms(data, fieldPrefix = "") {
-  const transforms = [];
-  for (const [key, value] of Object.entries(data)) {
-    const fieldPath = fieldPrefix ? `${fieldPrefix}.${key}` : key;
-    if (isFieldValue(value)) {
-      switch (value._type) {
-        case "serverTimestamp":
-          transforms.push({
-            fieldPath,
-            setToServerValue: "REQUEST_TIME"
-          });
-          break;
-        case "increment":
-          transforms.push({
-            fieldPath,
-            increment: toFirestoreValue(value._value)
-          });
-          break;
-        case "arrayUnion":
-          transforms.push({
-            fieldPath,
-            appendMissingElements: {
-              values: value._value.map((v) => toFirestoreValue(v))
-            }
-          });
-          break;
-        case "arrayRemove":
-          transforms.push({
-            fieldPath,
-            removeAllFromArray: {
-              values: value._value.map((v) => toFirestoreValue(v))
-            }
-          });
-          break;
-      }
-    }
-  }
-  return transforms;
-}
-function removeFieldTransforms(data) {
-  const result = {};
-  for (const [key, value] of Object.entries(data)) {
-    if (isFieldValue(value)) {
-      if (value._type === "delete") {
-        continue;
-      }
-      continue;
-    }
-    result[key] = value;
-  }
-  return result;
-}
 function fromFirestoreValue(value) {
   if ("stringValue" in value) {
     return value.stringValue;
@@ -584,12 +459,17 @@ function fromFirestoreValue(value) {
   return null;
 }
 function convertFromFirestoreFormat(fields) {
+  if (!fields) {
+    return {};
+  }
   const result = {};
   for (const [key, value] of Object.entries(fields)) {
     result[key] = fromFirestoreValue(value);
   }
   return result;
 }
+
+// src/firestore/query-builder.ts
 function buildStructuredQuery(collectionPath, options) {
   const pathSegments = collectionPath.split("/");
   const collectionId = pathSegments[pathSegments.length - 1];
@@ -672,14 +552,181 @@ function mapWhereOp(op) {
   };
   return opMap[op] || "EQUAL";
 }
-async function setDocument(collectionPath, documentId, data, options) {
+
+// src/firestore/transforms.ts
+function extractFieldTransforms(data, fieldPrefix = "") {
+  const transforms = [];
+  for (const [key, value] of Object.entries(data)) {
+    const fieldPath = fieldPrefix ? `${fieldPrefix}.${key}` : key;
+    if (isFieldValue(value)) {
+      switch (value._type) {
+        case "serverTimestamp":
+          transforms.push({
+            fieldPath,
+            setToServerValue: "REQUEST_TIME"
+          });
+          break;
+        case "increment":
+          transforms.push({
+            fieldPath,
+            increment: toFirestoreValue(value._value)
+          });
+          break;
+        case "arrayUnion":
+          transforms.push({
+            fieldPath,
+            appendMissingElements: {
+              values: value._value.map((v) => toFirestoreValue(v))
+            }
+          });
+          break;
+        case "arrayRemove":
+          transforms.push({
+            fieldPath,
+            removeAllFromArray: {
+              values: value._value.map((v) => toFirestoreValue(v))
+            }
+          });
+          break;
+      }
+    }
+  }
+  return transforms;
+}
+function removeFieldTransforms(data) {
+  const result = {};
+  for (const [key, value] of Object.entries(data)) {
+    if (isFieldValue(value)) {
+      if (value._type === "delete") {
+        continue;
+      }
+      continue;
+    }
+    result[key] = value;
+  }
+  return result;
+}
+
+// src/token-generation.ts
+function base64UrlEncode(str) {
+  return btoa(str).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function base64UrlEncodeBuffer(buffer) {
+  return btoa(String.fromCharCode(...buffer)).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+async function createJWT(serviceAccount) {
+  const now = Math.floor(Date.now() / 1e3);
+  const expiry = now + 3600;
+  const header = {
+    alg: "RS256",
+    typ: "JWT"
+  };
+  const payload = {
+    iss: serviceAccount.client_email,
+    sub: serviceAccount.client_email,
+    aud: serviceAccount.token_uri,
+    iat: now,
+    exp: expiry,
+    scope: "https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/datastore https://www.googleapis.com/auth/firebase"
+  };
+  const encodedHeader = base64UrlEncode(JSON.stringify(header));
+  const encodedPayload = base64UrlEncode(JSON.stringify(payload));
+  const unsignedToken = `${encodedHeader}.${encodedPayload}`;
+  const pemContents = serviceAccount.private_key.replace("-----BEGIN PRIVATE KEY-----", "").replace("-----END PRIVATE KEY-----", "").replace(/\s/g, "");
+  const binaryDer = Uint8Array.from(atob(pemContents), (c) => c.charCodeAt(0));
+  const cryptoKey = await crypto.subtle.importKey(
+    "pkcs8",
+    binaryDer,
+    { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" },
+    false,
+    ["sign"]
+  );
+  const signature = await crypto.subtle.sign(
+    "RSASSA-PKCS1-v1_5",
+    cryptoKey,
+    new TextEncoder().encode(unsignedToken)
+  );
+  const encodedSignature = base64UrlEncodeBuffer(new Uint8Array(signature));
+  return `${unsignedToken}.${encodedSignature}`;
+}
+var cachedAccessToken = null;
+var tokenExpiry = 0;
+async function getAdminAccessToken() {
+  if (cachedAccessToken && Date.now() < tokenExpiry) {
+    return cachedAccessToken;
+  }
+  const serviceAccount = getServiceAccount();
+  const jwt = await createJWT(serviceAccount);
+  const response = await fetch(serviceAccount.token_uri, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer",
+      assertion: jwt
+    })
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Failed to get access token: ${errorText}`);
+  }
+  const data = await response.json();
+  cachedAccessToken = data.access_token;
+  tokenExpiry = Date.now() + data.expires_in * 1e3 - 6e4;
+  return cachedAccessToken;
+}
+function clearTokenCache() {
+  cachedAccessToken = null;
+  tokenExpiry = 0;
+}
+
+// src/firestore/operations.ts
+var FIRESTORE_API = "https://firestore.googleapis.com/v1";
+async function commitWrites(writes) {
   const accessToken = await getAdminAccessToken();
   const projectId = getProjectId();
-  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
+  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents:commit`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Authorization": `Bearer ${accessToken}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({ writes })
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Failed to commit writes: ${errorText}`);
+  }
+}
+async function setDocument(collectionPath, documentId, data, options) {
+  const projectId = getProjectId();
+  const documentPath = `projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
   const cleanData = removeFieldTransforms(data);
   const firestoreData = convertToFirestoreFormat(cleanData);
   const transforms = extractFieldTransforms(data);
-  const body = { fields: firestoreData };
+  if (transforms.length > 0) {
+    const updateWrite = {
+      update: {
+        name: documentPath,
+        fields: firestoreData
+      },
+      updateTransforms: transforms
+    };
+    const nonTransformFields = Object.keys(cleanData);
+    if (nonTransformFields.length > 0) {
+      if (options?.merge) {
+        updateWrite.updateMask = { fieldPaths: ["*"] };
+      } else if (options?.mergeFields && options.mergeFields.length > 0) {
+        updateWrite.updateMask = { fieldPaths: options.mergeFields };
+      } else {
+        updateWrite.updateMask = { fieldPaths: nonTransformFields };
+      }
+    }
+    await commitWrites([updateWrite]);
+    return;
+  }
+  const accessToken = await getAdminAccessToken();
+  const url = `${FIRESTORE_API}/${documentPath}`;
   let queryParams = "";
   if (options?.merge) {
     queryParams = "?updateMask.fieldPaths=*";
@@ -687,16 +734,13 @@ async function setDocument(collectionPath, documentId, data, options) {
     const fieldPaths = options.mergeFields.join("&updateMask.fieldPaths=");
     queryParams = `?updateMask.fieldPaths=${fieldPaths}`;
   }
-  if (transforms.length > 0) {
-    body.transforms = transforms;
-  }
   const response = await fetch(`${url}${queryParams}`, {
     method: "PATCH",
     headers: {
       "Authorization": `Bearer ${accessToken}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify(body)
+    body: JSON.stringify({ fields: firestoreData })
   });
   if (!response.ok) {
     const errorText = await response.text();
@@ -754,25 +798,51 @@ async function getDocument(collectionPath, documentId) {
   return convertFromFirestoreFormat(result.fields);
 }
 async function updateDocument(collectionPath, documentId, data) {
-  const accessToken = await getAdminAccessToken();
   const projectId = getProjectId();
-  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
+  const documentPath = `projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
   const cleanData = removeFieldTransforms(data);
   const firestoreData = convertToFirestoreFormat(cleanData);
   const transforms = extractFieldTransforms(data);
-  const updateMaskFields = Object.keys(data).filter((key) => !isFieldValue(data[key]) || data[key]._type !== "delete");
-  const updateMaskParams = updateMaskFields.map((field) => `updateMask.fieldPaths=${encodeURIComponent(field)}`).join("&");
-  const body = { fields: firestoreData };
+  const updateMaskFields = Object.keys(data).filter((key) => {
+    if (!isFieldValue(data[key])) {
+      return true;
+    }
+    return data[key]._type === "delete";
+  });
   if (transforms.length > 0) {
-    body.transforms = transforms;
+    const nonTransformFields = Object.keys(cleanData);
+    if (nonTransformFields.length === 0) {
+      const transformWrite = {
+        transform: {
+          document: documentPath,
+          fieldTransforms: transforms
+        }
+      };
+      await commitWrites([transformWrite]);
+      return;
+    }
+    const updateWrite = {
+      update: {
+        name: documentPath,
+        fields: firestoreData
+      },
+      updateMask: { fieldPaths: updateMaskFields },
+      updateTransforms: transforms,
+      currentDocument: { exists: true }
+    };
+    await commitWrites([updateWrite]);
+    return;
   }
+  const accessToken = await getAdminAccessToken();
+  const url = `${FIRESTORE_API}/${documentPath}`;
+  const updateMaskParams = updateMaskFields.map((field) => `updateMask.fieldPaths=${encodeURIComponent(field)}`).join("&");
   const response = await fetch(`${url}?${updateMaskParams}&currentDocument.exists=true`, {
     method: "PATCH",
     headers: {
       "Authorization": `Bearer ${accessToken}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify(body)
+    body: JSON.stringify({ fields: firestoreData })
   });
   if (!response.ok) {
     const errorText = await response.text();

package/dist/index.mjs

@@ -288,78 +288,6 @@ function getAuth() {
   };
 }
 
-// src/token-generation.ts
-function base64UrlEncode(str) {
-  return btoa(str).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
-}
-function base64UrlEncodeBuffer(buffer) {
-  return btoa(String.fromCharCode(...buffer)).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
-}
-async function createJWT(serviceAccount) {
-  const now = Math.floor(Date.now() / 1e3);
-  const expiry = now + 3600;
-  const header = {
-    alg: "RS256",
-    typ: "JWT"
-  };
-  const payload = {
-    iss: serviceAccount.client_email,
-    sub: serviceAccount.client_email,
-    aud: serviceAccount.token_uri,
-    iat: now,
-    exp: expiry,
-    scope: "https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/datastore https://www.googleapis.com/auth/firebase"
-  };
-  const encodedHeader = base64UrlEncode(JSON.stringify(header));
-  const encodedPayload = base64UrlEncode(JSON.stringify(payload));
-  const unsignedToken = `${encodedHeader}.${encodedPayload}`;
-  const pemContents = serviceAccount.private_key.replace("-----BEGIN PRIVATE KEY-----", "").replace("-----END PRIVATE KEY-----", "").replace(/\s/g, "");
-  const binaryDer = Uint8Array.from(atob(pemContents), (c) => c.charCodeAt(0));
-  const cryptoKey = await crypto.subtle.importKey(
-    "pkcs8",
-    binaryDer,
-    { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" },
-    false,
-    ["sign"]
-  );
-  const signature = await crypto.subtle.sign(
-    "RSASSA-PKCS1-v1_5",
-    cryptoKey,
-    new TextEncoder().encode(unsignedToken)
-  );
-  const encodedSignature = base64UrlEncodeBuffer(new Uint8Array(signature));
-  return `${unsignedToken}.${encodedSignature}`;
-}
-var cachedAccessToken = null;
-var tokenExpiry = 0;
-async function getAdminAccessToken() {
-  if (cachedAccessToken && Date.now() < tokenExpiry) {
-    return cachedAccessToken;
-  }
-  const serviceAccount = getServiceAccount();
-  const jwt = await createJWT(serviceAccount);
-  const response = await fetch(serviceAccount.token_uri, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer",
-      assertion: jwt
-    })
-  });
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`Failed to get access token: ${errorText}`);
-  }
-  const data = await response.json();
-  cachedAccessToken = data.access_token;
-  tokenExpiry = Date.now() + data.expires_in * 1e3 - 6e4;
-  return cachedAccessToken;
-}
-function clearTokenCache() {
-  cachedAccessToken = null;
-  tokenExpiry = 0;
-}
-
 // src/field-value.ts
 function serverTimestamp() {
   return {
@@ -400,8 +328,7 @@ var FieldValue = {
   delete: deleteField
 };
 
-// src/firestore-rest.ts
-var FIRESTORE_API = "https://firestore.googleapis.com/v1";
+// src/firestore/converters.ts
 function toFirestoreValue(value) {
   if (value === null || value === void 0) {
     return { nullValue: null };
@@ -461,58 +388,6 @@ function convertToFirestoreFormat(data) {
   }
   return result;
 }
-function extractFieldTransforms(data, fieldPrefix = "") {
-  const transforms = [];
-  for (const [key, value] of Object.entries(data)) {
-    const fieldPath = fieldPrefix ? `${fieldPrefix}.${key}` : key;
-    if (isFieldValue(value)) {
-      switch (value._type) {
-        case "serverTimestamp":
-          transforms.push({
-            fieldPath,
-            setToServerValue: "REQUEST_TIME"
-          });
-          break;
-        case "increment":
-          transforms.push({
-            fieldPath,
-            increment: toFirestoreValue(value._value)
-          });
-          break;
-        case "arrayUnion":
-          transforms.push({
-            fieldPath,
-            appendMissingElements: {
-              values: value._value.map((v) => toFirestoreValue(v))
-            }
-          });
-          break;
-        case "arrayRemove":
-          transforms.push({
-            fieldPath,
-            removeAllFromArray: {
-              values: value._value.map((v) => toFirestoreValue(v))
-            }
-          });
-          break;
-      }
-    }
-  }
-  return transforms;
-}
-function removeFieldTransforms(data) {
-  const result = {};
-  for (const [key, value] of Object.entries(data)) {
-    if (isFieldValue(value)) {
-      if (value._type === "delete") {
-        continue;
-      }
-      continue;
-    }
-    result[key] = value;
-  }
-  return result;
-}
 function fromFirestoreValue(value) {
   if ("stringValue" in value) {
     return value.stringValue;
@@ -541,12 +416,17 @@ function fromFirestoreValue(value) {
   return null;
 }
 function convertFromFirestoreFormat(fields) {
+  if (!fields) {
+    return {};
+  }
   const result = {};
   for (const [key, value] of Object.entries(fields)) {
     result[key] = fromFirestoreValue(value);
   }
   return result;
 }
+
+// src/firestore/query-builder.ts
 function buildStructuredQuery(collectionPath, options) {
   const pathSegments = collectionPath.split("/");
   const collectionId = pathSegments[pathSegments.length - 1];
@@ -629,14 +509,181 @@ function mapWhereOp(op) {
   };
   return opMap[op] || "EQUAL";
 }
-async function setDocument(collectionPath, documentId, data, options) {
+
+// src/firestore/transforms.ts
+function extractFieldTransforms(data, fieldPrefix = "") {
+  const transforms = [];
+  for (const [key, value] of Object.entries(data)) {
+    const fieldPath = fieldPrefix ? `${fieldPrefix}.${key}` : key;
+    if (isFieldValue(value)) {
+      switch (value._type) {
+        case "serverTimestamp":
+          transforms.push({
+            fieldPath,
+            setToServerValue: "REQUEST_TIME"
+          });
+          break;
+        case "increment":
+          transforms.push({
+            fieldPath,
+            increment: toFirestoreValue(value._value)
+          });
+          break;
+        case "arrayUnion":
+          transforms.push({
+            fieldPath,
+            appendMissingElements: {
+              values: value._value.map((v) => toFirestoreValue(v))
+            }
+          });
+          break;
+        case "arrayRemove":
+          transforms.push({
+            fieldPath,
+            removeAllFromArray: {
+              values: value._value.map((v) => toFirestoreValue(v))
+            }
+          });
+          break;
+      }
+    }
+  }
+  return transforms;
+}
+function removeFieldTransforms(data) {
+  const result = {};
+  for (const [key, value] of Object.entries(data)) {
+    if (isFieldValue(value)) {
+      if (value._type === "delete") {
+        continue;
+      }
+      continue;
+    }
+    result[key] = value;
+  }
+  return result;
+}
+
+// src/token-generation.ts
+function base64UrlEncode(str) {
+  return btoa(str).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function base64UrlEncodeBuffer(buffer) {
+  return btoa(String.fromCharCode(...buffer)).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+async function createJWT(serviceAccount) {
+  const now = Math.floor(Date.now() / 1e3);
+  const expiry = now + 3600;
+  const header = {
+    alg: "RS256",
+    typ: "JWT"
+  };
+  const payload = {
+    iss: serviceAccount.client_email,
+    sub: serviceAccount.client_email,
+    aud: serviceAccount.token_uri,
+    iat: now,
+    exp: expiry,
+    scope: "https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/datastore https://www.googleapis.com/auth/firebase"
+  };
+  const encodedHeader = base64UrlEncode(JSON.stringify(header));
+  const encodedPayload = base64UrlEncode(JSON.stringify(payload));
+  const unsignedToken = `${encodedHeader}.${encodedPayload}`;
+  const pemContents = serviceAccount.private_key.replace("-----BEGIN PRIVATE KEY-----", "").replace("-----END PRIVATE KEY-----", "").replace(/\s/g, "");
+  const binaryDer = Uint8Array.from(atob(pemContents), (c) => c.charCodeAt(0));
+  const cryptoKey = await crypto.subtle.importKey(
+    "pkcs8",
+    binaryDer,
+    { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" },
+    false,
+    ["sign"]
+  );
+  const signature = await crypto.subtle.sign(
+    "RSASSA-PKCS1-v1_5",
+    cryptoKey,
+    new TextEncoder().encode(unsignedToken)
+  );
+  const encodedSignature = base64UrlEncodeBuffer(new Uint8Array(signature));
+  return `${unsignedToken}.${encodedSignature}`;
+}
+var cachedAccessToken = null;
+var tokenExpiry = 0;
+async function getAdminAccessToken() {
+  if (cachedAccessToken && Date.now() < tokenExpiry) {
+    return cachedAccessToken;
+  }
+  const serviceAccount = getServiceAccount();
+  const jwt = await createJWT(serviceAccount);
+  const response = await fetch(serviceAccount.token_uri, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer",
+      assertion: jwt
+    })
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Failed to get access token: ${errorText}`);
+  }
+  const data = await response.json();
+  cachedAccessToken = data.access_token;
+  tokenExpiry = Date.now() + data.expires_in * 1e3 - 6e4;
+  return cachedAccessToken;
+}
+function clearTokenCache() {
+  cachedAccessToken = null;
+  tokenExpiry = 0;
+}
+
+// src/firestore/operations.ts
+var FIRESTORE_API = "https://firestore.googleapis.com/v1";
+async function commitWrites(writes) {
   const accessToken = await getAdminAccessToken();
   const projectId = getProjectId();
-  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
+  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents:commit`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Authorization": `Bearer ${accessToken}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({ writes })
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Failed to commit writes: ${errorText}`);
+  }
+}
+async function setDocument(collectionPath, documentId, data, options) {
+  const projectId = getProjectId();
+  const documentPath = `projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
   const cleanData = removeFieldTransforms(data);
   const firestoreData = convertToFirestoreFormat(cleanData);
   const transforms = extractFieldTransforms(data);
-  const body = { fields: firestoreData };
+  if (transforms.length > 0) {
+    const updateWrite = {
+      update: {
+        name: documentPath,
+        fields: firestoreData
+      },
+      updateTransforms: transforms
+    };
+    const nonTransformFields = Object.keys(cleanData);
+    if (nonTransformFields.length > 0) {
+      if (options?.merge) {
+        updateWrite.updateMask = { fieldPaths: ["*"] };
+      } else if (options?.mergeFields && options.mergeFields.length > 0) {
+        updateWrite.updateMask = { fieldPaths: options.mergeFields };
+      } else {
+        updateWrite.updateMask = { fieldPaths: nonTransformFields };
+      }
+    }
+    await commitWrites([updateWrite]);
+    return;
+  }
+  const accessToken = await getAdminAccessToken();
+  const url = `${FIRESTORE_API}/${documentPath}`;
   let queryParams = "";
   if (options?.merge) {
     queryParams = "?updateMask.fieldPaths=*";
@@ -644,16 +691,13 @@ async function setDocument(collectionPath, documentId, data, options) {
     const fieldPaths = options.mergeFields.join("&updateMask.fieldPaths=");
     queryParams = `?updateMask.fieldPaths=${fieldPaths}`;
   }
-  if (transforms.length > 0) {
-    body.transforms = transforms;
-  }
   const response = await fetch(`${url}${queryParams}`, {
     method: "PATCH",
     headers: {
       "Authorization": `Bearer ${accessToken}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify(body)
+    body: JSON.stringify({ fields: firestoreData })
   });
   if (!response.ok) {
     const errorText = await response.text();
@@ -711,25 +755,51 @@ async function getDocument(collectionPath, documentId) {
   return convertFromFirestoreFormat(result.fields);
 }
 async function updateDocument(collectionPath, documentId, data) {
-  const accessToken = await getAdminAccessToken();
   const projectId = getProjectId();
-  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
+  const documentPath = `projects/${projectId}/databases/(default)/documents/${collectionPath}/${documentId}`;
   const cleanData = removeFieldTransforms(data);
   const firestoreData = convertToFirestoreFormat(cleanData);
   const transforms = extractFieldTransforms(data);
-  const updateMaskFields = Object.keys(data).filter((key) => !isFieldValue(data[key]) || data[key]._type !== "delete");
-  const updateMaskParams = updateMaskFields.map((field) => `updateMask.fieldPaths=${encodeURIComponent(field)}`).join("&");
-  const body = { fields: firestoreData };
+  const updateMaskFields = Object.keys(data).filter((key) => {
+    if (!isFieldValue(data[key])) {
+      return true;
+    }
+    return data[key]._type === "delete";
+  });
   if (transforms.length > 0) {
-    body.transforms = transforms;
+    const nonTransformFields = Object.keys(cleanData);
+    if (nonTransformFields.length === 0) {
+      const transformWrite = {
+        transform: {
+          document: documentPath,
+          fieldTransforms: transforms
+        }
+      };
+      await commitWrites([transformWrite]);
+      return;
+    }
+    const updateWrite = {
+      update: {
+        name: documentPath,
+        fields: firestoreData
+      },
+      updateMask: { fieldPaths: updateMaskFields },
+      updateTransforms: transforms,
+      currentDocument: { exists: true }
+    };
+    await commitWrites([updateWrite]);
+    return;
   }
+  const accessToken = await getAdminAccessToken();
+  const url = `${FIRESTORE_API}/${documentPath}`;
+  const updateMaskParams = updateMaskFields.map((field) => `updateMask.fieldPaths=${encodeURIComponent(field)}`).join("&");
   const response = await fetch(`${url}?${updateMaskParams}&currentDocument.exists=true`, {
     method: "PATCH",
     headers: {
       "Authorization": `Bearer ${accessToken}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify(body)
+    body: JSON.stringify({ fields: firestoreData })
   });
   if (!response.ok) {
     const errorText = await response.text();

package/firebase.json

@@ -0,0 +1,9 @@
+{
+  "projects": {
+    "default": "prmichaelsen-firebase-e2e"
+  },
+  "firestore": {
+    "rules": "firestore.rules",
+    "indexes": "firestore.indexes.json"
+  }
+}

package/firestore.indexes.json

@@ -0,0 +1,33 @@
+{
+  "indexes": [
+    {
+      "collectionGroup": "e2e-tests",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "_test",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "age",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "messages",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "_test",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "ASCENDING"
+        }
+      ]
+    }
+  ],
+  "fieldOverrides": []
+}

package/firestore.rules

@@ -0,0 +1,11 @@
+rules_version = '2';
+
+service cloud.firestore {
+  match /databases/{database}/documents {
+    // Allow all reads and writes for testing
+    // WARNING: These rules are for testing only!
+    match /{document=**} {
+      allow read, write: if true;
+    }
+  }
+}

package/jest.e2e.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/*.e2e.ts'],
+  testTimeout: 30000, // 30 seconds for real API calls
+  roots: ['<rootDir>/src'],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.spec.ts',
+    '!src/**/*.e2e.ts',
+    '!src/types.ts',
+    '!src/index.ts',
+  ],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prmichaelsen/firebase-admin-sdk-v8",
-  "version": "2.0.16",
+  "version": "2.0.19",
   "description": "Firebase Admin SDK for Cloudflare Workers and edge runtimes using REST APIs",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,7 +26,10 @@
     "typecheck": "tsc --noEmit",
     "test": "jest",
     "test:watch": "jest --watch",
-    "publish": "npm run build && npm publish"
+    "test:e2e": "jest --config jest.e2e.config.js",
+    "test:e2e:watch": "jest --config jest.e2e.config.js --watch",
+    "test:all": "npm test && npm run test:e2e",
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "firebase",

package/service-account.json

@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "prmichaelsen-firebase-e2e",
+  "private_key_id": "84caabb8515ec5fab4caa53a0f85405c270d5cd4",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/0n8V7m7vCQ9/\n5FGYL5V20pQxliUMF/ycNBSV/xHrXAvTMxyMEjFK8Tg9sBLdYhuxC488lnwm3/o+\nn5JkckQ2AyzXX6mi+camwxdLXmT97kXqdFLisO4PY7Fv6HvvMgRQqysj7aJkyiz7\nrAs0DpQq1L70sBFdVLiScPH9FFnuV0EeyOTuVgYwGYk1L76/U7bb3WLNCmcmtG+Y\nt4BNzyMqFgtIdXCQFVBQf9HXy3x5xk8a1rrkf7pEuiwK0PXCDIVH7GYX4xCiQ1qs\nYF4IunNFhcwu1hk5XTIDSVrIn/qLPMZvEcBqHxIJd5JvePjx5hPP81b1mrGUVske\nsaRimjxxAgMBAAECggEAAWNKVG7KslkMRH5y5q56yYbMLVsAPp5SehDYZfNtU5jG\nucr2CxS7SDxcOKS0UOdmUDlyBQaztED3mbS5hZeGuHtSZjvaHtnpdDMXe+NIHhw3\nY520LHwKOjtG69/bPFz4x1qjBRoG4Zgi4NlFpXqbhinO4zdTkNYi6xBSd+R0oshP\nSo59lQvs8e3bMD4f4uTl7JxUifjVM64R3gCkH6AbGqU01wg8UzsllCf0fQM04w8i\nq1oVjhBVWYYVE7w2H+EU+LdiRSRET+Vrk5dtBL3vI6yckvGmxTBMnkK2gTFAAR6F\nnN4NKlUsiFol9WVRY3tdRNOnStjlORDyerSEFQaqhwKBgQDfAa5ddxBVbxUS3E2a\nnGJRA44fYlRyZf9KnJdz8uWsCvuG7UYbe2bp7TxlpEXdTG6Vqu/hhYWd/msmhupZ\nc+YFg1HWE1Ee+nQv7iwAD+okfncnKGIC65XjwaSEMRGrmtxBL6Qq4yxn/Yug/8YR\nniGRQKuMtJ2ZA0p41vI6Mkt7kwKBgQDcM7eQQ5482FcXuOfUlPoiWnd+pF5mNrU1\ngKoxdsXMYRKyTGMPLrOKqsf6kisQUlA48vWRCQOa9QBSjHktfOt2EZ3mNQz5k3AR\n/dIjCGf+ATr2P9Sc0uo7sA20XB62wmG+t2A/vxf9WzBAgdDk6nENB4nz6lL9xcak\ngvVt2vXSawKBgQCV6JRk4f/J3oVFC3DjaRKyMPid4kSwLh6B8mfhGrwHfc59cgz5\ntmeFAuPh057fV1zTIXhlmpMqlPdEi9cHUOCkfhVKGewjLetiuPE9DXWxGI5SdVQF\ncIZu9yH3duDRAaXj7/mklteoBAmTrbxg5XLdKKLpUBTM4ihyuNNWCa8yHwKBgCYK\noTnBFMM6NMGaZiKpohTxQBeW2eAar2+QzNZCyKUoWAyJecuTq9zW6Dl3qwzky4sr\nHhVyUzcgAHBCaGTdYehB3t94ZsdvGztgeD8pIp4VJFSKbnaxUVoCbjusdnnoVu6V\ny4D3yHMyn8FlK+uAPQudM835u2CwHEMrhK731uQFAoGBAKO0crVWuY1EP1RLSyLK\nIS3uUgbauBbQlE4ZPBTi84vXCZjN/53obFgkPHJ5tdjxj6C8x58jgHg/Hufyvbib\ngOQQxadM90UBumlzA8lV7A9jvL2ryfop9ketnVO5hPvB4O8iw9Z1R+25FeM9ZFJI\nqmEjiy9Nhmvpvur+FZ85qcRm\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-fbsvc@prmichaelsen-firebase-e2e.iam.gserviceaccount.com",
+  "client_id": "103889460014910902622",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-fbsvc%40prmichaelsen-firebase-e2e.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}