@dosgato/api 0.0.68 → 0.0.69

package/dist/assetfolder/assetfolder.service.js

@@ -1,20 +1,27 @@
 import { BaseService } from '@txstate-mws/graphql-server';
-import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
-import { isNull, isNotNull, unique, mapConcurrent, intersect, isNotBlank, keyby, isBlank } from 'txstate-utils';
-import { AssetService, DosGatoService, getAssetFolders, AssetServiceInternal, createAssetFolder, AssetFolderResponse, renameAssetFolder, deleteAssetFolder, undeleteAssetFolder, normalizePath, finalizeAssetFolderDeletion, DeleteStateAll } from '../internal.js';
-const assetFolderByInternalIdLoader = new PrimaryKeyLoader({
-    fetch: async (ids) => await getAssetFolders({ internalIds: ids, deleteStates: DeleteStateAll }),
-    extractId: af => af.internalId
-});
+import { ManyJoinedLoader, OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
+import { isNull, isNotNull, unique, mapConcurrent, intersect, isBlank } from 'txstate-utils';
+import { AssetService, DosGatoService, getAssetFolders, AssetServiceInternal, createAssetFolder, AssetFolderResponse, renameAssetFolder, deleteAssetFolder, undeleteAssetFolder, finalizeAssetFolderDeletion, DeleteStateAll, PagetreeServiceInternal, PagetreeType, SiteServiceInternal, getAssetFoldersByPath } from '../internal.js';
 const assetFolderByIdLoader = new PrimaryKeyLoader({
-    fetch: async (ids) => await getAssetFolders({ ids, deleteStates: DeleteStateAll }),
-    idLoader: assetFolderByInternalIdLoader
+    fetch: async (ids) => await getAssetFolders({ ids, deleteStates: DeleteStateAll })
 });
-assetFolderByInternalIdLoader.addIdLoader(assetFolderByIdLoader);
 const foldersByNameLoader = new OneToManyLoader({
     fetch: async (names) => await getAssetFolders({ names, deleteStates: DeleteStateAll }),
     extractKey: folder => folder.name,
-    idLoader: [assetFolderByIdLoader, assetFolderByInternalIdLoader]
+    idLoader: assetFolderByIdLoader
+});
+const foldersByLinkIdLoader = new OneToManyLoader({
+    fetch: async (linkIds, filters) => {
+        return await getAssetFolders({ ...filters, linkIds });
+    },
+    extractKey: f => f.linkId,
+    idLoader: assetFolderByIdLoader
+});
+const foldersByPathLoader = new ManyJoinedLoader({
+    fetch: async (paths, filters) => {
+        return await getAssetFoldersByPath(paths, filters);
+    },
+    idLoader: assetFolderByIdLoader
 });
 const foldersByInternalIdPathLoader = new OneToManyLoader({
     fetch: async (internalIdPaths, filter) => {
@@ -22,7 +29,7 @@ const foldersByInternalIdPathLoader = new OneToManyLoader({
     },
     keysFromFilter: (filter) => filter?.internalIdPaths ?? [],
     extractKey: (f) => f.path,
-    idLoader: [assetFolderByInternalIdLoader, assetFolderByIdLoader]
+    idLoader: assetFolderByIdLoader
 });
 const foldersByInternalIdPathRecursiveLoader = new OneToManyLoader({
     fetch: async (internalIdPathsRecursive, filter) => {
@@ -31,7 +38,7 @@ const foldersByInternalIdPathRecursiveLoader = new OneToManyLoader({
     },
     keysFromFilter: (filter) => filter?.internalIdPathsRecursive ?? [],
     matchKey: (path, f) => f.path.startsWith(path),
-    idLoader: [assetFolderByInternalIdLoader, assetFolderByIdLoader]
+    idLoader: assetFolderByIdLoader
 });
 const foldersInPagetreeLoader = new OneToManyLoader({
     fetch: async (pagetreeIds, filter) => {
@@ -39,19 +46,18 @@ const foldersInPagetreeLoader = new OneToManyLoader({
     },
     extractKey: (f) => f.pagetreeId,
     keysFromFilter: (filter) => filter?.pagetreeIds ?? [],
-    idLoader: [assetFolderByInternalIdLoader, assetFolderByIdLoader]
+    idLoader: assetFolderByIdLoader
 });
 export class AssetFolderServiceInternal extends BaseService {
     async find(filter) {
         const folders = await getAssetFolders(await this.processFolderFilters(filter));
         for (const folder of folders) {
             this.loaders.get(assetFolderByIdLoader).prime(folder.id, folder);
-            this.loaders.get(assetFolderByInternalIdLoader).prime(folder.internalId, folder);
         }
         return folders;
     }
     async findByInternalId(id) {
-        return await this.loaders.get(assetFolderByInternalIdLoader).load(id);
+        return await this.loaders.get(assetFolderByIdLoader).load(String(id));
     }
     async findById(id) {
         return await this.loaders.get(assetFolderByIdLoader).load(id);
@@ -59,47 +65,24 @@ export class AssetFolderServiceInternal extends BaseService {
     async findByIds(ids) {
         return await this.loaders.loadMany(assetFolderByIdLoader, ids);
     }
+    async findByInternalIds(ids) {
+        return await this.findByIds(ids.map(String));
+    }
     async findByPagetreeId(id, filter) {
         return await this.loaders.get(foldersInPagetreeLoader, filter).load(id);
     }
     async getAncestors(folder) {
-        return await this.loaders.loadMany(assetFolderByInternalIdLoader, folder.pathSplit);
+        return await this.findByInternalIds(folder.pathSplit);
     }
     async getParent(folder) {
         if (!folder.parentInternalId)
             return undefined;
-        return await this.loaders.get(assetFolderByInternalIdLoader).load(folder.parentInternalId);
-    }
-    async convertPathsToIDPaths(pathstrings) {
-        var _a, _b, _c;
-        const paths = pathstrings.map(normalizePath).map(p => p.split(/\//).filter(isNotBlank));
-        const names = new Set(paths.flat());
-        const folders = await this.loaders.loadMany(foldersByNameLoader, Array.from(names));
-        const rowsByNameAndIDPath = {};
-        for (const row of folders) {
-            rowsByNameAndIDPath[_a = row.name] ?? (rowsByNameAndIDPath[_a] = {});
-            (_b = rowsByNameAndIDPath[row.name])[_c = row.path] ?? (_b[_c] = []);
-            rowsByNameAndIDPath[row.name][row.path].push(row);
-        }
-        const idpaths = [];
-        // eslint-disable-next-line no-labels
-        loop1: for (const pt of paths) {
-            let searchpaths = ['/'];
-            for (const segment of pt) {
-                const pages = searchpaths.flatMap(sp => rowsByNameAndIDPath[segment]?.[sp]);
-                // eslint-disable-next-line no-labels
-                if (pages.some(isNull))
-                    break loop1;
-                searchpaths = pages.map(pg => `${pg.path}${pg.path === '/' ? '' : '/'}${pg.internalId}`);
-                if (!searchpaths.length)
-                    break;
-            }
-            idpaths.push(...searchpaths);
-        }
-        return idpaths;
+        return await this.findByInternalId(folder.parentInternalId);
     }
     async processFolderFilters(filter) {
-        if (filter?.parentOfFolderIds) {
+        if (!filter)
+            return filter;
+        if (filter.parentOfFolderIds?.length) {
             const folders = await this.loaders.loadMany(assetFolderByIdLoader, filter.parentOfFolderIds);
             const parentIds = folders.map(f => f.parentInternalId).filter(isNotNull);
             if (filter.internalIds?.length) {
@@ -109,8 +92,8 @@ export class AssetFolderServiceInternal extends BaseService {
             else
                 filter.internalIds = parentIds;
         }
-        if (filter?.parentOfFolderInternalIds) {
-            const folders = await this.loaders.loadMany(assetFolderByInternalIdLoader, filter.parentOfFolderInternalIds);
+        if (filter.parentOfFolderInternalIds?.length) {
+            const folders = await this.findByInternalIds(filter.parentOfFolderInternalIds);
             const parentIds = folders.map(f => f.parentInternalId).filter(isNotNull);
             if (filter.internalIds?.length) {
                 filter.internalIds.push(...parentIds);
@@ -119,7 +102,7 @@ export class AssetFolderServiceInternal extends BaseService {
             else
                 filter.internalIds = parentIds;
         }
-        if (filter?.childOfFolderIds) {
+        if (filter.childOfFolderIds?.length) {
             const folders = await this.loaders.loadMany(assetFolderByIdLoader, filter.childOfFolderIds);
             const childFolders = await (await mapConcurrent(folders, async (folder) => await this.getChildFolders(folder, false))).flat();
             if (filter.internalIds?.length) {
@@ -128,44 +111,44 @@ export class AssetFolderServiceInternal extends BaseService {
             else
                 filter.internalIds = childFolders.map(f => f.internalId);
         }
-        // named paths e.g. /site1/about
-        if (filter?.paths?.length) {
-            const idpaths = await this.convertPathsToIDPaths(filter.paths);
-            const ids = idpaths.map(p => +p.split(/\//).slice(-1)[0]);
-            filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
-            if (!idpaths.length)
-                filter.internalIds = [-1];
-        }
-        // beneath a named path e.g. /site1/about
-        if (filter?.beneath?.length) {
-            const idpaths = await this.convertPathsToIDPaths(filter.beneath);
-            filter.internalIdPathsRecursive = intersect({ skipEmpty: true }, filter.internalIdPaths, idpaths);
-            if (!idpaths.length)
-                filter.internalIds = [-1];
-        }
-        // direct children of a named path e.g. /site1/about
-        if (filter?.parentPaths?.length) {
-            const idpaths = await this.convertPathsToIDPaths(filter.parentPaths);
-            filter.internalIdPaths = intersect({ skipEmpty: true }, filter.internalIdPaths, idpaths);
-            if (!idpaths.length)
-                filter.internalIds = [-1];
-        }
-        if (filter?.links?.length) {
-            const folders = await this.findByIds(filter.links.map(l => l.id));
-            const foldersById = keyby(folders, 'id');
-            const notFoundById = filter.links.filter(l => !foldersById[l.id]);
-            if (notFoundById.length) {
-                const pathFolders = await this.find({ paths: notFoundById.map(l => l.path) });
-                const foldersByPath = {};
-                await Promise.all(pathFolders.map(async (a) => {
-                    foldersByPath[await this.getPath(a)] = a;
-                }));
-                folders.push(...notFoundById.map(link => foldersByPath[link.path]).filter(isNotNull));
-            }
-            if (!folders.length)
+        if (filter.links?.length) {
+            const pagetreeSvc = this.svc(PagetreeServiceInternal);
+            const siteSvc = this.svc(SiteServiceInternal);
+            const folders = await Promise.all(filter.links.map(async (l) => {
+                const lookups = [];
+                const [contextPagetree, targetSite] = await Promise.all([
+                    l.context ? pagetreeSvc.findById(l.context.pagetreeId) : undefined,
+                    siteSvc.findById(l.siteId)
+                ]);
+                if (contextPagetree?.siteId === l.siteId) {
+                    // the link is targeting the same site as the context, so we need to look for the link in
+                    // the same pagetree as the context
+                    // if we don't find the link in our pagetree, we do NOT fall back to the primary page tree,
+                    // we WANT the user to see a broken link in their sandbox because it will break when they go live
+                    lookups.push(this.loaders.get(foldersByLinkIdLoader, { pagetreeIds: [contextPagetree.id] }).load(l.linkId), this.loaders.get(foldersByPathLoader, { pagetreeIds: [contextPagetree.id] }).load(l.path.replace(/^\/[^/]+/, `/${contextPagetree.name}`)));
+                }
+                else {
+                    // the link is cross-site, so we only look in the primary tree in the site the link was targeting
+                    // we do NOT fall back to finding the linkId in other sites that the link did not originally
+                    // point at
+                    // this means that links will break when pages are moved between sites, which is unfortunate but
+                    // ignoring the link's siteId leads to madness because we could have multiple sites that all have
+                    // pages with the same linkId, and now I have to try to pick: do I prefer launched sites? published
+                    // pages? etc
+                    const resolvedTargetSite = targetSite ?? await siteSvc.findByName(l.path.split('/')[1]);
+                    if (!resolvedTargetSite || resolvedTargetSite.deleted)
+                        return undefined;
+                    const lookuppath = l.path.replace(/^\/[^/]+/, `/${resolvedTargetSite?.name}`);
+                    lookups.push(this.loaders.get(foldersByLinkIdLoader, { pagetreeTypes: [PagetreeType.PRIMARY], siteIds: [l.siteId] }).load(l.linkId), this.loaders.get(foldersByPathLoader, { pagetreeTypes: [PagetreeType.PRIMARY], siteIds: [l.siteId] }).load(l.path));
+                }
+                const pages = await Promise.all(lookups);
+                return pages.find(p => p.length > 0)?.[0];
+            }));
+            const found = folders.filter(isNotNull);
+            if (!found.length)
                 filter.internalIds = [-1];
             else
-                filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, folders.map(a => a.internalId));
+                filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, found.map(p => p.internalId));
         }
         return filter;
     }

package/dist/assetfolder/assetfolder.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetfolder.service.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assetfolder.service.js","sourceRoot":"","sources":["../../src/assetfolder/assetfolder.service.ts"],"names":[],"mappings":"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"}

package/dist/internal.d.ts

@@ -1,5 +1,6 @@
 export * from './scalars/index.js';
 export * from './versionedservice/types.js';
+export * from './page/page.model.js';
 export * from './role/role.model.js';
 export * from './access/access.model.js';
 export * from './asset/asset.model.js';
@@ -11,7 +12,6 @@ export * from './datarule/datarule.model.js';
 export * from './globalrule/globalrule.model.js';
 export * from './group/group.model.js';
 export * from './organization/organization.model.js';
-export * from './page/page.model.js';
 export * from './pagerule/pagerule.model.js';
 export * from './pagetree/pagetree.model.js';
 export * from './site/site.model.js';

package/dist/internal.js

@@ -1,5 +1,6 @@
 export * from './scalars/index.js';
 export * from './versionedservice/types.js';
+export * from './page/page.model.js';
 export * from './role/role.model.js';
 export * from './access/access.model.js';
 export * from './asset/asset.model.js';
@@ -11,7 +12,6 @@ export * from './datarule/datarule.model.js';
 export * from './globalrule/globalrule.model.js';
 export * from './group/group.model.js';
 export * from './organization/organization.model.js';
-export * from './page/page.model.js';
 export * from './pagerule/pagerule.model.js';
 export * from './pagetree/pagetree.model.js';
 export * from './site/site.model.js';

package/dist/internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAE3C,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,oCAAoC,CAAA;AAClD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,sBAAsB,CAAA;AACpC,cAAc,kCAAkC,CAAA;AAChD,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kCAAkC,CAAA;AAChD,cAAc,wBAAwB,CAAA;AACtC,cAAc,sCAAsC,CAAA;AACpD,cAAc,sBAAsB,CAAA;AACpC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sBAAsB,CAAA;AACpC,cAAc,oCAAoC,CAAA;AAClD,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sCAAsC,CAAA;AACpD,cAAc,sBAAsB,CAAA;AACpC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,4BAA4B,CAAA;AAE1C,cAAc,iBAAiB,CAAA;AAE/B,cAAc,2BAA2B,CAAA;AACzC,cAAc,uCAAuC,CAAA;AACrD,cAAc,mCAAmC,CAAA;AACjD,cAAc,yBAAyB,CAAA;AACvC,cAAc,qCAAqC,CAAA;AACnD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,qCAAqC,CAAA;AACnD,cAAc,2BAA2B,CAAA;AACzC,cAAc,yCAAyC,CAAA;AACvD,cAAc,yBAAyB,CAAA;AACvC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uCAAuC,CAAA;AACrD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,yCAAyC,CAAA;AACvD,cAAc,yBAAyB,CAAA;AAEvC,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AAEzC,cAAc,yBAAyB,CAAA;AAEvC,cAAc,0BAA0B,CAAA;AACxC,cAAc,sCAAsC,CAAA;AACpD,cAAc,wBAAwB,CAAA;AACtC,cAAc,oCAAoC,CAAA;AAClD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,kCAAkC,CAAA;AAChD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,oCAAoC,CAAA;AAClD,cAAc,0BAA0B,CAAA;AACxC,cAAc,wCAAwC,CAAA;AACtD,cAAc,wBAAwB,CAAA;AACtC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sCAAsC,CAAA;AACpD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wCAAwC,CAAA;AACtD,cAAc,wBAAwB,CAAA;AACtC,cAAc,+BAA+B,CAAA;AAE7C,cAAc,2BAA2B,CAAA;AACzC,cAAc,2BAA2B,CAAA;AAEzC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,uCAAuC,CAAA;AACrD,cAAc,mCAAmC,CAAA;AACjD,cAAc,yBAAyB,CAAA;AACvC,cAAc,qCAAqC,CAAA;AACnD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,qCAAqC,CAAA;AACnD,cAAc,2BAA2B,CAAA;AACzC,cAAc,yCAAyC,CAAA;AACvD,cAAc,yBAAyB,CAAA;AACvC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uCAAuC,CAAA;AACrD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,yCAAyC,CAAA;AACvD,cAAc,yBAAyB,CAAA;AACvC,cAAc,+BAA+B,CAAA;AAE7C,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AAErC,cAAc,0BAA0B,CAAA"}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"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"}

package/dist/migrations.js

@@ -114,8 +114,8 @@ const dgMigrations = [
         INNER JOIN pagetrees pt ON pt.id=p.pagetreeId
         INNER JOIN storage s ON s.id=p.dataId
         SET p.siteId=pt.siteId,
-          p.templateKey=JSON_EXTRACT(s.data, '$.templateKey'),
-          p.title=JSON_EXTRACT(s.data, '$.title')
+          p.templateKey=JSON_UNQUOTE(JSON_EXTRACT(s.data, '$.templateKey')),
+          p.title=JSON_UNQUOTE(JSON_EXTRACT(s.data, '$.title'))
       `);
             await db.execute(`
         ALTER TABLE pages
@@ -167,6 +167,18 @@ const dgMigrations = [
       `);
             await db.execute('ALTER TABLE data ALTER templateId DROP DEFAULT, ADD FOREIGN KEY (templateId) REFERENCES templates(id)');
         }
+    },
+    {
+        id: 20230223120000,
+        description: 'add linkId to assets and assetfolders',
+        run: async (db) => {
+            await db.execute('ALTER TABLE assets ADD COLUMN linkId CHAR(10) CHARACTER SET "ascii" COLLATE "ascii_bin" NOT NULL DEFAULT ""');
+            await db.execute('ALTER TABLE assetfolders ADD COLUMN linkId CHAR(10) CHARACTER SET "ascii" COLLATE "ascii_bin" NOT NULL DEFAULT "", DROP FOREIGN KEY assetfolders_ibfk_1');
+            await db.execute('UPDATE assets SET linkId = dataId');
+            await db.execute('UPDATE assetfolders SET linkId = guid');
+            await db.execute('ALTER TABLE assets ALTER linkId DROP DEFAULT, ADD INDEX (linkId)');
+            await db.execute('ALTER TABLE assetfolders ALTER linkId DROP DEFAULT, DROP COLUMN guid, ADD UNIQUE INDEX linkId_unique_in_pagetree (pagetreeId, linkId), ADD INDEX (linkId), ADD FOREIGN KEY FK_assetfolders_pagetrees (pagetreeId) REFERENCES pagetrees(id)');
+        }
     }
 ];
 export async function migrations(moreMigrations) {

package/dist/migrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"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"}

package/dist/page/page.database.js

@@ -5,7 +5,7 @@ import { isNotBlank, isNotNull, keyby, unique, sortby } from 'txstate-utils';
 import { Page, normalizePath, getPageIndexes, DeleteState, numerate, DeleteStateAll, DeleteStateInput, DeleteStateDefault } from '../internal.js';
 import { DateTime } from 'luxon';
 async function convertPathsToIDPaths(pathstrings) {
-    var _a, _b, _c;
+    var _a;
     const paths = pathstrings.map(normalizePath).map(p => p.split(/\//).filter(isNotBlank));
     const names = new Set(paths.flat());
     const binds = [];
@@ -13,19 +13,22 @@ async function convertPathsToIDPaths(pathstrings) {
     const rowsByNameAndIDPath = {};
     for (const row of rows) {
         rowsByNameAndIDPath[_a = row.name] ?? (rowsByNameAndIDPath[_a] = {});
-        (_b = rowsByNameAndIDPath[row.name])[_c = row.path] ?? (_b[_c] = []);
-        rowsByNameAndIDPath[row.name][row.path].push(row);
+        rowsByNameAndIDPath[row.name][row.path] = row;
     }
     const idpaths = [];
-    for (const pt of paths) {
-        let searchpaths = ['/'];
-        for (const segment of pt) {
-            const pages = searchpaths.flatMap(sp => rowsByNameAndIDPath[segment]?.[sp]).filter(isNotNull);
-            searchpaths = pages.map(pg => `${pg.path}${pg.path === '/' ? '' : '/'}${pg.id}`);
-            if (!searchpaths.length)
+    for (const entry of paths) {
+        let lastpath = '/';
+        let finished = false;
+        for (let i = 0; i < entry.length; i++) {
+            const segment = entry[i];
+            const page = rowsByNameAndIDPath[segment]?.[lastpath];
+            if (!page)
                 break;
+            lastpath = `${page.path}${page.path === '/' ? '' : '/'}${page.id}`;
+            finished = (i === entry.length - 1);
         }
-        idpaths.push(...searchpaths);
+        if (finished && lastpath !== '/')
+            idpaths.push(lastpath);
     }
     return idpaths;
 }
@@ -132,24 +135,32 @@ async function processFilters(filter) {
         joins.set('pagetrees', 'INNER JOIN pagetrees ON pages.pagetreeId = pagetrees.id');
         where.push(`pagetrees.siteId IN (${db.in(binds, filter.siteIds)})`);
     }
-    // named paths e.g. /site1/about
-    if (filter.paths?.length) {
-        const idpaths = await convertPathsToIDPaths(filter.paths);
-        const ids = ['-1', ...idpaths.map(p => p.split(/\//).slice(-1)[0])];
-        where.push(`pages.id IN (${db.in(binds, ids)})`);
-    }
-    // beneath a named path e.g. /site1/about
-    if (filter.beneath?.length) {
-        const idpaths = await convertPathsToIDPaths(filter.beneath);
-        const ors = idpaths.flatMap(p => ['pages.path LIKE ?', 'pages.path = ?']);
-        binds.push(...idpaths.flatMap(p => [`${p}/%`, p]));
-        where.push(ors.join(' OR '));
-    }
-    // direct children of a named path e.g. /site1/about
-    if (filter.parentPaths?.length) {
-        const idpaths = await convertPathsToIDPaths(filter.parentPaths);
-        where.push(`pages.path IN (${db.in(binds, idpaths)})`);
-    }
+    await Promise.all([
+        (async () => {
+            // named paths e.g. /site1/about
+            if (filter.paths?.length) {
+                const idpaths = await convertPathsToIDPaths(filter.paths);
+                const ids = ['-1', ...idpaths.map(p => p.split(/\//).slice(-1)[0])];
+                where.push(`pages.id IN (${db.in(binds, ids)})`);
+            }
+        })(),
+        (async () => {
+            // beneath a named path e.g. /site1/about
+            if (filter.beneath?.length) {
+                const idpaths = await convertPathsToIDPaths(filter.beneath);
+                const ors = idpaths.flatMap(p => ['pages.path LIKE ?', 'pages.path = ?']);
+                binds.push(...idpaths.flatMap(p => [`${p}/%`, p]));
+                where.push(ors.join(' OR '));
+            }
+        })(),
+        (async () => {
+            // direct children of a named path e.g. /site1/about
+            if (filter.parentPaths?.length) {
+                const idpaths = await convertPathsToIDPaths(filter.parentPaths);
+                where.push(`pages.path IN (${db.in(binds, idpaths)})`);
+            }
+        })()
+    ]);
     if (filter.maxDepth === 0) {
         where.push('pages.path = "/"');
     }