@emailmaker/filemanager 0.10.93 → 0.10.94

package/file-manager.js

@@ -32451,7 +32451,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ src)
 });
 
-// UNUSED EXPORTS: DEFAULT_FILE_MANAGER_CACHE_TTL_MS, DataSourceProxyBase, FailedRequestCache, FileContent, FileManagerApiError, FileManagerApp, FileManagerAppWithContext, FileModals, FolderSidebar, MutationRegistry, PathAwareStorageAdapter, PixieOnlyApp, TreeCache, ViewCacheManager, buildAssetsPath, defaultIsFolderNotFoundError, fetchRemoteImageBlobByUrl, getAssetsBase, init, initFileManager, initPixieEditor, installResizeObserverErrorHandler, joinUrls, mapHttpStatusToErrorCode, uninstallResizeObserverErrorHandler, unmount, unmountPixieEditor
+// UNUSED EXPORTS: DEFAULT_FILE_MANAGER_CACHE_TTL_MS, DataSourceProxyBase, FailedRequestCache, FileContent, FileManagerApiError, FileManagerApp, FileManagerAppWithContext, FileModals, FolderSidebar, MutationRegistry, PathAwareStorageAdapter, PixieOnlyApp, TRASH_FOLDER_ID, TreeCache, ViewCacheManager, buildAssetsPath, compareFileSystemItems, createSystemFolderByPathResolver, defaultChildrenViewFilterMatch, defaultFileSystemItemComparator, defaultIsFolderNotFoundError, fetchRemoteImageBlobByUrl, getAssetsBase, getTrashFolderLookupCandidates, init, initFileManager, initPixieEditor, installResizeObserverErrorHandler, joinUrls, mapHttpStatusToErrorCode, matchesChildrenViewFilter, normalizeSystemFolderPath, resolveSortParams, resolveViewStrategyOptions, uninstallResizeObserverErrorHandler, unmount, unmountPixieEditor
 
 // EXTERNAL MODULE: ./node_modules/react/jsx-runtime.js
 var jsx_runtime = __webpack_require__(4848);
@@ -39888,6 +39888,7 @@ var TreeCache_rest = (undefined && undefined.__rest) || function (s, e) {
     return t;
 };
 
+
 const ROOT_KEY = '';
 /** When `fileManager.cacheStrategy.ttl` is unset: success/error cache and notification dedupe fallback (30 min). */
 const DEFAULT_FILE_MANAGER_CACHE_TTL_MS = (/* unused pure expression or super */ null && (30 * 60 * 1000));
@@ -40344,14 +40345,15 @@ class ViewCacheManager {
         this.views = new Map();
         // Защита от переполнения
         this.maxViewsPerParent = 50;
+        const resolved = resolveViewStrategyOptions(options);
         this.strategy = {
-            allowSortedInsert: (_a = options.allowSortedInsert) !== null && _a !== void 0 ? _a : true,
-            allowSearchInsert: (_b = options.allowSearchInsert) !== null && _b !== void 0 ? _b : true,
-            invalidateOnPaginationFull: (_c = options.invalidateOnPaginationFull) !== null && _c !== void 0 ? _c : true,
-            preloadPagesBefore: (_d = options.preloadPagesBefore) !== null && _d !== void 0 ? _d : 0,
-            preloadPagesAfter: (_e = options.preloadPagesAfter) !== null && _e !== void 0 ? _e : 1,
-            comparator: options.comparator,
-            filterMatch: options.filterMatch,
+            allowSortedInsert: (_a = resolved.allowSortedInsert) !== null && _a !== void 0 ? _a : true,
+            allowSearchInsert: (_b = resolved.allowSearchInsert) !== null && _b !== void 0 ? _b : true,
+            invalidateOnPaginationFull: (_c = resolved.invalidateOnPaginationFull) !== null && _c !== void 0 ? _c : true,
+            preloadPagesBefore: (_d = resolved.preloadPagesBefore) !== null && _d !== void 0 ? _d : 0,
+            preloadPagesAfter: (_e = resolved.preloadPagesAfter) !== null && _e !== void 0 ? _e : 1,
+            comparator: resolved.comparator,
+            filterMatch: resolved.filterMatch,
         };
         this.ttl = ttl;
         this.errorTtl = errorTtl !== null && errorTtl !== void 0 ? errorTtl : ttl;
@@ -40393,6 +40395,17 @@ class ViewCacheManager {
             return true;
         return false;
     }
+    /** Mark cached view as stale and cancel any in-flight load for this record. */
+    markViewStaleForReload(rec) {
+        var _a;
+        rec.view.meta = Object.assign(Object.assign({}, ((_a = rec.view.meta) !== null && _a !== void 0 ? _a : {})), { stale: true });
+        rec.view.updatedAt = this.now();
+        rec.view.loadId = generateId();
+        if (rec.view.abortController) {
+            rec.view.abortController.abort();
+            rec.view.abortController = undefined;
+        }
+    }
     cleanupOldViews(bucket) {
         if (bucket.size <= this.maxViewsPerParent)
             return;
@@ -40669,14 +40682,6 @@ class ViewCacheManager {
             }
         }
     }
