@webiny/api-page-builder-import-export 0.0.0-unstable.d7f521b032 → 0.0.0-unstable.de38392959

package/export/process/templatesHandler.js

@@ -7,9 +7,9 @@ exports.templatesHandler = void 0;
 var _types = require("../../types");
 var _client = require("../../client");
 var _handlerGraphql = require("@webiny/handler-graphql");
-var _utils = require("../utils");
 var _mockSecurity = require("../../mockSecurity");
-var _utils2 = require("@webiny/utils");
+var _utils = require("@webiny/utils");
+var _PageTemplateExporter = require("./exporters/PageTemplateExporter");
 /**
  * Handles the export templates process workflow.
  */
@@ -37,7 +37,7 @@ const templatesHandler = async (configuration, payload, context) => {
      * Note: We're not going to DB for finding the next sub-task to process,
      * because the data might be out of sync due to GSI eventual consistency.
      */
-    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
+    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex, 5));
     /**
      * Base condition!!
      * Bail out early, if task not found or task's status is not "pending".
@@ -81,8 +81,8 @@ const templatesHandler = async (configuration, payload, context) => {
     });
     prevStatusOfSubTask = subTask.status;
     log(`Extracting template data and uploading to storage...`);
-    // Extract Template
-    const templateDataZip = await (0, _utils.exportTemplate)(template, exportTemplatesDataKey, fileManager);
+    const templateExporter = new _PageTemplateExporter.PageTemplateExporter(fileManager);
+    const templateDataZip = await templateExporter.execute(template, exportTemplatesDataKey);
     log(`Finish uploading zip...`);
     // Update task record in DB
     subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
@@ -163,4 +163,6 @@ const templatesHandler = async (configuration, payload, context) => {
     error: null
   };
 };
-exports.templatesHandler = templatesHandler;
+exports.templatesHandler = templatesHandler;
+
+//# sourceMappingURL=templatesHandler.js.map

package/export/process/templatesHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["templatesHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","pageBuilder","fileManager","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","input","templateId","exportTemplatesDataKey","template","getPageTemplate","where","NotFoundError","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","templateDataZip","exportTemplate","COMPLETED","message","key","Key","e","FAILED","name","code","invokeHandlerClient","handlers","combine","security","getIdentity","description","process"],"sources":["templatesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport { exportTemplate } from \"~/export/utils\";\nimport { Payload as ExtractPayload } from \"../combine\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/export/process\";\n\n/**\n * Handles the export templates process workflow.\n */\nexport const templatesHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Export Templates Process Handler\");\n    const { pageBuilder, fileManager } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity as SecurityIdentity, context);\n    try {\n        /*\n         * Note: We're not going to DB for finding the next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { input } = subTask;\n        const { templateId, exportTemplatesDataKey } = input;\n\n        const template = await pageBuilder.getPageTemplate({ where: { id: templateId } });\n\n        if (!template) {\n            log(`Unable to load template \"${templateId}\"`);\n            throw new NotFoundError(`Unable to load template \"${templateId}\"`);\n        }\n\n        log(`Processing template key \"${templateId}\"`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Extracting template data and uploading to storage...`);\n        // Extract Template\n        const templateDataZip = await exportTemplate(template, exportTemplatesDataKey, fileManager);\n        log(`Finish uploading zip...`);\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading data for template \"${template.id}\"`,\n                key: templateDataZip.Key\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[EXPORT_TEMPLATES_PROCESS] Error => \", e.message);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    code: \"EXPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n            // Combine individual template zip files.\n            await invokeHandlerClient<ExtractPayload>({\n                context,\n                name: configuration.handlers.combine,\n                payload: {\n                    taskId,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - combine\"\n            });\n        } else {\n            console.log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current template error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    subTaskIndex: subTaskIndex + 1,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_types","require","_client","_handlerGraphql","_mockSecurity","_utils","_PageTemplateExporter","templatesHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","pageBuilder","fileManager","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","input","templateId","exportTemplatesDataKey","template","getPageTemplate","where","NotFoundError","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","templateExporter","PageTemplateExporter","templateDataZip","execute","COMPLETED","message","key","Key","e","FAILED","name","code","invokeHandlerClient","handlers","combine","security","getIdentity","description","process","exports"],"sources":["templatesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport { Payload as ExtractPayload } from \"../combine\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/export/process\";\nimport { PageTemplateExporter } from \"~/export/process/exporters/PageTemplateExporter\";\n\n/**\n * Handles the export templates process workflow.\n */\nexport const templatesHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Export Templates Process Handler\");\n    const { pageBuilder, fileManager } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity as SecurityIdentity, context);\n    try {\n        /*\n         * Note: We're not going to DB for finding the next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { input } = subTask;\n        const { templateId, exportTemplatesDataKey } = input;\n\n        const template = await pageBuilder.getPageTemplate({ where: { id: templateId } });\n\n        if (!template) {\n            log(`Unable to load template \"${templateId}\"`);\n            throw new NotFoundError(`Unable to load template \"${templateId}\"`);\n        }\n\n        log(`Processing template key \"${templateId}\"`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Extracting template data and uploading to storage...`);\n        const templateExporter = new PageTemplateExporter(fileManager);\n        const templateDataZip = await templateExporter.execute(template, exportTemplatesDataKey);\n\n        log(`Finish uploading zip...`);\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading data for template \"${template.id}\"`,\n                key: templateDataZip.Key\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[EXPORT_TEMPLATES_PROCESS] Error => \", e.message);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    code: \"EXPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n            // Combine individual template zip files.\n            await invokeHandlerClient<ExtractPayload>({\n                context,\n                name: configuration.handlers.combine,\n                payload: {\n                    taskId,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - combine\"\n            });\n        } else {\n            console.log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current template error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    subTaskIndex: subTaskIndex + 1,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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"}

package/export/s3Stream.d.ts

