@strapi/core 0.0.0-experimental.3f7b2587c5e3d548262671895cf11d8bf8c9166e → 0.0.0-experimental.580ff744b0b1df648d5a65092d9bc91fd5430329

package/dist/services/document-service/transform/relations/utils/map-relation.mjs

@@ -0,0 +1,87 @@
+import { curry, isNil, isObject } from "lodash/fp";
+import { async, traverseEntity } from "@strapi/utils";
+const isNumeric = (value) => {
+  if (Array.isArray(value))
+    return false;
+  const parsed = parseInt(value, 10);
+  return !Number.isNaN(parsed);
+};
+const toArray = (value) => {
+  if (isNil(value))
+    return value;
+  if (Array.isArray(value))
+    return value;
+  return [value];
+};
+const mapRelation = async (callback, rel, isRecursive = false) => {
+  let relation = rel;
+  const wrapInSet = (value) => {
+    if (isRecursive) {
+      return value;
+    }
+    return { set: toArray(value) };
+  };
+  if (isNil(relation)) {
+    return callback(relation);
+  }
+  if (Array.isArray(relation)) {
+    return async.map(relation, (r) => mapRelation(callback, r, true)).then((result) => result.flat().filter(Boolean)).then(wrapInSet);
+  }
+  if (isObject(relation)) {
+    if ("id" in relation || "documentId" in relation) {
+      const result = await callback(relation);
+      return wrapInSet(result);
+    }
+    if (!relation.set && !relation.disconnect && !relation.connect) {
+      return callback(relation);
+    }
+    if (relation.set) {
+      const set = await mapRelation(callback, relation.set, true);
+      relation = { ...relation, set: toArray(set) };
+    }
+    if (relation.disconnect) {
+      const disconnect = await mapRelation(callback, relation.disconnect, true);
+      relation = { ...relation, disconnect: toArray(disconnect) };
+    }
+    if (relation.connect) {
+      const connect = await mapRelation(callback, relation.connect, true);
+      relation = { ...relation, connect: toArray(connect) };
+    }
+    return relation;
+  }
+  if (isNumeric(relation)) {
+    const result = await callback({ id: relation });
+    return wrapInSet(result);
+  }
+  if (typeof relation === "string") {
+    const result = await callback({ documentId: relation });
+    return wrapInSet(result);
+  }
+  return callback(relation);
+};
+const traverseEntityRelations = async (visitor, options, data) => {
+  return traverseEntity(
+    async (options2, utils) => {
+      if (options2.attribute.type !== "relation") {
+        return;
+      }
+      if (options2.attribute.useJoinTable === false) {
+        return;
+      }
+      const target = options2.attribute.target;
+      if (!target) {
+        return;
+      }
+      return visitor(options2, utils);
+    },
+    options,
+    data
+  );
+};
+const mapRelationCurried = curry(mapRelation);
+const traverseEntityRelationsCurried = curry(traverseEntityRelations);
+export {
+  mapRelationCurried as mapRelation,
+  traverseEntityRelationsCurried as traverseEntityRelations
+};
+//# sourceMappingURL=map-relation.mjs.map

