@mikeyt23/node-cli-utils 2.0.0-beta.1 → 2.0.0-beta.2

package/dist/cjs/GitUtility.d.ts

@@ -0,0 +1,7 @@
+import { spawnAsync } from './generalUtils.js';
+export interface GitUtilityDependencies {
+    spawnAsyncFn: typeof spawnAsync;
+}
+export declare const isValidBranchName: (branchName: string) => boolean;
+export declare const cloneProject: (repoUrl: string, localDestPath: string, branchName?: string, deleteGitFolder?: boolean) => Promise<void>;
+//# sourceMappingURL=GitUtility.d.ts.map

package/dist/cjs/GitUtility.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GitUtility.d.ts","sourceRoot":"","sources":["../../src/GitUtility.ts"],"names":[],"mappings":"AAEA,OAAO,EAAU,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAGtD,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,OAAO,UAAU,CAAA;CAChC;AAgDD,eAAO,MAAM,iBAAiB,eAvCE,MAAM,KAAG,OAuC2B,CAAA;AACpE,eAAO,MAAM,YAAY,YAzBK,MAAM,iBAAiB,MAAM,eAAc,MAAM,oBAA4B,OAAO,kBAyBxD,CAAA"}

package/dist/cjs/GitUtility.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloneProject = exports.isValidBranchName = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const promises_1 = __importDefault(require("node:fs/promises"));
+const generalUtils_js_1 = require("./generalUtils.js");
+const node_path_1 = require("node:path");
+class GitUtility {
+    constructor(dependencies = {}) {
+        var _a;
+        this.spawnAsyncFn = (_a = dependencies.spawnAsyncFn) !== null && _a !== void 0 ? _a : generalUtils_js_1.spawnAsync;
+    }
+    isValidBranchName(branchName) {
+        if (branchName.startsWith('-') || branchName.endsWith('/') || branchName.endsWith('.') || branchName.endsWith('@{') || branchName.includes('..')) {
+            return false;
+        }
+        const invalidChars = [' ', '~', '^', ':', '\\', '*', '?', '[', ']', '/'];
+        for (const char of branchName) {
+            if (invalidChars.includes(char)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    async cloneProject(repoUrl, localDestPath, branchName = 'main', deleteGitFolder = true) {
+        if (node_fs_1.default.existsSync(localDestPath)) {
+            throw new Error(`Cannot clone project - destination path already exists: ${localDestPath}`);
+        }
+        if (!this.isValidBranchName(branchName)) {
+            throw new Error(`Cannot clone project - invalid branch name: ${branchName}`);
+        }
+        await (0, generalUtils_js_1.mkdirp)(localDestPath);
+        const cloneArgs = `clone -b ${branchName} --single-branch --depth 1 ${repoUrl} ${localDestPath}`.split(' ');
+        const result = await this.spawnAsyncFn('git', cloneArgs);
+        if (result.code !== 0) {
+            throw new Error(`Failed to clone project '${result.stderr}' to '${localDestPath}'`);
+        }
+        if (deleteGitFolder) {
+            await promises_1.default.rm((0, node_path_1.join)(localDestPath, '.git'), { recursive: true });
+        }
+    }
+}
+const defaultGitUtility = new GitUtility();
+exports.isValidBranchName = defaultGitUtility.isValidBranchName;
+exports.cloneProject = defaultGitUtility.cloneProject;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR2l0VXRpbGl0eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9HaXRVdGlsaXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHNEQUF3QjtBQUN4QixnRUFBa0M7QUFDbEMsdURBQXNEO0FBQ3RELHlDQUFnQztBQU1oQyxNQUFNLFVBQVU7SUFHZCxZQUFZLGVBQWdELEVBQUU7O1FBQzVELElBQUksQ0FBQyxZQUFZLEdBQUcsTUFBQSxZQUFZLENBQUMsWUFBWSxtQ0FBSSw0QkFBVSxDQUFBO0lBQzdELENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxVQUFrQjtRQUNsQyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUksVUFBVSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksVUFBVSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNoSixPQUFPLEtBQUssQ0FBQTtTQUNiO1FBRUQsTUFBTSxZQUFZLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQTtRQUN4RSxLQUFLLE1BQU0sSUFBSSxJQUFJLFVBQVUsRUFBRTtZQUM3QixJQUFJLFlBQVksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQy9CLE9BQU8sS0FBSyxDQUFBO2FBQ2I7U0FDRjtRQUVELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQztJQUVELEtBQUssQ0FBQyxZQUFZLENBQUMsT0FBZSxFQUFFLGFBQXFCLEVBQUUsYUFBcUIsTUFBTSxFQUFFLGtCQUEyQixJQUFJO1FBQ3JILElBQUksaUJBQUUsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUU7WUFDaEMsTUFBTSxJQUFJLEtBQUssQ0FBQywyREFBMkQsYUFBYSxFQUFFLENBQUMsQ0FBQTtTQUM1RjtRQUNELElBQUksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUFDLEVBQUU7WUFDdkMsTUFBTSxJQUFJLEtBQUssQ0FBQywrQ0FBK0MsVUFBVSxFQUFFLENBQUMsQ0FBQTtTQUM3RTtRQUVELE1BQU0sSUFBQSx3QkFBTSxFQUFDLGFBQWEsQ0FBQyxDQUFBO1FBRTNCLE1BQU0sU0FBUyxHQUFHLFlBQVksVUFBVSw4QkFBOEIsT0FBTyxJQUFJLGFBQWEsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUMzRyxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFBO1FBQ3hELElBQUksTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLEVBQUU7WUFDckIsTUFBTSxJQUFJLEtBQUssQ0FBQyw0QkFBNEIsTUFBTSxDQUFDLE1BQU0sU0FBUyxhQUFhLEdBQUcsQ0FBQyxDQUFBO1NBQ3BGO1FBRUQsSUFBSSxlQUFlLEVBQUU7WUFDbkIsTUFBTSxrQkFBRyxDQUFDLEVBQUUsQ0FBQyxJQUFBLGdCQUFJLEVBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7U0FDL0Q7SUFDSCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLGlCQUFpQixHQUFHLElBQUksVUFBVSxFQUFFLENBQUE7QUFFN0IsUUFBQSxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQyxpQkFBaUIsQ0FBQTtBQUN2RCxRQUFBLFlBQVksR0FBRyxpQkFBaUIsQ0FBQyxZQUFZLENBQUEifQ==

package/dist/cjs/TarballUtility.d.ts

@@ -1,4 +1,5 @@
-import { whichSync } from './generalUtils.js';
+import fs from 'node:fs';
+import { mkdirp, spawnAsync, whichSync } from './generalUtils.js';
 export interface CreateTarballOptions {
     /**
      * A list of files or directories to exclude from the tarball.
@@ -7,16 +8,25 @@ export interface CreateTarballOptions {
     excludes?: string[];
 }
 export interface TarballUnpackOptions {
-    createDirIfNotExists?: boolean;
-    stripComponents?: number;
-    throwOnNonEmptyUnpackDir?: boolean;
+    createDirIfNotExists: boolean;
+    stripComponents: number;
+    throwOnNonEmptyUnpackDir: boolean;
+}
+export interface TarballUtilityDependencies {
+    whichSyncFn: typeof whichSync;
+    spawnAsyncFn: typeof spawnAsync;
+    statSyncFn: typeof fs.statSync;
+    mkdirpFn: typeof mkdirp;
 }
 /**
  * This utility class exists so we can mock the `which` dependency in unit tests without resorting to libraries that hack the import system.
  */
 export declare class TarballUtility {
     private whichSyncFn;
-    constructor(whichSyncFn: typeof whichSync);
+    private spawnAsyncFn;
+    private statSyncFn;
+    private mkdirpFn;
+    constructor(dependencies?: Partial<TarballUtilityDependencies>);
     /**
      * Creates a gzipped tarball from a directory by spawning a process to run OS-installed `tar` to avoid pulling in npm package dependencies.
      * Note that Windows has tar since Windows 10 1803 (see https://devblogs.microsoft.com/commandline/windows10v1803/.
@@ -35,7 +45,7 @@ export declare class TarballUtility {
      * @param unpackDirectory The directory to unpack the tarball into
      * @param options The options to use when unpacking the tarball. See {@link TarballUnpackOptions}.
      */
-    unpackTarball: (tarballPath: string, unpackDirectory: string, options?: TarballUnpackOptions) => Promise<void>;
+    unpackTarball: (tarballPath: string, unpackDirectory: string, options?: Partial<TarballUnpackOptions>) => Promise<void>;
     /**
      * A more opinionated version of {@link unpackTarball} that assumes you want to create the directory and strip the first directory out of the unpacked files.
      * @param tarballPath The path to the tarball to unpack
@@ -48,6 +58,6 @@ export declare class TarballUtility {
     private tryCreateDirectory;
 }
 export declare const createTarball: (directoryToTarball: string, tarballPath: string, options?: CreateTarballOptions) => Promise<void>;
-export declare const unpackTarball: (tarballPath: string, unpackDirectory: string, options?: TarballUnpackOptions) => Promise<void>;
+export declare const unpackTarball: (tarballPath: string, unpackDirectory: string, options?: Partial<TarballUnpackOptions>) => Promise<void>;
 export declare const unpackTarballContents: (tarballPath: string, unpackDirectory: string, stripComponents?: number) => Promise<void>;
 //# sourceMappingURL=TarballUtility.d.ts.map

package/dist/cjs/TarballUtility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TarballUtility.d.ts","sourceRoot":"","sources":["../../src/TarballUtility.ts"],"names":[],"mappings":"AAGA,OAAO,EAA8D,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGzG,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAkB;gBAEzB,WAAW,EAAE,OAAO,SAAS;IAIzC;;;;;;;;;OASG;IACH,aAAa,uBAA8B,MAAM,eAAe,MAAM,YAAY,oBAAoB,mBA4CrG;IAED;;;;;;OAMG;IACH,aAAa,gBAAuB,MAAM,mBAAmB,MAAM,YAAY,oBAAoB,mBA0ClG;IAED;;;;;OAKG;IACH,qBAAqB,gBAAuB,MAAM,mBAAmB,MAAM,oBAAmB,MAAM,mBAEnG;IAED,OAAO,CAAC,WAAW,CAOlB;IAED,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,kBAAkB,CAUzB;CACF;AAID,eAAO,MAAM,aAAa,uBA5ImB,MAAM,eAAe,MAAM,YAAY,oBAAoB,kBA4IlD,CAAA;AACtD,eAAO,MAAM,aAAa,gBAxFY,MAAM,mBAAmB,MAAM,YAAY,oBAAoB,kBAwF/C,CAAA;AACtD,eAAO,MAAM,qBAAqB,gBAvCY,MAAM,mBAAmB,MAAM,oBAAmB,MAAM,kBAuChC,CAAA"}
+{"version":3,"file":"TarballUtility.d.ts","sourceRoot":"","sources":["../../src/TarballUtility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AAExB,OAAO,EAAiB,MAAM,EAAmC,UAAU,EAAS,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGxH,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,oBAAoB,EAAE,OAAO,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAA;IACvB,wBAAwB,EAAE,OAAO,CAAA;CAClC;AAED,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,OAAO,SAAS,CAAA;IAC7B,YAAY,EAAE,OAAO,UAAU,CAAA;IAC/B,UAAU,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAA;IAC9B,QAAQ,EAAE,OAAO,MAAM,CAAA;CACxB;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,QAAQ,CAAe;gBAEnB,YAAY,GAAE,OAAO,CAAC,0BAA0B,CAAM;IAOlE;;;;;;;;;OASG;IACH,aAAa,uBAA8B,MAAM,eAAe,MAAM,YAAY,oBAAoB,mBAsCrG;IAED;;;;;;OAMG;IACH,aAAa,gBAAuB,MAAM,mBAAmB,MAAM,YAAY,QAAQ,oBAAoB,CAAC,mBA0C3G;IAED;;;;;OAKG;IACH,qBAAqB,gBAAuB,MAAM,mBAAmB,MAAM,oBAAmB,MAAM,mBAEnG;IAED,OAAO,CAAC,WAAW,CAQlB;IAED,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,kBAAkB,CAMzB;CACF;AAID,eAAO,MAAM,aAAa,uBAnImB,MAAM,eAAe,MAAM,YAAY,oBAAoB,kBAmIlD,CAAA;AACtD,eAAO,MAAM,aAAa,gBArFY,MAAM,mBAAmB,MAAM,YAAY,QAAQ,oBAAoB,CAAC,kBAqFxD,CAAA;AACtD,eAAO,MAAM,qBAAqB,gBApCY,MAAM,mBAAmB,MAAM,oBAAmB,MAAM,kBAoChC,CAAA"}

package/dist/cjs/TarballUtility.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unpackTarballContents = exports.unpackTarball = exports.createTarball = exports.TarballUtility = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
-const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const generalUtils_js_1 = require("./generalUtils.js");
 const NodeCliUtilsConfig_js_1 = require("./NodeCliUtilsConfig.js");
@@ -13,7 +12,8 @@ const NodeCliUtilsConfig_js_1 = require("./NodeCliUtilsConfig.js");
  * This utility class exists so we can mock the `which` dependency in unit tests without resorting to libraries that hack the import system.
  */
 class TarballUtility {
-    constructor(whichSyncFn) {
+    constructor(dependencies = {}) {
+        var _a, _b, _c, _d;
         /**
          * Creates a gzipped tarball from a directory by spawning a process to run OS-installed `tar` to avoid pulling in npm package dependencies.
          * Note that Windows has tar since Windows 10 1803 (see https://devblogs.microsoft.com/commandline/windows10v1803/.
@@ -32,28 +32,23 @@ class TarballUtility {
             if (!this.whichSyncFn('tar').location) {
                 throw new Error('tar command not found - please install tar on your OS to use this method, or consider using the npm package node-tar instead');
             }
-            if (!node_fs_1.default.existsSync(directoryToTarball)) {
-                throw new Error(`directoryToTarball does not exist: ${directoryToTarball}`);
-            }
             if (tarballPath.endsWith('.tar.gz') === false) {
                 throw new Error(`tarballPath must end with '.tar.gz': ${tarballPath}`);
             }
             const directoryToTarballParentDir = node_path_1.default.dirname(directoryToTarball);
             const directoryToTarballName = node_path_1.default.basename(directoryToTarball);
             const outputDirectory = node_path_1.default.dirname(tarballPath);
-            const tarballName = node_path_1.default.basename(tarballPath);
             if (!node_fs_1.default.existsSync(outputDirectory)) {
                 (0, generalUtils_js_1.trace)(`tarballPath directory does not exist - creating '${outputDirectory}'`);
-                await (0, generalUtils_js_1.mkdirp)(outputDirectory);
+                await this.mkdirpFn(outputDirectory);
             }
             else if (node_fs_1.default.existsSync(tarballPath)) {
-                (0, generalUtils_js_1.trace)(`removing existing tarball '${tarballName}' before creating new one`);
-                await promises_1.default.unlink(tarballPath);
+                throw new Error(`tarballPath already exists - delete, move or rename it first: ${tarballPath}`);
             }
             const excludesArgs = mergedOptions.excludes.length > 0 ? mergedOptions.excludes.map(exclude => `--exclude=${exclude}`) : [];
             const verboseFlag = NodeCliUtilsConfig_js_1.config.traceEnabled ? ['-v'] : [];
             const args = [...(verboseFlag), '-czf', tarballPath, '-C', directoryToTarballParentDir, ...excludesArgs, directoryToTarballName];
-            const result = await (0, generalUtils_js_1.spawnAsync)('tar', args);
+            const result = await this.spawnAsyncFn('tar', args);
             if (result.code !== 0) {
                 throw new Error(`tar command failed with code ${result.code}`);
             }
@@ -92,7 +87,7 @@ class TarballUtility {
             }
             const verboseFlag = NodeCliUtilsConfig_js_1.config.traceEnabled ? ['-v'] : [];
             const args = [...(verboseFlag), '-xzf', tarballPath, '-C', unpackDirectory, '--strip-components', mergedOptions.stripComponents.toString()];
-            const result = await (0, generalUtils_js_1.spawnAsync)('tar', args);
+            const result = await this.spawnAsyncFn('tar', args);
             if (result.code !== 0) {
                 throw new Error(`tar command failed with code ${result.code}`);
             }
@@ -109,41 +104,40 @@ class TarballUtility {
         };
         this.isDirectory = (path) => {
             try {
-                const stats = node_fs_1.default.statSync(path);
+                const stats = this.statSyncFn(path);
                 return stats.isDirectory();
             }
             catch (err) {
+                (0, generalUtils_js_1.trace)('error checking idDirectory (returning false)', err);
                 return false;
             }
         };
         this.dirIsNotEmpty = (dirPath) => {
             try {
-                const stats = node_fs_1.default.statSync(dirPath);
+                const stats = this.statSyncFn(dirPath);
                 return stats.isDirectory() && node_fs_1.default.readdirSync(dirPath).length > 0;
             }
             catch (err) {
-                return false;
+                throw new generalUtils_js_1.ExtendedError('Error checking dirIsNotEmpty - see innerError', err);
             }
         };
         this.tryCreateDirectory = async (dirPath) => {
             try {
-                await (0, generalUtils_js_1.mkdirp)(dirPath);
+                await this.mkdirpFn(dirPath);
             }
             catch (err) {
-                if (err instanceof Error) {
-                    throw new Error(`Error creating unpackDirectory: ${err.message}`);
-                }
-                else {
-                    throw new Error(`Error creating unpackDirectory: ${err}`);
-                }
+                throw new generalUtils_js_1.ExtendedError('Error creating unpackDirectory - see innerError', err);
             }
         };
-        this.whichSyncFn = whichSyncFn;
+        this.whichSyncFn = (_a = dependencies.whichSyncFn) !== null && _a !== void 0 ? _a : generalUtils_js_1.whichSync;
+        this.spawnAsyncFn = (_b = dependencies.spawnAsyncFn) !== null && _b !== void 0 ? _b : generalUtils_js_1.spawnAsync;
+        this.statSyncFn = (_c = dependencies.statSyncFn) !== null && _c !== void 0 ? _c : node_fs_1.default.statSync;
+        this.mkdirpFn = (_d = dependencies.mkdirpFn) !== null && _d !== void 0 ? _d : generalUtils_js_1.mkdirp;
     }
 }
 exports.TarballUtility = TarballUtility;
-const defaultUtil = new TarballUtility(generalUtils_js_1.whichSync);
+const defaultUtil = new TarballUtility();
 exports.createTarball = defaultUtil.createTarball;
 exports.unpackTarball = defaultUtil.unpackTarball;
 exports.unpackTarballContents = defaultUtil.unpackTarballContents;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFyYmFsbFV0aWxpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVGFyYmFsbFV0aWxpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsc0RBQXdCO0FBQ3hCLGdFQUFrQztBQUNsQywwREFBNEI7QUFDNUIsdURBQXlHO0FBQ3pHLG1FQUFnRDtBQWdCaEQ7O0dBRUc7QUFDSCxNQUFhLGNBQWM7SUFHekIsWUFBWSxXQUE2QjtRQUl6Qzs7Ozs7Ozs7O1dBU0c7UUFDSCxrQkFBYSxHQUFHLEtBQUssRUFBRSxrQkFBMEIsRUFBRSxXQUFtQixFQUFFLE9BQThCLEVBQUUsRUFBRTtZQUN4RyxJQUFBLGtDQUFnQixFQUFDLG9CQUFvQixFQUFFLGtCQUFrQixDQUFDLENBQUE7WUFDMUQsSUFBQSwrQkFBYSxFQUFDLGFBQWEsRUFBRSxXQUFXLENBQUMsQ0FBQTtZQUV6QyxNQUFNLGNBQWMsR0FBRyxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQTtZQUN2QyxNQUFNLGFBQWEsR0FBRyxFQUFFLEdBQUcsY0FBYyxFQUFFLEdBQUcsT0FBTyxFQUFFLENBQUE7WUFFdkQsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxFQUFFO2dCQUNyQyxNQUFNLElBQUksS0FBSyxDQUFDLDhIQUE4SCxDQUFDLENBQUE7YUFDaEo7WUFFRCxJQUFJLENBQUMsaUJBQUUsQ0FBQyxVQUFVLENBQUMsa0JBQWtCLENBQUMsRUFBRTtnQkFDdEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxzQ0FBc0Msa0JBQWtCLEVBQUUsQ0FBQyxDQUFBO2FBQzVFO1lBRUQsSUFBSSxXQUFXLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEtBQUssRUFBRTtnQkFDN0MsTUFBTSxJQUFJLEtBQUssQ0FBQyx3Q0FBd0MsV0FBVyxFQUFFLENBQUMsQ0FBQTthQUN2RTtZQUVELE1BQU0sMkJBQTJCLEdBQUcsbUJBQUks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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFyYmFsbFV0aWxpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVGFyYmFsbFV0aWxpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsc0RBQXdCO0FBQ3hCLDBEQUE0QjtBQUM1Qix1REFBd0g7QUFDeEgsbUVBQWdEO0FBdUJoRDs7R0FFRztBQUNILE1BQWEsY0FBYztJQU16QixZQUFZLGVBQW9ELEVBQUU7O1FBT2xFOzs7Ozs7Ozs7V0FTRztRQUNILGtCQUFhLEdBQUcsS0FBSyxFQUFFLGtCQUEwQixFQUFFLFdBQW1CLEVBQUUsT0FBOEIsRUFBRSxFQUFFO1lBQ3hHLElBQUEsa0NBQWdCLEVBQUMsb0JBQW9CLEVBQUUsa0JBQWtCLENBQUMsQ0FBQTtZQUMxRCxJQUFBLCtCQUFhLEVBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFBO1lBRXpDLE1BQU0sY0FBYyxHQUFHLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFBO1lBQ3ZDLE1BQU0sYUFBYSxHQUFHLEVBQUUsR0FBRyxjQUFjLEVBQUUsR0FBRyxPQUFPLEVBQUUsQ0FBQTtZQUV2RCxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxRQUFRLEVBQUU7Z0JBQ3JDLE1BQU0sSUFBSSxLQUFLLENBQUMsOEhBQThILENBQUMsQ0FBQTthQUNoSjtZQUVELElBQUksV0FBVyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsS0FBSyxLQUFLLEVBQUU7Z0JBQzdDLE1BQU0sSUFBSSxLQUFLLENBQUMsd0NBQXdDLFdBQVcsRUFBRSxDQUFDLENBQUE7YUFDdkU7WUFFRCxNQUFNLDJCQUEyQixHQUFHLG1CQUFJLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUE7WUFDcEUsTUFBTSxzQkFBc0IsR0FBRyxtQkFBSSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFBO1lBRWhFLE1BQU0sZUFBZSxHQUFHLG1CQUFJLENB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

package/dist/cjs/certUtils.d.ts

@@ -1,30 +1,66 @@
+/** Control what is logged when running certUtils functions. */
+export interface CertLogOptions {
+    logSpawnOutput: boolean;
+    logTraceMessages: boolean;
+    logElevatedPermissionsMessage: boolean;
+    logSuccess: boolean;
+}
+export interface GenerateCertOptions extends CertLogOptions {
+    /** The directory to write the generated cert files to. Defaults to `./cert`. */
+    outputDirectory: string;
+}
+/** Subject, thumbprint or path to the pfx file. Used with the {@link winUninstallCert} function. */
+export type CertIdentifier = string | {
+    thumbprint: string;
+} | {
+    pfxPath: string;
+};
+/** The subject or path to the pfx file. Used with the {@link winCertIsInstalled} function. */
+export type CertIdentifierWithoutThumbprint = string | {
+    pfxPath: string;
+};
+/** Cert info returned by {@link winGetPfxInfo}. */
+export type CertInfo = {
+    subject: string;
+    thumbprint: string;
+    pfxPath: string;
+};
 /**
  * Wrapper function for calling openssl to generate a self-signed cert to be used for developing a local website with trusted https.
  * @param url The url to generate a cert for. This will be used as the common name (CN) in the cert as well as the filename for the generated cert files.
- * @param outputDirectory The directory to write the generated cert files to. Defaults to './cert'.
+ * @param options Options for generating the cert.
+ * @returns The path to the generated pfx file.
  */
-export declare function generateCertWithOpenSsl(url: string, outputDirectory?: string): Promise<void>;
+export declare function generateCertWithOpenSsl(url: string, options?: Partial<GenerateCertOptions>): Promise<string>;
 /**
- * Uses Powershell to install a cert to the local machine's trusted root store. Must have admin permissions.
- *
- * If the cert is already installed, this method will do nothing.
- * @param urlOrCertFilename The url or cert filename to install. The url + '.pfx' or the cert filename passed must match a file that exists in the certDirectory.
- * @param certDirectory The directory to look for the cert file in. Defaults to './cert'.
+ * Uses Powershell to install a cert to the local machine's trusted root store. Must have elevated permissions.
+ * If the cert is already installed, this function will do nothing.
+ * @param pfxPath The path to the pfx file to install.
  */
-export declare function winInstallCert(urlOrCertFilename: string, certDirectory?: string): Promise<void>;
+export declare function winInstallCert(pfxPath: string, options?: Partial<CertLogOptions>): Promise<void>;
 /**
- * Uses Powershell to uninstall a cert from the local machine's trusted root store. Must have admin permissions.
- * @param urlOrSubject The url or subject of the cert to uninstall. If the cert was installed with the winInstallCert method, this will be the url passed to that method.
+ * Uses Powershell to check if a cert is already installed to the local machine's trusted root store.
+ * Uses the subject of the cert in order to avoid false negatives from regenerating the same self-signed cert
+ * with the same subject but different thumbprint. Note that this method is geared towards use with certs generated
+ * with the {@link generateCertWithOpenSsl} function, so this may not work using subject if your subject is not precisely "`CN=<url>`".
+ * @param identifier The subject or path to the pfx file of the cert to check.
+ * @returns `true` if the cert is already installed, `false` otherwise.
  */
-export declare function winUninstallCert(urlOrSubject: string): Promise<void>;
+export declare function winCertIsInstalled(identifier: CertIdentifierWithoutThumbprint, options?: Partial<CertLogOptions>): Promise<boolean>;
 /**
- * Does not actually do anything - just outputs the manual instructions for installing a cert for use by chrome on linux.
+ * Uses Powershell to uninstall a cert from the local machine's trusted root store. Must have elevated permissions.
+ * @param identifier The subject, thumbprint or path to the pfx file of the cert to uninstall.
+ * @param options Options for uninstalling the cert.
  */
-export declare function linuxInstallCert(): void;
+export declare function winUninstallCert(identifier: CertIdentifier, options?: Partial<CertLogOptions>): Promise<void>;
 /**
- * Uses Powershell to check if a cert is already installed to the local machine's trusted root store.
- * @param urlOrSubject The url or subject of the cert to check. If the cert was installed with the winInstallCert method, this will be the url passed to that method.
- * @returns `true` if the cert is already installed, `false` otherwise.
+ * Uses Powershell to get info about a cert.
+ * @param pfxPath The path to the pfx file to get info for.
+ * @returns The subject, thumbprint and pfxPath of the cert.
  */
-export declare function winCertAlreadyInstalled(urlOrSubject: string): Promise<boolean>;
+export declare function winGetPfxInfo(pfxPath: string): Promise<CertInfo>;
+/**
+ * Does not actually do anything - just outputs the manual instructions for installing a cert for use by chrome on linux.
+ */
+export declare function linuxInstallCert(): void;
 //# sourceMappingURL=certUtils.d.ts.map

package/dist/cjs/certUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"certUtils.d.ts","sourceRoot":"","sources":["../../src/certUtils.ts"],"names":[],"mappings":"AASA;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,GAAE,MAAiB,iBAuD5F;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,iBAAiB,EAAE,MAAM,EAAE,aAAa,SAAW,iBA8BvF;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,YAAY,EAAE,MAAM,iBAY1D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,SAU/B;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAmBpF"}
+{"version":3,"file":"certUtils.d.ts","sourceRoot":"","sources":["../../src/certUtils.ts"],"names":[],"mappings":"AAqBA,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,OAAO,CAAA;IACvB,gBAAgB,EAAE,OAAO,CAAA;IACzB,6BAA6B,EAAE,OAAO,CAAA;IACtC,UAAU,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACzD,gFAAgF;IAChF,eAAe,EAAE,MAAM,CAAA;CACxB;AASD,oGAAoG;AACpG,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAElF,8FAA8F;AAC9F,MAAM,MAAM,+BAA+B,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1E,mDAAmD;AACnD,MAAM,MAAM,QAAQ,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/E;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAkElH;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,iBAwBtF;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,+BAA+B,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAkCzI;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,iBA+BnG;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqBtE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,SAU/B"}