npm - @webiny/app-admin - Versions diffs - 6.5.0-beta.0 → 6.5.0-beta.1 - Mend

@webiny/app-admin 6.5.0-beta.0 → 6.5.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-admin",
-	"version": "6.5.0-beta.0",
+	"version": "6.5.0-beta.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -26,24 +26,24 @@
 		"@iconify/json": "2.2.503",
 		"@lexical/utils": "0.48.0",
 		"@types/react": "18.3.31",
-		"@webiny/admin-ui": "6.5.0-beta.0",
-		"@webiny/app": "6.5.0-beta.0",
+		"@webiny/admin-ui": "6.5.0-beta.1",
+		"@webiny/app": "6.5.0-beta.1",
 		"@webiny/di": "1.0.2",
-		"@webiny/feature": "6.5.0-beta.0",
-		"@webiny/form": "6.5.0-beta.0",
-		"@webiny/icons": "6.5.0-beta.0",
-		"@webiny/lexical-converter": "6.5.0-beta.0",
-		"@webiny/lexical-editor": "6.5.0-beta.0",
-		"@webiny/lexical-nodes": "6.5.0-beta.0",
-		"@webiny/lexical-theme": "6.5.0-beta.0",
-		"@webiny/plugins": "6.5.0-beta.0",
-		"@webiny/react-composition": "6.5.0-beta.0",
-		"@webiny/react-properties": "6.5.0-beta.0",
-		"@webiny/sdk": "6.5.0-beta.0",
-		"@webiny/telemetry": "6.5.0-beta.0",
-		"@webiny/utils": "6.5.0-beta.0",
-		"@webiny/validation": "6.5.0-beta.0",
-		"@webiny/wcp": "6.5.0-beta.0",
+		"@webiny/feature": "6.5.0-beta.1",
+		"@webiny/form": "6.5.0-beta.1",
+		"@webiny/icons": "6.5.0-beta.1",
+		"@webiny/lexical-converter": "6.5.0-beta.1",
+		"@webiny/lexical-editor": "6.5.0-beta.1",
+		"@webiny/lexical-nodes": "6.5.0-beta.1",
+		"@webiny/lexical-theme": "6.5.0-beta.1",
+		"@webiny/plugins": "6.5.0-beta.1",
+		"@webiny/react-composition": "6.5.0-beta.1",
+		"@webiny/react-properties": "6.5.0-beta.1",
+		"@webiny/sdk": "6.5.0-beta.1",
+		"@webiny/telemetry": "6.5.0-beta.1",
+		"@webiny/utils": "6.5.0-beta.1",
+		"@webiny/validation": "6.5.0-beta.1",
+		"@webiny/wcp": "6.5.0-beta.1",
 		"apollo-cache": "1.3.5",
 		"apollo-client": "2.6.10",
 		"apollo-link": "1.2.14",
@@ -83,7 +83,7 @@
 		"@types/react-transition-group": "4.4.12",
 		"@types/store": "2.0.5",
 		"@types/tinycolor2": "1.4.6",
-		"@webiny/build-tools": "6.5.0-beta.0",
+		"@webiny/build-tools": "6.5.0-beta.1",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
 		"vitest": "4.1.10"

package/presentation/listPresenter/FolderAwareDataSource.d.ts CHANGED Viewed

@@ -10,6 +10,11 @@ export interface FolderAwareDataSourceConfig<TRow> {
     };
     keyField: keyof TRow & string;
     localFilters?: Record<string, (item: TRow, value: unknown) => boolean>;
