@strapi/data-transfer 4.6.0 → 4.6.2

package/lib/engine/index.js

@@ -374,7 +374,7 @@ _TransferEngine_metadata = new WeakMap(), _TransferEngine_instances = new WeakSe
     keys.forEach((key) => {
         const sourceSchema = sourceSchemas[key];
         const destinationSchema = destinationSchemas[key];
-        const schemaDiffs = (0, validation_1.compareSchemas)(destinationSchema, sourceSchema, strategy);
+        const schemaDiffs = (0, validation_1.compareSchemas)(sourceSchema, destinationSchema, strategy);
         if (schemaDiffs.length) {
             diffs[key] = schemaDiffs;
         }
@@ -388,13 +388,16 @@ _TransferEngine_metadata = new WeakMap(), _TransferEngine_instances = new WeakSe
                 .map((diff) => {
                 const path = diff.path.join('.');
                 if (diff.kind === 'added') {
-                    return `Added "${path}": "${diff.value}" (${diff.type})`;
+                    return `${path} exists in destination schema but not in source schema`;
                 }
                 if (diff.kind === 'deleted') {
-                    return `Removed "${path}"`;
+                    return `${path} exists in source schema but not in destination schema`;
                 }
                 if (diff.kind === 'modified') {
-                    return `Modified "${path}": "${diff.values[0]}" (${diff.types[0]}) => "${diff.values[1]}" (${diff.types[1]})`;
+                    if (diff.types[0] === diff.types[1]) {
+                        return `Schema value changed at "${path}": "${diff.values[0]}" (${diff.types[0]}) => "${diff.values[1]}" (${diff.types[1]})`;
+                    }
+                    return `Schema has differing data types at "${path}": "${diff.values[0]}" (${diff.types[0]}) => "${diff.values[1]}" (${diff.types[1]})`;
                 }
                 throw new errors_1.TransferEngineValidationError(`Invalid diff found for "${uid}"`, {
                     check: `schema on ${uid}`,

package/lib/errors/constants.d.ts

@@ -1,3 +1,3 @@
 import { ErrorDiagnosticSeverity } from '../engine/diagnostic';
 export declare const SeverityKind: Record<string, ErrorDiagnosticSeverity>;
-export declare type Severity = typeof SeverityKind[keyof typeof SeverityKind];
+export declare type Severity = (typeof SeverityKind)[keyof typeof SeverityKind];

package/lib/file/providers/source/index.js

@@ -26,6 +26,7 @@ const stream_1 = require("stream");
 const Parser_1 = require("stream-json/jsonl/Parser");
 const encryption_1 = require("../../../utils/encryption");
 const stream_2 = require("../../../utils/stream");
+const providers_1 = require("../../../errors/providers");
 /**
  * Constant for the metadata file path
  */
@@ -56,7 +57,10 @@ class LocalFileSourceProvider {
             __classPrivateFieldSet(this, _LocalFileSourceProvider_metadata, await this.getMetadata(), "f");
         }
         catch (e) {
-            throw new Error(`Can't read file "${filePath}".`);
+            if (this.options?.encryption?.enabled) {
+                throw new providers_1.ProviderInitializationError(`Key is incorrect or the file '${filePath}' is not a valid Strapi data file.`);
+            }
+            throw new providers_1.ProviderInitializationError(`File '${filePath}' is not a valid Strapi data file.`);
         }
     }
     getMetadata() {
@@ -147,13 +151,24 @@ _LocalFileSourceProvider_metadata = new WeakMap(), _LocalFileSourceProvider_inst
             async onentry(entry) {
                 const transforms = [
                     // JSONL parser to read the data chunks one by one (line by line)
-                    (0, Parser_1.parser)(),
+                    (0, Parser_1.parser)({
+                        checkErrors: true,
+                    }),
                     // The JSONL parser returns each line as key/value
                     (line) => line.value,
                 ];
                 const stream = entry.pipe((0, stream_chain_1.chain)(transforms));
-                for await (const chunk of stream) {
-                    outStream.write(chunk);
+                try {
+                    for await (const chunk of stream) {
+                        outStream.write(chunk);
+                    }
+                }
+                catch (e) {
+                    outStream.destroy(new providers_1.ProviderTransferError(`Error parsing backup files from backup file ${entry.path}: ${e.message}`, {
+                        details: {
+                            error: e,
+                        },
+                    }));
                 }
             },
         }),
@@ -163,7 +178,9 @@ _LocalFileSourceProvider_metadata = new WeakMap(), _LocalFileSourceProvider_inst
         outStream.end();
     });
     return outStream;
-}, _LocalFileSourceProvider_parseJSONFile = async function _LocalFileSourceProvider_parseJSONFile(fileStream, filePath) {
+}, _LocalFileSourceProvider_parseJSONFile = 
+// For collecting an entire JSON file then parsing it, not for streaming JSONL
+async function _LocalFileSourceProvider_parseJSONFile(fileStream, filePath) {
     return new Promise((resolve, reject) => {
         (0, stream_1.pipeline)([
             fileStream,

package/lib/strapi/providers/local-destination/index.js

@@ -136,7 +136,7 @@ class LocalStrapiDestinationProvider {
         (0, providers_2.assertValidStrapi)(this.strapi, 'Not able to stream Assets');
         const assetsDirectory = path_1.default.join(this.strapi.dirs.static.public, 'uploads');
         const backupDirectory = path_1.default.join(this.strapi.dirs.static.public, `uploads_backup_${Date.now()}`);
-        await fse.rename(assetsDirectory, backupDirectory);
+        await fse.move(assetsDirectory, backupDirectory);
         await fse.mkdir(assetsDirectory);
         // Create a .gitkeep file to ensure the directory is not empty
         await fse.outputFile(path_1.default.join(assetsDirectory, '.gitkeep'), '');
@@ -155,7 +155,7 @@ class LocalStrapiDestinationProvider {
                     .on('error', async (error) => {
                     try {
                         await fse.rm(assetsDirectory, { recursive: true, force: true });
-                        await fse.rename(backupDirectory, assetsDirectory);
+                        await fse.move(backupDirectory, assetsDirectory);
                         this.destroy(new providers_1.ProviderTransferError(`There was an error during the transfer process. The original files have been restored to ${assetsDirectory}`));
                     }
                     catch (err) {

package/lib/utils/json.js

@@ -33,12 +33,6 @@ const diff = (a, b, ctx = createContext()) => {
         });
         return diffs;
     };
-    if (aType === 'undefined') {
-        return added();
-    }
-    if (bType === 'undefined') {
-        return deleted();
-    }
     if ((0, fp_1.isArray)(a) && (0, fp_1.isArray)(b)) {
         let k = 0;
         for (const [aItem, bItem] of (0, fp_1.zip)(a, b)) {
@@ -60,6 +54,12 @@ const diff = (a, b, ctx = createContext()) => {
         return diffs;
     }
     if (!(0, fp_1.isEqual)(a, b)) {
+        if (aType === 'undefined') {
+            return added();
+        }
+        if (bType === 'undefined') {
+            return deleted();
+        }
         return modified();
     }
     return diffs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/data-transfer",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "description": "Data transfer capabilities for Strapi",
   "keywords": [
     "strapi",
@@ -39,12 +39,12 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "@strapi/logger": "4.6.0",
-    "@strapi/strapi": "4.6.0",
+    "@strapi/logger": "4.6.2",
+    "@strapi/strapi": "4.6.2",
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
     "lodash": "4.17.21",
-    "prettier": "2.7.1",
+    "prettier": "2.8.4",
     "semver": "7.3.8",
     "stream-chain": "2.2.5",
     "stream-json": "1.7.4",
@@ -60,7 +60,7 @@
     "@types/koa": "2.13.4",
     "@types/semver": "7.3.13",
     "@types/stream-chain": "2.0.1",
-    "@types/stream-json": "1.7.2",
+    "@types/stream-json": "1.7.3",
     "@types/tar": "6.1.3",
     "@types/tar-stream": "2.2.2",
     "@types/uuid": "9.0.0",
@@ -73,5 +73,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "a9e55435c489f3379d88565bf3f729deb29bfb45"
+  "gitHead": "bae505f44c3a779905f6b8dbc0c497e24d9eabfb"
 }