-    // Если задан comparator — считаем клиентскую сортировку авторитетной
-    canSafelyModifySortedView(baseParams) {
-        if (!baseParams.sortBy && !baseParams.sortOrder)
-            return true;
-        if (this.strategy.comparator)
-            return true;
-        return false;
-    }
     cascadeShiftPages(bucket, startPageRec, startPageNum, pageSize, totalPages, entitiesManager, baseParams) {
         var _a, _b, _c;
         let currentPageRec = startPageRec;
@@ -40793,7 +40798,7 @@ class ViewCacheManager {
         return wasNewPageCreated;
     }
     tryInsertSorted(rec, entity, entitiesManager) {
-        var _a;
+        var _a, _b;
         const comparator = this.strategy.comparator;
         if (!comparator)
             return false;
@@ -40805,6 +40810,21 @@ class ViewCacheManager {
         const currentEntities = rec.view.value.map((id) => entitiesManager.getEntity(id));
         if (currentEntities.some((e) => !e))
             return false;
+        if (currentEntities.length === 0) {
+            const params = (_b = rec.params) !== null && _b !== void 0 ? _b : {};
+            if (params.sortBy || params.sortOrder) {
+                const probe = comparator(entity, entity, rec.params);
+                if (typeof probe !== 'number' || Number.isNaN(probe))
+                    return false;
+            }
+            if (rec.view.value.includes(entity.id)) {
+                rec.view.updatedAt = this.now();
+                return true;
+            }
+            rec.view.value = [entity.id];
+            rec.view.updatedAt = this.now();
+            return true;
+        }
         let lo = 0;
         let hi = currentEntities.length;
         while (lo < hi) {
@@ -40823,9 +40843,6 @@ class ViewCacheManager {
         }
         rec.view.value = [...rec.view.value.slice(0, lo), entity.id, ...rec.view.value.slice(lo)];
         rec.view.updatedAt = this.now();
-        if (rec.view.meta && typeof rec.view.meta.total === 'number') {
-            rec.view.meta.total = Number(rec.view.meta.total) + 1;
-        }
         return true;
     }
     updateChildrenCountForOperation(operation, entity, prevParentId, entitiesManager) {
@@ -40860,7 +40877,7 @@ class ViewCacheManager {
     }
     // Разделили smartInvalidate на хелперы
     smartInvalidateChildrenViews(parentId, entity, operation, entitiesManager, prevParentId, prevEntity) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (!entity)
             return;
         // Всегда обновляем childrenCount (entitiesManager обязателен)
@@ -40885,7 +40902,7 @@ class ViewCacheManager {
                     if (rec.view.meta && typeof rec.view.meta.total === 'number') {
                         rec.view.meta.total = Math.max(0, rec.view.meta.total - 1);
                     }
-                    rec.view.updatedAt = Date.now();
+                    this.markViewStaleForReload(rec);
                 }
                 continue;
             }
@@ -40903,13 +40920,7 @@ class ViewCacheManager {
             const entityInView = rec.view.value.includes(entity.id);
             const shouldInvalidateCompletely = this.shouldInvalidateCompletely(rec, operation, entity, hasSort, isPaginated, page);
             if (shouldInvalidateCompletely) {
-                rec.view.meta = Object.assign(Object.assign({}, ((_d = rec.view.meta) !== null && _d !== void 0 ? _d : {})), { stale: true });
-                rec.view.loadId = generateId();
-                // Отменяем старый AbortController если был
-                if (rec.view.abortController) {
-                    rec.view.abortController.abort();
-                    rec.view.abortController = undefined;
-                }
+                this.markViewStaleForReload(rec);
                 continue;
             }
             switch (operation) {
@@ -40929,13 +40940,10 @@ class ViewCacheManager {
             }
         }
     }
-    shouldInvalidateCompletely(rec, operation, entity, hasSort, isPaginated, page) {
+    shouldInvalidateCompletely(rec, operation, _entity, _hasSort, isPaginated, page) {
         if (isPaginated && page > 1 && (operation === 'insert' || operation === 'delete' || operation === 'move')) {
             return true;
         }
-        if (hasSort && !this.strategy.comparator && (operation === 'insert' || operation === 'move')) {
-            return true;
-        }
         if (this.isExpired(rec.view.updatedAt)) {
             return true;
         }
@@ -40946,16 +40954,13 @@ class ViewCacheManager {
         const itemType = ((_a = rec.params) === null || _a === void 0 ? void 0 : _a.itemType) || 'all';
         if (!this.isEntityTypeCompatible(entity, itemType))
             return false;
-        if (this.strategy.comparator && this.strategy.filterMatch) {
-            if (!this.strategy.filterMatch(entity, rec.params))
-                return false;
-            const inserted = this.tryInsertSorted(rec, entity, entitiesManager);
-            if (inserted)
-                return true;
-        }
         const params = (_b = rec.params) !== null && _b !== void 0 ? _b : {};
-        const hasSort = !!(params.sortBy || params.sortOrder);
-        if (hasSort && !this.canSafelyModifySortedView(params))
+        if (!this.strategy.filterMatch(entity, params))
+            return false;
+        const inserted = this.tryInsertSorted(rec, entity, entitiesManager);
+        if (inserted)
+            return true;
+        if (params.sortBy || params.sortOrder)
             return false;
         if (!isPaginated || rec.view.value.length < pageSize) {
             rec.view.value.push(entity.id);
@@ -41000,31 +41005,37 @@ class ViewCacheManager {
     }
     // helper: вставка
     handleInsert(bucket, rec, page, pageSize, isPaginated, hasSort, entity, entitiesManager) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (rec.view.value.includes(entity.id))
             return;
         if (hasSort && this.strategy.allowSortedInsert && this.strategy.comparator && entitiesManager) {
             const inserted = this.tryInsertSorted(rec, entity, entitiesManager);
-            if (inserted && rec.view.meta && typeof rec.view.meta.total === 'number') {
-                rec.view.meta.total += 1;
-                if (isPaginated && Number.isFinite(pageSize)) {
-                    const finitePageSize = pageSize;
-                    if (finitePageSize > 0) {
-                        rec.view.meta.totalPages = Math.max(1, Math.ceil(rec.view.meta.total / finitePageSize));
+            if (inserted) {
+                if (rec.view.meta && typeof rec.view.meta.total === 'number') {
+                    rec.view.meta.total += 1;
+                    if (isPaginated && Number.isFinite(pageSize)) {
+                        const finitePageSize = pageSize;
+                        if (finitePageSize > 0) {
+                            rec.view.meta.totalPages = Math.max(1, Math.ceil(rec.view.meta.total / finitePageSize));
+                        }
                     }
+                    this.syncTotalsInSameViews(bucket, rec);
                 }
-                this.syncTotalsInSameViews(bucket, rec);
-            }
-            if (isPaginated && ((_b = (_a = rec.view.value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > pageSize && entitiesManager) {
-                const meta = rec.view.meta;
-                const totalPages = meta && typeof meta.totalPages === 'number' ? meta.totalPages : 1;
-                const wasNewPageCreated = this.cascadeShiftToNextPage(bucket, rec, page, pageSize, totalPages, entitiesManager, (_c = rec.params) !== null && _c !== void 0 ? _c : {});
-                if (wasNewPageCreated && rec.view.meta && typeof rec.view.meta.totalPages === 'number') {
-                    const newTotalPages = rec.view.meta.totalPages + 1;
-                    rec.view.meta.totalPages = newTotalPages;
-                    this.updateTotalPagesForAllViews(bucket, newTotalPages);
+                rec.view.updatedAt = Date.now();
+                if (isPaginated && ((_b = (_a = rec.view.value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > pageSize && entitiesManager) {
+                    const meta = rec.view.meta;
+                    const totalPages = meta && typeof meta.totalPages === 'number' ? meta.totalPages : 1;
+                    const wasNewPageCreated = this.cascadeShiftToNextPage(bucket, rec, page, pageSize, totalPages, entitiesManager, (_c = rec.params) !== null && _c !== void 0 ? _c : {});
+                    if (wasNewPageCreated && rec.view.meta && typeof rec.view.meta.totalPages === 'number') {
+                        const newTotalPages = rec.view.meta.totalPages + 1;
+                        rec.view.meta.totalPages = newTotalPages;
+                        this.updateTotalPagesForAllViews(bucket, newTotalPages);
+                    }
                 }
             }
+            else {
+                this.markViewStaleForReload(rec);
+            }
         }
         else {
             if (!isPaginated || rec.view.value.length < pageSize) {
@@ -41042,7 +41053,7 @@ class ViewCacheManager {
                 rec.view.updatedAt = Date.now();
             }
             else {
-                rec.view.meta = Object.assign(Object.assign({}, ((_d = rec.view.meta) !== null && _d !== void 0 ? _d : {})), { stale: true });
+                this.markViewStaleForReload(rec);
             }
         }
         rec.view.loadId = generateId();
@@ -41054,7 +41065,7 @@ class ViewCacheManager {
     }
     // helper: update
     handleUpdate(bucket, rec, page, pageSize, isPaginated, hasSort, hasSearch, entity, entitiesManager) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const entityInView = rec.view.value.includes(entity.id);
         const stillCompatible = this.isEntityTypeCompatible(entity, ((_a = rec.params) === null || _a === void 0 ? void 0 : _a.itemType) || 'all');
         if (entityInView && !stillCompatible) {
@@ -41091,46 +41102,16 @@ class ViewCacheManager {
             rec.view.value = rec.view.value.filter((id) => id !== entity.id);
             const reinserted = this.tryReinsertEntity(rec, entity, entitiesManager, isPaginated, pageSize);
             if (!reinserted) {
-                if (rec.view.meta && typeof rec.view.meta.total === 'number') {
-                    rec.view.meta.total = Math.max(0, rec.view.meta.total - 1);
-                    if (isPaginated && Number.isFinite(pageSize) && typeof rec.view.meta.total === 'number') {
-                        const finitePageSize = pageSize;
-                        if (finitePageSize > 0) {
-                            rec.view.meta.totalPages = Math.max(1, Math.ceil(rec.view.meta.total / finitePageSize));
-                        }
-                    }
-                    this.syncTotalsInSameViews(bucket, rec);
-                }
-                if (isPaginated && rec.view.value.length < pageSize && entitiesManager) {
-                    const meta = rec.view.meta;
-                    const totalPages = meta && typeof meta.totalPages === 'number' ? meta.totalPages : 1;
-                    const wasEmptyPageRemoved = this.cascadeShiftPages(bucket, rec, page, pageSize, totalPages, entitiesManager, (_c = rec.params) !== null && _c !== void 0 ? _c : {});
-                    if (wasEmptyPageRemoved && rec.view.meta && typeof rec.view.meta.totalPages === 'number') {
-                        const newTotalPages = Math.max(1, rec.view.meta.totalPages - 1);
-                        rec.view.meta.totalPages = newTotalPages;
-                        this.updateTotalPagesForAllViews(bucket, newTotalPages);
-                    }
-                }
+                this.markViewStaleForReload(rec);
             }
             else {
-                if (rec.view.meta && typeof rec.view.meta.total === 'number') {
-                    rec.view.meta.total += 1;
-                    if (isPaginated && Number.isFinite(pageSize)) {
-                        const finitePageSize = pageSize;
-                        if (finitePageSize > 0) {
-                            rec.view.meta.totalPages = Math.max(1, Math.ceil(rec.view.meta.total / finitePageSize));
-                        }
-                    }
-                    this.syncTotalsInSameViews(bucket, rec);
+                rec.view.updatedAt = Date.now();
+                rec.view.loadId = generateId();
+                if (rec.view.abortController) {
+                    rec.view.abortController.abort();
+                    rec.view.abortController = undefined;
                 }
             }
-            rec.view.updatedAt = Date.now();
-            rec.view.loadId = generateId();
-            // Отменяем старый AbortController если был
-            if (rec.view.abortController) {
-                rec.view.abortController.abort();
-                rec.view.abortController = undefined;
-            }
             return;
         }
         if (entityInView) {
@@ -41146,15 +41127,21 @@ class ViewCacheManager {
         if (stillCompatible && !hasSearch) {
             if (hasSort && this.strategy.allowSortedInsert && this.strategy.comparator && entitiesManager) {
                 const inserted = this.tryInsertSorted(rec, entity, entitiesManager);
-                if (inserted && rec.view.meta && typeof rec.view.meta.total === 'number') {
-                    rec.view.meta.total += 1;
-                    if (isPaginated && Number.isFinite(pageSize)) {
-                        const finitePageSize = pageSize;
-                        if (finitePageSize > 0) {
-                            rec.view.meta.totalPages = Math.max(1, Math.ceil(rec.view.meta.total / finitePageSize));
+                if (inserted) {
+                    if (rec.view.meta && typeof rec.view.meta.total === 'number') {
+                        rec.view.meta.total += 1;
+                        if (isPaginated && Number.isFinite(pageSize)) {
+                            const finitePageSize = pageSize;
+                            if (finitePageSize > 0) {
+                                rec.view.meta.totalPages = Math.max(1, Math.ceil(rec.view.meta.total / finitePageSize));
+                            }
                         }
+                        this.syncTotalsInSameViews(bucket, rec);
                     }
-                    this.syncTotalsInSameViews(bucket, rec);
+                    rec.view.updatedAt = Date.now();
+                }
+                else {
+                    this.markViewStaleForReload(rec);
                 }
             }
             else if (!isPaginated || rec.view.value.length < pageSize) {
@@ -41172,7 +41159,7 @@ class ViewCacheManager {
                 rec.view.updatedAt = Date.now();
             }
             else {
-                rec.view.meta = Object.assign(Object.assign({}, ((_d = rec.view.meta) !== null && _d !== void 0 ? _d : {})), { stale: true });
+                this.markViewStaleForReload(rec);
             }
             rec.view.loadId = generateId();
             // Отменяем старый AbortController если был
@@ -41578,14 +41565,15 @@ class TreeCache_TreeCache {
         });
         // Применяем viewOptions к ViewCacheManager после создания
         if (viewOptions) {
+            const resolved = resolveViewStrategyOptions(viewOptions);
             v.strategy = {
-                allowSortedInsert: (_g = viewOptions.allowSortedInsert) !== null && _g !== void 0 ? _g : true,
-                allowSearchInsert: (_h = viewOptions.allowSearchInsert) !== null && _h !== void 0 ? _h : true,
-                invalidateOnPaginationFull: (_j = viewOptions.invalidateOnPaginationFull) !== null && _j !== void 0 ? _j : true,
-                preloadPagesBefore: (_k = viewOptions.preloadPagesBefore) !== null && _k !== void 0 ? _k : 0,
-                preloadPagesAfter: (_l = viewOptions.preloadPagesAfter) !== null && _l !== void 0 ? _l : 1,
-                comparator: viewOptions.comparator,
-                filterMatch: viewOptions.filterMatch,
+                allowSortedInsert: (_g = resolved.allowSortedInsert) !== null && _g !== void 0 ? _g : true,
+                allowSearchInsert: (_h = resolved.allowSearchInsert) !== null && _h !== void 0 ? _h : true,
+                invalidateOnPaginationFull: (_j = resolved.invalidateOnPaginationFull) !== null && _j !== void 0 ? _j : true,
+                preloadPagesBefore: (_k = resolved.preloadPagesBefore) !== null && _k !== void 0 ? _k : 0,
+                preloadPagesAfter: (_l = resolved.preloadPagesAfter) !== null && _l !== void 0 ? _l : 1,
+                comparator: resolved.comparator,
+                filterMatch: resolved.filterMatch,
             };
         }
         tc.entities = ent;
@@ -41635,6 +41623,8 @@ var DataSourceProxyBase_rest = (undefined && undefined.__rest) || function (s, e
 
 
 
+
+
 // Константы для стандартных идентификаторов
 const DEFAULT_ROOT_ID = '';
 const DEFAULT_TRASH_PATH = 'Trash';
@@ -41690,12 +41680,62 @@ function parseFilePath(filePath) {
  * Extend this class in a consumer app to add backend-specific logic.
  */
 class DataSourceProxyBase {
+    _getTrashPath() {
+        return this._pathOptions.trashPath || DEFAULT_TRASH_PATH;
+    }
+    _getPathLookupCandidates(path) {
+        return getTrashFolderLookupCandidates(path, this._getTrashPath(), TRASH_FOLDER_ID);
+    }
+    _folderFromResolvedPath(resolved, lookupPath) {
+        var _a;
+        if (resolved.isFolder !== true) {
+            const message = resolved.isFolder === false ?
+                "Path '%s' resolves to a file, not a folder".replace('%s', lookupPath)
+                : "Path '%s' resolved to an item that is not marked as a folder".replace('%s', lookupPath);
+            throw new FileManagerApiError(message, 'ValidationError');
+        }
+        if (!resolved.id) {
+            const message = "Path '%s' resolved to a folder without id".replace('%s', lookupPath);
+            throw new FileManagerApiError(message, 'ValidationError');
+        }
+        const folder = {
+            id: resolved.id,
+            name: resolved.name || resolved.id,
+            parentId: resolved.folderId,
+        };
+        // Synthetic system folders (e.g. backend-managed trash) must exist in the entity
+        // graph so forceInvalidate(trash.id) can invalidate children views.
+        this._cache.upsertEntity(normalizeFileSystemItem({
+            id: folder.id,
+            name: folder.name,
+            folderId: (_a = folder.parentId) !== null && _a !== void 0 ? _a : null,
+            isFolder: true,
+        }));
+        return folder;
+    }
+    async _resolveFolderByPath(path) {
+        if (typeof this._dataProvider.findItemByPath !== 'function') {
+            return undefined;
+        }
+        for (const lookupPath of this._getPathLookupCandidates(path)) {
+            const resolved = await this._dataProvider.findItemByPath(lookupPath);
+            if (!resolved) {
+                continue;
+            }
+            return this._folderFromResolvedPath(resolved, lookupPath);
+        }
+        return undefined;
+    }
     async _findOrCreateFolderByPath(path) {
         const parts = parseFilePath(path);
         if (parts.length > MAX_PATH_DEPTH) {
             const message = 'Path depth exceeds maximum limit of %s'.replace('%s', String(MAX_PATH_DEPTH));
             throw new FileManagerApiError(message, 'ValidationError');
         }
+        const resolvedFolder = await this._resolveFolderByPath(path);
+        if (resolvedFolder) {
+            return resolvedFolder;
+        }
         let current = undefined;
         for (const part of parts) {
             const { files } = await this.getFiles({ folderId: (current === null || current === void 0 ? void 0 : current.id) || '', itemType: 'folder' });
@@ -41716,8 +41756,13 @@ class DataSourceProxyBase {
         }
         return current;
     }
-    getTrashFolder() {
-        return this._findOrCreateFolderByPath(this._pathOptions.trashPath || DEFAULT_TRASH_PATH);
+    async getTrashFolder() {
+        const folder = await this._findOrCreateFolderByPath(this._getTrashPath());
+        if (!folder) {
+            const message = "Trash folder path '%s' could not be resolved".replace('%s', this._getTrashPath());
+            throw new FileManagerApiError(message, 'FolderNotFound');
+        }
+        return folder;
     }
     async getTempFolder() {
         var _a;
@@ -41765,7 +41810,7 @@ class DataSourceProxyBase {
         this._rootId = this._pathOptions.rootId || DEFAULT_ROOT_ID;
         this._enableTrash = this._options.enableTrash === undefined ? true : this._options.enableTrash;
         this._validateDuplicates = this._dataProvider.validateDuplicates;
-        // Инициализация кэша с переданными настройками
+        // ViewCacheManager applies resolveViewStrategyOptions in its constructor.
         this._cache = new TreeCache(_options.cacheStrategy || {}, (_a = _options.cacheStrategy) === null || _a === void 0 ? void 0 : _a.ttl, (_b = _options.cacheStrategy) === null || _b === void 0 ? void 0 : _b.errorTtl);
         // if (!this._dataProvider.deleteItems) {
         //   this.deleteItems = undefined;
@@ -42181,23 +42226,7 @@ class DataSourceProxyBase {
      * Стандартная клиентская сортировка файлов
      */
     _defaultClientSideSort(files, sortBy, sortOrder) {
-        return files.sort((a, b) => {
-            let compareResult = 0;
-            switch (sortBy) {
-                case 'name':
-                    compareResult = (a.name || '').localeCompare(b.name || '');
-                    break;
-                case 'date':
-                    compareResult = new Date(a.date || 0).getTime() - new Date(b.date || 0).getTime();
-                    break;
-                case 'size':
-                    compareResult = (Number(a.size) || 0) - (Number(b.size) || 0);
-                    break;
-                default:
-                    compareResult = (a.name || '').localeCompare(b.name || '');
-            }
-            return sortOrder === 'desc' ? -compareResult : compareResult;
-        });
+        return files.sort((a, b) => compareFileSystemItems(a, b, { sortBy, sortOrder }));
     }
     async getFileData(fileOrId, options) {
         var _a;
@@ -43022,11 +43051,11 @@ var PathAwareStorageAdapter_rest = (undefined && undefined.__rest) || function (
 // @ts-nocheck
 
 
+
 const PathAwareStorageAdapter_DEFAULT_ROOT_ID = '';
 const PathAwareStorageAdapter_DEFAULT_TRASH_PATH = 'Trash';
-const DEFAULT_TRASH_ID = 'Trash';
 class PathAwareStorageAdapter {
-    constructor(_inner, rootPath = PathAwareStorageAdapter_DEFAULT_ROOT_ID, trashId = DEFAULT_TRASH_ID, trashPath = PathAwareStorageAdapter_DEFAULT_TRASH_PATH, ensureFolderTrailingSlash = true) {
+    constructor(_inner, rootPath = PathAwareStorageAdapter_DEFAULT_ROOT_ID, trashId = TRASH_FOLDER_ID, trashPath = PathAwareStorageAdapter_DEFAULT_TRASH_PATH, ensureFolderTrailingSlash = true) {
         var _a;
         this._inner = _inner;
         this.rootPath = rootPath;
@@ -43100,11 +43129,46 @@ class PathAwareStorageAdapter {
             return;
         return this._inner.clearCache(pathFolder);
     }
+    findItemByPath(path) {
+        if (typeof this._inner.findItemByPath !== 'function') {
+            return undefined;
+        }
+        const mapResolved = (resolved, lookupPath, requestPath) => {
+            if (!resolved) {
+                return undefined;
+            }
+            if (resolved.isFolder !== true) {
+                return resolved;
+            }
+            const requestPathClean = normalizeSystemFolderPath(requestPath);
+            const trashPathClean = normalizeSystemFolderPath(this.trashPath);
+            const idPath = requestPathClean === trashPathClean ? this.trashPath : lookupPath;
+            const cleanedIdPath = normalizeSystemFolderPath(idPath);
+            const parentPath = resolved.folderId != null && resolved.folderId !== '' ?
+                normalizeSystemFolderPath(resolved.folderId)
+                : this.rootPath;
+            return Object.assign(Object.assign({}, resolved), { id: this._getOrGenerateId(cleanedIdPath), name: resolved.name, folderId: parentPath === normalizeSystemFolderPath(this.rootPath) ?
+                    this.rootPath || ''
+                    : this._getOrGenerateId(parentPath), isFolder: true });
+        };
+        const lookupPaths = getTrashFolderLookupCandidates(path, this.trashPath, this.trashId);
+        const resolveCandidates = async () => {
+            for (const lookupPath of lookupPaths) {
+                const resolved = await Promise.resolve(this._inner.findItemByPath(lookupPath));
+                const mapped = mapResolved(resolved, lookupPath, path);
+                if (mapped) {
+                    return mapped;
+                }
+            }
+            return undefined;
+        };
+        return resolveCandidates();
+    }
     _getOrGenerateId(path) {
         if (path === this.rootPath)
             return '';
-        const cleanedPath = path.replaceAll(/^\/+|\/+$/g, '');
-        if (cleanedPath === this.trashPath.replaceAll(/^\/+|\/+$/g, ''))
+        const cleanedPath = normalizeSystemFolderPath(path);
+        if (cleanedPath === normalizeSystemFolderPath(this.trashPath))
             return this.trashId;
         if (this._pathToId.has(cleanedPath))
             return this._pathToId.get(cleanedPath);
@@ -43584,6 +43648,8 @@ var remoteFileFetchPipeline = __webpack_require__(5597);
 
 
 
+
+
 })();
 
 __webpack_exports__ = __webpack_exports__["default"];

package/index.d.ts

@@ -23,6 +23,8 @@ export { mapHttpStatusToErrorCode } from './shared/mapHttpStatusToErrorCode';
 export { buildAssetsPath, joinUrls, getAssetsBase } from './helpers/urls';
 export { FailedRequestCache } from './adapters/FailedRequestCache';
 export { MutationRegistry } from './adapters/MutationRegistry';
+export { compareFileSystemItems, defaultChildrenViewFilterMatch, defaultFileSystemItemComparator, matchesChildrenViewFilter, resolveSortParams, resolveViewStrategyOptions, } from './adapters/cacheViewStrategy';
+export { TRASH_FOLDER_ID, createSystemFolderByPathResolver, getTrashFolderLookupCandidates, normalizeSystemFolderPath, type SystemFolderDefinition, } from './adapters/systemFolderPath';
 export { TreeCache, ViewCacheManager, DEFAULT_FILE_MANAGER_CACHE_TTL_MS, defaultIsFolderNotFoundError, type TreeCacheConfig, type QueryResult, type ChildrenQueryParams, type ViewStrategyOptions, } from './adapters/TreeCache';
 export { DataSourceProxyBase, type DataSourceProxyConfig, type DataSourceProxyOptions, type FileManagerProxyOptions, } from './adapters/DataSourceProxyBase';
 export { PathAwareStorageAdapter } from './adapters/PathAwareStorageAdapter';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emailmaker/filemanager",
-  "version": "0.10.93",
+  "version": "0.10.94",
   "main": "./file-manager.js",
   "module": "./file-manager.esm.js",
   "types": "./index.d.ts",