@strapi/core 0.0.0-experimental.020096d91bef5bab5a6c32b4216da5aeb9383d33 → 0.0.0-experimental.18019758d6ccd252f2f00bcc32c191402af2e60a

package/dist/services/document-service/middlewares/errors.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const database = require("@strapi/database");
+const strapiUtils = require("@strapi/utils");
+const databaseErrorsToTransform = [
+  database.errors.InvalidTimeError,
+  database.errors.InvalidDateTimeError,
+  database.errors.InvalidDateError,
+  database.errors.InvalidRelationError
+];
+const databaseErrorsMiddleware = async (ctx, next) => {
+  try {
+    return await next();
+  } catch (error) {
+    if (databaseErrorsToTransform.some((errorToTransform) => error instanceof errorToTransform)) {
+      if (error instanceof Error) {
+        throw new strapiUtils.errors.ValidationError(error.message);
+      }
+      throw error;
+    }
+    throw error;
+  }
+};
+exports.databaseErrorsMiddleware = databaseErrorsMiddleware;
+//# sourceMappingURL=errors.js.map

package/dist/services/document-service/middlewares/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sources":["../../../../src/services/document-service/middlewares/errors.ts"],"sourcesContent":["import { errors as databaseErrors } from '@strapi/database';\nimport { errors } from '@strapi/utils';\n\nimport type { Middleware } from './middleware-manager';\n\nconst databaseErrorsToTransform = [\n  databaseErrors.InvalidTimeError,\n  databaseErrors.InvalidDateTimeError,\n  databaseErrors.InvalidDateError,\n  databaseErrors.InvalidRelationError,\n];\n\n/**\n * Handle database errors\n */\nexport const databaseErrorsMiddleware: Middleware = async (ctx, next) => {\n  try {\n    return await next();\n  } catch (error) {\n    if (databaseErrorsToTransform.some((errorToTransform) => error instanceof errorToTransform)) {\n      if (error instanceof Error) {\n        throw new errors.ValidationError(error.message);\n      }\n\n      throw error;\n    }\n    throw error;\n  }\n};\n"],"names":["databaseErrors","errors"],"mappings":";;;;AAKA,MAAM,4BAA4B;AAAA,EAChCA,SAAAA,OAAe;AAAA,EACfA,SAAAA,OAAe;AAAA,EACfA,SAAAA,OAAe;AAAA,EACfA,SAAAA,OAAe;AACjB;AAKa,MAAA,2BAAuC,OAAO,KAAK,SAAS;AACnE,MAAA;AACF,WAAO,MAAM,KAAK;AAAA,WACX,OAAO;AACd,QAAI,0BAA0B,KAAK,CAAC,qBAAqB,iBAAiB,gBAAgB,GAAG;AAC3F,UAAI,iBAAiB,OAAO;AAC1B,cAAM,IAAIC,YAAAA,OAAO,gBAAgB,MAAM,OAAO;AAAA,MAChD;AAEM,YAAA;AAAA,IACR;AACM,UAAA;AAAA,EACR;AACF;;"}

package/dist/services/document-service/middlewares/errors.mjs

@@ -0,0 +1,25 @@
+import { errors } from "@strapi/database";
+import { errors as errors$1 } from "@strapi/utils";
+const databaseErrorsToTransform = [
+  errors.InvalidTimeError,
+  errors.InvalidDateTimeError,
+  errors.InvalidDateError,
+  errors.InvalidRelationError
+];
+const databaseErrorsMiddleware = async (ctx, next) => {
+  try {
+    return await next();
+  } catch (error) {
+    if (databaseErrorsToTransform.some((errorToTransform) => error instanceof errorToTransform)) {
+      if (error instanceof Error) {
+        throw new errors$1.ValidationError(error.message);
+      }
+      throw error;
+    }
+    throw error;
+  }
+};
+export {
+  databaseErrorsMiddleware
+};
+//# sourceMappingURL=errors.mjs.map