@@ -1,31 +1,34 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { PassThrough, Readable } from "stream";
-import S3 from "aws-sdk/clients/s3";
+import { Readable } from "stream";
+import { S3, ListObjectsOutput, DeleteObjectOutput, HeadObjectOutput } from "@webiny/aws-sdk/client-s3";
 declare class S3Stream {
     s3: S3;
     bucket: string;
     constructor();
-    getPresignedUrl(key: string): string;
+    getPresignedUrl(key?: string): Promise<string>;
     /**
      * We're checking if the file is accessible on S3 by getting object meta data.
      * It help us to filter files that we need to download as part of export data.
      * @param Key {string}
      */
     isFileAccessible(Key: string): Promise<boolean>;
-    getObjectHead(Key: string): Promise<S3.HeadObjectOutput>;
-    readStream(Key: string): Readable;
+    getObjectHead(Key: string): Promise<HeadObjectOutput>;
+    readStream(Key: string): Promise<Readable>;
     writeStream(Key: string, contentType?: string): {
-        streamPassThrough: PassThrough;
-        streamPassThroughUploadPromise: Promise<S3.ManagedUpload.SendData>;
+        streamPassThrough: import("stream").PassThrough;
+        /**
+         * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.
+         */
+        streamPassThroughUploadPromise: Promise<import("@aws-sdk/client-s3").AbortMultipartUploadCommandOutput | import("@webiny/aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
     };
     upload(params: {
         Key: string;
         ContentType: string;
         Body: Buffer;
-    }): Promise<S3.ManagedUpload.SendData>;
-    listObject(prefix: string): Promise<S3.ListObjectsOutput>;
-    deleteObject(key: string): Promise<S3.DeleteObjectOutput>;
+    }): Promise<void>;
+    listObject(prefix: string): Promise<ListObjectsOutput>;
+    deleteObject(key: string): Promise<DeleteObjectOutput>;
 }
 export declare const s3Stream: S3Stream;
 export {};

package/export/s3Stream.js

@@ -1,29 +1,26 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.s3Stream = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _stream = require("stream");
-var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
+var _clientS = require("@webiny/aws-sdk/client-s3");
+var _libStorage = require("@webiny/aws-sdk/lib-storage");
 const ARCHIVE_CONTENT_TYPE = "application/zip";
 class S3Stream {
   constructor() {
-    (0, _defineProperty2.default)(this, "s3", void 0);
-    (0, _defineProperty2.default)(this, "bucket", void 0);
-    this.s3 = new _s.default({
+    this.s3 = new _clientS.S3({
       region: process.env.AWS_REGION
     });
     this.bucket = process.env.S3_BUCKET;
   }
   getPresignedUrl(key) {
-    return this.s3.getSignedUrl("getObject", {
+    return (0, _clientS.getSignedUrl)(this.s3, new _clientS.GetObjectCommand({
       Bucket: this.bucket,
-      Key: key,
-      Expires: 604800 // 1 week
+      Key: key
+    }), {
+      expiresIn: 604800 // 1 week
     });
   }
 
@@ -46,13 +43,14 @@ class S3Stream {
     return this.s3.headObject({
       Bucket: this.bucket,
       Key
-    }).promise();
+    });
   }
-  readStream(Key) {
-    return this.s3.getObject({
+  async readStream(Key) {
+    const response = await this.s3.send(new _clientS.GetObjectCommand({
       Bucket: this.bucket,
       Key
-    }).createReadStream();
+    }));
+    return response.Body;
   }
   writeStream(Key, contentType = ARCHIVE_CONTENT_TYPE) {
     const streamPassThrough = new _stream.Stream.PassThrough();
@@ -63,32 +61,39 @@ class S3Stream {
       ContentType: contentType,
       Key
     };
+    const upload = new _libStorage.Upload({
+      client: this.s3,
+      params
+    });
     return {
       streamPassThrough: streamPassThrough,
       /**
        * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.
        */
-      streamPassThroughUploadPromise: this.s3.upload(params).promise()
+      streamPassThroughUploadPromise: upload.done()
     };
   }
-  upload(params) {
-    return this.s3.upload((0, _objectSpread2.default)({
+  async upload(params) {
+    await this.s3.send(new _clientS.PutObjectCommand({
       ACL: "private",
-      Bucket: this.bucket
-    }, params)).promise();
+      Bucket: this.bucket,
+      ...params
+    }));
   }
   listObject(prefix) {
     return this.s3.listObjects({
       Bucket: this.bucket,
       Prefix: prefix
-    }).promise();
+    });
   }
   deleteObject(key) {
     return this.s3.deleteObject({
       Key: key,
       Bucket: this.bucket
-    }).promise();
+    });
   }
 }
 const s3Stream = new S3Stream();
-exports.s3Stream = s3Stream;
+exports.s3Stream = s3Stream;
+
+//# sourceMappingURL=s3Stream.js.map

package/export/s3Stream.js.map

