@strapi/core 0.0.0-experimental.90ca9123352ed07e0a9cedaf4bcad1475e74137f → 0.0.0-experimental.91f3ae970fe679dc0b1aa20eed15d1ebe84c0a6b

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

@@ -1,23 +1,31 @@
-const transformFields = (fields) => {
-  if (typeof fields === "string") {
-    if (fields === "*")
-      return fields;
-    if (fields === "documentId" || fields.startsWith("documentId,"))
-      return fields;
-    if (fields === "id")
-      return "documentId";
-    return [fields, "documentId"];
-  }
-  if (!fields || fields.length === 0) {
+const transformFields = (fields)=>{
+    // If  it's a string, and it doesn't contain documentId, should be an array
+    if (typeof fields === 'string') {
+        // '*' => '*'
+        if (fields === '*') {
+            return fields;
+        }
+        // '' => 'documentId'
+        if (fields === '') {
+            return 'documentId';
+        }
+        // 'name,description' => 'name,description,documentId'
+        if (!fields.split(',').includes('documentId')) {
+            return `${fields},documentId`;
+        }
+    }
+    // It's not an array, ignore it
+    if (!fields || !Array.isArray(fields)) {
+        // If fields is empty, return it as is
+        return fields;
+    }
+    // Ensure we are always selecting the documentId
+    // ['name', 'description'] => ['name', 'description', 'documentId']
+    if (!fields.includes('documentId')) {
+        fields.push('documentId');
+    }
     return fields;
-  }
-  const mappedFields = fields.map((field) => field === "id" ? "documentId" : field);
-  if (!mappedFields.includes("documentId")) {
-    mappedFields.push("documentId");
-  }
-  return mappedFields;
-};
-export {
-  transformFields
 };
+
+export { transformFields };
 //# sourceMappingURL=fields.mjs.map

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 type { Modules, UID } from '@strapi/types';\n\ntype Fields = Modules.Documents.Params.Pick<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":["transformFields","fields","split","includes","Array","isArray","push"],"mappings":"AAIO,MAAMA,kBAAkB,CAACC,MAAAA,GAAAA;;IAE9B,IAAI,OAAOA,WAAW,QAAU,EAAA;;AAE9B,QAAA,IAAIA,WAAW,GAAK,EAAA;YAClB,OAAOA,MAAAA;AACT;;AAGA,QAAA,IAAIA,WAAW,EAAI,EAAA;YACjB,OAAO,YAAA;AACT;;AAGA,QAAA,IAAI,CAACA,MAAOC,CAAAA,KAAK,CAAC,GAAKC,CAAAA,CAAAA,QAAQ,CAAC,YAAe,CAAA,EAAA;AAC7C,YAAA,OAAO,CAAC,EAAEF,MAAO,CAAA,WAAW,CAAC;AAC/B;AACF;;AAGA,IAAA,IAAI,CAACA,MAAU,IAAA,CAACG,KAAMC,CAAAA,OAAO,CAACJ,MAAS,CAAA,EAAA;;QAErC,OAAOA,MAAAA;AACT;;;AAIA,IAAA,IAAI,CAACA,MAAAA,CAAOE,QAAQ,CAAC,YAAe,CAAA,EAAA;AAClCF,QAAAA,MAAAA,CAAOK,IAAI,CAAC,YAAA,CAAA;AACd;IAEA,OAAOL,MAAAA;AACT;;;;"}

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

@@ -1,9 +1,9 @@
-import { Strapi, Entity } from '@strapi/types';
+import type { Core, Data } from '@strapi/types';
 interface KeyFields {
     uid: string;
-    documentId: Entity.ID;
+    documentId: Data.ID;
     locale?: string | null;
-    isDraft?: boolean;
+    status?: 'draft' | 'published';
 }
 export interface IdMap {
     loadedIds: Map<string, string>;
@@ -17,7 +17,7 @@ export interface IdMap {
  * Holds a registry of document ids and their corresponding entity ids.
  */
 declare const createIdMap: ({ strapi }: {
-    strapi: Strapi;
+    strapi: Core.Strapi;
 }) => IdMap;
 export { createIdMap };
 //# sourceMappingURL=id-map.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-map.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAmB/C,UAAU,SAAS;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,KAAK;IACpB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAElC,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,QAAA,MAAM,WAAW;YAA0B,MAAM;MAAK,KA+ErD,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"id-map.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,EAAO,MAAM,eAAe,CAAC;AA6BrD,UAAU,SAAS;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,KAAK;IACpB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAElC,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,QAAA,MAAM,WAAW,eAAgB;IAAE,MAAM,EAAE,KAAK,MAAM,CAAA;CAAE,KAAG,KAyF1D,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}

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

@@ -1,72 +1,125 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const strapiUtils = require("@strapi/utils");
-const encodeKey = (obj) => {
-  const keys = Object.keys(obj).sort();
-  return keys.map((key) => `${key}:::${obj[key]}`).join("&&");
+'use strict';
+
+var strapiUtils = require('@strapi/utils');
+
+const hasDraftAndPublish = (uid)=>{
+    const model = strapi.getModel(uid);
+    return strapiUtils.contentTypes.hasDraftAndPublish(model);
 };
-const createIdMap = ({ strapi }) => {
-  const loadedIds = /* @__PURE__ */ new Map();
-  const toLoadIds = /* @__PURE__ */ new Map();
-  return {
-    loadedIds,
-    toLoadIds,
-    /**
+/**
+ * TODO: Find a better way to encode keys than this
+ * This converts an object into a string by joining its keys and values,
+ * so it can be used as a key in a Map.
+ *
+ * @example
+ * const obj = { a: 1, b: 2 };
+ * const key = encodeKey(obj);
+ *      ^ "a:::1&&b:::2"
+ */ const encodeKey = (obj)=>{
+    // Ignore status field for models without draft and publish
+    if (!hasDraftAndPublish(obj.uid)) {
+        delete obj.status;
+    }
+    // Sort keys to always keep the same order when encoding
+    const keys = Object.keys(obj).sort();
+    return keys.map((key)=>`${key}:::${obj[key]}`).join('&&');
+};
+/**
+ * Holds a registry of document ids and their corresponding entity ids.
+ */ const createIdMap = ({ strapi: strapi1 })=>{
+    const loadedIds = new Map();
+    const toLoadIds = new Map();
+    return {
+        loadedIds,
+        toLoadIds,
+        /**
      * Register a new document id and its corresponding entity id.
-     */
-    add(keyFields) {
-      const key = encodeKey({ isDraft: false, locale: null, ...keyFields });
-      if (loadedIds.has(key))
-        return;
-      if (toLoadIds.has(key))
-        return;
-      toLoadIds.set(key, keyFields);
-    },
-    /**
+     */ add (keyFields) {
+            const key = encodeKey({
+                status: 'published',
+                locale: null,
+                ...keyFields
+            });
+            // If the id is already loaded, do nothing
+            if (loadedIds.has(key)) return;
+            // If the id is already in the toLoadIds, do nothing
+            if (toLoadIds.has(key)) return;
+            // Add the id to the toLoadIds
+            toLoadIds.set(key, keyFields);
+        },
+        /**
      * Load all ids from the registry.
-     */
-    async load() {
-      const loadIdValues = Array.from(toLoadIds.values());
-      const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest }) => {
-        const key = encodeKey(rest);
-        const ids = acc[key] || { ...rest, documentIds: [] };
-        ids.documentIds.push(documentId);
-        return { ...acc, [key]: ids };
-      }, {});
-      await strapiUtils.mapAsync(
-        Object.values(idsByUidAndLocale),
-        async ({ uid, locale, documentIds, isDraft }) => {
-          const result = await strapi?.db?.query(uid).findMany({
-            select: ["id", "documentId", "locale", "publishedAt"],
-            where: {
-              documentId: { $in: documentIds },
-              locale,
-              publishedAt: isDraft ? null : { $ne: null }
-            }
-          });
-          result?.forEach(({ documentId, id, locale: locale2, publishedAt }) => {
-            const key = encodeKey({ documentId, uid, locale: locale2, isDraft: !publishedAt });
-            loadedIds.set(key, id);
-          });
-        }
-      );
-      toLoadIds.clear();
-    },
-    /**
+     */ async load () {
+            // Document Id to Entry Id queries are batched by its uid and locale
+            // TODO: Add publication state too
+            const loadIdValues = Array.from(toLoadIds.values());
+            // 1. Group ids to query together
+            const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest })=>{
+                const key = encodeKey(rest);
+                const ids = acc[key] || {
+                    ...rest,
+                    documentIds: []
+                };
+                ids.documentIds.push(documentId);
+                return {
+                    ...acc,
+                    [key]: ids
+                };
+            }, {});
+            // 2. Query ids
+            await strapiUtils.async.map(Object.values(idsByUidAndLocale), async ({ uid, locale, documentIds, status })=>{
+                const findParams = {
+                    select: [
+                        'id',
+                        'documentId',
+                        'locale',
+                        'publishedAt'
+                    ],
+                    where: {
+                        documentId: {
+                            $in: documentIds
+                        },
+                        locale: locale || null
+                    }
+                };
+                if (hasDraftAndPublish(uid)) {
+                    findParams.where.publishedAt = status === 'draft' ? null : {
+                        $ne: null
+                    };
+                }
+                const result = await strapi1?.db?.query(uid).findMany(findParams);
+                // 3. Store result in loadedIds
+                result?.forEach(({ documentId, id, locale, publishedAt })=>{
+                    const key = encodeKey({
+                        documentId,
+                        uid,
+                        locale,
+                        status: publishedAt ? 'published' : 'draft'
+                    });
+                    loadedIds.set(key, id);
+                });
+            });
+            // 4. Clear toLoadIds
+            toLoadIds.clear();
+        },
+        /**
      * Get the entity id for a given document id.
-     */
-    get(keys) {
-      const key = encodeKey({ isDraft: false, locale: null, ...keys });
-      return loadedIds.get(key);
-    },
-    /**
+     */ get (keys) {
+            const key = encodeKey({
+                status: 'published',
+                locale: null,
+                ...keys
+            });
+            return loadedIds.get(key);
+        },
+        /**
      * Clear the registry.
-     */
-    clear() {
-      loadedIds.clear();
-      toLoadIds.clear();
-    }
-  };
+     */ clear () {
+            loadedIds.clear();
+            toLoadIds.clear();
+        }
+    };
 };
