payload 1.6.32 → 1.7.0

package/dist/auth/getExecuteStaticAccess.js

@@ -15,31 +15,33 @@ const getExecuteStaticAccess = ({ config, Model }) => async (req, res, next) =>
             if (typeof accessResult === 'object') {
                 const filename = decodeURI(req.path).replace(/^\/|\/$/g, '');
                 const queryToBuild = {
-                    where: {
-                        and: [
-                            {
-                                or: [
-                                    {
-                                        filename: {
-                                            equals: filename,
-                                        },
+                    and: [
+                        {
+                            or: [
+                                {
+                                    filename: {
+                                        equals: filename,
                                     },
-                                ],
-                            },
-                            accessResult,
-                        ],
-                    },
+                                },
+                            ],
+                        },
+                        accessResult,
+                    ],
                 };
                 if (config.upload.imageSizes) {
                     config.upload.imageSizes.forEach(({ name }) => {
-                        queryToBuild.where.and[0].or.push({
+                        queryToBuild.and[0].or.push({
                             [`sizes.${name}.filename`]: {
                                 equals: filename,
                             },
                         });
                     });
                 }
-                const query = await Model.buildQuery(queryToBuild, req.locale);
+                const query = await Model.buildQuery({
+                    where: queryToBuild,
+                    req,
+                    overrideAccess: true,
+                });
                 const doc = await Model.findOne(query);
                 if (!doc) {
                     throw new errors_1.Forbidden(req.t);

package/dist/auth/getExecuteStaticAccess.js.map

@@ -1 +1 @@
-{"version":3,"file":"getExecuteStaticAccess.js","sourceRoot":"","sources":["../../src/auth/getExecuteStaticAccess.ts"],"names":[],"mappings":";;;;;AAEA,oEAA4C;AAC5C,sCAAsC;AAGtC,MAAM,sBAAsB,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACrH,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;QAC5B,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI;QACF,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,MAAM,YAAY,GAAG,MAAM,IAAA,uBAAa,EAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEjG,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;gBACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAE7D,MAAM,YAAY,GAAqB;oBACrC,KAAK,EAAE;wBACL,GAAG,EAAE;4BACH;gCACE,EAAE,EAAE;oCACF;wCACE,QAAQ,EAAE;4CACR,MAAM,EAAE,QAAQ;yCACjB;qCACF;iCACF;6BACF;4BACD,YAAY;yBACb;qBACF;iBACF,CAAC;gBAEF,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;oBAC5B,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;wBAC5C,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;4BAChC,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE;gCAC1B,MAAM,EAAE,QAAQ;6BACjB;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;gBAED,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC/D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAEvC,IAAI,CAAC,GAAG,EAAE;oBACR,MAAM,IAAI,kBAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC5B;aACF;SACF;QAED,OAAO,IAAI,EAAE,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC,CAAC;AAEF,kBAAe,sBAAsB,CAAC"}
+{"version":3,"file":"getExecuteStaticAccess.js","sourceRoot":"","sources":["../../src/auth/getExecuteStaticAccess.ts"],"names":[],"mappings":";;;;;AAEA,oEAA4C;AAC5C,sCAAsC;AAGtC,MAAM,sBAAsB,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACrH,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;QAC5B,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,IAAI;QACF,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,MAAM,YAAY,GAAG,MAAM,IAAA,uBAAa,EAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEjG,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;gBACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAE7D,MAAM,YAAY,GAAU;oBAC1B,GAAG,EAAE;wBACH;4BACE,EAAE,EAAE;gCACF;oCACE,QAAQ,EAAE;wCACR,MAAM,EAAE,QAAQ;qCACjB;iCACF;6BACF;yBACF;wBACD,YAAY;qBACb;iBACF,CAAC;gBAEF,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;oBAC5B,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;wBAC5C,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;4BAC1B,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE;gCAC1B,MAAM,EAAE,QAAQ;6BACjB;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;gBAED,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;oBACnC,KAAK,EAAE,YAAY;oBACnB,GAAG;oBACH,cAAc,EAAE,IAAI;iBACrB,CAAC,CAAC;gBAEH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAEvC,IAAI,CAAC,GAAG,EAAE;oBACR,MAAM,IAAI,kBAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC5B;aACF;SACF;QAED,OAAO,IAAI,EAAE,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC,CAAC;AAEF,kBAAe,sBAAsB,CAAC"}

package/dist/auth/strategies/apiKey.js

@@ -46,7 +46,6 @@ exports.default = (payload, { Model, config }) => {
                 },
                 req: req,
                 overrideAccess: true,
-                queryHiddenFields: true,
                 depth: config.auth.depth,
             });
             if (userQuery.docs && userQuery.docs.length > 0) {

package/dist/auth/strategies/apiKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiKey.js","sourceRoot":"","sources":["../../../src/auth/strategies/apiKey.ts"],"names":[],"mappings":";;;;;AAAA,kFAAmD;AACnD,oDAA4B;AAG5B,6EAAqD;AAErD,kBAAe,CAAC,OAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAkB,EAAE;IACrE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,WAAW;KAClC,CAAC;IAEF,OAAO,IAAI,+BAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAChE,MAAM,WAAW,GAAG,gBAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC;aAClD,MAAM,CAAC,MAAM,CAAC;aACd,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjB,IAAI;YACF,MAAM,KAAK,GAA2B,EAAE,CAAC;YACzC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;gBACtB,KAAK,CAAC,GAAG,GAAG;oBACV;wBACE,yBAAyB;wBACzB,WAAW,EAAE;4BACX,MAAM,EAAE,WAAW;yBACpB;qBACF;oBACD;wBACE,SAAS,EAAE;4BACT,UAAU,EAAE,KAAK;yBAClB;qBACF;iBACF,CAAC;aACH;iBAAM;gBACL,KAAK,CAAC,WAAW,GAAG;oBAClB,MAAM,EAAE,WAAW;iBACpB,CAAC;aACH;YACD,MAAM,SAAS,GAAG,MAAM,IAAA,cAAI,EAAC;gBAC3B,KAAK;gBACL,UAAU,EAAE;oBACV,KAAK;oBACL,MAAM;iBACP;gBACD,GAAG,EAAE,GAAqB;gBAC1B,cAAc,EAAE,IAAI;gBACpB,iBAAiB,EAAE,IAAI;gBACvB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK;aACzB,CAAC,CAAC;YAEH,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;gBAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3B,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAClB;iBAAM;gBACL,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACnB;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACnB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"apiKey.js","sourceRoot":"","sources":["../../../src/auth/strategies/apiKey.ts"],"names":[],"mappings":";;;;;AAAA,kFAAmD;AACnD,oDAA4B;AAG5B,6EAAqD;AAErD,kBAAe,CAAC,OAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAkB,EAAE;IACrE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,WAAW;KAClC,CAAC;IAEF,OAAO,IAAI,+BAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAChE,MAAM,WAAW,GAAG,gBAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC;aAClD,MAAM,CAAC,MAAM,CAAC;aACd,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjB,IAAI;YACF,MAAM,KAAK,GAA2B,EAAE,CAAC;YACzC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;gBACtB,KAAK,CAAC,GAAG,GAAG;oBACV;wBACE,yBAAyB;wBACzB,WAAW,EAAE;4BACX,MAAM,EAAE,WAAW;yBACpB;qBACF;oBACD;wBACE,SAAS,EAAE;4BACT,UAAU,EAAE,KAAK;yBAClB;qBACF;iBACF,CAAC;aACH;iBAAM;gBACL,KAAK,CAAC,WAAW,GAAG;oBAClB,MAAM,EAAE,WAAW;iBACpB,CAAC;aACH;YACD,MAAM,SAAS,GAAG,MAAM,IAAA,cAAI,EAAC;gBAC3B,KAAK;gBACL,UAAU,EAAE;oBACV,KAAK;oBACL,MAAM;iBACP;gBACD,GAAG,EAAE,GAAqB;gBAC1B,cAAc,EAAE,IAAI;gBACpB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK;aACzB,CAAC,CAAC;YAEH,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;gBAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3B,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAClB;iBAAM;gBACL,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACnB;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACnB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/collections/buildSchema.js

@@ -21,7 +21,7 @@ const buildCollectionSchema = (collection, config, schemaOptions = {}) => {
         schema.index({ createdAt: 1 });
     }
     schema.plugin(mongoose_paginate_v2_1.default, { useEstimatedCount: true })
-        .plugin(buildQuery_1.default);
+        .plugin((0, buildQuery_1.default)({ collectionSlug: collection.slug }));
     return schema;
 };
 exports.default = buildCollectionSchema;

package/dist/collections/buildSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildSchema.js","sourceRoot":"","sources":["../../src/collections/buildSchema.ts"],"names":[],"mappings":";;;;;AAAA,gFAA4C;AAG5C,wEAAsD;AACtD,0EAAkD;AAGlD,MAAM,qBAAqB,GAAG,CAAC,UAAqC,EAAE,MAAuB,EAAE,aAAa,GAAG,EAAE,EAAU,EAAE;IAC3H,MAAM,MAAM,GAAG,IAAA,qBAAW,EACxB,MAAM,EACN,UAAU,CAAC,MAAM,EACjB;QACE,aAAa,EAAE,OAAO,CAAC,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAA,KAAK,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC9F,OAAO,EAAE;YACP,UAAU,EAAE,UAAU,CAAC,UAAU,KAAK,KAAK;YAC3C,QAAQ,EAAE,KAAK;YACf,GAAG,aAAa;SACjB;QACD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;KAChD,CACF,CAAC;IAEF,IAAI,MAAM,CAAC,mBAAmB,IAAI,UAAU,CAAC,UAAU,KAAK,KAAK,EAAE;QACjE,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;KAChC;IAED,MAAM,CAAC,MAAM,CAAC,8BAAQ,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;SACjD,MAAM,CAAC,oBAAgB,CAAC,CAAC;IAE5B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}
+{"version":3,"file":"buildSchema.js","sourceRoot":"","sources":["../../src/collections/buildSchema.ts"],"names":[],"mappings":";;;;;AAAA,gFAA4C;AAG5C,wEAAyD;AACzD,0EAAkD;AAGlD,MAAM,qBAAqB,GAAG,CAAC,UAAqC,EAAE,MAAuB,EAAE,aAAa,GAAG,EAAE,EAAU,EAAE;IAC3H,MAAM,MAAM,GAAG,IAAA,qBAAW,EACxB,MAAM,EACN,UAAU,CAAC,MAAM,EACjB;QACE,aAAa,EAAE,OAAO,CAAC,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAA,KAAK,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC9F,OAAO,EAAE;YACP,UAAU,EAAE,UAAU,CAAC,UAAU,KAAK,KAAK;YAC3C,QAAQ,EAAE,KAAK;YACf,GAAG,aAAa;SACjB;QACD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;KAChD,CACF,CAAC;IAEF,IAAI,MAAM,CAAC,mBAAmB,IAAI,UAAU,CAAC,UAAU,KAAK,KAAK,EAAE;QACjE,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;KAChC;IAED,MAAM,CAAC,MAAM,CAAC,8BAAQ,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;SACjD,MAAM,CAAC,IAAA,oBAAmB,EAAC,EAAE,cAAc,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEpE,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}

package/dist/collections/config/sanitize.js

@@ -13,7 +13,6 @@ const accountLock_1 = __importDefault(require("../../auth/baseFields/accountLock
 const getBaseFields_1 = __importDefault(require("../../uploads/getBaseFields"));
 const formatLabels_1 = require("../../utilities/formatLabels");
 const defaults_1 = require("./defaults");
-const defaults_2 = require("../../versions/defaults");
 const baseFields_1 = __importDefault(require("../../versions/baseFields"));
 const TimestampsRequired_1 = __importDefault(require("../../errors/TimestampsRequired"));
 const mergeBaseFields_1 = __importDefault(require("../../fields/mergeBaseFields"));
@@ -37,11 +36,13 @@ const sanitizeCollection = (config, collection) => {
                     autosave: false,
                 };
             }
-            if (sanitized.versions.drafts.autosave === true)
-                sanitized.versions.drafts.autosave = {};
+            if (sanitized.versions.drafts.autosave === true) {
+                sanitized.versions.drafts.autosave = {
+                    interval: 2000,
+                };
+            }
             sanitized.fields = (0, mergeBaseFields_1.default)(sanitized.fields, baseFields_1.default);
         }
-        sanitized.versions = (0, deepmerge_1.default)(defaults_2.versionCollectionDefaults, sanitized.versions);
     }
     if (sanitized.upload) {
         if (sanitized.upload === true)

package/dist/collections/config/sanitize.js.map

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

package/dist/collections/config/schema.js

@@ -35,6 +35,7 @@ const collectionSchema = joi_1.default.object().keys({
     }),
     timestamps: joi_1.default.boolean(),
     admin: joi_1.default.object({
+        hidden: joi_1.default.alternatives().try(joi_1.default.boolean(), joi_1.default.func()),
         useAsTitle: joi_1.default.string(),
         defaultColumns: joi_1.default.array().items(joi_1.default.string()),
         listSearchableFields: joi_1.default.array().items(joi_1.default.string()),

package/dist/collections/config/schema.js.map

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

package/dist/collections/config/types.d.ts

@@ -7,17 +7,18 @@ import { Response } from 'express';
 import { Access, Endpoint, EntityDescription, GeneratePreviewURL } from '../../config/types';
 import { Field } from '../../fields/config/types';
 import { PayloadRequest } from '../../express/types';
-import { Auth, IncomingAuthType } from '../../auth/types';
+import { Auth, IncomingAuthType, User } from '../../auth/types';
 import { IncomingUploadType, Upload } from '../../uploads/types';
 import { IncomingCollectionVersions, SanitizedCollectionVersions } from '../../versions/types';
 import { Config as GeneratedTypes } from '../../generated-types';
+import { BuildQueryArgs } from '../../mongoose/buildQuery';
 type Register<T = any> = (doc: T, password: string) => T;
 interface PassportLocalModel {
     register: Register;
     authenticate: any;
 }
 export interface CollectionModel extends Model<any>, PaginateModel<any>, AggregatePaginateModel<any>, PassportLocalModel {
-    buildQuery: (query: unknown, locale: string, queryHiddenFields?: boolean) => Record<string, unknown>;
+    buildQuery: (args: BuildQueryArgs) => Promise<Record<string, unknown>>;
 }
 export interface AuthCollectionModel extends CollectionModel {
     resetPasswordToken: string;
@@ -129,6 +130,12 @@ type BeforeDuplicateArgs<T> = {
 };
 export type BeforeDuplicate<T = any> = (args: BeforeDuplicateArgs<T>) => T | Promise<T>;
 export type CollectionAdminOptions = {
+    /**
+     * Exclude the collection from the admin nav and routes
+     */
+    hidden?: ((args: {
+        user: User;
+    }) => boolean) | boolean;
     /**
      * Field to use as title in Edit view and first column in List view
      */

package/dist/collections/initLocal.js

@@ -50,7 +50,8 @@ function initCollectionsLocal(ctx) {
         }
         if (collection.versions) {
             const versionModelName = (0, getVersionsModelName_1.getVersionsModelName)(collection);
-            const versionSchema = (0, buildSchema_2.default)(ctx.config, (0, buildCollectionFields_1.buildVersionCollectionFields)(collection), {
+            const versionCollectionFields = (0, buildCollectionFields_1.buildVersionCollectionFields)(collection);
+            const versionSchema = (0, buildSchema_2.default)(ctx.config, versionCollectionFields, {
                 disableUnique: true,
                 draftsEnabled: true,
                 options: {
@@ -59,7 +60,7 @@ function initCollectionsLocal(ctx) {
                 },
             });
             versionSchema.plugin(mongoose_paginate_v2_1.default, { useEstimatedCount: true })
-                .plugin(buildQuery_1.default);
+                .plugin((0, buildQuery_1.default)({ collectionSlug: collection.slug, versionsFields: versionCollectionFields }));
             if ((_a = collection.versions) === null || _a === void 0 ? void 0 : _a.drafts) {
                 versionSchema.plugin(mongoose_aggregate_paginate_v2_1.default);
             }

package/dist/collections/initLocal.js.map

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

package/dist/collections/operations/delete.js

@@ -30,19 +30,17 @@ async function deleteOperation(incomingArgs) {
     // /////////////////////////////////////
     // Access
     // /////////////////////////////////////
-    const queryToBuild = {
-        where: {
-            and: [],
-        },
+    let queryToBuild = {
+        and: [],
     };
     if (where) {
-        queryToBuild.where = {
+        queryToBuild = {
             and: [],
             ...where,
         };
         if (Array.isArray(where.AND)) {
-            queryToBuild.where.and = [
-                ...queryToBuild.where.and,
+            queryToBuild.and = [
+                ...queryToBuild.and,
                 ...where.AND,
             ];
         }
@@ -51,10 +49,14 @@ async function deleteOperation(incomingArgs) {
     if (!overrideAccess) {
         accessResult = await (0, executeAccess_1.default)({ req }, collectionConfig.access.delete);
         if ((0, types_1.hasWhereAccessResult)(accessResult)) {
-            queryToBuild.where.and.push(accessResult);
+            queryToBuild.and.push(accessResult);
         }
     }
-    const query = await Model.buildQuery(queryToBuild, locale);
+    const query = await Model.buildQuery({
+        where: queryToBuild,
+        req,
+        overrideAccess,
+    });
     // /////////////////////////////////////
     // Retrieve documents
     // /////////////////////////////////////

package/dist/collections/operations/delete.js.map

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

package/dist/collections/operations/deleteByID.js

@@ -22,7 +22,7 @@ async function deleteByID(incomingArgs) {
             operation: 'delete',
         })) || args;
     }, Promise.resolve());
-    const { depth, collection: { Model, config: collectionConfig, }, id, req, req: { t, locale, payload, payload: { config, preferences, }, }, overrideAccess, showHiddenFields, } = args;
+    const { depth, collection: { Model, config: collectionConfig, }, id, req, req: { t, payload, payload: { config, preferences, }, }, overrideAccess, showHiddenFields, } = args;
     // /////////////////////////////////////
     // Access
     // /////////////////////////////////////
@@ -42,20 +42,22 @@ async function deleteByID(incomingArgs) {
     // Retrieve document
     // /////////////////////////////////////
     const queryToBuild = {
-        where: {
-            and: [
-                {
-                    id: {
-                        equals: id,
-                    },
+        and: [
+            {
+                id: {
+                    equals: id,
                 },
-            ],
-        },
+            },
+        ],
     };
     if ((0, types_1.hasWhereAccessResult)(accessResults)) {
-        queryToBuild.where.and.push(accessResults);
+        queryToBuild.and.push(accessResults);
     }
-    const query = await Model.buildQuery(queryToBuild, locale);
+    const query = await Model.buildQuery({
+        req,
+        where: queryToBuild,
+        overrideAccess,
+    });
     const docToDelete = await Model.findOne(query);
     if (!docToDelete && !hasWhereAccess)
         throw new errors_1.NotFound(t);

package/dist/collections/operations/deleteByID.js.map

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

package/dist/collections/operations/find.d.ts

@@ -15,7 +15,6 @@ export type Arguments = {
     disableErrors?: boolean;
     pagination?: boolean;
     showHiddenFields?: boolean;
-    queryHiddenFields?: boolean;
     draft?: boolean;
 };
 declare function find<T extends TypeWithID & Record<string, unknown>>(incomingArgs: Arguments): Promise<PaginatedDocs<T>>;

package/dist/collections/operations/find.js

@@ -23,24 +23,22 @@ async function find(incomingArgs) {
             operation: 'read',
         })) || args;
     }, Promise.resolve());
-    const { where, page, limit, depth, currentDepth, draft: draftsEnabled, collection, collection: { Model, config: collectionConfig, }, req, req: { locale, payload, }, overrideAccess, disableErrors, showHiddenFields, queryHiddenFields, pagination = true, } = args;
+    const { where, page, limit, depth, currentDepth, draft: draftsEnabled, collection, collection: { Model, config: collectionConfig, }, req, req: { locale, payload, }, overrideAccess, disableErrors, showHiddenFields, pagination = true, } = args;
     // /////////////////////////////////////
     // Access
     // /////////////////////////////////////
-    const queryToBuild = {
-        where: {
-            and: [],
-        },
+    let queryToBuild = {
+        and: [],
     };
     let useEstimatedCount = false;
     if (where) {
-        queryToBuild.where = {
+        queryToBuild = {
             and: [],
             ...where,
         };
         if (Array.isArray(where.AND)) {
-            queryToBuild.where.and = [
-                ...queryToBuild.where.and,
+            queryToBuild.and = [
+                ...queryToBuild.and,
                 ...where.AND,
             ];
         }
@@ -66,10 +64,14 @@ async function find(incomingArgs) {
             };
         }
         if ((0, types_1.hasWhereAccessResult)(accessResult)) {
-            queryToBuild.where.and.push(accessResult);
+            queryToBuild.and.push(accessResult);
         }
     }
-    const query = await Model.buildQuery(queryToBuild, locale, queryHiddenFields);
+    const query = await Model.buildQuery({
+        req,
+        where: queryToBuild,
+        overrideAccess,
+    });
     // /////////////////////////////////////
     // Find
     // /////////////////////////////////////
@@ -103,7 +105,8 @@ async function find(incomingArgs) {
         result = await (0, queryDrafts_1.queryDrafts)({
             accessResult,
             collection,
-            locale,
+            req,
+            overrideAccess,
             paginationOptions,
             payload,
             where,

package/dist/collections/operations/find.js.map

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

package/dist/collections/operations/findByID.js

@@ -24,7 +24,7 @@ async function findByID(incomingArgs) {
             operation: 'read',
         })) || args;
     }, Promise.resolve());
-    const { depth, collection: { Model, config: collectionConfig, }, id, req, req: { t, locale, payload, }, disableErrors, currentDepth, overrideAccess = false, showHiddenFields, draft: draftEnabled = false, } = args;
+    const { depth, collection: { Model, config: collectionConfig, }, id, req, req: { t, payload, }, disableErrors, currentDepth, overrideAccess = false, showHiddenFields, draft: draftEnabled = false, } = args;
     // /////////////////////////////////////
     // Access
     // /////////////////////////////////////
@@ -33,20 +33,22 @@ async function findByID(incomingArgs) {
     if (accessResult === false)
         return null;
     const queryToBuild = {
-        where: {
-            and: [
-                {
-                    _id: {
-                        equals: id,
-                    },
+        and: [
+            {
+                _id: {
+                    equals: id,
                 },
-            ],
-        },
+            },
+        ],
     };
     if ((0, types_1.hasWhereAccessResult)(accessResult)) {
-        queryToBuild.where.and.push(accessResult);
+        queryToBuild.and.push(accessResult);
     }
-    const query = await Model.buildQuery(queryToBuild, locale);
+    const query = await Model.buildQuery({
+        where: queryToBuild,
+        req,
+        overrideAccess,
+    });
     // /////////////////////////////////////
     // Find by ID
     // /////////////////////////////////////
@@ -84,7 +86,8 @@ async function findByID(incomingArgs) {
             entityType: 'collection',
             doc: result,
             accessResult,
-            locale,
+            req,
+            overrideAccess,
         });
     }
     // /////////////////////////////////////

package/dist/collections/operations/findByID.js.map

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

package/dist/collections/operations/findVersionByID.js

@@ -11,7 +11,7 @@ const executeAccess_1 = __importDefault(require("../../auth/executeAccess"));
 const types_1 = require("../../auth/types");
 const afterRead_1 = require("../../fields/hooks/afterRead");
 async function findVersionByID(args) {
-    const { depth, collection: { config: collectionConfig, }, id, req, req: { t, locale, payload, }, disableErrors, currentDepth, overrideAccess, showHiddenFields, } = args;
+    const { depth, collection: { config: collectionConfig, }, id, req, req: { t, payload, }, disableErrors, currentDepth, overrideAccess, showHiddenFields, } = args;
     if (!id) {
         throw new errors_1.APIError('Missing ID of version.', http_status_1.default.BAD_REQUEST);
     }
@@ -25,20 +25,22 @@ async function findVersionByID(args) {
         return null;
     const hasWhereAccess = typeof accessResults === 'object';
     const queryToBuild = {
-        where: {
-            and: [
-                {
-                    _id: {
-                        equals: id,
-                    },
+        and: [
+            {
+                _id: {
+                    equals: id,
                 },
-            ],
-        },
+            },
+        ],
     };
     if ((0, types_1.hasWhereAccessResult)(accessResults)) {
-        queryToBuild.where.and.push(accessResults);
+        queryToBuild.and.push(accessResults);
     }
-    const query = await VersionsModel.buildQuery(queryToBuild, locale);
+    const query = await VersionsModel.buildQuery({
+        where: queryToBuild,
+        req,
+        overrideAccess,
+    });
     // /////////////////////////////////////
     // Find by ID
     // /////////////////////////////////////