@genesislcap/grid-pro 14.481.0 → 14.481.1-alpha-69af5f8.0

package/dist/dts/datasource/server-side.datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-side.datasource.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.datasource.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,UAAU,EACV,iBAAiB,EAYlB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,cAAc,EAEf,MAAM,+BAA+B,CAAC;AAUvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;;;;;;;kBAoDb,CAAC;;;;;;;;8BAwBuD,CAAA,cACtF,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAiBH,CAAH;4IAEkE,CAAA;wFAIL,CAAC;+IAOzC,CAAC;2FAEb,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAmCJ,CAAF;;;;;;;;;;;;;;;;;;;;;;;mBA4DE,CAAL;;;;;;;;;;;;;6BA6B6B,CAAC;8BACe,CAAC;kBAErC,CAAC;;oBAEuB,CAAC;;sBAMX,CAAC;oBAEnB,CAAF;;;;;;;;gDAmBQ,CAAC;;;;;;;;;;;;;;;;;;uBAmBM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EA6ES,CAAC;yBACwB,CAAC;UAEP,GAAG;WAC1B,GAAG;;gBAKd,GAAG;;;;;;;WAeR,GAAG;YACkB,GAAG;;;;;;;;;;;oBAyC/B,GAAD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA2LiD,CAAA;cAG5C,CAAJ;eAG6E,CAAC;gBAG3C,CAAC;;;;;;;;;;;;;;SAmCxB,CAAC;;;iBAGR,CAAC;;AA7lBR;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAGa,2BAA4B,SAAQ,gCAAqC;IACpE,UAAU,EAAG,cAAc,CAAC;IAChC,iBAAiB,EAAG,UAAU,CAAC;IAC3C;;;OAGG;IAC6D,mBAAmB,UAAS;IAE5F;;;OAGG;IACmD,WAAW,UAAS;IAE1E;;;;;;OAMG;IACiC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IAE3D,OAAO,EAAE,GAAG,CAAM;IAE9B,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,cAAc,CAA8D;IACpF,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,uBAAuB,CAA6B;IAE5D,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOtD,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAaxD,iBAAiB;IAUjB,oBAAoB;IAUX,SAAS,IAAI,IAAI;IAO1B;;;;OAIG;IACG,kBAAkB,CAAC,MAAM,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCnE;;;OAGG;IACH,OAAO,CAAC,mCAAmC;IAc3C;;;OAGG;IACH,OAAO,CAAC,oCAAoC;IAWtC,IAAI;IAuIV,mBAAmB,CAAC,KAAK,EAAE,GAAG;IAMf,OAAO;IAmBP,OAAO;IAKtB,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,kBAAkB;YAgDZ,mBAAmB;IAKjC;;;;;;;;;;;;OAYG;YACW,kBAAkB;IA+BhC;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB,CAA+B;IAEzD;;;;;;;;;OASG;IACH,OAAO,CAAC,0BAA0B,CAAS;IAE3C;;;;;;OAMG;IACI,uBAAuB;IAM9B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,wBAAwB;IAsEhC,OAAO,CAAC,yBAAyB;YAyCnB,sBAAsB;YA2DtB,eAAe;IAmBpB,gBAAgB,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG;IAIvC,QAAQ;CAGlB"}
+{"version":3,"file":"server-side.datasource.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.datasource.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,UAAU,EACV,iBAAiB,EAYlB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,cAAc,EAEf,MAAM,+BAA+B,CAAC;AAUvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;;;;;;;kBAoDb,CAAC;;;;;;;;8BAwBuD,CAAA,cACtF,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAiBH,CAAH;4IAEkE,CAAA;wFAIL,CAAC;+IAOzC,CAAC;2FAEb,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAmCJ,CAAF;;;;;;;;;;;;;;;;;;;;;;;mBAuDgB,CAAC;;;;;;;;;;;;;6BAed,CAAC;8BACoB,CAAC;kBACvB,CAAF;;oBAOD,CAAF;;sBAGO,CAAC;oBACgB,CAAC;;;;;;;;gDAiBM,CAAC;;;;;;;;;;;;;;;;;;uBA4BzB,CAAF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EAgF4B,CAAC;yBACM,CAAC;UACP,GAAE;WAAgD,GAAG;;gBACd,GAAG;;;;;;;WAQ7D,GAAG;YACQ,GAAG;;;;;;;;;;;oBA2ClB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA6LG,CAAC;cAEwB,CAAC;eAEvB,CAAC;gBAKgB,CAAC;;;;;;;;;;;;;;SAkChB,CAAC;;;iBAG0B,CAAC;;AA1kBnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAGa,2BAA4B,SAAQ,gCAAqC;IACpE,UAAU,EAAG,cAAc,CAAC;IAChC,iBAAiB,EAAG,UAAU,CAAC;IAC3C;;;OAGG;IAC6D,mBAAmB,UAAS;IAE5F;;;OAGG;IACmD,WAAW,UAAS;IAE1E;;;;;;OAMG;IACiC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IAE3D,OAAO,EAAE,GAAG,CAAM;IAE9B,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,cAAc,CAA8D;IACpF,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,uBAAuB,CAA6B;IAE5D,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOtD,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAaxD,iBAAiB;IAUjB,oBAAoB;IAUX,SAAS,IAAI,IAAI;IAO1B;;;;OAIG;IACG,kBAAkB,CAAC,MAAM,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDnE;;;OAGG;IACH,OAAO,CAAC,mCAAmC;IAc3C;;;OAGG;IACH,OAAO,CAAC,oCAAoC;IAWtC,IAAI;IAuIV,mBAAmB,CAAC,KAAK,EAAE,GAAG;IAMf,OAAO;IAmBP,OAAO;IAKtB,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,kBAAkB;YAgDZ,mBAAmB;IAKjC;;;;;;;;;;;;OAYG;YACW,kBAAkB;IA+BhC;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB,CAA+B;IAEzD;;;;;;;;;OASG;IACH,OAAO,CAAC,0BAA0B,CAAS;IAE3C;;;;;;OAMG;IACI,uBAAuB;IAM9B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,wBAAwB;IAsEhC,OAAO,CAAC,yBAAyB;YAyCnB,sBAAsB;YA2DtB,eAAe;IAmBpB,gBAAgB,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG;IAIvC,QAAQ;CAGlB"}

