@webiny/api-headless-cms 0.0.0-unstable.de38392959 → 0.0.0-unstable.e0bfc55d5a

package/{types.d.ts → types/types.d.ts}

@@ -1,21 +1,35 @@
-import { Plugin } from "@webiny/plugins/types";
-import { I18NContext, I18NLocale } from "@webiny/api-i18n/types";
-import { Context } from "@webiny/api/types";
-import { GraphQLFieldResolver, GraphQLSchemaDefinition, Resolvers } from "@webiny/handler-graphql/types";
-import { SecurityPermission } from "@webiny/api-security/types";
-import { DbContext } from "@webiny/handler-db/types";
-import { Topic } from "@webiny/pubsub/types";
-import { CmsModelConverterCallable } from "./utils/converters/ConverterCollection";
-import { ModelGroupsPermissions } from "./utils/permissions/ModelGroupsPermissions";
-import { ModelsPermissions } from "./utils/permissions/ModelsPermissions";
-import { EntriesPermissions } from "./utils/permissions/EntriesPermissions";
-import { HeadlessCmsExport, HeadlessCmsImport } from "./export/types";
-export declare type ApiEndpoint = "manage" | "preview" | "read";
-interface HeadlessCmsPermissions {
-    groups: ModelGroupsPermissions;
-    models: ModelsPermissions;
-    entries: EntriesPermissions;
+import type { Plugin } from "@webiny/plugins/types";
+import type { I18NContext, I18NLocale } from "@webiny/api-i18n/types";
+import type { Context, GenericRecord } from "@webiny/api/types";
+import type { GraphQLFieldResolver, GraphQLRequestBody, Resolvers } from "@webiny/handler-graphql/types";
+import type { processRequestBody } from "@webiny/handler-graphql";
+import type { SecurityPermission } from "@webiny/api-security/types";
+import type { DbContext } from "@webiny/handler-db/types";
+import type { Topic } from "@webiny/pubsub/types";
+import type { CmsModelConverterCallable } from "../utils/converters/ConverterCollection";
+import type { HeadlessCmsExport, HeadlessCmsImport } from "../export/types";
+import type { AccessControl } from "../crud/AccessControl/AccessControl";
+import type { CmsModelToAstConverter } from "../utils/contentModelAst/CmsModelToAstConverter";
+import type { CmsModelFieldToGraphQLPlugin } from "./plugins";
+import type { CmsEntryContext } from "./context";
+import type { CmsModelField, CmsModelFieldValidation, CmsModelUpdateInput } from "./modelField";
+import type { CmsModel, CmsModelCreateFromInput, CmsModelCreateInput } from "./model";
+import type { CmsGroup } from "./modelGroup";
+import type { CmsIdentity } from "./identity";
+import type { ISingletonModelManager } from "../modelManager";
+export interface CmsError {
+    message: string;
+    code: string;
+    data: GenericRecord;
+    stack?: string;
+}
+export interface CmsError {
+    message: string;
+    code: string;
+    data: GenericRecord;
+    stack?: string;
 }
+export type ApiEndpoint = "manage" | "preview" | "read";
 export interface HeadlessCms extends CmsSystemContext, CmsGroupContext, CmsModelContext, CmsEntryContext {
     /**
      * API type
@@ -46,17 +60,17 @@ export interface HeadlessCms extends CmsSystemContext, CmsGroupContext, CmsModel
      */
     storageOperations: HeadlessCmsStorageOperations;
     /**
-     * Permissions for groups, models and entries.
-     *
-     * @internal
+     * Use to ensure perform authorization and ensure identities have access to the groups, models and entries.
      */
-    permissions: HeadlessCmsPermissions;
+    accessControl: AccessControl;
     /**
      * Export operations.
      */
     export: HeadlessCmsExport;
     importing: HeadlessCmsImport;
+    getExecutableSchema: GetExecutableSchema;
 }
+export type GetExecutableSchema = (type: ApiEndpoint) => Promise<(<TData = Record<string, any>, TExtensions = Record<string, any>>(input: GraphQLRequestBody | GraphQLRequestBody[]) => ReturnType<typeof processRequestBody<TData, TExtensions>>)>;
 /**
  * @description This combines all contexts used in the CMS into a single one.
  *
@@ -65,193 +79,6 @@ export interface HeadlessCms extends CmsSystemContext, CmsGroupContext, CmsModel
 export interface CmsContext extends Context, DbContext, I18NContext {
     cms: HeadlessCms;
 }
-interface CmsModelFieldPredefinedValuesValue {
-    value: string;
-    label: string;
-    /**
-     * Default selected predefined value.
-     */
-    selected?: boolean;
-}
-/**
- * Object containing content model field predefined options and values.
- *
- * @category CmsModelField
- */
-export interface CmsModelFieldPredefinedValues {
-    /**
-     * Are predefined field values enabled?
-     */
-    enabled: boolean;
-    /**
-     * Predefined values array.
-     */
-    values: CmsModelFieldPredefinedValuesValue[];
-}
-/**
- * Object containing content model field renderer options.
- *
- * @category CmsModelField
- */
-interface CmsModelFieldRenderer {
-    /**
-     * Name of the field renderer. Must have one in field renderer plugins.
-     * Can be blank to let automatically determine the renderer.
-     */
-    name: string;
-}
-/**
- * A definition for content model field settings.
- *
- * @category ModelField
- * @category Database model
- */
-export interface CmsModelFieldSettings {
-    /**
-     * Predefined values (text, number)
-     * The default value for the field in case it is not predefined values field.
-     */
-    defaultValue?: string | number | null | undefined;
-    /**
-     * Object field has child fields.
-     */
-    fields?: CmsModelField[];
-    /**
-     * Is the file field images only one?
-     */
-    imagesOnly?: boolean;
-    /**
-     * Object field has child fields - so it needs to have a layout.
-     */
-    layout?: string[][];
-    /**
-     * Ref field.
-     */
-    models?: Pick<CmsModel, "modelId">[];
-    /**
-     * Date field.
-     */
-    type?: string;
-    /**
-     * Disable full text search explicitly on this field.
-     */
-    disableFullTextSearch?: boolean;
-    /**
-     * There are a lot of other settings that are possible to add, so we keep the type opened.
-     */
-    [key: string]: any;
-}
-export declare type CmsModelFieldType = "boolean" | "datetime" | "file" | "long-text" | "number" | "json" | "object" | "ref" | "rich-text" | "text" | "dynamicZone" | string;
-/**
- * A definition for content model field. This type exists on the app side as well.
- *
- * @category ModelField
- * @category Database model
- */
-export interface CmsModelField {
-    /**
-     * A generated unique ID for the model field.
-     * MUST be absolute unique throughout the models.
-     * Must be in form of a-zA-Z0-9.
-     *
-     * We generate a unique id value when you're building a model via UI,
-     * but when user is creating a model via a plugin it is up to them to be careful about this.
-     */
-    id: string;
-    /**
-     * A type of the field.
-     * We are defining our built-in fields, so people know which are available by the default.
-     */
-    type: CmsModelFieldType;
-    /**
-     * A unique storage ID for storing actual values.
-     * Must in form of a-zA-Z0-9@a-zA-Z0-9
-     *
-     * This is an auto-generated value: uses `id` and `type`
-     *
-     * This is used as path for the entry value.
-     */
-    storageId: `${string}@${string}` | string;
-    /**
-     * Field identifier for the model field that will be available to the outside world.
-     * `storageId` is used as path (or column) to store the data.
-     *
-     * Must in form of a-zA-Z0-9.
-     *
-     * This value MUST be unique in the CmsModel.
-     */
-    fieldId: string;
-    /**
-     * A label for the field
-     */
-    label: string;
-    /**
-     * Text below the field to clarify what is it meant to be in the field value
-     */
-    helpText?: string | null;
-    /**
-     * Text to be displayed in the field
-     */
-    placeholderText?: string | null;
-    /**
-     * Are predefined values enabled? And list of them
-     */
-    predefinedValues?: CmsModelFieldPredefinedValues;
-    /**
-     * Field renderer. Blank if determined automatically.
-     */
-    renderer?: CmsModelFieldRenderer;
-    /**
-     * List of validations for the field
-     *
-     * @default []
-     */
-    validation?: CmsModelFieldValidation[];
-    /**
-     * List of validations for the list of values, when a field is set to accept a list of values.
-     * These validations will be applied to the entire list, and `validation` (see above) will be applied
-     * to each individual value in the list.
-     *
-     * @default []
-     */
-    listValidation?: CmsModelFieldValidation[];
-    /**
-     * Is this a multiple values field?
-     *
-     */
-    multipleValues?: boolean;
-    /**
-     * Fields can be tagged to give them contextual meaning.
-     */
-    tags?: string[];
-    /**
-     * Any user defined settings.
-     *
-     * @default {}
-     */
-    settings?: CmsModelFieldSettings;
-}
-export interface CmsDynamicZoneTemplate {
-    id: string;
-    name: string;
-    gqlTypeName: string;
-    description: string;
-    icon: string;
-    fields: CmsModelField[];
-    layout: string[][];
-    validation: CmsModelFieldValidation[];
-}
-/**
- * A definition for dynamic-zone field to show possible type of the field in settings.
- */
-export interface CmsModelDynamicZoneField extends CmsModelField {
-    /**
-     * Settings object for the field. Contains `templates` property.
-     */
-    settings: {
-        templates: CmsDynamicZoneTemplate[];
-    };
-}
 /**
  * Used for our internal functionality.
  */
