@squidcloud/client 1.0.123 → 1.0.124

package/dist/cjs/index.js

@@ -27907,6 +27907,7 @@ function isStringMatch(str, pattern, caseSensitive) {
         str = str.toLowerCase();
         pattern = pattern.toLowerCase();
     }
+    str = str.replace(/\n/g, ' ');
     // Escape special regex characters in the pattern
     const escapedPattern = pattern.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
     // Replace '%' wildcard with regex equivalent
@@ -28705,10 +28706,16 @@ class Pagination {
         */
         this.internalStateObserver = new external_rxjs_namespaceObject.BehaviorSubject(null);
         this.firstElement = null;
-        this.lastElement = null;
         this.isDestroyed = new external_rxjs_namespaceObject.BehaviorSubject(false);
         this.snapshotSubject = new external_rxjs_namespaceObject.Subject();
         this.onFirstPage = true;
+        /* Used during reverse navigation:
+        - When navigating to the last page, we set navigatingToLastPage to true and run a reverse query starting at the end of the query.
+        - When navigating to a previous page, we set lastElement to the last element that should be on that page.
+        In both situations, the variables are reset during the next call to dataReceived.
+         */
+        this.navigatingToLastPage = false;
+        this.lastElement = null;
         this.snapshotSubject.pipe((0,external_rxjs_namespaceObject.switchAll)()).subscribe((data) => this.dataReceived(data));
         this.templateSnapshotEmitter = snapshotEmitter.clone();
         this.options = Object.assign({ pageSize: 100, subscribe: true }, options);
@@ -28751,8 +28758,8 @@ class Pagination {
         return 0;
     }
     async dataReceived(data) {
-        // Because documents might be deleted by the time we need them (if we are not subscribed), we save the extracted data here.
-        // This is the only place we're allowed to call extractData.
+        // Because documents might be deleted by the time we need them (if we are not subscribed), we save the extracted
+        // data here. This is the only place we're allowed to call extractData.
         const extractedData = data.map((s) => this.templateSnapshotEmitter.extractData(s));
         if (data.length === 0) {
             if (this.onFirstPage) {
@@ -28763,12 +28770,19 @@ class Pagination {
             }
             return;
         }
-        if (this.firstElement === null && this.lastElement !== null) {
-            // We just executed a `prev` and we know what the last element is on the page but not the first.
-            // We need to find the first element on the page instead, because that's our anchor.
-            const numAfter = extractedData.filter((s) => this.compare(s, this.lastElement) === 1).length;
-            this.firstElement = extractedData[data.length - numAfter - this.options.pageSize];
-            this.lastElement = null;
+        if (this.firstElement === null) {
+            if (this.lastElement !== null) {
+                // We just executed a `prev` and we know what the last element is on the page but not the first.
+                // We need to find the first element on the page instead, because that's our anchor.
+                const numAfter = extractedData.filter((s) => this.compare(s, this.lastElement) === 1).length;
+                this.firstElement = extractedData[data.length - numAfter - this.options.pageSize];
+                this.lastElement = null;
+            }
+            else if (this.navigatingToLastPage) {
+                // We just executed a `last`.
+                this.firstElement = extractedData[data.length - this.options.pageSize];
+                this.navigatingToLastPage = false;
+            }
         }
         const numBefore = extractedData.filter((s) => this.compare(s, this.firstElement) === -1).length;
         const numAfter = Math.max(0, data.length - numBefore - this.options.pageSize);
@@ -28785,27 +28799,29 @@ class Pagination {
             const newSnapshotEmitter = this.templateSnapshotEmitter
                 .clone()
                 .limit(this.options.pageSize * 3)
-                .flipSortOrder()
-                .addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map((sortOrder) => {
-                return {
-                    fieldName: sortOrder.fieldName,
-                    operator: sortOrder.asc ? '<=' : '>=',
-                    value: getInPath(startingDoc, sortOrder.fieldName),
-                };
-            }));
+                .flipSortOrder();
+            if (startingDoc) {
+                newSnapshotEmitter.addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map((sortOrder) => {
+                    return {
+                        fieldName: sortOrder.fieldName,
+                        operator: sortOrder.asc ? '<=' : '>=',
+                        value: getInPath(startingDoc, sortOrder.fieldName),
+                    };
+                }));
+            }
             this.snapshotSubject.next(newSnapshotEmitter.snapshots(this.options.subscribe).pipe((0,external_rxjs_namespaceObject.map)((s) => s.reverse())));
         }
         else {
-            const newSnapshotEmitter = this.templateSnapshotEmitter
-                .clone()
-                .limit(this.options.pageSize * 3)
-                .addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map((sortOrder) => {
-                return {
-                    fieldName: sortOrder.fieldName,
-                    operator: sortOrder.asc ? '>=' : '<=',
-                    value: getInPath(startingDoc, sortOrder.fieldName),
-                };
-            }));
+            const newSnapshotEmitter = this.templateSnapshotEmitter.clone().limit(this.options.pageSize * 3);
+            if (startingDoc) {
+                newSnapshotEmitter.addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map((sortOrder) => {
+                    return {
+                        fieldName: sortOrder.fieldName,
+                        operator: sortOrder.asc ? '>=' : '<=',
+                        value: getInPath(startingDoc, sortOrder.fieldName),
+                    };
+                }));
+            }
             this.snapshotSubject.next(newSnapshotEmitter.snapshots(this.options.subscribe));
         }
     }