package/dist/dts/datasource/server-side.resource-base.d.ts

@@ -45,6 +45,12 @@ export declare abstract class BaseServerSideDatasource implements IServerSideDat
     protected moreRows: boolean;
     protected calculatedRowsCount: number;
     protected currentSequenceId: any;
+    /**
+     * Whether the corrective ROWS_COUNT snapshot() has already resolved for the current
+     * CRITERIA_MATCH. Reset in destroy() so it re-resolves whenever the filter/sort changes.
+     * @internal
+     */
+    protected criteriaRowCountResolved: boolean;
     protected currentFilterModel: SetFilterModel;
     protected originalCriteriaMatch: string | string[];
     protected currentSortModel: SortModelItem[];
@@ -67,15 +73,22 @@ export declare abstract class BaseServerSideDatasource implements IServerSideDat
     /**
      * Handles filtering setup for server-side datasources.
      * Common logic used by both dataserver and req-rep implementations.
+     *
+     * @returns `true` when a filter change triggered {@link refreshDatasource} - in that case
+     * the current getRows() request is superseded and the caller MUST stop processing it
+     * (see the corresponding handling in the dataserver implementation's getRows()).
      */
-    protected setupFiltering(params: IServerSideGetRowsParams): Promise<void>;
+    protected setupFiltering(params: IServerSideGetRowsParams): Promise<boolean>;
     /**
      * Handles sorting setup. Must be implemented by each datasource type.
      * Different datasource types have different sorting requirements:
      * - Dataserver: Requires indexed columns
      * - Req-rep: Can sort by any column
+     *
+     * @returns `true` when a sort change triggered a datasource refresh and the current
+     * getRows() request is superseded (same contract as {@link setupFiltering}).
      */
-    protected abstract setupSorting(params: IServerSideGetRowsParams): Promise<void>;
+    protected abstract setupSorting(params: IServerSideGetRowsParams): Promise<boolean>;
     /**
      * Legacy method that combines filtering and sorting.
      * Kept for backward compatibility. New implementations should use setupFiltering and setupSorting directly.
@@ -91,6 +104,17 @@ export declare abstract class BaseServerSideDatasource implements IServerSideDat
     };
     protected buildCriteriaMatchFromFilters(): string;
     protected criteriaFromFilters(): string[];
+    /**
+     * Builds a single criteria fragment for one filter model. Used both for flat per-column
+     * filter models and to unwrap the sub-filters inside an ag-multi-column-filter's
+     * `filterModels` array.
+     * @internal
+     */
+    protected criteriaForSingleModel(k: string, model: any): string | null;
+    protected criteriaForTextModel(k: string, model: any): string | null;
+    protected criteriaForSetModel(k: string, model: any): string | null;
+    protected criteriaForNumberModel(k: string, model: any): string | null;
+    protected criteriaForDateModel(k: string, model: any): string | null;
     protected getFiltersByType(filterType: string): string[];
     protected getPageNumber(start: number, recordsPerPage: number, totalRecords?: number, zeroBasedViewNumber?: boolean): number;
     protected getCorrectRowCount(params: IServerSideGetRowsParams<any, any>): any;

package/dist/dts/datasource/server-side.resource-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-side.resource-base.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-side.resource-base.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-base.ts"],"names":[],"mappings":"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"}

package/dist/dts/datasource/server-side.resource-dataserver.d.ts

