@dosgato/api 0.0.65 → 0.0.67

package/dist/assetfolder/assetfolder.database.js

@@ -1,60 +1,65 @@
 import db from 'mysql2-async/db';
 import { nanoid } from 'nanoid';
-import { AssetFolder, DeletedFilter, DeleteState } from '../internal.js';
+import { AssetFolder, DeleteState, processDeletedFilters } from '../internal.js';
 async function processFilters(filter) {
-    const where = [];
-    const binds = [];
-    if (filter?.internalIds?.length) {
+    const { binds, where, joins } = processDeletedFilters(filter, 'assetfolders', new Map([
+        ['pagetrees', 'INNER JOIN pagetrees ON assetfolders.pagetreeId = pagetrees.id'],
+        ['sites', 'INNER JOIN sites ON assetfolders.siteId = sites.id']
+    ]), ' AND sites.deletedAt IS NULL AND pagetrees.deletedAt IS NULL', ' AND (sites.deletedAt IS NOT NULL OR pagetrees.deletedAt IS NOT NULL)');
+    if (filter == null)
+        return { where, binds, joins };
+    if (filter.internalIds?.length) {
         where.push(`assetfolders.id IN (${db.in(binds, filter.internalIds)})`);
     }
     // internalIdPaths for getting direct descendants of an asset folder
-    if (filter?.internalIdPaths?.length) {
+    if (filter.internalIdPaths?.length) {
         where.push(`assetfolders.path IN (${db.in(binds, filter.internalIdPaths)})`);
     }
     // internalIdPathsRecursive for getting all descendants of an asset folder
-    if (filter?.internalIdPathsRecursive?.length) {
+    if (filter.internalIdPathsRecursive?.length) {
         const ors = filter.internalIdPathsRecursive.flatMap(path => ['assetfolders.path LIKE ?', 'assetfolders.path = ?']);
         where.push(ors.join(' OR '));
         binds.push(...filter.internalIdPathsRecursive.flatMap(p => [`${p}/%`, p]));
     }
-    if (filter?.ids?.length) {
+    if (filter.ids?.length) {
         where.push(`assetfolders.guid IN (${db.in(binds, filter.ids)})`);
     }
-    if (filter?.siteIds?.length) {
+    if (filter.siteIds?.length) {
         where.push(`assetfolders.siteId IN (${db.in(binds, filter.siteIds)})`);
     }
-    if (filter?.childOfFolderInternalIds?.length) {
+    if (filter.pagetreeIds?.length) {
+        where.push(`assetfolders.pagetreeId IN (${db.in(binds, filter.pagetreeIds)})`);
+    }
+    if (filter.pagetreeTypes?.length) {
+        joins.set('pagetrees', 'INNER JOIN pagetrees ON pages.pagetreeId = pagetrees.id');
+        where.push(`pagetrees.type IN (${db.in(binds, filter.pagetreeTypes)})`);
+    }
+    if (filter.maxDepth === 0) {
+        where.push('assetfolders.path = "/"');
+    }
+    else if (filter.maxDepth != null) {
+        where.push('LENGTH(assetfolders.path) - LENGTH(REPLACE(assetfolders.path, "/", "")) <= ?');
+        binds.push(filter.maxDepth);
+    }
+    if (filter.childOfFolderInternalIds?.length) {
         const ors = filter.childOfFolderInternalIds.map(id => 'assetfolders.path LIKE ?');
         where.push(ors.join(' OR '));
         binds.push(...filter.childOfFolderInternalIds.map(id => `%/${id}`));
     }
-    if (filter?.names?.length) {
+    if (filter.names?.length) {
         where.push(`assetfolders.name IN (${db.in(binds, filter.names)})`);
     }
-    if (filter?.root) {
+    if (filter.root) {
         where.push('assetfolders.path = \'/\'');
     }
-    if (filter?.deleted) {
-        if (filter.deleted === DeletedFilter.ONLY) {
-            // Only show deleted asset folders
-            where.push(`assetfolders.deleteState = ${DeleteState.DELETED}`);
-        }
-        else if (filter.deleted === DeletedFilter.HIDE) {
-            // hide fully deleted asset folders
-            where.push(`assetfolders.deleteState != ${DeleteState.DELETED}`);
-        }
-    }
-    else {
-        // deleted filter not specified, return asset folders that are not fully deleted
-        where.push(`assetfolders.deleteState != ${DeleteState.DELETED}`);
-    }
-    return { where, binds };
+    return { joins, where, binds };
 }
 export async function getAssetFolders(filter) {
-    const { where, binds } = await processFilters(filter);
+    const { joins, where, binds } = await processFilters(filter);
     return (await db.getall(`
-    SELECT *
+    SELECT assetfolders.*
     FROM assetfolders
+    ${Array.from(joins.values()).join('\n')}
     ${where.length ? `WHERE (${where.join(') AND (')})` : ''}
   `, binds)).map(r => new AssetFolder(r));
 }
@@ -62,8 +67,8 @@ export async function createAssetFolder(args) {
     return await db.transaction(async (db) => {
         const parent = new AssetFolder(await db.getrow('SELECT * from assetfolders WHERE guid = ?', [args.parentId]));
         const newInternalId = await db.insert(`
-      INSERT INTO assetfolders (siteId, path, name, guid)
-      VALUES (?, ?, ?, ?)`, [parent.siteId, `/${[...parent.pathSplit, parent.internalId].join('/')}`, args.name, nanoid(10)]);
+      INSERT INTO assetfolders (siteId, pagetreeId, path, name, guid)
+      VALUES (?, ?, ?, ?, ?)`, [parent.siteId, parent.pagetreeId, `/${[...parent.pathSplit, parent.internalId].join('/')}`, args.name, nanoid(10)]);
         return new AssetFolder(await db.getrow('SELECT * FROM assetfolders WHERE id=?', [newInternalId]));
     });
 }
@@ -83,7 +88,7 @@ export async function finalizeAssetFolderDeletion(id, userInternalId) {
         const folderIds = await db.getvals('SELECT id FROM assetfolders WHERE id = ? OR path like ?', [id, `%/${id}%`]);
         const binds = [userInternalId, DeleteState.DELETED];
         await db.update(`UPDATE assetfolders SET deletedBy = ?, deletedAt = NOW(), deleteState = ? WHERE id IN (${db.in(binds, folderIds)})`, binds);
-        await db.update(`UPDATE assets SET deletedBy = ?, deletedAt = NOW(), deleteState = ? WHERE folderId IN (${db.in(binds, folderIds)})`, binds);
+        await db.update(`UPDATE assets SET deletedBy = ?, deletedAt = NOW(), deleteState = ? WHERE folderId IN (${db.in([], folderIds)})`, binds);
     });
 }
 export async function undeleteAssetFolder(id) {
@@ -91,7 +96,7 @@ export async function undeleteAssetFolder(id) {
         const folderIds = await db.getvals('SELECT id FROM assetfolders WHERE id = ? OR path like ?', [id, `%/${id}%`]);
         const binds = [DeleteState.NOTDELETED];
         await db.update(`UPDATE assetfolders SET deletedBy = null, deletedAt = null, deleteState = ? WHERE id IN (${db.in(binds, folderIds)})`, binds);
-        await db.update(`UPDATE assets SET deletedBy = null, deletedAt = null, deleteState = ? WHERE folderId IN (${db.in(binds, folderIds)})`, binds);
+        await db.update(`UPDATE assets SET deletedBy = null, deletedAt = null, deleteState = ? WHERE folderId IN (${db.in([], folderIds)})`, binds);
     });
 }
 //# sourceMappingURL=assetfolder.database.js.map

package/dist/assetfolder/assetfolder.database.js.map

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

package/dist/assetfolder/assetfolder.model.d.ts

@@ -1,6 +1,6 @@
 import { ValidatedResponse, ValidatedResponseArgs } from '@txstate-mws/graphql-server';
 import { DateTime } from 'luxon';
-import { DeletedFilter, DeleteState } from '../internal.js';
+import { DeleteState, DeleteStateInput, PagetreeType } from '../internal.js';
 export declare class AssetFolder {
     internalId: number;
     id: string;
@@ -14,6 +14,7 @@ export declare class AssetFolder {
     pathSplit: number[];
     parentInternalId?: number;
     pathAsParent: string;
+    pagetreeId: string;
     constructor(row: any);
 }
 export declare class AssetFolderFilter {
@@ -22,6 +23,9 @@ export declare class AssetFolderFilter {
     internalIdPathsRecursive?: string[];
     ids?: string[];
     siteIds?: string[];
+    pagetreeIds?: string[];
+    pagetreeTypes?: PagetreeType[];
+    maxDepth?: number;
     links?: AssetFolderLinkInput[];
     parentOfFolderIds?: string[];
     parentOfFolderInternalIds?: number[];
@@ -32,7 +36,7 @@ export declare class AssetFolderFilter {
     beneath?: string[];
     parentPaths?: string[];
     root?: boolean;
-    deleted?: DeletedFilter;
+    deleteStates?: DeleteStateInput[];
 }
 export declare class CreateAssetFolderInput {
     name: string;

package/dist/assetfolder/assetfolder.model.js

@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import { ValidatedResponse } from '@txstate-mws/graphql-server';
 import { DateTime } from 'luxon';
 import { isNotBlank, isNotNull } from 'txstate-utils';
-import { Field, ID, InputType, ObjectType, registerEnumType } from 'type-graphql';
-import { DeletedFilter, DeleteState, UrlSafePath, UrlSafeString } from '../internal.js';
+import { Field, ID, InputType, Int, ObjectType, registerEnumType } from 'type-graphql';
+import { DeleteState, DeleteStateInput, PagetreeType, UrlSafePath, UrlSafeString } from '../internal.js';
 let AssetFolder = class AssetFolder {
     constructor(row) {
         this.internalId = row.id;
@@ -21,11 +21,12 @@ let AssetFolder = class AssetFolder {
         this.path = row.path;
         this.pathSplit = row.path.split(/\//).filter(isNotBlank).map(Number);
         this.parentInternalId = this.pathSplit[this.pathSplit.length - 1];
+        this.pagetreeId = String(row.pagetreeId);
         this.pathAsParent = '/' + [...this.pathSplit, this.internalId].join('/');
         this.deleted = isNotNull(row.deletedAt);
-        this.deletedAt = DateTime.fromJSDate(row.deletedAt);
+        this.deletedAt = row.deletedAt ? DateTime.fromJSDate(row.deletedAt) : undefined;
         this.deletedBy = row.deletedBy;
-        this.deleteState = this.deleteState = row.deleteState === 0 ? DeleteState.NOTDELETED : ((row.deleteState === 1 ? DeleteState.MARKEDFORDELETE : DeleteState.DELETED));
+        this.deleteState = row.deleteState;
     }
 };
 __decorate([
@@ -63,6 +64,18 @@ __decorate([
     Field(type => [ID], { nullable: true }),
     __metadata("design:type", Array)
 ], AssetFolderFilter.prototype, "siteIds", void 0);
+__decorate([
+    Field(type => [ID], { nullable: true }),
+    __metadata("design:type", Array)
+], AssetFolderFilter.prototype, "pagetreeIds", void 0);
+__decorate([
+    Field(type => [PagetreeType], { nullable: true }),
+    __metadata("design:type", Array)
+], AssetFolderFilter.prototype, "pagetreeTypes", void 0);
+__decorate([
+    Field(type => Int, { nullable: true, description: 'Only return folders at a depth less than or equal to maxDepth. Root folder is 0 depth.' }),
+    __metadata("design:type", Number)
+], AssetFolderFilter.prototype, "maxDepth", void 0);
 __decorate([
     Field(type => [AssetFolderLinkInput], { nullable: true, description: 'Resolve asset folder links preferring id and falling back to path.' }),
     __metadata("design:type", Array)
@@ -92,9 +105,9 @@ __decorate([
     __metadata("design:type", Boolean)
 ], AssetFolderFilter.prototype, "root", void 0);
 __decorate([
-    Field(type => DeletedFilter, { nullable: true }),
-    __metadata("design:type", String)
-], AssetFolderFilter.prototype, "deleted", void 0);
+    Field(type => [DeleteStateInput], { nullable: true, description: 'Return based on deleted status. If you do not specify this filter it will still hide deleted and orphaned by default but show those that are marked for deletion. Orphaned refers to the situation where an object is effectively deleted because it belongs to a site, pagetree, or parent that has been deleted.' }),
+    __metadata("design:type", Array)
+], AssetFolderFilter.prototype, "deleteStates", void 0);
 AssetFolderFilter = __decorate([
     InputType()
 ], AssetFolderFilter);

package/dist/assetfolder/assetfolder.model.js.map

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

package/dist/assetfolder/assetfolder.resolver.js

@@ -13,10 +13,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 import { Context } from '@txstate-mws/graphql-server';
 import { isNull } from 'txstate-utils';
 import { Resolver, Arg, Ctx, FieldResolver, Root, Mutation, ID, Query } from 'type-graphql';
-import { Asset, AssetFilter, Role, RoleService, User, AssetFolder, AssetFolderFilter, AssetFolderPermission, AssetFolderPermissions, AssetFolderService, AssetRuleService, UserService, AssetFolderResponse, CreateAssetFolderInput, UrlSafeString, Site, SiteService } from '../internal.js';
+import { Asset, AssetFilter, Role, RoleService, User, AssetFolder, AssetFolderFilter, AssetFolderPermission, AssetFolderPermissions, AssetFolderService, AssetRuleService, UserService, AssetFolderResponse, CreateAssetFolderInput, UrlSafeString, Site, SiteService, DeleteStateRootDefault } from '../internal.js';
 let AssetFolderResolver = class AssetFolderResolver {
     async assetfolders(ctx, filter) {
-        return await ctx.svc(AssetFolderService).find(filter);
+        return await ctx.svc(AssetFolderService).find({ ...filter, deleteStates: filter?.deleteStates ?? DeleteStateRootDefault });
     }
     async deletedBy(ctx, folder) {
         if (isNull(folder.deletedBy))

package/dist/assetfolder/assetfolder.resolver.js.map

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

package/dist/assetfolder/assetfolder.service.d.ts

@@ -5,6 +5,7 @@ export declare class AssetFolderServiceInternal extends BaseService {
     findByInternalId(id: number): Promise<AssetFolder | undefined>;
     findById(id: string): Promise<AssetFolder | undefined>;
     findByIds(ids: string[]): Promise<AssetFolder[]>;
+    findByPagetreeId(id: string, filter?: AssetFolderFilter): Promise<AssetFolder[]>;
     getAncestors(folder: AssetFolder): Promise<AssetFolder[]>;
     getParent(folder: AssetFolder): Promise<AssetFolder | undefined>;
     convertPathsToIDPaths(pathstrings: string[]): Promise<string[]>;
@@ -19,6 +20,7 @@ export declare class AssetFolderService extends DosGatoService<AssetFolder> {
     find(filter?: AssetFolderFilter): Promise<AssetFolder[]>;
     findByInternalId(internalId: number): Promise<AssetFolder | undefined>;
     findById(id: string): Promise<AssetFolder | undefined>;
+    findByPagetreeId(id: string, filter?: AssetFolderFilter): Promise<AssetFolder[]>;
     getAncestors(folder: AssetFolder): Promise<AssetFolder[]>;
     getParent(folder: AssetFolder): Promise<AssetFolder | undefined>;
     getChildFolders(folder: AssetFolder, recursive?: boolean, filter?: AssetFolderFilter): Promise<AssetFolder[]>;

package/dist/assetfolder/assetfolder.service.js

@@ -1,18 +1,18 @@
 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, DeletedFilter } from '../internal.js';
+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, deleted: DeletedFilter.SHOW }),
+    fetch: async (ids) => await getAssetFolders({ internalIds: ids, deleteStates: DeleteStateAll }),
     extractId: af => af.internalId
 });
 const assetFolderByIdLoader = new PrimaryKeyLoader({
-    fetch: async (ids) => await getAssetFolders({ ids, deleted: DeletedFilter.SHOW }),
+    fetch: async (ids) => await getAssetFolders({ ids, deleteStates: DeleteStateAll }),
     idLoader: assetFolderByInternalIdLoader
 });
 assetFolderByInternalIdLoader.addIdLoader(assetFolderByIdLoader);
 const foldersByNameLoader = new OneToManyLoader({
-    fetch: async (names) => await getAssetFolders({ names, deleted: DeletedFilter.SHOW }),
+    fetch: async (names) => await getAssetFolders({ names, deleteStates: DeleteStateAll }),
     extractKey: folder => folder.name,
     idLoader: [assetFolderByIdLoader, assetFolderByInternalIdLoader]
 });
@@ -33,6 +33,14 @@ const foldersByInternalIdPathRecursiveLoader = new OneToManyLoader({
     matchKey: (path, f) => f.path.startsWith(path),
     idLoader: [assetFolderByInternalIdLoader, assetFolderByIdLoader]
 });
+const foldersInPagetreeLoader = new OneToManyLoader({
+    fetch: async (pagetreeIds, filter) => {
+        return await getAssetFolders({ ...filter, pagetreeIds });
+    },
+    extractKey: (f) => f.pagetreeId,
+    keysFromFilter: (filter) => filter?.pagetreeIds ?? [],
+    idLoader: [assetFolderByInternalIdLoader, assetFolderByIdLoader]
+});
 export class AssetFolderServiceInternal extends BaseService {
     async find(filter) {
         const folders = await getAssetFolders(await this.processFolderFilters(filter));
@@ -51,6 +59,9 @@ export class AssetFolderServiceInternal extends BaseService {
     async findByIds(ids) {
         return await this.loaders.loadMany(assetFolderByIdLoader, ids);
     }
+    async findByPagetreeId(id, filter) {
+        return await this.loaders.get(foldersInPagetreeLoader, filter).load(id);
+    }
     async getAncestors(folder) {
         return await this.loaders.loadMany(assetFolderByInternalIdLoader, folder.pathSplit);
     }
@@ -194,6 +205,9 @@ export class AssetFolderService extends DosGatoService {
     async findById(id) {
         return await this.removeUnauthorized(await this.raw.findById(id));
     }
+    async findByPagetreeId(id, filter) {
+        return await this.removeUnauthorized(await this.raw.findByPagetreeId(id, filter));
+    }
     async getAncestors(folder) {
         return await this.removeUnauthorized(await this.raw.getAncestors(folder));
     }
@@ -279,8 +293,8 @@ export class AssetFolderService extends DosGatoService {
             throw new Error(`Current user is not permitted to delete folder ${String(folder.name)}.`);
         const currentUser = await this.currentUser();
         await finalizeAssetFolderDeletion(folder.internalId, currentUser.internalId);
-        const deletedfolder = await this.loaders.get(assetFolderByIdLoader).load(folderId);
         this.loaders.clear();
+        const deletedfolder = await this.raw.findById(folderId);
         return new AssetFolderResponse({ assetFolder: deletedfolder, success: true });
     }
     async undelete(folderId) {

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/assetrule/assetrule.database.js

@@ -19,6 +19,15 @@ function processFilters(filter) {
             ors.push(`assetrules.siteId IN (${db.in(binds, siteIds)})`);
         where.push(ors.join('OR'));
     }
+    if (filter?.pagetreeTypes?.length) {
+        const ors = [];
+        if (filter.pagetreeTypes.some(id => !id))
+            ors.push('assetrules.pagetreeType IS NULL');
+        const pagetreeTypes = filter.pagetreeTypes.filter(isNotNull);
+        if (pagetreeTypes.length)
+            ors.push(`assetrules.pagetreeType IN (${db.in(binds, pagetreeTypes)})`);
+        where.push(ors.join('OR'));
+    }
     if (filter?.paths?.length) {
         where.push(`assetrules.path IN (${db.in(binds, filter.paths)})`);
     }
@@ -89,6 +98,10 @@ export async function createAssetRule(args) {
         columns.push('siteId');
         binds.push(args.siteId);
     }
+    if (args.pagetreeType) {
+        columns.push('pagetreeType');
+        binds.push(args.pagetreeType);
+    }
     if (args.grants) {
         if (args.grants.create) {
             columns.push('`create`');

package/dist/assetrule/assetrule.database.js.map

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

package/dist/assetrule/assetrule.model.d.ts

@@ -1,9 +1,10 @@
 import { ValidatedResponse, ValidatedResponseArgs } from '@txstate-mws/graphql-server';
-import { RulePathMode } from '../internal.js';
+import { PagetreeType, RulePathMode } from '../internal.js';
 interface AssetRuleRow {
     id: number | string;
     roleId: number | string;
     siteId?: number | string;
+    pagetreeType?: PagetreeType;
     path: string;
     mode: RulePathMode;
     create?: number | boolean;
@@ -33,11 +34,13 @@ export declare class AssetRule {
     grants: AssetRuleGrants;
     roleId: string;
     siteId?: string;
+    pagetreeType?: PagetreeType;
     constructor(row: AssetRuleRow);
 }
 export declare class AssetRuleFilter {
     ids?: string[];
     siteIds?: (string | null)[];
+    pagetreeTypes?: (PagetreeType | null)[];
     roleIds?: string[];
     paths?: string[];
     create?: boolean;
@@ -49,6 +52,7 @@ export declare class AssetRuleFilter {
 export declare class CreateAssetRuleInput {
     roleId: string;
     siteId?: string;
+    pagetreeType?: PagetreeType;
     path?: string;
     mode?: RulePathMode;
     grants?: AssetRuleGrantsBase;
@@ -56,6 +60,7 @@ export declare class CreateAssetRuleInput {
 export declare class UpdateAssetRuleInput {
     ruleId: string;
     siteId?: string;
+    pagetreeType?: PagetreeType;
     path?: string;
     mode?: RulePathMode;
     grants?: AssetRuleGrantsBase;