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

package/dist/engine/diagnostic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostic.d.ts","sourceRoot":"","sources":["../../src/engine/diagnostic.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,GAAG,OAAO,IAAI;IACrE,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;KACjB,GAAG,CAAC,CAAC;CACP,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAE1D,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,IAAI,CAC1E,UAAU,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,KAC7D,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,cAAc,cAAc,EAAE,CAAC;AAE5E,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,SAAS,YAAY,GAC5E,kBAAkB,GAClB,CAAC,SAAS,cAAc,MAAM,CAAC,EAAE,GACjC,CAAC,SAAS,cAAc,GACtB,kBAAkB,CAAC,CAAC,CAAC,GACrB,KAAK,GACP,KAAK,CAAC;AAEV,MAAM,MAAM,UAAU,GAAG,eAAe,GAAG,iBAAiB,GAAG,cAAc,CAAC;AAE9E,MAAM,MAAM,uBAAuB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAElE,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAC7C,OAAO,EACP;IACE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,uBAAuB,CAAC;IAClC,KAAK,EAAE,KAAK,CAAC;CACd,CACF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAC/C,SAAS,EACT;IACE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CACF,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,OAAO,IAAI,iBAAiB,CACzD,MAAM,EACN;IACE,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CACF,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE;QACL,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC;KAC9B,CAAC;IAEF,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,mBAAmB,CAAC;IACpD,YAAY,CAAC,QAAQ,EAAE,kBAAkB,GAAG,mBAAmB,CAAC;IAChE,EAAE,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC;CAC7F;AAED,QAAA,MAAM,wBAAwB,aACnB,0BAA0B,KAClC,mBAyDF,CAAC;AAEF,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"diagnostic.d.ts","sourceRoot":"","sources":["../../src/engine/diagnostic.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,GAAG,OAAO,IAAI;IACrE,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;KACjB,GAAG,CAAC,CAAC;CACP,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAE1D,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,IAAI,CAC1E,UAAU,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG,UAAU,SAAS,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,KAC7D,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,cAAc,cAAc,EAAE,CAAC;AAE5E,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,SAAS,YAAY,GAC5E,kBAAkB,GAClB,CAAC,SAAS,cAAc,MAAM,CAAC,EAAE,GAC/B,CAAC,SAAS,cAAc,GACtB,kBAAkB,CAAC,CAAC,CAAC,GACrB,KAAK,GACP,KAAK,CAAC;AAEZ,MAAM,MAAM,UAAU,GAAG,eAAe,GAAG,iBAAiB,GAAG,cAAc,CAAC;AAE9E,MAAM,MAAM,uBAAuB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAElE,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAC7C,OAAO,EACP;IACE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,uBAAuB,CAAC;IAClC,KAAK,EAAE,KAAK,CAAC;CACd,CACF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAC/C,SAAS,EACT;IACE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CACF,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,OAAO,IAAI,iBAAiB,CACzD,MAAM,EACN;IACE,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CACF,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE;QACL,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC;KAC9B,CAAC;IAEF,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,mBAAmB,CAAC;IACpD,YAAY,CAAC,QAAQ,EAAE,kBAAkB,GAAG,mBAAmB,CAAC;IAChE,EAAE,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC;CAC7F;AAED,QAAA,MAAM,wBAAwB,aACnB,0BAA0B,KAClC,mBAyDF,CAAC;AAEF,OAAO,EAAE,wBAAwB,EAAE,CAAC"}

package/dist/index.js

@@ -1283,6 +1283,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 = fp.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);
@@ -1644,29 +1672,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 = fp.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,
@@ -1676,8 +1681,8 @@ const createEntitiesWriteStream = (options) => {
           const diffs = diff(data, created);
           updateMappingTable(type, id, created.id);
           diffs.forEach((diff2) => {
-            if (diff2.kind === "modified" && fp.last(diff2.path) === "id") {
-              const target = resolveType(diff2.path);
+            if (diff2.kind === "modified" && fp.last(diff2.path) === "id" && "kind" in contentType) {
+              const target = resolveComponentUID({ paths: diff2.path, data, contentType, strapi: strapi2 });
               if (!target) {
                 return;
               }
@@ -2307,11 +2312,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 ? path.join(strapi2.dirs.static.public, file.url) : file.url;
       const stats = await getFileStats(filepath, strapi2, isLocalProvider);
       const stream22 = getFileStream(filepath, strapi2, isLocalProvider);
@@ -2969,9 +2994,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) {
@@ -3110,8 +3133,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;
@@ -3126,7 +3152,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;