@hubspot/local-dev-lib 0.0.3 → 0.0.5

package/types/Error.d.ts

@@ -5,13 +5,9 @@ export interface BaseError extends Error {
     code?: string | null;
     syscall?: string | null;
     reason?: string;
+    statusCode?: number;
 }
-export interface SystemError extends BaseError {
-    errno: number;
-    code: string;
-    syscall: string;
-}
-export interface StatusCodeError extends SystemError {
+export interface StatusCodeError extends BaseError {
     name: 'StatusCodeError';
     statusCode: number;
     message: string;
@@ -28,11 +24,8 @@ export interface StatusCodeError extends SystemError {
         };
     };
 }
-export type ErrorContext = {
-    accountId?: number;
-};
-export interface FileSystemErrorContext extends ErrorContext {
-    filepath?: string;
-    read?: boolean;
-    write?: boolean;
+export interface GithubError extends BaseError {
+    error: {
+        message?: string;
+    };
 }

package/utils/git.d.ts

@@ -1,3 +1,4 @@
+export declare function makeComparisonDir(filepath: string | null): string | null;
+export declare const getGitComparisonDir: () => string | null;
 export declare function isConfigPathInGitRepo(configPath: string): boolean;
 export declare function configFilenameIsIgnoredByGitignore(ignoreFiles: Array<string>, configPath: string): boolean;
-export declare function checkAndAddConfigToGitignore(configPath: string): void;

package/utils/git.js

@@ -3,51 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAndAddConfigToGitignore = exports.configFilenameIsIgnoredByGitignore = exports.isConfigPathInGitRepo = void 0;
+exports.configFilenameIsIgnoredByGitignore = exports.isConfigPathInGitRepo = exports.getGitComparisonDir = exports.makeComparisonDir = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = __importDefault(require("path"));
 const ignore_1 = __importDefault(require("ignore"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
-const config_1 = require("../constants/config");
-const standardErrors_1 = require("../errors/standardErrors");
-const GITIGNORE_FILE = '.gitignore';
 function makeComparisonDir(filepath) {
     if (typeof filepath !== 'string')
         return null;
     // Append sep to make comparisons easier e.g. 'foos'.startsWith('foo')
     return path_1.default.dirname(path_1.default.resolve(filepath)).toLowerCase() + path_1.default.sep;
 }
+exports.makeComparisonDir = makeComparisonDir;
 const getGitComparisonDir = () => makeComparisonDir((0, findup_sync_1.default)('.git'));
-// Get all .gitignore files since they can cascade down directory structures
-function getGitignoreFiles(configPath) {
-    const gitDir = getGitComparisonDir();
-    const files = [];
-    if (!gitDir) {
-        // Not in git
-        return files;
-    }
-    // Start findup from config dir
-    let cwd = configPath && path_1.default.dirname(configPath);
-    while (cwd) {
-        const ignorePath = (0, findup_sync_1.default)(GITIGNORE_FILE, { cwd });
-        const ignorePathComparisonDir = makeComparisonDir(ignorePath);
-        const gitComparisonDir = makeComparisonDir(gitDir);
-        if (ignorePath &&
-            ignorePathComparisonDir &&
-            gitComparisonDir &&
-            ignorePathComparisonDir.startsWith(gitComparisonDir)) {
-            const file = path_1.default.resolve(ignorePath);
-            files.push(file);
-            cwd = path_1.default.resolve(path_1.default.dirname(file) + '..');
-        }
-        else {
-            cwd = null;
-        }
-    }
-    return files;
-}
+exports.getGitComparisonDir = getGitComparisonDir;
 function isConfigPathInGitRepo(configPath) {
-    const gitDir = getGitComparisonDir();
+    const gitDir = (0, exports.getGitComparisonDir)();
     if (!gitDir)
         return false;
     const configDir = makeComparisonDir(configPath);
@@ -67,38 +38,3 @@ function configFilenameIsIgnoredByGitignore(ignoreFiles, configPath) {
     });
 }
 exports.configFilenameIsIgnoredByGitignore = configFilenameIsIgnoredByGitignore;
-function checkGitInclusion(configPath) {
-    const result = {
-        inGit: false,
-        configIgnored: false,
-        gitignoreFiles: [],
-    };
-    if (isConfigPathInGitRepo(configPath)) {
-        result.inGit = true;
-        result.gitignoreFiles = getGitignoreFiles(configPath);
-        if (configFilenameIsIgnoredByGitignore(result.gitignoreFiles, configPath)) {
-            // Found ignore statement in .gitignore that matches config filename
-            result.configIgnored = true;
-        }
-    }
-    return result;
-}
-function checkAndAddConfigToGitignore(configPath) {
-    try {
-        const { configIgnored, gitignoreFiles } = checkGitInclusion(configPath);
-        if (configIgnored)
-            return;
-        let gitignoreFilePath = gitignoreFiles && gitignoreFiles.length ? gitignoreFiles[0] : null;
-        if (!gitignoreFilePath) {
-            gitignoreFilePath = path_1.default.resolve(configPath, GITIGNORE_FILE);
-            (0, fs_extra_1.writeFileSync)(gitignoreFilePath, '');
-        }
-        const gitignoreContents = (0, fs_extra_1.readFileSync)(gitignoreFilePath).toString();
-        const updatedContents = `${gitignoreContents.trim()}\n\n# HubSpot config file\n${config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}\n`;
-        (0, fs_extra_1.writeFileSync)(gitignoreFilePath, updatedContents);
-    }
-    catch (e) {
-        throw (0, standardErrors_1.throwErrorWithMessage)('utils.git.configIgnore');
-    }
-}
-exports.checkAndAddConfigToGitignore = checkAndAddConfigToGitignore;

package/utils/lang.d.ts

@@ -1,3 +1,8 @@
+type InterpolationData = {
+    [identifier: string]: string | number;
+};
+export declare function interpolate(stringValue: string, interpolationData: InterpolationData): string;
 export declare function i18n(lookupDotNotation: string, options?: {
     [identifier: string]: string | number;
 }): string;
+export {};

package/utils/lang.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.i18n = void 0;
-const util_1 = require("util");
+exports.i18n = exports.interpolate = void 0;
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const js_yaml_1 = require("js-yaml");
-const interpolation_1 = require("./interpolation");
 const MISSING_LANGUAGE_DATA_PREFIX = '[Missing language data]';
 let locale = '';
 let languageObj;
@@ -21,7 +19,6 @@ function loadLanguageFromYaml() {
         // Fall back to using the default language file
         locale = languageFileExists ? nodeLocale : 'en';
         languageObj = (0, js_yaml_1.load)((0, fs_extra_1.readFileSync)((0, path_1.join)(__dirname, `../lang/${locale}.lyaml`), 'utf8'));
-        console.debug('Loaded language data: ', (0, util_1.inspect)(languageObj, true, 999, true));
     }
     catch (e) {
         throw new Error(`Error loading language data: ${e}`);
@@ -46,13 +43,41 @@ function getTextValue(lookupDotNotation) {
     }
     return textValue;
 }
+const delimiters = {
+    interpolation: {
+        start: '{{',
+        end: '}}',
+    },
+};
+function generateReplaceFn(matchedText, startIndex, replacementString) {
+    return function (currentStringValue) {
+        return `${currentStringValue.slice(0, startIndex)}${replacementString || ''}${currentStringValue.slice(startIndex + matchedText.length)}`;
+    };
+}
+function interpolate(stringValue, interpolationData) {
+    const interpolationIdentifierRegEx = new RegExp(`${delimiters.interpolation.start}(.*?)${delimiters.interpolation.end}`, 'g');
+    const replaceQueue = [];
+    let match;
+    // while & reduce necessary because RegExp.exec is stateful and only runs
+    // from beginning to end of string
+    while ((match = interpolationIdentifierRegEx.exec(stringValue)) != null) {
+        const { 0: matchedText, 1: rawIdentifier, index } = match;
+        const identifier = rawIdentifier.trim();
+        if (identifier) {
+            replaceQueue.unshift(generateReplaceFn(matchedText, index, interpolationData[identifier]));
+        }
+    }
+    const compiledString = replaceQueue.reduce((currentValue, replaceFn) => replaceFn(currentValue), stringValue);
+    return compiledString;
+}
+exports.interpolate = interpolate;
 function i18n(lookupDotNotation, options = {}) {
     if (typeof lookupDotNotation !== 'string') {
         throw new Error(`i18n must be passed a string value for lookupDotNotation, received ${typeof lookupDotNotation}`);
     }
     const textValue = getTextValue(lookupDotNotation);
     const shouldInterpolate = !textValue.startsWith(MISSING_LANGUAGE_DATA_PREFIX);
-    return shouldInterpolate ? (0, interpolation_1.interpolate)(textValue, options) : textValue;
+    return shouldInterpolate ? interpolate(textValue, options) : textValue;
 }
 exports.i18n = i18n;
 loadLanguageFromYaml();

package/errors/cmsFieldsJsErrors.d.ts

@@ -1,9 +0,0 @@
-import { ValueOf } from '../types/Utils';
-import { BaseError } from '../types/Error';
-export declare const FieldErrors: {
-    readonly IsNotFunction: "IsNotFunction";
-    readonly DoesNotReturnArray: "DoesNotReturnArray";
-};
-export declare function throwFieldsJsError(e: BaseError | ValueOf<typeof FieldErrors>, path: string, info?: {
-    returned?: string;
-}): void;

package/errors/cmsFieldsJsErrors.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.throwFieldsJsError = exports.FieldErrors = void 0;
-const standardErrors_1 = require("./standardErrors");
-const i18nKey = 'errorTypes.cmsFields';
-exports.FieldErrors = {
-    IsNotFunction: 'IsNotFunction',
-    DoesNotReturnArray: 'DoesNotReturnArray',
-};
-function throwFieldsJsError(e, path, info = {}) {
-    if (e instanceof SyntaxError ||
-        (typeof e === 'object' && e.code === 'MODULE_NOT_FOUND')) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.syntaxError`, { path });
-    }
-    if (e === exports.FieldErrors.IsNotFunction) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.notFunction`, {
-            path,
-            returned: info.returned || '',
-        });
-    }
-    if (e === exports.FieldErrors.DoesNotReturnArray) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.notReturnArray`, {
-            path,
-            returned: info.returned || '',
-        });
-    }
-    if (typeof e === 'object' && e.code === 'ENOENT') {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.invalidPath`, { path });
-    }
-}
-exports.throwFieldsJsError = throwFieldsJsError;

