Add OR query snippets

.github/workflows/test.yml

@@ -13,15 +13,16 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 14.x
+          - 20.x
+          - 22.x
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Cache npm
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package.json') }}

.gitignore

@@ -5,4 +5,3 @@ tsconfig.json
 dist/
 .DS_Store
 .idea
-pnpm-lock.yaml

eslint.config.js

@@ -0,0 +1,14 @@
+
+import { defineConfig } from "eslint/config";
+import js from "@eslint/js";
+
+export default defineConfig([
+  js.configs.recommended,
+	{
+		rules: {
+      "no-unused-vars": "off",
+      "no-undef": "off",
+      "no-redeclare": "off"
+		},
+	},
+]);

firestore-next/package.json

@@ -6,13 +6,13 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^10.0.0",
-    "geofire-common": "^5.1.0"
+    "firebase": "^12.4.0",
+    "geofire-common": "^6.0.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.12",
-    "@types/mocha": "^8.0.3",
-    "chai": "^4.2.0",
-    "mocha": "^8.1.3"
+    "@types/chai": "^5.2.3",
+    "@types/mocha": "^10.0.10",
+    "chai": "^6.2.0",
+    "mocha": "^11.7.4"
   }
 }

firestore-next/test.firestore.js

@@ -2,6 +2,7 @@
 // [SNIPPETS_SEPARATION enabled]
 
 const { expect } = require('chai');
+import { or } from "firebase/firestore";
 
 // [START city_custom_object]
 class City {
@@ -892,7 +893,7 @@ describe("firestore", () => {
               const { query, where } = require("firebase/firestore");  
 
               const q = query(citiesRef, 
-                where('regions', 'array-contains-any', ['west_coast', 'east_coast']));
+                where('regions', 'array-contains-any', [['west_coast'], ['east_coast']]));
               // [END array_contains_any_filter]
             });
 
@@ -1102,6 +1103,77 @@ describe("firestore", () => {
                   limit(25));
               // [END paginate]
             });
