@strapi/core 0.0.0-experimental.90ca9123352ed07e0a9cedaf4bcad1475e74137f → 0.0.0-experimental.a407f3bc8fb79a53cf7975140864526b6ddbac4b

package/dist/services/document-service/{collection-type.mjs → repositories/content-type.mjs}

@@ -1,11 +1,11 @@
 import { omit } from "lodash/fp";
 import { pipeAsync } from "@strapi/utils";
-import { wrapInTransaction } from "./common.mjs";
-import createDocumentEngine from "./document-engine.mjs";
-import { defaultToDraft, statusToLookup, setStatusToDraft, statusToData, filterDataPublishedAt } from "./draft-and-publish.mjs";
-import { defaultLocale as defaultLocaleCurry, localeToLookup as localeToLookupCurry, localeToData as localeToDataCurry } from "./internationalization.mjs";
-const createCollectionTypeRepository = (contentType) => {
-  const { uid } = contentType;
+import { wrapInTransaction } from "../common.mjs";
+import createDocumentEngine from "../document-engine.mjs";
+import { defaultToDraft, statusToLookup, setStatusToDraft, statusToData, filterDataPublishedAt } from "../draft-and-publish.mjs";
+import { defaultLocale as defaultLocaleCurry, localeToLookup as localeToLookupCurry, multiLocaleToLookup as multiLocaleToLookupCurry, localeToData as localeToDataCurry } from "../internationalization.mjs";
+const createContentTypeRepository = (uid) => {
+  const contentType = strapi.contentType(uid);
   const documents = createDocumentEngine({ strapi, db: strapi?.db });
   async function findMany(params = {}) {
     const queryParams = await pipeAsync(
@@ -35,7 +35,11 @@ const createCollectionTypeRepository = (contentType) => {
     return documents.findOne(uid, id, queryParams);
   }
   async function deleteFn(id, params = {}) {
-    const queryParams = await pipeAsync(omit("status"), localeToLookupCurry(contentType))(params);
+    const queryParams = await pipeAsync(
+      omit("status"),
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
     return documents.delete(uid, id, queryParams);
   }
   async function create(params = {}) {
@@ -48,14 +52,7 @@ const createCollectionTypeRepository = (contentType) => {
     )(params);
     const doc = await documents.create(uid, queryParams);
     if (params.status === "published") {
-      return documents.create(uid, {
-        ...queryParams,
-        data: {
-          ...queryParams.data,
-          documentId: doc.id,
-          publishedAt: params?.data?.publishedAt ?? /* @__PURE__ */ new Date()
-        }
-      });
+      return publish(doc.documentId, params).then((doc2) => doc2.versions[0]);
     }
     return doc;
   }
@@ -88,19 +85,7 @@ const createCollectionTypeRepository = (contentType) => {
       }
     }
     if (updatedDraft && params.status === "published") {
-      await documents.delete(uid, id, {
-        ...queryParams,
-        status: "published",
-        lookup: { ...params?.lookup, publishedAt: { $notNull: true } }
-      });
-      return documents.create(uid, {
-        ...queryParams,
-        data: {
-          ...queryParams.data,
-          documentId: updatedDraft.id,
-          publishedAt: params?.data?.publishedAt ?? /* @__PURE__ */ new Date()
-        }
-      });
+      return publish(id, params).then((doc) => doc.versions[0]);
     }
     return updatedDraft;
   }
@@ -114,15 +99,24 @@ const createCollectionTypeRepository = (contentType) => {
     return documents.count(uid, queryParams);
   }
   async function publish(id, params = {}) {
-    const queryParams = localeToLookupCurry(contentType, params);
+    const queryParams = await pipeAsync(
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
     return documents.publish(uid, id, queryParams);
   }
   async function unpublish(id, params = {}) {
-    const queryParams = localeToLookupCurry(contentType, params);
+    const queryParams = await pipeAsync(
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
     return documents.unpublish(uid, id, queryParams);
   }
   async function discardDraft(id, params = {}) {
-    const queryParams = localeToLookupCurry(contentType, params);
+    const queryParams = await pipeAsync(
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
     return documents.discardDraft(uid, id, queryParams);
   }
   return {
@@ -140,6 +134,6 @@ const createCollectionTypeRepository = (contentType) => {
   };
 };
 export {
-  createCollectionTypeRepository
+  createContentTypeRepository
 };
-//# sourceMappingURL=collection-type.mjs.map
+//# sourceMappingURL=content-type.mjs.map

package/dist/services/document-service/repositories/content-type.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-type.mjs","sources":["../../../../src/services/document-service/repositories/content-type.ts"],"sourcesContent":["import { omit } from 'lodash/fp';\n\nimport { pipeAsync } from '@strapi/utils';\n\nimport { wrapInTransaction, type RepositoryFactoryMethod } from '../common';\nimport createDocumentEngine from '../document-engine';\nimport * as DP from '../draft-and-publish';\nimport * as i18n from '../internationalization';\n\nexport const createContentTypeRepository: RepositoryFactoryMethod = (uid) => {\n  const contentType = strapi.contentType(uid);\n\n  // TODO: move the code back into here instead of using the document-engine\n  const documents = createDocumentEngine({ strapi, db: strapi?.db });\n\n  async function findMany(params = {} as any) {\n    // TODO: replace with chaining\n    const queryParams = await pipeAsync(\n      DP.defaultToDraft,\n      DP.statusToLookup,\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType)\n    )(params);\n\n    return documents.findMany(uid, queryParams);\n  }\n\n  async function findFirst(params = {} as any) {\n    const queryParams = await pipeAsync(\n      DP.defaultToDraft,\n      DP.statusToLookup,\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType)\n    )(params);\n\n    return documents.findFirst(uid, queryParams);\n  }\n\n  async function findOne(id: string, params = {} as any) {\n    const queryParams = await pipeAsync(\n      DP.defaultToDraft,\n      DP.statusToLookup,\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType)\n    )(params);\n\n    return documents.findOne(uid, id, queryParams);\n  }\n\n  async function deleteFn(id: string, params = {} as any) {\n    const queryParams = await pipeAsync(\n      omit('status'),\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    return documents.delete(uid, id, queryParams);\n  }\n\n  async function create(params = {} as any) {\n    const queryParams = await pipeAsync(\n      DP.setStatusToDraft,\n      DP.statusToData,\n      DP.filterDataPublishedAt,\n      i18n.defaultLocale(contentType),\n      i18n.localeToData(contentType)\n    )(params);\n\n    const doc = await documents.create(uid, queryParams);\n\n    if (params.status === 'published') {\n      return publish(doc.documentId, params).then((doc) => doc.versions[0]);\n    }\n\n    return doc;\n  }\n\n  async function clone(id: string, params = {} as any) {\n    const queryParams = await pipeAsync(\n      DP.filterDataPublishedAt,\n      i18n.localeToLookup(contentType)\n    )(params);\n\n    return documents.clone(uid, id, queryParams);\n  }\n\n  async function update(id: string, params = {} as any) {\n    const queryParams = await pipeAsync(\n      DP.setStatusToDraft,\n      DP.statusToLookup,\n      DP.statusToData,\n      DP.filterDataPublishedAt,\n      // Default locale will be set if not provided\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType),\n      i18n.localeToData(contentType)\n    )(params);\n\n    let updatedDraft: any = await documents.update(uid, id, queryParams);\n\n    if (!updatedDraft) {\n      const documentExists = await strapi.db\n        .query(contentType.uid)\n        .findOne({ where: { documentId: id } });\n\n      if (documentExists) {\n        updatedDraft = await create({\n          ...queryParams,\n          data: { ...queryParams.data, documentId: id },\n        });\n      }\n    }\n\n    if (updatedDraft && params.status === 'published') {\n      return publish(id, params).then((doc) => doc.versions[0]);\n    }\n\n    return updatedDraft;\n  }\n\n  async function count(params = {} as any) {\n    const queryParams = await pipeAsync(\n      DP.defaultToDraft,\n      DP.statusToLookup,\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType)\n    )(params);\n\n    return documents.count(uid, queryParams);\n  }\n\n  async function publish(id: string, params = {} as any) {\n    const queryParams = await pipeAsync(\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    return documents.publish(uid, id, queryParams);\n  }\n\n  async function unpublish(id: string, params = {} as any) {\n    const queryParams = await pipeAsync(\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    return documents.unpublish(uid, id, queryParams);\n  }\n\n  async function discardDraft(id: string, params = {} as any) {\n    const queryParams = await pipeAsync(\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    return documents.discardDraft(uid, id, queryParams);\n  }\n\n  return {\n    findMany: wrapInTransaction(findMany),\n    findFirst: wrapInTransaction(findFirst),\n    findOne: wrapInTransaction(findOne),\n    delete: wrapInTransaction(deleteFn),\n    create: wrapInTransaction(create),\n    clone: wrapInTransaction(clone),\n    update: wrapInTransaction(update),\n    count: wrapInTransaction(count),\n    publish: wrapInTransaction(publish),\n    unpublish: wrapInTransaction(unpublish),\n    discardDraft: wrapInTransaction(discardDraft),\n  };\n};\n"],"names":["DP.defaultToDraft","DP.statusToLookup","i18n.defaultLocale","i18n.localeToLookup","i18n.multiLocaleToLookup","DP.setStatusToDraft","DP.statusToData","DP.filterDataPublishedAt","i18n.localeToData","doc"],"mappings":";;;;;;AASa,MAAA,8BAAuD,CAAC,QAAQ;AACrE,QAAA,cAAc,OAAO,YAAY,GAAG;AAG1C,QAAM,YAAY,qBAAqB,EAAE,QAAQ,IAAI,QAAQ,IAAI;AAElD,iBAAA,SAAS,SAAS,IAAW;AAE1C,UAAM,cAAc,MAAM;AAAA,MACxBA;AAAAA,MACAC;AAAAA,MACAC,mBAAmB,WAAW;AAAA,MAC9BC,oBAAoB,WAAW;AAAA,MAC/B,MAAM;AAED,WAAA,UAAU,SAAS,KAAK,WAAW;AAAA,EAC5C;AAEe,iBAAA,UAAU,SAAS,IAAW;AAC3C,UAAM,cAAc,MAAM;AAAA,MACxBH;AAAAA,MACAC;AAAAA,MACAC,mBAAmB,WAAW;AAAA,MAC9BC,oBAAoB,WAAW;AAAA,MAC/B,MAAM;AAED,WAAA,UAAU,UAAU,KAAK,WAAW;AAAA,EAC7C;AAEA,iBAAe,QAAQ,IAAY,SAAS,IAAW;AACrD,UAAM,cAAc,MAAM;AAAA,MACxBH;AAAAA,MACAC;AAAAA,MACAC,mBAAmB,WAAW;AAAA,MAC9BC,oBAAoB,WAAW;AAAA,MAC/B,MAAM;AAER,WAAO,UAAU,QAAQ,KAAK,IAAI,WAAW;AAAA,EAC/C;AAEA,iBAAe,SAAS,IAAY,SAAS,IAAW;AACtD,UAAM,cAAc,MAAM;AAAA,MACxB,KAAK,QAAQ;AAAA,MACbD,mBAAmB,WAAW;AAAA,MAC9BE,yBAAyB,WAAW;AAAA,MACpC,MAAM;AAER,WAAO,UAAU,OAAO,KAAK,IAAI,WAAW;AAAA,EAC9C;AAEe,iBAAA,OAAO,SAAS,IAAW;AACxC,UAAM,cAAc,MAAM;AAAA,MACxBC;AAAAA,MACAC;AAAAA,MACAC;AAAAA,MACAL,mBAAmB,WAAW;AAAA,MAC9BM,kBAAkB,WAAW;AAAA,MAC7B,MAAM;AAER,UAAM,MAAM,MAAM,UAAU,OAAO,KAAK,WAAW;AAE/C,QAAA,OAAO,WAAW,aAAa;AAC1B,aAAA,QAAQ,IAAI,YAAY,MAAM,EAAE,KAAK,CAACC,SAAQA,KAAI,SAAS,CAAC,CAAC;AAAA,IACtE;AAEO,WAAA;AAAA,EACT;AAEA,iBAAe,MAAM,IAAY,SAAS,IAAW;AACnD,UAAM,cAAc,MAAM;AAAA,MACxBF;AAAAA,MACAJ,oBAAoB,WAAW;AAAA,MAC/B,MAAM;AAER,WAAO,UAAU,MAAM,KAAK,IAAI,WAAW;AAAA,EAC7C;AAEA,iBAAe,OAAO,IAAY,SAAS,IAAW;AACpD,UAAM,cAAc,MAAM;AAAA,MACxBE;AAAAA,MACAJ;AAAAA,MACAK;AAAAA,MACAC;AAAAA;AAAAA,MAEAL,mBAAmB,WAAW;AAAA,MAC9BC,oBAAoB,WAAW;AAAA,MAC/BK,kBAAkB,WAAW;AAAA,MAC7B,MAAM;AAER,QAAI,eAAoB,MAAM,UAAU,OAAO,KAAK,IAAI,WAAW;AAEnE,QAAI,CAAC,cAAc;AACjB,YAAM,iBAAiB,MAAM,OAAO,GACjC,MAAM,YAAY,GAAG,EACrB,QAAQ,EAAE,OAAO,EAAE,YAAY,GAAA,EAAM,CAAA;AAExC,UAAI,gBAAgB;AAClB,uBAAe,MAAM,OAAO;AAAA,UAC1B,GAAG;AAAA,UACH,MAAM,EAAE,GAAG,YAAY,MAAM,YAAY,GAAG;AAAA,QAAA,CAC7C;AAAA,MACH;AAAA,IACF;AAEI,QAAA,gBAAgB,OAAO,WAAW,aAAa;AAC1C,aAAA,QAAQ,IAAI,MAAM,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC;AAAA,IAC1D;AAEO,WAAA;AAAA,EACT;AAEe,iBAAA,MAAM,SAAS,IAAW;AACvC,UAAM,cAAc,MAAM;AAAA,MACxBR;AAAAA,MACAC;AAAAA,MACAC,mBAAmB,WAAW;AAAA,MAC9BC,oBAAoB,WAAW;AAAA,MAC/B,MAAM;AAED,WAAA,UAAU,MAAM,KAAK,WAAW;AAAA,EACzC;AAEA,iBAAe,QAAQ,IAAY,SAAS,IAAW;AACrD,UAAM,cAAc,MAAM;AAAA,MACxBD,mBAAmB,WAAW;AAAA,MAC9BE,yBAAyB,WAAW;AAAA,MACpC,MAAM;AAER,WAAO,UAAU,QAAQ,KAAK,IAAI,WAAW;AAAA,EAC/C;AAEA,iBAAe,UAAU,IAAY,SAAS,IAAW;AACvD,UAAM,cAAc,MAAM;AAAA,MACxBF,mBAAmB,WAAW;AAAA,MAC9BE,yBAAyB,WAAW;AAAA,MACpC,MAAM;AAER,WAAO,UAAU,UAAU,KAAK,IAAI,WAAW;AAAA,EACjD;AAEA,iBAAe,aAAa,IAAY,SAAS,IAAW;AAC1D,UAAM,cAAc,MAAM;AAAA,MACxBF,mBAAmB,WAAW;AAAA,MAC9BE,yBAAyB,WAAW;AAAA,MACpC,MAAM;AAER,WAAO,UAAU,aAAa,KAAK,IAAI,WAAW;AAAA,EACpD;AAEO,SAAA;AAAA,IACL,UAAU,kBAAkB,QAAQ;AAAA,IACpC,WAAW,kBAAkB,SAAS;AAAA,IACtC,SAAS,kBAAkB,OAAO;AAAA,IAClC,QAAQ,kBAAkB,QAAQ;AAAA,IAClC,QAAQ,kBAAkB,MAAM;AAAA,IAChC,OAAO,kBAAkB,KAAK;AAAA,IAC9B,QAAQ,kBAAkB,MAAM;AAAA,IAChC,OAAO,kBAAkB,KAAK;AAAA,IAC9B,SAAS,kBAAkB,OAAO;AAAA,IAClC,WAAW,kBAAkB,SAAS;AAAA,IACtC,cAAc,kBAAkB,YAAY;AAAA,EAAA;AAEhD;"}

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

@@ -1 +1 @@
-{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAElD,KAAK,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE3E,eAAO,MAAM,eAAe,WAAY,MAAM,KAAG,MA+BhD,CAAC"}
+{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAElD,KAAK,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE3E,eAAO,MAAM,eAAe,WAAY,MAAM,KAAG,MAgChD,CAAC"}

package/dist/services/document-service/transform/fields.js

@@ -2,22 +2,23 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const transformFields = (fields) => {
   if (typeof fields === "string") {
-    if (fields === "*")
+    if (fields === "*") {
       return fields;
-    if (fields === "documentId" || fields.startsWith("documentId,"))
-      return fields;
-    if (fields === "id")
+    }
+    if (fields === "") {
       return "documentId";
-    return [fields, "documentId"];
+    }
+    if (!fields.split(",").includes("documentId")) {
+      return `${fields},documentId`;
+    }
   }
-  if (!fields || fields.length === 0) {
+  if (!fields || !Array.isArray(fields)) {
     return fields;
   }
-  const mappedFields = fields.map((field) => field === "id" ? "documentId" : field);
-  if (!mappedFields.includes("documentId")) {
-    mappedFields.push("documentId");
+  if (!fields.includes("documentId")) {
+    fields.push("documentId");
   }
-  return mappedFields;
+  return fields;
 };
 exports.transformFields = transformFields;
 //# sourceMappingURL=fields.js.map

package/dist/services/document-service/transform/fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"fields.js","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import { Documents, Common } from '@strapi/types';\n\ntype Fields = Documents.Params.Pick<Common.UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  // '*' => '*'\n  // 'documentId' => 'documentId' , 'documentId,name' => 'documentId,name'\n  // 'name' => ['name', 'documentId']\n  // 'id' => 'documentId'\n  if (typeof fields === 'string') {\n    if (fields === '*') return fields;\n    if (fields === 'documentId' || fields.startsWith('documentId,')) return fields;\n    if (fields === 'id') return 'documentId';\n    return [fields, 'documentId'];\n  }\n\n  // It's an array\n  // [] => []\n  if (!fields || fields.length === 0) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Map any id fields to documentId\n  // ['id', 'name'] => ['documentId', 'name']\n  const mappedFields = fields.map((field) => (field === 'id' ? 'documentId' : field));\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!mappedFields.includes('documentId')) {\n    mappedFields.push('documentId');\n  }\n\n  return mappedFields;\n};\n"],"names":[],"mappings":";;AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAMrD,MAAA,OAAO,WAAW,UAAU;AAC9B,QAAI,WAAW;AAAY,aAAA;AAC3B,QAAI,WAAW,gBAAgB,OAAO,WAAW,aAAa;AAAU,aAAA;AACxE,QAAI,WAAW;AAAa,aAAA;AACrB,WAAA,CAAC,QAAQ,YAAY;AAAA,EAC9B;AAIA,MAAI,CAAC,UAAU,OAAO,WAAW,GAAG;AAE3B,WAAA;AAAA,EACT;AAIM,QAAA,eAAe,OAAO,IAAI,CAAC,UAAW,UAAU,OAAO,eAAe,KAAM;AAIlF,MAAI,CAAC,aAAa,SAAS,YAAY,GAAG;AACxC,iBAAa,KAAK,YAAY;AAAA,EAChC;AAEO,SAAA;AACT;;"}
+{"version":3,"file":"fields.js","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import { Documents, Common } from '@strapi/types';\n\ntype Fields = Documents.Params.Pick<Common.UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  if (typeof fields === 'string') {\n    // '*' => '*'\n    if (fields === '*') {\n      return fields;\n    }\n\n    // '' => 'documentId'\n    if (fields === '') {\n      return 'documentId';\n    }\n\n    // 'name,description' => 'name,description,documentId'\n    if (!fields.split(',').includes('documentId')) {\n      return `${fields},documentId`;\n    }\n  }\n\n  // It's not an array, ignore it\n  if (!fields || !Array.isArray(fields)) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!fields.includes('documentId')) {\n    fields.push('documentId');\n  }\n\n  return fields;\n};\n"],"names":[],"mappings":";;AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAErD,MAAA,OAAO,WAAW,UAAU;AAE9B,QAAI,WAAW,KAAK;AACX,aAAA;AAAA,IACT;AAGA,QAAI,WAAW,IAAI;AACV,aAAA;AAAA,IACT;AAGA,QAAI,CAAC,OAAO,MAAM,GAAG,EAAE,SAAS,YAAY,GAAG;AAC7C,aAAO,GAAG,MAAM;AAAA,IAClB;AAAA,EACF;AAGA,MAAI,CAAC,UAAU,CAAC,MAAM,QAAQ,MAAM,GAAG;AAE9B,WAAA;AAAA,EACT;AAIA,MAAI,CAAC,OAAO,SAAS,YAAY,GAAG;AAClC,WAAO,KAAK,YAAY;AAAA,EAC1B;AAEO,SAAA;AACT;;"}

package/dist/services/document-service/transform/fields.mjs

@@ -1,21 +1,22 @@
 const transformFields = (fields) => {
   if (typeof fields === "string") {
-    if (fields === "*")
+    if (fields === "*") {
       return fields;
-    if (fields === "documentId" || fields.startsWith("documentId,"))
-      return fields;
-    if (fields === "id")
+    }
+    if (fields === "") {
       return "documentId";
-    return [fields, "documentId"];
+    }
+    if (!fields.split(",").includes("documentId")) {
+      return `${fields},documentId`;
+    }
   }
-  if (!fields || fields.length === 0) {
+  if (!fields || !Array.isArray(fields)) {
     return fields;
   }
-  const mappedFields = fields.map((field) => field === "id" ? "documentId" : field);
-  if (!mappedFields.includes("documentId")) {
-    mappedFields.push("documentId");
+  if (!fields.includes("documentId")) {
+    fields.push("documentId");
   }
-  return mappedFields;
+  return fields;
 };
 export {
   transformFields

package/dist/services/document-service/transform/fields.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"fields.mjs","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import { Documents, Common } from '@strapi/types';\n\ntype Fields = Documents.Params.Pick<Common.UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  // '*' => '*'\n  // 'documentId' => 'documentId' , 'documentId,name' => 'documentId,name'\n  // 'name' => ['name', 'documentId']\n  // 'id' => 'documentId'\n  if (typeof fields === 'string') {\n    if (fields === '*') return fields;\n    if (fields === 'documentId' || fields.startsWith('documentId,')) return fields;\n    if (fields === 'id') return 'documentId';\n    return [fields, 'documentId'];\n  }\n\n  // It's an array\n  // [] => []\n  if (!fields || fields.length === 0) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Map any id fields to documentId\n  // ['id', 'name'] => ['documentId', 'name']\n  const mappedFields = fields.map((field) => (field === 'id' ? 'documentId' : field));\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!mappedFields.includes('documentId')) {\n    mappedFields.push('documentId');\n  }\n\n  return mappedFields;\n};\n"],"names":[],"mappings":"AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAMrD,MAAA,OAAO,WAAW,UAAU;AAC9B,QAAI,WAAW;AAAY,aAAA;AAC3B,QAAI,WAAW,gBAAgB,OAAO,WAAW,aAAa;AAAU,aAAA;AACxE,QAAI,WAAW;AAAa,aAAA;AACrB,WAAA,CAAC,QAAQ,YAAY;AAAA,EAC9B;AAIA,MAAI,CAAC,UAAU,OAAO,WAAW,GAAG;AAE3B,WAAA;AAAA,EACT;AAIM,QAAA,eAAe,OAAO,IAAI,CAAC,UAAW,UAAU,OAAO,eAAe,KAAM;AAIlF,MAAI,CAAC,aAAa,SAAS,YAAY,GAAG;AACxC,iBAAa,KAAK,YAAY;AAAA,EAChC;AAEO,SAAA;AACT;"}
+{"version":3,"file":"fields.mjs","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import { Documents, Common } from '@strapi/types';\n\ntype Fields = Documents.Params.Pick<Common.UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  if (typeof fields === 'string') {\n    // '*' => '*'\n    if (fields === '*') {\n      return fields;\n    }\n\n    // '' => 'documentId'\n    if (fields === '') {\n      return 'documentId';\n    }\n\n    // 'name,description' => 'name,description,documentId'\n    if (!fields.split(',').includes('documentId')) {\n      return `${fields},documentId`;\n    }\n  }\n\n  // It's not an array, ignore it\n  if (!fields || !Array.isArray(fields)) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!fields.includes('documentId')) {\n    fields.push('documentId');\n  }\n\n  return fields;\n};\n"],"names":[],"mappings":"AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAErD,MAAA,OAAO,WAAW,UAAU;AAE9B,QAAI,WAAW,KAAK;AACX,aAAA;AAAA,IACT;AAGA,QAAI,WAAW,IAAI;AACV,aAAA;AAAA,IACT;AAGA,QAAI,CAAC,OAAO,MAAM,GAAG,EAAE,SAAS,YAAY,GAAG;AAC7C,aAAO,GAAG,MAAM;AAAA,IAClB;AAAA,EACF;AAGA,MAAI,CAAC,UAAU,CAAC,MAAM,QAAQ,MAAM,GAAG;AAE9B,WAAA;AAAA,EACT;AAIA,MAAI,CAAC,OAAO,SAAS,YAAY,GAAG;AAClC,WAAO,KAAK,YAAY;AAAA,EAC1B;AAEO,SAAA;AACT;"}

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

@@ -5,22 +5,15 @@ import { Common } from '@strapi/types';
 declare function transformParamsDocumentId(uid: Common.UID.Schema, input: {
     data?: any;
     fields?: any;
-    filters?: any;
     populate?: any;
-    sort?: any;
+    [key: string]: any;
 }, opts: {
     locale?: string | null;
     isDraft: boolean;
 }): Promise<{
     data: any;
     fields: any;
-    filters: any;
     populate: any;
-    sort: any;
 }>;
-/**
- * Transform response of a query to map entity ids to document ids.
- */
-declare function transformOutputDocumentId(uid: Common.UID.Schema, output: Record<string, any> | Record<string, any>[]): Promise<any>;
-export { transformParamsDocumentId, transformOutputDocumentId };
+export { transformParamsDocumentId };
 //# sourceMappingURL=id-transform.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-transform.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAWvC;;GAEG;AACH,iBAAe,yBAAyB,CACtC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EACtB,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAA;CAAE,EAC9E,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB;;;;;;GAoCF;AAED;;GAEG;AACH,iBAAe,yBAAyB,CACtC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,gBAepD;AAED,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"id-transform.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKvC;;GAEG;AACH,iBAAe,yBAAyB,CACtC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EACtB,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EACvE,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB;;;;GAyBF;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/services/document-service/transform/id-transform.js

@@ -1,14 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const strapiUtils = require("@strapi/utils");
-const _ = require("lodash/fp");
-const outputIds = require("./relations/transform/output-ids.js");
-const utils = require("./utils.js");
-const filters = require("./filters.js");
-const sort = require("./sort.js");
+const data = require("./data.js");
 const fields = require("./fields.js");
 const populate = require("./populate.js");
-const data = require("./data.js");
 async function transformParamsDocumentId(uid, input, opts) {
   let data$1 = input.data;
   if (input.data) {
@@ -18,40 +12,16 @@ async function transformParamsDocumentId(uid, input, opts) {
   if (input.fields) {
     fields$1 = fields.transformFields(input.fields);
   }
-  let filters$1 = input.filters;
-  if (input.filters) {
-    filters$1 = await filters.transformFilters(input.filters, { ...opts, uid });
-  }
   let populate$1 = input.populate;
   if (input.populate) {
     populate$1 = await populate.transformPopulate(input.populate, { ...opts, uid });
   }
-  let sort$1 = input.sort;
-  if (input.sort) {
-    sort$1 = await sort.transformSort(input.sort, { ...opts, uid });
-  }
   return {
     ...input,
     data: data$1,
     fields: fields$1,
-    filters: filters$1,
-    populate: populate$1,
-    sort: sort$1
+    populate: populate$1
   };
 }
-async function transformOutputDocumentId(uid, output) {
-  if (Array.isArray(output)) {
-    return strapiUtils.mapAsync(output, (o) => transformOutputDocumentId(uid, o));
-  }
-  if (!_.isObject(output) || !output?.documentId)
-    return output;
-  return strapiUtils.pipeAsync(
-    // Switch top level id -> documentId
-    utils.switchIdForDocumentId,
-    // Switch relations id -> documentId
-    (output2) => outputIds.transformOutputIds(uid, output2)
-  )(output);
-}
-exports.transformOutputDocumentId = transformOutputDocumentId;
 exports.transformParamsDocumentId = transformParamsDocumentId;
 //# sourceMappingURL=id-transform.js.map

package/dist/services/document-service/transform/id-transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"id-transform.js","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { mapAsync, pipeAsync } from '@strapi/utils';\nimport { isObject } from 'lodash/fp';\nimport { transformOutputIds as transformRelationOutputIds } from './relations/transform/output-ids';\nimport { switchIdForDocumentId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformSort } from './sort';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\nimport { transformData } from './data';\n\n/**\n * Transform input of a query to map document ids to entity ids.\n */\nasync function transformParamsDocumentId(\n  uid: Common.UID.Schema,\n  input: { data?: any; fields?: any; filters?: any; populate?: any; sort?: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Transform any relation ids to entity ids\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let filters = input.filters;\n  if (input.filters) {\n    filters = await transformFilters(input.filters, { ...opts, uid });\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  let sort = input.sort;\n  if (input.sort) {\n    sort = await transformSort(input.sort, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    filters,\n    populate,\n    sort,\n  };\n}\n\n/**\n * Transform response of a query to map entity ids to document ids.\n */\nasync function transformOutputDocumentId(\n  uid: Common.UID.Schema,\n  output: Record<string, any> | Record<string, any>[]\n) {\n  if (Array.isArray(output)) {\n    return mapAsync(output, (o: Record<string, any>) => transformOutputDocumentId(uid, o));\n  }\n\n  // TODO: Ensure we always have documentId on output\n  if (!isObject(output) || !output?.documentId) return output;\n\n  return pipeAsync(\n    // Switch top level id -> documentId\n    switchIdForDocumentId,\n    // Switch relations id -> documentId\n    (output) => transformRelationOutputIds(uid, output)\n  )(output);\n}\n\nexport { transformParamsDocumentId, transformOutputDocumentId };\n"],"names":["data","transformData","fields","transformFields","filters","transformFilters","populate","transformPopulate","sort","transformSort","mapAsync","isObject","pipeAsync","switchIdForDocumentId","output","transformRelationOutputIds"],"mappings":";;;;;;;;;;;AAcA,eAAe,0BACb,KACA,OACA,MAIA;AACA,MAAIA,SAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACPA,aAAA,MAAMC,mBAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAGA,MAAIC,WAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACPA,eAAAC,OAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAIC,YAAU,MAAM;AACpB,MAAI,MAAM,SAAS;AACPA,gBAAA,MAAMC,yBAAiB,MAAM,SAAS,EAAE,GAAG,MAAM,KAAK;AAAA,EAClE;AAEA,MAAIC,aAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACPA,iBAAA,MAAMC,2BAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEA,MAAIC,SAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACPA,aAAA,MAAMC,mBAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IAAA,MACHT;AAAAA,IAAA,QACAE;AAAAA,IAAA,SACAE;AAAAA,IAAA,UACAE;AAAAA,IAAA,MACAE;AAAAA,EAAA;AAEJ;AAKA,eAAe,0BACb,KACA,QACA;AACI,MAAA,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAOE,YAAAA,SAAS,QAAQ,CAAC,MAA2B,0BAA0B,KAAK,CAAC,CAAC;AAAA,EACvF;AAGA,MAAI,CAACC,EAAAA,SAAS,MAAM,KAAK,CAAC,QAAQ;AAAmB,WAAA;AAE9C,SAAAC,YAAA;AAAA;AAAA,IAELC,MAAA;AAAA;AAAA,IAEA,CAACC,YAAWC,UAAAA,mBAA2B,KAAKD,OAAM;AAAA,IAClD,MAAM;AACV;;;"}
+{"version":3,"file":"id-transform.js","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { transformData } from './data';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\n\n/**\n * Transform input of a query to map document ids to entity ids.\n */\nasync function transformParamsDocumentId(\n  uid: Common.UID.Schema,\n  input: { data?: any; fields?: any; populate?: any; [key: string]: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  // Transform relational documentIds to entity ids\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Make sure documentId is always present in the response\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    populate,\n  };\n}\n\nexport { transformParamsDocumentId };\n"],"names":["data","transformData","fields","transformFields","populate","transformPopulate"],"mappings":";;;;;AAQA,eAAe,0BACb,KACA,OACA,MAIA;AAEA,MAAIA,SAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACPA,aAAA,MAAMC,mBAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAGA,MAAIC,WAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACPA,eAAAC,OAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAIC,aAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACPA,iBAAA,MAAMC,2BAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IAAA,MACHL;AAAAA,IAAA,QACAE;AAAAA,IAAA,UACAE;AAAAA,EAAA;AAEJ;;"}

package/dist/services/document-service/transform/id-transform.mjs

@@ -1,12 +1,6 @@
-import { mapAsync, pipeAsync } from "@strapi/utils";
-import { isObject } from "lodash/fp";
-import { transformOutputIds } from "./relations/transform/output-ids.mjs";
-import { switchIdForDocumentId } from "./utils.mjs";
-import { transformFilters } from "./filters.mjs";
-import { transformSort } from "./sort.mjs";
+import { transformData } from "./data.mjs";
 import { transformFields } from "./fields.mjs";
 import { transformPopulate } from "./populate.mjs";
-import { transformData } from "./data.mjs";
 async function transformParamsDocumentId(uid, input, opts) {
   let data = input.data;
   if (input.data) {
@@ -16,42 +10,18 @@ async function transformParamsDocumentId(uid, input, opts) {
   if (input.fields) {
     fields = transformFields(input.fields);
   }
-  let filters = input.filters;
-  if (input.filters) {
-    filters = await transformFilters(input.filters, { ...opts, uid });
-  }
   let populate = input.populate;
   if (input.populate) {
     populate = await transformPopulate(input.populate, { ...opts, uid });
   }
-  let sort = input.sort;
-  if (input.sort) {
-    sort = await transformSort(input.sort, { ...opts, uid });
-  }
   return {
     ...input,
     data,
     fields,
-    filters,
-    populate,
-    sort
+    populate
   };
 }
-async function transformOutputDocumentId(uid, output) {
-  if (Array.isArray(output)) {
-    return mapAsync(output, (o) => transformOutputDocumentId(uid, o));
-  }
-  if (!isObject(output) || !output?.documentId)
-    return output;
-  return pipeAsync(
-    // Switch top level id -> documentId
-    switchIdForDocumentId,
-    // Switch relations id -> documentId
-    (output2) => transformOutputIds(uid, output2)
-  )(output);
-}
 export {
-  transformOutputDocumentId,
   transformParamsDocumentId
 };
 //# sourceMappingURL=id-transform.mjs.map

package/dist/services/document-service/transform/id-transform.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"id-transform.mjs","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { mapAsync, pipeAsync } from '@strapi/utils';\nimport { isObject } from 'lodash/fp';\nimport { transformOutputIds as transformRelationOutputIds } from './relations/transform/output-ids';\nimport { switchIdForDocumentId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformSort } from './sort';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\nimport { transformData } from './data';\n\n/**\n * Transform input of a query to map document ids to entity ids.\n */\nasync function transformParamsDocumentId(\n  uid: Common.UID.Schema,\n  input: { data?: any; fields?: any; filters?: any; populate?: any; sort?: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Transform any relation ids to entity ids\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let filters = input.filters;\n  if (input.filters) {\n    filters = await transformFilters(input.filters, { ...opts, uid });\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  let sort = input.sort;\n  if (input.sort) {\n    sort = await transformSort(input.sort, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    filters,\n    populate,\n    sort,\n  };\n}\n\n/**\n * Transform response of a query to map entity ids to document ids.\n */\nasync function transformOutputDocumentId(\n  uid: Common.UID.Schema,\n  output: Record<string, any> | Record<string, any>[]\n) {\n  if (Array.isArray(output)) {\n    return mapAsync(output, (o: Record<string, any>) => transformOutputDocumentId(uid, o));\n  }\n\n  // TODO: Ensure we always have documentId on output\n  if (!isObject(output) || !output?.documentId) return output;\n\n  return pipeAsync(\n    // Switch top level id -> documentId\n    switchIdForDocumentId,\n    // Switch relations id -> documentId\n    (output) => transformRelationOutputIds(uid, output)\n  )(output);\n}\n\nexport { transformParamsDocumentId, transformOutputDocumentId };\n"],"names":["output","transformRelationOutputIds"],"mappings":";;;;;;;;;AAcA,eAAe,0BACb,KACA,OACA,MAIA;AACA,MAAI,OAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACP,WAAA,MAAM,cAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAGA,MAAI,SAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACP,aAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAI,UAAU,MAAM;AACpB,MAAI,MAAM,SAAS;AACP,cAAA,MAAM,iBAAiB,MAAM,SAAS,EAAE,GAAG,MAAM,KAAK;AAAA,EAClE;AAEA,MAAI,WAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACP,eAAA,MAAM,kBAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEA,MAAI,OAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACP,WAAA,MAAM,cAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAKA,eAAe,0BACb,KACA,QACA;AACI,MAAA,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO,SAAS,QAAQ,CAAC,MAA2B,0BAA0B,KAAK,CAAC,CAAC;AAAA,EACvF;AAGA,MAAI,CAAC,SAAS,MAAM,KAAK,CAAC,QAAQ;AAAmB,WAAA;AAE9C,SAAA;AAAA;AAAA,IAEL;AAAA;AAAA,IAEA,CAACA,YAAWC,mBAA2B,KAAKD,OAAM;AAAA,IAClD,MAAM;AACV;"}
+{"version":3,"file":"id-transform.mjs","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { transformData } from './data';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\n\n/**\n * Transform input of a query to map document ids to entity ids.\n */\nasync function transformParamsDocumentId(\n  uid: Common.UID.Schema,\n  input: { data?: any; fields?: any; populate?: any; [key: string]: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  // Transform relational documentIds to entity ids\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Make sure documentId is always present in the response\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    populate,\n  };\n}\n\nexport { transformParamsDocumentId };\n"],"names":[],"mappings":";;;AAQA,eAAe,0BACb,KACA,OACA,MAIA;AAEA,MAAI,OAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACP,WAAA,MAAM,cAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAGA,MAAI,SAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACP,aAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAI,WAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACP,eAAA,MAAM,kBAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;"}

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

@@ -1 +1 @@
-{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/populate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAKlD,eAAO,MAAM,iBAAiB,SAAgB,IAAI,QAAQ,OAAO,qBAkChE,CAAC"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/populate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlD,eAAO,MAAM,iBAAiB,SAAgB,IAAI,QAAQ,OAAO,qBAqBhE,CAAC"}

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

@@ -1,23 +1,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const strapiUtils = require("@strapi/utils");
-const utils = require("./utils.js");
-const filters = require("./filters.js");
 const fields = require("./fields.js");
 const transformPopulate = async (data, opts) => {
-  utils.switchDocumentIdForId(data);
-  const allKeysAreDocumentId = Object.keys(data).every((key) => key === "documentId");
-  if (allKeysAreDocumentId) {
-    return data;
-  }
   return strapiUtils.traverse.traverseQueryPopulate(
     async ({ attribute, key, value }, { set }) => {
       if (!value || typeof value !== "object" || attribute?.type !== "relation") {
         return;
       }
-      if ("filters" in value) {
-        value.filters = await filters.transformFilters(value.filters, opts);
-      }
       if ("fields" in value && Array.isArray(value.fields)) {
         value.fields = fields.transformFields(value.fields);
       }

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

@@ -1 +1 @@
-{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { type Data, type Options } from './types';\nimport { switchDocumentIdForId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  // Before doing the filters traversal change any top level 'id' properties to 'documentId'\n  switchDocumentIdForId(data);\n\n  const allKeysAreDocumentId = Object.keys(data).every((key) => key === 'documentId');\n  if (allKeysAreDocumentId) {\n    // If every key is a documentId, skip the traversal\n    return data;\n  }\n\n  return traverse.traverseQueryPopulate(\n    async ({ attribute, key, value }, { set }) => {\n      if (!value || typeof value !== 'object' || attribute?.type !== 'relation') {\n        return;\n      }\n\n      /*\n        If the attribute is a relation\n        Look for filters or fields in the value \n        and apply the relevant transformation to these objects\n      */\n      if ('filters' in value) {\n        value.filters = await transformFilters(value.filters as Data, opts);\n      }\n\n      if ('fields' in value && Array.isArray(value.fields)) {\n        value.fields = transformFields(value.fields);\n      }\n\n      set(key, value);\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n"],"names":["switchDocumentIdForId","traverse","transformFilters","transformFields"],"mappings":";;;;;;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AAEpEA,QAAA,sBAAsB,IAAI;AAEpB,QAAA,uBAAuB,OAAO,KAAK,IAAI,EAAE,MAAM,CAAC,QAAQ,QAAQ,YAAY;AAClF,MAAI,sBAAsB;AAEjB,WAAA;AAAA,EACT;AAEA,SAAOC,YAAS,SAAA;AAAA,IACd,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,UAAU;AAC5C,UAAI,CAAC,SAAS,OAAO,UAAU,YAAY,WAAW,SAAS,YAAY;AACzE;AAAA,MACF;AAOA,UAAI,aAAa,OAAO;AACtB,cAAM,UAAU,MAAMC,QAAAA,iBAAiB,MAAM,SAAiB,IAAI;AAAA,MACpE;AAEA,UAAI,YAAY,SAAS,MAAM,QAAQ,MAAM,MAAM,GAAG;AAC9C,cAAA,SAASC,OAAAA,gBAAgB,MAAM,MAAM;AAAA,MAC7C;AAEA,UAAI,KAAK,KAAK;AAAA,IAChB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;;"}
+{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { type Data, type Options } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  return traverse.traverseQueryPopulate(\n    async ({ attribute, key, value }, { set }) => {\n      if (!value || typeof value !== 'object' || attribute?.type !== 'relation') {\n        return;\n      }\n\n      /*\n        If the attribute is a relation\n        Look for fields in the value\n        and apply the relevant transformation to these objects\n      */\n      if ('fields' in value && Array.isArray(value.fields)) {\n        value.fields = transformFields(value.fields);\n      }\n\n      set(key, value);\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n"],"names":["traverse","transformFields"],"mappings":";;;;AAIa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AACpE,SAAOA,YAAS,SAAA;AAAA,IACd,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,UAAU;AAC5C,UAAI,CAAC,SAAS,OAAO,UAAU,YAAY,WAAW,SAAS,YAAY;AACzE;AAAA,MACF;AAOA,UAAI,YAAY,SAAS,MAAM,QAAQ,MAAM,MAAM,GAAG;AAC9C,cAAA,SAASC,OAAAA,gBAAgB,MAAM,MAAM;AAAA,MAC7C;AAEA,UAAI,KAAK,KAAK;AAAA,IAChB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;;"}

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

@@ -1,21 +1,11 @@
 import { traverse } from "@strapi/utils";
-import { switchDocumentIdForId } from "./utils.mjs";
-import { transformFilters } from "./filters.mjs";
 import { transformFields } from "./fields.mjs";
 const transformPopulate = async (data, opts) => {
-  switchDocumentIdForId(data);
-  const allKeysAreDocumentId = Object.keys(data).every((key) => key === "documentId");
-  if (allKeysAreDocumentId) {
-    return data;
-  }
   return traverse.traverseQueryPopulate(
     async ({ attribute, key, value }, { set }) => {
       if (!value || typeof value !== "object" || attribute?.type !== "relation") {
         return;
       }
-      if ("filters" in value) {
-        value.filters = await transformFilters(value.filters, opts);
-      }
       if ("fields" in value && Array.isArray(value.fields)) {
         value.fields = transformFields(value.fields);
       }

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

@@ -1 +1 @@
-{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { type Data, type Options } from './types';\nimport { switchDocumentIdForId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  // Before doing the filters traversal change any top level 'id' properties to 'documentId'\n  switchDocumentIdForId(data);\n\n  const allKeysAreDocumentId = Object.keys(data).every((key) => key === 'documentId');\n  if (allKeysAreDocumentId) {\n    // If every key is a documentId, skip the traversal\n    return data;\n  }\n\n  return traverse.traverseQueryPopulate(\n    async ({ attribute, key, value }, { set }) => {\n      if (!value || typeof value !== 'object' || attribute?.type !== 'relation') {\n        return;\n      }\n\n      /*\n        If the attribute is a relation\n        Look for filters or fields in the value \n        and apply the relevant transformation to these objects\n      */\n      if ('filters' in value) {\n        value.filters = await transformFilters(value.filters as Data, opts);\n      }\n\n      if ('fields' in value && Array.isArray(value.fields)) {\n        value.fields = transformFields(value.fields);\n      }\n\n      set(key, value);\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n"],"names":[],"mappings":";;;;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AAEpE,wBAAsB,IAAI;AAEpB,QAAA,uBAAuB,OAAO,KAAK,IAAI,EAAE,MAAM,CAAC,QAAQ,QAAQ,YAAY;AAClF,MAAI,sBAAsB;AAEjB,WAAA;AAAA,EACT;AAEA,SAAO,SAAS;AAAA,IACd,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,UAAU;AAC5C,UAAI,CAAC,SAAS,OAAO,UAAU,YAAY,WAAW,SAAS,YAAY;AACzE;AAAA,MACF;AAOA,UAAI,aAAa,OAAO;AACtB,cAAM,UAAU,MAAM,iBAAiB,MAAM,SAAiB,IAAI;AAAA,MACpE;AAEA,UAAI,YAAY,SAAS,MAAM,QAAQ,MAAM,MAAM,GAAG;AAC9C,cAAA,SAAS,gBAAgB,MAAM,MAAM;AAAA,MAC7C;AAEA,UAAI,KAAK,KAAK;AAAA,IAChB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { type Data, type Options } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  return traverse.traverseQueryPopulate(\n    async ({ attribute, key, value }, { set }) => {\n      if (!value || typeof value !== 'object' || attribute?.type !== 'relation') {\n        return;\n      }\n\n      /*\n        If the attribute is a relation\n        Look for fields in the value\n        and apply the relevant transformation to these objects\n      */\n      if ('fields' in value && Array.isArray(value.fields)) {\n        value.fields = transformFields(value.fields);\n      }\n\n      set(key, value);\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n"],"names":[],"mappings":";;AAIa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AACpE,SAAO,SAAS;AAAA,IACd,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,UAAU;AAC5C,UAAI,CAAC,SAAS,OAAO,UAAU,YAAY,WAAW,SAAS,YAAY;AACzE;AAAA,MACF;AAOA,UAAI,YAAY,SAAS,MAAM,QAAQ,MAAM,MAAM,GAAG;AAC9C,cAAA,SAAS,gBAAgB,MAAM,MAAM;AAAA,MAC7C;AAEA,UAAI,KAAK,KAAK;AAAA,IAChB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}

package/dist/services/document-service/transform/relations/extract/data-ids.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,MAAM,EAAE,MAAM,eAAe,CAAC;AAEjE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAoErC;;;GAGG;AACH,QAAA,MAAM,cAAc,UACX,KAAK,QACN,OAAO,MAAM,EAAE,GAAG,CAAC,QACnB;IAAE,GAAG,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,qDA6B5E,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"data-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,MAAM,EAAE,MAAM,eAAe,CAAC;AAEjE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAyErC;;;GAGG;AACH,QAAA,MAAM,cAAc,UACX,KAAK,QACN,OAAO,MAAM,EAAE,GAAG,CAAC,QACnB;IAAE,GAAG,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,qDA6B5E,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/services/document-service/transform/relations/extract/data-ids.js

@@ -9,13 +9,16 @@ const handlePrimitive = (relation) => {
     return [];
   }
   if (data.isShortHand(relation)) {
-    return [{ id: relation }];
+    return [{ documentId: relation }];
   }
   if (data.isLongHand(relation)) {
-    return [{ id: relation.id, locale: relation.locale }];
+    if ("documentId" in relation) {
+      return [{ documentId: relation.documentId, locale: relation.locale }];
+    }
+    return [];
   }
   if (Array.isArray(relation)) {
-    return relation.map((item) => data.isShortHand(item) ? { id: item } : item);
+    return relation.map((item) => data.isShortHand(item) ? { documentId: item } : item);
   }
   return [];
 };
@@ -57,7 +60,7 @@ const extractDataIds = (idMap, data2, opts) => {
         extractedIds.forEach((relation) => {
           idMap.add({
             uid: target,
-            documentId: relation.id,
+            documentId: relation.documentId,
             locale: i18n.getRelationTargetLocale(relation, {
               targetUid: target,
               sourceUid: opts.uid,

package/dist/services/document-service/transform/relations/extract/data-ids.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-ids.js","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { IdMap } from '../../id-map';\nimport { ShortHand, LongHand, ID } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { getRelationTargetLocale } from '../utils/i18n';\n\ntype ExtractedId = { id: ID; locale?: string };\n\n/**\n *  Get relation ids from primitive representation (id, id[], {id}, {id}[])\n */\nconst handlePrimitive = (\n  relation: ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined | any\n): LongHand[] => {\n  if (!relation) {\n    return []; // null\n  }\n  if (isShortHand(relation)) {\n    return [{ id: relation }]; // id\n  }\n  if (isLongHand(relation)) {\n    // @ts-expect-error - TODO: Add relation type\n    return [{ id: relation.id, locale: relation.locale }]; // { id, locale? }\n  }\n  if (Array.isArray(relation)) {\n    return relation.map((item) => (isShortHand(item) ? { id: item } : item)); // id[]\n  }\n\n  return [];\n};\n\n/**\n * Get all relations document ids from a relation input value\n */\nconst extractRelationIds = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>\n): ExtractedId[] => {\n  const ids = handlePrimitive(relation);\n  if (!isObject(relation)) return ids;\n\n  if ('set' in relation) ids.push(...handlePrimitive(relation.set)); // set: id[]\n  if ('disconnect' in relation) ids.push(...handlePrimitive(relation.disconnect)); // disconnect: id[]\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    if (!relation.connect) return [];\n    ids.push(...handlePrimitive(relation.connect));\n\n    // handle positional arguments\n    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];\n    connect.forEach((relation) => {\n      if (isShortHand(relation) || !('position' in relation)) return;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        ids.push(...handlePrimitive({ ...position, id: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, id: position.after }));\n      }\n    });\n  }\n\n  return ids;\n};\n\n/**\n * Iterate over all attributes of a Data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: { uid: Common.UID.Schema; locale?: string | null; isDraft?: boolean }\n) => {\n  return traverseEntity(\n    ({ value, attribute }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const extractedIds = extractRelationIds(value as any);\n\n        // TODO: Handle morph relations (they have multiple targets)\n        const target = attribute.target;\n        if (!target) return;\n\n        extractedIds.forEach((relation) => {\n          idMap.add({\n            uid: target,\n            documentId: relation.id as string,\n            locale: getRelationTargetLocale(relation, {\n              targetUid: target as Common.UID.Schema,\n              sourceUid: opts.uid,\n              sourceLocale: opts.locale,\n            }),\n            isDraft: opts.isDraft,\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["isShortHand","isLongHand","isObject","relation","data","traverseEntity","getRelationTargetLocale"],"mappings":";;;;;;AAaA,MAAM,kBAAkB,CACtB,aACe;AACf,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AACI,MAAAA,KAAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,IAAI,SAAA,CAAU;AAAA,EAC1B;AACI,MAAAC,KAAAA,WAAW,QAAQ,GAAG;AAEjB,WAAA,CAAC,EAAE,IAAI,SAAS,IAAI,QAAQ,SAAS,QAAQ;AAAA,EACtD;AACI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,SAAS,IAAI,CAAC,SAAUD,KAAA,YAAY,IAAI,IAAI,EAAE,IAAI,KAAK,IAAI,IAAK;AAAA,EACzE;AAEA,SAAO;AACT;AAKA,MAAM,qBAAqB,CACzB,aACkB;AACZ,QAAA,MAAM,gBAAgB,QAAQ;AAChC,MAAA,CAACE,WAAS,QAAQ;AAAU,WAAA;AAEhC,MAAI,SAAS;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,GAAG,CAAC;AAChE,MAAI,gBAAgB;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,UAAU,CAAC;AAC9E,MAAI,aAAa,UAAU;AAEzB,QAAI,CAAC,SAAS;AAAS,aAAO;AAC9B,QAAI,KAAK,GAAG,gBAAgB,SAAS,OAAO,CAAC;AAGvC,UAAA,UAAU,MAAM,QAAQ,SAAS,OAAO,IAAI,SAAS,UAAU,CAAC,SAAS,OAAO;AAC9E,YAAA,QAAQ,CAACC,cAAa;AAC5B,UAAIH,KAAYG,YAAAA,SAAQ,KAAK,EAAE,cAAcA;AAAW;AAElD,YAAA,EAAE,SAAaA,IAAAA;AAGrB,UAAI,UAAU,QAAQ;AAChB,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,OAAQ,CAAA,CAAC;AAAA,MACnE;AAGA,UAAI,UAAU,OAAO;AACf,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,MAAO,CAAA,CAAC;AAAA,MAClE;AAAA,IAAA,CACD;AAAA,EACH;AAEO,SAAA;AACT;AAMA,MAAM,iBAAiB,CACrB,OACAC,OACA,SACG;AACI,SAAAC,YAAA;AAAA,IACL,CAAC,EAAE,OAAO,gBAAgB;AAEpB,UAAA,UAAU,SAAS,YAAY;AAC3B,cAAA,eAAe,mBAAmB,KAAY;AAGpD,cAAM,SAAS,UAAU;AACzB,YAAI,CAAC;AAAQ;AAEA,qBAAA,QAAQ,CAAC,aAAa;AACjC,gBAAM,IAAI;AAAA,YACR,KAAK;AAAA,YACL,YAAY,SAAS;AAAA,YACrB,QAAQC,6BAAwB,UAAU;AAAA,cACxC,WAAW;AAAA,cACX,WAAW,KAAK;AAAA,cAChB,cAAc,KAAK;AAAA,YAAA,CACpB;AAAA,YACD,SAAS,KAAK;AAAA,UAAA,CACf;AAAA,QAAA,CACF;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpCF;AAAA,EAAA;AAEJ;;"}
+{"version":3,"file":"data-ids.js","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { IdMap } from '../../id-map';\nimport { ShortHand, LongHand, LongHandDocument } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { getRelationTargetLocale } from '../utils/i18n';\n\n/**\n *  Get relation ids from primitive representation (id, id[], {id}, {id}[])\n */\nconst handlePrimitive = (\n  relation: ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined | any\n): LongHandDocument[] => {\n  if (!relation) {\n    return []; // null\n  }\n\n  if (isShortHand(relation)) {\n    return [{ documentId: relation }]; // id\n  }\n\n  if (isLongHand(relation)) {\n    // { documentId, locale? }\n    if ('documentId' in relation) {\n      return [{ documentId: relation.documentId, locale: relation.locale }];\n    }\n    // { id }\n    return [];\n  }\n\n  if (Array.isArray(relation)) {\n    return relation.map((item) => (isShortHand(item) ? { documentId: item } : item)); // id[]\n  }\n\n  return [];\n};\n\n/**\n * Get all relations document ids from a relation input value\n */\nconst extractRelationIds = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>\n): LongHandDocument[] => {\n  const ids = handlePrimitive(relation);\n  if (!isObject(relation)) return ids;\n\n  if ('set' in relation) ids.push(...handlePrimitive(relation.set)); // set: id[]\n  if ('disconnect' in relation) ids.push(...handlePrimitive(relation.disconnect)); // disconnect: id[]\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    if (!relation.connect) return [];\n    ids.push(...handlePrimitive(relation.connect));\n\n    // handle positional arguments\n    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];\n    connect.forEach((relation) => {\n      if (isShortHand(relation) || !('position' in relation)) return;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        ids.push(...handlePrimitive({ ...position, id: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, id: position.after }));\n      }\n    });\n  }\n\n  return ids;\n};\n\n/**\n * Iterate over all attributes of a Data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: { uid: Common.UID.Schema; locale?: string | null; isDraft?: boolean }\n) => {\n  return traverseEntity(\n    ({ value, attribute }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const extractedIds = extractRelationIds(value as any);\n\n        // TODO: Handle morph relations (they have multiple targets)\n        const target = attribute.target;\n        if (!target) return;\n\n        extractedIds.forEach((relation) => {\n          idMap.add({\n            uid: target,\n            documentId: relation.documentId,\n            locale: getRelationTargetLocale(relation, {\n              targetUid: target as Common.UID.Schema,\n              sourceUid: opts.uid,\n              sourceLocale: opts.locale,\n            }),\n            isDraft: opts.isDraft,\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["isShortHand","isLongHand","isObject","relation","data","traverseEntity","getRelationTargetLocale"],"mappings":";;;;;;AAWA,MAAM,kBAAkB,CACtB,aACuB;AACvB,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AAEI,MAAAA,KAAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,YAAY,SAAA,CAAU;AAAA,EAClC;AAEI,MAAAC,KAAAA,WAAW,QAAQ,GAAG;AAExB,QAAI,gBAAgB,UAAU;AACrB,aAAA,CAAC,EAAE,YAAY,SAAS,YAAY,QAAQ,SAAS,QAAQ;AAAA,IACtE;AAEA,WAAO;EACT;AAEI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,SAAS,IAAI,CAAC,SAAUD,KAAA,YAAY,IAAI,IAAI,EAAE,YAAY,KAAK,IAAI,IAAK;AAAA,EACjF;AAEA,SAAO;AACT;AAKA,MAAM,qBAAqB,CACzB,aACuB;AACjB,QAAA,MAAM,gBAAgB,QAAQ;AAChC,MAAA,CAACE,WAAS,QAAQ;AAAU,WAAA;AAEhC,MAAI,SAAS;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,GAAG,CAAC;AAChE,MAAI,gBAAgB;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,UAAU,CAAC;AAC9E,MAAI,aAAa,UAAU;AAEzB,QAAI,CAAC,SAAS;AAAS,aAAO;AAC9B,QAAI,KAAK,GAAG,gBAAgB,SAAS,OAAO,CAAC;AAGvC,UAAA,UAAU,MAAM,QAAQ,SAAS,OAAO,IAAI,SAAS,UAAU,CAAC,SAAS,OAAO;AAC9E,YAAA,QAAQ,CAACC,cAAa;AAC5B,UAAIH,KAAYG,YAAAA,SAAQ,KAAK,EAAE,cAAcA;AAAW;AAElD,YAAA,EAAE,SAAaA,IAAAA;AAGrB,UAAI,UAAU,QAAQ;AAChB,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,OAAQ,CAAA,CAAC;AAAA,MACnE;AAGA,UAAI,UAAU,OAAO;AACf,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,MAAO,CAAA,CAAC;AAAA,MAClE;AAAA,IAAA,CACD;AAAA,EACH;AAEO,SAAA;AACT;AAMA,MAAM,iBAAiB,CACrB,OACAC,OACA,SACG;AACI,SAAAC,YAAA;AAAA,IACL,CAAC,EAAE,OAAO,gBAAgB;AAEpB,UAAA,UAAU,SAAS,YAAY;AAC3B,cAAA,eAAe,mBAAmB,KAAY;AAGpD,cAAM,SAAS,UAAU;AACzB,YAAI,CAAC;AAAQ;AAEA,qBAAA,QAAQ,CAAC,aAAa;AACjC,gBAAM,IAAI;AAAA,YACR,KAAK;AAAA,YACL,YAAY,SAAS;AAAA,YACrB,QAAQC,6BAAwB,UAAU;AAAA,cACxC,WAAW;AAAA,cACX,WAAW,KAAK;AAAA,cAChB,cAAc,KAAK;AAAA,YAAA,CACpB;AAAA,YACD,SAAS,KAAK;AAAA,UAAA,CACf;AAAA,QAAA,CACF;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpCF;AAAA,EAAA;AAEJ;;"}

package/dist/services/document-service/transform/relations/extract/data-ids.mjs

@@ -7,13 +7,16 @@ const handlePrimitive = (relation) => {
     return [];
   }
   if (isShortHand(relation)) {
-    return [{ id: relation }];
+    return [{ documentId: relation }];
   }
   if (isLongHand(relation)) {
-    return [{ id: relation.id, locale: relation.locale }];
+    if ("documentId" in relation) {
+      return [{ documentId: relation.documentId, locale: relation.locale }];
+    }
+    return [];
   }
   if (Array.isArray(relation)) {
-    return relation.map((item) => isShortHand(item) ? { id: item } : item);
+    return relation.map((item) => isShortHand(item) ? { documentId: item } : item);
   }
   return [];
 };
@@ -55,7 +58,7 @@ const extractDataIds = (idMap, data, opts) => {
         extractedIds.forEach((relation) => {
           idMap.add({
             uid: target,
-            documentId: relation.id,
+            documentId: relation.documentId,
             locale: getRelationTargetLocale(relation, {
               targetUid: target,
               sourceUid: opts.uid,

package/dist/services/document-service/transform/relations/extract/data-ids.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { IdMap } from '../../id-map';\nimport { ShortHand, LongHand, ID } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { getRelationTargetLocale } from '../utils/i18n';\n\ntype ExtractedId = { id: ID; locale?: string };\n\n/**\n *  Get relation ids from primitive representation (id, id[], {id}, {id}[])\n */\nconst handlePrimitive = (\n  relation: ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined | any\n): LongHand[] => {\n  if (!relation) {\n    return []; // null\n  }\n  if (isShortHand(relation)) {\n    return [{ id: relation }]; // id\n  }\n  if (isLongHand(relation)) {\n    // @ts-expect-error - TODO: Add relation type\n    return [{ id: relation.id, locale: relation.locale }]; // { id, locale? }\n  }\n  if (Array.isArray(relation)) {\n    return relation.map((item) => (isShortHand(item) ? { id: item } : item)); // id[]\n  }\n\n  return [];\n};\n\n/**\n * Get all relations document ids from a relation input value\n */\nconst extractRelationIds = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>\n): ExtractedId[] => {\n  const ids = handlePrimitive(relation);\n  if (!isObject(relation)) return ids;\n\n  if ('set' in relation) ids.push(...handlePrimitive(relation.set)); // set: id[]\n  if ('disconnect' in relation) ids.push(...handlePrimitive(relation.disconnect)); // disconnect: id[]\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    if (!relation.connect) return [];\n    ids.push(...handlePrimitive(relation.connect));\n\n    // handle positional arguments\n    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];\n    connect.forEach((relation) => {\n      if (isShortHand(relation) || !('position' in relation)) return;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        ids.push(...handlePrimitive({ ...position, id: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, id: position.after }));\n      }\n    });\n  }\n\n  return ids;\n};\n\n/**\n * Iterate over all attributes of a Data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: { uid: Common.UID.Schema; locale?: string | null; isDraft?: boolean }\n) => {\n  return traverseEntity(\n    ({ value, attribute }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const extractedIds = extractRelationIds(value as any);\n\n        // TODO: Handle morph relations (they have multiple targets)\n        const target = attribute.target;\n        if (!target) return;\n\n        extractedIds.forEach((relation) => {\n          idMap.add({\n            uid: target,\n            documentId: relation.id as string,\n            locale: getRelationTargetLocale(relation, {\n              targetUid: target as Common.UID.Schema,\n              sourceUid: opts.uid,\n              sourceLocale: opts.locale,\n            }),\n            isDraft: opts.isDraft,\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["relation"],"mappings":";;;;AAaA,MAAM,kBAAkB,CACtB,aACe;AACf,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AACI,MAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,IAAI,SAAA,CAAU;AAAA,EAC1B;AACI,MAAA,WAAW,QAAQ,GAAG;AAEjB,WAAA,CAAC,EAAE,IAAI,SAAS,IAAI,QAAQ,SAAS,QAAQ;AAAA,EACtD;AACI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,SAAS,IAAI,CAAC,SAAU,YAAY,IAAI,IAAI,EAAE,IAAI,KAAK,IAAI,IAAK;AAAA,EACzE;AAEA,SAAO;AACT;AAKA,MAAM,qBAAqB,CACzB,aACkB;AACZ,QAAA,MAAM,gBAAgB,QAAQ;AAChC,MAAA,CAAC,SAAS,QAAQ;AAAU,WAAA;AAEhC,MAAI,SAAS;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,GAAG,CAAC;AAChE,MAAI,gBAAgB;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,UAAU,CAAC;AAC9E,MAAI,aAAa,UAAU;AAEzB,QAAI,CAAC,SAAS;AAAS,aAAO;AAC9B,QAAI,KAAK,GAAG,gBAAgB,SAAS,OAAO,CAAC;AAGvC,UAAA,UAAU,MAAM,QAAQ,SAAS,OAAO,IAAI,SAAS,UAAU,CAAC,SAAS,OAAO;AAC9E,YAAA,QAAQ,CAACA,cAAa;AAC5B,UAAI,YAAYA,SAAQ,KAAK,EAAE,cAAcA;AAAW;AAElD,YAAA,EAAE,SAAaA,IAAAA;AAGrB,UAAI,UAAU,QAAQ;AAChB,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,OAAQ,CAAA,CAAC;AAAA,MACnE;AAGA,UAAI,UAAU,OAAO;AACf,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,MAAO,CAAA,CAAC;AAAA,MAClE;AAAA,IAAA,CACD;AAAA,EACH;AAEO,SAAA;AACT;AAMA,MAAM,iBAAiB,CACrB,OACA,MACA,SACG;AACI,SAAA;AAAA,IACL,CAAC,EAAE,OAAO,gBAAgB;AAEpB,UAAA,UAAU,SAAS,YAAY;AAC3B,cAAA,eAAe,mBAAmB,KAAY;AAGpD,cAAM,SAAS,UAAU;AACzB,YAAI,CAAC;AAAQ;AAEA,qBAAA,QAAQ,CAAC,aAAa;AACjC,gBAAM,IAAI;AAAA,YACR,KAAK;AAAA,YACL,YAAY,SAAS;AAAA,YACrB,QAAQ,wBAAwB,UAAU;AAAA,cACxC,WAAW;AAAA,cACX,WAAW,KAAK;AAAA,cAChB,cAAc,KAAK;AAAA,YAAA,CACpB;AAAA,YACD,SAAS,KAAK;AAAA,UAAA,CACf;AAAA,QAAA,CACF;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { IdMap } from '../../id-map';\nimport { ShortHand, LongHand, LongHandDocument } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { getRelationTargetLocale } from '../utils/i18n';\n\n/**\n *  Get relation ids from primitive representation (id, id[], {id}, {id}[])\n */\nconst handlePrimitive = (\n  relation: ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined | any\n): LongHandDocument[] => {\n  if (!relation) {\n    return []; // null\n  }\n\n  if (isShortHand(relation)) {\n    return [{ documentId: relation }]; // id\n  }\n\n  if (isLongHand(relation)) {\n    // { documentId, locale? }\n    if ('documentId' in relation) {\n      return [{ documentId: relation.documentId, locale: relation.locale }];\n    }\n    // { id }\n    return [];\n  }\n\n  if (Array.isArray(relation)) {\n    return relation.map((item) => (isShortHand(item) ? { documentId: item } : item)); // id[]\n  }\n\n  return [];\n};\n\n/**\n * Get all relations document ids from a relation input value\n */\nconst extractRelationIds = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>\n): LongHandDocument[] => {\n  const ids = handlePrimitive(relation);\n  if (!isObject(relation)) return ids;\n\n  if ('set' in relation) ids.push(...handlePrimitive(relation.set)); // set: id[]\n  if ('disconnect' in relation) ids.push(...handlePrimitive(relation.disconnect)); // disconnect: id[]\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    if (!relation.connect) return [];\n    ids.push(...handlePrimitive(relation.connect));\n\n    // handle positional arguments\n    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];\n    connect.forEach((relation) => {\n      if (isShortHand(relation) || !('position' in relation)) return;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        ids.push(...handlePrimitive({ ...position, id: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, id: position.after }));\n      }\n    });\n  }\n\n  return ids;\n};\n\n/**\n * Iterate over all attributes of a Data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: { uid: Common.UID.Schema; locale?: string | null; isDraft?: boolean }\n) => {\n  return traverseEntity(\n    ({ value, attribute }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const extractedIds = extractRelationIds(value as any);\n\n        // TODO: Handle morph relations (they have multiple targets)\n        const target = attribute.target;\n        if (!target) return;\n\n        extractedIds.forEach((relation) => {\n          idMap.add({\n            uid: target,\n            documentId: relation.documentId,\n            locale: getRelationTargetLocale(relation, {\n              targetUid: target as Common.UID.Schema,\n              sourceUid: opts.uid,\n              sourceLocale: opts.locale,\n            }),\n            isDraft: opts.isDraft,\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["relation"],"mappings":";;;;AAWA,MAAM,kBAAkB,CACtB,aACuB;AACvB,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AAEI,MAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,YAAY,SAAA,CAAU;AAAA,EAClC;AAEI,MAAA,WAAW,QAAQ,GAAG;AAExB,QAAI,gBAAgB,UAAU;AACrB,aAAA,CAAC,EAAE,YAAY,SAAS,YAAY,QAAQ,SAAS,QAAQ;AAAA,IACtE;AAEA,WAAO;EACT;AAEI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,SAAS,IAAI,CAAC,SAAU,YAAY,IAAI,IAAI,EAAE,YAAY,KAAK,IAAI,IAAK;AAAA,EACjF;AAEA,SAAO;AACT;AAKA,MAAM,qBAAqB,CACzB,aACuB;AACjB,QAAA,MAAM,gBAAgB,QAAQ;AAChC,MAAA,CAAC,SAAS,QAAQ;AAAU,WAAA;AAEhC,MAAI,SAAS;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,GAAG,CAAC;AAChE,MAAI,gBAAgB;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,UAAU,CAAC;AAC9E,MAAI,aAAa,UAAU;AAEzB,QAAI,CAAC,SAAS;AAAS,aAAO;AAC9B,QAAI,KAAK,GAAG,gBAAgB,SAAS,OAAO,CAAC;AAGvC,UAAA,UAAU,MAAM,QAAQ,SAAS,OAAO,IAAI,SAAS,UAAU,CAAC,SAAS,OAAO;AAC9E,YAAA,QAAQ,CAACA,cAAa;AAC5B,UAAI,YAAYA,SAAQ,KAAK,EAAE,cAAcA;AAAW;AAElD,YAAA,EAAE,SAAaA,IAAAA;AAGrB,UAAI,UAAU,QAAQ;AAChB,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,OAAQ,CAAA,CAAC;AAAA,MACnE;AAGA,UAAI,UAAU,OAAO;AACf,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,MAAO,CAAA,CAAC;AAAA,MAClE;AAAA,IAAA,CACD;AAAA,EACH;AAEO,SAAA;AACT;AAMA,MAAM,iBAAiB,CACrB,OACA,MACA,SACG;AACI,SAAA;AAAA,IACL,CAAC,EAAE,OAAO,gBAAgB;AAEpB,UAAA,UAAU,SAAS,YAAY;AAC3B,cAAA,eAAe,mBAAmB,KAAY;AAGpD,cAAM,SAAS,UAAU;AACzB,YAAI,CAAC;AAAQ;AAEA,qBAAA,QAAQ,CAAC,aAAa;AACjC,gBAAM,IAAI;AAAA,YACR,KAAK;AAAA,YACL,YAAY,SAAS;AAAA,YACrB,QAAQ,wBAAwB,UAAU;AAAA,cACxC,WAAW;AAAA,cACX,WAAW,KAAK;AAAA,cAChB,cAAc,KAAK;AAAA,YAAA,CACpB;AAAA,YACD,SAAS,KAAK;AAAA,UAAA,CACf;AAAA,QAAA,CACF;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}