+    /**
+     * Reads the value of a sort field from an item, for ordering rows locally.
+     * See `QueryMatcherConfig.getSortValue`.
+     */
+    getSortValue?: (item: TRow, field: string) => unknown;
 }
 export interface FetchParams {
     where?: Record<string, unknown>;

package/presentation/listPresenter/FolderAwareDataSource.js CHANGED Viewed

@@ -28,7 +28,8 @@ class FolderAwareDataSource {
         };
         this.queryMatcher = new QueryMatcher({
             keyField: config.keyField,
-            localFilters
+            localFilters,
+            getSortValue: config.getSortValue
         });
         makeObservable(this, {
             _meta: observable,
@@ -59,7 +60,7 @@ class FolderAwareDataSource {
             });
             runInAction(()=>{
                 this.onQueryResult(result.data);
-                this.queryMatcher.updateFromQuery(params, result.data.map((item)=>String(item[this._keyField])));
+                this.queryMatcher.updateFromQuery(params, result.data.map((item)=>String(item[this._keyField])), result.meta.hasMoreItems);
                 this._meta = {
                     cursor: result.meta.cursor,
                     hasMoreItems: result.meta.hasMoreItems,
@@ -85,7 +86,7 @@ class FolderAwareDataSource {
             });
             runInAction(()=>{
                 this.onLoadMoreResult(result.data);
-                this.queryMatcher.appendResultKeys(result.data.map((item)=>String(item[this._keyField])));
+                this.queryMatcher.appendResultKeys(result.data.map((item)=>String(item[this._keyField])), result.meta.hasMoreItems);
                 this._meta = {
                     cursor: result.meta.cursor,
                     hasMoreItems: result.meta.hasMoreItems,

package/presentation/listPresenter/FolderAwareDataSource.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"presentation/listPresenter/FolderAwareDataSource.js","sources":["../../../src/presentation/listPresenter/FolderAwareDataSource.ts"],"sourcesContent":["import { makeObservable, observable, computed, runInAction, action } from \"mobx\";\nimport type { IDataSource, IDataSourceQuery, IDataSourceMeta } from \"./abstractions.js\";\nimport { QueryMatcher } from \"./QueryMatcher.js\";\n\nexport interface FolderAwareDataSourceConfig<TRow> {\n locationField?: string;\n registeredFilterNames?: string[];\n getDescendantFolders?: { execute(folderId: string): { id: string }[] };\n keyField: keyof TRow & string;\n localFilters?: Record<string, (item: TRow, value: unknown) => boolean>;\n}\n\nexport interface FetchParams {\n where?: Record<string, unknown>;\n sort?: string[];\n search?: string;\n limit?: number;\n after?: string;\n}\n\nexport interface FetchResult<TRow> {\n data: TRow[];\n meta: { cursor: string \| null; hasMoreItems: boolean; totalCount: number };\n}\n\nexport abstract class FolderAwareDataSource<TRow> implements IDataSource<TRow> {\n private _meta: IDataSourceMeta = { cursor: null, hasMoreItems: false, totalCount: 0 };\n private _loading = false;\n private _locationField: string;\n private _registeredFilterNames: Set<string>;\n private _getDescendantFolders: FolderAwareDataSourceConfig<TRow>[\"getDescendantFolders\"];\n private _keyField: keyof TRow & string;\n protected queryMatcher: QueryMatcher<TRow>;\n\n constructor(config: FolderAwareDataSourceConfig<TRow>) {\n this._locationField = config.locationField ?? \"location\";\n this._registeredFilterNames = new Set([\n ...(config.registeredFilterNames ?? []),\n ...Object.keys(config.localFilters ?? {})\n ]);\n this._getDescendantFolders = config.getDescendantFolders;\n this._keyField = config.keyField;\n\n const locationField = this._locationField;\n const localFilters: Record<string, (item: TRow, value: unknown) => boolean> = {\n folderId: (item, value) => {\n const folderId = value as string;\n const location = (item as Record<string, any>)[locationField];\n const itemFolderId = location?.folderId as string \| undefined;\n if (folderId && folderId !== \"root\") {\n return itemFolderId === folderId;\n }\n return !itemFolderId \|\| itemFolderId === \"root\";\n },\n ...config.localFilters\n };\n\n this.queryMatcher = new QueryMatcher<TRow>({\n keyField: config.keyField,\n localFilters\n });\n\n makeObservable<FolderAwareDataSource<TRow>, \"_meta\" \| \"_loading\">(this, {\n _meta: observable,\n _loading: observable,\n meta: computed,\n loading: computed,\n query: action,\n loadMore: action\n });\n }\n\n abstract get rows(): TRow[];\n\n abstract fetch(params: FetchParams): Promise<FetchResult<TRow>>;\n\n protected onQueryResult(_data: TRow[]): void {}\n\n protected onLoadMoreResult(_data: TRow[]): void {}\n\n get meta(): IDataSourceMeta {\n return this._meta;\n }\n\n get loading(): boolean {\n return this._loading;\n }\n\n async query(params: IDataSourceQuery): Promise<void> {\n this._loading = true;\n\n try {\n const result = await this.fetch({\n where: this.buildWhere(params),\n sort: this.buildSort(params),\n search: params.search,\n limit: params.limit,\n after: params.cursor\n });\n\n runInAction(() => {\n this.onQueryResult(result.data);\n this.queryMatcher.updateFromQuery(\n params,\n result.data.map(item => String(item[this._keyField]))\n );\n this._meta = {\n cursor: result.meta.cursor,\n hasMoreItems: result.meta.hasMoreItems,\n totalCount: result.meta.totalCount\n };\n });\n } finally {\n runInAction(() => {\n this._loading = false;\n });\n }\n }\n\n async loadMore(params: IDataSourceQuery): Promise<void> {\n if (!this._meta.hasMoreItems \|\| this._loading) {\n return;\n }\n\n this._loading = true;\n\n try {\n const result = await this.fetch({\n where: this.buildWhere(params),\n sort: this.buildSort(params),\n search: params.search,\n limit: params.limit,\n after: this._meta.cursor ?? undefined\n });\n\n runInAction(() => {\n this.onLoadMoreResult(result.data);\n this.queryMatcher.appendResultKeys(\n result.data.map(item => String(item[this._keyField]))\n );\n this._meta = {\n cursor: result.meta.cursor,\n hasMoreItems: result.meta.hasMoreItems,\n totalCount: result.meta.totalCount\n };\n });\n } finally {\n runInAction(() => {\n this._loading = false;\n });\n }\n }\n\n protected customizeWhere(\n _where: Record<string, unknown>,\n _filters: Record<string, unknown>\n ): void {}\n\n protected shouldExpandFolders(_filters: Record<string, unknown>): boolean {\n return false;\n }\n\n private buildWhere(params: IDataSourceQuery): Record<string, unknown> \| undefined {\n const where: Record<string, unknown> = {};\n const filters = params.filters ?? {};\n const folderId = (filters.folderId as string \| undefined) \|\| \"root\";\n const isRoot = folderId === \"root\";\n const hasAdvancedFilters = Object.keys(filters).some(\n k => k !== \"folderId\" && !this._registeredFilterNames.has(k)\n );\n const isSearching =\n !!params.search \|\| hasAdvancedFilters \|\| this.shouldExpandFolders(filters);\n\n if (isSearching && isRoot) {\n // Search/filter from root: no folder filter — search all folders.\n } else if (isSearching && this._getDescendantFolders) {\n const descendants = this._getDescendantFolders.execute(folderId);\n const folderIds = descendants.map(f => f.id);\n where[this._locationField] = { folderId_in: folderIds };\n } else {\n where[this._locationField] = { folderId };\n }\n\n for (const [key, value] of Object.entries(filters)) {\n if (key === \"folderId\") {\n continue;\n }\n where[key] = value;\n }\n\n this.customizeWhere(where, filters);\n\n return Object.keys(where).length > 0 ? where : undefined;\n }\n\n private buildSort(params: IDataSourceQuery): string[] \| undefined {\n if (!params.sort) {\n return undefined;\n }\n return [`${params.sort.field}_${params.sort.direction}`];\n }\n}\n"],"names":["FolderAwareDataSource","config","Set","Object","locationField","localFilters","item","value","folderId","location","itemFolderId","QueryMatcher","makeObservable","observable","computed","action","_data","params","result","runInAction","String","undefined","_where","_filters","where","filters","isRoot","hasAdvancedFilters","k","isSearching","descendants","folderIds","f","key"],"mappings":"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"}
1	+ {"version":3,"file":"presentation/listPresenter/FolderAwareDataSource.js","sources":["../../../src/presentation/listPresenter/FolderAwareDataSource.ts"],"sourcesContent":["import { makeObservable, observable, computed, runInAction, action } from \"mobx\";\nimport type { IDataSource, IDataSourceQuery, IDataSourceMeta } from \"./abstractions.js\";\nimport { QueryMatcher } from \"./QueryMatcher.js\";\n\nexport interface FolderAwareDataSourceConfig<TRow> {\n locationField?: string;\n registeredFilterNames?: string[];\n getDescendantFolders?: { execute(folderId: string): { id: string }[] };\n keyField: keyof TRow & string;\n localFilters?: Record<string, (item: TRow, value: unknown) => boolean>;\n /*\n Reads the value of a sort field from an item, for ordering rows locally.\n * See `QueryMatcherConfig.getSortValue`.\n */\n getSortValue?: (item: TRow, field: string) => unknown;\n}\n\nexport interface FetchParams {\n where?: Record<string, unknown>;\n sort?: string[];\n search?: string;\n limit?: number;\n after?: string;\n}\n\nexport interface FetchResult<TRow> {\n data: TRow[];\n meta: { cursor: string \| null; hasMoreItems: boolean; totalCount: number };\n}\n\nexport abstract class FolderAwareDataSource<TRow> implements IDataSource<TRow> {\n private _meta: IDataSourceMeta = { cursor: null, hasMoreItems: false, totalCount: 0 };\n private _loading = false;\n private _locationField: string;\n private _registeredFilterNames: Set<string>;\n private _getDescendantFolders: FolderAwareDataSourceConfig<TRow>[\"getDescendantFolders\"];\n private _keyField: keyof TRow & string;\n protected queryMatcher: QueryMatcher<TRow>;\n\n constructor(config: FolderAwareDataSourceConfig<TRow>) {\n this._locationField = config.locationField ?? \"location\";\n this._registeredFilterNames = new Set([\n ...(config.registeredFilterNames ?? []),\n ...Object.keys(config.localFilters ?? {})\n ]);\n this._getDescendantFolders = config.getDescendantFolders;\n this._keyField = config.keyField;\n\n const locationField = this._locationField;\n const localFilters: Record<string, (item: TRow, value: unknown) => boolean> = {\n folderId: (item, value) => {\n const folderId = value as string;\n const location = (item as Record<string, any>)[locationField];\n const itemFolderId = location?.folderId as string \| undefined;\n if (folderId && folderId !== \"root\") {\n return itemFolderId === folderId;\n }\n return !itemFolderId \|\| itemFolderId === \"root\";\n },\n ...config.localFilters\n };\n\n this.queryMatcher = new QueryMatcher<TRow>({\n keyField: config.keyField,\n localFilters,\n getSortValue: config.getSortValue\n });\n\n makeObservable<FolderAwareDataSource<TRow>, \"_meta\" \| \"_loading\">(this, {\n _meta: observable,\n _loading: observable,\n meta: computed,\n loading: computed,\n query: action,\n loadMore: action\n });\n }\n\n abstract get rows(): TRow[];\n\n abstract fetch(params: FetchParams): Promise<FetchResult<TRow>>;\n\n protected onQueryResult(_data: TRow[]): void {}\n\n protected onLoadMoreResult(_data: TRow[]): void {}\n\n get meta(): IDataSourceMeta {\n return this._meta;\n }\n\n get loading(): boolean {\n return this._loading;\n }\n\n async query(params: IDataSourceQuery): Promise<void> {\n this._loading = true;\n\n try {\n const result = await this.fetch({\n where: this.buildWhere(params),\n sort: this.buildSort(params),\n search: params.search,\n limit: params.limit,\n after: params.cursor\n });\n\n runInAction(() => {\n this.onQueryResult(result.data);\n this.queryMatcher.updateFromQuery(\n params,\n result.data.map(item => String(item[this._keyField])),\n result.meta.hasMoreItems\n );\n this._meta = {\n cursor: result.meta.cursor,\n hasMoreItems: result.meta.hasMoreItems,\n totalCount: result.meta.totalCount\n };\n });\n } finally {\n runInAction(() => {\n this._loading = false;\n });\n }\n }\n\n async loadMore(params: IDataSourceQuery): Promise<void> {\n if (!this._meta.hasMoreItems \|\| this._loading) {\n return;\n }\n\n this._loading = true;\n\n try {\n const result = await this.fetch({\n where: this.buildWhere(params),\n sort: this.buildSort(params),\n search: params.search,\n limit: params.limit,\n after: this._meta.cursor ?? undefined\n });\n\n runInAction(() => {\n this.onLoadMoreResult(result.data);\n this.queryMatcher.appendResultKeys(\n result.data.map(item => String(item[this._keyField])),\n result.meta.hasMoreItems\n );\n this._meta = {\n cursor: result.meta.cursor,\n hasMoreItems: result.meta.hasMoreItems,\n totalCount: result.meta.totalCount\n };\n });\n } finally {\n runInAction(() => {\n this._loading = false;\n });\n }\n }\n\n protected customizeWhere(\n _where: Record<string, unknown>,\n _filters: Record<string, unknown>\n ): void {}\n\n protected shouldExpandFolders(_filters: Record<string, unknown>): boolean {\n return false;\n }\n\n private buildWhere(params: IDataSourceQuery): Record<string, unknown> \| undefined {\n const where: Record<string, unknown> = {};\n const filters = params.filters ?? {};\n const folderId = (filters.folderId as string \| undefined) \|\| \"root\";\n const isRoot = folderId === \"root\";\n const hasAdvancedFilters = Object.keys(filters).some(\n k => k !== \"folderId\" && !this._registeredFilterNames.has(k)\n );\n const isSearching =\n !!params.search \|\| hasAdvancedFilters \|\| this.shouldExpandFolders(filters);\n\n if (isSearching && isRoot) {\n // Search/filter from root: no folder filter — search all folders.\n } else if (isSearching && this._getDescendantFolders) {\n const descendants = this._getDescendantFolders.execute(folderId);\n const folderIds = descendants.map(f => f.id);\n where[this._locationField] = { folderId_in: folderIds };\n } else {\n where[this._locationField] = { folderId };\n }\n\n for (const [key, value] of Object.entries(filters)) {\n if (key === \"folderId\") {\n continue;\n }\n where[key] = value;\n }\n\n this.customizeWhere(where, filters);\n\n return Object.keys(where).length > 0 ? where : undefined;\n }\n\n private buildSort(params: IDataSourceQuery): string[] \| undefined {\n if (!params.sort) {\n return undefined;\n }\n return [`${params.sort.field}_${params.sort.direction}`];\n }\n}\n"],"names":["FolderAwareDataSource","config","Set","Object","locationField","localFilters","item","value","folderId","location","itemFolderId","QueryMatcher","makeObservable","observable","computed","action","_data","params","result","runInAction","String","undefined","_where","_filters","where","filters","isRoot","hasAdvancedFilters","k","isSearching","descendants","folderIds","f","key"],"mappings":"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"}

package/presentation/listPresenter/QueryMatcher.d.ts CHANGED Viewed

@@ -1,8 +1,15 @@
 import type { IDataSourceQuery } from "./abstractions.js";
 type ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;
+type SortValueGetter<TRow> = (item: TRow, field: string) => unknown;
 export interface QueryMatcherConfig<TRow> {
     keyField: keyof TRow & string;
     localFilters: Record<string, ItemPredicate<TRow>>;
+    /**
+     * Reads the value of a sort field from an item. Defaults to a dot-path lookup
+     * (e.g. `savedOn`, `values.title`). Override when the query's sort field name
+     * does not match the item's shape.
+     */
+    getSortValue?: SortValueGetter<TRow>;
 }
 /**
  * Decides which cached items belong in the current view.
@@ -34,10 +41,11 @@ export interface QueryMatcherConfig<TRow> {
  * });
  *
  * // In DataSource.query(), after fetching:
- * matcher.updateFromQuery(params, result.data.map(item => item.id));
+ * matcher.updateFromQuery(params, result.data.map(item => item.id), result.meta.hasMoreItems);
  *
- * // In DataSource.rows getter:
- * return cache.getItems().filter(matcher.matcher);
+ * // In DataSource.rows getter (filters, sorts by the applied sort, and cuts off at the
+ * // last loaded item):
+ * return matcher.select(cache.getItems());
  * ```
  */
 export declare class QueryMatcher<TRow> {
@@ -45,12 +53,27 @@ export declare class QueryMatcher<TRow> {
     private _queryResultKeys;
     private _matcher;
     private localFilterKeys;
+    private getSortValue;
+    private _view;
     constructor(config: QueryMatcherConfig<TRow>);
     get matcher(): (item: TRow) => boolean;
     filter(items: TRow[]): TRow[];
+    /**
+     * Returns the items that belong in the current view, in the view's order.
+     *
+     * The cache is shared by views with different sorts, so its order means nothing to
+     * this view. Instead, matching items are sorted by the applied sort (ties keep the
+     * server order), and the result is cut off after the last item the server returned
+     * for this view. That keeps locally created or updated items in their sort position,
+     * and hides cached items that sort past the loaded pages until pagination reaches them.
+     *
+     * While searching, the server's (relevance) order is kept as is.
+     */
+    select(items: TRow[]): TRow[];
+    private getKey;
     hasServerSideFilters(params: IDataSourceQuery): boolean;
-    updateFromQuery(params: IDataSourceQuery, resultKeys: string[]): void;
-    appendResultKeys(keys: string[]): void;
+    updateFromQuery(params: IDataSourceQuery, resultKeys: string[], hasMore?: boolean): void;
+    appendResultKeys(keys: string[], hasMore?: boolean): void;
     private buildMatcher;
 }
 export {};

package/presentation/listPresenter/QueryMatcher.js CHANGED Viewed

@@ -4,9 +4,12 @@ class QueryMatcher {
         this.config = config;
         this._queryResultKeys = null;
         this._matcher = ()=>true;
+        this._view = null;
         this.localFilterKeys = new Set(Object.keys(config.localFilters));
+        this.getSortValue = config.getSortValue ?? getValueByPath;
         makeObservable(this, {
             _matcher: observable.ref,
+            _view: observable.ref,
             matcher: computed,
             updateFromQuery: action,
             appendResultKeys: action
@@ -18,18 +21,65 @@ class QueryMatcher {
     filter(items) {
         return items.filter(this._matcher);
     }
+    select(items) {
+        const matched = this.filter(items);
+        const view = this._view;
+        if (!view) return matched;
+        const serverIndex = new Map(view.resultKeys.map((key, index)=>[
+                key,
+                index
+            ]));
+        const indexOf = (item)=>serverIndex.get(this.getKey(item)) ?? 1 / 0;
+        const sort = view.searching ? void 0 : view.sort;
+        const sorted = [
+            ...matched
+        ].sort((a, b)=>{
+            if (sort) {
+                const result = compareValues(this.getSortValue(a, sort.field), this.getSortValue(b, sort.field));
+                if (0 !== result) return "ASC" === sort.direction ? result : -result;
+            }
+            const left = indexOf(a);
+            const right = indexOf(b);
+            return left === right ? 0 : left < right ? -1 : 1;
+        });
+        if (!view.hasMore) return sorted;
+        let lastLoaded = -1;
+        sorted.forEach((item, index)=>{
+            if (serverIndex.has(this.getKey(item))) lastLoaded = index;
+        });
+        return lastLoaded < 0 ? sorted : sorted.slice(0, lastLoaded + 1);
+    }
+    getKey(item) {
+        return String(item[this.config.keyField]);
+    }
     hasServerSideFilters(params) {
         if (params.search) return true;
         const filters = params.filters ?? {};
         return Object.keys(filters).some((key)=>!this.localFilterKeys.has(key));
     }
-    updateFromQuery(params, resultKeys) {
+    updateFromQuery(params, resultKeys, hasMore = false) {
         if (this.hasServerSideFilters(params)) this._queryResultKeys = new Set(resultKeys);
         else this._queryResultKeys = null;
         this._matcher = this.buildMatcher(params);
+        this._view = {
+            resultKeys: [
+                ...resultKeys
+            ],
+            sort: params.sort,
+            searching: !!params.search,
+            hasMore
+        };
     }
-    appendResultKeys(keys) {
+    appendResultKeys(keys, hasMore = false) {
         if (this._queryResultKeys) for (const key of keys)this._queryResultKeys.add(key);
+        if (this._view) this._view = {
+            ...this._view,
+            resultKeys: [
+                ...this._view.resultKeys,
+                ...keys
+            ],
+            hasMore
+        };
     }
     buildMatcher(params) {
         const filters = params.filters ?? {};
@@ -54,6 +104,26 @@ class QueryMatcher {
         };
     }
 }
+function getValueByPath(item, path) {
+    let current = item;
+    for (const part of path.split(".")){
+        if (null == current || "object" != typeof current) return;
+        current = current[part];
+    }
+    return current;
+}
+function compareValues(a, b) {
+    const aEmpty = null == a;
+    const bEmpty = null == b;
+    if (aEmpty || bEmpty) return aEmpty === bEmpty ? 0 : aEmpty ? 1 : -1;
+    const left = a instanceof Date ? a.getTime() : a;
+    const right = b instanceof Date ? b.getTime() : b;
+    if ("number" == typeof left && "number" == typeof right) return left - right;
+    if ("boolean" == typeof left && "boolean" == typeof right) return Number(left) - Number(right);
+    const leftString = String(left);
+    const rightString = String(right);
+    return leftString < rightString ? -1 : leftString > rightString ? 1 : 0;
+}
 export { QueryMatcher };
 //# sourceMappingURL=QueryMatcher.js.map

package/presentation/listPresenter/QueryMatcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"presentation/listPresenter/QueryMatcher.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.ts"],"sourcesContent":["import { makeObservable, observable, computed, action } from \"mobx\";\nimport type { IDataSourceQuery } from \"./abstractions.js\";\n\ntype ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;\n\nexport interface QueryMatcherConfig<TRow> {\n keyField: keyof TRow & string;\n localFilters: Record<string, ItemPredicate<TRow>>;\n}\n\n/*\n Decides which cached items belong in the current view.\n \n A DataSource backed by a shared cache (e.g., per-model entry cache) needs to\n * filter cached items to only those matching the active query. QueryMatcher does\n * this by splitting filters into two categories:\n \n - Local filters (e.g., folderId, status) — evaluated client-side against\n * each item using predicates provided via `localFilters` config. Used when\n * browsing without search or server-side filters.\n \n - Server-side filters (search, advanced search, any filter key not in\n * `localFilters`) — cannot be evaluated locally. Instead, QueryMatcher tracks\n * the set of item keys returned by the last server query (`_queryResultKeys`)\n * and restricts the view to those items.\n \n The `matcher` getter is MobX-computed, so any DataSource `rows` getter that\n * reads it will recompute when the matcher changes after a query.\n \n Usage:\n * ```ts\n * const matcher = new QueryMatcher<MyItem>({\n * keyField: \"id\",\n * localFilters: {\n * folderId: (item, value) => item.folderId === value,\n * status: (item, value) => item.status === value,\n * }\n * });\n \n // In DataSource.query(), after fetching:\n * matcher.updateFromQuery(params, result.data.map(item => item.id));\n \n // In DataSource.rows getter:\n * return cache.getItems().filter(matcher.matcher);\n * ```\n */\nexport class QueryMatcher<TRow> {\n private _queryResultKeys: Set<string> \| null = null;\n private _matcher: (item: TRow) => boolean = () => true;\n private localFilterKeys: Set<string>;\n\n constructor(private config: QueryMatcherConfig<TRow>) {\n this.localFilterKeys = new Set(Object.keys(config.localFilters));\n\n makeObservable<QueryMatcher<TRow>, \"_matcher\">(this, {\n _matcher: observable.ref,\n matcher: computed,\n updateFromQuery: action,\n appendResultKeys: action\n });\n }\n\n get matcher(): (item: TRow) => boolean {\n return this._matcher;\n }\n\n filter(items: TRow[]): TRow[] {\n return items.filter(this._matcher);\n }\n\n hasServerSideFilters(params: IDataSourceQuery): boolean {\n if (params.search) {\n return true;\n }\n const filters = params.filters ?? {};\n return Object.keys(filters).some(key => !this.localFilterKeys.has(key));\n }\n\n updateFromQuery(params: IDataSourceQuery, resultKeys: string[]): void {\n if (this.hasServerSideFilters(params)) {\n this._queryResultKeys = new Set(resultKeys);\n } else {\n this._queryResultKeys = null;\n }\n this._matcher = this.buildMatcher(params);\n }\n\n appendResultKeys(keys: string[]): void {\n if (this._queryResultKeys) {\n for (const key of keys) {\n this._queryResultKeys.add(key);\n }\n }\n }\n\n private buildMatcher(params: IDataSourceQuery): (item: TRow) => boolean {\n const filters = params.filters ?? {};\n const queryResultKeys = this._queryResultKeys;\n const isSearching = !!params.search;\n const { keyField, localFilters } = this.config;\n\n const activeLocalFilters: Array<{ predicate: ItemPredicate<TRow>; value: unknown }> = [];\n for (const [key, predicate] of Object.entries(localFilters)) {\n const value = filters[key];\n if (value !== undefined && value !== null) {\n activeLocalFilters.push({ predicate, value });\n }\n }\n\n return (item: TRow) => {\n if (queryResultKeys) {\n if (!queryResultKeys.has(String(item[keyField]))) {\n return false;\n }\n } else if (!isSearching) {\n for (const { predicate, value } of activeLocalFilters) {\n if (!predicate(item, value)) {\n return false;\n }\n }\n }\n\n return true;\n };\n }\n}\n"],"names":["QueryMatcher","config","Set","Object","makeObservable","observable","computed","action","items","params","filters","key","resultKeys","keys","queryResultKeys","isSearching","keyField","localFilters","activeLocalFilters","predicate","value","item","String"],"mappings":";AA8CO,MAAMA;IAKT,YAAoBC,MAAgC,CAAE;aAAlCA,MAAM,GAANA;aAJZ,gBAAgB,GAAuB;aACvC,QAAQ,GAA4B,IAAM;QAI9C,IAAI,CAAC,eAAe,GAAG,IAAIC,IAAIC,OAAO,IAAI,CAACF,OAAO,YAAY;QAE9DG,eAA+C,IAAI,EAAE;YACjD,UAAUC,WAAW,GAAG;YACxB,SAASC;YACT,iBAAiBC;YACjB,kBAAkBA;QACtB;IACJ;IAEA,IAAI,UAAmC;QACnC,OAAO,IAAI,CAAC,QAAQ;IACxB;IAEA,OAAOC,KAAa,EAAU;QAC1B,OAAOA,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ;IACrC;IAEA,qBAAqBC,MAAwB,EAAW;QACpD,IAAIA,OAAO,MAAM,EACb,OAAO;QAEX,MAAMC,UAAUD,OAAO,OAAO,IAAI,CAAC;QACnC,OAAON,OAAO,IAAI,CAACO,SAAS,IAAI,CAACC,CAAAA,MAAO,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAACA;IACtE;IAEA,gBAAgBF,MAAwB,EAAEG,UAAoB,EAAQ;QAClE,IAAI,IAAI,CAAC,oBAAoB,CAACH,SAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAIP,IAAIU;aAEhC,IAAI,CAAC,gBAAgB,GAAG;QAE5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,CAACH;IACtC;IAEA,iBAAiBI,IAAc,EAAQ;QACnC,IAAI,IAAI,CAAC,gBAAgB,EACrB,KAAK,MAAMF,OAAOE,KACd,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAACF;IAGtC;IAEQ,aAAaF,MAAwB,EAA2B;QACpE,MAAMC,UAAUD,OAAO,OAAO,IAAI,CAAC;QACnC,MAAMK,kBAAkB,IAAI,CAAC,gBAAgB;QAC7C,MAAMC,cAAc,CAAC,CAACN,OAAO,MAAM;QACnC,MAAM,EAAEO,QAAQ,EAAEC,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM;QAE9C,MAAMC,qBAAgF,EAAE;QACxF,KAAK,MAAM,CAACP,KAAKQ,UAAU,IAAIhB,OAAO,OAAO,CAACc,cAAe;YACzD,MAAMG,QAAQV,OAAO,CAACC,IAAI;YAC1B,IAAIS,QAAAA,OACAF,mBAAmB,IAAI,CAAC;gBAAEC;gBAAWC;YAAM;QAEnD;QAEA,OAAO,CAACC;YACJ,IAAIP,iBACA;gBAAA,IAAI,CAACA,gBAAgB,GAAG,CAACQ,OAAOD,IAAI,CAACL,SAAS,IAC1C,OAAO;YACX,OACG,IAAI,CAACD,aACR;gBAAA,KAAK,MAAM,EAAEI,SAAS,EAAEC,KAAK,EAAE,IAAIF,mBAC/B,IAAI,CAACC,UAAUE,MAAMD,QACjB,OAAO;YAEf;YAGJ,OAAO;QACX;IACJ;AACJ"}
1	+ {"version":3,"file":"presentation/listPresenter/QueryMatcher.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.ts"],"sourcesContent":["import { makeObservable, observable, computed, action } from \"mobx\";\nimport type { IDataSourceQuery } from \"./abstractions.js\";\n\ntype ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;\n\ntype SortValueGetter<TRow> = (item: TRow, field: string) => unknown;\n\nexport interface QueryMatcherConfig<TRow> {\n keyField: keyof TRow & string;\n localFilters: Record<string, ItemPredicate<TRow>>;\n /*\n Reads the value of a sort field from an item. Defaults to a dot-path lookup\n * (e.g. `savedOn`, `values.title`). Override when the query's sort field name\n * does not match the item's shape.\n /\n getSortValue?: SortValueGetter<TRow>;\n}\n\n/\n Decides which cached items belong in the current view.\n \n A DataSource backed by a shared cache (e.g., per-model entry cache) needs to\n * filter cached items to only those matching the active query. QueryMatcher does\n * this by splitting filters into two categories:\n \n - Local filters (e.g., folderId, status) — evaluated client-side against\n * each item using predicates provided via `localFilters` config. Used when\n * browsing without search or server-side filters.\n \n - Server-side filters (search, advanced search, any filter key not in\n * `localFilters`) — cannot be evaluated locally. Instead, QueryMatcher tracks\n * the set of item keys returned by the last server query (`_queryResultKeys`)\n * and restricts the view to those items.\n \n The `matcher` getter is MobX-computed, so any DataSource `rows` getter that\n * reads it will recompute when the matcher changes after a query.\n \n Usage:\n * ```ts\n * const matcher = new QueryMatcher<MyItem>({\n * keyField: \"id\",\n * localFilters: {\n * folderId: (item, value) => item.folderId === value,\n * status: (item, value) => item.status === value,\n * }\n * });\n \n // In DataSource.query(), after fetching:\n * matcher.updateFromQuery(params, result.data.map(item => item.id), result.meta.hasMoreItems);\n \n // In DataSource.rows getter (filters, sorts by the applied sort, and cuts off at the\n * // last loaded item):\n * return matcher.select(cache.getItems());\n * ```\n /\nexport class QueryMatcher<TRow> {\n private _queryResultKeys: Set<string> \| null = null;\n private _matcher: (item: TRow) => boolean = () => true;\n private localFilterKeys: Set<string>;\n private getSortValue: SortValueGetter<TRow>;\n\n // Ordering state of the current view: the keys the server returned for the active\n // query (in server order, extended by `appendResultKeys`), the applied sort, and\n // whether the server has more items beyond the loaded ones.\n private _view: {\n resultKeys: string[];\n sort: IDataSourceQuery[\"sort\"];\n searching: boolean;\n hasMore: boolean;\n } \| null = null;\n\n constructor(private config: QueryMatcherConfig<TRow>) {\n this.localFilterKeys = new Set(Object.keys(config.localFilters));\n this.getSortValue = config.getSortValue ?? getValueByPath;\n\n makeObservable<QueryMatcher<TRow>, \"_matcher\" \| \"_view\">(this, {\n _matcher: observable.ref,\n _view: observable.ref,\n matcher: computed,\n updateFromQuery: action,\n appendResultKeys: action\n });\n }\n\n get matcher(): (item: TRow) => boolean {\n return this._matcher;\n }\n\n filter(items: TRow[]): TRow[] {\n return items.filter(this._matcher);\n }\n\n /\n Returns the items that belong in the current view, in the view's order.\n \n The cache is shared by views with different sorts, so its order means nothing to\n * this view. Instead, matching items are sorted by the applied sort (ties keep the\n * server order), and the result is cut off after the last item the server returned\n * for this view. That keeps locally created or updated items in their sort position,\n * and hides cached items that sort past the loaded pages until pagination reaches them.\n \n While searching, the server's (relevance) order is kept as is.\n /\n select(items: TRow[]): TRow[] {\n const matched = this.filter(items);\n const view = this._view;\n if (!view) {\n return matched;\n }\n\n const serverIndex = new Map(view.resultKeys.map((key, index) => [key, index]));\n // Items the server did not return for this view (cached by other views, or created\n // locally) sort after the server's items among equal sort values.\n const indexOf = (item: TRow) =>\n serverIndex.get(this.getKey(item)) ?? Number.POSITIVE_INFINITY;\n\n const sort = view.searching ? undefined : view.sort;\n const sorted = [...matched].sort((a, b) => {\n if (sort) {\n const result = compareValues(\n this.getSortValue(a, sort.field),\n this.getSortValue(b, sort.field)\n );\n if (result !== 0) {\n return sort.direction === \"ASC\" ? result : -result;\n }\n }\n const left = indexOf(a);\n const right = indexOf(b);\n return left === right ? 0 : left < right ? -1 : 1;\n });\n\n if (!view.hasMore) {\n return sorted;\n }\n\n let lastLoaded = -1;\n sorted.forEach((item, index) => {\n if (serverIndex.has(this.getKey(item))) {\n lastLoaded = index;\n }\n });\n\n return lastLoaded < 0 ? sorted : sorted.slice(0, lastLoaded + 1);\n }\n\n private getKey(item: TRow): string {\n return String(item[this.config.keyField]);\n }\n\n hasServerSideFilters(params: IDataSourceQuery): boolean {\n if (params.search) {\n return true;\n }\n const filters = params.filters ?? {};\n return Object.keys(filters).some(key => !this.localFilterKeys.has(key));\n }\n\n updateFromQuery(params: IDataSourceQuery, resultKeys: string[], hasMore = false): void {\n if (this.hasServerSideFilters(params)) {\n this._queryResultKeys = new Set(resultKeys);\n } else {\n this._queryResultKeys = null;\n }\n this._matcher = this.buildMatcher(params);\n this._view = {\n resultKeys: [...resultKeys],\n sort: params.sort,\n searching: !!params.search,\n hasMore\n };\n }\n\n appendResultKeys(keys: string[], hasMore = false): void {\n if (this._queryResultKeys) {\n for (const key of keys) {\n this._queryResultKeys.add(key);\n }\n }\n if (this._view) {\n this._view = {\n ...this._view,\n resultKeys: [...this._view.resultKeys, ...keys],\n hasMore\n };\n }\n }\n\n private buildMatcher(params: IDataSourceQuery): (item: TRow) => boolean {\n const filters = params.filters ?? {};\n const queryResultKeys = this._queryResultKeys;\n const isSearching = !!params.search;\n const { keyField, localFilters } = this.config;\n\n const activeLocalFilters: Array<{ predicate: ItemPredicate<TRow>; value: unknown }> = [];\n for (const [key, predicate] of Object.entries(localFilters)) {\n const value = filters[key];\n if (value !== undefined && value !== null) {\n activeLocalFilters.push({ predicate, value });\n }\n }\n\n return (item: TRow) => {\n if (queryResultKeys) {\n if (!queryResultKeys.has(String(item[keyField]))) {\n return false;\n }\n } else if (!isSearching) {\n for (const { predicate, value } of activeLocalFilters) {\n if (!predicate(item, value)) {\n return false;\n }\n }\n }\n\n return true;\n };\n }\n}\n\nfunction getValueByPath(item: unknown, path: string): unknown {\n let current: unknown = item;\n for (const part of path.split(\".\")) {\n if (current === null \|\| current === undefined \|\| typeof current !== \"object\") {\n return undefined;\n }\n current = (current as Record<string, unknown>)[part];\n }\n return current;\n}\n\n/\n Compares two sort values in ascending order, the same way the DDB and SQL storage sort\n * entries: `null` and `undefined` sort last (so first in descending order), and an empty\n * string is a regular string. Strings are compared by code point, which keeps ISO dates in\n * chronological order.\n */\nfunction compareValues(a: unknown, b: unknown): number {\n const aEmpty = a === null \|\| a === undefined;\n const bEmpty = b === null \|\| b === undefined;\n if (aEmpty \|\| bEmpty) {\n return aEmpty === bEmpty ? 0 : aEmpty ? 1 : -1;\n }\n\n const left = a instanceof Date ? a.getTime() : a;\n const right = b instanceof Date ? b.getTime() : b;\n\n if (typeof left === \"number\" && typeof right === \"number\") {\n return left - right;\n }\n if (typeof left === \"boolean\" && typeof right === \"boolean\") {\n return Number(left) - Number(right);\n }\n\n const leftString = String(left);\n const rightString = String(right);\n return leftString < rightString ? -1 : leftString > rightString ? 1 : 0;\n}\n"],"names":["QueryMatcher","config","Set","Object","getValueByPath","makeObservable","observable","computed","action","items","matched","view","serverIndex","Map","key","index","indexOf","item","Number","sort","undefined","sorted","a","b","result","compareValues","left","right","lastLoaded","String","params","filters","resultKeys","hasMore","keys","queryResultKeys","isSearching","keyField","localFilters","activeLocalFilters","predicate","value","path","current","part","aEmpty","bEmpty","Date","leftString","rightString"],"mappings":"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"}

package/presentation/listPresenter/QueryMatcher.test.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/presentation/listPresenter/QueryMatcher.test.js ADDED Viewed

@@ -0,0 +1,345 @@
+import { describe, expect, it } from "vitest";
+import { QueryMatcher } from "./QueryMatcher.js";
+const row = (id, savedOn, folderId = "root")=>({
+        id,
+        folderId,
+        savedOn
+    });
+const createMatcher = (config = {})=>new QueryMatcher({
+        keyField: "id",
+        localFilters: {
+            folderId: (item, value)=>item.folderId === value
+        },
+        ...config
+    });
+const ids = (rows)=>rows.map((r)=>r.id);
+describe("QueryMatcher.select", ()=>{
+    it("should only filter before the first query", ()=>{
+        const matcher = createMatcher();
+        expect(ids(matcher.select([
+            row("b", "2"),
+            row("a", "1")
+        ]))).toEqual([
+            "b",
+            "a"
+        ]);
+    });
+    it("should sort by the applied sort, regardless of cache order", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "c",
+            "b",
+            "a"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("c", "3"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "c",
+            "b",
+            "a"
+        ]);
+    });
+    it("should apply local filters", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            filters: {
+                folderId: "root"
+            },
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("x", "0", "other"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should cut off items that sort past the last loaded item while more are available", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ], true);
+        const cached = [
+            row("z", "9"),
+            row("a", "1"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should include items past the last loaded item when nothing more is available", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ], false);
+        const cached = [
+            row("z", "9"),
+            row("a", "1"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b",
+            "z"
+        ]);
+    });
+    it("should extend the loaded window on appendResultKeys", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a"
+        ], true);
+        matcher.appendResultKeys([
+            "b"
+        ], true);
+        const cached = [
+            row("c", "3"),
+            row("b", "2"),
+            row("a", "1")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should keep the server order for items with equal sort values", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "b",
+            "a",
+            "c"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("c", "1"),
+            row("b", "1")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "b",
+            "a",
+            "c"
+        ]);
+    });
+    it("should sort empty values last in ascending order", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            row("n"),
+            row("b", "2"),
+            row("u"),
+            row("a", "1")
+        ];
+        cached[0].savedOn = null;
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b",
+            "n",
+            "u"
+        ]);
+    });
+    it("should sort empty values first in descending order", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "b",
+            "a"
+        ]);
+        expect(ids(matcher.select([
+            row("a", "1"),
+            row("e"),
+            row("b", "2")
+        ]))).toEqual([
+            "e",
+            "b",
+            "a"
+        ]);
+    });
+    it("should sort an empty string as a regular string", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        expect(ids(matcher.select([
+            row("b", "1"),
+            row("u"),
+            row("a", "")
+        ]))).toEqual([
+            "a",
+            "b",
+            "u"
+        ]);
+    });
+    it("should keep the server order while searching", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            search: "hello",
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "c",
+            "a",
+            "b"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("b", "2"),
+            row("c", "3"),
+            row("x", "0")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "c",
+            "a",
+            "b"
+        ]);
+    });
+    it("should read nested sort fields by path", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "values.title",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            {
+                id: "b",
+                folderId: "root",
+                values: {
+                    title: "Beta"
+                }
+            },
+            {
+                id: "a",
+                folderId: "root",
+                values: {
+                    title: "Alpha"
+                }
+            }
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should use a custom sort value getter", ()=>{
+        const matcher = createMatcher({
+            getSortValue: (item, field)=>"title" === field ? item.values?.title : void 0
+        });
+        matcher.updateFromQuery({
+            sort: {
+                field: "title",
+                direction: "DESC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            {
+                id: "a",
+                folderId: "root",
+                values: {
+                    title: "Alpha"
+                }
+            },
+            {
+                id: "b",
+                folderId: "root",
+                values: {
+                    title: "Beta"
+                }
+            }
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "b",
+            "a"
+        ]);
+    });
+    it("should put items the server did not return after the server's items among equal values", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "b",
+            "a"
+        ], true);
+        const cached = [
+            row("x", "1"),
+            row("a", "1"),
+            row("y", "1"),
+            row("b", "1")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "b",
+            "a"
+        ]);
+    });
+});
+//# sourceMappingURL=QueryMatcher.test.js.map

