@hubspot/local-dev-lib 0.0.9 → 0.0.11

package/config/config_DEPRECATED.d.ts

@@ -26,7 +26,7 @@ export declare function loadConfig(path?: string, options?: CLIOptions): CLIConf
 export declare function isTrackingAllowed(): boolean;
 export declare function getAndLoadConfigIfNeeded(options?: {}): Partial<CLIConfig_DEPRECATED>;
 export declare function findConfig(directory: string): string | null;
-export declare function getEnv(nameOrId: string | number): Environment;
+export declare function getEnv(nameOrId?: string | number): Environment;
 export declare function getAccountConfig(accountId: number | undefined): CLIAccount_DEPRECATED | undefined;
 export declare function getAccountId(nameOrId?: string | number): number | undefined;
 /**

package/config/index.d.ts

@@ -26,7 +26,7 @@ export declare function updateAllowUsageTracking(isEnabled: boolean): void;
 export declare function deleteConfigFile(): void;
 export declare function isConfigFlagEnabled(flag: keyof CLIConfig): boolean;
 export declare function isTrackingAllowed(): boolean;
-export declare function getEnv(nameOrId: string | number): import("../types/Config").Environment;
+export declare function getEnv(nameOrId?: string | number): import("../types/Config").Environment;
 export declare const getConfigAccounts: typeof config_DEPRECATED.getConfigAccounts;
 export declare const getConfigDefaultAccount: typeof config_DEPRECATED.getConfigDefaultAccount;
 export declare const getConfigAccountId: typeof config_DEPRECATED.getConfigAccountId;

package/errors/fileSystemErrors.d.ts

@@ -1,2 +1,5 @@
 import { BaseError, FileSystemErrorContext } from '../types/Error';
+/**
+ * @throws
+ */
 export declare function throwFileSystemError(error: BaseError, context: FileSystemErrorContext): void;

package/errors/fileSystemErrors.js

@@ -4,6 +4,9 @@ exports.throwFileSystemError = void 0;
 const lang_1 = require("../utils/lang");
 const standardErrors_1 = require("./standardErrors");
 const i18nKey = 'errors.fileSystemErrors';
+/**
+ * @throws
+ */
 function throwFileSystemError(error, context) {
     let fileAction = '';
     if (context.read) {

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/lib/cms/functions.js

@@ -10,10 +10,13 @@ const findup_sync_1 = __importDefault(require("findup-sync"));
 const path_2 = require("../path");
 const github_1 = require("../github");
 const logger_1 = require("../../utils/logger");
-const objectUtils_1 = require("../../utils/objectUtils");
 const standardErrors_1 = require("../../errors/standardErrors");
 const fileSystemErrors_1 = require("../../errors/fileSystemErrors");
 const i18nKey = 'lib.cms.functions';
+function isObjectOrFunction(value) {
+    const type = typeof value;
+    return value != null && (type === 'object' || type === 'function');
+}
 function createEndpoint(endpointMethod, filename) {
     return {
         method: endpointMethod || 'GET',
@@ -62,7 +65,7 @@ function updateExistingConfig(configFilePath, { endpointPath, endpointMethod, fu
             read: true,
         });
     }
-    if (!(0, objectUtils_1.isObject)(config)) {
+    if (!isObjectOrFunction(config)) {
         (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.updateExistingConfig.errors.configIsNotObjectError`, { configFilePath });
     }
     if (config.endpoints) {

package/lib/environment.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getValidEnv = void 0;
 const environments_1 = require("../constants/environments");
 function getValidEnv(env, maskedProductionValue) {
-    const prodValue = maskedProductionValue
+    const prodValue = typeof maskedProductionValue === 'string'
         ? maskedProductionValue
         : environments_1.ENVIRONMENTS.PROD;
     const returnVal = typeof env &&

package/lib/logging/logger.d.ts

@@ -30,7 +30,7 @@ export declare class Logger {
 }
 export declare function setLogger(logger: Logger): void;
 export declare function setLogLevel(level: number): void;
-export declare function shouldLog(level: number): number;
+export declare function shouldLog(level: number): boolean;
 export declare function getLogLevel(): number;
 export declare const logger: {
     error(...args: any[]): void;

package/lib/logging/logger.js

@@ -88,7 +88,7 @@ function setLogLevel(level) {
 }
 exports.setLogLevel = setLogLevel;
 function shouldLog(level) {
-    return currentLogLevel & level;
+    return !!(currentLogLevel & level);
 }
 exports.shouldLog = shouldLog;
 function getLogLevel() {

package/lib/text.d.ts

@@ -1 +1 @@
-export declare function commaSeparatedValues(arr: Array<string>, conjunction?: string, ifempty?: string): string;
+export declare function commaSeparatedValues(arr: Array<string>, conjunction?: null | string, ifempty?: string): string;

package/lib/trackUsage.d.ts

@@ -1 +1 @@
-export declare function trackUsage(eventName: string, eventClass: string, meta: {} | undefined, accountId: number): Promise<void>;
+export declare function trackUsage(eventName: string, eventClass: string, meta?: {}, accountId?: number): Promise<void>;

package/lib/trackUsage.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackUsage = void 0;
+const axios_1 = __importDefault(require("axios"));
+const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const logger_1 = require("../utils/logger");
 const http_1 = __importDefault(require("../http"));
 const config_1 = require("../config");
@@ -42,12 +44,13 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
         });
     }
     const env = (0, config_1.getEnv)(accountId);
-    (0, logger_1.debug)(`${i18nKey}.sendingEventUnauthenticated`);
-    http_1.default.post(accountId, {
+    const axiosConfig = (0, getAxiosConfig_1.getAxiosConfig)({
         env,
         url: path,
         data: usageEvent,
         resolveWithFullResponse: true,
     });
+    (0, logger_1.debug)(`${i18nKey}.sendingEventUnauthenticated`);
+    (0, axios_1.default)({ ...axiosConfig, method: 'post' });
 }
 exports.trackUsage = trackUsage;

package/lib/validate.js

@@ -7,8 +7,8 @@ exports.lint = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const extensions_1 = require("../constants/extensions");
 const validateHubl_1 = require("../api/validateHubl");
-const fs_1 = require("../lib/fs");
-const path_1 = require("../lib/path");
+const fs_1 = require("./fs");
+const path_1 = require("./path");
 async function lint(accountId, filepath, callback) {
     const stats = await fs_extra_1.default.stat(filepath);
     const files = stats.isDirectory() ? await (0, fs_1.walk)(filepath) : [filepath];

package/models/OAuth2Manager.js

@@ -20,7 +20,9 @@ class OAuth2Manager {
         this.writeTokenInfo = writeTokenInfo;
         this.refreshTokenRequest = null;
         this.account = account;
-        // NOTE: Potential issues by not using maskProductionValue = '' for env like in cli-lib
+        if (this.account.env) {
+            this.account.env = (0, environment_1.getValidEnv)(this.account.env, '');
+        }
     }
     async accessToken() {
         if (!this.account.auth.tokenInfo?.refreshToken) {

package/package.json

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

package/utils/objectUtils.d.ts

@@ -1,4 +1,4 @@
-export declare function isObject(value: object): boolean;
+export declare function isObject(item: any): any;
 export declare function mergeDeep(target: {
     [key: string]: any;
 }, ...sources: Array<{

package/utils/objectUtils.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeDeep = exports.isObject = void 0;
-function isObject(value) {
-    const type = typeof value;
-    return value != null && (type === 'object' || type === 'function');
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isObject(item) {
+    return item && typeof item === 'object' && !Array.isArray(item);
 }
 exports.isObject = isObject;
 function mergeDeep(