+
+            it("should handle OR queries", async () => {
+              const { collection, query, where, and } = require("firebase/firestore");
+              // [START or_query]
+              const q = query(collection(db, "cities"), and(
+                where('state', '==', 'CA'),   
+                or(
+                  where('capital', '==', true),
+                  where('population', '>=', 1000000)
+                )
+              ));
+              // [END or_query]
+            });
+
+            it("should allow for 30 or fewer disjunctions", async () => {
+              const { collection, query, where, and } = require("firebase/firestore");
+              const collectionRef = collection(db, "cities");
+              // [START one_disjunction]
+              query(collectionRef, where("a", "==", 1));
+              // [END one_disjunction]
+
+              // [START two_disjunctions]
+              query(collectionRef, or( where("a", "==", 1), where("b", "==", 2) ));
+              // [END two_disjunctions]
+
+              // [START four_disjunctions]
+              query(collectionRef,
+                or( and( where("a", "==", 1), where("c", "==", 3) ),
+                    and( where("a", "==", 1), where("d", "==", 4) ),
+                    and( where("b", "==", 2), where("c", "==", 3) ),
+                    and( where("b", "==", 2), where("d", "==", 4) )
+                )
+              );
+              // [END four_disjunctions]
+
+              // [START four_disjunctions_compact]
+              query(collectionRef,
+                and( or( where("a", "==", 1), where("b", "==", 2) ),
+                     or( where("c", "==", 3), where("d", "==", 4) )
+                )
+              );
+              // [END four_disjunctions_compact]
+
+              expect(() => {
+                // [START 50_disjunctions]
+                query(collectionRef,
+                  and( where("a", "in", [1, 2, 3, 4, 5]),
+                       where("b", "in", [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+                  )
+                );
+                // [END 50_disjunctions]
+              }).to.throw;
+
+              // [START 20_disjunctions]
+              query(collectionRef,
+                or( where("a", "in", [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]),
+                    where("b", "in", [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+                )
+              );
+              // [END 20_disjunctions]
+
+              // [START 10_disjunctions]
+              query(collectionRef,
+                and( where("a", "in", [1, 2, 3, 4, 5]),
+                     or( where("b", "==", 2),
+                         where("c", "==", 3)
+                     )
+                )
+              );
+              // [END 10_disjunctions]
+            });
         });
 
         describe('collectionGroup(landmarks)', () => {

firestore-next/test.solution-geoqueries.js

@@ -29,6 +29,9 @@ async function addHash(done) {
   done();
 }
 
+// tsc complains `center` can have more or fewer than 2 elements, but
+// since this is a js file there's no way of more accurately specifying
+// `center`'s type.
 async function queryHashes(done) {
   // [START fs_geo_query_hashes]
   const { collection, query, orderBy, startAt, endAt, getDocs } = require('firebase/firestore');
@@ -40,6 +43,7 @@ async function queryHashes(done) {
   // Each item in 'bounds' represents a startAt/endAt pair. We have to issue
   // a separate query for each pair. There can be up to 9 pairs of bounds
   // depending on overlap, but in most cases there are 4.
+  // @ts-ignore
   const bounds = geofire.geohashQueryBounds(center, radiusInM);
   const promises = [];
   for (const b of bounds) {
@@ -63,6 +67,7 @@ async function queryHashes(done) {
 
       // We have to filter out a few false positives due to GeoHash
       // accuracy, but most will match
+      // @ts-ignore
       const distanceInKm = geofire.distanceBetween([lat, lng], center);
       const distanceInM = distanceInKm * 1000;
       if (distanceInM <= radiusInM) {

firestore/test.firestore.js

@@ -877,7 +877,7 @@ describe("firestore", () => {
                 const citiesRef = db.collection('cities');
                 // [START array_contains_any_filter]
                 citiesRef.where('regions', 'array-contains-any',
-                    ['west_coast', 'east_coast']);
+                    [['west_coast'], ['east_coast']]);
                 // [END array_contains_any_filter]
             });
 

installations/package.json

@@ -1,7 +1,9 @@
 {
   "name": "installations",
   "version": "1.0.0",
-  "scripts": {},
+  "scripts": {
+    "compile": "echo 'Installations build temporarily disabled'"
+  },
   "license": "Apache 2.0",
   "dependencies": {
     "firebase": "^8.10.0"

package.json

@@ -1,20 +1,21 @@
 {
   "name": "snippets-web",
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
-    "snippets": "rimraf snippets && ts-node scripts/separate-snippets.ts",
+    "snippets": "rimraf snippets && node --loader ts-node/esm scripts/separate-snippets.ts",
     "lint": "git ls-files | grep -v 'snippets/' | grep '.js$' | xargs npx eslint",
     "format": "npm run lint -- --fix",
-    "bootstrap": "pnpm recursive install",
-    "compile": "pnpm recursive run compile --workspace-concurrency=4"
+    "bootstrap": "find . -type f -name package.json -not -path '*/node_modules/*' -exec bash -c 'cd $(dirname {}) && npm install' \\;",
+    "compile": "bash scripts/compile.sh"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/node": "^16.7.10",
-    "eslint": "^7.32.0",
-    "pnpm": "^6.14.6",
-    "rimraf": "^3.0.2",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.4.2"
+    "@eslint/js": "^9.38.0",
+    "@types/node": "^24.9.1",
+    "eslint": "^9.38.0",
+    "rimraf": "^5.0.10",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.0"
   }
 }

scripts/checkdirty.sh

@@ -11,5 +11,5 @@ if [[ $(git diff --stat HEAD) != '' ]]; then
   echo 'Error: git diff is dirty ... did you forget to run "npm run snippets" after adding snippets?'
   exit 1
 else
-  echo 'Succes: git diff is clean'
+  echo 'Success: git diff is clean'
 fi

scripts/compile.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Runs `npm run compile` across all snippet directories.
+
+echo "Starting package compilation search..."
+
+# Iterate over all direct subdirectories (ending with /)
+# The glob pattern '*/' ensures we only look at directories at this level.
+for dir in */; do
+    # Strip the trailing slash for cleaner output and directory path usage
+    subdir="${dir%/}"
+
+    # Check if a package.json file exists in the current subdirectory
+    if [[ -f "$subdir/package.json" && "$subdir" != "scripts" ]]; then
+        echo "--> Found package.json in '$subdir'. Running 'npm run compile'..."
+
+        # Use a subshell (parentheses) for the 'cd' command.
+        # This executes 'cd' and 'npm run compile' in a separate process,
+        # ensuring the main script's working directory doesn't change,
+        # and the loop continues correctly from the parent path.
+        if (cd "$subdir" && npm run compile); then
+            echo "Successfully compiled '$subdir'."
+        else
+            echo "ERROR: Compilation failed for '$subdir'. Check the output above."
+            exit 1
+        fi
+
+    else
+        : # skip directories like snippets and .github
+    fi
+done
+
+echo "Package compilation search complete."

scripts/package.json

@@ -1,6 +1,7 @@
 {
   "name": "scripts",
   "version": "1.0.0",
+  "type": "module",
   "description": "Internal repo scripts",
   "scripts": {
   },

snippets/firestore-next/test-firestore/array_contains_any_filter.js

@@ -8,5 +8,5 @@
 import { query, where } from "firebase/firestore";  
 
 const q = query(citiesRef, 
-  where('regions', 'array-contains-any', ['west_coast', 'east_coast']));
+  where('regions', 'array-contains-any', [['west_coast'], ['east_coast']]));
 // [END array_contains_any_filter_modular]

snippets/firestore-next/test-firestore/four_disjunctions.js

@@ -0,0 +1,15 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START four_disjunctions_modular]
+query(collectionRef,
+  or( and( where("a", "==", 1), where("c", "==", 3) ),
+      and( where("a", "==", 1), where("d", "==", 4) ),
+      and( where("b", "==", 2), where("c", "==", 3) ),
+      and( where("b", "==", 2), where("d", "==", 4) )
+  )
+);
+// [END four_disjunctions_modular]

snippets/firestore-next/test-firestore/four_disjunctions_compact.js

@@ -0,0 +1,13 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START four_disjunctions_compact_modular]
+query(collectionRef,
+  and( or( where("a", "==", 1), where("b", "==", 2) ),
+       or( where("c", "==", 3), where("d", "==", 4) )
+  )
+);
+// [END four_disjunctions_compact_modular]

snippets/firestore-next/test-firestore/one_disjunction.js

@@ -0,0 +1,9 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START one_disjunction_modular]
+query(collectionRef, where("a", "==", 1));
+// [END one_disjunction_modular]

snippets/firestore-next/test-firestore/or_query.js

@@ -0,0 +1,15 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START or_query_modular]
+const q = query(collection(db, "cities"), and(
+  where('state', '==', 'CA'),   
+  or(
+    where('capital', '==', true),
+    where('population', '>=', 1000000)
+  )
+));
+// [END or_query_modular]

snippets/firestore-next/test-firestore/two_disjunctions.js

@@ -0,0 +1,9 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START two_disjunctions_modular]
+query(collectionRef, or( where("a", "==", 1), where("b", "==", 2) ));
+// [END two_disjunctions_modular]

snippets/firestore-next/test-solution-geoqueries/fs_geo_query_hashes.js

@@ -14,6 +14,7 @@ const radiusInM = 50 * 1000;
 // Each item in 'bounds' represents a startAt/endAt pair. We have to issue
 // a separate query for each pair. There can be up to 9 pairs of bounds
 // depending on overlap, but in most cases there are 4.
+// @ts-ignore
 const bounds = geofire.geohashQueryBounds(center, radiusInM);
 const promises = [];
 for (const b of bounds) {
@@ -37,6 +38,7 @@ for (const snap of snapshots) {
 
     // We have to filter out a few false positives due to GeoHash
     // accuracy, but most will match
+    // @ts-ignore
     const distanceInKm = geofire.distanceBetween([lat, lng], center);
     const distanceInM = distanceInKm * 1000;
     if (distanceInM <= radiusInM) {