@salesforce/core 4.1.3 → 4.2.0

package/lib/util/zipWriter.d.ts

@@ -5,12 +5,11 @@ import { StructuredWriter } from './structuredWriter';
 export declare class ZipWriter extends Writable implements StructuredWriter {
     private readonly rootDestination?;
     private zip;
-    private buffers;
+    private zipBuffer?;
+    private logger;
     constructor(rootDestination?: string | undefined);
     get buffer(): Buffer;
     addToStore(contents: string | Readable | Buffer, path: string): Promise<void>;
     finalize(): Promise<void>;
     getDestinationPath(): string | undefined;
-    private getOutputStream;
-    private getInputBuffer;
 }

package/lib/util/zipWriter.js

@@ -7,62 +7,45 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZipWriter = void 0;
-const fs_1 = require("fs");
 const stream_1 = require("stream");
-const util_1 = require("util");
-const archiver_1 = require("archiver");
-const pipeline = (0, util_1.promisify)(stream_1.pipeline);
+const JSZip = require("jszip");
+const logger_1 = require("../logger");
+const sfError_1 = require("../sfError");
 class ZipWriter extends stream_1.Writable {
     constructor(rootDestination) {
         super({ objectMode: true });
         this.rootDestination = rootDestination;
-        // compression-/speed+ (0)<---(3)---------->(9) compression+/speed-
-        // 3 appears to be a decent balance of compression and speed. It felt like
-        // higher values = diminishing returns on compression and made conversion slower
-        this.zip = (0, archiver_1.create)('zip', { zlib: { level: 3 } });
-        this.buffers = [];
-        void pipeline(this.zip, this.getOutputStream());
+        this.zip = JSZip();
+        const destination = rootDestination ? `for: ${rootDestination}` : 'in memory';
+        this.logger = logger_1.Logger.childFromRoot(this.constructor.name);
+        this.logger.debug(`generating zip ${destination}`);
     }
     get buffer() {
-        return Buffer.concat(this.buffers);
+        if (!this.zipBuffer) {
+            throw new sfError_1.SfError('Must finalize the ZipWriter before getting a buffer');
+        }
+        return this.zipBuffer;
     }
     async addToStore(contents, path) {
-        this.zip.append(contents, { name: path });
+        // Ensure only posix paths are added to zip files
+        const posixPath = path.replace(/\\/g, '/');
+        this.zip.file(posixPath, contents);
         return Promise.resolve();
     }
     async finalize() {
-        await this.zip.finalize();
-        await this.getInputBuffer();
+        // compression-/speed+ (0)<---(3)---------->(9) compression+/speed-
+        // 3 appears to be a decent balance of compression and speed. It felt like
+        // higher values = diminishing returns on compression and made conversion slower
+        this.zipBuffer = await this.zip.generateAsync({
+            type: 'nodebuffer',
+            compression: 'DEFLATE',
+            compressionOptions: { level: 3 },
+        });
+        this.logger.debug('Generated zip complete');
     }
     getDestinationPath() {
         return this.rootDestination;
     }
-    getOutputStream() {
-        if (this.rootDestination) {
-            return (0, fs_1.createWriteStream)(this.rootDestination);
-        }
-        else {
-            const bufferWritable = new stream_1.Writable();
-            // eslint-disable-next-line no-underscore-dangle
-            bufferWritable._write = (chunk, encoding, cb) => {
-                this.buffers.push(chunk);
-                cb();
-            };
-            return bufferWritable;
-        }
-    }
-    async getInputBuffer() {
-        if (this.rootDestination) {
-            const inputStream = (0, fs_1.createReadStream)(this.rootDestination);
-            return new Promise((resolve, reject) => {
-                inputStream.on('data', (chunk) => {
-                    this.buffers.push(chunk);
-                });
-                inputStream.once('end', () => resolve());
-                inputStream.once('error', (error) => reject(error));
-            });
-        }
-    }
 }
 exports.ZipWriter = ZipWriter;
 //# sourceMappingURL=zipWriter.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -41,26 +41,25 @@
     "@salesforce/bunyan": "^2.0.0",
     "@salesforce/kit": "^3.0.2",
     "@salesforce/schemas": "^1.5.1",
-    "@salesforce/ts-types": "^2.0.1",
+    "@salesforce/ts-types": "^2.0.2",
     "@types/semver": "^7.5.0",
     "ajv": "^8.12.0",
-    "archiver": "^5.3.0",
     "change-case": "^4.1.2",
     "debug": "^3.2.7",
     "faye": "^1.4.0",
     "form-data": "^4.0.0",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "^2.0.0-beta.23",
+    "jsforce": "^2.0.0-beta.24",
     "jsonwebtoken": "9.0.0",
+    "jszip": "3.10.1",
     "proper-lockfile": "^4.1.2",
     "ts-retry-promise": "^0.7.0"
   },
   "devDependencies": {
     "@salesforce/dev-config": "^4.0.1",
-    "@salesforce/dev-scripts": "^5.0.1",
-    "@salesforce/prettier-config": "^0.0.2",
+    "@salesforce/dev-scripts": "^5.4.2",
+    "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "^1.4.6",
-    "@types/archiver": "^5.3.2",
     "@types/chai-string": "^1.4.2",
     "@types/debug": "0.0.31",
     "@types/jsonwebtoken": "9.0.2",