@hubspot/local-dev-lib 0.0.10 → 0.0.11

package/lib/archive.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
+import { LogCallbacksArg } from '../types/LogCallbacks';
+declare const archiveCallbackKeys: string[];
 type CopySourceToDestOptions = {
     sourceDir?: string;
     includesRootDir?: boolean;
 };
-export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir }?: CopySourceToDestOptions): Promise<boolean>;
+export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir }?: CopySourceToDestOptions, logCallbacks?: LogCallbacksArg<typeof archiveCallbackKeys>): Promise<boolean>;
 export {};

package/lib/archive.js

@@ -7,17 +7,17 @@ exports.extractZipArchive = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = require("path");
 const os_1 = require("os");
-const util_1 = require("util");
 const extract_zip_1 = __importDefault(require("extract-zip"));
 const fileSystemErrors_1 = require("../errors/fileSystemErrors");
 const standardErrors_1 = require("../errors/standardErrors");
 const logger_1 = require("../utils/logger");
-const extract = (0, util_1.promisify)(extract_zip_1.default);
 const i18nKey = 'lib.archive';
-async function extractZip(name, zip) {
+const archiveCallbackKeys = ['init', 'copy'];
+async function extractZip(name, zip, logCallbacks) {
+    const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
     const result = { extractDir: '', tmpDir: '' };
     const TMP_FOLDER_PREFIX = `hubspot-temp-${name}-`;
-    (0, logger_1.debug)(`${i18nKey}.extractZip.init`);
+    logger('init', `${i18nKey}.extractZip.init`);
     // Write zip to disk
     let tmpZipPath = '';
     try {
@@ -43,7 +43,7 @@ async function extractZip(name, zip) {
     // Extract zip
     try {
         const tmpExtractPath = (0, path_1.join)(result.tmpDir, 'extracted');
-        await extract(tmpZipPath, { dir: tmpExtractPath });
+        await (0, extract_zip_1.default)(tmpZipPath, { dir: tmpExtractPath });
         result.extractDir = tmpExtractPath;
     }
     catch (err) {
@@ -52,9 +52,10 @@ async function extractZip(name, zip) {
     (0, logger_1.debug)(`${i18nKey}.extractZip.success`);
     return result;
 }
-async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true } = {}) {
+async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true } = {}, logCallbacks) {
     try {
-        (0, logger_1.debug)(`${i18nKey}.copySourceToDest.init`);
+        const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
+        logger('copy', `${i18nKey}.copySourceToDest.init`);
         const srcDirPath = [src];
         if (includesRootDir) {
             const files = await fs_extra_1.default.readdir(src);
@@ -95,15 +96,15 @@ function cleanupTempDir(tmpDir) {
         (0, logger_1.debug)(`${i18nKey}.cleanupTempDir.error`, { tmpDir });
     }
 }
-async function extractZipArchive(zip, name, dest, { sourceDir, includesRootDir } = {}) {
+async function extractZipArchive(zip, name, dest, { sourceDir, includesRootDir } = {}, logCallbacks) {
     let success = false;
     if (zip) {
-        const { extractDir, tmpDir } = await extractZip(name, zip);
+        const { extractDir, tmpDir } = await extractZip(name, zip, logCallbacks);
         if (extractDir !== null) {
             success = await copySourceToDest(extractDir, dest, {
                 sourceDir,
                 includesRootDir,
-            });
+            }, logCallbacks);
         }
         cleanupTempDir(tmpDir);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "lib/index.js",
     "repository": {