package/dist/services/document-service/middlewares/errors.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.mjs","sources":["../../../../src/services/document-service/middlewares/errors.ts"],"sourcesContent":["import { errors as databaseErrors } from '@strapi/database';\nimport { errors } from '@strapi/utils';\n\nimport type { Middleware } from './middleware-manager';\n\nconst databaseErrorsToTransform = [\n  databaseErrors.InvalidTimeError,\n  databaseErrors.InvalidDateTimeError,\n  databaseErrors.InvalidDateError,\n  databaseErrors.InvalidRelationError,\n];\n\n/**\n * Handle database errors\n */\nexport const databaseErrorsMiddleware: Middleware = async (ctx, next) => {\n  try {\n    return await next();\n  } catch (error) {\n    if (databaseErrorsToTransform.some((errorToTransform) => error instanceof errorToTransform)) {\n      if (error instanceof Error) {\n        throw new errors.ValidationError(error.message);\n      }\n\n      throw error;\n    }\n    throw error;\n  }\n};\n"],"names":["databaseErrors","errors"],"mappings":";;AAKA,MAAM,4BAA4B;AAAA,EAChCA,OAAe;AAAA,EACfA,OAAe;AAAA,EACfA,OAAe;AAAA,EACfA,OAAe;AACjB;AAKa,MAAA,2BAAuC,OAAO,KAAK,SAAS;AACnE,MAAA;AACF,WAAO,MAAM,KAAK;AAAA,WACX,OAAO;AACd,QAAI,0BAA0B,KAAK,CAAC,qBAAqB,iBAAiB,gBAAgB,GAAG;AAC3F,UAAI,iBAAiB,OAAO;AAC1B,cAAM,IAAIC,SAAO,gBAAgB,MAAM,OAAO;AAAA,MAChD;AAEM,YAAA;AAAA,IACR;AACM,UAAA;AAAA,EACR;AACF;"}

package/dist/services/document-service/middlewares/index.d.ts

@@ -0,0 +1,3 @@
+export { databaseErrorsMiddleware } from './errors';
+export { createMiddlewareManager } from './middleware-manager';
+//# sourceMappingURL=index.d.ts.map

package/dist/services/document-service/middlewares/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/middlewares/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/services/document-service/middlewares/middleware-manager.d.ts

@@ -0,0 +1,10 @@
+export type Middleware = (ctx: any, next: () => Promise<void>) => Promise<void> | void;
+export type Options = {
+    exclude?: string[];
+};
+export declare const createMiddlewareManager: () => {
+    use(middleware: Middleware): () => Middleware[];
+    run(ctx: any, cb: () => void): Promise<void>;
+    wrapObject<TSource>(source: TSource, ctxDefaults?: {}, opts?: Options): TSource;
+};
+//# sourceMappingURL=middleware-manager.d.ts.map

package/dist/services/document-service/middlewares/middleware-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware-manager.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/middlewares/middleware-manager.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEvF,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,uBAAuB;oBAIhB,UAAU;aAMX,GAAG,MAAM,MAAM,IAAI;gCAcN,OAAO,2BAA0B,OAAO,GAAQ,OAAO;CAiCtF,CAAC"}

package/dist/services/document-service/{middlewares.js → middlewares/middleware-manager.js}

@@ -17,19 +17,22 @@ const createMiddlewareManager = () => {
       };
       return next();
     },