@@ -7,6 +7,12 @@ import { BaseServerSideDatasource } from './server-side.resource-base';
  * @beta
  */
 export declare class DataserverServerSideDatasource extends BaseServerSideDatasource implements IServerSideDatasource {
+    /**
+     * How long a non-paginated SSRM block may stay pending before it is force-resolved with
+     * whatever rows have accumulated so far. See the safety valve in getRows().
+     * @internal
+     */
+    private static readonly BLOCK_RESOLVE_TIMEOUT_MS;
     dataserverStream: SocketObservable<FilteredDataServerResult>;
     dataserverStreamSubscription: SocketSubscription;
     createDataserverStreamFunc: (existingParams?: any) => Promise<SocketObservable<FilteredDataServerResult>>;
@@ -18,7 +24,7 @@ export declare class DataserverServerSideDatasource extends BaseServerSideDataso
      * Dataserver-specific sorting setup that validates columns are part of an index.
      * This is required because dataserver needs indexed columns for efficient sorting.
      */
-    protected setupSorting(params: IServerSideGetRowsParams): Promise<void>;
+    protected setupSorting(params: IServerSideGetRowsParams): Promise<boolean>;
     destroy(): Promise<void>;
     private handleCurrentStreamLoad;
 }

package/dist/dts/datasource/server-side.resource-dataserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-side.resource-dataserver.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-dataserver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EAGxB,gBAAgB,EAChB,kBAAkB,EAGnB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAEvE;;;GAGG;AACH,qBAAa,8BACX,SAAQ,wBACR,YAAW,qBAAqB;IAEhC,gBAAgB,EAAE,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAC7D,4BAA4B,EAAE,kBAAkB,CAAC;IACjD,0BAA0B,EAAE,CAC1B,cAAc,CAAC,EAAE,GAAG,KACjB,OAAO,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,CAAC;gBAE7C,OAAO,EAAE,2BAA2B;IAK1C,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,OAAO,CAAC,MAAM,EAAE,wBAAwB;IA+E9C,OAAO,CAAC,mBAAmB;IAiE3B;;;OAGG;cACa,YAAY,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvE,OAAO;IAOb,OAAO,CAAC,uBAAuB;CAYhC"}
+{"version":3,"file":"server-side.resource-dataserver.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-dataserver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EAGxB,gBAAgB,EAChB,kBAAkB,EAGnB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAEvE;;;GAGG;AACH,qBAAa,8BACX,SAAQ,wBACR,YAAW,qBAAqB;IAEhC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAS;IAEzD,gBAAgB,EAAE,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAC7D,4BAA4B,EAAE,kBAAkB,CAAC;IACjD,0BAA0B,EAAE,CAC1B,cAAc,CAAC,EAAE,GAAG,KACjB,OAAO,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,CAAC;gBAE7C,OAAO,EAAE,2BAA2B;IAK1C,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,OAAO,CAAC,MAAM,EAAE,wBAAwB;IA8O9C,OAAO,CAAC,mBAAmB;IAkE3B;;;OAGG;cACa,YAAY,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4D1E,OAAO;IAOb,OAAO,CAAC,uBAAuB;CAuChC"}

package/dist/dts/datasource/server-side.resource-reqrep.d.ts

@@ -74,7 +74,7 @@ export declare class ReqRepServerSideDatasource extends BaseServerSideDatasource
      * Req-rep specific sorting setup that allows any column to be sorted
      * (unlike dataserver which requires indexed columns only)
      */