@@ -305,220 +132,6 @@ export interface CmsModelFieldValidatorValidateParams<T = any> {
      */
     entry?: CmsEntry;
 }
-/**
- * Definition for the field validator.
- *
- * @category Plugin
- * @category ModelField
- * @category FieldValidation
- */
-export interface CmsModelFieldValidatorPluginValidateCb {
-    (params: CmsModelFieldValidatorValidateParams): Promise<boolean>;
-}
-export interface CmsModelFieldValidatorPlugin extends Plugin {
-    /**
-     * A plugin type.
-     */
-    type: "cms-model-field-validator";
-    /**
-     * Actual validator definition.
-     */
-    validator: {
-        /**
-         * Name of the validator.
-         */
-        name: string;
-        /**
-         * Validation method.
-         */
-        validate: CmsModelFieldValidatorPluginValidateCb;
-    };
-}
-/**
- * A pattern validator for the content entry field value.
- *
- * @category Plugin
- * @category ModelField
- * @category FieldValidation
- */
-export interface CmsModelFieldPatternValidatorPlugin extends Plugin {
-    /**
-     * A plugin type
-     */
-    type: "cms-model-field-validator-pattern";
-    /**
-     * A pattern object for the validator.
-     */
-    pattern: {
-        /**
-         * name of the pattern.
-         */
-        name: string;
-        /**
-         * RegExp of the validator.
-         */
-        regex: string;
-        /**
-         * RegExp flags
-         */
-        flags: string;
-    };
-}
-/**
- * Locked field in the content model
- *
- * @see CmsModel.lockedFields
- *
- * @category ModelField
- */
-export interface LockedField {
-    /**
-     * Locked field storage ID - one used to store values.
-     * We cannot change this due to old systems.
-     */
-    fieldId: string;
-    /**
-     * Is the field multiple values field?
-     */
-    multipleValues: boolean;
-    /**
-     * Field type.
-     */
-    type: string;
-    [key: string]: any;
-}
-/**
- * @category Database model
- * @category CmsModel
- */
-export interface CmsModelGroup {
-    /**
-     * Generated ID of the group
-     */
-    id: string;
-    /**
-     * Name of the group
-     */
-    name: string;
-}
-/**
- * Base CMS Model. Should not be exported and used outside of this package.
- *
- * @category Database model
- * @category CmsModel
- */
-export interface CmsModel {
-    /**
-     * Name of the content model.
-     */
-    name: string;
-    /**
-     * Unique ID for the content model. Created from name if not defined by user.
-     */
-    modelId: string;
-    /**
-     * Name of the content model in singular form to be used in the API.
-     * example:
-     * - Article
-     * - Fruit
-     * - Vegetable
-     * - Car
-     */
-    singularApiName: string;
-    /**
-     * Name of the content model in plural form to be used in the API.
-     * example:
-     * - Articles
-     * - Fruits
-     * - Vegetables
-     * - Cars
-     */
-    pluralApiName: string;
-    /**
-     * Model tenant.
-     */
-    tenant: string;
-    /**
-     * Locale this model belongs to.
-     */
-    locale: string;
-    /**
-     * Cms Group reference object.
-     */
-    group: CmsModelGroup;
-    /**
-     * Icon for the content model.
-     */
-    icon?: string | null;
-    /**
-     * Description for the content model.
-     */
-    description: string | null;
-    /**
-     * Date created
-     */
-    createdOn?: string;
-    /**
-     * Date saved. Changes on both save and create.
-     */
-    savedOn?: string;
-    /**
-     * CreatedBy object wrapper. Contains id, name and type of the user.
-     */
-    createdBy?: CmsIdentity;
-    /**
-     * List of fields defining entry values.
-     */
-    fields: CmsModelField[];
-    /**
-     * Admin UI field layout
-     *
-     * ```ts
-     * layout: [
-     *      [field1id, field2id],
-     *      [field3id]
-     * ]
-     * ```
-     */
-    layout: string[][];
-    /**
-     * Models can be tagged to give them contextual meaning.
-     */
-    tags?: string[];
-    /**
-     * List of locked fields. Updated when entry is saved and a field has been used.
-     */
-    lockedFields?: LockedField[];
-    /**
-     * The field that is being displayed as entry title.
-     * It is picked as first available text field. Or user can select own field.
-     */
-    titleFieldId: string;
-    /**
-     * The field which is displayed as the description one.
-     * Only way this is null or undefined is that there are no long-text fields to be set as description.
-     */
-    descriptionFieldId?: string | null;
-    /**
-     * The field which is displayed as the image.
-     * Only way this is null or undefined is that there are no file fields, with images only set, to be set as image.
-     */
-    imageFieldId?: string | null;
-    /**
-     * The version of Webiny which this record was stored with.
-     */
-    webinyVersion: string;
-    /**
-     * Is model private?
-     * This is meant to be used for some internal models - will not be visible in the schema.
-     * Only available for the plugin constructed models.
-     */
-    isPrivate?: boolean;
-    /**
-     * Is this model created via plugin?
-     */
-    isPlugin?: boolean;
-}
 /**
  * When sending model to the storage operations, it must contain createValueKeyToStorageConverter and createValueKeyFromStorageConverter
  *
@@ -535,6 +148,11 @@ export interface CmsModelFieldDefinition {
     fields: string;
     typeDefs?: string;
 }
+export interface CmsModelFieldToGraphQLNormalizeInputParams<TField> {
+    model: CmsModel;
+    field: TField;
+    input: GenericRecord<string> | Array<GenericRecord<string>>;
+}
 interface CmsModelFieldToGraphQLCreateResolverParams<TField> {
     models: CmsModel[];
     model: CmsModel;
@@ -564,326 +182,12 @@ export interface CmsModelFieldToGraphQLPluginValidateChildFieldsParams<TField ex
 export interface CmsModelFieldToGraphQLPluginValidateChildFields<TField extends CmsModelField = CmsModelField> {
     (params: CmsModelFieldToGraphQLPluginValidateChildFieldsParams<TField>): void;
 }
-/**
- * @category Plugin
- * @category ModelField
- * @category GraphQL
- */
-export interface CmsModelFieldToGraphQLPlugin<TField extends CmsModelField = CmsModelField> extends Plugin {
-    /**
-     * A plugin type
-     */
-    type: "cms-model-field-to-graphql";
-    /**
-     * Field type name which must be exact as the one in `CmsEditorFieldTypePlugin` plugin.
-     *
-     * ```ts
-     * fieldType: "myField"
-     * ```
-     */
-    fieldType: CmsModelFieldType;
-    /**
-     * Is the field searchable via the GraphQL?
-     *
-     * ```ts
-     * isSearchable: false
-     * ```
-     */
-    isSearchable: boolean;
-    /**
-     * Is the field searchable via full text search?
-     *
-     * Field is not full text searchable by default.
-     * ```ts
-     * fullTextSearch: false
-     * ```
-     */
-    fullTextSearch?: boolean;
-    /**
-     * Is the field sortable via the GraphQL?
-     *
-     * ```ts
-     * isSortable: true
-     * ```
-     */
-    isSortable: boolean;
-    /**
-     * Optional method which creates the storageId.
-     * Primary use is for the datetime field, but if users has some specific fields, they can customize the storageId to their needs.
-     *
-     * ```ts
-     * createStorageId: ({field}) => {
-     *     if (field.settings.type === "time) {
-     *         return `${field.type}_time@${field.id}`
-     *     }
-     *     // use default method
-     *     return undefined;
-     * }
-     * ```
-     */
-    createStorageId?: (params: {
-        model: CmsModel;
-        field: Omit<TField, "storageId"> & Partial<Pick<TField, "storageId">>;
-    }) => string | null | undefined;
-    /**
-     * Read API methods.
-     */
-    read: {
-        /**
-         * Definition for get filtering for GraphQL.
-         *
-         * ```ts
-         * read: {
-         *     createGetFilters({ field }) {
-         *         return `${field.fieldId}: MyField`;
-         *     }
-         * }
-         * ```
-         */
-        createGetFilters?(params: {
-            field: TField;
-        }): string;
-        /**
-         * Definition for list filtering for GraphQL.
-         *
-         * ```ts
-         * read: {
-         *     createListFilters({ field }) {
-         *         return `
-         *             ${field.fieldId}: MyType
-         *             ${field.fieldId}_not: MyType
-         *             ${field.fieldId}_in: [MyType]
-         *             ${field.fieldId}_not_in: [MyType]
-         *         `;
-         *     }
-         * }
-         * ```
-         */
-        createListFilters?(params: {
-            model: Pick<CmsModel, "singularApiName">;
-            field: TField;
-            plugins: CmsFieldTypePlugins;
-        }): string;
-        /**
-         * Definition of the field type for GraphQL - be aware if multiple values is selected.
-         *
-         * ```ts
-         * read: {
-         *     createTypeField({ field }) {
-         *         if (field.multipleValues) {
-         *             return `${field.fieldId}: [MyFieldType]`;
-         *         }
-         *
-         *         return `${field.fieldId}: MyField`;
-         *     }
-         * }
-         * ```
-         */
-        createTypeField(params: {
-            models: CmsModel[];
-            model: CmsModel;
-            field: TField;
-            fieldTypePlugins: CmsFieldTypePlugins;
-        }): CmsModelFieldDefinition | string | null;
-        /**
-         * Definition for field resolver.
-         * By default, it is simple return of the `instance.values[storageId]` but if required, users can define their own.
-         *
-         * ```ts
-         * read: {
-         *     createResolver({ field }) {
-         *         return instance => {
-         *             return instance.values[field.storageId];
-         *         };
-         *     }
-         * }
-         * ```
-         */
-        createResolver?: CmsModelFieldToGraphQLCreateResolver<TField>;
-        /**
-         * Read API schema definitions for the field and resolvers for them.
-         *
-         * ```ts
-         * read: {
-         *     createSchema() {
-         *         return {
-         *             typeDefs: `
-         *                 myField {
-         *                     id
-         *                     date
-         *                 }
-         *             `,
-         *             resolvers: {}
-         *         }
-         *     }
-         * }
-         * ```
-         */
-        createSchema?: (params: {
-            models: CmsModel[];
-        }) => GraphQLSchemaDefinition<CmsContext>;
-    };
-    manage: {
-        /**
-         * Definition for list filtering for GraphQL.
-         *
-         * ```ts
-         * manage: {
-         *     createListFilters({ field }) {
-         *         return `
-         *             ${field.fieldId}: MyType
-         *             ${field.fieldId}_not: MyType
-         *             ${field.fieldId}_in: [MyType]
-         *             ${field.fieldId}_not_in: [MyType]
-         *         `;
-         *     }
-         * }
-         * ```
-         */
-        createListFilters?: (params: {
-            model: Pick<CmsModel, "singularApiName">;
-            field: TField;
-            plugins: CmsFieldTypePlugins;
-        }) => string;
-        /**
-         * Manage API schema definitions for the field and resolvers for them. Probably similar to `read.createSchema`.
-         *
-         * ```ts
-         *     createSchema() {
-         *         return {
-         *             typeDefs: `
-         *                 myField {
-         *                     id
-         *                     date
-         *                 }
-         *             `,
-         *             resolvers: {}
-         *         }
-         *     }
-         * ```
-         */
-        createSchema?: (params: {
-            models: CmsModel[];
-        }) => GraphQLSchemaDefinition<CmsContext>;
-        /**
-         * Definition of the field type for GraphQL - be aware if multiple values is selected. Probably same as `read.createTypeField`.
-         *
-         * ```ts
-         * manage: {
-         *     createTypeField({ field }) {
-         *         if (field.multipleValues) {
-         *             return field.fieldId + ": [MyType]";
-         *         }
-         *
-         *         return field.fieldId + ": MyType";
-         *     }
-         * }
-         * ```
-         */
-        createTypeField: (params: {
-            models: CmsModel[];
-            model: CmsModel;
-            field: TField;
-            fieldTypePlugins: CmsFieldTypePlugins;
-        }) => CmsModelFieldDefinition | string | null;
-        /**
-         * Definition for input GraphQL field type.
-         *
-         * ```ts
-         * manage: {
-         *     createInputField({ field }) {
-         *         if (field.multipleValues) {
-         *             return field.fieldId + ": [MyField]";
-         *         }
-         *
-         *         return field.fieldId + ": MyField";
-         *     }
-         * }
-         * ```
-         */
-        createInputField: (params: {
-            models: CmsModel[];
-            model: CmsModel;
-            field: TField;
-            fieldTypePlugins: CmsFieldTypePlugins;
-        }) => CmsModelFieldDefinition | string | null;
-        /**
-         * Definition for field resolver.
-         * By default, it is simple return of the `instance.values[storageId]` but if required, users can define their own.
-         *
-         * ```ts
-         * manage: {
-         *     createResolver({ field }) {
-         *         return instance => {
-         *             return instance.values[field.storageId];
-         *         };
-         *     }
-         * }
-         * ```
-         */
-        createResolver?: CmsModelFieldToGraphQLCreateResolver<TField>;
-    };
-    /**
-     *
-     * @param field
-     */
-    validateChildFields?: CmsModelFieldToGraphQLPluginValidateChildFields<TField>;
-}
-/**
- * Check for content model locked field.
- * A custom plugin definable by the user.
- *
- * @category CmsModel
- * @category Plugin
- */
-export interface CmsModelLockedFieldPlugin extends Plugin {
-    /**
-     * A plugin type
-     */
-    type: "cms-model-locked-field";
-    /**
-     * A unique identifier of the field type (text, number, json, myField, ...).
-     */
-    fieldType: string;
-    /**
-     * A method to check if field really is locked.
-     */
-    checkLockedField?: (params: {
-        lockedField: LockedField;
-        field: CmsModelField;
-    }) => void;
-    /**
-     * A method to get the locked field data.
-     */
-    getLockedFieldData?: (params: {
-        field: CmsModelField;
-    }) => Record<string, any>;
-}
 /**
  * @category ModelField
  */
 export interface CmsFieldTypePlugins {
     [key: string]: CmsModelFieldToGraphQLPlugin;
 }
