@firestore-repository/google-cloud-firestore 0.2.1 → 0.4.0

package/README.md

@@ -93,7 +93,7 @@ await repository.delete({ userId: 'user2' });
 import { condition as $, limit, query, where } from 'firestore-repository/query';
 
 // Define a query
-const query1 = query(users, where($('profile.age', '>=', 20)), limit(10));
+const query1 = query(users, $('profile.age', '>=', 20), limit(10));
 
 // List documents
 const docs = await repository.list(query1);

package/build/esm/index.d.ts

@@ -1,5 +1,5 @@
 import { type DocumentReference, type DocumentSnapshot, Filter, type Firestore, type Query as FirestoreQuery, Transaction, type WriteBatch } from '@google-cloud/firestore';
-import type { AggregateQuery, Aggregated } from 'firestore-repository/aggregate';
+import type { AggregateSpec, Aggregated } from 'firestore-repository/aggregate';
 import type { WriteDocumentData } from 'firestore-repository/document';
 import type { FilterExpression, Offset, Query } from 'firestore-repository/query';
 import type * as repository from 'firestore-repository/repository';
@@ -19,7 +19,7 @@ export declare class Repository<T extends CollectionSchema = CollectionSchema> i
     getOnSnapshot(id: Id<T>, next: (snapshot: Model<T> | undefined) => void, error?: (error: Error) => void): repository.Unsubscribe;
     list(query: Query<T>): Promise<Model<T>[]>;
     listOnSnapshot(query: Query<T>, next: (snapshot: Model<T>[]) => void, error?: (error: Error) => void): repository.Unsubscribe;
-    aggregate<U extends AggregateQuery<T>>(aggregate: U): Promise<Aggregated<U>>;
+    aggregate<U extends AggregateSpec<T>>(query: Query<T>, spec: U): Promise<Aggregated<U>>;
     /**
      * Create a new document
      * @throws If the document already exists

package/build/esm/index.js

@@ -29,9 +29,9 @@ export class Repository {
             next(snapshot.docs.map((doc) => this.fromFirestore(doc)));
         }, error);
     }
-    async aggregate(aggregate) {
+    async aggregate(query, spec) {
         const aggregateSpec = {};
-        for (const [k, v] of Object.entries(aggregate.spec)) {
+        for (const [k, v] of Object.entries(spec)) {
             switch (v.kind) {
                 case 'count':
                     aggregateSpec[k] = AggregateField.count();
@@ -46,7 +46,7 @@ export class Repository {
                     return assertNever(v);
             }
         }
-        const res = await toFirestoreQuery(this.db, aggregate.query).aggregate(aggregateSpec).get();
+        const res = await toFirestoreQuery(this.db, query).aggregate(aggregateSpec).get();
         return res.data();
     }
     /**
@@ -167,7 +167,9 @@ export const toFirestoreQuery = (db, query) => {
     return (query.constraints?.reduce((q, constraint) => {
         switch (constraint.kind) {
             case 'where':
-                return q.where(toFirestoreFilter(constraint.filter));
+            case 'or':
+            case 'and':
+                return q.where(toFirestoreFilter(constraint));
             case 'orderBy':
                 return q.orderBy(constraint.field, constraint.direction);
             case 'limit':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestore-repository/google-cloud-firestore",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "A minimum and universal Firestore ORM (Repository Pattern) for TypeScript",
   "homepage": "https://github.com/ikenox/firestore-repository",
   "repository": {
@@ -10,7 +10,7 @@
   "type": "module",
   "dependencies": {
     "@google-cloud/firestore": "^7.10.0",
-    "firestore-repository": "0.2.1"
+    "firestore-repository": "0.4.0"
   },
   "exports": {
     ".": {