payload 1.6.32 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/admin/components/Routes.js +8 -3
- package/dist/admin/components/Routes.js.map +1 -1
- package/dist/admin/components/elements/Nav/index.js +8 -4
- package/dist/admin/components/elements/Nav/index.js.map +1 -1
- package/dist/admin/components/elements/PreviewButton/index.js +30 -12
- package/dist/admin/components/elements/PreviewButton/index.js.map +1 -1
- package/dist/admin/components/elements/Status/index.js +5 -4
- package/dist/admin/components/elements/Status/index.js.map +1 -1
- package/dist/admin/components/forms/Form/index.js +7 -0
- package/dist/admin/components/forms/Form/index.js.map +1 -1
- package/dist/admin/components/forms/Form/initContextState.js +1 -0
- package/dist/admin/components/forms/Form/initContextState.js.map +1 -1
- package/dist/admin/components/forms/Form/types.d.ts +1 -0
- package/dist/admin/components/forms/field-types/Array/index.js +1 -2
- package/dist/admin/components/forms/field-types/Array/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Blocks/BlocksDrawer/index.js +11 -1
- package/dist/admin/components/forms/field-types/Blocks/BlocksDrawer/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Blocks/index.js +1 -2
- package/dist/admin/components/forms/field-types/Blocks/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Textarea/index.scss +6 -5
- package/dist/admin/components/utilities/DocumentInfo/index.d.ts +1 -1
- package/dist/admin/components/utilities/DocumentInfo/index.js +18 -12
- package/dist/admin/components/utilities/DocumentInfo/index.js.map +1 -1
- package/dist/admin/components/utilities/DocumentInfo/types.d.ts +0 -3
- package/dist/admin/components/views/Dashboard/Default.js +8 -4
- package/dist/admin/components/views/Dashboard/Default.js.map +1 -1
- package/dist/admin/components/views/Dashboard/index.js +2 -1
- package/dist/admin/components/views/Dashboard/index.js.map +1 -1
- package/dist/admin/components/views/Dashboard/types.d.ts +2 -1
- package/dist/admin/components/views/Global/index.scss +15 -5
- package/dist/admin/components/views/Version/Version.js +5 -2
- package/dist/admin/components/views/Version/Version.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Default.js +5 -2
- package/dist/admin/components/views/collections/Edit/Default.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Upload/index.js +7 -4
- package/dist/admin/components/views/collections/Edit/Upload/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/index.scss +11 -3
- package/dist/admin/components/views/collections/List/RelationshipProvider/index.js +11 -4
- package/dist/admin/components/views/collections/List/RelationshipProvider/index.js.map +1 -1
- package/dist/auth/getExecuteStaticAccess.js +17 -15
- package/dist/auth/getExecuteStaticAccess.js.map +1 -1
- package/dist/auth/strategies/apiKey.js +0 -1
- package/dist/auth/strategies/apiKey.js.map +1 -1
- package/dist/collections/buildSchema.js +1 -1
- package/dist/collections/buildSchema.js.map +1 -1
- package/dist/collections/config/sanitize.js +5 -4
- package/dist/collections/config/sanitize.js.map +1 -1
- package/dist/collections/config/schema.js +1 -0
- package/dist/collections/config/schema.js.map +1 -1
- package/dist/collections/config/types.d.ts +9 -2
- package/dist/collections/initLocal.js +3 -2
- package/dist/collections/initLocal.js.map +1 -1
- package/dist/collections/operations/delete.js +11 -9
- package/dist/collections/operations/delete.js.map +1 -1
- package/dist/collections/operations/deleteByID.js +13 -11
- package/dist/collections/operations/deleteByID.js.map +1 -1
- package/dist/collections/operations/find.d.ts +0 -1
- package/dist/collections/operations/find.js +14 -11
- package/dist/collections/operations/find.js.map +1 -1
- package/dist/collections/operations/findByID.js +15 -12
- package/dist/collections/operations/findByID.js.map +1 -1
- package/dist/collections/operations/findVersionByID.js +13 -11
- package/dist/collections/operations/findVersionByID.js.map +1 -1
- package/dist/collections/operations/findVersions.js +9 -5
- package/dist/collections/operations/findVersions.js.map +1 -1
- package/dist/collections/operations/local/find.d.ts +0 -1
- package/dist/collections/operations/local/find.js +1 -2
- package/dist/collections/operations/local/find.js.map +1 -1
- package/dist/collections/operations/restoreVersion.js +12 -10
- package/dist/collections/operations/restoreVersion.js.map +1 -1
- package/dist/collections/operations/update.js +13 -10
- package/dist/collections/operations/update.js.map +1 -1
- package/dist/collections/operations/updateByID.js +12 -10
- package/dist/collections/operations/updateByID.js.map +1 -1
- package/dist/config/schema.js +1 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/config/types.d.ts +7 -1
- package/dist/email/build.d.ts +1 -1
- package/dist/email/build.js +6 -3
- package/dist/email/build.js.map +1 -1
- package/dist/email/defaults.d.ts +2 -0
- package/dist/email/defaults.js +8 -0
- package/dist/email/defaults.js.map +1 -0
- package/dist/email/mockHandler.js +3 -2
- package/dist/email/mockHandler.js.map +1 -1
- package/dist/email/sendEmail.js +1 -1
- package/dist/email/sendEmail.js.map +1 -1
- package/dist/errors/QueryError.d.ts +8 -0
- package/dist/errors/QueryError.js +15 -0
- package/dist/errors/QueryError.js.map +1 -0
- package/dist/fields/validations.d.ts +1 -1
- package/dist/globals/buildModel.js +1 -1
- package/dist/globals/buildModel.js.map +1 -1
- package/dist/globals/config/sanitize.js +5 -5
- package/dist/globals/config/sanitize.js.map +1 -1
- package/dist/globals/config/schema.js +1 -0
- package/dist/globals/config/schema.js.map +1 -1
- package/dist/globals/config/types.d.ts +8 -1
- package/dist/globals/initLocal.js +3 -2
- package/dist/globals/initLocal.js.map +1 -1
- package/dist/globals/operations/findOne.js +15 -11
- package/dist/globals/operations/findOne.js.map +1 -1
- package/dist/globals/operations/findVersionByID.js +14 -11
- package/dist/globals/operations/findVersionByID.js.map +1 -1
- package/dist/globals/operations/findVersions.js +10 -5
- package/dist/globals/operations/findVersions.js.map +1 -1
- package/dist/globals/operations/update.js +14 -11
- package/dist/globals/operations/update.js.map +1 -1
- package/dist/graphql/errorHandler.d.ts +1 -8
- package/dist/graphql/errorHandler.js +2 -9
- package/dist/graphql/errorHandler.js.map +1 -1
- package/dist/graphql/graphQLHandler.d.ts +1 -6
- package/dist/graphql/graphQLHandler.js +24 -7
- package/dist/graphql/graphQLHandler.js.map +1 -1
- package/dist/graphql/registerSchema.js +0 -18
- package/dist/graphql/registerSchema.js.map +1 -1
- package/dist/initHTTP.js +1 -1
- package/dist/initHTTP.js.map +1 -1
- package/dist/mongoose/buildQuery.d.ts +76 -2
- package/dist/mongoose/buildQuery.js +274 -149
- package/dist/mongoose/buildQuery.js.map +1 -1
- package/dist/mongoose/sanitizeQueryValue.d.ts +12 -0
- package/dist/mongoose/{sanitizeFormattedValue.js → sanitizeQueryValue.js} +27 -26
- package/dist/mongoose/sanitizeQueryValue.js.map +1 -0
- package/dist/payload.d.ts +8 -6
- package/dist/payload.js +6 -2
- package/dist/payload.js.map +1 -1
- package/dist/translations/cs.json +1 -0
- package/dist/translations/de.json +1 -0
- package/dist/translations/en.json +1 -0
- package/dist/translations/es.json +1 -0
- package/dist/translations/fr.json +1 -0
- package/dist/translations/hr.json +1 -0
- package/dist/translations/hu.json +1 -0
- package/dist/translations/index.d.ts +21 -0
- package/dist/translations/it.json +1 -0
- package/dist/translations/ja.json +1 -0
- package/dist/translations/my.json +1 -0
- package/dist/translations/nb.json +1 -0
- package/dist/translations/nl.json +1 -0
- package/dist/translations/pl.json +1 -0
- package/dist/translations/pt.json +1 -0
- package/dist/translations/ru.json +1 -0
- package/dist/translations/sv.json +1 -0
- package/dist/translations/th.json +1 -0
- package/dist/translations/tr.json +1 -0
- package/dist/translations/ua.json +1 -0
- package/dist/translations/vi.json +1 -0
- package/dist/translations/zh.json +1 -0
- package/dist/uploads/generateFileData.js +4 -2
- package/dist/uploads/generateFileData.js.map +1 -1
- package/dist/utilities/flattenWhereConstraints.d.ts +2 -2
- package/dist/utilities/flattenWhereConstraints.js +12 -13
- package/dist/utilities/flattenWhereConstraints.js.map +1 -1
- package/dist/utilities/getEntityPolicies.d.ts +6 -10
- package/dist/utilities/getEntityPolicies.js +25 -15
- package/dist/utilities/getEntityPolicies.js.map +1 -1
- package/dist/versions/drafts/queryDrafts.d.ts +4 -3
- package/dist/versions/drafts/queryDrafts.js +11 -9
- package/dist/versions/drafts/queryDrafts.js.map +1 -1
- package/dist/versions/drafts/replaceWithDraftIfAvailable.d.ts +4 -2
- package/dist/versions/drafts/replaceWithDraftIfAvailable.js +16 -13
- package/dist/versions/drafts/replaceWithDraftIfAvailable.js.map +1 -1
- package/docs/access-control/collections.mdx +1 -1
- package/docs/admin/hooks.mdx +0 -1
- package/docs/configuration/collections.mdx +12 -11
- package/docs/configuration/express.mdx +34 -0
- package/docs/configuration/globals.mdx +5 -4
- package/docs/configuration/localization.mdx +9 -0
- package/docs/fields/date.mdx +32 -32
- package/docs/fields/textarea.mdx +1 -1
- package/docs/getting-started/installation.mdx +2 -0
- package/docs/hooks/collections.mdx +7 -1
- package/docs/queries/overview.mdx +1 -1
- package/docs/rest-api/overview.mdx +1 -1
- package/package.json +4 -4
- package/dist/mongoose/sanitizeFormattedValue.d.ts +0 -2
- package/dist/mongoose/sanitizeFormattedValue.js.map +0 -1
- package/dist/versions/defaults.d.ts +0 -3
- package/dist/versions/defaults.js +0 -18
- package/dist/versions/defaults.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanitize.js","sourceRoot":"","sources":["../../../src/globals/config/sanitize.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"sanitize.js","sourceRoot":"","sources":["../../../src/globals/config/sanitize.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const globalSchema = joi_1.default.object().keys({
|
|
|
10
10
|
slug: joi_1.default.string().required(),
|
|
11
11
|
label: joi_1.default.alternatives().try(joi_1.default.string(), joi_1.default.object().pattern(joi_1.default.string(), [joi_1.default.string()])),
|
|
12
12
|
admin: joi_1.default.object({
|
|
13
|
+
hidden: joi_1.default.alternatives().try(joi_1.default.boolean(), joi_1.default.func()),
|
|
13
14
|
group: joi_1.default.alternatives().try(joi_1.default.string(), joi_1.default.object().pattern(joi_1.default.string(), [joi_1.default.string()])),
|
|
14
15
|
hideAPIURL: joi_1.default.boolean(),
|
|
15
16
|
description: joi_1.default.alternatives().try(joi_1.default.string(), componentSchema_1.componentSchema),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/globals/config/schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/globals/config/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { Document, Model } from 'mongoose';
|
|
3
3
|
import { DeepRequired } from 'ts-essentials';
|
|
4
4
|
import { GraphQLNonNull, GraphQLObjectType } from 'graphql';
|
|
5
|
+
import { User } from '../../auth/types';
|
|
5
6
|
import { PayloadRequest } from '../../express/types';
|
|
6
7
|
import { Access, Endpoint, EntityDescription, GeneratePreviewURL } from '../../config/types';
|
|
7
8
|
import { Field } from '../../fields/config/types';
|
|
@@ -40,6 +41,12 @@ export interface GlobalModel extends Model<Document> {
|
|
|
40
41
|
buildQuery: (query: unknown, locale?: string) => Record<string, unknown>;
|
|
41
42
|
}
|
|
42
43
|
export type GlobalAdminOptions = {
|
|
44
|
+
/**
|
|
45
|
+
* Exclude the global from the admin nav and routes
|
|
46
|
+
*/
|
|
47
|
+
hidden?: ((args: {
|
|
48
|
+
user: User;
|
|
49
|
+
}) => boolean) | boolean;
|
|
43
50
|
/**
|
|
44
51
|
* Place globals into a navigational group
|
|
45
52
|
* */
|
|
@@ -19,7 +19,8 @@ function initGlobalsLocal(ctx) {
|
|
|
19
19
|
ctx.config.globals.forEach((global) => {
|
|
20
20
|
if (global.versions) {
|
|
21
21
|
const versionModelName = (0, getVersionsModelName_1.getVersionsModelName)(global);
|
|
22
|
-
const
|
|
22
|
+
const versionGlobalFields = (0, buildGlobalFields_1.buildVersionGlobalFields)(global);
|
|
23
|
+
const versionSchema = (0, buildSchema_1.default)(ctx.config, versionGlobalFields, {
|
|
23
24
|
disableUnique: true,
|
|
24
25
|
draftsEnabled: true,
|
|
25
26
|
options: {
|
|
@@ -28,7 +29,7 @@ function initGlobalsLocal(ctx) {
|
|
|
28
29
|
},
|
|
29
30
|
});
|
|
30
31
|
versionSchema.plugin(mongoose_paginate_v2_1.default, { useEstimatedCount: true })
|
|
31
|
-
.plugin(buildQuery_1.default);
|
|
32
|
+
.plugin((0, buildQuery_1.default)({ versionsFields: versionGlobalFields }));
|
|
32
33
|
ctx.versions[global.slug] = mongoose_1.default.model(versionModelName, versionSchema);
|
|
33
34
|
}
|
|
34
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initLocal.js","sourceRoot":"","sources":["../../src/globals/initLocal.ts"],"names":[],"mappings":";;;;;AAAA,wDAAgC;AAChC,gFAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"initLocal.js","sourceRoot":"","sources":["../../src/globals/initLocal.ts"],"names":[],"mappings":";;;;;AAAA,wDAAgC;AAChC,gFAA4C;AAC5C,wEAAyD;AACzD,8DAAsC;AAEtC,2EAAwE;AACxE,qEAAyE;AACzE,0EAAkD;AAGlD,SAAwB,gBAAgB,CAAC,GAAY;IACnD,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE;QACtB,GAAG,CAAC,OAAO,GAAG;YACZ,KAAK,EAAE,IAAA,oBAAU,EAAC,GAAG,CAAC,MAAM,CAAC;YAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO;SAC3B,CAAC;QAEF,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACpC,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACnB,MAAM,gBAAgB,GAAG,IAAA,2CAAoB,EAAC,MAAM,CAAC,CAAC;gBAEtD,MAAM,mBAAmB,GAAG,IAAA,4CAAwB,EAAC,MAAM,CAAC,CAAC;gBAE7D,MAAM,aAAa,GAAG,IAAA,qBAAW,EAC/B,GAAG,CAAC,MAAM,EACV,mBAAmB,EACnB;oBACE,aAAa,EAAE,IAAI;oBACnB,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE;wBACP,UAAU,EAAE,KAAK;wBACjB,QAAQ,EAAE,KAAK;qBAChB;iBACF,CACF,CAAC;gBAEF,aAAa,CAAC,MAAM,CAAC,8BAAQ,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;qBACxD,MAAM,CAAC,IAAA,oBAAmB,EAAC,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;gBAExE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAQ,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,CAAoB,CAAC;aAChG;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAjCD,mCAiCC"}
|
|
@@ -16,24 +16,27 @@ async function findOne(args) {
|
|
|
16
16
|
// Retrieve and execute access
|
|
17
17
|
// /////////////////////////////////////
|
|
18
18
|
const queryToBuild = {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
{
|
|
22
|
-
|
|
23
|
-
equals: slug,
|
|
24
|
-
},
|
|
19
|
+
and: [
|
|
20
|
+
{
|
|
21
|
+
globalType: {
|
|
22
|
+
equals: slug,
|
|
25
23
|
},
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
},
|
|
25
|
+
],
|
|
28
26
|
};
|
|
29
27
|
let accessResult;
|
|
30
28
|
if (!overrideAccess) {
|
|
31
29
|
accessResult = await (0, executeAccess_1.default)({ req }, globalConfig.access.read);
|
|
32
30
|
if ((0, auth_1.hasWhereAccessResult)(accessResult)) {
|
|
33
|
-
queryToBuild.
|
|
31
|
+
queryToBuild.and.push(accessResult);
|
|
34
32
|
}
|
|
35
33
|
}
|
|
36
|
-
const query = await Model.buildQuery(
|
|
34
|
+
const query = await Model.buildQuery({
|
|
35
|
+
where: queryToBuild,
|
|
36
|
+
req,
|
|
37
|
+
overrideAccess,
|
|
38
|
+
globalSlug: slug,
|
|
39
|
+
});
|
|
37
40
|
// /////////////////////////////////////
|
|
38
41
|
// Perform database operation
|
|
39
42
|
// /////////////////////////////////////
|
|
@@ -57,7 +60,8 @@ async function findOne(args) {
|
|
|
57
60
|
entity: globalConfig,
|
|
58
61
|
entityType: 'global',
|
|
59
62
|
doc,
|
|
60
|
-
|
|
63
|
+
req,
|
|
64
|
+
overrideAccess,
|
|
61
65
|
accessResult,
|
|
62
66
|
});
|
|
63
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findOne.js","sourceRoot":"","sources":["../../../src/globals/operations/findOne.ts"],"names":[],"mappings":";;;;;AAAA,qCAAkD;AAClD,6EAAqD;AAGrD,oGAA4E;AAC5E,oHAA4F;AAC5F,4DAAyD;AAezD,KAAK,UAAU,OAAO,CAAoC,IAAU;;IAClE,MAAM,EACJ,YAAY,EACZ,MAAM,EACN,GAAG,EACH,GAAG,EAAE,EACH,OAAO,GACR,EACD,IAAI,EACJ,KAAK,EACL,gBAAgB,EAChB,KAAK,EAAE,YAAY,GAAG,KAAK,EAC3B,cAAc,GAAG,KAAK,GACvB,GAAG,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC;IAEvC,wCAAwC;IACxC,8BAA8B;IAC9B,wCAAwC;IAExC,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"findOne.js","sourceRoot":"","sources":["../../../src/globals/operations/findOne.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const executeAccess_1 = __importDefault(require("../../auth/executeAccess"));
|
|
|
9
9
|
const types_1 = require("../../auth/types");
|
|
10
10
|
const afterRead_1 = require("../../fields/hooks/afterRead");
|
|
11
11
|
async function findVersionByID(args) {
|
|
12
|
-
const { depth, globalConfig, id, req, req: { t, payload,
|
|
12
|
+
const { depth, globalConfig, id, req, req: { t, payload, }, disableErrors, currentDepth, overrideAccess, showHiddenFields, } = args;
|
|
13
13
|
const VersionsModel = payload.versions[globalConfig.slug];
|
|
14
14
|
// /////////////////////////////////////
|
|
15
15
|
// Access
|
|
@@ -20,20 +20,23 @@ async function findVersionByID(args) {
|
|
|
20
20
|
return null;
|
|
21
21
|
const hasWhereAccess = typeof accessResults === 'object';
|
|
22
22
|
const queryToBuild = {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
{
|
|
26
|
-
|
|
27
|
-
equals: id,
|
|
28
|
-
},
|
|
23
|
+
and: [
|
|
24
|
+
{
|
|
25
|
+
_id: {
|
|
26
|
+
equals: id,
|
|
29
27
|
},
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
},
|
|
29
|
+
],
|
|
32
30
|
};
|
|
33
31
|
if ((0, types_1.hasWhereAccessResult)(accessResults)) {
|
|
34
|
-
queryToBuild.
|
|
32
|
+
queryToBuild.and.push(accessResults);
|
|
35
33
|
}
|
|
36
|
-
const query = await VersionsModel.buildQuery(
|
|
34
|
+
const query = await VersionsModel.buildQuery({
|
|
35
|
+
where: queryToBuild,
|
|
36
|
+
req,
|
|
37
|
+
overrideAccess,
|
|
38
|
+
globalSlug: globalConfig.slug,
|
|
39
|
+
});
|
|
37
40
|
// /////////////////////////////////////
|
|
38
41
|
// Find by ID
|
|
39
42
|
// /////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findVersionByID.js","sourceRoot":"","sources":["../../../src/globals/operations/findVersionByID.ts"],"names":[],"mappings":";;;;;AAEA,oGAA4E;AAC5E,yCAAmD;AACnD,6EAAqD;AAErD,4CAAwD;AAGxD,4DAAyD;AAazD,KAAK,UAAU,eAAe,CAAqC,IAAe;IAChF,MAAM,EACJ,KAAK,EACL,YAAY,EACZ,EAAE,EACF,GAAG,EACH,GAAG,EAAE,EACH,CAAC,EACD,OAAO,
|
|
1
|
+
{"version":3,"file":"findVersionByID.js","sourceRoot":"","sources":["../../../src/globals/operations/findVersionByID.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ async function findVersions(args) {
|
|
|
16
16
|
// /////////////////////////////////////
|
|
17
17
|
// Access
|
|
18
18
|
// /////////////////////////////////////
|
|
19
|
-
|
|
19
|
+
let queryToBuild = {};
|
|
20
20
|
let useEstimatedCount = false;
|
|
21
21
|
if (where) {
|
|
22
22
|
let and = [];
|
|
@@ -24,7 +24,7 @@ async function findVersions(args) {
|
|
|
24
24
|
and = where.and;
|
|
25
25
|
if (Array.isArray(where.AND))
|
|
26
26
|
and = where.AND;
|
|
27
|
-
queryToBuild
|
|
27
|
+
queryToBuild = {
|
|
28
28
|
...where,
|
|
29
29
|
and: [
|
|
30
30
|
...and,
|
|
@@ -37,18 +37,23 @@ async function findVersions(args) {
|
|
|
37
37
|
const accessResults = await (0, executeAccess_1.default)({ req }, globalConfig.access.readVersions);
|
|
38
38
|
if ((0, types_1.hasWhereAccessResult)(accessResults)) {
|
|
39
39
|
if (!where) {
|
|
40
|
-
queryToBuild
|
|
40
|
+
queryToBuild = {
|
|
41
41
|
and: [
|
|
42
42
|
accessResults,
|
|
43
43
|
],
|
|
44
44
|
};
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
|
-
queryToBuild.
|
|
47
|
+
queryToBuild.and.push(accessResults);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
const query = await VersionsModel.buildQuery(
|
|
51
|
+
const query = await VersionsModel.buildQuery({
|
|
52
|
+
where: queryToBuild,
|
|
53
|
+
req,
|
|
54
|
+
overrideAccess,
|
|
55
|
+
globalSlug: globalConfig.slug,
|
|
56
|
+
});
|
|
52
57
|
// /////////////////////////////////////
|
|
53
58
|
// Find
|
|
54
59
|
// /////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findVersions.js","sourceRoot":"","sources":["../../../src/globals/operations/findVersions.ts"],"names":[],"mappings":";;;;;AAEA,6EAAqD;AACrD,oGAA4E;AAE5E,4CAAwD;AACxD,sGAA8E;AAC9E,kEAA+D;AAE/D,4DAAyD;AACzD,wEAA4E;AAe5E,KAAK,UAAU,YAAY,CACzB,IAAe;IAEf,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,KAAK,EACL,YAAY,EACZ,GAAG,EACH,GAAG,EAAE,EACH,MAAM,EACN,OAAO,GACR,EACD,cAAc,EACd,gBAAgB,GACjB,GAAG,IAAI,CAAC;IAET,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAE1D,wCAAwC;IACxC,SAAS;IACT,wCAAwC;IAExC,
|
|
1
|
+
{"version":3,"file":"findVersions.js","sourceRoot":"","sources":["../../../src/globals/operations/findVersions.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const sanitizeInternalFields_1 = __importDefault(require("../../utilities/saniti
|
|
|
14
14
|
const getLatestGlobalVersion_1 = require("../../versions/getLatestGlobalVersion");
|
|
15
15
|
async function update(args) {
|
|
16
16
|
var _a;
|
|
17
|
-
const { globalConfig, slug, req, req: {
|
|
17
|
+
const { globalConfig, slug, req, req: { payload, payload: { globals: { Model, }, }, }, depth, overrideAccess, showHiddenFields, draft: draftArg, autosave, } = args;
|
|
18
18
|
let { data } = args;
|
|
19
19
|
const shouldSaveDraft = Boolean(draftArg && ((_a = globalConfig.versions) === null || _a === void 0 ? void 0 : _a.drafts));
|
|
20
20
|
// /////////////////////////////////////
|
|
@@ -25,20 +25,23 @@ async function update(args) {
|
|
|
25
25
|
// Retrieve document
|
|
26
26
|
// /////////////////////////////////////
|
|
27
27
|
const queryToBuild = {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
{
|
|
31
|
-
|
|
32
|
-
equals: slug,
|
|
33
|
-
},
|
|
28
|
+
and: [
|
|
29
|
+
{
|
|
30
|
+
globalType: {
|
|
31
|
+
equals: slug,
|
|
34
32
|
},
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
},
|
|
34
|
+
],
|
|
37
35
|
};
|
|
38
36
|
if ((0, auth_1.hasWhereAccessResult)(accessResults)) {
|
|
39
|
-
queryToBuild.
|
|
37
|
+
queryToBuild.and.push(accessResults);
|
|
40
38
|
}
|
|
41
|
-
const query = await Model.buildQuery(
|
|
39
|
+
const query = await Model.buildQuery({
|
|
40
|
+
where: queryToBuild,
|
|
41
|
+
req,
|
|
42
|
+
overrideAccess,
|
|
43
|
+
globalSlug: slug,
|
|
44
|
+
});
|
|
42
45
|
// /////////////////////////////////////
|
|
43
46
|
// 2. Retrieve document
|
|
44
47
|
// /////////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/globals/operations/update.ts"],"names":[],"mappings":";;;;;AAIA,6EAAqD;AACrD,qCAAkD;AAClD,kEAA+D;AAC/D,sEAAmE;AACnE,gEAA6D;AAC7D,4DAAyD;AAEzD,4DAAyD;AACzD,oGAA4E;AAC5E,kFAA+E;AAc/E,KAAK,UAAU,MAAM,CACnB,IAA4C;;IAE5C,MAAM,EACJ,YAAY,EACZ,IAAI,EACJ,GAAG,EACH,GAAG,EAAE,EACH,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/globals/operations/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,5 @@
|
|
|
1
1
|
import { GraphQLFormattedError } from 'graphql';
|
|
2
2
|
import { AfterErrorHook } from '../collections/config/types';
|
|
3
3
|
import { Payload } from '../payload';
|
|
4
|
-
|
|
5
|
-
*
|
|
6
|
-
* @param info
|
|
7
|
-
* @param debug
|
|
8
|
-
* @param afterErrorHook
|
|
9
|
-
* @returns {Promise<unknown[]>}
|
|
10
|
-
*/
|
|
11
|
-
declare const errorHandler: (payload: Payload, info: any, debug: boolean, afterErrorHook: AfterErrorHook) => Promise<GraphQLFormattedError[]>;
|
|
4
|
+
declare const errorHandler: (payload: Payload, err: any, debug: boolean, afterErrorHook: AfterErrorHook) => Promise<GraphQLFormattedError>;
|
|
12
5
|
export default errorHandler;
|
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
*
|
|
5
|
-
* @param info
|
|
6
|
-
* @param debug
|
|
7
|
-
* @param afterErrorHook
|
|
8
|
-
* @returns {Promise<unknown[]>}
|
|
9
|
-
*/
|
|
10
|
-
const errorHandler = async (payload, info, debug, afterErrorHook) => Promise.all(info.result.errors.map(async (err) => {
|
|
3
|
+
const errorHandler = async (payload, err, debug, afterErrorHook) => {
|
|
11
4
|
var _a;
|
|
12
5
|
payload.logger.error(err.stack);
|
|
13
6
|
let response = {
|
|
@@ -24,6 +17,6 @@ const errorHandler = async (payload, info, debug, afterErrorHook) => Promise.all
|
|
|
24
17
|
({ response } = await afterErrorHook(err, response) || { response });
|
|
25
18
|
}
|
|
26
19
|
return response;
|
|
27
|
-
}
|
|
20
|
+
};
|
|
28
21
|
exports.default = errorHandler;
|
|
29
22
|
//# sourceMappingURL=errorHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/graphql/errorHandler.ts"],"names":[],"mappings":";;AAIA
|
|
1
|
+
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/graphql/errorHandler.ts"],"names":[],"mappings":";;AAIA,MAAM,YAAY,GAAG,KAAK,EACxB,OAAgB,EAChB,GAAQ,EACR,KAAc,EACd,cAA8B,EACE,EAAE;;IAClC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,QAAQ,GAA0B;QACpC,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,UAAU,EAAE;YACV,IAAI,EAAE,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,0CAAE,IAAI,KAAI,SAAS;YAC3C,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,SAAS;YACvE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;SACrC;KACF,CAAC;IAEF,IAAI,cAAc,EAAE;QAClB,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;KACtE;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { Response } from 'express';
|
|
3
2
|
import { PayloadRequest } from '../express/types';
|
|
4
|
-
declare const graphQLHandler: (req: PayloadRequest, res: Response) =>
|
|
5
|
-
url: string;
|
|
6
|
-
}, response: import("http").ServerResponse<import("http").IncomingMessage> & {
|
|
7
|
-
json?: (data: unknown) => void;
|
|
8
|
-
}) => Promise<void>;
|
|
3
|
+
declare const graphQLHandler: (req: PayloadRequest, res: Response) => import("express").Handler;
|
|
9
4
|
export default graphQLHandler;
|
|
@@ -1,16 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
6
|
+
const express_1 = require("graphql-http/lib/use/express");
|
|
7
|
+
const errorHandler_1 = __importDefault(require("./errorHandler"));
|
|
4
8
|
const graphQLHandler = (req, res) => {
|
|
5
9
|
const { payload } = req;
|
|
6
|
-
payload.
|
|
7
|
-
return (0,
|
|
10
|
+
const afterErrorHook = typeof payload.config.hooks.afterError === 'function' ? payload.config.hooks.afterError : null;
|
|
11
|
+
return (0, express_1.createHandler)({
|
|
8
12
|
schema: payload.schema,
|
|
9
|
-
|
|
10
|
-
|
|
13
|
+
onOperation: async (request, args, result) => {
|
|
14
|
+
const response = typeof payload.extensions === 'function' ? await payload.extensions({
|
|
15
|
+
req: request,
|
|
16
|
+
args,
|
|
17
|
+
result,
|
|
18
|
+
}) : result;
|
|
19
|
+
if (response.errors) {
|
|
20
|
+
const errors = await Promise.all(result.errors.map((error) => {
|
|
21
|
+
return (0, errorHandler_1.default)(payload, error, payload.config.debug, afterErrorHook);
|
|
22
|
+
}));
|
|
23
|
+
// errors type should be FormattedGraphQLError[] but onOperation has a return type of ExecutionResult instead of FormattedExecutionResult
|
|
24
|
+
return { ...response, errors };
|
|
25
|
+
}
|
|
26
|
+
return response;
|
|
27
|
+
},
|
|
11
28
|
context: { req, res },
|
|
12
|
-
validationRules: payload.validationRules(
|
|
13
|
-
})
|
|
29
|
+
validationRules: (request, args, defaultRules) => defaultRules.concat(payload.validationRules(args)),
|
|
30
|
+
});
|
|
14
31
|
};
|
|
15
32
|
exports.default = graphQLHandler;
|
|
16
33
|
//# sourceMappingURL=graphQLHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphQLHandler.js","sourceRoot":"","sources":["../../src/graphql/graphQLHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"graphQLHandler.js","sourceRoot":"","sources":["../../src/graphql/graphQLHandler.ts"],"names":[],"mappings":";;;;;AACA,0DAA6D;AAG7D,kEAA0C;AAE1C,MAAM,cAAc,GAAG,CAAC,GAAmB,EAAE,GAAa,EAAE,EAAE;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IAExB,MAAM,cAAc,GAAG,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;IAEtH,OAAO,IAAA,uBAAa,EAClB;QACE,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC;gBACnF,GAAG,EAAE,OAAO;gBACZ,IAAI;gBACJ,MAAM;aACP,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACZ,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC3D,OAAO,IAAA,sBAAY,EAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;gBAC5E,CAAC,CAAC,CAAmB,CAAC;gBACtB,yIAAyI;gBACzI,OAAO,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,CAAC;aAChC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;QACrB,eAAe,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;KACrG,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}
|
|
@@ -37,7 +37,6 @@ const init_2 = __importDefault(require("../globals/graphql/init"));
|
|
|
37
37
|
const init_3 = __importDefault(require("../preferences/graphql/init"));
|
|
38
38
|
const buildPoliciesType_1 = __importDefault(require("./schema/buildPoliciesType"));
|
|
39
39
|
const access_1 = __importDefault(require("../auth/graphql/resolvers/access"));
|
|
40
|
-
const errorHandler_1 = __importDefault(require("./errorHandler"));
|
|
41
40
|
function registerSchema(payload) {
|
|
42
41
|
payload.types = {
|
|
43
42
|
blockTypes: {},
|
|
@@ -89,23 +88,6 @@ function registerSchema(payload) {
|
|
|
89
88
|
mutation,
|
|
90
89
|
};
|
|
91
90
|
payload.schema = new graphql_1.GraphQLSchema(schema);
|
|
92
|
-
payload.extensions = async (info) => {
|
|
93
|
-
const { result } = info;
|
|
94
|
-
if (result.errors) {
|
|
95
|
-
payload.errorIndex = 0;
|
|
96
|
-
const afterErrorHook = typeof payload.config.hooks.afterError === 'function' ? payload.config.hooks.afterError : null;
|
|
97
|
-
payload.errorResponses = await (0, errorHandler_1.default)(payload, info, payload.config.debug, afterErrorHook);
|
|
98
|
-
}
|
|
99
|
-
return null;
|
|
100
|
-
};
|
|
101
|
-
payload.customFormatErrorFn = (error) => {
|
|
102
|
-
if (payload.errorResponses && payload.errorResponses[payload.errorIndex]) {
|
|
103
|
-
const response = payload.errorResponses[payload.errorIndex];
|
|
104
|
-
payload.errorIndex += 1;
|
|
105
|
-
return response;
|
|
106
|
-
}
|
|
107
|
-
return error;
|
|
108
|
-
};
|
|
109
91
|
payload.validationRules = (variables) => ([
|
|
110
92
|
(0, graphql_query_complexity_1.default)({
|
|
111
93
|
estimators: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registerSchema.js","sourceRoot":"","sources":["../../src/graphql/registerSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,iDAAmC;AACnC,qCAA2D;AAC3D,qFAAsG;AAEtG,yFAAiE;AACjE,yGAAiF;AACjF,uEAA0D;AAC1D,mEAAkD;AAClD,uEAA0D;AAC1D,mFAA2D;AAC3D,8EAA8D;
|
|
1
|
+
{"version":3,"file":"registerSchema.js","sourceRoot":"","sources":["../../src/graphql/registerSchema.ts"],"names":[],"mappings":"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"}
|
package/dist/initHTTP.js
CHANGED
|
@@ -55,7 +55,7 @@ const initHTTP = async (options) => {
|
|
|
55
55
|
else {
|
|
56
56
|
next();
|
|
57
57
|
}
|
|
58
|
-
}, (0, identifyAPI_1.default)('GraphQL'), (req, res) => (0, graphQLHandler_1.default)(req, res)(req, res));
|
|
58
|
+
}, (0, identifyAPI_1.default)('GraphQL'), (req, res, next) => (0, graphQLHandler_1.default)(req, res)(req, res, next));
|
|
59
59
|
(0, initPlayground_1.default)(payload);
|
|
60
60
|
}
|
|
61
61
|
(0, mountEndpoints_1.default)(options.express, payload.router, payload.config.endpoints);
|
package/dist/initHTTP.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initHTTP.js","sourceRoot":"","sources":["../src/initHTTP.ts"],"names":[],"mappings":";;;;;;AAAA,sCAAsC;AACtC,sDAA0D;AAG1D,qFAA6D;AAC7D,sEAAqD;AACrD,4DAAwC;AACxC,uDAAmC;AACnC,2EAAmD;AACnD,sEAAyD;AACzD,8DAAiD;AACjD,kEAAiD;AACjD,8EAA6D;AAC7D,8DAA0C;AAC1C,8EAAsD;AACtD,mFAA2D;AAC3D,qFAA6D;AAE7D,yDAAyD;AACzD,8EAAsD;AACtD,uCAAgD;AAEzC,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAoB,EAAoB,EAAE;IACvE,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW;QAAE,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;IAChE,MAAM,OAAO,GAAG,MAAM,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;IAE1C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;QAClB,OAAO,CAAC,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;QAClC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,oBAAiB,EAAC,OAAO,CAAC,CAAC,CAAC;QAClD,IAAA,cAAQ,EAAC,OAAO,CAAC,CAAC;QAElB,IAAA,kBAAmB,EAAC,OAAO,CAAC,CAAC;QAC7B,IAAA,kBAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAmB,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACrD,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;YACtB,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;YACnF,GAAG,CAAC,iBAAiB,GAAG,IAAA,0BAAa,EAAC,GAAG,CAAC,CAAC;YAC3C,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAElC,IAAI,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE;YACvC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;SACvC;QAED,IAAA,eAAS,EAAC,OAAO,CAAC,CAAC;QACnB,IAAA,cAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,gBAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE;YACnC,OAAO,CAAC,MAAM,CAAC,GAAG,CAChB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAC7B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAQ,EAAE;gBACvB,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;oBAC5B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBACrB;qBAAM;oBACL,IAAI,EAAE,CAAC;iBACR;YACH,CAAC,EACD,IAAA,qBAAW,EAAC,SAAS,CAAC,EACtB,CAAC,GAAmB,EAAE,GAAa,EAAE,EAAE,CAAC,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"initHTTP.js","sourceRoot":"","sources":["../src/initHTTP.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,76 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { PayloadRequest, Where } from '../types';
|
|
2
|
+
import { Field, FieldAffectingData, TabAsField, UIField } from '../fields/config/types';
|
|
3
|
+
import { CollectionPermission, FieldPermissions, GlobalPermission } from '../auth';
|
|
4
|
+
import { SanitizedConfig } from '../config/types';
|
|
5
|
+
type PathToQuery = {
|
|
6
|
+
complete: boolean;
|
|
7
|
+
collectionSlug?: string;
|
|
8
|
+
path: string;
|
|
9
|
+
field: Field | TabAsField;
|
|
10
|
+
fields?: (FieldAffectingData | UIField | TabAsField)[];
|
|
11
|
+
fieldPolicies?: {
|
|
12
|
+
[field: string]: FieldPermissions;
|
|
13
|
+
};
|
|
14
|
+
};
|
|
15
|
+
type SearchParam = {
|
|
16
|
+
path?: string;
|
|
17
|
+
value: unknown;
|
|
18
|
+
};
|
|
19
|
+
type ParamParserArgs = {
|
|
20
|
+
req: PayloadRequest;
|
|
21
|
+
collectionSlug?: string;
|
|
22
|
+
globalSlug?: string;
|
|
23
|
+
versionsFields?: Field[];
|
|
24
|
+
model: any;
|
|
25
|
+
where: Where;
|
|
26
|
+
overrideAccess?: boolean;
|
|
27
|
+
};
|
|
28
|
+
export declare class ParamParser {
|
|
29
|
+
collectionSlug?: string;
|
|
30
|
+
globalSlug?: string;
|
|
31
|
+
overrideAccess: boolean;
|
|
32
|
+
req: PayloadRequest;
|
|
33
|
+
where: Where;
|
|
34
|
+
model: any;
|
|
35
|
+
fields: Field[];
|
|
36
|
+
localizationConfig: SanitizedConfig['localization'];
|
|
37
|
+
policies: {
|
|
38
|
+
collections?: {
|
|
39
|
+
[collectionSlug: string]: CollectionPermission;
|
|
40
|
+
};
|
|
41
|
+
globals?: {
|
|
42
|
+
[globalSlug: string]: GlobalPermission;
|
|
43
|
+
};
|
|
44
|
+
};
|
|
45
|
+
errors: {
|
|
46
|
+
path: string;
|
|
47
|
+
}[];
|
|
48
|
+
constructor({ req, collectionSlug, globalSlug, versionsFields, model, where, overrideAccess, }: ParamParserArgs);
|
|
49
|
+
parse(): Promise<Record<string, unknown>>;
|
|
50
|
+
parsePathOrRelation(object: Where): Promise<Record<string, unknown>>;
|
|
51
|
+
buildAndOrConditions(conditions: any): Promise<any[]>;
|
|
52
|
+
buildSearchParam({ fields, incomingPath, val, operator, }: {
|
|
53
|
+
fields: Field[];
|
|
54
|
+
incomingPath: string;
|
|
55
|
+
val: unknown;
|
|
56
|
+
operator: string;
|
|
57
|
+
}): Promise<SearchParam>;
|
|
58
|
+
getLocalizedPaths({ collectionSlug, globalSlug, fields, incomingPath, }: {
|
|
59
|
+
collectionSlug?: string;
|
|
60
|
+
globalSlug?: string;
|
|
61
|
+
fields: Field[];
|
|
62
|
+
incomingPath: string;
|
|
63
|
+
}): Promise<PathToQuery[]>;
|
|
64
|
+
}
|
|
65
|
+
type GetBuildQueryPluginArgs = {
|
|
66
|
+
collectionSlug?: string;
|
|
67
|
+
versionsFields?: Field[];
|
|
68
|
+
};
|
|
69
|
+
export type BuildQueryArgs = {
|
|
70
|
+
req: PayloadRequest;
|
|
71
|
+
where: Where;
|
|
72
|
+
overrideAccess: boolean;
|
|
73
|
+
globalSlug?: string;
|
|
74
|
+
};
|
|
75
|
+
declare const getBuildQueryPlugin: ({ collectionSlug, versionsFields, }?: GetBuildQueryPluginArgs) => (schema: any) => void;
|
|
76
|
+
export default getBuildQueryPlugin;
|