package/index.d.ts

@@ -1,2 +0,0 @@
-import { extractZipArchive as __extractZipArchive } from './lib/archive';
-export declare const extractZipArchive: typeof __extractZipArchive;

package/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractZipArchive = void 0;
-const archive_1 = require("./lib/archive");
-exports.extractZipArchive = archive_1.extractZipArchive;

package/src/config/CLIConfiguration.d.ts

@@ -1,55 +0,0 @@
-import { CLIConfig } from '../types/Config';
-import { CLIAccount, FlatAccountFields, OauthTokenInfo } from '../types/Accounts';
-import { CLIOptions } from '../types/CLIOptions';
-import { LogCallbacksArg } from '../types/LogCallbacks';
-declare const validateLogCallbackKeys: readonly ["noConfig", "noConfigAccounts", "emptyAccountConfig", "noAccountId", "duplicateAccountIds", "duplicateAccountNames", "nameContainsSpaces"];
-declare class CLIConfiguration {
-    options: CLIOptions;
-    useEnvConfig: boolean;
-    config: CLIConfig | null;
-    constructor();
-    init(options?: CLIOptions): void;
-    load(): CLIConfig | null;
-    configIsEmpty(): boolean;
-    delete(): void;
-    write(updatedConfig?: CLIConfig): CLIConfig | null;
-    validate(logCallbacks?: LogCallbacksArg<typeof validateLogCallbackKeys>): boolean;
-    getAccount(nameOrId: string | number | undefined): CLIAccount | null;
-    getAccountId(nameOrId: string | number): number | null;
-    getDefaultAccount(): string | number | null;
-    getResolvedDefaultAccountForCWD(nameOrId: string | number): CLIAccount | null;
-    getConfigAccountIndex(accountId: number): number;
-    isAccountInConfig(nameOrId: string | number): boolean;
-    getAndLoadConfigIfNeeded(options?: CLIOptions): CLIConfig;
-    getEnv(nameOrId?: string | number): string;
-    /**
-     * @throws {Error}
-     */
-    updateAccount(updatedAccountFields: FlatAccountFields<OauthTokenInfo>, writeUpdate?: boolean): CLIAccount | null;
-    /**
-     * @throws {Error}
-     */
-    updateDefaultAccount(defaultAccount: string | number): CLIConfig | null;
-    /**
-     * @throws {Error}
-     */
-    renameAccount(currentName: string, newName: string): void;
-    /**
-     * @throws {Error}
-     */
-    removeAccountFromConfig(nameOrId: string | number): boolean;
-    /**
-     * @throws {Error}
-     */
-    updateDefaultMode(defaultMode: string): CLIConfig | null;
-    /**
-     * @throws {Error}
-     */
-    updateHttpTimeout(timeout: string): CLIConfig | null;
-    /**
-     * @throws {Error}
-     */
-    updateAllowUsageTracking(isEnabled: boolean): CLIConfig | null;
-}
-declare const _default: CLIConfiguration;
-export default _default;