+
 exports.createIdMap = createIdMap;
 //# sourceMappingURL=id-map.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-map.js","sources":["../../../../src/services/document-service/transform/id-map.ts"],"sourcesContent":["import { Strapi, Entity } from '@strapi/types';\nimport { mapAsync } from '@strapi/utils';\n\n/**\n * TODO: Find a better way to encode keys than this\n * This converts an object into a string by joining its keys and values,\n * so it can be used as a key in a Map.\n *\n * @example\n * const obj = { a: 1, b: 2 };\n * const key = encodeKey(obj);\n *      ^ \"a:::1&&b:::2\"\n */\nconst encodeKey = (obj: any) => {\n  // Sort keys to always keep the same order when encoding\n  const keys = Object.keys(obj).sort();\n  return keys.map((key) => `${key}:::${obj[key]}`).join('&&');\n};\n\ninterface KeyFields {\n  uid: string;\n  documentId: Entity.ID;\n  locale?: string | null;\n  isDraft?: boolean;\n}\n\nexport interface IdMap {\n  loadedIds: Map<string, string>;\n  toLoadIds: Map<string, KeyFields>;\n  // Make the Keys type to be the params of add\n  add(keys: KeyFields): void;\n  load(): Promise<void>;\n  get(keys: KeyFields): string | undefined;\n  clear(): void;\n}\n\n/**\n * Holds a registry of document ids and their corresponding entity ids.\n */\nconst createIdMap = ({ strapi }: { strapi: Strapi }): IdMap => {\n  const loadedIds = new Map();\n  const toLoadIds = new Map();\n\n  return {\n    loadedIds,\n    toLoadIds,\n    /**\n     * Register a new document id and its corresponding entity id.\n     */\n    add(keyFields: KeyFields) {\n      const key = encodeKey({ isDraft: false, locale: null, ...keyFields });\n\n      // If the id is already loaded, do nothing\n      if (loadedIds.has(key)) return;\n      // If the id is already in the toLoadIds, do nothing\n      if (toLoadIds.has(key)) return;\n\n      // Add the id to the toLoadIds\n      toLoadIds.set(key, keyFields);\n    },\n\n    /**\n     * Load all ids from the registry.\n     */\n    async load() {\n      // Document Id to Entry Id queries are batched by its uid and locale\n      // TODO: Add publication state too\n      const loadIdValues = Array.from(toLoadIds.values());\n\n      // 1. Group ids to query together\n      const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest }) => {\n        const key = encodeKey(rest);\n        const ids = acc[key] || { ...rest, documentIds: [] };\n        ids.documentIds.push(documentId);\n        return { ...acc, [key]: ids };\n      }, {});\n\n      // 2. Query ids\n      await mapAsync(\n        Object.values(idsByUidAndLocale),\n        async ({ uid, locale, documentIds, isDraft }: any) => {\n          const result = await strapi?.db?.query(uid).findMany({\n            select: ['id', 'documentId', 'locale', 'publishedAt'],\n            where: {\n              documentId: { $in: documentIds },\n              locale,\n              publishedAt: isDraft ? null : { $ne: null },\n            },\n          });\n\n          // 3. Store result in loadedIds\n          result?.forEach(({ documentId, id, locale, publishedAt }: any) => {\n            const key = encodeKey({ documentId, uid, locale, isDraft: !publishedAt });\n            loadedIds.set(key, id);\n          });\n        }\n      );\n\n      // 4. Clear toLoadIds\n      toLoadIds.clear();\n    },\n\n    /**\n     * Get the entity id for a given document id.\n     */\n    get(keys: KeyFields) {\n      const key = encodeKey({ isDraft: false, locale: null, ...keys });\n      return loadedIds.get(key);\n    },\n\n    /**\n     * Clear the registry.\n     */\n    clear() {\n      loadedIds.clear();\n      toLoadIds.clear();\n    },\n  };\n};\n\nexport { createIdMap };\n"],"names":["mapAsync","locale"],"mappings":";;;AAaA,MAAM,YAAY,CAAC,QAAa;AAE9B,QAAM,OAAO,OAAO,KAAK,GAAG,EAAE,KAAK;AACnC,SAAO,KAAK,IAAI,CAAC,QAAQ,GAAG,GAAG,MAAM,IAAI,GAAG,CAAC,EAAE,EAAE,KAAK,IAAI;AAC5D;AAsBA,MAAM,cAAc,CAAC,EAAE,aAAwC;AACvD,QAAA,gCAAgB;AAChB,QAAA,gCAAgB;AAEf,SAAA;AAAA,IACL;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,IAIA,IAAI,WAAsB;AAClB,YAAA,MAAM,UAAU,EAAE,SAAS,OAAO,QAAQ,MAAM,GAAG,UAAA,CAAW;AAGhE,UAAA,UAAU,IAAI,GAAG;AAAG;AAEpB,UAAA,UAAU,IAAI,GAAG;AAAG;AAGd,gBAAA,IAAI,KAAK,SAAS;AAAA,IAC9B;AAAA;AAAA;AAAA;AAAA,IAKA,MAAM,OAAO;AAGX,YAAM,eAAe,MAAM,KAAK,UAAU,OAAQ,CAAA;AAG5C,YAAA,oBAAoB,aAAa,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW;AACxE,cAAA,MAAM,UAAU,IAAI;AACpB,cAAA,MAAM,IAAI,GAAG,KAAK,EAAE,GAAG,MAAM,aAAa,CAAA;AAC5C,YAAA,YAAY,KAAK,UAAU;AAC/B,eAAO,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,IAAI;AAAA,MAC9B,GAAG,CAAE,CAAA;AAGC,YAAAA,YAAA;AAAA,QACJ,OAAO,OAAO,iBAAiB;AAAA,QAC/B,OAAO,EAAE,KAAK,QAAQ,aAAa,cAAmB;AACpD,gBAAM,SAAS,MAAM,QAAQ,IAAI,MAAM,GAAG,EAAE,SAAS;AAAA,YACnD,QAAQ,CAAC,MAAM,cAAc,UAAU,aAAa;AAAA,YACpD,OAAO;AAAA,cACL,YAAY,EAAE,KAAK,YAAY;AAAA,cAC/B;AAAA,cACA,aAAa,UAAU,OAAO,EAAE,KAAK,KAAK;AAAA,YAC5C;AAAA,UAAA,CACD;AAGO,kBAAA,QAAQ,CAAC,EAAE,YAAY,IAAI,QAAAC,SAAQ,kBAAuB;AAC1D,kBAAA,MAAM,UAAU,EAAE,YAAY,KAAK,QAAAA,SAAQ,SAAS,CAAC,YAAA,CAAa;AAC9D,sBAAA,IAAI,KAAK,EAAE;AAAA,UAAA,CACtB;AAAA,QACH;AAAA,MAAA;AAIF,gBAAU,MAAM;AAAA,IAClB;AAAA;AAAA;AAAA;AAAA,IAKA,IAAI,MAAiB;AACb,YAAA,MAAM,UAAU,EAAE,SAAS,OAAO,QAAQ,MAAM,GAAG,KAAA,CAAM;AACxD,aAAA,UAAU,IAAI,GAAG;AAAA,IAC1B;AAAA;AAAA;AAAA;AAAA,IAKA,QAAQ;AACN,gBAAU,MAAM;AAChB,gBAAU,MAAM;AAAA,IAClB;AAAA,EAAA;AAEJ;;"}