-    protected setupSorting(params: IServerSideGetRowsParams): Promise<void>;
+    protected setupSorting(params: IServerSideGetRowsParams): Promise<boolean>;
     refreshDatasource(params: DatasourceOptions): Promise<void>;
     destroy(): Promise<void>;
     /**

package/dist/dts/datasource/server-side.resource-reqrep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-side.resource-reqrep.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-reqrep.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,mBAAmB,EAInB,iBAAiB,EAGlB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAOvE;;;GAGG;AACH,qBAAa,0BACX,SAAQ,wBACR,YAAW,qBAAqB;IAEhC,uBAAuB,EAAE,CAAC,cAAc,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEhF;;;OAGG;IACH,OAAO,CAAC,sBAAsB,CAAC,CAG5B;IAEH;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAC,CAAwC;IAEpE;;OAEG;IACH,OAAO,CAAC,yBAAyB,CAAC,CAAqB;IAEvD;;;OAGG;IACH,OAAO,CAAC,uBAAuB,CAAC,CAAM;IAEtC;;OAEG;IACH,OAAO,CAAC,UAAU,CAAU;IAE5B;;OAEG;IACH,OAAO,CAAC,eAAe,CAAC,CAAwC;IAEhE;;OAEG;IACH,OAAO,CAAC,uBAAuB,CAAC,CAAa;IAE7C;;;OAGG;IACH,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAE5C;;;OAGG;IACH,OAAO,CAAC,qBAAqB,CAA8B;IAG3D,OAAO,CAAC,uBAAuB,CAAuB;IACtD,OAAO,CAAC,iBAAiB,CAAa;gBAE1B,OAAO,EAAE,2BAA2B;IA6B1C,OAAO,CAAC,MAAM,EAAE,wBAAwB;IAmC9C;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAwB9B;;OAEG;YACW,mBAAmB;IAsCjC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,mBAAmB;IAoF3B,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM;IA0BtE,OAAO,CAAC,uBAAuB;IAoB/B;;;OAGG;cACa,YAAY,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BvE,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3D,OAAO;IAUb;;;;;;;;;;OAUG;YACW,mBAAmB;IAkCjC;;;;;;;;OAQG;IACH,OAAO,CAAC,oBAAoB;IAqB5B,OAAO,CAAC,mBAAmB;CAoB5B"}
+{"version":3,"file":"server-side.resource-reqrep.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-reqrep.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,mBAAmB,EAInB,iBAAiB,EAGlB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAOvE;;;GAGG;AACH,qBAAa,0BACX,SAAQ,wBACR,YAAW,qBAAqB;IAEhC,uBAAuB,EAAE,CAAC,cAAc,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEhF;;;OAGG;IACH,OAAO,CAAC,sBAAsB,CAAC,CAG5B;IAEH;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAC,CAAwC;IAEpE;;OAEG;IACH,OAAO,CAAC,yBAAyB,CAAC,CAAqB;IAEvD;;;OAGG;IACH,OAAO,CAAC,uBAAuB,CAAC,CAAM;IAEtC;;OAEG;IACH,OAAO,CAAC,UAAU,CAAU;IAE5B;;OAEG;IACH,OAAO,CAAC,eAAe,CAAC,CAAwC;IAEhE;;OAEG;IACH,OAAO,CAAC,uBAAuB,CAAC,CAAa;IAE7C;;;OAGG;IACH,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAE5C;;;OAGG;IACH,OAAO,CAAC,qBAAqB,CAA8B;IAG3D,OAAO,CAAC,uBAAuB,CAAuB;IACtD,OAAO,CAAC,iBAAiB,CAAa;gBAE1B,OAAO,EAAE,2BAA2B;IA6B1C,OAAO,CAAC,MAAM,EAAE,wBAAwB;IAmC9C;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAwB9B;;OAEG;YACW,mBAAmB;IAsCjC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,mBAAmB;IAoF3B,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM;IA0BtE,OAAO,CAAC,uBAAuB;IAoB/B;;;OAGG;cACa,YAAY,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC1E,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3D,OAAO;IAUb;;;;;;;;;;OAUG;YACW,mBAAmB;IAkCjC;;;;;;;;OAQG;IACH,OAAO,CAAC,oBAAoB;IAqB5B,OAAO,CAAC,mBAAmB;CAoB5B"}

package/dist/dts/react.d.ts

@@ -205,6 +205,15 @@ export declare const AgTextRenderer: React.ForwardRefExoticComponent<
 >;
 export type AgTextRendererRef = AgTextRendererWC;
 
+export declare const GridProColumn: React.ForwardRefExoticComponent<
+  React.PropsWithChildren<
+    Omit<PublicOf<GridProColumnWC>, 'children' | 'style'> &
+    HTMLWCProps & {
+    }
+  > & React.RefAttributes<GridProColumnWC>
+>;
+export type GridProColumnRef = GridProColumnWC;
+
 export declare const GridProClientSideDatasource: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
     Omit<PublicOf<GridProClientSideDatasourceWC>, 'children' | 'style'> &
@@ -260,15 +269,6 @@ export declare const GridProServerSideDatasource: React.ForwardRefExoticComponen
 >;
 export type GridProServerSideDatasourceRef = GridProServerSideDatasourceWC;
 
-export declare const GridProColumn: React.ForwardRefExoticComponent<
-  React.PropsWithChildren<
-    Omit<PublicOf<GridProColumnWC>, 'children' | 'style'> &
-    HTMLWCProps & {
-    }
-  > & React.RefAttributes<GridProColumnWC>
->;
-export type GridProColumnRef = GridProColumnWC;
-
 export declare const GridProGenesisDatasource: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
     Omit<PublicOf<GridProGenesisDatasourceWC>, 'children' | 'style'> &

package/dist/esm/datasource/server-side.datasource.js

@@ -178,8 +178,6 @@ let GridProServerSideDatasource = class GridProServerSideDatasource extends Life
             this.$emit(datasourceEventNames.cacheFilterConfig);
             this.clearRowData(withoutColumnDefs);
             this.setDisconnected(false);
-            // Emit event to refresh server side with purge
-            this.$emit(datasourceEventNames.refreshServerSide, { purge: true });
             if (params) {
                 const options = Object.assign(Object.assign({}, this.datasourceOptions()), params);
                 const initOK = yield this.initializeDatasource(options, true, false);
@@ -187,9 +185,22 @@ let GridProServerSideDatasource = class GridProServerSideDatasource extends Life
                     // Emit event to set server side datasource to null
                     this.$emit(datasourceEventNames.setServerSideDatasource, { datasource: null });
                     logger.error('Genesis Datasource re-init failed on filtering/sorting.');
+                    return;
                 }
+                // Purge AG Grid's SSRM cache only AFTER the datasource re-init completed. The purge
+                // makes AG Grid immediately re-invoke getRows(), and getRows() builds its stream from
+                // this datasource via createDataserverStreamFunc - with the previous ordering (purge
+                // emitted before initializeDatasource), that re-invoked getRows() raced the re-init
+                // and called startStream() on the destroyed/half-initialized datasource. Observed
+                // symptoms of that race: rows from the PREVIOUS criteria leaking into the new
+                // filter's result set, and first loads breaking entirely (block stuck/failed) when a
+                // restored sort triggered a refresh during the initial getRows().
+                this.$emit(datasourceEventNames.refreshServerSide, { purge: true });
             }
             else {
+                // No params = full re-init path below; purge up-front as before (init() re-creates
+                // and re-attaches the whole ssrmDatasource, so there is no equivalent race here).
+                this.$emit(datasourceEventNames.refreshServerSide, { purge: true });
                 if (this.ssrmDatasource) {
                     yield this.ssrmDatasource.destroy();
                     this.ssrmDatasource = undefined;

package/dist/esm/datasource/server-side.resource-base.js

@@ -24,6 +24,12 @@ export class BaseServerSideDatasource {
         this.moreRows = false;
         this.calculatedRowsCount = 0;
         this.currentSequenceId = null;
+        /**
+         * Whether the corrective ROWS_COUNT snapshot() has already resolved for the current
+         * CRITERIA_MATCH. Reset in destroy() so it re-resolves whenever the filter/sort changes.
+         * @internal
+         */
+        this.criteriaRowCountResolved = false;
         this.reloadResourceDataFunc = options.reloadResourceDataFunc;
         this.errorHandlerFunc = options.errorHandlerFunc;
         this.onNoDataAvailableFunc = options.onNoDataAvailableFunc;
