@hubspot/local-dev-lib 3.7.0 → 3.7.1-beta.0

package/lib/archive.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { CopySourceToDestOptions } from '../types/Archive';
-export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir, hideLogs }?: CopySourceToDestOptions): Promise<boolean>;
+export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir, hideLogs, handleCollision, }?: CopySourceToDestOptions): Promise<boolean>;

package/lib/archive.js

@@ -1,16 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractZipArchive = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = require("path");
+const path_1 = __importStar(require("path"));
 const os_1 = require("os");
 const extract_zip_1 = __importDefault(require("extract-zip"));
 const logger_1 = require("./logger");
 const lang_1 = require("../utils/lang");
 const FileSystemError_1 = require("../models/FileSystemError");
+const fs_1 = require("./fs");
 const i18nKey = 'lib.archive';
 async function extractZip(name, zip, hideLogs = false) {
     const result = { extractDir: '', tmpDir: '' };
@@ -55,7 +79,7 @@ async function extractZip(name, zip, hideLogs = false) {
     logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.extractZip.success`));
     return result;
 }
-async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true, hideLogs = false, } = {}) {
+async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true, hideLogs = false, handleCollision, } = {}) {
     try {
         if (!hideLogs) {
             logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.copySourceToDest.init`));
@@ -73,11 +97,40 @@ async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true,
             }
             srcDirPath.push(rootDir);
         }
+        const sourceDirs = [];
         if (sourceDir) {
-            srcDirPath.push(sourceDir);
+            sourceDirs.push(...(Array.isArray(sourceDir) ? new Set(sourceDir) : [sourceDir]));
+        }
+        if (sourceDirs.length === 0) {
+            const projectSrcDir = (0, path_1.join)(...srcDirPath);
+            await fs_extra_1.default.copy(projectSrcDir, dest);
+        }
+        else {
+            for (let i = 0; i < sourceDirs.length; i++) {
+                const projectSrcDir = (0, path_1.join)(...srcDirPath, sourceDirs[i]);
+                let collisions = [];
+                if (fs_extra_1.default.existsSync(dest) &&
+                    handleCollision &&
+                    typeof handleCollision === 'function') {
+                    const existingFiles = (await (0, fs_1.walk)(dest, ['node_modules'])).map(file => path_1.default.normalize(path_1.default.relative(dest, file)));
+                    const newFiles = (await (0, fs_1.walk)(projectSrcDir, ['node_modules'])).map(file => path_1.default.relative(projectSrcDir, file));
+                    // Find files that exist in the same positions in both directories
+                    collisions = existingFiles.filter(currentFile => newFiles.includes(currentFile));
+                }
+                if (collisions.length &&
+                    handleCollision &&
+                    typeof handleCollision === 'function') {
+                    await handleCollision({
+                        dest,
+                        src: projectSrcDir,
+                        collisions,
+                    });
+                }
+                else {
+                    await fs_extra_1.default.copy(projectSrcDir, dest);
+                }
+            }
         }
-        const projectSrcDir = (0, path_1.join)(...srcDirPath);
-        await fs_extra_1.default.copy(projectSrcDir, dest);
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.copySourceToDest.success`));
         return true;
     }
@@ -99,7 +152,7 @@ async function cleanupTempDir(tmpDir) {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.cleanupTempDir.error`, { tmpDir }));
     }
 }
-async function extractZipArchive(zip, name, dest, { sourceDir, includesRootDir, hideLogs } = {}) {
+async function extractZipArchive(zip, name, dest, { sourceDir, includesRootDir, hideLogs, handleCollision, } = {}) {
     let success = false;
     if (zip) {
         const { extractDir, tmpDir } = await extractZip(name, zip, hideLogs);
@@ -108,6 +161,7 @@ async function extractZipArchive(zip, name, dest, { sourceDir, includesRootDir,
                 sourceDir,
                 includesRootDir,
                 hideLogs,
+                handleCollision,
             });
         }
         await cleanupTempDir(tmpDir);

package/lib/github.js

@@ -78,7 +78,7 @@ async function downloadGithubRepoZip(repoPath, isRelease = false, options = {})
     }
 }
 async function cloneGithubRepo(repoPath, dest, options = {}) {
-    const { tag, isRelease, branch, sourceDir, type, hideLogs } = options;
+    const { tag, isRelease, branch, sourceDir, type, hideLogs, handleCollision } = options;
     const zip = await downloadGithubRepoZip(repoPath, isRelease, {
         tag,
         branch,
@@ -87,6 +87,7 @@ async function cloneGithubRepo(repoPath, dest, options = {}) {
     const success = await (0, archive_1.extractZipArchive)(zip, repoName, dest, {
         sourceDir,
         hideLogs,
+        handleCollision,
     });
     if (success && !hideLogs) {
         logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.cloneGithubRepo.success`, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "3.7.0",
+    "version": "3.7.1-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",

package/types/Archive.d.ts

@@ -1,9 +1,15 @@
+export interface Collision {
+    dest: string;
+    src: string;
+    collisions: string[];
+}
 export type ZipData = {
     extractDir: string;
     tmpDir: string;
 };
 export type CopySourceToDestOptions = {
-    sourceDir?: string;
+    sourceDir?: string | string[];
     includesRootDir?: boolean;
     hideLogs?: boolean;
+    handleCollision?: (collision: Collision) => void | Promise<void>;
 };

package/types/Github.d.ts

@@ -1,3 +1,4 @@
+import { Collision } from './Archive';
 type GithubAuthor = {
     login: string;
     id: number;
@@ -71,7 +72,8 @@ export type CloneGithubRepoOptions = {
     type?: string;
     branch?: string;
     tag?: string;
-    sourceDir?: string;
+    sourceDir?: string | string[];
     hideLogs?: boolean;
+    handleCollision?: (collision: Collision) => void;
 };
 export {};