+{"version":3,"file":"id-map.js","sources":["../../../../src/services/document-service/transform/id-map.ts"],"sourcesContent":["import type { Core, Data, UID } from '@strapi/types';\nimport { async, contentTypes } from '@strapi/utils';\n\nconst hasDraftAndPublish = (uid: UID.CollectionType) => {\n  const model = strapi.getModel(uid);\n  return contentTypes.hasDraftAndPublish(model);\n};\n\n/**\n * TODO: Find a better way to encode keys than this\n * This converts an object into a string by joining its keys and values,\n * so it can be used as a key in a Map.\n *\n * @example\n * const obj = { a: 1, b: 2 };\n * const key = encodeKey(obj);\n *      ^ \"a:::1&&b:::2\"\n */\nconst encodeKey = (obj: any) => {\n  // Ignore status field for models without draft and publish\n  if (!hasDraftAndPublish(obj.uid)) {\n    delete obj.status;\n  }\n\n  // Sort keys to always keep the same order when encoding\n  const keys = Object.keys(obj).sort();\n  return keys.map((key) => `${key}:::${obj[key]}`).join('&&');\n};\n\ninterface KeyFields {\n  uid: string;\n  documentId: Data.ID;\n  locale?: string | null;\n  status?: 'draft' | 'published';\n}\n\nexport interface IdMap {\n  loadedIds: Map<string, string>;\n  toLoadIds: Map<string, KeyFields>;\n  // Make the Keys type to be the params of add\n  add(keys: KeyFields): void;\n  load(): Promise<void>;\n  get(keys: KeyFields): string | undefined;\n  clear(): void;\n}\n\n/**\n * Holds a registry of document ids and their corresponding entity ids.\n */\nconst createIdMap = ({ strapi }: { strapi: Core.Strapi }): IdMap => {\n  const loadedIds = new Map();\n  const toLoadIds = new Map();\n\n  return {\n    loadedIds,\n    toLoadIds,\n    /**\n     * Register a new document id and its corresponding entity id.\n     */\n    add(keyFields: KeyFields) {\n      const key = encodeKey({ status: 'published', locale: null, ...keyFields });\n\n      // If the id is already loaded, do nothing\n      if (loadedIds.has(key)) return;\n      // If the id is already in the toLoadIds, do nothing\n      if (toLoadIds.has(key)) return;\n\n      // Add the id to the toLoadIds\n      toLoadIds.set(key, keyFields);\n    },\n\n    /**\n     * Load all ids from the registry.\n     */\n    async load() {\n      // Document Id to Entry Id queries are batched by its uid and locale\n      // TODO: Add publication state too\n      const loadIdValues = Array.from(toLoadIds.values());\n\n      // 1. Group ids to query together\n      const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest }) => {\n        const key = encodeKey(rest);\n        const ids = acc[key] || { ...rest, documentIds: [] };\n        ids.documentIds.push(documentId);\n        return { ...acc, [key]: ids };\n      }, {});\n\n      // 2. Query ids\n      await async.map(\n        Object.values(idsByUidAndLocale),\n        async ({ uid, locale, documentIds, status }: any) => {\n          const findParams = {\n            select: ['id', 'documentId', 'locale', 'publishedAt'],\n            where: {\n              documentId: { $in: documentIds },\n              locale: locale || null,\n            },\n          } as any;\n\n          if (hasDraftAndPublish(uid)) {\n            findParams.where.publishedAt = status === 'draft' ? null : { $ne: null };\n          }\n\n          const result = await strapi?.db?.query(uid).findMany(findParams);\n\n          // 3. Store result in loadedIds\n          result?.forEach(({ documentId, id, locale, publishedAt }: any) => {\n            const key = encodeKey({\n              documentId,\n              uid,\n              locale,\n              status: publishedAt ? 'published' : 'draft',\n            });\n            loadedIds.set(key, id);\n          });\n        }\n      );\n\n      // 4. Clear toLoadIds\n      toLoadIds.clear();\n    },\n\n    /**\n     * Get the entity id for a given document id.\n     */\n    get(keys: KeyFields) {\n      const key = encodeKey({ status: 'published', locale: null, ...keys });\n      return loadedIds.get(key);\n    },\n\n    /**\n     * Clear the registry.\n     */\n    clear() {\n      loadedIds.clear();\n      toLoadIds.clear();\n    },\n  };\n};\n\nexport { createIdMap };\n"],"names":["hasDraftAndPublish","uid","model","strapi","getModel","contentTypes","encodeKey","obj","status","keys","Object","sort","map","key","join","createIdMap","loadedIds","Map","toLoadIds","add","keyFields","locale","has","set","load","loadIdValues","Array","from","values","idsByUidAndLocale","reduce","acc","documentId","rest","ids","documentIds","push","async","findParams","select","where","$in","publishedAt","$ne","result","db","query","findMany","forEach","id","clear","get"],"mappings":"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"}

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