-    wrapObject(source, ctxDefaults = {}) {
+    wrapObject(source, ctxDefaults = {}, opts = {}) {
       const facade = {};
+      const { exclude = [] } = opts;
       for (const key in source) {
         if (Object.hasOwnProperty.call(source, key)) {
           const prop = source[key];
-          if (typeof prop === "function") {
-            const newMethod = async (...args) => {
+          if (exclude.includes(key)) {
+            facade[key] = prop;
+          } else if (typeof prop === "function") {
+            const newMethod = async (params = {}) => {
               const ctx = {
                 ...ctxDefaults,
                 action: key,
-                args
+                params
               };
-              return manager.run(ctx, () => prop(...ctx.args));
+              return manager.run(ctx, () => prop(ctx.params));
             };
             facade[key] = newMethod;
           } else {
@@ -43,4 +46,4 @@ const createMiddlewareManager = () => {
   return manager;
 };
 exports.createMiddlewareManager = createMiddlewareManager;
-//# sourceMappingURL=middlewares.js.map
+//# sourceMappingURL=middleware-manager.js.map

package/dist/services/document-service/middlewares/middleware-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware-manager.js","sources":["../../../../src/services/document-service/middlewares/middleware-manager.ts"],"sourcesContent":["export type Middleware = (ctx: any, next: () => Promise<void>) => Promise<void> | void;\n\nexport type Options = {\n  exclude?: string[];\n};\n\nexport const createMiddlewareManager = () => {\n  const middlewares: Middleware[] = [];\n\n  const manager = {\n    use(middleware: Middleware) {\n      middlewares.push(middleware);\n\n      return () => middlewares.splice(middlewares.indexOf(middleware), 1);\n    },\n\n    async run(ctx: any, cb: () => void) {\n      let index = 0;\n      const next = async () => {\n        if (index < middlewares.length) {\n          // eslint-disable-next-line no-plusplus\n          return middlewares[index++](ctx, next);\n        }\n\n        return cb();\n      };\n\n      return next();\n    },\n\n    wrapObject<TSource>(source: TSource, ctxDefaults = {}, opts: Options = {}): TSource {\n      const facade: TSource = {} as TSource;\n      const { exclude = [] } = opts;\n\n      for (const key in source) {\n        if (Object.hasOwnProperty.call(source, key)) {\n          const prop = source[key];\n\n          if (exclude.includes(key)) {\n            facade[key] = prop;\n          } else if (typeof prop === 'function') {\n            const newMethod = async (params: any = {}) => {\n              const ctx = {\n                ...ctxDefaults,\n                action: key,\n                params,\n              };\n\n              return manager.run(ctx, () => prop(ctx.params));\n            };\n\n            facade[key] = newMethod as typeof prop;\n          } else {\n            facade[key] = prop;\n          }\n        }\n      }\n\n      return facade;\n    },\n  };\n\n  return manager;\n};\n"],"names":[],"mappings":";;AAMO,MAAM,0BAA0B,MAAM;AAC3C,QAAM,cAA4B,CAAA;AAElC,QAAM,UAAU;AAAA,IACd,IAAI,YAAwB;AAC1B,kBAAY,KAAK,UAAU;AAE3B,aAAO,MAAM,YAAY,OAAO,YAAY,QAAQ,UAAU,GAAG,CAAC;AAAA,IACpE;AAAA,IAEA,MAAM,IAAI,KAAU,IAAgB;AAClC,UAAI,QAAQ;AACZ,YAAM,OAAO,YAAY;AACnB,YAAA,QAAQ,YAAY,QAAQ;AAE9B,iBAAO,YAAY,OAAO,EAAE,KAAK,IAAI;AAAA,QACvC;AAEA,eAAO,GAAG;AAAA,MAAA;AAGZ,aAAO,KAAK;AAAA,IACd;AAAA,IAEA,WAAoB,QAAiB,cAAc,CAAA,GAAI,OAAgB,CAAA,GAAa;AAClF,YAAM,SAAkB,CAAA;AACxB,YAAM,EAAE,UAAU,GAAO,IAAA;AAEzB,iBAAW,OAAO,QAAQ;AACxB,YAAI,OAAO,eAAe,KAAK,QAAQ,GAAG,GAAG;AACrC,gBAAA,OAAO,OAAO,GAAG;AAEnB,cAAA,QAAQ,SAAS,GAAG,GAAG;AACzB,mBAAO,GAAG,IAAI;AAAA,UAAA,WACL,OAAO,SAAS,YAAY;AACrC,kBAAM,YAAY,OAAO,SAAc,OAAO;AAC5C,oBAAM,MAAM;AAAA,gBACV,GAAG;AAAA,gBACH,QAAQ;AAAA,gBACR;AAAA,cAAA;AAGF,qBAAO,QAAQ,IAAI,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC;AAAA,YAAA;AAGhD,mBAAO,GAAG,IAAI;AAAA,UAAA,OACT;AACL,mBAAO,GAAG,IAAI;AAAA,UAChB;AAAA,QACF;AAAA,MACF;AAEO,aAAA;AAAA,IACT;AAAA,EAAA;AAGK,SAAA;AACT;;"}

package/dist/services/document-service/{middlewares.mjs → middlewares/middleware-manager.mjs}

@@ -15,19 +15,22 @@ const createMiddlewareManager = () => {
       };
       return next();
     },
-    wrapObject(source, ctxDefaults = {}) {
+    wrapObject(source, ctxDefaults = {}, opts = {}) {
       const facade = {};
+      const { exclude = [] } = opts;
       for (const key in source) {
         if (Object.hasOwnProperty.call(source, key)) {
           const prop = source[key];
-          if (typeof prop === "function") {
-            const newMethod = async (...args) => {
+          if (exclude.includes(key)) {
+            facade[key] = prop;
+          } else if (typeof prop === "function") {
+            const newMethod = async (params = {}) => {
               const ctx = {
                 ...ctxDefaults,
                 action: key,
-                args
+                params
               };
-              return manager.run(ctx, () => prop(...ctx.args));
+              return manager.run(ctx, () => prop(ctx.params));
             };
             facade[key] = newMethod;
           } else {
@@ -43,4 +46,4 @@ const createMiddlewareManager = () => {
 export {
   createMiddlewareManager
 };
-//# sourceMappingURL=middlewares.mjs.map
+//# sourceMappingURL=middleware-manager.mjs.map

package/dist/services/document-service/middlewares/middleware-manager.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware-manager.mjs","sources":["../../../../src/services/document-service/middlewares/middleware-manager.ts"],"sourcesContent":["export type Middleware = (ctx: any, next: () => Promise<void>) => Promise<void> | void;\n\nexport type Options = {\n  exclude?: string[];\n};\n\nexport const createMiddlewareManager = () => {\n  const middlewares: Middleware[] = [];\n\n  const manager = {\n    use(middleware: Middleware) {\n      middlewares.push(middleware);\n\n      return () => middlewares.splice(middlewares.indexOf(middleware), 1);\n    },\n\n    async run(ctx: any, cb: () => void) {\n      let index = 0;\n      const next = async () => {\n        if (index < middlewares.length) {\n          // eslint-disable-next-line no-plusplus\n          return middlewares[index++](ctx, next);\n        }\n\n        return cb();\n      };\n\n      return next();\n    },\n\n    wrapObject<TSource>(source: TSource, ctxDefaults = {}, opts: Options = {}): TSource {\n      const facade: TSource = {} as TSource;\n      const { exclude = [] } = opts;\n\n      for (const key in source) {\n        if (Object.hasOwnProperty.call(source, key)) {\n          const prop = source[key];\n\n          if (exclude.includes(key)) {\n            facade[key] = prop;\n          } else if (typeof prop === 'function') {\n            const newMethod = async (params: any = {}) => {\n              const ctx = {\n                ...ctxDefaults,\n                action: key,\n                params,\n              };\n\n              return manager.run(ctx, () => prop(ctx.params));\n            };\n\n            facade[key] = newMethod as typeof prop;\n          } else {\n            facade[key] = prop;\n          }\n        }\n      }\n\n      return facade;\n    },\n  };\n\n  return manager;\n};\n"],"names":[],"mappings":"AAMO,MAAM,0BAA0B,MAAM;AAC3C,QAAM,cAA4B,CAAA;AAElC,QAAM,UAAU;AAAA,IACd,IAAI,YAAwB;AAC1B,kBAAY,KAAK,UAAU;AAE3B,aAAO,MAAM,YAAY,OAAO,YAAY,QAAQ,UAAU,GAAG,CAAC;AAAA,IACpE;AAAA,IAEA,MAAM,IAAI,KAAU,IAAgB;AAClC,UAAI,QAAQ;AACZ,YAAM,OAAO,YAAY;AACnB,YAAA,QAAQ,YAAY,QAAQ;AAE9B,iBAAO,YAAY,OAAO,EAAE,KAAK,IAAI;AAAA,QACvC;AAEA,eAAO,GAAG;AAAA,MAAA;AAGZ,aAAO,KAAK;AAAA,IACd;AAAA,IAEA,WAAoB,QAAiB,cAAc,CAAA,GAAI,OAAgB,CAAA,GAAa;AAClF,YAAM,SAAkB,CAAA;AACxB,YAAM,EAAE,UAAU,GAAO,IAAA;AAEzB,iBAAW,OAAO,QAAQ;AACxB,YAAI,OAAO,eAAe,KAAK,QAAQ,GAAG,GAAG;AACrC,gBAAA,OAAO,OAAO,GAAG;AAEnB,cAAA,QAAQ,SAAS,GAAG,GAAG;AACzB,mBAAO,GAAG,IAAI;AAAA,UAAA,WACL,OAAO,SAAS,YAAY;AACrC,kBAAM,YAAY,OAAO,SAAc,OAAO;AAC5C,oBAAM,MAAM;AAAA,gBACV,GAAG;AAAA,gBACH,QAAQ;AAAA,gBACR;AAAA,cAAA;AAGF,qBAAO,QAAQ,IAAI,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC;AAAA,YAAA;AAGhD,mBAAO,GAAG,IAAI;AAAA,UAAA,OACT;AACL,mBAAO,GAAG,IAAI;AAAA,UAChB;AAAA,QACF;AAAA,MACF;AAEO,aAAA;AAAA,IACT;AAAA,EAAA;AAGK,SAAA;AACT;"}

package/dist/services/document-service/params.d.ts

@@ -1,2 +1,4 @@
-export * from '../entity-service/params';
+import type { UID, Modules } from '@strapi/types';
+declare const pickSelectionParams: <TUID extends UID.ContentType>(data: unknown) => Modules.Documents.Params.Pick<TUID, 'fields' | 'populate' | 'status'>;
+export { pickSelectionParams };
 //# sourceMappingURL=params.d.ts.map

package/dist/services/document-service/params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/params.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/params.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAElD,QAAA,MAAM,mBAAmB,uCACjB,OAAO,KACZ,QAAQ,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAEtE,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

package/dist/services/document-service/params.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"params.js","sources":["../../../src/services/document-service/params.ts"],"sourcesContent":["import { pick } from 'lodash/fp';\nimport type { UID, Modules } from '@strapi/types';\n\nconst pickSelectionParams = <TUID extends UID.ContentType>(\n  data: unknown\n): Modules.Documents.Params.Pick<TUID, 'fields' | 'populate' | 'status'> => {\n  return pick(['fields', 'populate', 'status'], data);\n};\n\nexport { pickSelectionParams };\n"],"names":["pick"],"mappings":";;;AAGM,MAAA,sBAAsB,CAC1B,SAC0E;AAC1E,SAAOA,EAAAA,KAAK,CAAC,UAAU,YAAY,QAAQ,GAAG,IAAI;AACpD;;"}

package/dist/services/document-service/params.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"params.mjs","sources":["../../../src/services/document-service/params.ts"],"sourcesContent":["import { pick } from 'lodash/fp';\nimport type { UID, Modules } from '@strapi/types';\n\nconst pickSelectionParams = <TUID extends UID.ContentType>(\n  data: unknown\n): Modules.Documents.Params.Pick<TUID, 'fields' | 'populate' | 'status'> => {\n  return pick(['fields', 'populate', 'status'], data);\n};\n\nexport { pickSelectionParams };\n"],"names":[],"mappings":";AAGM,MAAA,sBAAsB,CAC1B,SAC0E;AAC1E,SAAO,KAAK,CAAC,UAAU,YAAY,QAAQ,GAAG,IAAI;AACpD;"}

package/dist/services/document-service/repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/repository.ts"],"names":[],"mappings":"AAKA,OAAO,EAAqB,KAAK,uBAAuB,EAAE,MAAM,UAAU,CAAC;AA2B3E,eAAO,MAAM,2BAA2B,EAAE,uBA4WzC,CAAC"}
+{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/repository.ts"],"names":[],"mappings":"AAIA,OAAO,EAAqB,KAAK,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAY3E,eAAO,MAAM,2BAA2B,EAAE,uBA4SzC,CAAC"}

package/dist/services/document-service/repository.js

@@ -5,95 +5,70 @@ const strapiUtils = require("@strapi/utils");
 const common = require("./common.js");
 const draftAndPublish = require("./draft-and-publish.js");
 const internationalization = require("./internationalization.js");
-const idTransform = require("./transform/id-transform.js");
-const components = require("../entity-service/components.js");
-const params = require("../entity-service/params.js");
-const index = require("../entity-validator/index.js");
-const index$1 = require("../entity-service/attributes/index.js");
+const components = require("./components.js");
+const entries = require("./entries.js");
+const params = require("./params.js");
 const transformContentTypesToModels = require("../../utils/transform-content-types-to-models.js");
 const populate = require("./utils/populate.js");
-const data = require("./transform/data.js");
-const transformParamsToQuery = _.curry((uid, params2) => {
-  const query = strapiUtils.convertQueryParams.transformParamsToQuery(uid, params2);
-  return _.assoc("where", { ...params2?.lookup, ...query.where }, query);
-});
+const query = require("./transform/query.js");
+const idTransform = require("./transform/id-transform.js");
 const createContentTypeRepository = (uid) => {
   const contentType = strapi.contentType(uid);
   const hasDraftAndPublish = strapiUtils.contentTypes.hasDraftAndPublish(contentType);
+  const entries$1 = entries.createEntriesService(uid);
   async function findMany(params2 = {}) {
-    const query = await strapiUtils.async.pipe(
+    const query$1 = await strapiUtils.async.pipe(
       draftAndPublish.defaultToDraft,
       draftAndPublish.statusToLookup(contentType),
       internationalization.defaultLocale(contentType),
       internationalization.localeToLookup(contentType),
       idTransform.transformParamsDocumentId(uid),
-      transformParamsToQuery(uid)
+      query.transformParamsToQuery(uid)
     )(params2 || {});
-    return strapi.db.query(uid).findMany(query);
+    return strapi.db.query(uid).findMany(query$1);
   }
   async function findFirst(params2 = {}) {
-    const query = await strapiUtils.async.pipe(
+    const query$1 = await strapiUtils.async.pipe(
       draftAndPublish.defaultToDraft,
       draftAndPublish.statusToLookup(contentType),
       internationalization.defaultLocale(contentType),
       internationalization.localeToLookup(contentType),
       idTransform.transformParamsDocumentId(uid),
-      transformParamsToQuery(uid)
+      query.transformParamsToQuery(uid)
     )(params2);
-    return strapi.db.query(uid).findOne(query);
+    return strapi.db.query(uid).findOne(query$1);
   }
-  async function findOne(documentId, params2 = {}) {
-    const query = await strapiUtils.async.pipe(
+  async function findOne(opts = {}) {
+    const { documentId, ...params2 } = opts;
+    const query$1 = await strapiUtils.async.pipe(
       draftAndPublish.defaultToDraft,
       draftAndPublish.statusToLookup(contentType),
       internationalization.defaultLocale(contentType),
       internationalization.localeToLookup(contentType),
       idTransform.transformParamsDocumentId(uid),
-      transformParamsToQuery(uid),
+      query.transformParamsToQuery(uid),
       (query2) => _.assoc("where", { ...query2.where, documentId }, query2)
     )(params2);
-    return strapi.db.query(uid).findOne(query);
+    return strapi.db.query(uid).findOne(query$1);
   }
-  async function deleteEntry(id) {
-    const componentsToDelete = await components.getComponents(uid, { id });
-    await strapi.db.query(uid).delete({ where: { id } });
-    await components.deleteComponents(uid, componentsToDelete, { loadComponents: false });
-  }
-  async function deleteFn(documentId, params2 = {}) {
-    const query = await strapiUtils.async.pipe(
+  async function deleteDocument(opts = {}) {
+    const { documentId, ...params2 } = opts;
+    const query$1 = await strapiUtils.async.pipe(
       _.omit("status"),
       internationalization.defaultLocale(contentType),
       internationalization.multiLocaleToLookup(contentType),
-      transformParamsToQuery(uid),
+      query.transformParamsToQuery(uid),
       (query2) => _.assoc("where", { ...query2.where, documentId }, query2)
     )(params2);
     if (params2.status === "draft") {
       throw new Error("Cannot delete a draft document");
     }
-    const entriesToDelete = await strapi.db.query(uid).findMany(query);
-    await strapiUtils.async.map(entriesToDelete, (entryToDelete) => deleteEntry(entryToDelete.id));
-    return { deletedEntries: entriesToDelete.length };
-  }
-  async function createEntry(params$1 = {}) {
-    const { data: data2, ...restParams } = await idTransform.transformParamsDocumentId(uid, params$1);
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(restParams));
-    if (!params$1.data) {
-      throw new Error("Create requires data attribute");
-    }
-    const validData = await index.validateEntityCreation(contentType, data2, {
-      // Note: publishedAt value will always be set when DP is disabled
-      isDraft: !params$1?.data?.publishedAt,
-      locale: params$1?.locale
-    });
-    const componentData = await components.createComponents(uid, validData);
-    const entryData = index$1.applyTransforms(
-      Object.assign(components.omitComponentData(contentType, validData), componentData),
-      { contentType }
-    );
-    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });
-    return doc;
+    const entriesToDelete = await strapi.db.query(uid).findMany(query$1);
+    await strapiUtils.async.map(entriesToDelete, (entryToDelete) => entries$1.delete(entryToDelete.id));
+    return { deletedEntries: entriesToDelete };
   }
-  async function create(params2 = {}) {
+  async function create(opts = {}) {
+    const { documentId, ...params2 } = opts;
     const queryParams = await strapiUtils.async.pipe(
       draftAndPublish.filterDataPublishedAt,
       draftAndPublish.setStatusToDraft(contentType),
@@ -101,51 +76,47 @@ const createContentTypeRepository = (uid) => {
       internationalization.defaultLocale(contentType),
       internationalization.localeToData(contentType)
     )(params2);
-    const doc = await createEntry(queryParams);
+    const doc = await entries$1.create(queryParams);
     if (hasDraftAndPublish && params2.status === "published") {
-      return publish(doc.documentId, params2).then((doc2) => doc2.versions[0]);
+      return publish({
+        ...params2,
+        documentId: doc.documentId
+      }).then((doc2) => doc2.versions[0]);
     }
     return doc;
   }
-  async function clone(documentId, params$1 = {}) {
+  async function clone(opts = {}) {
+    const { documentId, ...params2 } = opts;
     const queryParams = await strapiUtils.async.pipe(
       draftAndPublish.filterDataPublishedAt,
-      internationalization.localeToLookup(contentType)
-    )(params$1);
-    const { data: data2, ...restParams } = await idTransform.transformParamsDocumentId(uid, queryParams || {});
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(restParams));
-    const model = strapi.contentType(uid);
-    const entries = await strapi.db.query(uid).findMany({
-      ...query,
-      where: { ...queryParams?.lookup, ...query.where, documentId }
-    });
-    if (!entries.length) {
-      return null;
-    }
-    const newDocumentId = transformContentTypesToModels.createDocumentId();
-    const versions = await strapiUtils.async.map(entries, async (entryToClone) => {
-      const isDraft = strapiUtils.contentTypes.isDraft(data2, model);
-      const validData = await index.validateEntityUpdate(
-        model,
-        // Omit id fields, the cloned entity id will be generated by the database
-        _.omit(["id"], data2),
-        { isDraft, ...queryParams?.lookup },
-        entryToClone
-      );
-      const componentData = await components.cloneComponents(uid, entryToClone, validData);
-      const entityData = index$1.applyTransforms(
-        Object.assign(components.omitComponentData(model, validData), componentData),
-        { contentType: model }
-      );
-      return strapi.db.query(uid).clone(entryToClone.id, {
-        ...query,
-        // Allows entityData to override the documentId (e.g. when publishing)
-        data: { documentId: newDocumentId, ...entityData, locale: entryToClone.locale }
-      });
+      internationalization.defaultLocale(contentType),
+      internationalization.multiLocaleToLookup(contentType)
+    )(params2);
+    const entriesToClone = await strapi.db?.query(uid).findMany({
+      where: {
+        ...queryParams?.lookup,
+        documentId,
+        // DP Enabled: Clone drafts
+        // DP Disabled: Clone only the existing version (published)
+        publishedAt: { $null: hasDraftAndPublish }
+      },
+      populate: populate.getDeepPopulate(uid, { relationalFields: ["id"] })
     });
-    return { documentId: newDocumentId, versions };
+    const clonedEntries = await strapiUtils.async.map(
+      entriesToClone,
+      strapiUtils.async.pipe(
+        _.omit("id"),
+        // assign new documentId
+        _.assoc("documentId", transformContentTypesToModels.createDocumentId()),
+        // Merge new data into it
+        (data) => _.merge(data, queryParams.data),
+        (data) => entries$1.create({ ...queryParams, data, status: "draft" })
+      )
+    );
+    return { documentId: clonedEntries.at(0)?.documentId, versions: clonedEntries };
   }
-  async function update(documentId, params$1 = {}) {
+  async function update(opts = {}) {
+    const { documentId, ...params$1 } = opts;
     const queryParams = await strapiUtils.async.pipe(
       draftAndPublish.filterDataPublishedAt,
       draftAndPublish.setStatusToDraft(contentType),
@@ -156,109 +127,87 @@ const createContentTypeRepository = (uid) => {
       internationalization.localeToLookup(contentType),
       internationalization.localeToData(contentType)
     )(params$1);
-    const { data: data2, ...restParams } = await idTransform.transformParamsDocumentId(uid, queryParams || {});
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(restParams || {}));
-    const model = strapi.contentType(uid);
-    const entryToUpdate = await strapi.db.query(uid).findOne({ ...query, where: { ...queryParams?.lookup, ...query?.where, documentId } });
+    const { data, ...restParams } = await idTransform.transformParamsDocumentId(uid, queryParams || {});
+    const query$1 = query.transformParamsToQuery(uid, params.pickSelectionParams(restParams || {}));
+    const entryToUpdate = await strapi.db.query(uid).findOne({ ...query$1, where: { ...queryParams?.lookup, ...query$1?.where, documentId } });
     let updatedDraft = null;
     if (entryToUpdate) {
-      const validData = await index.validateEntityUpdate(
-        model,
-        data2,
-        {
-          isDraft: !params$1?.data?.publishedAt,
-          // Always update the draft version
-          locale: queryParams?.locale
-        },
-        entryToUpdate
-      );
-      const componentData = await components.updateComponents(uid, entryToUpdate, validData);
-      const entryData = index$1.applyTransforms(
-        Object.assign(components.omitComponentData(model, validData), componentData),
-        { contentType: model }
-      );
-      updatedDraft = await strapi.db.query(uid).update({ ...query, where: { id: entryToUpdate.id }, data: entryData });
+      updatedDraft = await entries$1.update(entryToUpdate, queryParams);
     }
     if (!updatedDraft) {
       const documentExists = await strapi.db.query(contentType.uid).findOne({ where: { documentId } });
       if (documentExists) {
-        updatedDraft = await createEntry({
+        updatedDraft = await entries$1.create({
           ...queryParams,
           data: { ...queryParams.data, documentId }
         });
       }
     }
     if (hasDraftAndPublish && updatedDraft && params$1.status === "published") {
-      return publish(documentId, params$1).then((doc) => doc.versions[0]);
+      return publish({
+        ...params$1,
+        documentId
+      }).then((doc) => doc.versions[0]);
     }
     return updatedDraft;
   }
   async function count(params2 = {}) {
-    const query = await strapiUtils.async.pipe(
+    const query$1 = await strapiUtils.async.pipe(
       draftAndPublish.defaultStatus(contentType),
       draftAndPublish.statusToLookup(contentType),
       internationalization.defaultLocale(contentType),
       internationalization.localeToLookup(contentType),
-      transformParamsToQuery(uid)
+      query.transformParamsToQuery(uid)
     )(params2);
-    return strapi.db.query(uid).count(query);
+    return strapi.db.query(uid).count(query$1);
   }
-  async function publish(documentId, params2 = {}) {
+  async function publish(opts = {}) {
+    const { documentId, ...params2 } = opts;
     const queryParams = await strapiUtils.async.pipe(
       internationalization.defaultLocale(contentType),
       internationalization.multiLocaleToLookup(contentType)
     )(params2);
-    await deleteFn(documentId, {
+    await deleteDocument({
       ...queryParams,
+      documentId,
       lookup: { ...queryParams?.lookup, publishedAt: { $ne: null } }
     });
-    const entriesToPublish = await strapi.db?.query(uid).findMany({
+    const draftsToPublish = await strapi.db?.query(uid).findMany({
       where: {
         ...queryParams?.lookup,
         documentId,
         publishedAt: null
       },
-      populate: populate.getDeepPopulate(uid)
+      populate: populate.getDeepPopulate(uid, { relationalFields: ["documentId", "locale"] })
     });
-    const publishedEntries = await strapiUtils.async.map(
-      entriesToPublish,
-      strapiUtils.async.pipe(
-        // Updated at value is used to know if draft has been modified
-        // If both versions share the same value, it means the draft has not been modified
-        (draft) => _.assoc("updatedAt", draft.updatedAt, draft),
-        _.assoc("publishedAt", /* @__PURE__ */ new Date()),
-        _.assoc("documentId", documentId),
-        _.omit("id"),
-        // Transform relations to target published versions
-        (entry) => {
-          const opts = { uid, locale: entry.locale, status: "published", allowMissingId: true };
-          return data.transformData(entry, opts);
-        },
-        // Create the published entry
-        (data2) => createEntry({ ...queryParams, data: data2, locale: data2.locale, status: "published" })
-      )
+    const versions = await strapiUtils.async.map(
+      draftsToPublish,
+      (draft) => entries$1.publish(draft, queryParams)
     );
-    return { versions: publishedEntries };
+    return { versions };
   }
-  async function unpublish(documentId, params2 = {}) {
+  async function unpublish(opts = {}) {
+    const { documentId, ...params2 } = opts;
     const queryParams = await strapiUtils.async.pipe(
       internationalization.defaultLocale(contentType),
       internationalization.multiLocaleToLookup(contentType)
     )(params2);
-    const { deletedEntries } = await deleteFn(documentId, {
+    const { deletedEntries } = await deleteDocument({
       ...params2,
+      documentId,
       lookup: { ...queryParams?.lookup, publishedAt: { $ne: null } }
     });
     return { versions: deletedEntries };
   }
-  async function discardDraft(documentId, params2 = {}) {
+  async function discardDraft(opts = {}) {
+    const { documentId, ...params2 } = opts;
     const queryParams = await strapiUtils.async.pipe(
       internationalization.defaultLocale(contentType),
       internationalization.multiLocaleToLookup(contentType)
     )(params2);
-    await deleteFn(documentId, {
+    await deleteDocument({
       ...queryParams,
-      // Delete all drafts that match query
+      documentId,
       lookup: { ...queryParams?.lookup, publishedAt: null }
     });
     const entriesToDraft = await strapi.db?.query(uid).findMany({
@@ -267,37 +216,34 @@ const createContentTypeRepository = (uid) => {
         documentId,
         publishedAt: { $ne: null }
       },
-      populate: populate.getDeepPopulate(uid)
+      populate: populate.getDeepPopulate(uid, { relationalFields: ["documentId", "locale"] })
     });
     const draftEntries = await strapiUtils.async.map(
       entriesToDraft,
-      strapiUtils.async.pipe(
-        _.assoc("publishedAt", null),
-        _.assoc("documentId", documentId),
-        _.omit("id"),
-        // Transform relations to target draft versions
-        (entry) => {
-          const opts = { uid, locale: entry.locale, status: "draft", allowMissingId: true };
-          return data.transformData(entry, opts);
-        },
-        // Create the draft entry
-        (data2) => createEntry({ ...queryParams, locale: data2.locale, data: data2, status: "draft" })
-      )
+      (entry) => entries$1.discardDraft(entry, queryParams)
     );
     return { versions: draftEntries };
   }
+  async function updateComponents(entry, data) {
+    return components.updateComponents(uid, entry, data);
+  }
+  function omitComponentData(data) {
+    return components.omitComponentData(contentType, data);
+  }
   return {
     findMany: common.wrapInTransaction(findMany),
     findFirst: common.wrapInTransaction(findFirst),
     findOne: common.wrapInTransaction(findOne),
-    delete: common.wrapInTransaction(deleteFn),
+    delete: common.wrapInTransaction(deleteDocument),
     create: common.wrapInTransaction(create),
     clone: common.wrapInTransaction(clone),
     update: common.wrapInTransaction(update),
     count: common.wrapInTransaction(count),
     publish: hasDraftAndPublish ? common.wrapInTransaction(publish) : void 0,
     unpublish: hasDraftAndPublish ? common.wrapInTransaction(unpublish) : void 0,
-    discardDraft: hasDraftAndPublish ? common.wrapInTransaction(discardDraft) : void 0
+    discardDraft: hasDraftAndPublish ? common.wrapInTransaction(discardDraft) : void 0,
+    updateComponents,
+    omitComponentData
   };
 };
 exports.createContentTypeRepository = createContentTypeRepository;