@strapi/core 0.0.0-experimental.3f7b2587c5e3d548262671895cf11d8bf8c9166e → 0.0.0-experimental.90ca9123352ed07e0a9cedaf4bcad1475e74137f
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.
Potentially problematic release.
This version of @strapi/core might be problematic. Click here for more details.
- package/dist/Strapi.d.ts.map +1 -1
- package/dist/Strapi.js +7 -3
- package/dist/Strapi.js.map +1 -1
- package/dist/Strapi.mjs +6 -2
- package/dist/Strapi.mjs.map +1 -1
- package/dist/core-api/controller/collection-type.d.ts +1 -1
- package/dist/core-api/controller/collection-type.d.ts.map +1 -1
- package/dist/core-api/controller/collection-type.js +9 -20
- package/dist/core-api/controller/collection-type.js.map +1 -1
- package/dist/core-api/controller/collection-type.mjs +8 -20
- package/dist/core-api/controller/collection-type.mjs.map +1 -1
- package/dist/core-api/controller/index.d.ts.map +1 -1
- package/dist/core-api/controller/index.js +2 -2
- package/dist/core-api/controller/index.js.map +1 -1
- package/dist/core-api/controller/index.mjs +2 -2
- package/dist/core-api/controller/index.mjs.map +1 -1
- package/dist/core-api/controller/single-type.d.ts +1 -1
- package/dist/core-api/controller/single-type.d.ts.map +1 -1
- package/dist/core-api/controller/single-type.js +6 -11
- package/dist/core-api/controller/single-type.js.map +1 -1
- package/dist/core-api/controller/single-type.mjs +5 -11
- package/dist/core-api/controller/single-type.mjs.map +1 -1
- package/dist/core-api/controller/transform.d.ts +2 -11
- package/dist/core-api/controller/transform.d.ts.map +1 -1
- package/dist/core-api/controller/transform.js +2 -16
- package/dist/core-api/controller/transform.js.map +1 -1
- package/dist/core-api/controller/transform.mjs +2 -16
- package/dist/core-api/controller/transform.mjs.map +1 -1
- package/dist/core-api/service/collection-type.d.ts +28 -5
- package/dist/core-api/service/collection-type.d.ts.map +1 -1
- package/dist/core-api/service/collection-type.js +47 -49
- package/dist/core-api/service/collection-type.js.map +1 -1
- package/dist/core-api/service/collection-type.mjs +47 -50
- package/dist/core-api/service/collection-type.mjs.map +1 -1
- package/dist/core-api/service/core-service.d.ts +4 -0
- package/dist/core-api/service/core-service.d.ts.map +1 -0
- package/dist/core-api/service/core-service.js +12 -0
- package/dist/core-api/service/core-service.js.map +1 -0
- package/dist/core-api/service/core-service.mjs +12 -0
- package/dist/core-api/service/core-service.mjs.map +1 -0
- package/dist/core-api/service/index.js +2 -2
- package/dist/core-api/service/index.js.map +1 -1
- package/dist/core-api/service/index.mjs +4 -4
- package/dist/core-api/service/index.mjs.map +1 -1
- package/dist/core-api/service/pagination.d.ts +1 -5
- package/dist/core-api/service/pagination.d.ts.map +1 -1
- package/dist/core-api/service/pagination.js +0 -11
- package/dist/core-api/service/pagination.js.map +1 -1
- package/dist/core-api/service/pagination.mjs +0 -11
- package/dist/core-api/service/pagination.mjs.map +1 -1
- package/dist/core-api/service/single-type.d.ts +13 -8
- package/dist/core-api/service/single-type.d.ts.map +1 -1
- package/dist/core-api/service/single-type.js +25 -51
- package/dist/core-api/service/single-type.js.map +1 -1
- package/dist/core-api/service/single-type.mjs +24 -51
- package/dist/core-api/service/single-type.mjs.map +1 -1
- package/dist/factories.d.ts.map +1 -1
- package/dist/factories.js +2 -12
- package/dist/factories.js.map +1 -1
- package/dist/factories.mjs +2 -12
- package/dist/factories.mjs.map +1 -1
- package/dist/registries/content-types.d.ts.map +1 -1
- package/dist/registries/content-types.js +1 -2
- package/dist/registries/content-types.js.map +1 -1
- package/dist/registries/content-types.mjs +1 -2
- package/dist/registries/content-types.mjs.map +1 -1
- package/dist/services/document-service/collection-type.d.ts +4 -0
- package/dist/services/document-service/collection-type.d.ts.map +1 -0
- package/dist/services/document-service/collection-type.js +145 -0
- package/dist/services/document-service/collection-type.js.map +1 -0
- package/dist/services/document-service/collection-type.mjs +145 -0
- package/dist/services/document-service/collection-type.mjs.map +1 -0
- package/dist/services/document-service/common.d.ts +4 -0
- package/dist/services/document-service/common.d.ts.map +1 -0
- package/dist/services/document-service/common.js +7 -0
- package/dist/services/document-service/common.js.map +1 -0
- package/dist/services/document-service/common.mjs +7 -0
- package/dist/services/document-service/common.mjs.map +1 -0
- package/dist/services/document-service/document-engine.d.ts.map +1 -1
- package/dist/services/document-service/document-engine.js +130 -81
- package/dist/services/document-service/document-engine.js.map +1 -1
- package/dist/services/document-service/document-engine.mjs +125 -76
- package/dist/services/document-service/document-engine.mjs.map +1 -1
- package/dist/services/document-service/draft-and-publish.d.ts +24 -0
- package/dist/services/document-service/draft-and-publish.d.ts.map +1 -0
- package/dist/services/document-service/draft-and-publish.js +41 -0
- package/dist/services/document-service/draft-and-publish.js.map +1 -0
- package/dist/services/document-service/draft-and-publish.mjs +41 -0
- package/dist/services/document-service/draft-and-publish.mjs.map +1 -0
- package/dist/services/document-service/{document-service.d.ts → index.d.ts} +2 -4
- package/dist/services/document-service/index.d.ts.map +1 -0
- package/dist/services/document-service/index.js +22 -0
- package/dist/services/document-service/index.js.map +1 -0
- package/dist/services/document-service/index.mjs +22 -0
- package/dist/services/document-service/index.mjs.map +1 -0
- package/dist/services/document-service/internationalization.d.ts +7 -0
- package/dist/services/document-service/internationalization.d.ts.map +1 -0
- package/dist/services/document-service/internationalization.js +40 -0
- package/dist/services/document-service/internationalization.js.map +1 -0
- package/dist/services/document-service/internationalization.mjs +40 -0
- package/dist/services/document-service/internationalization.mjs.map +1 -0
- package/dist/services/document-service/middlewares.d.ts +8 -0
- package/dist/services/document-service/middlewares.d.ts.map +1 -0
- package/dist/services/document-service/middlewares.js +46 -0
- package/dist/services/document-service/middlewares.js.map +1 -0
- package/dist/services/document-service/middlewares.mjs +46 -0
- package/dist/services/document-service/middlewares.mjs.map +1 -0
- package/dist/services/document-service/repository-factory.d.ts +3 -0
- package/dist/services/document-service/repository-factory.d.ts.map +1 -0
- package/dist/services/document-service/repository-factory.js +12 -0
- package/dist/services/document-service/repository-factory.js.map +1 -0
- package/dist/services/document-service/repository-factory.mjs +12 -0
- package/dist/services/document-service/repository-factory.mjs.map +1 -0
- package/dist/services/document-service/single-type.d.ts +4 -0
- package/dist/services/document-service/single-type.d.ts.map +1 -0
- package/dist/services/document-service/single-type.js +92 -0
- package/dist/services/document-service/single-type.js.map +1 -0
- package/dist/services/document-service/single-type.mjs +92 -0
- package/dist/services/document-service/single-type.mjs.map +1 -0
- package/dist/services/document-service/transform/data.d.ts +5 -0
- package/dist/services/document-service/transform/data.d.ts.map +1 -0
- package/dist/services/document-service/transform/data.js +13 -0
- package/dist/services/document-service/transform/data.js.map +1 -0
- package/dist/services/document-service/transform/data.mjs +13 -0
- package/dist/services/document-service/transform/data.mjs.map +1 -0
- package/dist/services/document-service/transform/fields.d.ts +5 -0
- package/dist/services/document-service/transform/fields.d.ts.map +1 -0
- package/dist/services/document-service/transform/fields.js +23 -0
- package/dist/services/document-service/transform/fields.js.map +1 -0
- package/dist/services/document-service/transform/fields.mjs +23 -0
- package/dist/services/document-service/transform/fields.mjs.map +1 -0
- package/dist/services/document-service/transform/filters.d.ts +3 -0
- package/dist/services/document-service/transform/filters.d.ts.map +1 -0
- package/dist/services/document-service/transform/filters.js +49 -0
- package/dist/services/document-service/transform/filters.js.map +1 -0
- package/dist/services/document-service/transform/filters.mjs +49 -0
- package/dist/services/document-service/transform/filters.mjs.map +1 -0
- package/dist/services/document-service/transform/id-map.d.ts +23 -0
- package/dist/services/document-service/transform/id-map.d.ts.map +1 -0
- package/dist/services/document-service/transform/id-map.js +72 -0
- package/dist/services/document-service/transform/id-map.js.map +1 -0
- package/dist/services/document-service/transform/id-map.mjs +72 -0
- package/dist/services/document-service/transform/id-map.mjs.map +1 -0
- package/dist/services/document-service/transform/id-transform.d.ts +26 -0
- package/dist/services/document-service/transform/id-transform.d.ts.map +1 -0
- package/dist/services/document-service/transform/id-transform.js +57 -0
- package/dist/services/document-service/transform/id-transform.js.map +1 -0
- package/dist/services/document-service/transform/id-transform.mjs +57 -0
- package/dist/services/document-service/transform/id-transform.mjs.map +1 -0
- package/dist/services/document-service/transform/populate.d.ts +3 -0
- package/dist/services/document-service/transform/populate.d.ts.map +1 -0
- package/dist/services/document-service/transform/populate.js +31 -0
- package/dist/services/document-service/transform/populate.js.map +1 -0
- package/dist/services/document-service/transform/populate.mjs +31 -0
- package/dist/services/document-service/transform/populate.mjs.map +1 -0
- package/dist/services/document-service/transform/relations/extract/data-ids.d.ts +13 -0
- package/dist/services/document-service/transform/relations/extract/data-ids.d.ts.map +1 -0
- package/dist/services/document-service/transform/relations/extract/data-ids.js +76 -0
- package/dist/services/document-service/transform/relations/extract/data-ids.js.map +1 -0
- package/dist/services/document-service/transform/relations/extract/data-ids.mjs +76 -0
- package/dist/services/document-service/transform/relations/extract/data-ids.mjs.map +1 -0
- package/dist/services/document-service/transform/relations/transform/data-ids.d.ts +10 -0
- package/dist/services/document-service/transform/relations/transform/data-ids.d.ts.map +1 -0
- package/dist/services/document-service/transform/relations/transform/data-ids.js +115 -0
- package/dist/services/document-service/transform/relations/transform/data-ids.js.map +1 -0
- package/dist/services/document-service/transform/relations/transform/data-ids.mjs +115 -0
- package/dist/services/document-service/transform/relations/transform/data-ids.mjs.map +1 -0
- package/dist/services/document-service/transform/relations/transform/output-ids.d.ts +4 -0
- package/dist/services/document-service/transform/relations/transform/output-ids.d.ts.map +1 -0
- package/dist/services/document-service/transform/relations/transform/output-ids.js +26 -0
- package/dist/services/document-service/transform/relations/transform/output-ids.js.map +1 -0
- package/dist/services/document-service/transform/relations/transform/output-ids.mjs +26 -0
- package/dist/services/document-service/transform/relations/transform/output-ids.mjs.map +1 -0
- package/dist/services/document-service/transform/relations/utils/data.d.ts +6 -0
- package/dist/services/document-service/transform/relations/utils/data.d.ts.map +1 -0
- package/dist/services/document-service/transform/relations/utils/data.js +12 -0
- package/dist/services/document-service/transform/relations/utils/data.js.map +1 -0
- package/dist/services/document-service/transform/relations/utils/data.mjs +12 -0
- package/dist/services/document-service/transform/relations/utils/data.mjs.map +1 -0
- package/dist/services/document-service/transform/relations/utils/i18n.d.ts +10 -0
- package/dist/services/document-service/transform/relations/utils/i18n.d.ts.map +1 -0
- package/dist/services/document-service/transform/relations/utils/i18n.js +31 -0
- package/dist/services/document-service/transform/relations/utils/i18n.js.map +1 -0
- package/dist/services/document-service/transform/relations/utils/i18n.mjs +31 -0
- package/dist/services/document-service/transform/relations/utils/i18n.mjs.map +1 -0
- package/dist/services/document-service/transform/relations/utils/types.d.ts +8 -0
- package/dist/services/document-service/transform/relations/utils/types.d.ts.map +1 -0
- package/dist/services/document-service/transform/sort.d.ts +5 -0
- package/dist/services/document-service/transform/sort.d.ts.map +1 -0
- package/dist/services/document-service/transform/sort.js +44 -0
- package/dist/services/document-service/transform/sort.js.map +1 -0
- package/dist/services/document-service/transform/sort.mjs +44 -0
- package/dist/services/document-service/transform/sort.mjs.map +1 -0
- package/dist/services/document-service/transform/types.d.ts +13 -0
- package/dist/services/document-service/transform/types.d.ts.map +1 -0
- package/dist/services/document-service/transform/utils.d.ts +9 -0
- package/dist/services/document-service/transform/utils.d.ts.map +1 -0
- package/dist/services/document-service/transform/utils.js +23 -0
- package/dist/services/document-service/transform/utils.js.map +1 -0
- package/dist/services/document-service/transform/utils.mjs +23 -0
- package/dist/services/document-service/transform/utils.mjs.map +1 -0
- package/dist/services/document-service/utils/populate.d.ts +3 -0
- package/dist/services/document-service/utils/populate.d.ts.map +1 -0
- package/dist/services/document-service/utils/populate.js +41 -0
- package/dist/services/document-service/utils/populate.js.map +1 -0
- package/dist/services/document-service/utils/populate.mjs +41 -0
- package/dist/services/document-service/utils/populate.mjs.map +1 -0
- package/dist/services/entity-validator/blocks-validator.d.ts.map +1 -1
- package/dist/services/entity-validator/blocks-validator.js +22 -2
- package/dist/services/entity-validator/blocks-validator.js.map +1 -1
- package/dist/services/entity-validator/blocks-validator.mjs +22 -2
- package/dist/services/entity-validator/blocks-validator.mjs.map +1 -1
- package/dist/services/entity-validator/validators.d.ts.map +1 -1
- package/dist/services/entity-validator/validators.js +7 -8
- package/dist/services/entity-validator/validators.js.map +1 -1
- package/dist/services/entity-validator/validators.mjs +7 -8
- package/dist/services/entity-validator/validators.mjs.map +1 -1
- package/dist/services/server/compose-endpoint.d.ts.map +1 -1
- package/dist/services/server/compose-endpoint.js +3 -0
- package/dist/services/server/compose-endpoint.js.map +1 -1
- package/dist/services/server/compose-endpoint.mjs +3 -0
- package/dist/services/server/compose-endpoint.mjs.map +1 -1
- package/dist/services/webhook-store.js +2 -2
- package/dist/services/webhook-store.js.map +1 -1
- package/dist/services/webhook-store.mjs +2 -2
- package/dist/services/webhook-store.mjs.map +1 -1
- package/package.json +14 -14
- package/dist/core-api/service/get-fetch-params.d.ts +0 -7
- package/dist/core-api/service/get-fetch-params.d.ts.map +0 -1
- package/dist/core-api/service/get-fetch-params.js +0 -14
- package/dist/core-api/service/get-fetch-params.js.map +0 -1
- package/dist/core-api/service/get-fetch-params.mjs +0 -14
- package/dist/core-api/service/get-fetch-params.mjs.map +0 -1
- package/dist/services/document-service/document-service.d.ts.map +0 -1
- package/dist/services/document-service/document-service.js +0 -132
- package/dist/services/document-service/document-service.js.map +0 -1
- package/dist/services/document-service/document-service.mjs +0 -132
- package/dist/services/document-service/document-service.mjs.map +0 -1
- package/dist/services/document-service/middlewares/defaults/draft-and-publish.d.ts +0 -26
- package/dist/services/document-service/middlewares/defaults/draft-and-publish.d.ts.map +0 -1
- package/dist/services/document-service/middlewares/defaults/draft-and-publish.js +0 -58
- package/dist/services/document-service/middlewares/defaults/draft-and-publish.js.map +0 -1
- package/dist/services/document-service/middlewares/defaults/draft-and-publish.mjs +0 -58
- package/dist/services/document-service/middlewares/defaults/draft-and-publish.mjs.map +0 -1
- package/dist/services/document-service/middlewares/defaults/index.d.ts +0 -3
- package/dist/services/document-service/middlewares/defaults/index.d.ts.map +0 -1
- package/dist/services/document-service/middlewares/defaults/index.js +0 -82
- package/dist/services/document-service/middlewares/defaults/index.js.map +0 -1
- package/dist/services/document-service/middlewares/defaults/index.mjs +0 -82
- package/dist/services/document-service/middlewares/defaults/index.mjs.map +0 -1
- package/dist/services/document-service/middlewares/defaults/locales.d.ts +0 -18
- package/dist/services/document-service/middlewares/defaults/locales.d.ts.map +0 -1
- package/dist/services/document-service/middlewares/defaults/locales.js +0 -50
- package/dist/services/document-service/middlewares/defaults/locales.js.map +0 -1
- package/dist/services/document-service/middlewares/defaults/locales.mjs +0 -50
- package/dist/services/document-service/middlewares/defaults/locales.mjs.map +0 -1
- package/dist/services/document-service/middlewares/index.d.ts +0 -11
- package/dist/services/document-service/middlewares/index.d.ts.map +0 -1
- package/dist/services/document-service/middlewares/index.js +0 -59
- package/dist/services/document-service/middlewares/index.js.map +0 -1
- package/dist/services/document-service/middlewares/index.mjs +0 -59
- package/dist/services/document-service/middlewares/index.mjs.map +0 -1
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { errors } from "@strapi/utils";
|
|
2
|
+
const isLocalizedContentType = (uid) => {
|
|
3
|
+
const model = strapi.getModel(uid);
|
|
4
|
+
return strapi.plugin("i18n").service("content-types").isLocalizedContentType(model);
|
|
5
|
+
};
|
|
6
|
+
const getDefaultLocale = () => {
|
|
7
|
+
return "en";
|
|
8
|
+
};
|
|
9
|
+
const getRelationTargetLocale = (relation, opts) => {
|
|
10
|
+
const defaultLocale = getDefaultLocale();
|
|
11
|
+
const targetLocale = relation.locale || opts.sourceLocale || defaultLocale;
|
|
12
|
+
const isTargetLocalized = isLocalizedContentType(opts.targetUid);
|
|
13
|
+
const isSourceLocalized = isLocalizedContentType(opts.sourceUid);
|
|
14
|
+
if (isSourceLocalized && isTargetLocalized) {
|
|
15
|
+
if (targetLocale !== opts.sourceLocale) {
|
|
16
|
+
throw new errors.ValidationError(
|
|
17
|
+
`Relation locale does not match the source locale ${JSON.stringify(relation)}`
|
|
18
|
+
);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (isTargetLocalized) {
|
|
22
|
+
return targetLocale;
|
|
23
|
+
}
|
|
24
|
+
return null;
|
|
25
|
+
};
|
|
26
|
+
export {
|
|
27
|
+
getDefaultLocale,
|
|
28
|
+
getRelationTargetLocale,
|
|
29
|
+
isLocalizedContentType
|
|
30
|
+
};
|
|
31
|
+
//# sourceMappingURL=i18n.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"i18n.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/i18n.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { errors } from '@strapi/utils';\nimport { LongHand } from './types';\n\nexport const isLocalizedContentType = (uid: Common.UID.Schema) => {\n const model = strapi.getModel(uid);\n return strapi.plugin('i18n').service('content-types').isLocalizedContentType(model);\n};\n\nexport const getDefaultLocale = () => {\n // TODO: Fix this\n // return strapi.plugin('i18n').service('locales').getDefaultLocale();\n return 'en';\n};\n\nexport const getRelationTargetLocale = (\n relation: LongHand,\n opts: {\n targetUid: Common.UID.Schema;\n sourceUid: Common.UID.Schema;\n sourceLocale?: string | null;\n }\n) => {\n const defaultLocale = getDefaultLocale();\n const targetLocale = relation.locale || opts.sourceLocale || defaultLocale;\n\n const isTargetLocalized = isLocalizedContentType(opts.targetUid);\n const isSourceLocalized = isLocalizedContentType(opts.sourceUid);\n\n // Locale validations\n if (isSourceLocalized && isTargetLocalized) {\n // Check the targetLocale matches\n if (targetLocale !== opts.sourceLocale) {\n throw new errors.ValidationError(\n `Relation locale does not match the source locale ${JSON.stringify(relation)}`\n );\n }\n }\n\n if (isTargetLocalized) {\n return targetLocale;\n }\n\n return null;\n};\n"],"names":[],"mappings":";AAIa,MAAA,yBAAyB,CAAC,QAA2B;AAC1D,QAAA,QAAQ,OAAO,SAAS,GAAG;AAC1B,SAAA,OAAO,OAAO,MAAM,EAAE,QAAQ,eAAe,EAAE,uBAAuB,KAAK;AACpF;AAEO,MAAM,mBAAmB,MAAM;AAG7B,SAAA;AACT;AAEa,MAAA,0BAA0B,CACrC,UACA,SAKG;AACH,QAAM,gBAAgB;AACtB,QAAM,eAAe,SAAS,UAAU,KAAK,gBAAgB;AAEvD,QAAA,oBAAoB,uBAAuB,KAAK,SAAS;AACzD,QAAA,oBAAoB,uBAAuB,KAAK,SAAS;AAG/D,MAAI,qBAAqB,mBAAmB;AAEtC,QAAA,iBAAiB,KAAK,cAAc;AACtC,YAAM,IAAI,OAAO;AAAA,QACf,oDAAoD,KAAK,UAAU,QAAQ,CAAC;AAAA,MAAA;AAAA,IAEhF;AAAA,EACF;AAEA,MAAI,mBAAmB;AACd,WAAA;AAAA,EACT;AAEO,SAAA;AACT;"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/types.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,CAAC;AACjC,MAAM,MAAM,SAAS,GAAG,EAAE,CAAC;AAC3B,MAAM,MAAM,QAAQ,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,MAAM,MAAM,KAAK,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/sort.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAGxC,KAAK,IAAI,GAAG,IAAI,GAAG,MAAM,CAAC;AAiC1B,eAAO,MAAM,aAAa,SAAgB,IAAI,GAAG,IAAI,EAAE,QAAQ,OAAO,qBAoBrE,CAAC"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
+
const strapiUtils = require("@strapi/utils");
|
|
4
|
+
const utils = require("./utils.js");
|
|
5
|
+
const rootIdReplacement = (sort) => {
|
|
6
|
+
if (typeof sort === "object") {
|
|
7
|
+
return utils.switchDocumentIdForId(sort);
|
|
8
|
+
}
|
|
9
|
+
if (typeof sort === "string") {
|
|
10
|
+
let sortCopy = sort;
|
|
11
|
+
let suffix = "";
|
|
12
|
+
const match = sort.match(/:(\w+)$/);
|
|
13
|
+
if (match) {
|
|
14
|
+
suffix = match[0];
|
|
15
|
+
sortCopy = sort.replace(suffix, "");
|
|
16
|
+
}
|
|
17
|
+
if (sortCopy === "id") {
|
|
18
|
+
sortCopy = "documentId";
|
|
19
|
+
} else {
|
|
20
|
+
sortCopy = sortCopy.split(",").map((value) => value === "id" ? "documentId" : value).join(",");
|
|
21
|
+
}
|
|
22
|
+
return sortCopy + suffix;
|
|
23
|
+
}
|
|
24
|
+
return sort;
|
|
25
|
+
};
|
|
26
|
+
const transformSort = async (sort, opts) => {
|
|
27
|
+
let mappedSort;
|
|
28
|
+
if (Array.isArray(sort)) {
|
|
29
|
+
mappedSort = sort.map(rootIdReplacement);
|
|
30
|
+
} else {
|
|
31
|
+
mappedSort = rootIdReplacement(sort);
|
|
32
|
+
}
|
|
33
|
+
return strapiUtils.traverse.traverseQuerySort(
|
|
34
|
+
({ attribute, value, key }, { set }) => {
|
|
35
|
+
if (attribute?.type === "relation") {
|
|
36
|
+
set(key, rootIdReplacement(value));
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
{ schema: strapi.getModel(opts.uid) },
|
|
40
|
+
mappedSort
|
|
41
|
+
);
|
|
42
|
+
};
|
|
43
|
+
exports.transformSort = transformSort;
|
|
44
|
+
//# sourceMappingURL=sort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sort.js","sources":["../../../../src/services/document-service/transform/sort.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { Options, Data } from './types';\nimport { switchDocumentIdForId } from './utils';\n\ntype Sort = Data | string;\n\nconst rootIdReplacement = (sort: Sort) => {\n if (typeof sort === 'object') {\n return switchDocumentIdForId(sort);\n }\n\n if (typeof sort === 'string') {\n let sortCopy = sort;\n let suffix = '';\n const match = sort.match(/:(\\w+)$/);\n if (match) {\n suffix = match[0];\n\n // TODO is there a regex to match :ASC or :DESC?\n sortCopy = sort.replace(suffix, '');\n }\n\n if (sortCopy === 'id') {\n sortCopy = 'documentId';\n } else {\n sortCopy = sortCopy\n .split(',')\n .map((value: any) => (value === 'id' ? 'documentId' : value))\n .join(',');\n }\n\n return sortCopy + suffix;\n }\n\n return sort;\n};\n\nexport const transformSort = async (sort: Sort | Sort[], opts: Options) => {\n let mappedSort;\n\n // Replace any top level 'id' properties with 'documentId'\n if (Array.isArray(sort)) {\n mappedSort = sort.map(rootIdReplacement);\n } else {\n mappedSort = rootIdReplacement(sort);\n }\n\n return traverse.traverseQuerySort(\n ({ attribute, value, key }, { set }) => {\n if (attribute?.type === 'relation') {\n // Replace any relation 'id' properties with 'documentId'\n set(key, rootIdReplacement(value as any));\n }\n },\n { schema: strapi.getModel(opts.uid) },\n mappedSort\n );\n};\n"],"names":["switchDocumentIdForId","traverse"],"mappings":";;;;AAMA,MAAM,oBAAoB,CAAC,SAAe;AACpC,MAAA,OAAO,SAAS,UAAU;AAC5B,WAAOA,MAAAA,sBAAsB,IAAI;AAAA,EACnC;AAEI,MAAA,OAAO,SAAS,UAAU;AAC5B,QAAI,WAAW;AACf,QAAI,SAAS;AACP,UAAA,QAAQ,KAAK,MAAM,SAAS;AAClC,QAAI,OAAO;AACT,eAAS,MAAM,CAAC;AAGL,iBAAA,KAAK,QAAQ,QAAQ,EAAE;AAAA,IACpC;AAEA,QAAI,aAAa,MAAM;AACV,iBAAA;AAAA,IAAA,OACN;AACL,iBAAW,SACR,MAAM,GAAG,EACT,IAAI,CAAC,UAAgB,UAAU,OAAO,eAAe,KAAM,EAC3D,KAAK,GAAG;AAAA,IACb;AAEA,WAAO,WAAW;AAAA,EACpB;AAEO,SAAA;AACT;AAEa,MAAA,gBAAgB,OAAO,MAAqB,SAAkB;AACrE,MAAA;AAGA,MAAA,MAAM,QAAQ,IAAI,GAAG;AACV,iBAAA,KAAK,IAAI,iBAAiB;AAAA,EAAA,OAClC;AACL,iBAAa,kBAAkB,IAAI;AAAA,EACrC;AAEA,SAAOC,YAAS,SAAA;AAAA,IACd,CAAC,EAAE,WAAW,OAAO,OAAO,EAAE,UAAU;AAClC,UAAA,WAAW,SAAS,YAAY;AAE9B,YAAA,KAAK,kBAAkB,KAAY,CAAC;AAAA,MAC1C;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;;"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { traverse } from "@strapi/utils";
|
|
2
|
+
import { switchDocumentIdForId } from "./utils.mjs";
|
|
3
|
+
const rootIdReplacement = (sort) => {
|
|
4
|
+
if (typeof sort === "object") {
|
|
5
|
+
return switchDocumentIdForId(sort);
|
|
6
|
+
}
|
|
7
|
+
if (typeof sort === "string") {
|
|
8
|
+
let sortCopy = sort;
|
|
9
|
+
let suffix = "";
|
|
10
|
+
const match = sort.match(/:(\w+)$/);
|
|
11
|
+
if (match) {
|
|
12
|
+
suffix = match[0];
|
|
13
|
+
sortCopy = sort.replace(suffix, "");
|
|
14
|
+
}
|
|
15
|
+
if (sortCopy === "id") {
|
|
16
|
+
sortCopy = "documentId";
|
|
17
|
+
} else {
|
|
18
|
+
sortCopy = sortCopy.split(",").map((value) => value === "id" ? "documentId" : value).join(",");
|
|
19
|
+
}
|
|
20
|
+
return sortCopy + suffix;
|
|
21
|
+
}
|
|
22
|
+
return sort;
|
|
23
|
+
};
|
|
24
|
+
const transformSort = async (sort, opts) => {
|
|
25
|
+
let mappedSort;
|
|
26
|
+
if (Array.isArray(sort)) {
|
|
27
|
+
mappedSort = sort.map(rootIdReplacement);
|
|
28
|
+
} else {
|
|
29
|
+
mappedSort = rootIdReplacement(sort);
|
|
30
|
+
}
|
|
31
|
+
return traverse.traverseQuerySort(
|
|
32
|
+
({ attribute, value, key }, { set }) => {
|
|
33
|
+
if (attribute?.type === "relation") {
|
|
34
|
+
set(key, rootIdReplacement(value));
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
{ schema: strapi.getModel(opts.uid) },
|
|
38
|
+
mappedSort
|
|
39
|
+
);
|
|
40
|
+
};
|
|
41
|
+
export {
|
|
42
|
+
transformSort
|
|
43
|
+
};
|
|
44
|
+
//# sourceMappingURL=sort.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sort.mjs","sources":["../../../../src/services/document-service/transform/sort.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { Options, Data } from './types';\nimport { switchDocumentIdForId } from './utils';\n\ntype Sort = Data | string;\n\nconst rootIdReplacement = (sort: Sort) => {\n if (typeof sort === 'object') {\n return switchDocumentIdForId(sort);\n }\n\n if (typeof sort === 'string') {\n let sortCopy = sort;\n let suffix = '';\n const match = sort.match(/:(\\w+)$/);\n if (match) {\n suffix = match[0];\n\n // TODO is there a regex to match :ASC or :DESC?\n sortCopy = sort.replace(suffix, '');\n }\n\n if (sortCopy === 'id') {\n sortCopy = 'documentId';\n } else {\n sortCopy = sortCopy\n .split(',')\n .map((value: any) => (value === 'id' ? 'documentId' : value))\n .join(',');\n }\n\n return sortCopy + suffix;\n }\n\n return sort;\n};\n\nexport const transformSort = async (sort: Sort | Sort[], opts: Options) => {\n let mappedSort;\n\n // Replace any top level 'id' properties with 'documentId'\n if (Array.isArray(sort)) {\n mappedSort = sort.map(rootIdReplacement);\n } else {\n mappedSort = rootIdReplacement(sort);\n }\n\n return traverse.traverseQuerySort(\n ({ attribute, value, key }, { set }) => {\n if (attribute?.type === 'relation') {\n // Replace any relation 'id' properties with 'documentId'\n set(key, rootIdReplacement(value as any));\n }\n },\n { schema: strapi.getModel(opts.uid) },\n mappedSort\n );\n};\n"],"names":[],"mappings":";;AAMA,MAAM,oBAAoB,CAAC,SAAe;AACpC,MAAA,OAAO,SAAS,UAAU;AAC5B,WAAO,sBAAsB,IAAI;AAAA,EACnC;AAEI,MAAA,OAAO,SAAS,UAAU;AAC5B,QAAI,WAAW;AACf,QAAI,SAAS;AACP,UAAA,QAAQ,KAAK,MAAM,SAAS;AAClC,QAAI,OAAO;AACT,eAAS,MAAM,CAAC;AAGL,iBAAA,KAAK,QAAQ,QAAQ,EAAE;AAAA,IACpC;AAEA,QAAI,aAAa,MAAM;AACV,iBAAA;AAAA,IAAA,OACN;AACL,iBAAW,SACR,MAAM,GAAG,EACT,IAAI,CAAC,UAAgB,UAAU,OAAO,eAAe,KAAM,EAC3D,KAAK,GAAG;AAAA,IACb;AAEA,WAAO,WAAW;AAAA,EACpB;AAEO,SAAA;AACT;AAEa,MAAA,gBAAgB,OAAO,MAAqB,SAAkB;AACrE,MAAA;AAGA,MAAA,MAAM,QAAQ,IAAI,GAAG;AACV,iBAAA,KAAK,IAAI,iBAAiB;AAAA,EAAA,OAClC;AACL,iBAAa,kBAAkB,IAAI;AAAA,EACrC;AAEA,SAAO,SAAS;AAAA,IACd,CAAC,EAAE,WAAW,OAAO,OAAO,EAAE,UAAU;AAClC,UAAA,WAAW,SAAS,YAAY;AAE9B,YAAA,KAAK,kBAAkB,KAAY,CAAC;AAAA,MAC1C;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Common } from '@strapi/types';
|
|
2
|
+
import { type ID } from './relations/utils/types';
|
|
3
|
+
export type Data = {
|
|
4
|
+
id?: ID | object;
|
|
5
|
+
documentId?: ID | object;
|
|
6
|
+
[key: string]: any;
|
|
7
|
+
};
|
|
8
|
+
export type Options = {
|
|
9
|
+
uid: Common.UID.Schema;
|
|
10
|
+
locale?: string | null;
|
|
11
|
+
isDraft: boolean;
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,yBAAyB,CAAC;AAElD,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Replace the documentId field with id
|
|
3
|
+
*/
|
|
4
|
+
export declare const switchIdForDocumentId: (output: Record<string, any>) => Record<string, any>;
|
|
5
|
+
/**
|
|
6
|
+
* Replace the id field for documentId
|
|
7
|
+
*/
|
|
8
|
+
export declare const switchDocumentIdForId: (output: Record<string, any>) => Record<string, any>;
|
|
9
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,qBAAqB,WAAY,OAAO,MAAM,EAAE,GAAG,CAAC,wBAUhE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,WAAY,OAAO,MAAM,EAAE,GAAG,CAAC,wBAUhE,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
+
const switchIdForDocumentId = (output) => {
|
|
4
|
+
const documentId = output?.documentId;
|
|
5
|
+
if (documentId === void 0) {
|
|
6
|
+
return output;
|
|
7
|
+
}
|
|
8
|
+
delete output.documentId;
|
|
9
|
+
output.id = documentId;
|
|
10
|
+
return output;
|
|
11
|
+
};
|
|
12
|
+
const switchDocumentIdForId = (output) => {
|
|
13
|
+
const id = output?.id;
|
|
14
|
+
if (id === void 0) {
|
|
15
|
+
return output;
|
|
16
|
+
}
|
|
17
|
+
delete output.id;
|
|
18
|
+
output.documentId = id;
|
|
19
|
+
return output;
|
|
20
|
+
};
|
|
21
|
+
exports.switchDocumentIdForId = switchDocumentIdForId;
|
|
22
|
+
exports.switchIdForDocumentId = switchIdForDocumentId;
|
|
23
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sources":["../../../../src/services/document-service/transform/utils.ts"],"sourcesContent":["/**\n * Replace the documentId field with id\n */\nexport const switchIdForDocumentId = (output: Record<string, any>) => {\n // Mutating for performance reasons\n const documentId = output?.documentId;\n if (documentId === undefined) {\n return output;\n }\n\n delete output.documentId;\n output.id = documentId;\n return output;\n};\n\n/**\n * Replace the id field for documentId\n */\nexport const switchDocumentIdForId = (output: Record<string, any>) => {\n // Mutating for performance reasons\n const id = output?.id;\n if (id === undefined) {\n return output;\n }\n\n delete output.id;\n output.documentId = id;\n return output;\n};\n"],"names":[],"mappings":";;AAGa,MAAA,wBAAwB,CAAC,WAAgC;AAEpE,QAAM,aAAa,QAAQ;AAC3B,MAAI,eAAe,QAAW;AACrB,WAAA;AAAA,EACT;AAEA,SAAO,OAAO;AACd,SAAO,KAAK;AACL,SAAA;AACT;AAKa,MAAA,wBAAwB,CAAC,WAAgC;AAEpE,QAAM,KAAK,QAAQ;AACnB,MAAI,OAAO,QAAW;AACb,WAAA;AAAA,EACT;AAEA,SAAO,OAAO;AACd,SAAO,aAAa;AACb,SAAA;AACT;;;"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
const switchIdForDocumentId = (output) => {
|
|
2
|
+
const documentId = output?.documentId;
|
|
3
|
+
if (documentId === void 0) {
|
|
4
|
+
return output;
|
|
5
|
+
}
|
|
6
|
+
delete output.documentId;
|
|
7
|
+
output.id = documentId;
|
|
8
|
+
return output;
|
|
9
|
+
};
|
|
10
|
+
const switchDocumentIdForId = (output) => {
|
|
11
|
+
const id = output?.id;
|
|
12
|
+
if (id === void 0) {
|
|
13
|
+
return output;
|
|
14
|
+
}
|
|
15
|
+
delete output.id;
|
|
16
|
+
output.documentId = id;
|
|
17
|
+
return output;
|
|
18
|
+
};
|
|
19
|
+
export {
|
|
20
|
+
switchDocumentIdForId,
|
|
21
|
+
switchIdForDocumentId
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=utils.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.mjs","sources":["../../../../src/services/document-service/transform/utils.ts"],"sourcesContent":["/**\n * Replace the documentId field with id\n */\nexport const switchIdForDocumentId = (output: Record<string, any>) => {\n // Mutating for performance reasons\n const documentId = output?.documentId;\n if (documentId === undefined) {\n return output;\n }\n\n delete output.documentId;\n output.id = documentId;\n return output;\n};\n\n/**\n * Replace the id field for documentId\n */\nexport const switchDocumentIdForId = (output: Record<string, any>) => {\n // Mutating for performance reasons\n const id = output?.id;\n if (id === undefined) {\n return output;\n }\n\n delete output.id;\n output.documentId = id;\n return output;\n};\n"],"names":[],"mappings":"AAGa,MAAA,wBAAwB,CAAC,WAAgC;AAEpE,QAAM,aAAa,QAAQ;AAC3B,MAAI,eAAe,QAAW;AACrB,WAAA;AAAA,EACT;AAEA,SAAO,OAAO;AACd,SAAO,KAAK;AACL,SAAA;AACT;AAKa,MAAA,wBAAwB,CAAC,WAAgC;AAEpE,QAAM,KAAK,QAAQ;AACnB,MAAI,OAAO,QAAW;AACb,WAAA;AAAA,EACT;AAEA,SAAO,OAAO;AACd,SAAO,aAAa;AACb,SAAA;AACT;"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/utils/populate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAIvC,eAAO,MAAM,eAAe,QAAS,OAAO,GAAG,CAAC,MAAM,QA8CrD,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
+
const strapiUtils = require("@strapi/utils");
|
|
4
|
+
const getDeepPopulate = (uid) => {
|
|
5
|
+
const model = strapi.getModel(uid);
|
|
6
|
+
const attributes = Object.entries(model.attributes);
|
|
7
|
+
return attributes.reduce((acc, [attributeName, attribute]) => {
|
|
8
|
+
switch (attribute.type) {
|
|
9
|
+
case "relation": {
|
|
10
|
+
const isVisible = strapiUtils.contentTypes.isVisibleAttribute(model, attributeName);
|
|
11
|
+
if (isVisible) {
|
|
12
|
+
acc[attributeName] = { fields: ["document_id", "locale"] };
|
|
13
|
+
}
|
|
14
|
+
break;
|
|
15
|
+
}
|
|
16
|
+
case "media": {
|
|
17
|
+
acc[attributeName] = { fields: ["id"] };
|
|
18
|
+
break;
|
|
19
|
+
}
|
|
20
|
+
case "component": {
|
|
21
|
+
const populate = getDeepPopulate(attribute.component);
|
|
22
|
+
acc[attributeName] = { populate };
|
|
23
|
+
break;
|
|
24
|
+
}
|
|
25
|
+
case "dynamiczone": {
|
|
26
|
+
const populatedComponents = (attribute.components || []).reduce(
|
|
27
|
+
(acc2, componentUID) => {
|
|
28
|
+
acc2[componentUID] = { populate: getDeepPopulate(componentUID) };
|
|
29
|
+
return acc2;
|
|
30
|
+
},
|
|
31
|
+
{}
|
|
32
|
+
);
|
|
33
|
+
acc[attributeName] = { on: populatedComponents };
|
|
34
|
+
break;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return acc;
|
|
38
|
+
}, {});
|
|
39
|
+
};
|
|
40
|
+
exports.getDeepPopulate = getDeepPopulate;
|
|
41
|
+
//# sourceMappingURL=populate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: Common.UID.Schema) => {\n const model = strapi.getModel(uid);\n const attributes = Object.entries(model.attributes);\n\n return attributes.reduce((acc: any, [attributeName, attribute]) => {\n switch (attribute.type) {\n case 'relation': {\n // TODO: Should this just be a plain list?\n // Ignore createdBy, updatedBy, ...\n const isVisible = contentTypes.isVisibleAttribute(model, attributeName);\n if (isVisible) {\n acc[attributeName] = { fields: ['document_id', 'locale'] };\n }\n break;\n }\n\n case 'media': {\n acc[attributeName] = { fields: ['id'] };\n break;\n }\n\n case 'component': {\n const populate = getDeepPopulate(attribute.component);\n acc[attributeName] = { populate };\n break;\n }\n\n case 'dynamiczone': {\n // Use fragments to populate the dynamic zone components\n const populatedComponents = (attribute.components || []).reduce(\n (acc: any, componentUID: Common.UID.Component) => {\n acc[componentUID] = { populate: getDeepPopulate(componentUID) };\n return acc;\n },\n {}\n );\n\n acc[attributeName] = { on: populatedComponents };\n break;\n }\n default:\n break;\n }\n\n return acc;\n }, {});\n};\n"],"names":["contentTypes","acc"],"mappings":";;;AAIa,MAAA,kBAAkB,CAAC,QAA2B;AACnD,QAAA,QAAQ,OAAO,SAAS,GAAG;AACjC,QAAM,aAAa,OAAO,QAAQ,MAAM,UAAU;AAElD,SAAO,WAAW,OAAO,CAAC,KAAU,CAAC,eAAe,SAAS,MAAM;AACjE,YAAQ,UAAU,MAAM;AAAA,MACtB,KAAK,YAAY;AAGf,cAAM,YAAYA,YAAA,aAAa,mBAAmB,OAAO,aAAa;AACtE,YAAI,WAAW;AACb,cAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,eAAe,QAAQ;QACzD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AACV,cAAA,WAAW,gBAAgB,UAAU,SAAS;AAChD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACC,MAAU,iBAAuC;AAChDA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,YAAY;AACrDA,mBAAAA;AAAAA,UACT;AAAA,UACA,CAAC;AAAA,QAAA;AAGH,YAAI,aAAa,IAAI,EAAE,IAAI,oBAAoB;AAC/C;AAAA,MACF;AAAA,IAGF;AAEO,WAAA;AAAA,EACT,GAAG,CAAE,CAAA;AACP;;"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { contentTypes } from "@strapi/utils";
|
|
2
|
+
const getDeepPopulate = (uid) => {
|
|
3
|
+
const model = strapi.getModel(uid);
|
|
4
|
+
const attributes = Object.entries(model.attributes);
|
|
5
|
+
return attributes.reduce((acc, [attributeName, attribute]) => {
|
|
6
|
+
switch (attribute.type) {
|
|
7
|
+
case "relation": {
|
|
8
|
+
const isVisible = contentTypes.isVisibleAttribute(model, attributeName);
|
|
9
|
+
if (isVisible) {
|
|
10
|
+
acc[attributeName] = { fields: ["document_id", "locale"] };
|
|
11
|
+
}
|
|
12
|
+
break;
|
|
13
|
+
}
|
|
14
|
+
case "media": {
|
|
15
|
+
acc[attributeName] = { fields: ["id"] };
|
|
16
|
+
break;
|
|
17
|
+
}
|
|
18
|
+
case "component": {
|
|
19
|
+
const populate = getDeepPopulate(attribute.component);
|
|
20
|
+
acc[attributeName] = { populate };
|
|
21
|
+
break;
|
|
22
|
+
}
|
|
23
|
+
case "dynamiczone": {
|
|
24
|
+
const populatedComponents = (attribute.components || []).reduce(
|
|
25
|
+
(acc2, componentUID) => {
|
|
26
|
+
acc2[componentUID] = { populate: getDeepPopulate(componentUID) };
|
|
27
|
+
return acc2;
|
|
28
|
+
},
|
|
29
|
+
{}
|
|
30
|
+
);
|
|
31
|
+
acc[attributeName] = { on: populatedComponents };
|
|
32
|
+
break;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return acc;
|
|
36
|
+
}, {});
|
|
37
|
+
};
|
|
38
|
+
export {
|
|
39
|
+
getDeepPopulate
|
|
40
|
+
};
|
|
41
|
+
//# sourceMappingURL=populate.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: Common.UID.Schema) => {\n const model = strapi.getModel(uid);\n const attributes = Object.entries(model.attributes);\n\n return attributes.reduce((acc: any, [attributeName, attribute]) => {\n switch (attribute.type) {\n case 'relation': {\n // TODO: Should this just be a plain list?\n // Ignore createdBy, updatedBy, ...\n const isVisible = contentTypes.isVisibleAttribute(model, attributeName);\n if (isVisible) {\n acc[attributeName] = { fields: ['document_id', 'locale'] };\n }\n break;\n }\n\n case 'media': {\n acc[attributeName] = { fields: ['id'] };\n break;\n }\n\n case 'component': {\n const populate = getDeepPopulate(attribute.component);\n acc[attributeName] = { populate };\n break;\n }\n\n case 'dynamiczone': {\n // Use fragments to populate the dynamic zone components\n const populatedComponents = (attribute.components || []).reduce(\n (acc: any, componentUID: Common.UID.Component) => {\n acc[componentUID] = { populate: getDeepPopulate(componentUID) };\n return acc;\n },\n {}\n );\n\n acc[attributeName] = { on: populatedComponents };\n break;\n }\n default:\n break;\n }\n\n return acc;\n }, {});\n};\n"],"names":["acc"],"mappings":";AAIa,MAAA,kBAAkB,CAAC,QAA2B;AACnD,QAAA,QAAQ,OAAO,SAAS,GAAG;AACjC,QAAM,aAAa,OAAO,QAAQ,MAAM,UAAU;AAElD,SAAO,WAAW,OAAO,CAAC,KAAU,CAAC,eAAe,SAAS,MAAM;AACjE,YAAQ,UAAU,MAAM;AAAA,MACtB,KAAK,YAAY;AAGf,cAAM,YAAY,aAAa,mBAAmB,OAAO,aAAa;AACtE,YAAI,WAAW;AACb,cAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,eAAe,QAAQ;QACzD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AACV,cAAA,WAAW,gBAAgB,UAAU,SAAS;AAChD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACA,MAAU,iBAAuC;AAChDA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,YAAY;AACrDA,mBAAAA;AAAAA,UACT;AAAA,UACA,CAAC;AAAA,QAAA;AAGH,YAAI,aAAa,IAAI,EAAE,IAAI,oBAAoB;AAC/C;AAAA,MACF;AAAA,IAGF;AAEO,WAAA;AAAA,EACT,GAAG,CAAE,CAAA;AACP;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocks-validator.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"blocks-validator.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;gCAyKb,GAAG,WAAW,GAAG;AAAxC,wBAA6D"}
|
|
@@ -15,9 +15,17 @@ const textNodeValidator = strapiUtils.yup.object().shape({
|
|
|
15
15
|
strikethrough: strapiUtils.yup.boolean(),
|
|
16
16
|
code: strapiUtils.yup.boolean()
|
|
17
17
|
});
|
|
18
|
+
const checkValidLink = (link) => {
|
|
19
|
+
try {
|
|
20
|
+
new URL(link.startsWith("/") ? `https://strapi.io${link}` : link);
|
|
21
|
+
} catch (error) {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
return true;
|
|
25
|
+
};
|
|
18
26
|
const linkNodeValidator = strapiUtils.yup.object().shape({
|
|
19
27
|
type: strapiUtils.yup.string().equals(["link"]).required(),
|
|
20
|
-
url: strapiUtils.yup.string().url()
|
|
28
|
+
url: strapiUtils.yup.string().test("invalid-url", "Please specify a valid link.", (value) => checkValidLink(value ?? "")),
|
|
21
29
|
children: strapiUtils.yup.array().of(textNodeValidator).required()
|
|
22
30
|
});
|
|
23
31
|
const inlineNodeValidator = strapiUtils.yup.lazy((value) => {
|
|
@@ -54,10 +62,22 @@ const listItemNode = strapiUtils.yup.object().shape({
|
|
|
54
62
|
type: strapiUtils.yup.string().equals(["list-item"]).required(),
|
|
55
63
|
children: strapiUtils.yup.array().of(inlineNodeValidator).required()
|
|
56
64
|
});
|
|
65
|
+
const listChildrenValidator = strapiUtils.yup.lazy((value) => {
|
|
66
|
+
switch (value.type) {
|
|
67
|
+
case "list":
|
|
68
|
+
return listNodeValidator;
|
|
69
|
+
case "list-item":
|
|
70
|
+
return listItemNode;
|
|
71
|
+
default:
|
|
72
|
+
return strapiUtils.yup.mixed().test("invalid-type", "Inline node must be list-item or list", () => {
|
|
73
|
+
return false;
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
});
|
|
57
77
|
const listNodeValidator = strapiUtils.yup.object().shape({
|
|
58
78
|
type: strapiUtils.yup.string().equals(["list"]).required(),
|
|
59
79
|
format: strapiUtils.yup.string().equals(["ordered", "unordered"]).required(),
|
|
60
|
-
children: strapiUtils.yup.array().of(
|
|
80
|
+
children: strapiUtils.yup.array().of(listChildrenValidator).min(1, "List node children must have at least one ListItem or ListNode").required()
|
|
61
81
|
});
|
|
62
82
|
const imageNodeValidator = strapiUtils.yup.object().shape({
|
|
63
83
|
type: strapiUtils.yup.string().equals(["image"]).required(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocks-validator.js","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\n\nconst textNodeValidator = yup.object().shape({\n type: yup.string().equals(['text']).required(),\n text: yup\n .string()\n .test(\n 'is-valid-text',\n 'Text must be defined with at least an empty string',\n (text: unknown) => {\n return typeof text === 'string' || text === '';\n }\n ),\n bold: yup.boolean(),\n italic: yup.boolean(),\n underline: yup.boolean(),\n strikethrough: yup.boolean(),\n code: yup.boolean(),\n});\n\nconst linkNodeValidator = yup.object().shape({\n type: yup.string().equals(['link']).required(),\n url: yup.string().url()
|
|
1
|
+
{"version":3,"file":"blocks-validator.js","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\n\nconst textNodeValidator = yup.object().shape({\n type: yup.string().equals(['text']).required(),\n text: yup\n .string()\n .test(\n 'is-valid-text',\n 'Text must be defined with at least an empty string',\n (text: unknown) => {\n return typeof text === 'string' || text === '';\n }\n ),\n bold: yup.boolean(),\n italic: yup.boolean(),\n underline: yup.boolean(),\n strikethrough: yup.boolean(),\n code: yup.boolean(),\n});\n\nconst checkValidLink = (link: string) => {\n try {\n // eslint-disable-next-line no-new\n new URL(link.startsWith('/') ? `https://strapi.io${link}` : link);\n } catch (error) {\n return false;\n }\n return true;\n};\n\nconst linkNodeValidator = yup.object().shape({\n type: yup.string().equals(['link']).required(),\n url: yup\n .string()\n .test('invalid-url', 'Please specify a valid link.', (value) => checkValidLink(value ?? '')),\n children: yup.array().of(textNodeValidator).required(),\n});\n\n// TODO: remove any with a correct Type\nconst inlineNodeValidator: any = yup.lazy((value: { type: string }) => {\n switch (value.type) {\n case 'text':\n return textNodeValidator;\n case 'link':\n return linkNodeValidator;\n default:\n return yup.mixed().test('invalid-type', 'Inline node must be Text or Link', () => {\n return false;\n });\n }\n});\n\nconst paragraphNodeValidator = yup.object().shape({\n type: yup.string().equals(['paragraph']).required(),\n children: yup\n .array()\n .of(inlineNodeValidator)\n .min(1, 'Paragraph node children must have at least one Text or Link node')\n .required(),\n});\n\nconst headingNodeValidator = yup.object().shape({\n type: yup.string().equals(['heading']).required(),\n level: yup.number().oneOf([1, 2, 3, 4, 5, 6]).required(),\n children: yup\n .array()\n .of(inlineNodeValidator)\n .min(1, 'Heading node children must have at least one Text or Link node')\n .required(),\n});\n\nconst quoteNodeValidator = yup.object().shape({\n type: yup.string().equals(['quote']).required(),\n children: yup\n .array()\n .of(inlineNodeValidator)\n .min(1, 'Quote node children must have at least one Text or Link node')\n .required(),\n});\n\nconst codeBlockValidator = yup.object().shape({\n type: yup.string().equals(['code']).required(),\n syntax: yup.string().nullable(),\n children: yup\n .array()\n .of(textNodeValidator)\n .min(1, 'Quote node children must have at least one Text or Link node')\n .required(),\n});\n\nconst listItemNode = yup.object().shape({\n type: yup.string().equals(['list-item']).required(),\n children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// Allow children to be either a listItemNode or a listNode itself\n// @ts-expect-error - listChildrenValidator needs a type\nconst listChildrenValidator = yup.lazy((value: { type: string }) => {\n switch (value.type) {\n case 'list':\n return listNodeValidator;\n case 'list-item':\n return listItemNode;\n default:\n return yup.mixed().test('invalid-type', 'Inline node must be list-item or list', () => {\n return false;\n });\n }\n});\n\n// @ts-expect-error - listNodeValidator needs a type\nconst listNodeValidator = yup.object().shape({\n type: yup.string().equals(['list']).required(),\n format: yup.string().equals(['ordered', 'unordered']).required(),\n children: yup\n .array()\n .of(listChildrenValidator)\n .min(1, 'List node children must have at least one ListItem or ListNode')\n .required(),\n});\n\nconst imageNodeValidator = yup.object().shape({\n type: yup.string().equals(['image']).required(),\n image: yup.object().shape({\n name: yup.string().required(),\n alternativeText: yup.string().nullable(),\n url: yup.string().required(),\n caption: yup.string().nullable(),\n width: yup.number().required(),\n height: yup.number().required(),\n formats: yup.object().required(),\n hash: yup.string().required(),\n ext: yup.string().required(),\n mime: yup.string().required(),\n size: yup.number().required(),\n previewUrl: yup.string().nullable(),\n provider: yup.string().required(),\n provider_metadata: yup.mixed().nullable(),\n createdAt: yup.string().required(),\n updatedAt: yup.string().required(),\n }),\n children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// TODO: remove the any and replace with a correct Type\nconst blockNodeValidator: any = yup.lazy((value: { type: string }) => {\n switch (value.type) {\n case 'paragraph':\n return paragraphNodeValidator;\n case 'heading':\n return headingNodeValidator;\n case 'quote':\n return quoteNodeValidator;\n case 'list':\n return listNodeValidator;\n case 'image':\n return imageNodeValidator;\n case 'code':\n return codeBlockValidator;\n default:\n return yup.mixed().test('invalid-type', 'Block node is of invalid type', () => {\n return false;\n });\n }\n});\n\nconst blocksValidator = yup.array().of(blockNodeValidator);\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nexport default (metas: any, options: any) => blocksValidator;\n"],"names":["yup"],"mappings":"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"}
|
|
@@ -14,9 +14,17 @@ const textNodeValidator = yup.object().shape({
|
|
|
14
14
|
strikethrough: yup.boolean(),
|
|
15
15
|
code: yup.boolean()
|
|
16
16
|
});
|
|
17
|
+
const checkValidLink = (link) => {
|
|
18
|
+
try {
|
|
19
|
+
new URL(link.startsWith("/") ? `https://strapi.io${link}` : link);
|
|
20
|
+
} catch (error) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
return true;
|
|
24
|
+
};
|
|
17
25
|
const linkNodeValidator = yup.object().shape({
|
|
18
26
|
type: yup.string().equals(["link"]).required(),
|
|
19
|
-
url: yup.string().url()
|
|
27
|
+
url: yup.string().test("invalid-url", "Please specify a valid link.", (value) => checkValidLink(value ?? "")),
|
|
20
28
|
children: yup.array().of(textNodeValidator).required()
|
|
21
29
|
});
|
|
22
30
|
const inlineNodeValidator = yup.lazy((value) => {
|
|
@@ -53,10 +61,22 @@ const listItemNode = yup.object().shape({
|
|
|
53
61
|
type: yup.string().equals(["list-item"]).required(),
|
|
54
62
|
children: yup.array().of(inlineNodeValidator).required()
|
|
55
63
|
});
|
|
64
|
+
const listChildrenValidator = yup.lazy((value) => {
|
|
65
|
+
switch (value.type) {
|
|
66
|
+
case "list":
|
|
67
|
+
return listNodeValidator;
|
|
68
|
+
case "list-item":
|
|
69
|
+
return listItemNode;
|
|
70
|
+
default:
|
|
71
|
+
return yup.mixed().test("invalid-type", "Inline node must be list-item or list", () => {
|
|
72
|
+
return false;
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
});
|
|
56
76
|
const listNodeValidator = yup.object().shape({
|
|
57
77
|
type: yup.string().equals(["list"]).required(),
|
|
58
78
|
format: yup.string().equals(["ordered", "unordered"]).required(),
|
|
59
|
-
children: yup.array().of(
|
|
79
|
+
children: yup.array().of(listChildrenValidator).min(1, "List node children must have at least one ListItem or ListNode").required()
|
|
60
80
|
});
|
|
61
81
|
const imageNodeValidator = yup.object().shape({
|
|
62
82
|
type: yup.string().equals(["image"]).required(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocks-validator.mjs","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\n\nconst textNodeValidator = yup.object().shape({\n type: yup.string().equals(['text']).required(),\n text: yup\n .string()\n .test(\n 'is-valid-text',\n 'Text must be defined with at least an empty string',\n (text: unknown) => {\n return typeof text === 'string' || text === '';\n }\n ),\n bold: yup.boolean(),\n italic: yup.boolean(),\n underline: yup.boolean(),\n strikethrough: yup.boolean(),\n code: yup.boolean(),\n});\n\nconst linkNodeValidator = yup.object().shape({\n type: yup.string().equals(['link']).required(),\n url: yup.string().url()
|
|
1
|
+
{"version":3,"file":"blocks-validator.mjs","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\n\nconst textNodeValidator = yup.object().shape({\n type: yup.string().equals(['text']).required(),\n text: yup\n .string()\n .test(\n 'is-valid-text',\n 'Text must be defined with at least an empty string',\n (text: unknown) => {\n return typeof text === 'string' || text === '';\n }\n ),\n bold: yup.boolean(),\n italic: yup.boolean(),\n underline: yup.boolean(),\n strikethrough: yup.boolean(),\n code: yup.boolean(),\n});\n\nconst checkValidLink = (link: string) => {\n try {\n // eslint-disable-next-line no-new\n new URL(link.startsWith('/') ? `https://strapi.io${link}` : link);\n } catch (error) {\n return false;\n }\n return true;\n};\n\nconst linkNodeValidator = yup.object().shape({\n type: yup.string().equals(['link']).required(),\n url: yup\n .string()\n .test('invalid-url', 'Please specify a valid link.', (value) => checkValidLink(value ?? '')),\n children: yup.array().of(textNodeValidator).required(),\n});\n\n// TODO: remove any with a correct Type\nconst inlineNodeValidator: any = yup.lazy((value: { type: string }) => {\n switch (value.type) {\n case 'text':\n return textNodeValidator;\n case 'link':\n return linkNodeValidator;\n default:\n return yup.mixed().test('invalid-type', 'Inline node must be Text or Link', () => {\n return false;\n });\n }\n});\n\nconst paragraphNodeValidator = yup.object().shape({\n type: yup.string().equals(['paragraph']).required(),\n children: yup\n .array()\n .of(inlineNodeValidator)\n .min(1, 'Paragraph node children must have at least one Text or Link node')\n .required(),\n});\n\nconst headingNodeValidator = yup.object().shape({\n type: yup.string().equals(['heading']).required(),\n level: yup.number().oneOf([1, 2, 3, 4, 5, 6]).required(),\n children: yup\n .array()\n .of(inlineNodeValidator)\n .min(1, 'Heading node children must have at least one Text or Link node')\n .required(),\n});\n\nconst quoteNodeValidator = yup.object().shape({\n type: yup.string().equals(['quote']).required(),\n children: yup\n .array()\n .of(inlineNodeValidator)\n .min(1, 'Quote node children must have at least one Text or Link node')\n .required(),\n});\n\nconst codeBlockValidator = yup.object().shape({\n type: yup.string().equals(['code']).required(),\n syntax: yup.string().nullable(),\n children: yup\n .array()\n .of(textNodeValidator)\n .min(1, 'Quote node children must have at least one Text or Link node')\n .required(),\n});\n\nconst listItemNode = yup.object().shape({\n type: yup.string().equals(['list-item']).required(),\n children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// Allow children to be either a listItemNode or a listNode itself\n// @ts-expect-error - listChildrenValidator needs a type\nconst listChildrenValidator = yup.lazy((value: { type: string }) => {\n switch (value.type) {\n case 'list':\n return listNodeValidator;\n case 'list-item':\n return listItemNode;\n default:\n return yup.mixed().test('invalid-type', 'Inline node must be list-item or list', () => {\n return false;\n });\n }\n});\n\n// @ts-expect-error - listNodeValidator needs a type\nconst listNodeValidator = yup.object().shape({\n type: yup.string().equals(['list']).required(),\n format: yup.string().equals(['ordered', 'unordered']).required(),\n children: yup\n .array()\n .of(listChildrenValidator)\n .min(1, 'List node children must have at least one ListItem or ListNode')\n .required(),\n});\n\nconst imageNodeValidator = yup.object().shape({\n type: yup.string().equals(['image']).required(),\n image: yup.object().shape({\n name: yup.string().required(),\n alternativeText: yup.string().nullable(),\n url: yup.string().required(),\n caption: yup.string().nullable(),\n width: yup.number().required(),\n height: yup.number().required(),\n formats: yup.object().required(),\n hash: yup.string().required(),\n ext: yup.string().required(),\n mime: yup.string().required(),\n size: yup.number().required(),\n previewUrl: yup.string().nullable(),\n provider: yup.string().required(),\n provider_metadata: yup.mixed().nullable(),\n createdAt: yup.string().required(),\n updatedAt: yup.string().required(),\n }),\n children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// TODO: remove the any and replace with a correct Type\nconst blockNodeValidator: any = yup.lazy((value: { type: string }) => {\n switch (value.type) {\n case 'paragraph':\n return paragraphNodeValidator;\n case 'heading':\n return headingNodeValidator;\n case 'quote':\n return quoteNodeValidator;\n case 'list':\n return listNodeValidator;\n case 'image':\n return imageNodeValidator;\n case 'code':\n return codeBlockValidator;\n default:\n return yup.mixed().test('invalid-type', 'Block node is of invalid type', () => {\n return false;\n });\n }\n});\n\nconst blocksValidator = yup.array().of(blockNodeValidator);\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nexport default (metas: any, options: any) => blocksValidator;\n"],"names":[],"mappings":";AAEA,MAAM,oBAAoB,IAAI,OAAO,EAAE,MAAM;AAAA,EAC3C,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS;AAAA,EAC7C,MAAM,IACH,OAAA,EACA;AAAA,IACC;AAAA,IACA;AAAA,IACA,CAAC,SAAkB;AACV,aAAA,OAAO,SAAS,YAAY,SAAS;AAAA,IAC9C;AAAA,EACF;AAAA,EACF,MAAM,IAAI,QAAQ;AAAA,EAClB,QAAQ,IAAI,QAAQ;AAAA,EACpB,WAAW,IAAI,QAAQ;AAAA,EACvB,eAAe,IAAI,QAAQ;AAAA,EAC3B,MAAM,IAAI,QAAQ;AACpB,CAAC;AAED,MAAM,iBAAiB,CAAC,SAAiB;AACnC,MAAA;AAEE,QAAA,IAAI,KAAK,WAAW,GAAG,IAAI,oBAAoB,IAAI,KAAK,IAAI;AAAA,WACzD,OAAO;AACP,WAAA;AAAA,EACT;AACO,SAAA;AACT;AAEA,MAAM,oBAAoB,IAAI,OAAO,EAAE,MAAM;AAAA,EAC3C,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS;AAAA,EAC7C,KAAK,IACF,OAAO,EACP,KAAK,eAAe,gCAAgC,CAAC,UAAU,eAAe,SAAS,EAAE,CAAC;AAAA,EAC7F,UAAU,IAAI,MAAA,EAAQ,GAAG,iBAAiB,EAAE,SAAS;AACvD,CAAC;AAGD,MAAM,sBAA2B,IAAI,KAAK,CAAC,UAA4B;AACrE,UAAQ,MAAM,MAAM;AAAA,IAClB,KAAK;AACI,aAAA;AAAA,IACT,KAAK;AACI,aAAA;AAAA,IACT;AACE,aAAO,IAAI,MAAM,EAAE,KAAK,gBAAgB,oCAAoC,MAAM;AACzE,eAAA;AAAA,MAAA,CACR;AAAA,EACL;AACF,CAAC;AAED,MAAM,yBAAyB,IAAI,OAAO,EAAE,MAAM;AAAA,EAChD,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,SAAS;AAAA,EAClD,UAAU,IACP,MACA,EAAA,GAAG,mBAAmB,EACtB,IAAI,GAAG,kEAAkE,EACzE,SAAS;AACd,CAAC;AAED,MAAM,uBAAuB,IAAI,OAAO,EAAE,MAAM;AAAA,EAC9C,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;AAAA,EAChD,OAAO,IAAI,SAAS,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,EAAE,SAAS;AAAA,EACvD,UAAU,IACP,MACA,EAAA,GAAG,mBAAmB,EACtB,IAAI,GAAG,gEAAgE,EACvE,SAAS;AACd,CAAC;AAED,MAAM,qBAAqB,IAAI,OAAO,EAAE,MAAM;AAAA,EAC5C,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS;AAAA,EAC9C,UAAU,IACP,MACA,EAAA,GAAG,mBAAmB,EACtB,IAAI,GAAG,8DAA8D,EACrE,SAAS;AACd,CAAC;AAED,MAAM,qBAAqB,IAAI,OAAO,EAAE,MAAM;AAAA,EAC5C,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS;AAAA,EAC7C,QAAQ,IAAI,OAAO,EAAE,SAAS;AAAA,EAC9B,UAAU,IACP,MACA,EAAA,GAAG,iBAAiB,EACpB,IAAI,GAAG,8DAA8D,EACrE,SAAS;AACd,CAAC;AAED,MAAM,eAAe,IAAI,OAAO,EAAE,MAAM;AAAA,EACtC,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,SAAS;AAAA,EAClD,UAAU,IAAI,MAAA,EAAQ,GAAG,mBAAmB,EAAE,SAAS;AACzD,CAAC;AAID,MAAM,wBAAwB,IAAI,KAAK,CAAC,UAA4B;AAClE,UAAQ,MAAM,MAAM;AAAA,IAClB,KAAK;AACI,aAAA;AAAA,IACT,KAAK;AACI,aAAA;AAAA,IACT;AACE,aAAO,IAAI,MAAM,EAAE,KAAK,gBAAgB,yCAAyC,MAAM;AAC9E,eAAA;AAAA,MAAA,CACR;AAAA,EACL;AACF,CAAC;AAGD,MAAM,oBAAoB,IAAI,OAAO,EAAE,MAAM;AAAA,EAC3C,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS;AAAA,EAC7C,QAAQ,IAAI,SAAS,OAAO,CAAC,WAAW,WAAW,CAAC,EAAE,SAAS;AAAA,EAC/D,UAAU,IACP,MACA,EAAA,GAAG,qBAAqB,EACxB,IAAI,GAAG,gEAAgE,EACvE,SAAS;AACd,CAAC;AAED,MAAM,qBAAqB,IAAI,OAAO,EAAE,MAAM;AAAA,EAC5C,MAAM,IAAI,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS;AAAA,EAC9C,OAAO,IAAI,OAAO,EAAE,MAAM;AAAA,IACxB,MAAM,IAAI,OAAO,EAAE,SAAS;AAAA,IAC5B,iBAAiB,IAAI,OAAO,EAAE,SAAS;AAAA,IACvC,KAAK,IAAI,OAAO,EAAE,SAAS;AAAA,IAC3B,SAAS,IAAI,OAAO,EAAE,SAAS;AAAA,IAC/B,OAAO,IAAI,OAAO,EAAE,SAAS;AAAA,IAC7B,QAAQ,IAAI,OAAO,EAAE,SAAS;AAAA,IAC9B,SAAS,IAAI,OAAO,EAAE,SAAS;AAAA,IAC/B,MAAM,IAAI,OAAO,EAAE,SAAS;AAAA,IAC5B,KAAK,IAAI,OAAO,EAAE,SAAS;AAAA,IAC3B,MAAM,IAAI,OAAO,EAAE,SAAS;AAAA,IAC5B,MAAM,IAAI,OAAO,EAAE,SAAS;AAAA,IAC5B,YAAY,IAAI,OAAO,EAAE,SAAS;AAAA,IAClC,UAAU,IAAI,OAAO,EAAE,SAAS;AAAA,IAChC,mBAAmB,IAAI,MAAM,EAAE,SAAS;AAAA,IACxC,WAAW,IAAI,OAAO,EAAE,SAAS;AAAA,IACjC,WAAW,IAAI,OAAO,EAAE,SAAS;AAAA,EAAA,CAClC;AAAA,EACD,UAAU,IAAI,MAAA,EAAQ,GAAG,mBAAmB,EAAE,SAAS;AACzD,CAAC;AAGD,MAAM,qBAA0B,IAAI,KAAK,CAAC,UAA4B;AACpE,UAAQ,MAAM,MAAM;AAAA,IAClB,KAAK;AACI,aAAA;AAAA,IACT,KAAK;AACI,aAAA;AAAA,IACT,KAAK;AACI,aAAA;AAAA,IACT,KAAK;AACI,aAAA;AAAA,IACT,KAAK;AACI,aAAA;AAAA,IACT,KAAK;AACI,aAAA;AAAA,IACT;AACE,aAAO,IAAI,MAAM,EAAE,KAAK,gBAAgB,iCAAiC,MAAM;AACtE,eAAA;AAAA,MAAA,CACR;AAAA,EACL;AACF,CAAC;AAED,MAAM,kBAAkB,IAAI,MAAM,EAAE,GAAG,kBAAkB;AAGzD,MAAA,oBAAe,CAAC,OAAY,YAAiB;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/validators.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKvD,UAAU,cAAc,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG;IACvD,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC;IAC1B,gBAAgB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CACxC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/validators.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKvD,UAAU,cAAc,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG;IACvD,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC;IAC1B,gBAAgB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CACxC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;;;;;;;;;;;;;;;;;;;;;AA0PD,wBAmBE"}
|
|
@@ -39,18 +39,17 @@ const addUniqueValidator = (validator, { attr, model, updatedAttribute, entity }
|
|
|
39
39
|
}
|
|
40
40
|
return validator.test("unique", "This attribute must be unique", async (value) => {
|
|
41
41
|
const isPublish = options.isDraft === false;
|
|
42
|
-
|
|
43
|
-
if (___default.default.isNil(valueToCheck)) {
|
|
42
|
+
if (___default.default.isNil(value)) {
|
|
44
43
|
return true;
|
|
45
44
|
}
|
|
46
|
-
if (!isPublish &&
|
|
45
|
+
if (!isPublish && value === entity?.[updatedAttribute.name]) {
|
|
47
46
|
return true;
|
|
48
47
|
}
|
|
49
|
-
const record = await strapi.
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
[updatedAttribute.name]:
|
|
48
|
+
const record = await strapi.db.query(model.uid).findOne({
|
|
49
|
+
where: {
|
|
50
|
+
locale: options.locale,
|
|
51
|
+
publishedAt: options.isDraft ? null : { $notNull: true },
|
|
52
|
+
[updatedAttribute.name]: value,
|
|
54
53
|
...entity?.id ? { id: { $ne: entity.id } } : {}
|
|
55
54
|
}
|
|
56
55
|
});
|