@@ -1,72 +1,123 @@
-import { mapAsync } from "@strapi/utils";
-const encodeKey = (obj) => {
-  const keys = Object.keys(obj).sort();
-  return keys.map((key) => `${key}:::${obj[key]}`).join("&&");
+import { async, contentTypes } from '@strapi/utils';
+
+const hasDraftAndPublish = (uid)=>{
+    const model = strapi.getModel(uid);
+    return contentTypes.hasDraftAndPublish(model);
 };
-const createIdMap = ({ strapi }) => {
-  const loadedIds = /* @__PURE__ */ new Map();
-  const toLoadIds = /* @__PURE__ */ new Map();
-  return {
-    loadedIds,
-    toLoadIds,
-    /**
+/**
+ * TODO: Find a better way to encode keys than this
+ * This converts an object into a string by joining its keys and values,
+ * so it can be used as a key in a Map.
+ *
+ * @example
+ * const obj = { a: 1, b: 2 };
+ * const key = encodeKey(obj);
+ *      ^ "a:::1&&b:::2"
+ */ const encodeKey = (obj)=>{
+    // Ignore status field for models without draft and publish
+    if (!hasDraftAndPublish(obj.uid)) {
+        delete obj.status;
+    }
+    // Sort keys to always keep the same order when encoding
+    const keys = Object.keys(obj).sort();
+    return keys.map((key)=>`${key}:::${obj[key]}`).join('&&');
+};
+/**
+ * Holds a registry of document ids and their corresponding entity ids.
+ */ const createIdMap = ({ strapi: strapi1 })=>{
+    const loadedIds = new Map();
+    const toLoadIds = new Map();
+    return {
+        loadedIds,
+        toLoadIds,
+        /**
      * Register a new document id and its corresponding entity id.
-     */
-    add(keyFields) {
-      const key = encodeKey({ isDraft: false, locale: null, ...keyFields });
-      if (loadedIds.has(key))
-        return;
-      if (toLoadIds.has(key))
-        return;
-      toLoadIds.set(key, keyFields);
-    },
-    /**
+     */ add (keyFields) {
+            const key = encodeKey({
+                status: 'published',
+                locale: null,
+                ...keyFields
+            });
+            // If the id is already loaded, do nothing
+            if (loadedIds.has(key)) return;
+            // If the id is already in the toLoadIds, do nothing
+            if (toLoadIds.has(key)) return;
+            // Add the id to the toLoadIds
+            toLoadIds.set(key, keyFields);
+        },
+        /**
      * Load all ids from the registry.
-     */
-    async load() {
-      const loadIdValues = Array.from(toLoadIds.values());
-      const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest }) => {
-        const key = encodeKey(rest);
-        const ids = acc[key] || { ...rest, documentIds: [] };
-        ids.documentIds.push(documentId);
-        return { ...acc, [key]: ids };
-      }, {});
-      await mapAsync(
-        Object.values(idsByUidAndLocale),
-        async ({ uid, locale, documentIds, isDraft }) => {
-          const result = await strapi?.db?.query(uid).findMany({
-            select: ["id", "documentId", "locale", "publishedAt"],
-            where: {
-              documentId: { $in: documentIds },
-              locale,
-              publishedAt: isDraft ? null : { $ne: null }
-            }
-          });
-          result?.forEach(({ documentId, id, locale: locale2, publishedAt }) => {
-            const key = encodeKey({ documentId, uid, locale: locale2, isDraft: !publishedAt });
-            loadedIds.set(key, id);
-          });
-        }
-      );
-      toLoadIds.clear();
-    },
-    /**
+     */ async load () {
+            // Document Id to Entry Id queries are batched by its uid and locale
+            // TODO: Add publication state too
+            const loadIdValues = Array.from(toLoadIds.values());
+            // 1. Group ids to query together
+            const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest })=>{
+                const key = encodeKey(rest);
+                const ids = acc[key] || {
+                    ...rest,
+                    documentIds: []
+                };
+                ids.documentIds.push(documentId);
+                return {
+                    ...acc,
+                    [key]: ids
+                };
+            }, {});
+            // 2. Query ids
+            await async.map(Object.values(idsByUidAndLocale), async ({ uid, locale, documentIds, status })=>{
+                const findParams = {
+                    select: [
+                        'id',
+                        'documentId',
+                        'locale',
+                        'publishedAt'
+                    ],
+                    where: {
+                        documentId: {
+                            $in: documentIds
+                        },
+                        locale: locale || null
+                    }
+                };
+                if (hasDraftAndPublish(uid)) {
+                    findParams.where.publishedAt = status === 'draft' ? null : {
+                        $ne: null
+                    };
+                }
+                const result = await strapi1?.db?.query(uid).findMany(findParams);
+                // 3. Store result in loadedIds
+                result?.forEach(({ documentId, id, locale, publishedAt })=>{
+                    const key = encodeKey({
+                        documentId,
+                        uid,
+                        locale,
+                        status: publishedAt ? 'published' : 'draft'
+                    });
+                    loadedIds.set(key, id);
+                });
+            });
+            // 4. Clear toLoadIds
+            toLoadIds.clear();
+        },
+        /**
      * Get the entity id for a given document id.
-     */
-    get(keys) {
-      const key = encodeKey({ isDraft: false, locale: null, ...keys });
-      return loadedIds.get(key);
-    },
-    /**
+     */ get (keys) {
+            const key = encodeKey({
+                status: 'published',
+                locale: null,
+                ...keys
+            });
+            return loadedIds.get(key);
+        },
+        /**
      * Clear the registry.
-     */
-    clear() {
-      loadedIds.clear();
-      toLoadIds.clear();
-    }
-  };
-};
-export {
-  createIdMap
+     */ clear () {
+            loadedIds.clear();
+            toLoadIds.clear();
+        }
+    };
 };