@@ -79,6 +85,10 @@ export class BaseServerSideDatasource {
     /**
      * Handles filtering setup for server-side datasources.
      * Common logic used by both dataserver and req-rep implementations.
+     *
+     * @returns `true` when a filter change triggered {@link refreshDatasource} - in that case
+     * the current getRows() request is superseded and the caller MUST stop processing it
+     * (see the corresponding handling in the dataserver implementation's getRows()).
      */
     setupFiltering(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -91,15 +101,21 @@ export class BaseServerSideDatasource {
                     this.currentFilterModel = null;
                     this.setResourceParam('CRITERIA_MATCH', this.originalCriteriaMatch);
                     yield this.refreshDatasource(params);
-                    return;
+                    // A refresh was triggered and this request is superseded: refreshDatasource() ->
+                    // reloadResourceDataFunc has already re-initialized the underlying datasource and
+                    // purged AG Grid's SSRM cache, so AG Grid re-invokes getRows() with fresh params
+                    // on its own. Continuing with THIS invocation's stale params would attach a
+                    // duplicate subscription to the freshly-created stream.
+                    return true;
                 }
                 else if (filterModelBeingAppliedDiffersFromCurrent && filtersAreBeingApplied) {
                     this.currentFilterModel = filterModelBeingApplied;
                     this.setResourceParam('CRITERIA_MATCH', this.buildCriteriaMatchFromFilters());
                     yield this.refreshDatasource(params);
-                    return;
+                    return true;
                 }
             }
+            return false;
         });
     }
     /**
@@ -122,6 +138,7 @@ export class BaseServerSideDatasource {
         this.moreRows = false;
         this.sourceRef = undefined;
         this.lastSuccessRowData = undefined;
+        this.criteriaRowCountResolved = false;
     }
     refreshDatasource(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -173,142 +190,184 @@ export class BaseServerSideDatasource {
     criteriaFromFilters() {
         const filters = [];
         this.getFiltersByType('text').forEach((k) => {
-            if (!this.currentFilterModel[k].filter &&
-                (this.currentFilterModel[k].type === 'false' || this.currentFilterModel[k].type === 'true')) {
-                filters.push(`${k} == ${this.currentFilterModel[k].type}`);
-            }
-            else {
-                switch (this.currentFilterModel[k].type) {
-                    case 'blank':
-                        filters.push(`(${k} == '' || ${k} == null)`);
-                        break;
-                    case 'contains':
-                        filters.push(`Expr.containsIgnoreCase(${k}, '${this.currentFilterModel[k].filter}')`);
-                        break;
-                    case 'equals':
-                        filters.push(`${k} == '${this.currentFilterModel[k].filter}'`);
-                        break;
-                    case 'notBlank':
-                        filters.push(`(${k} != '' && ${k} != null)`);
-                        break;
-                    case 'notEqual':
-                        filters.push(`${k} != '${this.currentFilterModel[k].filter}'`);
-                        break;
-                    case 'wordStartsWith':
-                        filters.push(`Expr.containsWordsStartingWithIgnoreCase(${k}, '${this.currentFilterModel[k].filter}')`);
-                        break;
-                }
+            const fragment = this.criteriaForSingleModel(k, this.currentFilterModel[k]);
+            if (fragment) {
+                filters.push(fragment);
             }
         });
-        // TODO: Handle multi filters if we decide we want to use them in SSRM
         // Handle set filters (typically used for enum fields with ag-set-column-filter)
         this.getFiltersByType('set').forEach((k) => {
-            var _a, _b, _c;
-            const model = (_a = this.currentFilterModel) === null || _a === void 0 ? void 0 : _a[k];
-            const selectedValues = ((_b = model === null || model === void 0 ? void 0 : model.values) !== null && _b !== void 0 ? _b : []);
-            if (!selectedValues || selectedValues.length === 0) {
-                // Nothing selected means no additional criteria
-                return;
-            }
-            // Try to detect "all values selected" using VALID_VALUES from metadata.
-            // In that case we don't want to send any criteria, as it would be equivalent
-            // to no filter at all.
-            const colMeta = (_c = this.resourceColDefs) === null || _c === void 0 ? void 0 : _c.find((o) => o.NAME === k);
-            let allValues;
-            if (colMeta === null || colMeta === void 0 ? void 0 : colMeta.VALID_VALUES) {
-                try {
-                    allValues = Array.isArray(colMeta.VALID_VALUES)
-                        ? colMeta.VALID_VALUES
-                        : colMeta.VALID_VALUES.split('|');
-                }
-                catch (_d) {
-                    allValues = undefined;
-                }
-            }
-            if (allValues &&
-                allValues.length === selectedValues.length &&
-                allValues.every((v) => selectedValues.includes(v))) {
-                // All enum options are selected – skip adding criteria for this column
-                return;
-            }
-            const orConditions = selectedValues.map((val) => {
-                const safeVal = String(val).replace(/'/g, "\\'");
-                return `${k} == '${safeVal}'`;
-            });
-            if (orConditions.length > 0) {
-                filters.push(`(${orConditions.join(' || ')})`);
+            const fragment = this.criteriaForSingleModel(k, this.currentFilterModel[k]);
+            if (fragment) {
+                filters.push(fragment);
             }
         });
         this.getFiltersByType('number').forEach((k) => {
-            const value = this.currentFilterModel[k].filter;
-            const valueTwo = this.currentFilterModel[k].filterTo;
-            switch (this.currentFilterModel[k].type) {
-                case 'equals':
-                    !isNaN(value) && filters.push(`${k} == ${value}`);
-                    break;
-                case 'notEqual':
-                    !isNaN(value) && filters.push(`${k} != ${value}`);
-                    break;
-                case 'greaterThan':
-                    !isNaN(value) && filters.push(`${k} > ${value}`);
-                    break;
-                case 'greaterThanOrEqual':
-                    !isNaN(value) && filters.push(`${k} >= ${value}`);
-                    break;
-                case 'lessThan':
-                    !isNaN(value) && filters.push(`${k} < ${value}`);
-                    break;
-                case 'lessThanOrEqual':
-                    !isNaN(value) && filters.push(`${k} <= ${value}`);
-                    break;
-                case 'inRange':
-                    !isNaN(value) &&
-                        !isNaN(valueTwo) &&
-                        filters.push(`${k} >= ${value} && ${k} <= ${valueTwo}`);
-                    break;
-                case 'blank':
-                    filters.push(`${k} == 0`);
-                    break;
-                case 'notBlank':
-                    filters.push(`${k} != 0`);
-                    break;
+            const fragment = this.criteriaForSingleModel(k, this.currentFilterModel[k]);
+            if (fragment) {
+                filters.push(fragment);
             }
         });
         this.getFiltersByType('date').forEach((k) => {
-            var _a, _b;
-            const dateFrom = (_a = this.currentFilterModel[k].dateFrom) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '').replace('T', '-').split(' ')[0];
-            const dateTo = (_b = this.currentFilterModel[k].dateTo) === null || _b === void 0 ? void 0 : _b.replace(/-/g, '').replace('T', '-').split(' ')[0];
-            switch (this.currentFilterModel[k].type) {
-                case 'equals':
-                    filters.push(`Expr.dateIsEqual(${k}, '${dateFrom}')`);
-                    break;
-                case 'lessThan':
-                    filters.push(`Expr.dateIsBefore(${k}, '${dateFrom}')`);
-                    break;
-                case 'greaterThan':
-                    filters.push(`Expr.dateIsAfter(${k}, '${dateFrom}')`);
-                    break;
-                case 'inRange':
-                    filters.push(`Expr.dateIsAfter(${k}, '${dateFrom}') && Expr.dateIsBefore(${k}, '${dateTo}')`);
-                    break;
-                case 'isToday':
-                    const now = new Date();
-                    const year = now.getFullYear();
-                    const month = (now.getMonth() + 1).toString().padStart(2, '0');
-                    const day = now.getDate().toString().padStart(2, '0');
-                    const todayStr = `${year}-${month}-${day} 00:00:00`;
-                    filters.push(`Expr.dateIsEqual(${k}, '${todayStr}')`);
-                    break;
-                case 'blank':
-                    filters.push(`${k} == null`);
-                    break;
-                case 'notBlank':
-                    filters.push(`${k} != null`);
-                    break;
+            const fragment = this.criteriaForSingleModel(k, this.currentFilterModel[k]);
+            if (fragment) {
+                filters.push(fragment);
+            }
+        });
+        // Handle multi filters (ag-multi-column-filter, e.g. text+set combos on enum/currency columns).
+        // AG Grid wraps these as { filterType: 'multi', filterModels: [...] } which none of the
+        // per-type branches above recognize, so the filter was previously silently dropped and
+        // CRITERIA_MATCH never reflected it - the grid kept showing unfiltered server-side data.
+        this.getFiltersByType('multi').forEach((k) => {
+            var _a;
+            const subModels = (_a = this.currentFilterModel[k].filterModels) !== null && _a !== void 0 ? _a : [];
+            const operator = (this.currentFilterModel[k].operator || 'AND').toUpperCase();
+            const joiner = operator === 'OR' ? ' || ' : ' && ';
+            const fragments = subModels
+                .map((subModel) => this.criteriaForSingleModel(k, subModel))
+                .filter((f) => !!f);
+            if (fragments.length === 1) {
+                filters.push(fragments[0]);
+            }
+            else if (fragments.length > 1) {
+                filters.push(`(${fragments.join(joiner)})`);
             }
         });
         return filters;
     }
+    /**
+     * Builds a single criteria fragment for one filter model. Used both for flat per-column
+     * filter models and to unwrap the sub-filters inside an ag-multi-column-filter's
+     * `filterModels` array.
+     * @internal
+     */
+    criteriaForSingleModel(k, model) {
+        if (!model)
+            return null;
+        switch (model.filterType) {
+            case 'text':
+                return this.criteriaForTextModel(k, model);
+            case 'set':
+                return this.criteriaForSetModel(k, model);
+            case 'number':
+                return this.criteriaForNumberModel(k, model);
+            case 'date':
+                return this.criteriaForDateModel(k, model);
+            default:
+                return null;
+        }
+    }
+    criteriaForTextModel(k, model) {
+        const type = model.type;
+        const val = model.filter;
+        if (!val && (type === 'false' || type === 'true')) {
+            return `${k} == ${type}`;
+        }
+        switch (type) {
+            case 'blank':
+                return `(${k} == '' || ${k} == null)`;
+            case 'contains':
+                return `Expr.containsIgnoreCase(${k}, '${val}')`;
+            case 'equals':
+                return `${k} == '${val}'`;
+            case 'notBlank':
+                return `(${k} != '' && ${k} != null)`;
+            case 'notEqual':
+                return `${k} != '${val}'`;
+            case 'wordStartsWith':
+                return `Expr.containsWordsStartingWithIgnoreCase(${k}, '${val}')`;
+            default:
+                return null;
+        }
+    }
+    criteriaForSetModel(k, model) {
+        var _a, _b;
+        const selectedValues = ((_a = model.values) !== null && _a !== void 0 ? _a : []);
+        if (!selectedValues.length) {
+            // Nothing selected means no additional criteria
+            return null;
+        }
+        // Try to detect "all values selected" using VALID_VALUES from metadata.
+        // In that case we don't want to send any criteria, as it would be equivalent
+        // to no filter at all.
+        const colMeta = (_b = this.resourceColDefs) === null || _b === void 0 ? void 0 : _b.find((o) => o.NAME === k);
+        let allValues;
+        if (colMeta === null || colMeta === void 0 ? void 0 : colMeta.VALID_VALUES) {
+            try {
+                allValues = Array.isArray(colMeta.VALID_VALUES)
+                    ? colMeta.VALID_VALUES
+                    : colMeta.VALID_VALUES.split('|');
+            }
+            catch (_c) {
+                allValues = undefined;
+            }
+        }
+        if (allValues &&
+            allValues.length === selectedValues.length &&
+            allValues.every((v) => selectedValues.includes(v))) {
+            // All enum options are selected – skip adding criteria for this column
+            return null;
+        }
+        const orConditions = selectedValues.map((val) => {
+            const safeVal = String(val).replace(/'/g, "\\'");
+            return `${k} == '${safeVal}'`;
+        });
+        return orConditions.length ? `(${orConditions.join(' || ')})` : null;
+    }
+    criteriaForNumberModel(k, model) {
+        const value = model.filter;
+        const valueTwo = model.filterTo;
+        switch (model.type) {
+            case 'equals':
+                return !isNaN(value) ? `${k} == ${value}` : null;
+            case 'notEqual':
+                return !isNaN(value) ? `${k} != ${value}` : null;
+            case 'greaterThan':
+                return !isNaN(value) ? `${k} > ${value}` : null;
+            case 'greaterThanOrEqual':
+                return !isNaN(value) ? `${k} >= ${value}` : null;
+            case 'lessThan':
+                return !isNaN(value) ? `${k} < ${value}` : null;
+            case 'lessThanOrEqual':
+                return !isNaN(value) ? `${k} <= ${value}` : null;
+            case 'inRange':
+                return !isNaN(value) && !isNaN(valueTwo) ? `${k} >= ${value} && ${k} <= ${valueTwo}` : null;
+            case 'blank':
+                return `${k} == 0`;
+            case 'notBlank':
+                return `${k} != 0`;
+            default:
+                return null;
+        }
+    }
+    criteriaForDateModel(k, model) {
+        var _a, _b;
+        const dateFrom = (_a = model.dateFrom) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '').replace('T', '-').split(' ')[0];
+        const dateTo = (_b = model.dateTo) === null || _b === void 0 ? void 0 : _b.replace(/-/g, '').replace('T', '-').split(' ')[0];
+        switch (model.type) {
+            case 'equals':
+                return `Expr.dateIsEqual(${k}, '${dateFrom}')`;
+            case 'lessThan':
+                return `Expr.dateIsBefore(${k}, '${dateFrom}')`;
+            case 'greaterThan':
+                return `Expr.dateIsAfter(${k}, '${dateFrom}')`;
+            case 'inRange':
+                return `Expr.dateIsAfter(${k}, '${dateFrom}') && Expr.dateIsBefore(${k}, '${dateTo}')`;
+            case 'isToday': {
+                const now = new Date();
+                const year = now.getFullYear();
+                const month = (now.getMonth() + 1).toString().padStart(2, '0');
+                const day = now.getDate().toString().padStart(2, '0');
+                return `Expr.dateIsEqual(${k}, '${year}-${month}-${day} 00:00:00')`;
+            }
+            case 'blank':
+                return `${k} == null`;
+            case 'notBlank':
+                return `${k} != null`;
+            default:
+                return null;
+        }
+    }
     getFiltersByType(filterType) {
         var _a;
         return Object.keys((_a = this.currentFilterModel) !== null && _a !== void 0 ? _a : {})
@@ -336,19 +395,29 @@ export class BaseServerSideDatasource {
             }
             return rowCount;
         }