package/dist/services/document-service/transform/relations/utils/map-relation.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"map-relation.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/map-relation.ts"],"sourcesContent":["/* eslint-disable node/no-callback-literal */\nimport { isObject, curry, isNil } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { traverseEntity, async } from '@strapi/utils';\n\nimport { Relation } from './types';\n\nconst isNumeric = (value: any): value is number => {\n  if (Array.isArray(value)) return false; // Handle [1, 'docId'] case\n  const parsed = parseInt(value, 10);\n  return !Number.isNaN(parsed);\n};\n\nconst toArray = (value: any) => {\n  // Keep value as it is if it's a nullish value\n  if (isNil(value)) return value;\n  if (Array.isArray(value)) return value;\n\n  return [value];\n};\n\n/**\n * There are multiple ways to create Strapi relations.\n * This is a utility to traverse and transform relation data\n *\n *\n * For consistency and ease of use, the response will always be an object with the following shape:\n * { set: [{...}], connect: [{...}], disconnect: [{...}] }\n *\n * @example\n * transformRelationData({\n *  onLongHand: (relation) => {\n *    // Change the id of the relation\n *    return { id: 'other' };\n *  },\n * }, relation)\n */\nconst mapRelation = async (\n  callback: (relation: any) => any,\n  rel: Relation,\n  isRecursive = false\n): Promise<Relation> => {\n  let relation: Relation = rel;\n\n  const wrapInSet = (value: any) => {\n    // Ignore wrapping if it's a recursive call\n    if (isRecursive) {\n      return value;\n    }\n    return { set: toArray(value) };\n  };\n\n  // undefined | null\n  if (isNil(relation)) {\n    return callback(relation);\n  }\n\n  // LongHand[] | ShortHand[]\n  if (Array.isArray(relation)) {\n    return async\n      .map(relation, (r: Relation) => mapRelation(callback, r, true))\n      .then((result: any) => result.flat().filter(Boolean))\n      .then(wrapInSet);\n  }\n\n  // LongHand\n  if (isObject(relation)) {\n    // { id: 1 } || { documentId: 1 }\n    if ('id' in relation || 'documentId' in relation) {\n      const result = await callback(relation);\n      return wrapInSet(result);\n    }\n\n    // If not connecting anything, return default visitor\n    if (!relation.set && !relation.disconnect && !relation.connect) {\n      return callback(relation);\n    }\n\n    // { set }\n    if (relation.set) {\n      const set: any = await mapRelation(callback, relation.set, true);\n      relation = { ...relation, set: toArray(set) };\n    }\n\n    // { disconnect}\n    if (relation.disconnect) {\n      const disconnect: any = await mapRelation(callback, relation.disconnect, true);\n      relation = { ...relation, disconnect: toArray(disconnect) };\n    }\n\n    // { connect }\n    if (relation.connect) {\n      // Transform the relation to connect\n      const connect: any = await mapRelation(callback, relation.connect, true);\n      relation = { ...relation, connect: toArray(connect) };\n    }\n\n    return relation;\n  }\n\n  // ShortHand\n  if (isNumeric(relation)) {\n    const result = await callback({ id: relation });\n    return wrapInSet(result);\n  }\n\n  if (typeof relation === 'string') {\n    const result = await callback({ documentId: relation });\n    return wrapInSet(result);\n  }\n\n  // Anything else\n  return callback(relation);\n};\n\ntype TraverseEntity = Parameters<typeof traverseEntity>;\n\n/**\n * Utility function, same as `traverseEntity` but only for relations.\n */\nconst traverseEntityRelations = async (\n  visitor: TraverseEntity[0],\n  options: TraverseEntity[1],\n  data: TraverseEntity[2]\n) => {\n  return traverseEntity(\n    async (options, utils) => {\n      if (options.attribute.type !== 'relation') {\n        return;\n      }\n\n      // TODO: Handle join columns\n      if (options.attribute.useJoinTable === false) {\n        return;\n      }\n\n      // TODO: Handle morph relations (they have multiple targets)\n      const target = options.attribute.target as UID.Schema | undefined;\n      if (!target) {\n        return;\n      }\n\n      return visitor(options, utils);\n    },\n    options,\n    data\n  );\n};\n\nconst mapRelationCurried = curry(mapRelation);\nconst traverseEntityRelationsCurried = curry(traverseEntityRelations);\n\nexport {\n  mapRelationCurried as mapRelation,\n  traverseEntityRelationsCurried as traverseEntityRelations,\n};\n"],"names":["options"],"mappings":";;AAQA,MAAM,YAAY,CAAC,UAAgC;AAC7C,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAC3B,QAAA,SAAS,SAAS,OAAO,EAAE;AAC1B,SAAA,CAAC,OAAO,MAAM,MAAM;AAC7B;AAEA,MAAM,UAAU,CAAC,UAAe;AAE9B,MAAI,MAAM,KAAK;AAAU,WAAA;AACrB,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAEjC,SAAO,CAAC,KAAK;AACf;AAkBA,MAAM,cAAc,OAClB,UACA,KACA,cAAc,UACQ;AACtB,MAAI,WAAqB;AAEnB,QAAA,YAAY,CAAC,UAAe;AAEhC,QAAI,aAAa;AACR,aAAA;AAAA,IACT;AACA,WAAO,EAAE,KAAK,QAAQ,KAAK,EAAE;AAAA,EAAA;AAI3B,MAAA,MAAM,QAAQ,GAAG;AACnB,WAAO,SAAS,QAAQ;AAAA,EAC1B;AAGI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,MACJ,IAAI,UAAU,CAAC,MAAgB,YAAY,UAAU,GAAG,IAAI,CAAC,EAC7D,KAAK,CAAC,WAAgB,OAAO,OAAO,OAAO,OAAO,CAAC,EACnD,KAAK,SAAS;AAAA,EACnB;AAGI,MAAA,SAAS,QAAQ,GAAG;AAElB,QAAA,QAAQ,YAAY,gBAAgB,UAAU;AAC1C,YAAA,SAAS,MAAM,SAAS,QAAQ;AACtC,aAAO,UAAU,MAAM;AAAA,IACzB;AAGI,QAAA,CAAC,SAAS,OAAO,CAAC,SAAS,cAAc,CAAC,SAAS,SAAS;AAC9D,aAAO,SAAS,QAAQ;AAAA,IAC1B;AAGA,QAAI,SAAS,KAAK;AAChB,YAAM,MAAW,MAAM,YAAY,UAAU,SAAS,KAAK,IAAI;AAC/D,iBAAW,EAAE,GAAG,UAAU,KAAK,QAAQ,GAAG;IAC5C;AAGA,QAAI,SAAS,YAAY;AACvB,YAAM,aAAkB,MAAM,YAAY,UAAU,SAAS,YAAY,IAAI;AAC7E,iBAAW,EAAE,GAAG,UAAU,YAAY,QAAQ,UAAU;IAC1D;AAGA,QAAI,SAAS,SAAS;AAEpB,YAAM,UAAe,MAAM,YAAY,UAAU,SAAS,SAAS,IAAI;AACvE,iBAAW,EAAE,GAAG,UAAU,SAAS,QAAQ,OAAO;IACpD;AAEO,WAAA;AAAA,EACT;AAGI,MAAA,UAAU,QAAQ,GAAG;AACvB,UAAM,SAAS,MAAM,SAAS,EAAE,IAAI,SAAU,CAAA;AAC9C,WAAO,UAAU,MAAM;AAAA,EACzB;AAEI,MAAA,OAAO,aAAa,UAAU;AAChC,UAAM,SAAS,MAAM,SAAS,EAAE,YAAY,SAAU,CAAA;AACtD,WAAO,UAAU,MAAM;AAAA,EACzB;AAGA,SAAO,SAAS,QAAQ;AAC1B;AAOA,MAAM,0BAA0B,OAC9B,SACA,SACA,SACG;AACI,SAAA;AAAA,IACL,OAAOA,UAAS,UAAU;AACpBA,UAAAA,SAAQ,UAAU,SAAS,YAAY;AACzC;AAAA,MACF;AAGIA,UAAAA,SAAQ,UAAU,iBAAiB,OAAO;AAC5C;AAAA,MACF;AAGM,YAAA,SAASA,SAAQ,UAAU;AACjC,UAAI,CAAC,QAAQ;AACX;AAAA,MACF;AAEO,aAAA,QAAQA,UAAS,KAAK;AAAA,IAC/B;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEM,MAAA,qBAAqB,MAAM,WAAW;AACtC,MAAA,iCAAiC,MAAM,uBAAuB;"}