-/**
- * An interface describing the reference to a user that created some data in the database.
- *
- * @category General
- */
-export interface CmsIdentity {
-    /**
-     * ID if the user.
-     */
-    id: string;
-    /**
-     * Full name of the user.
-     */
-    displayName: string | null;
-    /**
-     * Type of the user (admin, user)
-     */
-    type: string;
-}
 export interface OnSystemBeforeInstallTopicParams {
     tenant: string;
     locale: string;
@@ -897,7 +201,7 @@ export interface OnSystemInstallErrorTopicParams {
     tenant: string;
     locale: string;
 }
-export declare type CmsSystemContext = {
+export type CmsSystemContext = {
     getSystemVersion: () => Promise<string | null>;
     setSystemVersion: (version: string) => Promise<void>;
     installSystem: () => Promise<void>;
@@ -933,68 +237,6 @@ export interface CmsGroupUpdateInput {
     description?: string;
     icon?: string;
 }
-/**
- * A representation of content model group in the database.
- *
- * @category CmsGroup
- * @category Database model
- */
-export interface CmsGroup {
-    /**
-     * Generated ID.
-     */
-    id: string;
-    /**
-     * Name of the group.
-     */
-    name: string;
-    /**
-     * Slug for the group. Must be unique.
-     */
-    slug: string;
-    /**
-     * Group tenant.
-     */
-    tenant: string;
-    /**
-     * Locale this group belongs to.
-     */
-    locale: string;
-    /**
-     * Description for the group.
-     */
-    description: string | null;
-    /**
-     * Icon for the group. In a form of "ico/ico".
-     */
-    icon: string;
-    /**
-     * CreatedBy reference object.
-     */
-    createdBy?: CmsIdentity;
-    /**
-     * Date group was created on.
-     */
-    createdOn?: string;
-    /**
-     * Date group was created or changed on.
-     */
-    savedOn?: string;
-    /**
-     * Which Webiny version was this record stored with.
-     */
-    webinyVersion: string;
-    /**
-     * Is group private?
-     * This is meant to be used for some internal groups - will not be visible in the schema.
-     * Only available for the plugin constructed groups.
-     */
-    isPrivate?: boolean;
-    /**
-     * Is this group created via plugin?
-     */
-    isPlugin?: boolean;
-}
 /**
  * A `data.where` parameter received when listing content model groups.
  *
@@ -1040,285 +282,87 @@ export interface OnGroupBeforeUpdateTopicParams {
 }
 /**
  * @category CmsGroup
- * @category Topic
- */
-export interface OnGroupAfterUpdateTopicParams {
-    original: CmsGroup;
-    group: CmsGroup;
-}
-/**
- * @category CmsGroup
- * @category Topic
- */
-export interface OnGroupUpdateErrorTopicParams {
-    input: CmsGroupUpdateInput;
-    original: CmsGroup;
-    group: CmsGroup;
-    error: Error;
-}
-/**
- * @category CmsGroup
- * @category Topic
- */
-export interface OnGroupBeforeDeleteTopicParams {
-    group: CmsGroup;
-}
-/**
- * @category CmsGroup
- * @category Topic
- */
-export interface OnGroupAfterDeleteTopicParams {
-    group: CmsGroup;
-}
-/**
- * @category CmsGroup
- * @category Topic
- */
-export interface OnGroupDeleteErrorTopicParams {
-    group: CmsGroup;
-    error: Error;
-}
-/**
- * Cms Group in context.
- *
- * @category Context
- * @category CmsGroup
- */
-export interface CmsGroupContext {
-    /**
-     * Gets content model group by given id.
-     */
-    getGroup: (id: string) => Promise<CmsGroup>;
-    /**
-     * List all content model groups. Filterable via params.
-     */
-    listGroups: (params?: CmsGroupListParams) => Promise<CmsGroup[]>;
-    /**
-     * Create a new content model group.
-     */
-    createGroup: (data: CmsGroupCreateInput) => Promise<CmsGroup>;
-    /**
-     * Update existing content model group.
-     */
-    updateGroup: (id: string, data: CmsGroupUpdateInput) => Promise<CmsGroup>;
-    /**
-     * Delete content model group by given id.
-     */
-    deleteGroup: (id: string) => Promise<boolean>;
-    /**
-     * Clear the cached groups.
-     */
-    clearGroupsCache: () => void;
-    /**
-     * Lifecycle Events
-     */
-    onGroupBeforeCreate: Topic<OnGroupBeforeCreateTopicParams>;
-    onGroupAfterCreate: Topic<OnGroupAfterCreateTopicParams>;
-    onGroupCreateError: Topic<OnGroupCreateErrorTopicParams>;
-    onGroupBeforeUpdate: Topic<OnGroupBeforeUpdateTopicParams>;
-    onGroupAfterUpdate: Topic<OnGroupAfterUpdateTopicParams>;
-    onGroupUpdateError: Topic<OnGroupUpdateErrorTopicParams>;
-    onGroupBeforeDelete: Topic<OnGroupBeforeDeleteTopicParams>;
-    onGroupAfterDelete: Topic<OnGroupAfterDeleteTopicParams>;
-    onGroupDeleteError: Topic<OnGroupDeleteErrorTopicParams>;
-}
-/**
- * Definition for content model field validator.
- *
- * @category ModelField
- * @category FieldValidation
- */
-export interface CmsModelFieldValidation {
-    name: string;
-    message: string;
-    settings?: {
-        value?: string | number;
-        values?: string[];
-        preset?: string;
-        [key: string]: any;
-    };
-}
-/**
- * A GraphQL `params.data` parameter received when creating content model.
- *
- * @category GraphQL params
- * @category CmsModel
- */
-export interface CmsModelCreateInput {
-    /**
-     * Name of the content model.
-     */
-    name: string;
-    /**
-     * Singular name of the content model to be used in the API.
-     */
-    singularApiName: string;
-    /**
-     * Plural name of the content model to be used in the API.
-     */
-    pluralApiName: string;
-    /**
-     * Unique ID of the content model. Created from name if not sent by the user. Cannot be changed.
-     */
-    modelId?: string;
-    /**
-     * Description of the content model.
-     */
-    description?: string | null;
-    /**
-     * Group where to put the content model in.
-     */
-    group: string;
-    /**
-     * A list of content model fields to define the entry values.
-     */
-    fields?: CmsModelFieldInput[];
-    /**
-     * Admin UI field layout
-     *
-     * ```ts
-     * layout: [
-     *      [field1id, field2id],
-     *      [field3id]
-     * ]
-     * ```
-     */
-    layout?: string[][];
-    /**
-     * Models can be tagged to give them contextual meaning.
-     */
-    tags?: string[];
-    /**
-     * Fields fieldId which are picked to represent the CMS entry.
-     */
-    titleFieldId?: string | null;
-    descriptionFieldId?: string | null;
-    imageFieldId?: string | null;
+ * @category Topic
+ */
+export interface OnGroupAfterUpdateTopicParams {
+    original: CmsGroup;
+    group: CmsGroup;
 }
 /**
- * A GraphQL `params.data` parameter received when creating content model from existing model.
- *
- * @category GraphQL params
- * @category CmsModel
+ * @category CmsGroup
+ * @category Topic
  */
-export interface CmsModelCreateFromInput extends CmsModelCreateInput {
-    /**
-     * Locale into which we want to clone the model into.
-     */
-    locale?: string;
+export interface OnGroupUpdateErrorTopicParams {
+    input: CmsGroupUpdateInput;
+    original: CmsGroup;
+    group: CmsGroup;
+    error: Error;
 }
 /**
- * A definition for content model field received from the user.
- *
- * Input type for `CmsModelField`.
- * @see CmsModelField
- *
- * @category GraphQL params
- * @category ModelField
+ * @category CmsGroup
+ * @category Topic
  */
-export interface CmsModelFieldInput {
-    /**
-     * Generated ID.
-     */
-    id: string;
-    /**
-     * Type of the field. A plugin for the field must be defined.
-     * @see CmsModelFieldToGraphQLPlugin
-     */
-    type: string;
-    /**
-     * Field outside world identifier for the field. Must be unique in the model.
-     */
-    fieldId: string;
-    /**
-     * Label for the field.
-     */
-    label: string;
-    /**
-     * Text to display below the field to help user what to write in the field.
-     */
-    helpText?: string | null;
-    /**
-     * Text to display in the field.
-     */
-    placeholderText?: string | null;
-    /**
-     * Fields can be tagged to give them contextual meaning.
-     */
-    tags?: string[];
-    /**
-     * Are multiple values allowed?
-     */
-    multipleValues?: boolean;
-    /**
-     * Predefined values options for the field. Check the reference for more information.
-     */
-    predefinedValues?: CmsModelFieldPredefinedValues;
-    /**
-     * Renderer options for the field. Check the reference for more information.
-     */
-    renderer?: CmsModelFieldRenderer;
-    /**
-     * List of validations for the field.
-     */
-    validation?: CmsModelFieldValidation[];
-    /**
-     * @see CmsModelField.listValidation
-     */
-    listValidation?: CmsModelFieldValidation[];
-    /**
-     * User defined settings.
-     */
-    settings?: Record<string, any>;
+export interface OnGroupBeforeDeleteTopicParams {
+    group: CmsGroup;
+}
+/**
+ * @category CmsGroup
+ * @category Topic
+ */
+export interface OnGroupAfterDeleteTopicParams {
+    group: CmsGroup;
+}
+/**
+ * @category CmsGroup
+ * @category Topic
+ */
+export interface OnGroupDeleteErrorTopicParams {
+    group: CmsGroup;
+    error: Error;
 }
 /**
- * A GraphQL `params.data` parameter received when updating content model.
+ * Cms Group in context.
  *
- * @category GraphQL params
- * @category CmsModel
+ * @category Context
+ * @category CmsGroup
  */
-export interface CmsModelUpdateInput {
-    /**
-     * A new content model name.
-     */
-    name?: string;
+export interface CmsGroupContext {
     /**
-     * A new singular name of the content model to be used in the API.
+     * Gets content model group by given id.
      */
-    singularApiName?: string;
+    getGroup: (id: string) => Promise<CmsGroup>;
     /**
-     * A new plural name of the content model to be used in the API.
+     * List all content model groups. Filterable via params.
      */
-    pluralApiName?: string;
+    listGroups: (params?: CmsGroupListParams) => Promise<CmsGroup[]>;
     /**
-     * A group we want to move the model to.
+     * Create a new content model group.
      */
-    group?: string;
+    createGroup: (data: CmsGroupCreateInput) => Promise<CmsGroup>;
     /**
-     * A new description of the content model.
+     * Update existing content model group.
      */
-    description?: string | null;
+    updateGroup: (id: string, data: CmsGroupUpdateInput) => Promise<CmsGroup>;
     /**
-     * A list of content model fields to define the entry values.
+     * Delete content model group by given id.
      */
-    fields: CmsModelFieldInput[];
+    deleteGroup: (id: string) => Promise<boolean>;
     /**
-     * Admin UI field layout
-     *
-     * ```ts
-     * layout: [
-     *      [field1id, field2id],
-     *      [field3id]
-     * ]
-     * ```
+     * Clear the cached groups.
      */
-    layout: string[][];
+    clearGroupsCache: () => void;
     /**
-     * Fields fieldId which are picked to represent the CMS entry.
+     * Lifecycle Events
      */
-    titleFieldId?: string | null;
-    descriptionFieldId?: string | null;
-    imageFieldId?: string | null;
+    onGroupBeforeCreate: Topic<OnGroupBeforeCreateTopicParams>;
+    onGroupAfterCreate: Topic<OnGroupAfterCreateTopicParams>;
+    onGroupCreateError: Topic<OnGroupCreateErrorTopicParams>;
+    onGroupBeforeUpdate: Topic<OnGroupBeforeUpdateTopicParams>;
+    onGroupAfterUpdate: Topic<OnGroupAfterUpdateTopicParams>;
+    onGroupUpdateError: Topic<OnGroupUpdateErrorTopicParams>;
+    onGroupBeforeDelete: Topic<OnGroupBeforeDeleteTopicParams>;
+    onGroupAfterDelete: Topic<OnGroupAfterDeleteTopicParams>;
+    onGroupDeleteError: Topic<OnGroupDeleteErrorTopicParams>;
 }
 /**
  * A plugin to load a CmsModelManager.
@@ -1343,7 +387,7 @@ export interface ModelManagerPlugin extends Plugin {
      * Create a CmsModelManager for specific type - or new default one.
      * For reference in how is this plugin run check [contentModelManagerFactory](https://github.com/webiny/webiny-js/blob/f15676/packages/api-headless-cms/src/content/plugins/CRUD/contentModel/contentModelManagerFactory.ts)
      */
-    create: (context: CmsContext, model: CmsModel) => Promise<CmsModelManager>;
+    create<T = any>(context: CmsContext, model: CmsModel): Promise<CmsModelManager<T>>;
 }
 /**
  * A content entry values definition for and from the database.
@@ -1394,6 +438,14 @@ export interface CmsEntry<T = CmsEntryValues> {
      * An ISO 8601 date/time string.
      */
     revisionModifiedOn: string | null;
+    /**
+     * An ISO 8601 date/time string.
+     */
+    revisionDeletedOn: string | null;
+    /**
+     * An ISO 8601 date/time string.
+     */
+    revisionRestoredOn: string | null;
     /**
      * An ISO 8601 date/time string.
      */
@@ -1414,6 +466,14 @@ export interface CmsEntry<T = CmsEntryValues> {
      * Identity that last ionModified the entry.
      */
     revisionModifiedBy: CmsIdentity | null;
+    /**
+     * Identity that last deleted the revision.
+     */
+    revisionDeletedBy: CmsIdentity | null;
+    /**
+     * Identity that last restored the revision.
+     */
+    revisionRestoredBy: CmsIdentity | null;
     /**
      * Identity that first published the entry.
      */
@@ -1434,6 +494,14 @@ export interface CmsEntry<T = CmsEntryValues> {
      * An ISO 8601 date/time string.
      */
     modifiedOn: string | null;
+    /**
+     * An ISO 8601 date/time string.
+     */
+    deletedOn: string | null;
+    /**
+     * An ISO 8601 date/time string.
+     */
+    restoredOn: string | null;
     /**
      * An ISO 8601 date/time string.
      */
@@ -1454,6 +522,14 @@ export interface CmsEntry<T = CmsEntryValues> {
      * Identity that last modified the entry.
      */
     modifiedBy: CmsIdentity | null;
+    /**
+     * Identity that last deleted the entry.
+     */
+    deletedBy: CmsIdentity | null;
+    /**
+     * Identity that last restored the entry.
+     */
+    restoredBy: CmsIdentity | null;
     /**
      * Identity that first published the entry.
      */
@@ -1462,6 +538,17 @@ export interface CmsEntry<T = CmsEntryValues> {
      * Identity that last published the entry.
      */
     lastPublishedBy: CmsIdentity | null;
+    /**
+     * Deprecated fields. 👇
+     */
+    /**
+     * @deprecated Will be removed with the 5.41.0 release. Use `createdBy` field instead.
+     */
+    ownedBy?: CmsIdentity | null;
+    /**
+     * @deprecated Will be removed with the 5.41.0 release. Use `firstPublishedOn` or `lastPublishedOn` field instead.
+     */
+    publishedOn?: string | null;
     /**
      * Model ID of the definition for the entry.
      * @see CmsModel
@@ -1507,6 +594,15 @@ export interface CmsEntry<T = CmsEntryValues> {
     meta?: {
         [key: string]: any;
     };
+    /**
+     * Is the entry in the bin?
+     */
+    wbyDeleted?: boolean | null;
+    /**
+     * This field preserves the original folderId value, as the ROOT_FOLDER is set upon deletion.
+     * The value is utilized when restoring the entry from the trash bin.
+     */
+    binOriginalFolderId?: string | null;
 }
 export interface CmsStorageEntry extends CmsEntry {
     [key: string]: any;
@@ -1525,40 +621,42 @@ export interface CmsEntryUniqueValue {
  * @category CmsEntry
  * @category CmsModel
  */
-export interface CmsModelManager {
+export interface CmsModelManager<T = CmsEntryValues> {
+    model: CmsModel;
     /**
      * List only published entries in the content model.
      */
-    listPublished: (params: CmsEntryListParams) => Promise<[CmsEntry[], CmsEntryMeta]>;
+    listPublished(params: CmsEntryListParams): Promise<[CmsEntry<T>[], CmsEntryMeta]>;
     /**
      * List latest entries in the content model. Used for administration.
      */
-    listLatest: (params: CmsEntryListParams) => Promise<[CmsEntry[], CmsEntryMeta]>;
+    listLatest(params: CmsEntryListParams): Promise<[CmsEntry<T>[], CmsEntryMeta]>;
     /**
      * Get a list of published entries by the ID list.
      */
-    getPublishedByIds: (ids: string[]) => Promise<CmsEntry[]>;
+    getPublishedByIds(ids: string[]): Promise<CmsEntry<T>[]>;
     /**
      * Get a list of the latest entries by the ID list.
      */
-    getLatestByIds: (ids: string[]) => Promise<CmsEntry[]>;
+    getLatestByIds(ids: string[]): Promise<CmsEntry<T>[]>;
     /**
      * Get an entry filtered by given params. Will always get one.
      */
-    get: (id: string) => Promise<CmsEntry>;
+    get(id: string): Promise<CmsEntry<T>>;
     /**
      * Create an entry.
      */
-    create: (data: CreateCmsEntryInput) => Promise<CmsEntry>;
+    create<I>(data: CreateCmsEntryInput & I, options?: CreateCmsEntryOptionsInput): Promise<CmsEntry<T>>;
     /**
      * Update an entry.
      */
-    update: (id: string, data: UpdateCmsEntryInput) => Promise<CmsEntry>;
+    update(id: string, data: UpdateCmsEntryInput, options?: UpdateCmsEntryOptionsInput): Promise<CmsEntry<T>>;
     /**
      * Delete an entry.
      */
-    delete: (id: string) => Promise<void>;
+    delete(id: string, options?: CmsDeleteEntryOptions): Promise<void>;
 }
+export type ICmsEntryManager<T = GenericRecord> = CmsModelManager<T>;
 /**
  * Create
  */
@@ -1640,6 +738,13 @@ export interface CmsModelUpdateDirectParams {
     model: CmsModel;
     original: CmsModel;
 }
+export interface ICmsModelListParams {
+    /**
+     * Defaults to true.
+     */
+    includePrivate?: boolean;
+    includePlugins?: boolean;
+}
 /**
  * Cms Model in the context.
  *
@@ -1649,55 +754,65 @@ export interface CmsModelUpdateDirectParams {
 export interface CmsModelContext {
     /**
      * Get a single content model.
+     *
+     * @throws NotFoundError
+     */
+    getModel(modelId: string): Promise<CmsModel>;
+    /**
+     * Get model to AST converter.
      */
-    getModel: (modelId: string) => Promise<CmsModel | null>;
+    getModelToAstConverter: () => CmsModelToAstConverter;
     /**
      * Get all content models.
      */
-    listModels: () => Promise<CmsModel[]>;
+    listModels(params?: ICmsModelListParams): Promise<CmsModel[]>;
     /**
      * Create a content model.
      */
-    createModel: (data: CmsModelCreateInput) => Promise<CmsModel>;
+    createModel(data: CmsModelCreateInput): Promise<CmsModel>;
     /**
      * Create a content model from the given model - clone.
      */
-    createModelFrom: (modelId: string, data: CmsModelCreateFromInput) => Promise<CmsModel>;
+    createModelFrom(modelId: string, data: CmsModelCreateFromInput): Promise<CmsModel>;
     /**
      * Update content model without data validation. Used internally.
      * @hidden
      */
-    updateModelDirect: (params: CmsModelUpdateDirectParams) => Promise<CmsModel>;
+    updateModelDirect(params: CmsModelUpdateDirectParams): Promise<CmsModel>;
     /**
      * Update content model.
      */
-    updateModel: (modelId: string, data: CmsModelUpdateInput) => Promise<CmsModel>;
+    updateModel(modelId: string, data: CmsModelUpdateInput): Promise<CmsModel>;
     /**
      * Delete content model. Should not allow deletion if there are entries connected to it.
      */
-    deleteModel: (modelId: string) => Promise<void>;
+    deleteModel(modelId: string): Promise<void>;
     /**
      * Possibility for users to trigger the model initialization.
      * They can hook into it and do what ever they want to.
      *
      * Primary idea behind this is creating the index, for the code models, in the ES.
      */
-    initializeModel: (modelId: string, data: Record<string, any>) => Promise<boolean>;
+    initializeModel(modelId: string, data: Record<string, any>): Promise<boolean>;
     /**
      * Get an instance of CmsModelManager for given content modelId.
      *
      * @see CmsModelManager
      */
-    getEntryManager: (model: CmsModel | string) => Promise<CmsModelManager>;
+    getEntryManager<T extends CmsEntryValues = CmsEntryValues>(model: CmsModel | string): Promise<ICmsEntryManager<T>>;
+    /**
+     * A model manager for a model which has a single entry.
+     */
+    getSingletonEntryManager<T extends CmsEntryValues = CmsEntryValues>(model: CmsModel | string): Promise<ISingletonModelManager<T>>;
     /**
      * Get all content model managers mapped by modelId.
      * @see CmsModelManager
      */
-    getEntryManagers: () => Map<string, CmsModelManager>;
+    getEntryManagers(): Map<string, ICmsEntryManager>;
     /**
      * Clear all the model caches.
      */
-    clearModelsCache: () => void;
+    clearModelsCache(): void;
     /**
      * Lifecycle Events
      */
@@ -1720,7 +835,7 @@ export interface CmsModelContext {
  *
  * @category CmsEntry
  */
-export declare type CmsEntryStatus = "published" | "unpublished" | "draft";
+export type CmsEntryStatus = "published" | "unpublished" | "draft";
 export interface CmsEntryListWhereRef {
     id?: string;
     id_in?: string[];
@@ -1752,6 +867,13 @@ export interface CmsEntryListWhere {
     entryId_not?: string;
     entryId_in?: string[];
     entryId_not_in?: string[];
+    /**
+     * Status of the entry.
+     */
+    status?: CmsEntryStatus;
+    status_not?: CmsEntryStatus;
+    status_in?: CmsEntryStatus[];
+    status_not_in?: CmsEntryStatus[];
     /**
      * Revision-level meta fields. 👇
      */
@@ -1837,7 +959,7 @@ export interface CmsEntryListWhere {
     /**
      * This is to allow querying by any content model field defined by the user.
      */
-    [key: string]: string | number | boolean | undefined | string[] | number[] | null | CmsEntryListWhere[] | CmsEntryListWhere | CmsEntryListWhereRef;
+    [key: string]: string | number | boolean | Date | undefined | string[] | number[] | null | CmsEntryListWhere[] | CmsEntryListWhere | CmsEntryListWhereRef;
     /**
      * To allow querying via nested queries, we added the AND / OR properties.
      */
@@ -1850,7 +972,9 @@ export interface CmsEntryListWhere {
  * @category CmsEntry
  * @category GraphQL params
  */
-export declare type CmsEntryListSort = string[];
+export type CmsEntryListSortAsc = `${string}_ASC`;
+export type CmsEntryListSortDesc = `${string}_DESC`;
+export type CmsEntryListSort = (CmsEntryListSortAsc | CmsEntryListSortDesc)[];
 /**
  * Get entry GraphQL resolver params.
  *
@@ -2033,19 +1157,45 @@ export interface OnEntryUnpublishErrorTopicParams {
     entry: CmsEntry;
     model: CmsModel;
 }
+/**
+ * Delete
+ */
 export interface OnEntryBeforeDeleteTopicParams {
     entry: CmsEntry;
     model: CmsModel;
+    permanent: boolean;
 }
 export interface OnEntryAfterDeleteTopicParams {
     entry: CmsEntry;
     model: CmsModel;
+    permanent: boolean;
 }
 export interface OnEntryDeleteErrorTopicParams {
+    error: Error;
+    entry: CmsEntry;
+    permanent: boolean;
+    model: CmsModel;
+}
+/**
+ * Restore from bin
+ */
+export interface OnEntryBeforeRestoreFromBinTopicParams {
+    entry: CmsEntry;
+    model: CmsModel;
+}
+export interface OnEntryAfterRestoreFromBinTopicParams {
+    entry: CmsEntry;
+    model: CmsModel;
+    storageEntry: CmsEntry;
+}
+export interface OnEntryRestoreFromBinErrorTopicParams {
     error: Error;
     entry: CmsEntry;
     model: CmsModel;
 }
+/**
+ * Delete Revision
+ */
 export interface OnEntryRevisionBeforeDeleteTopicParams {
     entry: CmsEntry;
     model: CmsModel;
@@ -2059,6 +1209,9 @@ export interface OnEntryRevisionDeleteErrorTopicParams {
     entry: CmsEntry;
     model: CmsModel;
 }
+/**
+ * Delete multiple
+ */
 export interface OnEntryBeforeDeleteMultipleTopicParams {
     model: CmsModel;
     entries: CmsEntry[];
@@ -2075,10 +1228,16 @@ export interface OnEntryDeleteMultipleErrorTopicParams {
     ids: string[];
     error: Error;
 }
+/**
+ * Get
+ */
 export interface OnEntryBeforeGetTopicParams {
     model: CmsModel;
     where: CmsEntryListWhere;
 }
+/**
+ * List
+ */
 export interface EntryBeforeListTopicParams {
     where: CmsEntryListWhere;
     model: CmsModel;
@@ -2087,7 +1246,7 @@ export interface EntryBeforeListTopicParams {
  * @category Context
  * @category CmsEntry
  */
-export interface CreateCmsEntryInput {
+export type CreateCmsEntryInput<TValues = CmsEntryValues> = TValues & {
     id?: string;
     status?: CmsEntryStatus;
     /**
@@ -2096,9 +1255,12 @@ export interface CreateCmsEntryInput {
     createdOn?: Date | string;
     modifiedOn?: Date | string | null;
     savedOn?: Date | string;
+    deletedOn?: Date | string | null;
+    restoredOn?: Date | string | null;
     createdBy?: CmsIdentity;
-    modifiedBy?: CmsIdentity | null;
     savedBy?: CmsIdentity;
+    deletedBy?: CmsIdentity | null;
+    restoredBy?: CmsIdentity | null;
     firstPublishedOn?: Date | string;
     lastPublishedOn?: Date | string;
     firstPublishedBy?: CmsIdentity;
@@ -2109,9 +1271,13 @@ export interface CreateCmsEntryInput {
     revisionCreatedOn?: Date | string;
     revisionModifiedOn?: Date | string | null;
     revisionSavedOn?: Date | string;
+    revisionDeletedOn?: Date | string | null;
+    revisionRestoredOn?: Date | string | null;
     revisionCreatedBy?: CmsIdentity;
     revisionModifiedBy?: CmsIdentity | null;
     revisionSavedBy?: CmsIdentity;
+    revisionDeletedBy?: CmsIdentity | null;
+    revisionRestoredBy?: CmsIdentity | null;
     revisionFirstPublishedOn?: Date | string;
     revisionLastPublishedOn?: Date | string;
     revisionFirstPublishedBy?: CmsIdentity;
@@ -2119,8 +1285,7 @@ export interface CreateCmsEntryInput {
     wbyAco_location?: {
         folderId?: string | null;
     };
-    [key: string]: any;
-}
+};
 export interface CreateCmsEntryOptionsInput {
     skipValidators?: string[];
 }
@@ -2164,18 +1329,22 @@ export interface CreateRevisionCmsEntryOptionsInput {
  * @category Context
  * @category CmsEntry
  */
-export interface UpdateCmsEntryInput {
+export type UpdateCmsEntryInput<TValues = CmsEntryValues> = TValues & {
     /**
      * Revision-level meta fields. 👇
      */
     revisionCreatedOn?: Date | string | null;
     revisionModifiedOn?: Date | string | null;
     revisionSavedOn?: Date | string | null;
+    revisionDeletedOn?: Date | string | null;
+    revisionRestoredOn?: Date | string | null;
     revisionFirstPublishedOn?: Date | string | null;
     revisionLastPublishedOn?: Date | string | null;
     revisionModifiedBy?: CmsIdentity | null;
     revisionCreatedBy?: CmsIdentity | null;
     revisionSavedBy?: CmsIdentity | null;
+    revisionDeletedBy?: CmsIdentity | null;
+    revisionRestoredBy?: CmsIdentity | null;
     revisionFirstPublishedBy?: CmsIdentity | null;
     revisionLastPublishedBy?: CmsIdentity | null;
     /**
@@ -2184,18 +1353,21 @@ export interface UpdateCmsEntryInput {
     createdOn?: Date | string | null;
     modifiedOn?: Date | string | null;
     savedOn?: Date | string | null;
+    deletedOn?: Date | string | null;
+    restoredOn?: Date | string | null;
     firstPublishedOn?: Date | string | null;
     lastPublishedOn?: Date | string | null;
     createdBy?: CmsIdentity | null;
     modifiedBy?: CmsIdentity | null;
     savedBy?: CmsIdentity | null;
+    deletedBy?: CmsIdentity | null;
+    restoredBy?: CmsIdentity | null;
     firstPublishedBy?: CmsIdentity | null;
     lastPublishedBy?: CmsIdentity | null;
     wbyAco_location?: {
         folderId?: string | null;
     };
-    [key: string]: any;
-}
+};
 export interface UpdateCmsEntryOptionsInput {
     skipValidators?: string[];
 }
@@ -2216,6 +1388,10 @@ export interface CmsDeleteEntryOptions {
      * This is to force clean the entry records that might have been left behind a failed delete.
      */
     force?: boolean;
+    /**
+     * Destroying the entry directly, without moving it to the bin.
+     */
+    permanently?: boolean;
 }
 /**
  * @category Context
@@ -2224,139 +1400,12 @@ export interface CmsDeleteEntryOptions {
 export interface DeleteMultipleEntriesParams {
     entries: string[];
 }
-export declare type DeleteMultipleEntriesResponse = {
+export type DeleteMultipleEntriesResponse = {
     id: string;
 }[];
 export interface CmsEntryValidateResponse {
     [key: string]: any;
 }
-/**
- * Cms Entry CRUD methods in the context.
- *
- * @category Context
- * @category CmsEntry
- */
-export interface CmsEntryContext {
-    /**
-     * Get a single content entry for a model.
-     */
-    getEntry: (model: CmsModel, params: CmsEntryGetParams) => Promise<CmsEntry>;
-    /**
-     * Get a list of entries for a model by a given ID (revision).
-     */
-    getEntriesByIds: (model: CmsModel, revisions: string[]) => Promise<CmsEntry[]>;
-    /**
-     * Get the entry for a model by a given ID.
-     */
-    getEntryById: (model: CmsModel, revision: string) => Promise<CmsEntry>;
-    /**
-     * List entries for a model. Internal method used by get, listLatest and listPublished.
-     */
-    listEntries: <T = CmsEntryValues>(model: CmsModel, params: CmsEntryListParams) => Promise<[CmsEntry<T>[], CmsEntryMeta]>;
-    /**
-     * Lists the latest entries. Used for manage API.
-     */
-    listLatestEntries: <T = CmsEntryValues>(model: CmsModel, params?: CmsEntryListParams) => Promise<[CmsEntry<T>[], CmsEntryMeta]>;
-    /**
-     * List published entries. Used for read API.
-     */
-    listPublishedEntries: <T = CmsEntryValues>(model: CmsModel, params?: CmsEntryListParams) => Promise<[CmsEntry<T>[], CmsEntryMeta]>;
-    /**
-     * List published entries by IDs.
-     */
-    getPublishedEntriesByIds: (model: CmsModel, ids: string[]) => Promise<CmsEntry[]>;
-    /**
-     * List latest entries by IDs.
-     */
-    getLatestEntriesByIds: (model: CmsModel, ids: string[]) => Promise<CmsEntry[]>;
-    /**
-     * Create a new content entry.
-     */
-    createEntry: (model: CmsModel, input: CreateCmsEntryInput, options?: CreateCmsEntryOptionsInput) => Promise<CmsEntry>;
-    /**
-     * Create a new entry from already existing entry.
-     */
-    createEntryRevisionFrom: (model: CmsModel, id: string, input: CreateFromCmsEntryInput, options?: CreateRevisionCmsEntryOptionsInput) => Promise<CmsEntry>;
-    /**
-     * Update existing entry.
-     */
-    updateEntry: (model: CmsModel, id: string, input: UpdateCmsEntryInput, meta?: Record<string, any>, options?: UpdateCmsEntryOptionsInput) => Promise<CmsEntry>;
-    /**
-     * Validate the entry - either new one or existing one.
-     */
-    validateEntry: (model: CmsModel, id?: string, input?: UpdateCmsEntryInput) => Promise<CmsEntryValidateResponse>;
-    /**
-     * Move entry, and all its revisions, to a new folder.
-     */
-    moveEntry: (model: CmsModel, id: string, folderId: string) => Promise<CmsEntry>;
-    /**
-     * Method that republishes entry with given identifier.
-     * @internal
-     */
-    republishEntry: (model: CmsModel, id: string) => Promise<CmsEntry>;
-    /**
-     * Delete only a certain revision of the entry.
-     */
-    deleteEntryRevision: (model: CmsModel, id: string) => Promise<void>;
-    /**
-     * Delete entry with all its revisions.
-     */
-    deleteEntry: (model: CmsModel, id: string, options?: CmsDeleteEntryOptions) => Promise<void>;
-    /**
-     * Delete multiple entries
-     */
-    deleteMultipleEntries: (model: CmsModel, params: DeleteMultipleEntriesParams) => Promise<DeleteMultipleEntriesResponse>;
-    /**
-     * Publish entry.
-     */
-    publishEntry: (model: CmsModel, id: string) => Promise<CmsEntry>;
-    /**
-     * Unpublish entry.
-     */
-    unpublishEntry: (model: CmsModel, id: string) => Promise<CmsEntry>;
-    /**
-     * Get all entry revisions.
-     */
-    getEntryRevisions: (model: CmsModel, id: string) => Promise<CmsEntry[]>;
-    /**
-     * List all unique values for a given field.
-     *
-     * @internal
-     */
-    getUniqueFieldValues: (model: CmsModel, params: GetUniqueFieldValuesParams) => Promise<CmsEntryUniqueValue[]>;
-    /**
-     * Lifecycle Events
-     */
-    onEntryBeforeCreate: Topic<OnEntryBeforeCreateTopicParams>;
-    onEntryAfterCreate: Topic<OnEntryAfterCreateTopicParams>;
-    onEntryCreateError: Topic<OnEntryCreateErrorTopicParams>;
-    onEntryRevisionBeforeCreate: Topic<OnEntryRevisionBeforeCreateTopicParams>;
-    onEntryRevisionAfterCreate: Topic<OnEntryRevisionAfterCreateTopicParams>;
-    onEntryRevisionCreateError: Topic<OnEntryCreateRevisionErrorTopicParams>;
-    onEntryBeforeUpdate: Topic<OnEntryBeforeUpdateTopicParams>;
-    onEntryAfterUpdate: Topic<OnEntryAfterUpdateTopicParams>;
-    onEntryUpdateError: Topic<OnEntryUpdateErrorTopicParams>;
-    onEntryBeforeMove: Topic<OnEntryBeforeMoveTopicParams>;
-    onEntryAfterMove: Topic<OnEntryAfterMoveTopicParams>;
-    onEntryMoveError: Topic<OnEntryMoveErrorTopicParams>;
-    onEntryBeforeDelete: Topic<OnEntryBeforeDeleteTopicParams>;
-    onEntryAfterDelete: Topic<OnEntryAfterDeleteTopicParams>;
-    onEntryDeleteError: Topic<OnEntryDeleteErrorTopicParams>;
-    onEntryRevisionBeforeDelete: Topic<OnEntryRevisionBeforeDeleteTopicParams>;
-    onEntryRevisionAfterDelete: Topic<OnEntryRevisionAfterDeleteTopicParams>;
-    onEntryRevisionDeleteError: Topic<OnEntryRevisionDeleteErrorTopicParams>;
-    onEntryBeforePublish: Topic<OnEntryBeforePublishTopicParams>;
-    onEntryAfterPublish: Topic<OnEntryAfterPublishTopicParams>;
-    onEntryPublishError: Topic<OnEntryPublishErrorTopicParams>;
-    onEntryBeforeRepublish: Topic<OnEntryBeforeRepublishTopicParams>;
-    onEntryAfterRepublish: Topic<OnEntryAfterRepublishTopicParams>;
-    onEntryRepublishError: Topic<OnEntryRepublishErrorTopicParams>;
-    onEntryBeforeUnpublish: Topic<OnEntryBeforeUnpublishTopicParams>;
-    onEntryAfterUnpublish: Topic<OnEntryAfterUnpublishTopicParams>;
-    onEntryUnpublishError: Topic<OnEntryUnpublishErrorTopicParams>;
-    onEntryBeforeGet: Topic<OnEntryBeforeGetTopicParams>;
-    onEntryBeforeList: Topic<EntryBeforeListTopicParams>;
-}
 /**
  * Parameters for CmsEntryResolverFactory.
  *
@@ -2365,6 +1414,7 @@ export interface CmsEntryContext {
  */
 interface CmsEntryResolverFactoryParams {
     model: CmsModel;
+    fieldTypePlugins: CmsFieldTypePlugins;
 }
 /**
  * A type for EntryResolvers. Used when creating get, list, update, publish, ...etc.
@@ -2372,7 +1422,7 @@ interface CmsEntryResolverFactoryParams {
  * @category GraphQL resolver
  * @category CmsEntry
  */
-export declare type CmsEntryResolverFactory<TSource = any, TArgs = any, TContext = CmsContext> = {
+export type CmsEntryResolverFactory<TSource = any, TArgs = any, TContext = CmsContext> = {
     (params: CmsEntryResolverFactoryParams): GraphQLFieldResolver<TSource, TArgs, TContext>;
 };
 /**
@@ -2382,7 +1432,7 @@ export declare type CmsEntryResolverFactory<TSource = any, TArgs = any, TContext
  */
 export interface BaseCmsSecurityPermission extends SecurityPermission {
     own?: boolean;
-    rwd: string | number;
+    rwd: string;
 }
 /**
  * A security permission for content model.
@@ -2602,6 +1652,28 @@ export interface CmsEntryStorageOperationsDeleteRevisionParams<T extends CmsStor
 export interface CmsEntryStorageOperationsDeleteParams {
     entry: CmsEntry;
 }
+export interface CmsEntryStorageOperationsMoveToBinParams<T extends CmsStorageEntry = CmsStorageEntry> {
+    /**
+     * The modified entry that is going to be saved as published.
+     * Entry is in its original form.
+     */
+    entry: CmsEntry;
+    /**
+     * The modified entry and prepared for the storage.
+     */
+    storageEntry: T;
+}
+export interface CmsEntryStorageOperationsRestoreFromBinParams<T extends CmsStorageEntry = CmsStorageEntry> {
+    /**
+     * The modified entry that is going to be saved as restored.
+     * Entry is in its original form.
+     */
+    entry: CmsEntry;
+    /**
+     * The modified entry and prepared for the storage.
+     */
+    storageEntry: T;
+}
 export interface CmsEntryStorageOperationsDeleteEntriesParams {
     entries: string[];
 }
@@ -2747,6 +1819,14 @@ export interface CmsEntryStorageOperations<T extends CmsStorageEntry = CmsStorag
      * Delete the entry.
      */
     delete: (model: CmsModel, params: CmsEntryStorageOperationsDeleteParams) => Promise<void>;
+    /**
+     * Move the entry to bin.
+     */
+    moveToBin: (model: CmsModel, params: CmsEntryStorageOperationsMoveToBinParams) => Promise<void>;
+    /**
+     * Restore the entry from the bin.
+     */
+    restoreFromBin: (model: CmsModel, params: CmsEntryStorageOperationsRestoreFromBinParams<T>) => Promise<T>;
     /**
      * Delete multiple entries, with a limit on how much can be deleted in one call.
      */