@strapi/data-transfer 4.20.5 → 4.21.1

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { Transform, PassThrough, Writable, Readable, Duplex, pipeline } from "st
 import path, { extname, join, posix } from "path";
 import { EOL } from "os";
 import { chain } from "stream-chain";
-import { isArray, zip, isObject, uniq, isEqual, mapValues, pick, reject as reject$1, capitalize, isNumber, isEmpty, last, difference, set, omit, has, pipe, assign, map as map$1, size, isNil, clone, get, once, castArray, keyBy, isString, isNaN, merge, isFinite, toNumber } from "lodash/fp";
+import { isArray, zip, isObject, uniq, isEqual, mapValues, pick, reject as reject$1, capitalize, isNumber, isEmpty, last, difference, set, omit, get, has, pipe, assign, map as map$1, size, isNil, clone, once, castArray, keyBy, isString, isNaN, merge, isFinite, toNumber } from "lodash/fp";
 import { diff as diff$1 } from "semver";
 import { scryptSync, createCipheriv, createDecipheriv, randomUUID } from "crypto";
 import { EventEmitter } from "events";
@@ -1262,6 +1262,34 @@ const deleteComponent = async (uid, componentToDelete) => {
   await deleteComponents(uid, componentToDelete);
   await strapi.query(uid).delete({ where: { id: componentToDelete.id } });
 };
+const resolveComponentUID = ({
+  paths,
+  strapi: strapi2,
+  data,
+  contentType
+}) => {
+  let value = data;
+  let cType = contentType;
+  for (const path2 of paths) {
+    value = get(path2, value);
+    if (typeof cType === "function") {
+      cType = cType(value);
+    }
+    if (path2 in cType.attributes) {
+      const attribute = cType.attributes[path2];
+      if (attribute.type === "component") {
+        cType = strapi2.getModel(attribute.component);
+      }
+      if (attribute.type === "dynamiczone") {
+        cType = ({ __component }) => strapi2.getModel(__component);
+      }
+    }
+  }
+  if ("uid" in cType) {
+    return cType.uid;
+  }
+  return void 0;
+};
 const sanitizeComponentLikeAttributes = (model, data) => {
   const { attributes } = model;
   const componentLikeAttributesKey = Object.entries(attributes).filter(([, attribute]) => attribute.type === "component" || attribute.type === "dynamiczone").map(([key]) => key);
@@ -1627,29 +1655,6 @@ const createEntitiesWriteStream = (options) => {
         const { type, id, data } = entity2;
         const { create, getDeepPopulateComponentLikeQuery } = query(type);
         const contentType = strapi2.getModel(type);
-        let cType = contentType;
-        const resolveType = (paths) => {
-          let value = data;
-          for (const path2 of paths) {
-            value = get(path2, value);
-            if (typeof cType === "function") {
-              cType = cType(value);
-            }
-            if (path2 in cType.attributes) {
-              const attribute = cType.attributes[path2];
-              if (attribute.type === "component") {
-                cType = strapi2.getModel(attribute.component);
-              }
-              if (attribute.type === "dynamiczone") {
-                cType = ({ __component }) => strapi2.getModel(__component);
-              }
-            }
-          }
-          if ("uid" in cType) {
-            return cType.uid;
-          }
-          return void 0;
-        };
         try {
           const created = await create({
             data,
@@ -1660,7 +1665,7 @@ const createEntitiesWriteStream = (options) => {
           updateMappingTable(type, id, created.id);
           diffs.forEach((diff2) => {
             if (diff2.kind === "modified" && last(diff2.path) === "id") {
-              const target = resolveType(diff2.path);
+              const target = resolveComponentUID({ paths: diff2.path, data, contentType, strapi: strapi2 });
               if (!target) {
                 return;
               }
@@ -2276,11 +2281,31 @@ function getFileStats(filepath, isLocal = false) {
     });
   });
 }
+async function signFile(file2) {
+  const { provider } = strapi.plugins.upload;
+  const { provider: providerName } = strapi.config.get("plugin.upload");
+  const isPrivate = await provider.isPrivate();
+  if (file2?.provider === providerName && isPrivate) {
+    const signUrl = async (file22) => {
+      const signedUrl = await provider.getSignedUrl(file22);
+      file22.url = signedUrl.url;
+    };
+    await signUrl(file2);
+    if (file2.formats) {
+      for (const format of Object.keys(file2.formats)) {
+        await signUrl(file2.formats[format]);
+      }
+    }
+  }
+}
 const createAssetsStream = (strapi2) => {
   const generator = async function* () {
     const stream2 = strapi2.db.queryBuilder("plugin::upload.file").select("*").stream();
     for await (const file2 of stream2) {
       const isLocalProvider = file2.provider === "local";
+      if (!isLocalProvider) {
+        await signFile(file2);
+      }
       const filepath = isLocalProvider ? join(strapi2.dirs.static.public, file2.url) : file2.url;
       const stats = await getFileStats(filepath, isLocalProvider);
       const stream22 = getFileStream(filepath, isLocalProvider);