@prmichaelsen/firebase-admin-sdk-v8 2.0.10 → 2.0.12

package/dist/index.js

@@ -591,8 +591,14 @@ function convertFromFirestoreFormat(fields) {
   return result;
 }
 function buildStructuredQuery(collectionPath, options) {
+  const pathSegments = collectionPath.split("/");
+  const collectionId = pathSegments[pathSegments.length - 1];
+  const fromClause = { collectionId };
+  if (pathSegments.length > 1) {
+    fromClause.allDescendants = false;
+  }
   const query = {
-    from: [{ collectionId: collectionPath.split("/").pop() }]
+    from: [fromClause]
   };
   if (options?.where && options.where.length > 0) {
     const filters = options.where.map((filter) => ({
@@ -791,8 +797,8 @@ async function queryDocuments(collectionPath, options) {
   const accessToken = await getAdminAccessToken();
   const projectId = getProjectId();
   if (!options || Object.keys(options).length === 0) {
-    const url2 = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}`;
-    const response2 = await fetch(url2, {
+    const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}`;
+    const response2 = await fetch(url, {
       headers: {
         "Authorization": `Bearer ${accessToken}`
       }
@@ -808,9 +814,16 @@ async function queryDocuments(collectionPath, options) {
       data: convertFromFirestoreFormat(doc.fields)
     }));
   }
-  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents:runQuery`;
+  const pathSegments = collectionPath.split("/");
+  let queryUrl;
+  if (pathSegments.length > 1) {
+    const parentPath = pathSegments.slice(0, -1).join("/");
+    queryUrl = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${parentPath}:runQuery`;
+  } else {
+    queryUrl = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents:runQuery`;
+  }
   const structuredQuery = buildStructuredQuery(collectionPath, options);
-  const response = await fetch(url, {
+  const response = await fetch(queryUrl, {
     method: "POST",
     headers: {
       "Authorization": `Bearer ${accessToken}`,

package/dist/index.mjs

@@ -548,8 +548,14 @@ function convertFromFirestoreFormat(fields) {
   return result;
 }
 function buildStructuredQuery(collectionPath, options) {
+  const pathSegments = collectionPath.split("/");
+  const collectionId = pathSegments[pathSegments.length - 1];
+  const fromClause = { collectionId };
+  if (pathSegments.length > 1) {
+    fromClause.allDescendants = false;
+  }
   const query = {
-    from: [{ collectionId: collectionPath.split("/").pop() }]
+    from: [fromClause]
   };
   if (options?.where && options.where.length > 0) {
     const filters = options.where.map((filter) => ({
@@ -748,8 +754,8 @@ async function queryDocuments(collectionPath, options) {
   const accessToken = await getAdminAccessToken();
   const projectId = getProjectId();
   if (!options || Object.keys(options).length === 0) {
-    const url2 = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}`;
-    const response2 = await fetch(url2, {
+    const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${collectionPath}`;
+    const response2 = await fetch(url, {
       headers: {
         "Authorization": `Bearer ${accessToken}`
       }
@@ -765,9 +771,16 @@ async function queryDocuments(collectionPath, options) {
       data: convertFromFirestoreFormat(doc.fields)
     }));
   }
-  const url = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents:runQuery`;
+  const pathSegments = collectionPath.split("/");
+  let queryUrl;
+  if (pathSegments.length > 1) {
+    const parentPath = pathSegments.slice(0, -1).join("/");
+    queryUrl = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents/${parentPath}:runQuery`;
+  } else {
+    queryUrl = `${FIRESTORE_API}/projects/${projectId}/databases/(default)/documents:runQuery`;
+  }
   const structuredQuery = buildStructuredQuery(collectionPath, options);
-  const response = await fetch(url, {
+  const response = await fetch(queryUrl, {
     method: "POST",
     headers: {
       "Authorization": `Bearer ${accessToken}`,

package/jest.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  roots: ['<rootDir>/src'],
+  testMatch: ['**/*.spec.ts'],
+  moduleFileExtensions: ['ts', 'js'],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+    '!src/**/*.spec.ts',
+  ],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prmichaelsen/firebase-admin-sdk-v8",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "Firebase Admin SDK for Cloudflare Workers and edge runtimes using REST APIs",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -23,7 +23,9 @@
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",
     "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test": "jest",
+    "test:watch": "jest --watch"
   },
   "keywords": [
     "firebase",
@@ -37,9 +39,11 @@
   ],
   "author": "",
   "license": "MIT",
-  "dependencies": {},
   "devDependencies": {
+    "@types/jest": "^30.0.0",
     "@types/node": "^20.11.0",
+    "jest": "^30.2.0",
+    "ts-jest": "^29.4.6",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3"
   }