-        if (currentLastRowNumber === this.serverRowsCount && !this.moreRows) {
-            rowCount = this.serverRowsCount;
+        // Infinite scroll: getRows() only resolves a block once the session-cumulative row cache
+        // covers the block's full extent, or the stream reported no more data (see the accumulation
+        // logic in server-side.resource-dataserver.ts getRows()). So by construction, blocks handed
+        // to AG Grid are either FULL (more may follow) or FINAL (dataset ended) - which lets the
+        // count logic stay simple and honest:
+        if (!this.moreRows) {
+            // Dataset genuinely ends here. rowData is a Map keyed by rowId, so .size is the true
+            // unique-row count. Deliberately NOT serverRowsCount - GSF's ROWS_COUNT ignores
+            // CRITERIA_MATCH entirely (confirmed: it returns the full unfiltered total regardless of
+            // any filter). Deliberately NOT clientRowsCount either - it's a non-deduplicated running
+            // sum of inserts across stream messages and overcounts on live/reactive streams.
+            rowCount = Math.min(this.rowData.size, this.maxView);
         }
-        else if (currentLastRowNumber > this.maxView) {
-            rowCount = Math.min(defaultCount, this.calculatedRowsCount);
+        else if (this.rowData.size >= this.maxView) {
+            // Hard cap - the view can't grow past maxView, stop AG Grid from requesting further.
+            rowCount = this.maxView;
         }
-        else if (!this.moreRows && currentLastRowNumber > this.calculatedRowsCount) {
-            // No more data from server and request is beyond what has been counted.
-            // Return the actual loaded count so AG Grid knows the dataset ends here.
-            rowCount = this.clientRowsCount || this.calculatedRowsCount;
-        }
-        else if (!this.moreRows && this.serverRowsCount > this.calculatedRowsCount) {
-            rowCount = this.calculatedRowsCount;
+        else {
+            // Full block delivered and the stream says more may follow: leave rowCount undefined so
+            // AG Grid keeps its own "returned block was full, more may exist" heuristic - this both
+            // keeps infinite scroll going and preserves the open-ended "100+"-style count display,
+            // for filtered views exactly the same as for unfiltered ones.
+            rowCount = undefined;
         }
         return rowCount;
     }