+
+export { createIdMap };
 //# sourceMappingURL=id-map.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-map.mjs","sources":["../../../../src/services/document-service/transform/id-map.ts"],"sourcesContent":["import { Strapi, Entity } from '@strapi/types';\nimport { mapAsync } from '@strapi/utils';\n\n/**\n * TODO: Find a better way to encode keys than this\n * This converts an object into a string by joining its keys and values,\n * so it can be used as a key in a Map.\n *\n * @example\n * const obj = { a: 1, b: 2 };\n * const key = encodeKey(obj);\n *      ^ \"a:::1&&b:::2\"\n */\nconst encodeKey = (obj: any) => {\n  // Sort keys to always keep the same order when encoding\n  const keys = Object.keys(obj).sort();\n  return keys.map((key) => `${key}:::${obj[key]}`).join('&&');\n};\n\ninterface KeyFields {\n  uid: string;\n  documentId: Entity.ID;\n  locale?: string | null;\n  isDraft?: boolean;\n}\n\nexport interface IdMap {\n  loadedIds: Map<string, string>;\n  toLoadIds: Map<string, KeyFields>;\n  // Make the Keys type to be the params of add\n  add(keys: KeyFields): void;\n  load(): Promise<void>;\n  get(keys: KeyFields): string | undefined;\n  clear(): void;\n}\n\n/**\n * Holds a registry of document ids and their corresponding entity ids.\n */\nconst createIdMap = ({ strapi }: { strapi: Strapi }): IdMap => {\n  const loadedIds = new Map();\n  const toLoadIds = new Map();\n\n  return {\n    loadedIds,\n    toLoadIds,\n    /**\n     * Register a new document id and its corresponding entity id.\n     */\n    add(keyFields: KeyFields) {\n      const key = encodeKey({ isDraft: false, locale: null, ...keyFields });\n\n      // If the id is already loaded, do nothing\n      if (loadedIds.has(key)) return;\n      // If the id is already in the toLoadIds, do nothing\n      if (toLoadIds.has(key)) return;\n\n      // Add the id to the toLoadIds\n      toLoadIds.set(key, keyFields);\n    },\n\n    /**\n     * Load all ids from the registry.\n     */\n    async load() {\n      // Document Id to Entry Id queries are batched by its uid and locale\n      // TODO: Add publication state too\n      const loadIdValues = Array.from(toLoadIds.values());\n\n      // 1. Group ids to query together\n      const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest }) => {\n        const key = encodeKey(rest);\n        const ids = acc[key] || { ...rest, documentIds: [] };\n        ids.documentIds.push(documentId);\n        return { ...acc, [key]: ids };\n      }, {});\n\n      // 2. Query ids\n      await mapAsync(\n        Object.values(idsByUidAndLocale),\n        async ({ uid, locale, documentIds, isDraft }: any) => {\n          const result = await strapi?.db?.query(uid).findMany({\n            select: ['id', 'documentId', 'locale', 'publishedAt'],\n            where: {\n              documentId: { $in: documentIds },\n              locale,\n              publishedAt: isDraft ? null : { $ne: null },\n            },\n          });\n\n          // 3. Store result in loadedIds\n          result?.forEach(({ documentId, id, locale, publishedAt }: any) => {\n            const key = encodeKey({ documentId, uid, locale, isDraft: !publishedAt });\n            loadedIds.set(key, id);\n          });\n        }\n      );\n\n      // 4. Clear toLoadIds\n      toLoadIds.clear();\n    },\n\n    /**\n     * Get the entity id for a given document id.\n     */\n    get(keys: KeyFields) {\n      const key = encodeKey({ isDraft: false, locale: null, ...keys });\n      return loadedIds.get(key);\n    },\n\n    /**\n     * Clear the registry.\n     */\n    clear() {\n      loadedIds.clear();\n      toLoadIds.clear();\n    },\n  };\n};\n\nexport { createIdMap };\n"],"names":["locale"],"mappings":";AAaA,MAAM,YAAY,CAAC,QAAa;AAE9B,QAAM,OAAO,OAAO,KAAK,GAAG,EAAE,KAAK;AACnC,SAAO,KAAK,IAAI,CAAC,QAAQ,GAAG,GAAG,MAAM,IAAI,GAAG,CAAC,EAAE,EAAE,KAAK,IAAI;AAC5D;AAsBA,MAAM,cAAc,CAAC,EAAE,aAAwC;AACvD,QAAA,gCAAgB;AAChB,QAAA,gCAAgB;AAEf,SAAA;AAAA,IACL;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,IAIA,IAAI,WAAsB;AAClB,YAAA,MAAM,UAAU,EAAE,SAAS,OAAO,QAAQ,MAAM,GAAG,UAAA,CAAW;AAGhE,UAAA,UAAU,IAAI,GAAG;AAAG;AAEpB,UAAA,UAAU,IAAI,GAAG;AAAG;AAGd,gBAAA,IAAI,KAAK,SAAS;AAAA,IAC9B;AAAA;AAAA;AAAA;AAAA,IAKA,MAAM,OAAO;AAGX,YAAM,eAAe,MAAM,KAAK,UAAU,OAAQ,CAAA;AAG5C,YAAA,oBAAoB,aAAa,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW;AACxE,cAAA,MAAM,UAAU,IAAI;AACpB,cAAA,MAAM,IAAI,GAAG,KAAK,EAAE,GAAG,MAAM,aAAa,CAAA;AAC5C,YAAA,YAAY,KAAK,UAAU;AAC/B,eAAO,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,IAAI;AAAA,MAC9B,GAAG,CAAE,CAAA;AAGC,YAAA;AAAA,QACJ,OAAO,OAAO,iBAAiB;AAAA,QAC/B,OAAO,EAAE,KAAK,QAAQ,aAAa,cAAmB;AACpD,gBAAM,SAAS,MAAM,QAAQ,IAAI,MAAM,GAAG,EAAE,SAAS;AAAA,YACnD,QAAQ,CAAC,MAAM,cAAc,UAAU,aAAa;AAAA,YACpD,OAAO;AAAA,cACL,YAAY,EAAE,KAAK,YAAY;AAAA,cAC/B;AAAA,cACA,aAAa,UAAU,OAAO,EAAE,KAAK,KAAK;AAAA,YAC5C;AAAA,UAAA,CACD;AAGO,kBAAA,QAAQ,CAAC,EAAE,YAAY,IAAI,QAAAA,SAAQ,kBAAuB;AAC1D,kBAAA,MAAM,UAAU,EAAE,YAAY,KAAK,QAAAA,SAAQ,SAAS,CAAC,YAAA,CAAa;AAC9D,sBAAA,IAAI,KAAK,EAAE;AAAA,UAAA,CACtB;AAAA,QACH;AAAA,MAAA;AAIF,gBAAU,MAAM;AAAA,IAClB;AAAA;AAAA;AAAA;AAAA,IAKA,IAAI,MAAiB;AACb,YAAA,MAAM,UAAU,EAAE,SAAS,OAAO,QAAQ,MAAM,GAAG,KAAA,CAAM;AACxD,aAAA,UAAU,IAAI,GAAG;AAAA,IAC1B;AAAA;AAAA;AAAA;AAAA,IAKA,QAAQ;AACN,gBAAU,MAAM;AAChB,gBAAU,MAAM;AAAA,IAClB;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"id-map.mjs","sources":["../../../../src/services/document-service/transform/id-map.ts"],"sourcesContent":["import type { Core, Data, UID } from '@strapi/types';\nimport { async, contentTypes } from '@strapi/utils';\n\nconst hasDraftAndPublish = (uid: UID.CollectionType) => {\n  const model = strapi.getModel(uid);\n  return contentTypes.hasDraftAndPublish(model);\n};\n\n/**\n * TODO: Find a better way to encode keys than this\n * This converts an object into a string by joining its keys and values,\n * so it can be used as a key in a Map.\n *\n * @example\n * const obj = { a: 1, b: 2 };\n * const key = encodeKey(obj);\n *      ^ \"a:::1&&b:::2\"\n */\nconst encodeKey = (obj: any) => {\n  // Ignore status field for models without draft and publish\n  if (!hasDraftAndPublish(obj.uid)) {\n    delete obj.status;\n  }\n\n  // Sort keys to always keep the same order when encoding\n  const keys = Object.keys(obj).sort();\n  return keys.map((key) => `${key}:::${obj[key]}`).join('&&');\n};\n\ninterface KeyFields {\n  uid: string;\n  documentId: Data.ID;\n  locale?: string | null;\n  status?: 'draft' | 'published';\n}\n\nexport interface IdMap {\n  loadedIds: Map<string, string>;\n  toLoadIds: Map<string, KeyFields>;\n  // Make the Keys type to be the params of add\n  add(keys: KeyFields): void;\n  load(): Promise<void>;\n  get(keys: KeyFields): string | undefined;\n  clear(): void;\n}\n\n/**\n * Holds a registry of document ids and their corresponding entity ids.\n */\nconst createIdMap = ({ strapi }: { strapi: Core.Strapi }): IdMap => {\n  const loadedIds = new Map();\n  const toLoadIds = new Map();\n\n  return {\n    loadedIds,\n    toLoadIds,\n    /**\n     * Register a new document id and its corresponding entity id.\n     */\n    add(keyFields: KeyFields) {\n      const key = encodeKey({ status: 'published', locale: null, ...keyFields });\n\n      // If the id is already loaded, do nothing\n      if (loadedIds.has(key)) return;\n      // If the id is already in the toLoadIds, do nothing\n      if (toLoadIds.has(key)) return;\n\n      // Add the id to the toLoadIds\n      toLoadIds.set(key, keyFields);\n    },\n\n    /**\n     * Load all ids from the registry.\n     */\n    async load() {\n      // Document Id to Entry Id queries are batched by its uid and locale\n      // TODO: Add publication state too\n      const loadIdValues = Array.from(toLoadIds.values());\n\n      // 1. Group ids to query together\n      const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest }) => {\n        const key = encodeKey(rest);\n        const ids = acc[key] || { ...rest, documentIds: [] };\n        ids.documentIds.push(documentId);\n        return { ...acc, [key]: ids };\n      }, {});\n\n      // 2. Query ids\n      await async.map(\n        Object.values(idsByUidAndLocale),\n        async ({ uid, locale, documentIds, status }: any) => {\n          const findParams = {\n            select: ['id', 'documentId', 'locale', 'publishedAt'],\n            where: {\n              documentId: { $in: documentIds },\n              locale: locale || null,\n            },\n          } as any;\n\n          if (hasDraftAndPublish(uid)) {\n            findParams.where.publishedAt = status === 'draft' ? null : { $ne: null };\n          }\n\n          const result = await strapi?.db?.query(uid).findMany(findParams);\n\n          // 3. Store result in loadedIds\n          result?.forEach(({ documentId, id, locale, publishedAt }: any) => {\n            const key = encodeKey({\n              documentId,\n              uid,\n              locale,\n              status: publishedAt ? 'published' : 'draft',\n            });\n            loadedIds.set(key, id);\n          });\n        }\n      );\n\n      // 4. Clear toLoadIds\n      toLoadIds.clear();\n    },\n\n    /**\n     * Get the entity id for a given document id.\n     */\n    get(keys: KeyFields) {\n      const key = encodeKey({ status: 'published', locale: null, ...keys });\n      return loadedIds.get(key);\n    },\n\n    /**\n     * Clear the registry.\n     */\n    clear() {\n      loadedIds.clear();\n      toLoadIds.clear();\n    },\n  };\n};\n\nexport { createIdMap };\n"],"names":["hasDraftAndPublish","uid","model","strapi","getModel","contentTypes","encodeKey","obj","status","keys","Object","sort","map","key","join","createIdMap","loadedIds","Map","toLoadIds","add","keyFields","locale","has","set","load","loadIdValues","Array","from","values","idsByUidAndLocale","reduce","acc","documentId","rest","ids","documentIds","push","async","findParams","select","where","$in","publishedAt","$ne","result","db","query","findMany","forEach","id","clear","get"],"mappings":"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"}

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

@@ -1,26 +1,5 @@
-import { Common } from '@strapi/types';
-/**
- * Transform input of a query to map document ids to entity ids.
- */
-declare function transformParamsDocumentId(uid: Common.UID.Schema, input: {
-    data?: any;
-    fields?: any;
-    filters?: any;
-    populate?: any;
-    sort?: 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 };
+/// <reference types="lodash" />
+import type { UID, Modules } from '@strapi/types';
+declare const curriedTransformParamsDocumentId: import("lodash").CurriedFunction2<UID.Schema, Modules.Documents.Params.All, Promise<Modules.Documents.Params.All>>;
+export { curriedTransformParamsDocumentId as 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":";AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AA0ClD,QAAA,MAAM,gCAAgC,oHAAmC,CAAC;AAE1E,OAAO,EAAE,gCAAgC,IAAI,yBAAyB,EAAE,CAAC"}