package/presentation/listPresenter/QueryMatcher.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"presentation/listPresenter/QueryMatcher.test.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { QueryMatcher } from \"./QueryMatcher.js\";\n\ninterface Row {\n id: string;\n folderId: string;\n savedOn?: string;\n values?: { title?: string };\n}\n\nconst row = (id: string, savedOn?: string, folderId = \"root\"): Row => ({ id, folderId, savedOn });\n\nconst createMatcher = (config: Partial<ConstructorParameters<typeof QueryMatcher<Row>>[0]> = {}) =>\n new QueryMatcher<Row>({\n keyField: \"id\",\n localFilters: {\n folderId: (item, value) => item.folderId === value\n },\n ...config\n });\n\nconst ids = (rows: Row[]) => rows.map(r => r.id);\n\ndescribe(\"QueryMatcher.select\", () => {\n it(\"should only filter before the first query\", () => {\n const matcher = createMatcher();\n\n expect(ids(matcher.select([row(\"b\", \"2\"), row(\"a\", \"1\")]))).toEqual([\"b\", \"a\"]);\n });\n\n it(\"should sort by the applied sort, regardless of cache order\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"DESC\" } }, [\"c\", \"b\", \"a\"]);\n\n const cached = [row(\"a\", \"1\"), row(\"c\", \"3\"), row(\"b\", \"2\")];\n\n expect(ids(matcher.select(cached))).toEqual([\"c\", \"b\", \"a\"]);\n });\n\n it(\"should apply local filters\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery(\n { filters: { folderId: \"root\" }, sort: { field: \"savedOn\", direction: \"ASC\" } },\n [\"a\", \"b\"]\n );\n\n const cached = [row(\"a\", \"1\"), row(\"x\", \"0\", \"other\"), row(\"b\", \"2\")];\n\n expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n });\n\n it(\"should cut off items that sort past the last loaded item while more are available\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\", \"b\"], true);\n\n // \"z\" was cached by another view and sorts after the loaded window.\n const cached = [row(\"z\", \"9\"), row(\"a\", \"1\"), row(\"b\", \"2\")];\n\n expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n });\n\n it(\"should include items past the last loaded item when nothing more is available\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery(\n { sort: { field: \"savedOn\", direction: \"ASC\" } },\n [\"a\", \"b\"],\n false\n );\n\n const cached = [row(\"z\", \"9\"), row(\"a\", \"1\"), row(\"b\", \"2\")];\n\n expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\", \"z\"]);\n });\n\n it(\"should extend the loaded window on appendResultKeys\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\"], true);\n matcher.appendResultKeys([\"b\"], true);\n\n const cached = [row(\"c\", \"3\"), row(\"b\", \"2\"), row(\"a\", \"1\")];\n\n expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n });\n\n it(\"should keep the server order for items with equal sort values\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"DESC\" } }, [\"b\", \"a\", \"c\"]);\n\n const cached = [row(\"a\", \"1\"), row(\"c\", \"1\"), row(\"b\", \"1\")];\n\n expect(ids(matcher.select(cached))).toEqual([\"b\", \"a\", \"c\"]);\n });\n\n // Empty values are ordered the same way as the DDB and SQL storage sort them.\n it(\"should sort empty values last in ascending order\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\", \"b\"]);\n\n const cached = [row(\"n\"), row(\"b\", \"2\"), row(\"u\"), row(\"a\", \"1\")];\n cached[0].savedOn = null as unknown as string;\n\n expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\", \"n\", \"u\"]);\n });\n\n it(\"should sort empty values first in descending order\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"DESC\" } }, [\"b\", \"a\"]);\n\n expect(ids(matcher.select([row(\"a\", \"1\"), row(\"e\"), row(\"b\", \"2\")]))).toEqual([\n \"e\",\n \"b\",\n \"a\"\n ]);\n });\n\n it(\"should sort an empty string as a regular string\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\", \"b\"]);\n\n expect(ids(matcher.select([row(\"b\", \"1\"), row(\"u\"), row(\"a\", \"\")]))).toEqual([\n \"a\",\n \"b\",\n \"u\"\n ]);\n });\n\n it(\"should keep the server order while searching\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ search: \"hello\", sort: { field: \"savedOn\", direction: \"ASC\" } }, [\n \"c\",\n \"a\",\n \"b\"\n ]);\n\n const cached = [row(\"a\", \"1\"), row(\"b\", \"2\"), row(\"c\", \"3\"), row(\"x\", \"0\")];\n\n expect(ids(matcher.select(cached))).toEqual([\"c\", \"a\", \"b\"]);\n });\n\n it(\"should read nested sort fields by path\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery({ sort: { field: \"values.title\", direction: \"ASC\" } }, [\"a\", \"b\"]);\n\n const cached: Row[] = [\n { id: \"b\", folderId: \"root\", values: { title: \"Beta\" } },\n { id: \"a\", folderId: \"root\", values: { title: \"Alpha\" } }\n ];\n\n expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n });\n\n it(\"should use a custom sort value getter\", () => {\n const matcher = createMatcher({\n getSortValue: (item, field) => (field === \"title\" ? item.values?.title : undefined)\n });\n matcher.updateFromQuery({ sort: { field: \"title\", direction: \"DESC\" } }, [\"a\", \"b\"]);\n\n const cached: Row[] = [\n { id: \"a\", folderId: \"root\", values: { title: \"Alpha\" } },\n { id: \"b\", folderId: \"root\", values: { title: \"Beta\" } }\n ];\n\n expect(ids(matcher.select(cached))).toEqual([\"b\", \"a\"]);\n });\n\n it(\"should put items the server did not return after the server's items among equal values\", () => {\n const matcher = createMatcher();\n matcher.updateFromQuery(\n { sort: { field: \"savedOn\", direction: \"DESC\" } },\n [\"b\", \"a\"],\n true\n );\n\n // \"x\" and \"y\" were cached by another view and tie with the loaded items.\n const cached = [row(\"x\", \"1\"), row(\"a\", \"1\"), row(\"y\", \"1\"), row(\"b\", \"1\")];\n\n // Server items come first, in server order, and the tied leftovers are cut off\n // together with everything else past the last loaded item.\n expect(ids(matcher.select(cached))).toEqual([\"b\", \"a\"]);\n });\n});\n"],"names":["row","id","savedOn","folderId","createMatcher","config","QueryMatcher","item","value","ids","rows","r","describe","it","matcher","expect","cached","field","undefined"],"mappings":";;AAUA,MAAMA,MAAM,CAACC,IAAYC,SAAkBC,WAAW,MAAM,GAAW;QAAEF;QAAIE;QAAUD;IAAQ;AAE/F,MAAME,gBAAgB,CAACC,SAAsE,CAAC,CAAC,GAC3F,IAAIC,aAAkB;QAClB,UAAU;QACV,cAAc;YACV,UAAU,CAACC,MAAMC,QAAUD,KAAK,QAAQ,KAAKC;QACjD;QACA,GAAGH,MAAM;IACb;AAEJ,MAAMI,MAAM,CAACC,OAAgBA,KAAK,GAAG,CAACC,CAAAA,IAAKA,EAAE,EAAE;AAE/CC,SAAS,uBAAuB;IAC5BC,GAAG,6CAA6C;QAC5C,MAAMC,UAAUV;QAEhBW,OAAON,IAAIK,QAAQ,MAAM,CAAC;YAACd,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK,IAAI,OAAO,CAAC;YAAC;YAAK;SAAI;IAClF;IAEAa,GAAG,8DAA8D;QAC7D,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAO;QAAE,GAAG;YAAC;YAAK;YAAK;SAAI;QAE1F,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK;QAE5De,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;YAAK;SAAI;IAC/D;IAEAH,GAAG,8BAA8B;QAC7B,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CACnB;YAAE,SAAS;gBAAE,UAAU;YAAO;YAAG,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAM;QAAE,GAC9E;YAAC;YAAK;SAAI;QAGd,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK,KAAK;YAAUA,IAAI,KAAK;SAAK;QAErEe,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;SAAI;IAC1D;IAEAH,GAAG,qFAAqF;QACpF,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAM;QAAE,GAAG;YAAC;YAAK;SAAI,EAAE;QAGtF,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK;QAE5De,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;SAAI;IAC1D;IAEAH,GAAG,iFAAiF;QAChF,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CACnB;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAM;QAAE,GAC/C;YAAC;YAAK;SAAI,EACV;QAGJ,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK;QAE5De,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;YAAK;SAAI;IAC/D;IAEAH,GAAG,uDAAuD;QACtD,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAM;QAAE,GAAG;YAAC;SAAI,EAAE;QACjFA,QAAQ,gBAAgB,CAAC;YAAC;SAAI,EAAE;QAEhC,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK;QAE5De,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;SAAI;IAC1D;IAEAH,GAAG,iEAAiE;QAChE,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAO;QAAE,GAAG;YAAC;YAAK;YAAK;SAAI;QAE1F,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK;QAE5De,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;YAAK;SAAI;IAC/D;IAGAH,GAAG,oDAAoD;QACnD,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAM;QAAE,GAAG;YAAC;YAAK;SAAI;QAEpF,MAAME,SAAS;YAAChB,IAAI;YAAMA,IAAI,KAAK;YAAMA,IAAI;YAAMA,IAAI,KAAK;SAAK;QACjEgB,MAAM,CAAC,EAAE,CAAC,OAAO,GAAG;QAEpBD,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;YAAK;YAAK;SAAI;IACpE;IAEAH,GAAG,sDAAsD;QACrD,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAO;QAAE,GAAG;YAAC;YAAK;SAAI;QAErFC,OAAON,IAAIK,QAAQ,MAAM,CAAC;YAACd,IAAI,KAAK;YAAMA,IAAI;YAAMA,IAAI,KAAK;SAAK,IAAI,OAAO,CAAC;YAC1E;YACA;YACA;SACH;IACL;IAEAa,GAAG,mDAAmD;QAClD,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAM;QAAE,GAAG;YAAC;YAAK;SAAI;QAEpFC,OAAON,IAAIK,QAAQ,MAAM,CAAC;YAACd,IAAI,KAAK;YAAMA,IAAI;YAAMA,IAAI,KAAK;SAAI,IAAI,OAAO,CAAC;YACzE;YACA;YACA;SACH;IACL;IAEAa,GAAG,gDAAgD;QAC/C,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,QAAQ;YAAS,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAM;QAAE,GAAG;YACvF;YACA;YACA;SACH;QAED,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK;QAE3Ee,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;YAAK;SAAI;IAC/D;IAEAH,GAAG,0CAA0C;QACzC,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAgB,WAAW;YAAM;QAAE,GAAG;YAAC;YAAK;SAAI;QAEzF,MAAME,SAAgB;YAClB;gBAAE,IAAI;gBAAK,UAAU;gBAAQ,QAAQ;oBAAE,OAAO;gBAAO;YAAE;YACvD;gBAAE,IAAI;gBAAK,UAAU;gBAAQ,QAAQ;oBAAE,OAAO;gBAAQ;YAAE;SAC3D;QAEDD,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;SAAI;IAC1D;IAEAH,GAAG,yCAAyC;QACxC,MAAMC,UAAUV,cAAc;YAC1B,cAAc,CAACG,MAAMU,QAAWA,AAAU,YAAVA,QAAoBV,KAAK,MAAM,EAAE,QAAQW;QAC7E;QACAJ,QAAQ,eAAe,CAAC;YAAE,MAAM;gBAAE,OAAO;gBAAS,WAAW;YAAO;QAAE,GAAG;YAAC;YAAK;SAAI;QAEnF,MAAME,SAAgB;YAClB;gBAAE,IAAI;gBAAK,UAAU;gBAAQ,QAAQ;oBAAE,OAAO;gBAAQ;YAAE;YACxD;gBAAE,IAAI;gBAAK,UAAU;gBAAQ,QAAQ;oBAAE,OAAO;gBAAO;YAAE;SAC1D;QAEDD,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;SAAI;IAC1D;IAEAH,GAAG,0FAA0F;QACzF,MAAMC,UAAUV;QAChBU,QAAQ,eAAe,CACnB;YAAE,MAAM;gBAAE,OAAO;gBAAW,WAAW;YAAO;QAAE,GAChD;YAAC;YAAK;SAAI,EACV;QAIJ,MAAME,SAAS;YAAChB,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;YAAMA,IAAI,KAAK;SAAK;QAI3Ee,OAAON,IAAIK,QAAQ,MAAM,CAACE,UAAU,OAAO,CAAC;YAAC;YAAK;SAAI;IAC1D;AACJ"}