@strapi/data-transfer 5.0.0-beta.1 → 5.0.0-beta.3

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 } 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 } from "lodash/fp";
 import { diff as diff$1 } from "semver";
 import { scryptSync, createCipheriv, createDecipheriv, randomUUID } from "crypto";
 import { EventEmitter } from "events";
@@ -1255,6 +1255,34 @@ const deleteComponent = async (uid, componentToDelete) => {
   await deleteComponents(uid, componentToDelete);
   await strapi.db.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);
@@ -1616,29 +1644,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,
@@ -1648,8 +1653,8 @@ const createEntitiesWriteStream = (options) => {
           const diffs = diff(data, created);
           updateMappingTable(type, id, created.id);
           diffs.forEach((diff2) => {
-            if (diff2.kind === "modified" && last(diff2.path) === "id") {
-              const target = resolveType(diff2.path);
+            if (diff2.kind === "modified" && last(diff2.path) === "id" && "kind" in contentType) {
+              const target = resolveComponentUID({ paths: diff2.path, data, contentType, strapi: strapi2 });
               if (!target) {
                 return;
               }
@@ -2279,11 +2284,31 @@ function getFileStats(filepath, strapi2, isLocal = false) {
     });
   });
 }
+async function signFile(file) {
+  const { provider } = strapi.plugins.upload;
+  const { provider: providerName } = strapi.config.get("plugin.upload");
+  const isPrivate = await provider.isPrivate();
+  if (file?.provider === providerName && isPrivate) {
+    const signUrl = async (file2) => {
+      const signedUrl = await provider.getSignedUrl(file2);
+      file2.url = signedUrl.url;
+    };
+    await signUrl(file);
+    if (file.formats) {
+      for (const format of Object.keys(file.formats)) {
+        await signUrl(file.formats[format]);
+      }
+    }
+  }
+}
 const createAssetsStream = (strapi2) => {
   const generator = async function* () {
     const stream2 = strapi2.db.queryBuilder("plugin::upload.file").select("*").stream();
     for await (const file of stream2) {
       const isLocalProvider = file.provider === "local";
+      if (!isLocalProvider) {
+        await signFile(file);
+      }
       const filepath = isLocalProvider ? join(strapi2.dirs.static.public, file.url) : file.url;
       const stats = await getFileStats(filepath, strapi2, isLocalProvider);
       const stream22 = getFileStream(filepath, strapi2, isLocalProvider);
@@ -2941,9 +2966,7 @@ class RemoteStrapiSourceProvider {
     });
   }
   async getSchemas() {
-    const schemas = await this.dispatcher?.dispatchTransferAction(
-      "getSchemas"
-    );
+    const schemas = await this.dispatcher?.dispatchTransferAction("getSchemas");
     return schemas ?? null;
   }
   async #startStep(step) {
@@ -3082,8 +3105,11 @@ const transformUpgradeHeader = (header = "") => {
   return header.split(",").map((s) => s.trim().toLowerCase());
 };
 let timeouts;
+const hasHttpServer = () => {
+  return typeof strapi !== "undefined" && !!strapi?.server?.httpServer;
+};
 const disableTimeouts = () => {
-  if (!strapi?.server?.httpServer) {
+  if (!hasHttpServer()) {
     return;
   }
   const { httpServer } = strapi.server;
@@ -3098,7 +3124,7 @@ const disableTimeouts = () => {
   strapi.log.info("[Data transfer] Disabling http timeouts");
 };
 const resetTimeouts = () => {
-  if (!strapi?.server?.httpServer || !timeouts) {
+  if (!hasHttpServer() || !timeouts) {
     return;
   }
   const { httpServer } = strapi.server;