@firestore-repository/firebase-js-sdk 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, type Firestore, type Query as FirestoreQuery, Transaction, type WriteBatch } from '@firebase/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 { 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, complete?: () => void): repository.Unsubscribe;
     list(query: Query<T>): Promise<Model<T>[]>;
     listOnSnapshot(query: Query<T>, next: (snapshot: Model<T>[]) => void, error?: (error: Error) => void, complete?: () => 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>>;
     set(doc: Model<T>, options?: WriteTransactionOption): Promise<void>;
     delete(id: Id<T>, options?: WriteTransactionOption): Promise<void>;
     batchSet(docs: Model<T>[], options?: WriteTransactionOption): Promise<void>;

package/build/esm/index.js

@@ -41,9 +41,9 @@ export class Repository {
             },
         });
     }
-    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] = count();
@@ -58,7 +58,7 @@ export class Repository {
                     return assertNever(v);
             }
         }
-        const res = await getAggregateFromServer(toFirestoreQuery(this.db, aggregate.query), aggregateSpec);
+        const res = await getAggregateFromServer(toFirestoreQuery(this.db, query), aggregateSpec);
         return res.data();
     }
     async set(doc, options) {
@@ -136,8 +136,10 @@ export const docPathElements = (doc) => {
 export const toFirestoreQuery = (db, query) => {
     const { filter, nonFilter } = (query.constraints ?? []).reduce((acc, constraint) => {
         switch (constraint.kind) {
-            case 'where': {
-                const filter = toFirestoreQueryFilterConstraint(constraint.filter);
+            case 'where':
+            case 'and':
+            case 'or': {
+                const filter = toFirestoreQueryFilterConstraint(constraint);
                 acc.filter = acc.filter ? and(acc.filter, filter) : filter;
                 break;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestore-repository/firebase-js-sdk",
-  "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": {
     "@firebase/firestore": "^4.7.5",
-    "firestore-repository": "0.2.1"
+    "firestore-repository": "0.4.0"
   },
   "devDependencies": {
     "@firebase/app": "^0.10.16"