@@ -28815,9 +28831,9 @@ class Pagination {
             return internalState;
         }
         return await (0,external_rxjs_namespaceObject.firstValueFrom)((0,external_rxjs_namespaceObject.race)(
-        // It is possible that we get here and unsubscribe() was called. In that case we might not get any new state, so to avoid
-        // stalling we return an empty page in that situation. (We can't return the last page we saw because that has already
-        // been deleted, and also because it's possible that we've never seen any data.)
+        // It is possible that we get here and unsubscribe() was called. In that case we might not get any new state,
+        // so to avoid stalling we return an empty page in that situation. (We can't return the last page we saw
+        // because that has already been deleted, and also because it's possible that we've never seen any data.)
         this.isDestroyed.pipe((0,external_rxjs_namespaceObject.filter)(Boolean), (0,external_rxjs_namespaceObject.map)((_) => ({
             data: [],
             extractedData: [],
@@ -28835,6 +28851,7 @@ class Pagination {
             hasPrev: numBefore > 0,
         };
     }
+    /** Unsubscribes from the pagination. */
     unsubscribe() {
         this.isDestroyed.next(true);
         this.isDestroyed.complete();
@@ -28848,10 +28865,12 @@ class Pagination {
         this.internalStateObserver.next(null);
         this.doNewQuery(extractedData[extractedData.length - numAfter - 1], true);
     }
+    /** Returns a promise that resolves when the previous page of data is available. */
     async prev() {
         this.prevInternal(await this.waitForInternalState());
         return await this.waitForData();
     }
+    /** Returns a promise that resolves when the next page of data is available. */
     async next() {
         const { numBefore, extractedData } = await this.waitForInternalState();
         this.firstElement = extractedData[numBefore + this.options.pageSize];
@@ -28859,14 +28878,51 @@ class Pagination {
         this.doNewQuery(extractedData[numBefore], false);
         return await this.waitForData();
     }
+    /** Returns a promise that resolves when the page data is available. */
     async waitForData() {
         return this.internalStateToState(await this.waitForInternalState());
     }
+    /** Returns an observable that emits the current state of the pagination. */
     observeState() {
         return this.internalStateObserver.pipe((0,external_rxjs_namespaceObject.filter)((state) => state !== null), (0,external_rxjs_namespaceObject.map)((state) => {
             return this.internalStateToState(state);
         }));
     }
+    /** Jumps to the first page of the pagination. */
+    async first() {
+        await this.waitForInternalState();
+        this.internalStateObserver.next(null);
+        this.firstElement = null;
+        this.lastElement = null;
+        this.goToFirstPage();
+        return await this.waitForData();
+    }
+    /** Refreshes the current page of the pagination. */
+    async refreshPage() {
+        const { extractedData } = await this.waitForInternalState();
+        this.internalStateObserver.next(null);
+        this.doNewQuery(extractedData[0], false);
+        return await this.waitForData();
+    }
+    /**
+     * Jumps to the last page of the pagination. This page will always have the last <pageSize> elements of the
+     * underlying query, regardless of whether the total document count is evenly divisible by the page size.
+     */
+    async last() {
+        await this.waitForInternalState();
+        this.internalStateObserver.next(null);
+        this.firstElement = null;
+        this.lastElement = null;
+        this.navigatingToLastPage = true;
+        const lastPageSnapshot = this.templateSnapshotEmitter
+            .clone()
+            .limit(this.options.pageSize * 3)
+            .flipSortOrder()
+            .snapshots(this.options.subscribe)
+            .pipe((0,external_rxjs_namespaceObject.map)((s) => s.reverse()));
+        this.snapshotSubject.next(lastPageSnapshot);
+        return await this.waitForData();
+    }
 }
 
 ;// CONCATENATED MODULE: ../common/src/query/index.ts
@@ -32226,7 +32282,6 @@ class AiAssistantClient {
         this.rpcManager = rpcManager;
         this.socketManager = socketManager;
         this.integrationId = integrationId;
-        this.ongoingChatRequests = {};
         this.ongoingChatSequences = {};
         this.socketManager
             .observeNotifications()
@@ -32260,9 +32315,9 @@ class AiAssistantClient {
      */
     chat(profileId, prompt) {
         const clientRequestId = generateId();
-        const subject = new external_rxjs_namespaceObject.BehaviorSubject('');
+        let accumulatedValue = '';
+        const subject = new external_rxjs_namespaceObject.Subject();
         const tokenSequence = new external_rxjs_namespaceObject.Subject();
-        this.ongoingChatRequests[clientRequestId] = subject;
         this.ongoingChatSequences[clientRequestId] = tokenSequence;
         tokenSequence
             .pipe((0,external_rxjs_namespaceObject.concatMap)(({ value, complete }) => {
@@ -32273,7 +32328,8 @@ class AiAssistantClient {
         }), (0,external_rxjs_namespaceObject.takeWhile)(({ complete }) => !complete, true))
             .subscribe({
             next: ({ value }) => {
-                subject.next(subject.value + value);
+                accumulatedValue += value;
+                subject.next(accumulatedValue);
             },
             error: (e) => {
                 console.error(e);
@@ -32293,7 +32349,6 @@ class AiAssistantClient {
             subject.complete();
         });
         return subject.pipe((0,external_rxjs_namespaceObject.finalize)(() => {
-            delete this.ongoingChatRequests[clientRequestId];
             delete this.ongoingChatSequences[clientRequestId];
         }), (0,external_rxjs_namespaceObject.share)());
     }

package/dist/common/src/query/pagination.d.ts

@@ -1,8 +1,11 @@
 import { Observable } from 'rxjs';
 /** The state of a pagination. */
 export interface PaginationState<ReturnType> {
+    /** The page data. */
     data: Array<ReturnType>;
+    /** Whether there is a next page. */
     hasNext: boolean;
+    /** Whether there is a previous page. */
     hasPrev: boolean;
 }
 /** Pagination options */
@@ -22,23 +25,38 @@ export declare class Pagination<ReturnType> {
     private readonly options;
     private internalStateObserver;
     private firstElement;
-    private lastElement;
     private readonly isDestroyed;
     private templateSnapshotEmitter;
     private snapshotSubject;
     private onFirstPage;
+    private navigatingToLastPage;
+    private lastElement;
     private goToFirstPage;
     private static compareValues;
     private compare;
-    dataReceived(data: Array<ReturnType>): Promise<void>;
+    private dataReceived;
     private doNewQuery;
     private waitForInternalState;
     private internalStateToState;
+    /** Unsubscribes from the pagination. */
     unsubscribe(): void;
     prevInternal(internalState: InternalState<ReturnType>): void;
+    /** Returns a promise that resolves when the previous page of data is available. */
     prev(): Promise<PaginationState<ReturnType>>;
+    /** Returns a promise that resolves when the next page of data is available. */
     next(): Promise<PaginationState<ReturnType>>;
+    /** Returns a promise that resolves when the page data is available. */
     waitForData(): Promise<PaginationState<ReturnType>>;
+    /** Returns an observable that emits the current state of the pagination. */
     observeState(): Observable<PaginationState<ReturnType>>;
+    /** Jumps to the first page of the pagination. */
+    first(): Promise<PaginationState<ReturnType>>;
+    /** Refreshes the current page of the pagination. */
+    refreshPage(): Promise<PaginationState<ReturnType>>;
+    /**
+     * Jumps to the last page of the pagination. This page will always have the last <pageSize> elements of the
+     * underlying query, regardless of whether the total document count is evenly divisible by the page size.
+     */
+    last(): Promise<PaginationState<ReturnType>>;
 }
 export {};

package/dist/common/src/query/query-context.d.ts

@@ -108,7 +108,7 @@ export declare class QueryContext<T extends DocumentData = any> {
     private parseConditions;
 }
 /** A list of context conditions */
-type ContextConditions<Doc extends DocumentData = any, F extends Paths<Doc> = Paths<Doc>> = Array<ContextCondition<Doc, F>>;
+export type ContextConditions<Doc extends DocumentData = any, F extends Paths<Doc> = Paths<Doc>> = Array<ContextCondition<Doc, F>>;
 /** A Context condition - a condition that replaces multiple '==' or '!=' conditions with 'in' and 'not in'. */
 type ContextCondition<Doc extends DocumentData = any, F extends Paths<Doc> = Paths<Doc>> = InContextCondition<Doc, F> | NotInContextCondition<Doc, F> | OtherContextCondition<Doc, F>;
 interface InContextCondition<Doc extends DocumentData = any, F extends Paths<Doc> = Paths<Doc>> extends SimpleCondition<Doc, F, 'in'> {

package/dist/typescript-client/src/ai-assistant-client.d.ts

@@ -6,7 +6,6 @@ export declare class AiAssistantClient {
     private readonly rpcManager;
     private readonly socketManager;
     private readonly integrationId;
-    private readonly ongoingChatRequests;
     private readonly ongoingChatSequences;
     constructor(rpcManager: RpcManager, socketManager: SocketManager, integrationId: IntegrationId);
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squidcloud/client",
-  "version": "1.0.123",
+  "version": "1.0.124",
   "description": "A typescript implementation of the Squid client",
   "main": "dist/cjs/index.js",
   "types": "dist/typescript-client/src/index.d.ts",