@@ -1 +1 @@
-{"version":3,"names":["ARCHIVE_CONTENT_TYPE","S3Stream","constructor","s3","S3","region","process","env","AWS_REGION","bucket","S3_BUCKET","getPresignedUrl","key","getSignedUrl","Bucket","Key","Expires","isFileAccessible","getObjectHead","error","console","warn","log","headObject","promise","readStream","getObject","createReadStream","writeStream","contentType","streamPassThrough","Stream","PassThrough","params","ACL","Body","ContentType","streamPassThroughUploadPromise","upload","listObject","prefix","listObjects","Prefix","deleteObject","s3Stream"],"sources":["s3Stream.ts"],"sourcesContent":["import { Stream, PassThrough, Readable } from \"stream\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nconst ARCHIVE_CONTENT_TYPE = \"application/zip\";\n\nclass S3Stream {\n    s3: S3;\n    bucket: string;\n\n    constructor() {\n        this.s3 = new S3({\n            region: process.env.AWS_REGION as string\n        });\n        this.bucket = process.env.S3_BUCKET as string;\n    }\n\n    getPresignedUrl(key: string) {\n        return this.s3.getSignedUrl(\"getObject\", {\n            Bucket: this.bucket,\n            Key: key,\n            Expires: 604800 // 1 week\n        });\n    }\n\n    /**\n     * We're checking if the file is accessible on S3 by getting object meta data.\n     * It help us to filter files that we need to download as part of export data.\n     * @param Key {string}\n     */\n    async isFileAccessible(Key: string): Promise<boolean> {\n        try {\n            await this.getObjectHead(Key);\n            return true;\n        } catch (error) {\n            console.warn(`Error while fetching meta data for file \"${Key}\"`);\n            console.log(error);\n            return false;\n        }\n    }\n\n    getObjectHead(Key: string): Promise<S3.HeadObjectOutput> {\n        return this.s3.headObject({ Bucket: this.bucket, Key }).promise();\n    }\n\n    readStream(Key: string): Readable {\n        return this.s3.getObject({ Bucket: this.bucket, Key }).createReadStream();\n    }\n\n    writeStream(\n        Key: string,\n        contentType: string = ARCHIVE_CONTENT_TYPE\n    ): {\n        streamPassThrough: PassThrough;\n        streamPassThroughUploadPromise: Promise<S3.ManagedUpload.SendData>;\n    } {\n        const streamPassThrough = new Stream.PassThrough();\n\n        const params: S3.PutObjectRequest = {\n            ACL: \"private\",\n            Body: streamPassThrough,\n            Bucket: this.bucket,\n            ContentType: contentType,\n            Key\n        };\n\n        return {\n            streamPassThrough: streamPassThrough,\n            /**\n             * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.\n             */\n            streamPassThroughUploadPromise: this.s3.upload(params).promise()\n        };\n    }\n\n    upload(params: {\n        Key: string;\n        ContentType: string;\n        Body: Buffer;\n    }): Promise<S3.ManagedUpload.SendData> {\n        return this.s3\n            .upload({\n                ACL: \"private\",\n                Bucket: this.bucket,\n                ...params\n            })\n            .promise();\n    }\n\n    listObject(prefix: string): Promise<S3.ListObjectsOutput> {\n        return this.s3\n            .listObjects({\n                Bucket: this.bucket,\n                Prefix: prefix\n            })\n            .promise();\n    }\n\n    deleteObject(key: string): Promise<S3.DeleteObjectOutput> {\n        return this.s3.deleteObject({ Key: key, Bucket: this.bucket }).promise();\n    }\n}\n\nexport const s3Stream = new S3Stream();\n"],"mappings":";;;;;;;;;AAAA;AACA;AAEA,MAAMA,oBAAoB,GAAG,iBAAiB;AAE9C,MAAMC,QAAQ,CAAC;EAIXC,WAAW,GAAG;IAAA;IAAA;IACV,IAAI,CAACC,EAAE,GAAG,IAAIC,UAAE,CAAC;MACbC,MAAM,EAAEC,OAAO,CAACC,GAAG,CAACC;IACxB,CAAC,CAAC;IACF,IAAI,CAACC,MAAM,GAAGH,OAAO,CAACC,GAAG,CAACG,SAAmB;EACjD;EAEAC,eAAe,CAACC,GAAW,EAAE;IACzB,OAAO,IAAI,CAACT,EAAE,CAACU,YAAY,CAAC,WAAW,EAAE;MACrCC,MAAM,EAAE,IAAI,CAACL,MAAM;MACnBM,GAAG,EAAEH,GAAG;MACRI,OAAO,EAAE,MAAM,CAAC;IACpB,CAAC,CAAC;EACN;;EAEA;AACJ;AACA;AACA;AACA;EACI,MAAMC,gBAAgB,CAACF,GAAW,EAAoB;IAClD,IAAI;MACA,MAAM,IAAI,CAACG,aAAa,CAACH,GAAG,CAAC;MAC7B,OAAO,IAAI;IACf,CAAC,CAAC,OAAOI,KAAK,EAAE;MACZC,OAAO,CAACC,IAAI,CAAE,4CAA2CN,GAAI,GAAE,CAAC;MAChEK,OAAO,CAACE,GAAG,CAACH,KAAK,CAAC;MAClB,OAAO,KAAK;IAChB;EACJ;EAEAD,aAAa,CAACH,GAAW,EAAgC;IACrD,OAAO,IAAI,CAACZ,EAAE,CAACoB,UAAU,CAAC;MAAET,MAAM,EAAE,IAAI,CAACL,MAAM;MAAEM;IAAI,CAAC,CAAC,CAACS,OAAO,EAAE;EACrE;EAEAC,UAAU,CAACV,GAAW,EAAY;IAC9B,OAAO,IAAI,CAACZ,EAAE,CAACuB,SAAS,CAAC;MAAEZ,MAAM,EAAE,IAAI,CAACL,MAAM;MAAEM;IAAI,CAAC,CAAC,CAACY,gBAAgB,EAAE;EAC7E;EAEAC,WAAW,CACPb,GAAW,EACXc,WAAmB,GAAG7B,oBAAoB,EAI5C;IACE,MAAM8B,iBAAiB,GAAG,IAAIC,cAAM,CAACC,WAAW,EAAE;IAElD,MAAMC,MAA2B,GAAG;MAChCC,GAAG,EAAE,SAAS;MACdC,IAAI,EAAEL,iBAAiB;MACvBhB,MAAM,EAAE,IAAI,CAACL,MAAM;MACnB2B,WAAW,EAAEP,WAAW;MACxBd;IACJ,CAAC;IAED,OAAO;MACHe,iBAAiB,EAAEA,iBAAiB;MACpC;AACZ;AACA;MACYO,8BAA8B,EAAE,IAAI,CAAClC,EAAE,CAACmC,MAAM,CAACL,MAAM,CAAC,CAACT,OAAO;IAClE,CAAC;EACL;EAEAc,MAAM,CAACL,MAIN,EAAsC;IACnC,OAAO,IAAI,CAAC9B,EAAE,CACTmC,MAAM;MACHJ,GAAG,EAAE,SAAS;MACdpB,MAAM,EAAE,IAAI,CAACL;IAAM,GAChBwB,MAAM,EACX,CACDT,OAAO,EAAE;EAClB;EAEAe,UAAU,CAACC,MAAc,EAAiC;IACtD,OAAO,IAAI,CAACrC,EAAE,CACTsC,WAAW,CAAC;MACT3B,MAAM,EAAE,IAAI,CAACL,MAAM;MACnBiC,MAAM,EAAEF;IACZ,CAAC,CAAC,CACDhB,OAAO,EAAE;EAClB;EAEAmB,YAAY,CAAC/B,GAAW,EAAkC;IACtD,OAAO,IAAI,CAACT,EAAE,CAACwC,YAAY,CAAC;MAAE5B,GAAG,EAAEH,GAAG;MAAEE,MAAM,EAAE,IAAI,CAACL;IAAO,CAAC,CAAC,CAACe,OAAO,EAAE;EAC5E;AACJ;AAEO,MAAMoB,QAAQ,GAAG,IAAI3C,QAAQ,EAAE;AAAC"}
+{"version":3,"names":["_stream","require","_clientS","_libStorage","ARCHIVE_CONTENT_TYPE","S3Stream","constructor","s3","S3","region","process","env","AWS_REGION","bucket","S3_BUCKET","getPresignedUrl","key","getSignedUrl","GetObjectCommand","Bucket","Key","expiresIn","isFileAccessible","getObjectHead","error","console","warn","log","headObject","readStream","response","send","Body","writeStream","contentType","streamPassThrough","Stream","PassThrough","params","ACL","ContentType","upload","Upload","client","streamPassThroughUploadPromise","done","PutObjectCommand","listObject","prefix","listObjects","Prefix","deleteObject","s3Stream","exports"],"sources":["s3Stream.ts"],"sourcesContent":["import { Stream, Readable } from \"stream\";\nimport {\n    S3,\n    ListObjectsOutput,\n    DeleteObjectOutput,\n    HeadObjectOutput,\n    getSignedUrl,\n    GetObjectCommand,\n    PutObjectCommand,\n    PutObjectCommandInput\n} from \"@webiny/aws-sdk/client-s3\";\nimport { Upload } from \"@webiny/aws-sdk/lib-storage\";\n\nconst ARCHIVE_CONTENT_TYPE = \"application/zip\";\n\nclass S3Stream {\n    s3: S3;\n    bucket: string;\n\n    constructor() {\n        this.s3 = new S3({\n            region: process.env.AWS_REGION as string\n        });\n        this.bucket = process.env.S3_BUCKET as string;\n    }\n\n    getPresignedUrl(key?: string) {\n        return getSignedUrl(\n            this.s3,\n            new GetObjectCommand({\n                Bucket: this.bucket,\n                Key: key\n            }),\n            {\n                expiresIn: 604800 // 1 week\n            }\n        );\n    }\n\n    /**\n     * We're checking if the file is accessible on S3 by getting object meta data.\n     * It help us to filter files that we need to download as part of export data.\n     * @param Key {string}\n     */\n    async isFileAccessible(Key: string): Promise<boolean> {\n        try {\n            await this.getObjectHead(Key);\n            return true;\n        } catch (error) {\n            console.warn(`Error while fetching meta data for file \"${Key}\"`);\n            console.log(error);\n            return false;\n        }\n    }\n\n    getObjectHead(Key: string): Promise<HeadObjectOutput> {\n        return this.s3.headObject({ Bucket: this.bucket, Key });\n    }\n\n    async readStream(Key: string): Promise<Readable> {\n        const response = await this.s3.send(new GetObjectCommand({ Bucket: this.bucket, Key }));\n        return response.Body as Readable;\n    }\n\n    writeStream(Key: string, contentType: string = ARCHIVE_CONTENT_TYPE) {\n        const streamPassThrough = new Stream.PassThrough();\n\n        const params: PutObjectCommandInput = {\n            ACL: \"private\",\n            Body: streamPassThrough,\n            Bucket: this.bucket,\n            ContentType: contentType,\n            Key\n        };\n\n        const upload = new Upload({\n            client: this.s3,\n            params\n        });\n\n        return {\n            streamPassThrough: streamPassThrough,\n            /**\n             * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.\n             */\n            streamPassThroughUploadPromise: upload.done()\n        };\n    }\n\n    async upload(params: { Key: string; ContentType: string; Body: Buffer }): Promise<void> {\n        await this.s3.send(\n            new PutObjectCommand({\n                ACL: \"private\",\n                Bucket: this.bucket,\n                ...params\n            })\n        );\n    }\n\n    listObject(prefix: string): Promise<ListObjectsOutput> {\n        return this.s3.listObjects({\n            Bucket: this.bucket,\n            Prefix: prefix\n        });\n    }\n\n    deleteObject(key: string): Promise<DeleteObjectOutput> {\n        return this.s3.deleteObject({ Key: key, Bucket: this.bucket });\n    }\n}\n\nexport const s3Stream = new S3Stream();\n"],"mappings":"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"}

