@hubspot/local-dev-lib 0.0.3 → 0.0.4

package/config/CLIConfiguration.d.ts

@@ -4,13 +4,11 @@ import { CLIOptions } from '../types/CLIOptions';
 import { LogCallbacksArg } from '../types/LogCallbacks';
 declare const validateLogCallbackKeys: readonly ["noConfig", "noConfigAccounts", "emptyAccountConfig", "noAccountId", "duplicateAccountIds", "duplicateAccountNames", "nameContainsSpaces"];
 declare class CLIConfiguration {
-    active: boolean;
     options: CLIOptions;
     useEnvConfig: boolean;
     config: CLIConfig | null;
-    constructor(options: CLIOptions);
-    setActive(isActive: boolean): void;
-    init(options: CLIOptions): void;
+    constructor();
+    init(options?: CLIOptions): void;
     load(): CLIConfig | null;
     configIsEmpty(): boolean;
     delete(): void;
@@ -22,7 +20,8 @@ declare class CLIConfiguration {
     getResolvedDefaultAccountForCWD(nameOrId: string | number): CLIAccount | null;
     getConfigAccountIndex(accountId: number): number;
     isAccountInConfig(nameOrId: string | number): boolean;
-    getEnv(nameOrId: string | number): string;
+    getAndLoadConfigIfNeeded(options?: CLIOptions): CLIConfig;
+    getEnv(nameOrId?: string | number): string;
     /**
      * @throws {Error}
      */
@@ -52,4 +51,5 @@ declare class CLIConfiguration {
      */
     updateAllowUsageTracking(isEnabled: boolean): CLIConfig | null;
 }
-export default CLIConfiguration;
+declare const _default: CLIConfiguration;
+export default _default;

package/config/CLIConfiguration.js

@@ -4,7 +4,7 @@ const logger_1 = require("../utils/logger");
 const standardErrors_1 = require("../errors/standardErrors");
 const environment_1 = require("./environment");
 const configFile_1 = require("./configFile");
-const text_1 = require("../utils/text");
+const text_1 = require("../lib/text");
 const constants_1 = require("../constants");
 const auth_1 = require("../constants/auth");
 const config_1 = require("../constants/config");
@@ -19,23 +19,17 @@ const validateLogCallbackKeys = [
     'nameContainsSpaces',
 ];
 class CLIConfiguration {
-    active;
     options;
     useEnvConfig;
     config;
-    constructor(options) {
-        this.active = false;
-        this.options = options || {};
+    constructor() {
+        this.options = {};
         this.useEnvConfig = false;
         this.config = null;
     }
-    setActive(isActive) {
-        this.active = isActive;
-    }
-    init(options) {
+    init(options = {}) {
         this.options = options;
         this.load();
-        this.active = true;
     }
     load() {
         if (this.options.useEnv) {
@@ -192,6 +186,12 @@ class CLIConfiguration {
     isAccountInConfig(nameOrId) {
         return (!!this.config && this.config.accounts && !!this.getAccountId(nameOrId));
     }
+    getAndLoadConfigIfNeeded(options) {
+        if (!this.config) {
+            this.init(options);
+        }
+        return this.config;
+    }
     getEnv(nameOrId) {
         const accountConfig = this.getAccount(nameOrId);
         if (accountConfig && accountConfig.accountId && accountConfig.env) {
@@ -389,4 +389,4 @@ class CLIConfiguration {
         return this.write();
     }
 }
-exports.default = CLIConfiguration;
+exports.default = new CLIConfiguration();

package/config/configFile.js

@@ -60,8 +60,7 @@ function parseConfig(configSource) {
         parsed = js_yaml_1.default.load(configSource);
     }
     catch (err) {
-        (0, logger_1.debug)(`${i18nKey}.errorParsing`);
-        (0, standardErrors_1.throwError)(err);
+        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.parsing`, {}, err);
     }
     return parsed;
 }

package/constants/extensions.d.ts

@@ -1 +1,2 @@
 export declare const ALLOWED_EXTENSIONS: Set<string>;
+export declare const MODULE_EXTENSION = "module";

package/constants/extensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALLOWED_EXTENSIONS = void 0;
+exports.MODULE_EXTENSION = exports.ALLOWED_EXTENSIONS = void 0;
 exports.ALLOWED_EXTENSIONS = new Set([
     'css',
     'js',
@@ -20,3 +20,4 @@ exports.ALLOWED_EXTENSIONS = new Set([
     'woff2',
     'graphql',
 ]);
+exports.MODULE_EXTENSION = 'module';

package/errors/fileSystemErrors.d.ts

@@ -1,2 +1,8 @@
-import { BaseError, FileSystemErrorContext } from '../types/Error';
+import { BaseError } from '../types/Error';
+type FileSystemErrorContext = {
+    filepath: string;
+    write?: boolean;
+    read?: boolean;
+};
 export declare function throwFileSystemError(error: BaseError, context: FileSystemErrorContext): void;
+export {};

package/errors/fileSystemErrors.js

@@ -5,7 +5,6 @@ const lang_1 = require("../utils/lang");
 const standardErrors_1 = require("./standardErrors");
 const i18nKey = 'errors.errorTypes.fileSystem';
 function throwFileSystemError(error, context) {
-    (0, standardErrors_1.debugErrorAndContext)(error, context);
     let fileAction = '';
     if (context.read) {
         fileAction = (0, lang_1.i18n)(`${i18nKey}.readAction`);
@@ -24,6 +23,6 @@ function throwFileSystemError(error, context) {
     if ((0, standardErrors_1.isSystemError)(error)) {
         message.push((0, lang_1.i18n)(`${i18nKey}.baseMessage`, { errorMessage: error.message }));
     }
-    throw new Error(message.join(' '));
+    throw new Error(message.join(' '), { cause: error });
 }
 exports.throwFileSystemError = throwFileSystemError;

package/errors/standardErrors.d.ts

@@ -1,9 +1,19 @@
-import { ErrorContext } from '../types/Error';
 import { BaseError } from '../types/Error';
 export declare function isSystemError(err: BaseError): boolean;
 export declare function isFatalError(err: BaseError): boolean;
-export declare function debugErrorAndContext(error: BaseError, context?: ErrorContext): void;
+/**
+ * @throws
+ */
 export declare function throwErrorWithMessage(identifier: string, interpolation?: {
     [key: string]: string | number;
-}): never;
-export declare function throwError(error: BaseError, context?: ErrorContext): never;
+}, cause?: BaseError): never;
+/**
+ * @throws
+ */
+export declare function throwTypeErrorWithMessage(identifier: string, interpolation?: {
+    [key: string]: string | number;
+}, cause?: BaseError): never;
+/**
+ * @throws
+ */
+export declare function throwError(error: BaseError): never;

package/errors/standardErrors.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throwError = exports.throwErrorWithMessage = exports.debugErrorAndContext = exports.isFatalError = exports.isSystemError = void 0;
+exports.throwError = exports.throwTypeErrorWithMessage = exports.throwErrorWithMessage = exports.isFatalError = exports.isSystemError = void 0;
 const HubSpotAuthError_1 = require("./HubSpotAuthError");
-const logger_1 = require("../utils/logger");
 const lang_1 = require("../utils/lang");
 function isSystemError(err) {
     return err.errno != null && err.code != null && err.syscall != null;
@@ -12,52 +11,57 @@ function isFatalError(err) {
     return err instanceof HubSpotAuthError_1.HubSpotAuthError;
 }
 exports.isFatalError = isFatalError;
-function debugErrorAndContext(error, context) {
-    if (error.name === 'StatusCodeError') {
-        const { statusCode, message, response } = error;
-        (0, logger_1.debug)('standardErrors.error', {
-            error: JSON.stringify({
-                statusCode,
-                message,
-                url: response.request.href,
-                method: response.request.method,
-                response: response.body,
-                headers: response.headers,
-            }),
-        });
-    }
-    else {
-        (0, logger_1.debug)('standardErrors.error', { error: JSON.stringify(error) });
+/**
+ * @throws
+ */
+function throwErrorWithMessage(identifier, interpolation, cause) {
+    const message = (0, lang_1.i18n)(`errors.${identifier}`, interpolation);
+    if (cause) {
+        throw new Error(message, { cause });
     }
-    (0, logger_1.debug)('standardErrors.context', { context: JSON.stringify(context) });
-}
-exports.debugErrorAndContext = debugErrorAndContext;
-function throwErrorWithMessage(identifier, interpolation) {
-    throw new Error((0, lang_1.i18n)(`errors.${identifier}`, interpolation));
+    throw new Error(message);
 }
 exports.throwErrorWithMessage = throwErrorWithMessage;
-function throwSystemError(error, context) {
-    debugErrorAndContext(error, context);
-    throwErrorWithMessage('errorTypes.standard.system', {
-        message: error.message,
+/**
+ * @throws
+ */
+function throwTypeErrorWithMessage(identifier, interpolation, cause) {
+    const message = (0, lang_1.i18n)(`errors.${identifier}`, interpolation);
+    if (cause) {
+        throw new TypeError(message, { cause });
+    }
+    throw new TypeError(message);
+}
+exports.throwTypeErrorWithMessage = throwTypeErrorWithMessage;
+function throwStatusCodeError(error) {
+    const { statusCode, message, response } = error;
+    const errorData = JSON.stringify({
+        statusCode,
+        message,
+        url: response.request.href,
+        method: response.request.method,
+        response: response.body,
+        headers: response.headers,
     });
+    throw new Error(errorData, { cause: error });
 }
-// formally logErrorInstance
-function throwError(error, context) {
-    debugErrorAndContext(error, context);
-    if (isSystemError(error)) {
-        throwSystemError(error, context);
+/**
+ * @throws
+ */
+function throwError(error) {
+    if (error.name === 'StatusCodeError') {
+        throwStatusCodeError(error);
     }
     else {
         // Error or Error subclass
         const name = error.name || 'Error';
-        const message = [(0, lang_1.i18n)('errors.errorTypes.standard.generic', { name })];
+        const message = [(0, lang_1.i18n)('errors.errorTypes.generic', { name })];
         [error.message, error.reason].forEach(msg => {
             if (msg) {
                 message.push(msg);
             }
         });
-        throw new Error(message.join(' '));
+        throw new Error(message.join(' '), { cause: error });
     }
 }
 exports.throwError = throwError;

package/{src/http → http}/requestOptions.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRequestOptions = exports.DEFAULT_USER_AGENT_HEADERS = void 0;
-const package_json_1 = require("../../package.json");
+const package_json_1 = require("../package.json");
 const CLIConfiguration_1 = __importDefault(require("../config/CLIConfiguration"));
 const urls_1 = require("../lib/urls");
 exports.DEFAULT_USER_AGENT_HEADERS = {

package/lib/archive.js

@@ -28,7 +28,6 @@ async function extractZip(name, zip) {
         });
     }
     catch (err) {
-        (0, logger_1.debug)('archive.extractZip.writeError');
         if (tmpZipPath || result.tmpDir) {
             (0, fileSystemErrors_1.throwFileSystemError)(err, {
                 filepath: tmpZipPath || result.tmpDir,
@@ -36,7 +35,7 @@ async function extractZip(name, zip) {
             });
         }
         else {
-            (0, standardErrors_1.throwError)(err);
+            (0, standardErrors_1.throwErrorWithMessage)('archive.extractZip.write', {}, err);
         }
         return result;
     }
@@ -47,8 +46,7 @@ async function extractZip(name, zip) {
         result.extractDir = tmpExtractPath;
     }
     catch (err) {
-        (0, logger_1.debug)('archive.extractZip.extractError');
-        (0, standardErrors_1.throwError)(err);
+        (0, standardErrors_1.throwErrorWithMessage)('archive.extractZip.extract', {}, err);
     }
     (0, logger_1.debug)('archive.extractZip.success');
     return result;

package/lib/path.d.ts

@@ -1,13 +1,10 @@
 /// <reference types="node" />
 import path from 'path';
 export declare function convertToUnixPath(_path: string): string;
-export declare function convertToImportPath(_path: string): string;
 export declare function convertToLocalFileSystemPath(_path: string): string;
 export declare function splitLocalPath(filepath: string, pathImplementation?: path.PlatformPath): Array<string>;
 export declare function splitHubSpotPath(filepath: string): Array<string>;
 export declare function getCwd(): string;
 export declare function getExt(filepath: string): string;
-export declare const getAllowedExtensions: () => Set<string>;
 export declare function isAllowedExtension(filepath: string): boolean;
 export declare function getAbsoluteFilePath(_path: string): string;
-export declare function isRelativePath(_path: string): boolean;

package/lib/path.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRelativePath = exports.getAbsoluteFilePath = exports.isAllowedExtension = exports.getAllowedExtensions = exports.getExt = exports.getCwd = exports.splitHubSpotPath = exports.splitLocalPath = exports.convertToLocalFileSystemPath = exports.convertToImportPath = exports.convertToUnixPath = void 0;
+exports.getAbsoluteFilePath = exports.isAllowedExtension = exports.getExt = exports.getCwd = exports.splitHubSpotPath = exports.splitLocalPath = exports.convertToLocalFileSystemPath = exports.convertToUnixPath = void 0;
 const path_1 = __importDefault(require("path"));
 const unixify_1 = __importDefault(require("unixify"));
 const extensions_1 = require("../constants/extensions");
@@ -15,14 +15,6 @@ function convertToWindowsPath(_path) {
     const rgx = new RegExp(`\\${path_1.default.posix.sep}`, 'g');
     return path_1.default.normalize(_path).replace(rgx, path_1.default.win32.sep);
 }
-// Converts a Win32 path to Posix, retaining the drive letter (ex. 'c:')
-function convertToImportPath(_path) {
-    if (path_1.default.sep === path_1.default.win32.sep) {
-        return _path.split(path_1.default.win32.sep).join(path_1.default.posix.sep);
-    }
-    return _path;
-}
-exports.convertToImportPath = convertToImportPath;
 function convertToLocalFileSystemPath(_path) {
     switch (path_1.default.sep) {
         case path_1.default.posix.sep:
@@ -81,21 +73,12 @@ function getExt(filepath) {
     return ext[0] === '.' ? ext.slice(1) : ext;
 }
 exports.getExt = getExt;
-const getAllowedExtensions = () => {
-    return extensions_1.ALLOWED_EXTENSIONS;
-};
-exports.getAllowedExtensions = getAllowedExtensions;
 function isAllowedExtension(filepath) {
     const ext = getExt(filepath);
-    const allowedExtensions = (0, exports.getAllowedExtensions)();
-    return allowedExtensions.has(ext);
+    return extensions_1.ALLOWED_EXTENSIONS.has(ext);
 }
 exports.isAllowedExtension = isAllowedExtension;
 function getAbsoluteFilePath(_path) {
     return path_1.default.resolve(getCwd(), _path);
 }
 exports.getAbsoluteFilePath = getAbsoluteFilePath;
-function isRelativePath(_path) {
-    return !path_1.default.isAbsolute(_path);
-}
-exports.isRelativePath = isRelativePath;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "dist/index.js",
     "repository": {
@@ -14,12 +14,12 @@
     "scripts": {
         "build": "tsc --rootDir . --outdir dist",
         "check-main": "branch=$(git rev-parse --abbrev-ref HEAD) && [ $branch = main ] || (echo 'Error: New release can only be published on main branch' && exit 1)",
-        "lint": "eslint --max-warnings=0 . && prettier --check src/**/*.ts",
+        "lint": "eslint --max-warnings=0 . && prettier --check ./**/*.ts",
         "local-dev": "yarn build && cd dist && yarn link && cd .. && tsc --watch --rootDir . --outdir dist",
         "_postinstall": "husky install",
         "prepack": "pinst --disable",
         "postpack": "pinst --enable",
-        "prettier:write": "prettier --write src/**/*.{js,json}",
+        "prettier:write": "prettier --write ./**/*.{js,json}",
         "pub": "cd dist && npm publish --tag latest && cd ..",
         "push": "git push --atomic origin main v$npm_package_version",
         "release:major": "yarn check-main && yarn version --major && yarn build && yarn pub && yarn push",
@@ -46,11 +46,11 @@
         "typescript": "^4.9.5"
     },
     "exports": {
-        ".": "./dist/lib/index.js",
-        "./cms": "./dist/lib/cms",
-        "./constants": "./dist/constants.js",
-        "./github": "./dist/lib/github.js",
-        "./path": "./dist/lib/path.js"
+        ".": "./lib/index.js",
+        "./cms": "./lib/cms",
+        "./constants": "./constants",
+        "./github": "./lib/github.js",
+        "./path": "./lib/path.js"
     },
     "dependencies": {
         "axios": "^1.3.5",

package/types/Config.d.ts

@@ -6,5 +6,5 @@ export interface CLIConfig {
     defaultMode?: string;
     httpTimeout?: number;
     env?: string;
-    test: number;
+    httpUseLocalhost?: boolean;
 }

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;