package/dist/services/document-service/transform/relations/utils/types.d.ts

@@ -0,0 +1,21 @@
+export type ID = string | number;
+export type ShortHand = ID;
+export type LongHandEntity = {
+    id: ID;
+    position?: object;
+};
+export type LongHandDocument = {
+    documentId: ID;
+    locale?: string;
+    status?: 'draft' | 'published';
+    position?: object;
+};
+export type LongHand = LongHandEntity | LongHandDocument;
+export type RelationPrimitives = ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined;
+export type Relation = RelationPrimitives | {
+    connect?: RelationPrimitives;
+    disconnect?: RelationPrimitives;
+    set?: RelationPrimitives;
+};
+export type GetIds = (relation: ID) => ID[] | null;
+//# sourceMappingURL=types.d.ts.map

package/dist/services/document-service/transform/relations/utils/types.d.ts.map

@@ -0,0 +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;AAE3B,MAAM,MAAM,cAAc,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,EAAE,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,cAAc,GAAG,gBAAgB,CAAC;AACzD,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;AACpG,MAAM,MAAM,QAAQ,GAChB,kBAAkB,GAClB;IAAE,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAAC,GAAG,CAAC,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAEhG,MAAM,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC"}

package/dist/services/document-service/transform/types.d.ts

@@ -0,0 +1,13 @@
+import type { UID } from '@strapi/types';
+import type { ID } from './relations/utils/types';
+export type Data = {
+    id?: ID | object;
+    documentId?: ID | object;
+    [key: string]: any;
+};
+export type Options = {
+    uid: UID.Schema;
+    locale?: string | null;
+    status: 'draft' | 'published';
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/services/document-service/transform/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,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,GAAG,CAAC,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC;CAC/B,CAAC"}

package/dist/services/document-service/utils/populate.d.ts

@@ -0,0 +1,10 @@
+import { UID } from '@strapi/types';
+interface Options {
+    /**
+     * Fields to select when populating relations
+     */
+    relationalFields?: string[];
+}
+export declare const getDeepPopulate: (uid: UID.Schema, opts?: Options) => any;
+export {};
+//# sourceMappingURL=populate.d.ts.map

package/dist/services/document-service/utils/populate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/utils/populate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,UAAU,OAAO;IACf;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAGD,eAAO,MAAM,eAAe,QAAS,IAAI,MAAM,SAAQ,OAAO,QA8C7D,CAAC"}

package/dist/services/document-service/utils/populate.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const strapiUtils = require("@strapi/utils");
+const getDeepPopulate = (uid, opts = {}) => {
+  const model = strapi.getModel(uid);
+  const attributes = Object.entries(model.attributes);
+  return attributes.reduce((acc, [attributeName, attribute]) => {
+    switch (attribute.type) {
+      case "relation": {
+        const isVisible = strapiUtils.contentTypes.isVisibleAttribute(model, attributeName);
+        if (isVisible) {
+          acc[attributeName] = { select: opts.relationalFields };
+        }
+        break;
+      }
+      case "media": {
+        acc[attributeName] = { select: ["id"] };
+        break;
+      }
+      case "component": {
+        const populate = getDeepPopulate(attribute.component, opts);
+        acc[attributeName] = { populate };
+        break;
+      }
+      case "dynamiczone": {
+        const populatedComponents = (attribute.components || []).reduce(
+          (acc2, componentUID) => {
+            acc2[componentUID] = { populate: getDeepPopulate(componentUID, opts) };
+            return acc2;
+          },
+          {}
+        );
+        acc[attributeName] = { on: populatedComponents };
+        break;
+      }
+    }
+    return acc;
+  }, {});
+};
+exports.getDeepPopulate = getDeepPopulate;
+//# sourceMappingURL=populate.js.map

package/dist/services/document-service/utils/populate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { UID } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ninterface Options {\n  /**\n   * Fields to select when populating relations\n   */\n  relationalFields?: string[];\n}\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: UID.Schema, opts: Options = {}) => {\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] = { select: opts.relationalFields };\n        }\n        break;\n      }\n\n      case 'media': {\n        acc[attributeName] = { select: ['id'] };\n        break;\n      }\n\n      case 'component': {\n        const populate = getDeepPopulate(attribute.component, opts);\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: UID.Component) => {\n            acc[componentUID] = { populate: getDeepPopulate(componentUID, opts) };\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":";;;AAWO,MAAM,kBAAkB,CAAC,KAAiB,OAAgB,OAAO;AAChE,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,KAAK,iBAAiB;AAAA,QACvD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AAChB,cAAM,WAAW,gBAAgB,UAAU,WAAW,IAAI;AACtD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACC,MAAU,iBAAgC;AACzCA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,cAAc,IAAI;AAC3DA,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;;"}

package/dist/services/document-service/utils/populate.mjs

@@ -0,0 +1,41 @@
+import { contentTypes } from "@strapi/utils";
+const getDeepPopulate = (uid, opts = {}) => {
+  const model = strapi.getModel(uid);
+  const attributes = Object.entries(model.attributes);
+  return attributes.reduce((acc, [attributeName, attribute]) => {
+    switch (attribute.type) {
+      case "relation": {
+        const isVisible = contentTypes.isVisibleAttribute(model, attributeName);
+        if (isVisible) {
+          acc[attributeName] = { select: opts.relationalFields };
+        }
+        break;
+      }
+      case "media": {
+        acc[attributeName] = { select: ["id"] };
+        break;
+      }
+      case "component": {
+        const populate = getDeepPopulate(attribute.component, opts);
+        acc[attributeName] = { populate };
+        break;
+      }
+      case "dynamiczone": {
+        const populatedComponents = (attribute.components || []).reduce(
+          (acc2, componentUID) => {
+            acc2[componentUID] = { populate: getDeepPopulate(componentUID, opts) };
+            return acc2;
+          },
+          {}
+        );
+        acc[attributeName] = { on: populatedComponents };
+        break;
+      }
+    }
+    return acc;
+  }, {});
+};
+export {
+  getDeepPopulate
+};
+//# sourceMappingURL=populate.mjs.map

package/dist/services/document-service/utils/populate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { UID } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ninterface Options {\n  /**\n   * Fields to select when populating relations\n   */\n  relationalFields?: string[];\n}\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: UID.Schema, opts: Options = {}) => {\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] = { select: opts.relationalFields };\n        }\n        break;\n      }\n\n      case 'media': {\n        acc[attributeName] = { select: ['id'] };\n        break;\n      }\n\n      case 'component': {\n        const populate = getDeepPopulate(attribute.component, opts);\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: UID.Component) => {\n            acc[componentUID] = { populate: getDeepPopulate(componentUID, opts) };\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":";AAWO,MAAM,kBAAkB,CAAC,KAAiB,OAAgB,OAAO;AAChE,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,KAAK,iBAAiB;AAAA,QACvD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AAChB,cAAM,WAAW,gBAAgB,UAAU,WAAW,IAAI;AACtD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACA,MAAU,iBAAgC;AACzCA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,cAAc,IAAI;AAC3DA,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;"}

package/dist/services/entity-service/index.d.ts

@@ -1,15 +1,13 @@
 import type { Database } from '@strapi/database';
-import type { Strapi, EntityService, EntityValidator, EventHub } from '@strapi/types';
+import type { Core, Modules } from '@strapi/types';
 type Decoratable<T> = T & {
-    decorate(decorator: (old: EntityService.EntityService) => EntityService.EntityService & {
+    decorate(decorator: (old: Modules.EntityService.EntityService) => Modules.EntityService.EntityService & {
         [key: string]: unknown;
     }): void;
 };
 declare const _default: (ctx: {
-    strapi: Strapi;
+    strapi: Core.Strapi;
     db: Database;
-    eventHub: EventHub;
-    entityValidator: EntityValidator;
-}) => Decoratable<EntityService.EntityService>;
+}) => Decoratable<Modules.EntityService.EntityService>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/services/entity-service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-service/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EACV,MAAM,EACN,aAAa,EACb,eAAe,EACf,QAAQ,EAKT,MAAM,eAAe,CAAC;AAkBvB,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG;IACxB,QAAQ,CACN,SAAS,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC,aAAa,KAAK,aAAa,CAAC,aAAa,GAAG;QAC7E,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,GACA,IAAI,CAAC;CACT,CAAC;8BAsZmB;IACnB,QAAQ,MAAM,CAAC;IACf,EAAE,EAAE,QAAQ,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;CAClC,KAAG,YAAY,2BAA2B,CAAC;AAL5C,wBA0DE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-service/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAS,MAAM,eAAe,CAAC;AAE1D,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG;IACxB,QAAQ,CACN,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,aAAa,KAAK,OAAO,CAAC,aAAa,CAAC,aAAa,GAAG;QAC7F,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,GACA,IAAI,CAAC;CACT,CAAC;8BAuLmB;IACnB,MAAM,EAAE,KAAK,MAAM,CAAC;IACpB,EAAE,EAAE,QAAQ,CAAC;CACd,KAAG,YAAY,QAAQ,aAAa,CAAC,aAAa,CAAC;AAHpD,wBAoDE"}

package/dist/services/entity-service/index.js

@@ -3,16 +3,11 @@ const _ = require("lodash");
 const delegate = require("delegates");
 const database = require("@strapi/database");
 const strapiUtils = require("@strapi/utils");
-const uploadFiles = require("../utils/upload-files.js");
-const components = require("./components.js");
-const params = require("./params.js");
-const index = require("./attributes/index.js");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const ___default = /* @__PURE__ */ _interopDefault(_);
 const delegate__default = /* @__PURE__ */ _interopDefault(delegate);
-const { transformParamsToQuery } = strapiUtils.convertQueryParams;
-const transformLoadParamsToQuery = (uid, field, params2, pagination = {}) => {
-  const query = transformParamsToQuery(uid, { populate: { [field]: params2 } });
+const transformLoadParamsToQuery = (uid, field, params, pagination = {}) => {
+  const query = strapi.get("query-params").transform(uid, { populate: { [field]: params } });
   const res = {
     ...query.populate[field],
     ...pagination
@@ -25,258 +20,107 @@ const databaseErrorsToTransform = [
   database.errors.InvalidDateError,
   database.errors.InvalidRelationError
 ];
-const creationPipeline = (data, context) => {
-  return index.applyTransforms(data, context);
-};
-const updatePipeline = (data, context) => {
-  return index.applyTransforms(data, context);
-};
-const ALLOWED_WEBHOOK_EVENTS = {
-  ENTRY_CREATE: "entry.create",
-  ENTRY_UPDATE: "entry.update",
-  ENTRY_DELETE: "entry.delete"
-};
 const createDefaultImplementation = ({
-  strapi,
-  db,
-  eventHub,
-  entityValidator
+  strapi: strapi2,
+  db
 }) => ({
-  /**
-   * Upload files utility
-   */
-  uploadFiles,
   async wrapParams(options = {}) {
     return options;
   },
   async wrapResult(result = {}) {
     return result;
   },
-  async emitEvent(uid, event, entity) {
-    if (uid === "admin::audit-log") {
-      return;
-    }
-    const model = strapi.getModel(uid);
-    const sanitizedEntity = await strapiUtils.sanitize.sanitizers.defaultSanitizeOutput(model, entity);
-    eventHub.emit(event, {
-      model: model.modelName,
-      uid: model.uid,
-      entry: sanitizedEntity
-    });
-  },
   async findMany(uid, opts) {
-    const { kind } = strapi.getModel(uid);
+    const { kind } = strapi2.getModel(uid);
     const wrappedParams = await this.wrapParams(opts, { uid, action: "findMany" });
-    const query = transformParamsToQuery(uid, wrappedParams);
     if (kind === "singleType") {
-      const entity = db.query(uid).findOne(query);
+      const entity = strapi2.documents(uid).findFirst(wrappedParams);
       return this.wrapResult(entity, { uid, action: "findOne" });
     }
-    const entities = await db.query(uid).findMany(query);
+    const entities = await strapi2.documents(uid).findMany(wrappedParams);
     return this.wrapResult(entities, { uid, action: "findMany" });
   },
   async findPage(uid, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "findPage" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    const page = await db.query(uid).findPage(query);
-    return {
-      ...page,
-      results: await this.wrapResult(page.results, { uid, action: "findPage" })
-    };
-  },
-  // TODO: streamline the logic based on the populate option
-  async findWithRelationCountsPage(uid, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "findWithRelationCounts" });
-    const query = transformParamsToQuery(uid, wrappedParams);
+    const query = strapi2.get("query-params").transform(uid, wrappedParams);
     const entities = await db.query(uid).findPage(query);
-    return {
-      ...entities,
-      results: await this.wrapResult(entities.results, { uid, action: "findWithRelationCounts" })
-    };
-  },
-  async findWithRelationCounts(uid, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "findWithRelationCounts" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    const entities = await db.query(uid).findMany(query);
-    return this.wrapResult(entities, { uid, action: "findWithRelationCounts" });
+    return this.wrapResult(entities, { uid, action: "findMany" });
   },
   async findOne(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "findOne" });
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const entity = await db.query(uid).findOne({ ...query, where: { id: entityId } });
+    const res = await db.query(uid).findOne({ where: { id: entityId } });
+    if (!res) {
+      return this.wrapResult(null, { uid, action: "findOne" });
+    }
+    const entity = await strapi2.documents(uid).findOne({
+      ...wrappedParams,
+      documentId: res.documentId
+    });
     return this.wrapResult(entity, { uid, action: "findOne" });
   },
   async count(uid, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "count" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    return db.query(uid).count(query);
+    return strapi2.documents(uid).count(wrappedParams);
   },
-  async create(uid, params$1) {
-    const wrappedParams = await this.wrapParams(params$1, { uid, action: "create" });
-    const { data, files } = wrappedParams;
+  async create(uid, params) {
+    const wrappedParams = await this.wrapParams(params, { uid, action: "create" });
+    const { data } = wrappedParams;
     if (!data) {
       throw new Error("cannot create");
     }
-    const model = strapi.getModel(uid);
-    const isDraft = strapiUtils.contentTypes.isDraft(data);
-    const validData = await entityValidator.validateEntityCreation(model, data, { isDraft });
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const componentData = await components.createComponents(uid, validData);
-    const entityData = creationPipeline(
-      Object.assign(components.omitComponentData(model, validData), componentData),
-      {
-        contentType: model
-      }
-    );
-    let entity = await db.query(uid).create({
-      ...query,
-      data: entityData
+    const shouldPublish = !strapiUtils.contentTypes.isDraft(data, strapi2.getModel(uid));
+    const entity = await strapi2.documents(uid).create({
+      ...wrappedParams,
+      status: shouldPublish ? "published" : "draft"
     });
-    if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
-      entity = await this.findOne(uid, entity.id, wrappedParams);
-    }
-    entity = await this.wrapResult(entity, { uid, action: "create" });
-    const { ENTRY_CREATE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_CREATE, entity);
-    return entity;
+    return this.wrapResult(entity, { uid, action: "create" });
   },
   async update(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, {
       uid,
       action: "update"
     });
-    const { data, files } = wrappedParams;
-    const model = strapi.getModel(uid);
     const entityToUpdate = await db.query(uid).findOne({ where: { id: entityId } });
     if (!entityToUpdate) {
-      return null;
+      return this.wrapResult(null, { uid, action: "update" });
     }
-    const isDraft = strapiUtils.contentTypes.isDraft(entityToUpdate);
-    const validData = await entityValidator.validateEntityUpdate(
-      model,
-      data,
-      {
-        isDraft
-      },
-      entityToUpdate
-    );
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const componentData = await components.updateComponents(uid, entityToUpdate, validData);
-    const entityData = updatePipeline(
-      Object.assign(components.omitComponentData(model, validData), componentData),
-      { contentType: model }
-    );
-    let entity = await db.query(uid).update({
-      ...query,
-      where: { id: entityId },
-      data: entityData
+    const shouldPublish = !strapiUtils.contentTypes.isDraft(entityToUpdate, strapi2.getModel(uid));
+    const entity = strapi2.documents(uid).update({
+      ...wrappedParams,
+      status: shouldPublish ? "published" : "draft",
+      documentId: entityToUpdate.documentId
     });
-    if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
-      entity = await this.findOne(uid, entity.id, wrappedParams);
-    }
-    entity = await this.wrapResult(entity, { uid, action: "update" });
-    const { ENTRY_UPDATE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_UPDATE, entity);
-    return entity;
+    return this.wrapResult(entity, { uid, action: "update" });
   },
   async delete(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "delete" });
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    let entityToDelete = await db.query(uid).findOne({
-      ...query,
-      where: { id: entityId }
-    });
+    const entityToDelete = await db.query(uid).findOne({ where: { id: entityId } });
     if (!entityToDelete) {
-      return null;
+      return this.wrapResult(null, { uid, action: "delete" });
     }
-    const componentsToDelete = await components.getComponents(uid, entityToDelete);
-    await db.query(uid).delete({ where: { id: entityToDelete.id } });
-    await components.deleteComponents(uid, componentsToDelete, { loadComponents: false });
-    entityToDelete = await this.wrapResult(entityToDelete, { uid, action: "delete" });
-    const { ENTRY_DELETE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_DELETE, entityToDelete);
-    return entityToDelete;
-  },
-  async clone(uid, cloneId, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "clone" });
-    const { data, files } = wrappedParams;
-    if (!data) {
-      throw new Error("cannot clone");
-    }
-    const model = strapi.getModel(uid);
-    const entityToClone = await db.query(uid).findOne({ where: { id: cloneId } });
-    if (!entityToClone) {
-      return null;
-    }
-    const isDraft = strapiUtils.contentTypes.isDraft(entityToClone);
-    const validData = await entityValidator.validateEntityUpdate(
-      model,
-      // Omit the id, the cloned entity id will be generated by the database
-      ___default.default.omit(data, ["id"]),
-      { isDraft },
-      entityToClone
-    );
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const componentData = await components.cloneComponents(uid, entityToClone, validData);
-    const entityData = creationPipeline(
-      Object.assign(components.omitComponentData(model, validData), componentData),
-      {
-        contentType: model
-      }
-    );
-    let entity = await db.query(uid).clone(cloneId, {
-      ...query,
-      data: entityData
+    await strapi2.documents(uid).delete({
+      ...wrappedParams,
+      documentId: entityToDelete.documentId
     });
-    if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
-      entity = await this.findOne(uid, entity.id, wrappedParams);
-    }
-    const { ENTRY_CREATE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_CREATE, entity);
-    return entity;
+    return this.wrapResult(entityToDelete, { uid, action: "delete" });
   },
-  // FIXME: used only for the CM to be removed
-  async deleteMany(uid, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "delete" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    let entitiesToDelete = await db.query(uid).findMany(query);
-    if (!entitiesToDelete.length) {
-      return { count: 0 };
-    }
-    const componentsToDelete = await Promise.all(
-      entitiesToDelete.map((entityToDelete) => components.getComponents(uid, entityToDelete))
-    );
-    const deletedEntities = await db.query(uid).deleteMany(query);
-    await Promise.all(
-      componentsToDelete.map(
-        (compos) => components.deleteComponents(uid, compos, { loadComponents: false })
-      )
-    );
-    entitiesToDelete = await this.wrapResult(entitiesToDelete, { uid, action: "delete" });
-    const { ENTRY_DELETE } = ALLOWED_WEBHOOK_EVENTS;
-    await Promise.all(entitiesToDelete.map((entity) => this.emitEvent(uid, ENTRY_DELETE, entity)));
-    return deletedEntities;
-  },
-  async load(uid, entity, field, params2) {
+  async load(uid, entity, field, params) {
     if (!___default.default.isString(field)) {
       throw new Error(`Invalid load. Expected "${field}" to be a string`);
     }
-    const loadedEntity = await db.query(uid).load(entity, field, transformLoadParamsToQuery(uid, field, params2 ?? {}));
+    const loadedEntity = await db.query(uid).load(entity, field, transformLoadParamsToQuery(uid, field, params ?? {}));
     return this.wrapResult(loadedEntity, { uid, field, action: "load" });
   },
-  async loadPages(uid, entity, field, params2, pagination = {}) {
+  async loadPages(uid, entity, field, params, pagination = {}) {
     if (!___default.default.isString(field)) {
       throw new Error(`Invalid load. Expected "${field}" to be a string`);
     }
-    const { attributes } = strapi.getModel(uid);
+    const { attributes } = strapi2.getModel(uid);
     const attribute = attributes[field];
     if (!strapiUtils.relations.isAnyToMany(attribute)) {
       throw new Error(`Invalid load. Expected "${field}" to be an anyToMany relational attribute`);
     }
-    const query = transformLoadParamsToQuery(uid, field, params2 ?? {}, pagination);
+    const query = transformLoadParamsToQuery(uid, field, params ?? {}, pagination);
     const loadedPage = await db.query(uid).loadPages(entity, field, query);
     return {
       ...loadedPage,
@@ -285,9 +129,6 @@ const createDefaultImplementation = ({
   }
 });
 const createEntityService = (ctx) => {
-  Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
-    ctx.strapi.webhookStore?.addAllowedEvent(key, value);
-  });
   const implementation = createDefaultImplementation(ctx);
   const service = {
     implementation,