package/export/utils.d.ts

@@ -1,22 +1,24 @@
-import S3 from "aws-sdk/clients/s3";
-import { Page, PageBlock, PageTemplate } from "@webiny/api-page-builder/types";
+import { CompleteMultipartUploadOutput } from "@webiny/aws-sdk/client-s3";
+import { BlockCategory, Page, PageBlock, PageTemplate } from "@webiny/api-page-builder/types";
 import { FileManagerContext, File } from "@webiny/api-file-manager/types";
 export declare const EXPORT_PAGES_FOLDER_KEY = "WEBINY_PB_EXPORT_PAGES";
 export declare const EXPORT_BLOCKS_FOLDER_KEY = "WEBINY_PB_EXPORT_BLOCK";
 export declare const EXPORT_TEMPLATES_FOLDER_KEY = "WEBINY_PB_EXPORT_TEMPLATE";
+export declare const EXPORT_FORMS_FOLDER_KEY = "WEBINY_FB_EXPORT_FORM";
 export interface ExportedPageData {
     page: Pick<Page, "content" | "title" | "version" | "status" | "settings" | "path">;
     files: File[];
 }
-export declare function exportPage(page: Page, exportPagesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<S3.ManagedUpload.SendData>;
+export declare function exportPage(page: Page, exportPagesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<CompleteMultipartUploadOutput>;
 export interface ExportedBlockData {
-    block: Pick<PageBlock, "name" | "content" | "preview">;
+    block: Pick<PageBlock, "name" | "content">;
+    category: BlockCategory;
     files: File[];
 }
-export declare function exportBlock(block: PageBlock, exportBlocksDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<S3.ManagedUpload.SendData>;
+export declare function exportBlock(block: PageBlock, blockCategory: BlockCategory, exportBlocksDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<CompleteMultipartUploadOutput>;
 export interface ExportedTemplateData {
-    template: Pick<PageTemplate, "title" | "slug" | "tags" | "description" | "content" | "layout">;
+    template: Pick<PageTemplate, "title" | "slug" | "tags" | "description" | "content" | "layout" | "pageCategory">;
     files: File[];
 }
-export declare function exportTemplate(template: PageTemplate, exportTemplatesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<S3.ManagedUpload.SendData>;
-export declare function extractFilesFromData(data: Record<string, any>, files?: any[]): File[];
+export declare function exportTemplate(template: PageTemplate, exportTemplatesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<CompleteMultipartUploadOutput>;
+export declare function extractFilesFromData(data: Record<string, any>, files?: File[]): File[];

package/export/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EXPORT_TEMPLATES_FOLDER_KEY = exports.EXPORT_PAGES_FOLDER_KEY = exports.EXPORT_BLOCKS_FOLDER_KEY = void 0;
+exports.EXPORT_TEMPLATES_FOLDER_KEY = exports.EXPORT_PAGES_FOLDER_KEY = exports.EXPORT_FORMS_FOLDER_KEY = exports.EXPORT_BLOCKS_FOLDER_KEY = void 0;
 exports.exportBlock = exportBlock;
 exports.exportPage = exportPage;
 exports.exportTemplate = exportTemplate;
@@ -17,6 +17,8 @@ const EXPORT_BLOCKS_FOLDER_KEY = "WEBINY_PB_EXPORT_BLOCK";
 exports.EXPORT_BLOCKS_FOLDER_KEY = EXPORT_BLOCKS_FOLDER_KEY;
 const EXPORT_TEMPLATES_FOLDER_KEY = "WEBINY_PB_EXPORT_TEMPLATE";
 exports.EXPORT_TEMPLATES_FOLDER_KEY = EXPORT_TEMPLATES_FOLDER_KEY;
+const EXPORT_FORMS_FOLDER_KEY = "WEBINY_FB_EXPORT_FORM";
+exports.EXPORT_FORMS_FOLDER_KEY = EXPORT_FORMS_FOLDER_KEY;
 async function exportPage(page, exportPagesDataKey, fileManager) {
   // Extract all files
   const files = extractFilesFromData(page.content || {});
@@ -26,8 +28,10 @@ async function exportPage(page, exportPagesDataKey, fileManager) {
   // Get file data for all images
   const imageFilesData = [];
   if (fileIds.length > 0) {
-    const [filesData] = await fileManager.files.listFiles({
-      ids: fileIds
+    const [filesData] = await fileManager.listFiles({
+      where: {
+        id_in: fileIds
+      }
     });
     imageFilesData.push(...filesData);
   }
@@ -55,29 +59,32 @@ async function exportPage(page, exportPagesDataKey, fileManager) {
   });
   return zipper.process();
 }
-async function exportBlock(block, exportBlocksDataKey, fileManager) {
+async function exportBlock(block, blockCategory, exportBlocksDataKey, fileManager) {
   // Extract all files
   const files = extractFilesFromData(block.content || {});
   const fileIds = files.map(imageFile => imageFile.id);
   // Get file data for all images
   const imageFilesData = [];
   if (fileIds.length > 0) {
-    const [filesData] = await fileManager.files.listFiles({
-      ids: fileIds
+    const [filesData] = await fileManager.listFiles({
+      where: {
+        id_in: fileIds
+      }
     });
     imageFilesData.push(...filesData);
   }
-  // Add block preview image file data
-  if (block.preview.id) {
-    imageFilesData.push(await fileManager.files.getFile(block.preview.id));
-  }
 
   // Extract the block data in a json file and upload it to S3
   const blockData = {
     block: {
       name: block.name,
-      content: block.content,
-      preview: block.preview
+      content: block.content
+    },
+    category: {
+      name: blockCategory.name,
+      slug: blockCategory.slug,
+      icon: blockCategory.icon,
+      description: blockCategory.description
     },
     files: imageFilesData
   };
@@ -99,8 +106,10 @@ async function exportTemplate(template, exportTemplatesDataKey, fileManager) {
   // Get file data for all images
   const imageFilesData = [];
   if (fileIds.length > 0) {
-    const [filesData] = await fileManager.files.listFiles({
-      ids: fileIds
+    const [filesData] = await fileManager.listFiles({
+      where: {
+        id_in: fileIds
+      }
     });
     imageFilesData.push(...filesData);
   }
@@ -113,7 +122,8 @@ async function exportTemplate(template, exportTemplatesDataKey, fileManager) {
       tags: template.tags,
       description: template.description,
       content: template.content,
-      layout: template.layout
+      layout: template.layout,
+      pageCategory: template.pageCategory
     },
     files: imageFilesData
   };
@@ -129,10 +139,10 @@ async function exportTemplate(template, exportTemplatesDataKey, fileManager) {
   return zipper.process();
 }
 function extractFilesFromData(data, files = []) {
-  // Base case: termination
   if (!data || typeof data !== "object") {
     return files;
   }
+
   // Recursively call function for each element
   if (Array.isArray(data)) {
     for (let i = 0; i < data.length; i++) {
@@ -146,7 +156,6 @@ function extractFilesFromData(data, files = []) {
   const tuple = Object.entries(data);
   for (let i = 0; i < tuple.length; i++) {
     const [key, value] = tuple[i];
-    // TODO: @ashutosh extract it to plugins, so that, we can handle cases for other components too.
     if (key === "file" && value) {
       files.push(value);
     } else if (key === "images" && Array.isArray(value)) {
@@ -157,4 +166,6 @@ function extractFilesFromData(data, files = []) {
     }
   }
   return files;
-}
+}
+
+//# sourceMappingURL=utils.js.map

package/export/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["EXPORT_PAGES_FOLDER_KEY","EXPORT_BLOCKS_FOLDER_KEY","EXPORT_TEMPLATES_FOLDER_KEY","exportPage","page","exportPagesDataKey","fileManager","files","extractFilesFromData","content","pageSettingsImages","get","filter","image","src","fileIds","map","imageFile","id","imageFilesData","length","filesData","listFiles","ids","push","pageData","title","path","version","status","settings","pageDataBuffer","Buffer","from","JSON","stringify","zipper","Zipper","exportInfo","name","dataBuffer","archiveFileKey","process","exportBlock","block","exportBlocksDataKey","preview","getFile","blockData","blockDataBuffer","exportTemplate","template","exportTemplatesDataKey","templateData","slug","tags","description","layout","templateDataBuffer","data","Array","isArray","i","element","tuple","Object","entries","key","value"],"sources":["utils.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { Page, PageBlock, PageTemplate } from \"@webiny/api-page-builder/types\";\nimport { FileManagerContext, File } from \"@webiny/api-file-manager/types\";\nimport get from \"lodash/get\";\nimport Zipper from \"./zipper\";\n\nexport const EXPORT_PAGES_FOLDER_KEY = \"WEBINY_PB_EXPORT_PAGES\";\nexport const EXPORT_BLOCKS_FOLDER_KEY = \"WEBINY_PB_EXPORT_BLOCK\";\nexport const EXPORT_TEMPLATES_FOLDER_KEY = \"WEBINY_PB_EXPORT_TEMPLATE\";\n\nexport interface ExportedPageData {\n    page: Pick<Page, \"content\" | \"title\" | \"version\" | \"status\" | \"settings\" | \"path\">;\n    files: File[];\n}\n\nexport async function exportPage(\n    page: Page,\n    exportPagesDataKey: string,\n    fileManager: FileManagerContext[\"fileManager\"]\n): Promise<S3.ManagedUpload.SendData> {\n    // Extract all files\n    const files = extractFilesFromData(page.content || {});\n    // Extract images from page settings\n    const pageSettingsImages = [\n        get(page, \"settings.general.image\") as unknown as File,\n        get(page, \"settings.social.image\") as unknown as File\n    ].filter(image => image && image.src);\n\n    const fileIds = [...files, ...pageSettingsImages].map(imageFile => imageFile.id);\n    // Get file data for all images\n    const imageFilesData = [];\n    if (fileIds.length > 0) {\n        const [filesData] = await fileManager.files.listFiles({ ids: fileIds });\n        imageFilesData.push(...filesData);\n    }\n\n    // Extract the page data in a json file and upload it to S3\n    const pageData = {\n        page: {\n            content: page.content,\n            title: page.title,\n            path: page.path,\n            version: page.version,\n            status: page.status,\n            settings: page.settings\n        },\n        files: imageFilesData\n    };\n    const pageDataBuffer = Buffer.from(JSON.stringify(pageData));\n\n    const zipper = new Zipper({\n        exportInfo: {\n            files: imageFilesData,\n            name: page.title,\n            dataBuffer: pageDataBuffer\n        },\n        archiveFileKey: exportPagesDataKey\n    });\n\n    return zipper.process();\n}\n\nexport interface ExportedBlockData {\n    block: Pick<PageBlock, \"name\" | \"content\" | \"preview\">;\n    files: File[];\n}\n\nexport async function exportBlock(\n    block: PageBlock,\n    exportBlocksDataKey: string,\n    fileManager: FileManagerContext[\"fileManager\"]\n): Promise<S3.ManagedUpload.SendData> {\n    // Extract all files\n    const files = extractFilesFromData(block.content || {});\n    const fileIds = files.map(imageFile => imageFile.id);\n    // Get file data for all images\n    const imageFilesData = [];\n    if (fileIds.length > 0) {\n        const [filesData] = await fileManager.files.listFiles({ ids: fileIds });\n        imageFilesData.push(...filesData);\n    }\n    // Add block preview image file data\n    if (block.preview.id) {\n        imageFilesData.push(await fileManager.files.getFile(block.preview.id));\n    }\n\n    // Extract the block data in a json file and upload it to S3\n    const blockData = {\n        block: {\n            name: block.name,\n            content: block.content,\n            preview: block.preview\n        },\n        files: imageFilesData\n    };\n    const blockDataBuffer = Buffer.from(JSON.stringify(blockData));\n\n    const zipper = new Zipper({\n        exportInfo: {\n            files: imageFilesData,\n            name: block.name,\n            dataBuffer: blockDataBuffer\n        },\n        archiveFileKey: exportBlocksDataKey\n    });\n\n    return zipper.process();\n}\n\nexport interface ExportedTemplateData {\n    template: Pick<PageTemplate, \"title\" | \"slug\" | \"tags\" | \"description\" | \"content\" | \"layout\">;\n    files: File[];\n}\n\nexport async function exportTemplate(\n    template: PageTemplate,\n    exportTemplatesDataKey: string,\n    fileManager: FileManagerContext[\"fileManager\"]\n): Promise<S3.ManagedUpload.SendData> {\n    // Extract all files\n    const files = extractFilesFromData(template.content || {});\n    const fileIds = files.map(imageFile => imageFile.id);\n    // Get file data for all images\n    const imageFilesData = [];\n    if (fileIds.length > 0) {\n        const [filesData] = await fileManager.files.listFiles({ ids: fileIds });\n        imageFilesData.push(...filesData);\n    }\n\n    // Extract the template data in a json file and upload it to S3\n    const templateData = {\n        template: {\n            title: template.title,\n            slug: template.slug,\n            tags: template.tags,\n            description: template.description,\n            content: template.content,\n            layout: template.layout\n        },\n        files: imageFilesData\n    };\n    const templateDataBuffer = Buffer.from(JSON.stringify(templateData));\n\n    const zipper = new Zipper({\n        exportInfo: {\n            files: imageFilesData,\n            name: template.title,\n            dataBuffer: templateDataBuffer\n        },\n        archiveFileKey: exportTemplatesDataKey\n    });\n\n    return zipper.process();\n}\n\nexport function extractFilesFromData(data: Record<string, any>, files: any[] = []): File[] {\n    // Base case: termination\n    if (!data || typeof data !== \"object\") {\n        return files;\n    }\n    // Recursively call function for each element\n    if (Array.isArray(data)) {\n        for (let i = 0; i < data.length; i++) {\n            const element = data[i];\n            extractFilesFromData(element, files);\n        }\n        return files;\n    }\n\n    // Main\n    const tuple = Object.entries(data);\n    for (let i = 0; i < tuple.length; i++) {\n        const [key, value] = tuple[i];\n        // TODO: @ashutosh extract it to plugins, so that, we can handle cases for other components too.\n        if (key === \"file\" && value) {\n            files.push(value);\n        } else if (key === \"images\" && Array.isArray(value)) {\n            // Handle case for \"images-list\" component\n            files.push(...value);\n        } else {\n            extractFilesFromData(value, files);\n        }\n    }\n    return files;\n}\n"],"mappings":"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"}
+{"version":3,"names":["_get","_interopRequireDefault","require","_zipper","EXPORT_PAGES_FOLDER_KEY","exports","EXPORT_BLOCKS_FOLDER_KEY","EXPORT_TEMPLATES_FOLDER_KEY","EXPORT_FORMS_FOLDER_KEY","exportPage","page","exportPagesDataKey","fileManager","files","extractFilesFromData","content","pageSettingsImages","get","filter","image","src","fileIds","map","imageFile","id","imageFilesData","length","filesData","listFiles","where","id_in","push","pageData","title","path","version","status","settings","pageDataBuffer","Buffer","from","JSON","stringify","zipper","Zipper","exportInfo","name","dataBuffer","archiveFileKey","process","exportBlock","block","blockCategory","exportBlocksDataKey","blockData","category","slug","icon","description","blockDataBuffer","exportTemplate","template","exportTemplatesDataKey","templateData","tags","layout","pageCategory","templateDataBuffer","data","Array","isArray","i","element","tuple","Object","entries","key","value"],"sources":["utils.ts"],"sourcesContent":["import { CompleteMultipartUploadOutput } from \"@webiny/aws-sdk/client-s3\";\nimport { BlockCategory, Page, PageBlock, PageTemplate } from \"@webiny/api-page-builder/types\";\nimport { FileManagerContext, File } from \"@webiny/api-file-manager/types\";\nimport get from \"lodash/get\";\nimport Zipper from \"./zipper\";\n\nexport const EXPORT_PAGES_FOLDER_KEY = \"WEBINY_PB_EXPORT_PAGES\";\nexport const EXPORT_BLOCKS_FOLDER_KEY = \"WEBINY_PB_EXPORT_BLOCK\";\nexport const EXPORT_TEMPLATES_FOLDER_KEY = \"WEBINY_PB_EXPORT_TEMPLATE\";\nexport const EXPORT_FORMS_FOLDER_KEY = \"WEBINY_FB_EXPORT_FORM\";\n\nexport interface ExportedPageData {\n    page: Pick<Page, \"content\" | \"title\" | \"version\" | \"status\" | \"settings\" | \"path\">;\n    files: File[];\n}\n\nexport async function exportPage(\n    page: Page,\n    exportPagesDataKey: string,\n    fileManager: FileManagerContext[\"fileManager\"]\n): Promise<CompleteMultipartUploadOutput> {\n    // Extract all files\n    const files = extractFilesFromData(page.content || {});\n    // Extract images from page settings\n    const pageSettingsImages = [\n        get(page, \"settings.general.image\") as unknown as File,\n        get(page, \"settings.social.image\") as unknown as File\n    ].filter(image => image && image.src);\n\n    const fileIds = [...files, ...pageSettingsImages].map(imageFile => imageFile.id);\n    // Get file data for all images\n    const imageFilesData = [];\n    if (fileIds.length > 0) {\n        const [filesData] = await fileManager.listFiles({ where: { id_in: fileIds } });\n        imageFilesData.push(...filesData);\n    }\n\n    // Extract the page data in a json file and upload it to S3\n    const pageData = {\n        page: {\n            content: page.content,\n            title: page.title,\n            path: page.path,\n            version: page.version,\n            status: page.status,\n            settings: page.settings\n        },\n        files: imageFilesData\n    };\n    const pageDataBuffer = Buffer.from(JSON.stringify(pageData));\n\n    const zipper = new Zipper({\n        exportInfo: {\n            files: imageFilesData,\n            name: page.title,\n            dataBuffer: pageDataBuffer\n        },\n        archiveFileKey: exportPagesDataKey\n    });\n\n    return zipper.process();\n}\n\nexport interface ExportedBlockData {\n    block: Pick<PageBlock, \"name\" | \"content\">;\n    category: BlockCategory;\n    files: File[];\n}\n\nexport async function exportBlock(\n    block: PageBlock,\n    blockCategory: BlockCategory,\n    exportBlocksDataKey: string,\n    fileManager: FileManagerContext[\"fileManager\"]\n): Promise<CompleteMultipartUploadOutput> {\n    // Extract all files\n    const files = extractFilesFromData(block.content || {});\n    const fileIds = files.map(imageFile => imageFile.id);\n    // Get file data for all images\n    const imageFilesData = [];\n    if (fileIds.length > 0) {\n        const [filesData] = await fileManager.listFiles({ where: { id_in: fileIds } });\n        imageFilesData.push(...filesData);\n    }\n\n    // Extract the block data in a json file and upload it to S3\n    const blockData = {\n        block: {\n            name: block.name,\n            content: block.content\n        },\n        category: {\n            name: blockCategory.name,\n            slug: blockCategory.slug,\n            icon: blockCategory.icon,\n            description: blockCategory.description\n        },\n        files: imageFilesData\n    };\n    const blockDataBuffer = Buffer.from(JSON.stringify(blockData));\n\n    const zipper = new Zipper({\n        exportInfo: {\n            files: imageFilesData,\n            name: block.name,\n            dataBuffer: blockDataBuffer\n        },\n        archiveFileKey: exportBlocksDataKey\n    });\n\n    return zipper.process();\n}\n\nexport interface ExportedTemplateData {\n    template: Pick<\n        PageTemplate,\n        \"title\" | \"slug\" | \"tags\" | \"description\" | \"content\" | \"layout\" | \"pageCategory\"\n    >;\n    files: File[];\n}\n\nexport async function exportTemplate(\n    template: PageTemplate,\n    exportTemplatesDataKey: string,\n    fileManager: FileManagerContext[\"fileManager\"]\n): Promise<CompleteMultipartUploadOutput> {\n    // Extract all files\n    const files = extractFilesFromData(template.content || {});\n    const fileIds = files.map(imageFile => imageFile.id);\n    // Get file data for all images\n    const imageFilesData = [];\n    if (fileIds.length > 0) {\n        const [filesData] = await fileManager.listFiles({ where: { id_in: fileIds } });\n        imageFilesData.push(...filesData);\n    }\n\n    // Extract the template data in a json file and upload it to S3\n    const templateData = {\n        template: {\n            title: template.title,\n            slug: template.slug,\n            tags: template.tags,\n            description: template.description,\n            content: template.content,\n            layout: template.layout,\n            pageCategory: template.pageCategory\n        },\n        files: imageFilesData\n    };\n    const templateDataBuffer = Buffer.from(JSON.stringify(templateData));\n\n    const zipper = new Zipper({\n        exportInfo: {\n            files: imageFilesData,\n            name: template.title,\n            dataBuffer: templateDataBuffer\n        },\n        archiveFileKey: exportTemplatesDataKey\n    });\n\n    return zipper.process();\n}\n\nexport function extractFilesFromData(data: Record<string, any>, files: File[] = []) {\n    if (!data || typeof data !== \"object\") {\n        return files;\n    }\n\n    // Recursively call function for each element\n    if (Array.isArray(data)) {\n        for (let i = 0; i < data.length; i++) {\n            const element = data[i];\n            extractFilesFromData(element, files);\n        }\n        return files;\n    }\n\n    // Main\n    const tuple = Object.entries(data);\n    for (let i = 0; i < tuple.length; i++) {\n        const [key, value] = tuple[i];\n        if (key === \"file\" && value) {\n            files.push(value);\n        } else if (key === \"images\" && Array.isArray(value)) {\n            // Handle case for \"images-list\" component\n            files.push(...value);\n        } else {\n            extractFilesFromData(value, files);\n        }\n    }\n    return files;\n}\n"],"mappings":"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"}

package/export/zipper.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import S3 from "aws-sdk/clients/s3";
+import { CompleteMultipartUploadOutput } from "@webiny/aws-sdk/client-s3";
 import { Readable } from "stream";
 import { File } from "@webiny/api-file-manager/types";
 interface FileStreamDetails {
@@ -22,8 +22,8 @@ export default class Zipper {
     private readonly archiveFileName;
     config: ZipperConfig;
     constructor(config: ZipperConfig);
-    s3DownloadStreams(): FileStreamDetails[];
-    process(): Promise<S3.ManagedUpload.SendData>;
+    s3DownloadStreams(): Promise<FileStreamDetails[]>;
+    process(): Promise<CompleteMultipartUploadOutput>;
 }
 export declare class ZipOfZip {
     private readonly archiveFormat;
@@ -31,7 +31,7 @@ export declare class ZipOfZip {
     keys: string[];
     filename: string;
     constructor(keys: string[], filename: string);
-    getFileStreams(): FileStreamDetails[];
-    process(): Promise<S3.ManagedUpload.SendData>;
+    getFileStreams(): Promise<FileStreamDetails[]>;
+    process(): Promise<CompleteMultipartUploadOutput>;
 }
 export {};

package/export/zipper.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ZipOfZip = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _archiver = _interopRequireDefault(require("archiver"));
 var _stream = require("stream");
 var path = _interopRequireWildcard(require("path"));
@@ -16,38 +15,36 @@ var _s3Stream = require("./s3Stream");
 // TODO: Move "archive" in layer
 
 class Zipper {
+  archiveFormat = "zip";
+  filesDirName = "assets";
   constructor(config) {
-    (0, _defineProperty2.default)(this, "archiveFormat", "zip");
-    (0, _defineProperty2.default)(this, "filesDirName", "assets");
-    (0, _defineProperty2.default)(this, "archiveFileName", void 0);
-    (0, _defineProperty2.default)(this, "config", void 0);
     this.config = config;
     this.archiveFileName = (0, _uniqid.default)(`${this.config.archiveFileKey}/`, `-${(0, _kebabCase.default)(this.config.exportInfo.name)}.zip`);
   }
-  s3DownloadStreams() {
+  async s3DownloadStreams() {
     const exportInfo = this.config.exportInfo;
     const prefix = (0, _uniqid.default)("", `-${(0, _kebabCase.default)(exportInfo.name)}`);
-    const files = exportInfo.files.map(({
+    const files = await Promise.all(exportInfo.files.map(async ({
       key
     }) => {
       return {
-        stream: _s3Stream.s3Stream.readStream(key),
-        filename: `${prefix}\\${this.filesDirName}\\${path.basename(key)}`
+        stream: await _s3Stream.s3Stream.readStream(key),
+        filename: `${prefix}\\${this.filesDirName}\\${key}`
       };
-    });
+    }));
     return [...files, {
       stream: _stream.Readable.from(exportInfo.dataBuffer),
       filename: `${prefix}\\${exportInfo.name}.json`
     }];
   }
-  process() {
+  async process() {
     const {
       streamPassThrough,
       streamPassThroughUploadPromise
     } = _s3Stream.s3Stream.writeStream(this.archiveFileName);
 
     // 1. Read all files from S3 using stream.
-    const s3FilesStreams = this.s3DownloadStreams();
+    const s3FilesStreams = await this.s3DownloadStreams();
 
     // 2. Prepare zip from the file stream.
     const archive = _archiver.default.create(this.archiveFormat);
@@ -73,31 +70,28 @@ class Zipper {
 }
 exports.default = Zipper;
 class ZipOfZip {
+  archiveFormat = "zip";
   constructor(keys, filename) {
-    (0, _defineProperty2.default)(this, "archiveFormat", "zip");
-    (0, _defineProperty2.default)(this, "archiveFileName", void 0);
-    (0, _defineProperty2.default)(this, "keys", void 0);
-    (0, _defineProperty2.default)(this, "filename", void 0);
     this.keys = keys;
     this.filename = filename;
-    this.archiveFileName = (0, _uniqid.default)("", `-${filename}`);
+    this.archiveFileName = (0, _uniqid.default)("EXPORTS/", `-${filename}`);
   }
-  getFileStreams() {
-    return this.keys.map(key => {
+  async getFileStreams() {
+    return await Promise.all(this.keys.map(async key => {
       return {
-        stream: _s3Stream.s3Stream.readStream(key),
+        stream: await _s3Stream.s3Stream.readStream(key),
         filename: `${path.basename(key)}`
       };
-    });
+    }));
   }
-  process() {
+  async process() {
     const {
       streamPassThrough,
       streamPassThroughUploadPromise
     } = _s3Stream.s3Stream.writeStream(this.archiveFileName);
 
     // 1. Read all files from S3 using stream.
-    const fileStreamDetails = this.getFileStreams();
+    const fileStreamDetails = await this.getFileStreams();
 
     // 2. Prepare zip from the file stream.
     const archive = _archiver.default.create(this.archiveFormat);
@@ -121,4 +115,6 @@ class ZipOfZip {
     return streamPassThroughUploadPromise;
   }
 }
-exports.ZipOfZip = ZipOfZip;
+exports.ZipOfZip = ZipOfZip;
+
+//# sourceMappingURL=zipper.js.map