@redocly/openapi-core 1.0.0-beta.105 → 1.0.0-beta.108

package/lib/config/load.js

@@ -9,28 +9,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfig = exports.findConfig = exports.CONFIG_FILE_NAMES = exports.loadConfig = void 0;
+exports.createConfig = exports.getConfig = exports.findConfig = exports.CONFIG_FILE_NAMES = exports.loadConfig = void 0;
 const fs = require("fs");
 const path = require("path");
 const redocly_1 = require("../redocly");
 const utils_1 = require("../utils");
+const js_yaml_1 = require("../js-yaml");
 const config_1 = require("./config");
 const utils_2 = require("./utils");
 const config_resolvers_1 = require("./config-resolvers");
-function addConfigMetadata({ rawConfig, customExtends, configPath, }) {
+function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, }) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (customExtends !== undefined) {
-            rawConfig.lint = rawConfig.lint || {};
-            rawConfig.lint.extends = customExtends;
+            rawConfig.styleguide = rawConfig.styleguide || {};
+            rawConfig.styleguide.extends = customExtends;
         }
         else if (utils_1.isEmptyObject(rawConfig)) {
             // TODO: check if we can add recommended here. add message here?
-            // rawConfig.lint = { extends: ['recommended'], recommendedFallback: true };
+            // rawConfig.styleguide = { extends: ['recommended'], recommendedFallback: true };
         }
-        const redoclyClient = new redocly_1.RedoclyClient();
-        const tokens = yield redoclyClient.getTokens();
-        if (tokens.length) {
+        if (tokens === null || tokens === void 0 ? void 0 : tokens.length) {
             if (!rawConfig.resolve)
                 rawConfig.resolve = {};
             if (!rawConfig.resolve.http)
@@ -66,10 +65,13 @@ function loadConfig(configPath = findConfig(), customExtends, processRawConfig)
         if (typeof processRawConfig === 'function') {
             yield processRawConfig(rawConfig);
         }
-        return yield addConfigMetadata({
+        const redoclyClient = new redocly_1.RedoclyClient();
+        const tokens = yield redoclyClient.getTokens();
+        return addConfigMetadata({
             rawConfig,
             customExtends,
             configPath,
+            tokens,
         });
     });
 }
@@ -94,7 +96,7 @@ function getConfig(configPath = findConfig()) {
         if (!configPath || !utils_1.doesYamlFileExist(configPath))
             return {};
         try {
-            const rawConfig = ((yield utils_1.loadYaml(configPath)) || {});
+            const rawConfig = (yield utils_1.loadYaml(configPath)) || {};
             return utils_2.transformConfig(rawConfig);
         }
         catch (e) {
@@ -103,3 +105,9 @@ function getConfig(configPath = findConfig()) {
     });
 }
 exports.getConfig = getConfig;
+function createConfig(config, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return addConfigMetadata(Object.assign({ rawConfig: utils_2.transformConfig(typeof config === 'string' ? js_yaml_1.parseYaml(config) : config) }, options));
+    });
+}
+exports.createConfig = createConfig;

package/lib/config/minimal.d.ts

@@ -1,3 +1,3 @@
-import type { PluginLintConfig } from './types';
-declare const _default: PluginLintConfig;
+import type { PluginStyleguideConfig } from './types';
+declare const _default: PluginStyleguideConfig;
 export default _default;

package/lib/config/minimal.js

@@ -18,7 +18,7 @@ exports.default = {
         'operation-description': 'off',
         'operation-2xx-response': 'warn',
         'operation-4xx-response': 'off',
-        'assertions': 'warn',
+        assertions: 'warn',
         'operation-operationId': 'warn',
         'operation-summary': 'warn',
         'operation-operationId-unique': 'warn',
@@ -36,7 +36,7 @@ exports.default = {
     oas3_0Rules: {
         'no-invalid-media-type-examples': {
             severity: 'warn',
-            disallowAdditionalProperties: true,
+            allowAdditionalProperties: false,
         },
         'no-server-example.com': 'warn',
         'no-server-trailing-slash': 'error',
@@ -44,15 +44,16 @@ exports.default = {
         'no-example-value-and-externalValue': 'warn',
         'no-unused-components': 'warn',
         'no-undefined-server-variable': 'warn',
-        'no-servers-empty-enum': 'error',
+        'no-server-variables-empty-enum': 'error',
     },
     oas3_1Rules: {
+        'no-invalid-media-type-examples': 'warn',
         'no-server-example.com': 'warn',
         'no-server-trailing-slash': 'error',
         'no-empty-servers': 'warn',
         'no-example-value-and-externalValue': 'warn',
         'no-unused-components': 'warn',
         'no-undefined-server-variable': 'warn',
-        'no-servers-empty-enum': 'error',
+        'no-server-variables-empty-enum': 'error',
     },
 };

package/lib/config/recommended.d.ts

@@ -1,3 +1,3 @@
-import type { PluginLintConfig } from './types';
-declare const _default: PluginLintConfig;
+import type { PluginStyleguideConfig } from './types';
+declare const _default: PluginStyleguideConfig;
 export default _default;

package/lib/config/recommended.js

@@ -17,7 +17,7 @@ exports.default = {
         'path-parameters-defined': 'error',
         'operation-description': 'off',
         'operation-2xx-response': 'warn',
-        'assertions': 'warn',
+        assertions: 'warn',
         'operation-4xx-response': 'warn',
         'operation-operationId': 'warn',
         'operation-summary': 'error',
@@ -36,7 +36,7 @@ exports.default = {
     oas3_0Rules: {
         'no-invalid-media-type-examples': {
             severity: 'warn',
-            disallowAdditionalProperties: true,
+            allowAdditionalProperties: false,
         },
         'no-server-example.com': 'warn',
         'no-server-trailing-slash': 'error',
@@ -44,15 +44,16 @@ exports.default = {
         'no-example-value-and-externalValue': 'error',
         'no-unused-components': 'warn',
         'no-undefined-server-variable': 'error',
-        'no-servers-empty-enum': 'error',
+        'no-server-variables-empty-enum': 'error',
     },
     oas3_1Rules: {
+        'no-invalid-media-type-examples': 'warn',
         'no-server-example.com': 'warn',
         'no-server-trailing-slash': 'error',
         'no-empty-servers': 'error',
         'no-example-value-and-externalValue': 'error',
         'no-unused-components': 'warn',
         'no-undefined-server-variable': 'error',
-        'no-servers-empty-enum': 'error',
+        'no-server-variables-empty-enum': 'error',
     },
 };

package/lib/config/rules.d.ts

@@ -1,7 +1,7 @@
 import { RuleSet, OasVersion } from '../oas-types';
-import { LintConfig } from './config';
-export declare function initRules<T extends Function, P extends RuleSet<T>>(rules: P[], config: LintConfig, type: 'rules' | 'preprocessors' | 'decorators', oasVersion: OasVersion): {
-    severity: import("./types").RuleSeverity;
+import { StyleguideConfig } from './config';
+export declare function initRules<T extends Function, P extends RuleSet<T>>(rules: P[], config: StyleguideConfig, type: 'rules' | 'preprocessors' | 'decorators', oasVersion: OasVersion): {
+    severity: string;
     ruleId: string;
     visitor: any;
 }[];

package/lib/config/rules.js

@@ -28,7 +28,7 @@ function initRules(rules, config, type, oasVersion) {
             visitor: visitors, // note: actually it is only one visitor object
         };
     }))
-        .flatMap(visitor => visitor)
+        .flatMap((visitor) => visitor)
         .filter(utils_1.notUndefined);
 }
 exports.initRules = initRules;

package/lib/config/types.d.ts

@@ -10,7 +10,7 @@ export declare type PreprocessorConfig = PreprocessorSeverity | ({
     severity?: ProblemSeverity;
 } & Record<string, any>);
 export declare type DecoratorConfig = PreprocessorConfig;
-export declare type LintRawConfig = {
+export declare type StyleguideRawConfig = {
     plugins?: (string | Plugin)[];
     extends?: string[];
     doNotResolveExamples?: boolean;
@@ -28,7 +28,8 @@ export declare type LintRawConfig = {
     oas3_0Decorators?: Record<string, DecoratorConfig>;
     oas3_1Decorators?: Record<string, DecoratorConfig>;
 };
-export declare type ResolvedLintConfig = PluginLintConfig & {
+export declare type ApiStyleguideRawConfig = Omit<StyleguideRawConfig, 'plugins'>;
+export declare type ResolvedStyleguideConfig = PluginStyleguideConfig & {
     plugins?: Plugin[];
     recommendedFallback?: boolean;
     extends?: void | never;
@@ -51,13 +52,13 @@ export declare type CustomRulesConfig = {
 };
 export declare type Plugin = {
     id: string;
-    configs?: Record<string, PluginLintConfig>;
+    configs?: Record<string, PluginStyleguideConfig>;
     rules?: CustomRulesConfig;
     preprocessors?: PreprocessorsConfig;
     decorators?: DecoratorsConfig;
     typeExtension?: TypeExtensionsConfig;
 };
-export declare type PluginLintConfig = Omit<LintRawConfig, 'plugins' | 'extends'>;
+export declare type PluginStyleguideConfig = Omit<StyleguideRawConfig, 'plugins' | 'extends'>;
 export declare type ResolveHeader = {
     name: string;
     envVariable?: undefined;
@@ -83,33 +84,36 @@ export declare type Region = 'us' | 'eu';
 export declare type AccessTokens = {
     [region in Region]?: string;
 };
-export declare type DeprecatedRawConfig = {
+export declare type DeprecatedInRawConfig = {
     apiDefinitions?: Record<string, string>;
-    lint?: LintRawConfig;
-    resolve?: RawResolveConfig;
-    region?: Region;
+    lint?: StyleguideRawConfig;
     referenceDocs?: Record<string, any>;
+    apis?: Record<string, Api & DeprecatedInApi>;
 };
 export declare type Api = {
     root: string;
-    lint?: Omit<LintRawConfig, 'plugins'>;
-    'features.openapi'?: Record<string, any>;
-    'features.mockServer'?: Record<string, any>;
+    styleguide?: ApiStyleguideRawConfig;
+} & FeaturesConfig;
+export declare type DeprecatedInApi = {
+    lint?: ApiStyleguideRawConfig;
 };
-export declare type ResolvedApi = Omit<Api, 'lint'> & {
-    lint: Omit<ResolvedLintConfig, 'plugins'>;
+export declare type ResolvedApi = Omit<Api, 'styleguide'> & {
+    styleguide: ResolvedStyleguideConfig;
 };
 export declare type RawConfig = {
     apis?: Record<string, Api>;
-    lint?: LintRawConfig;
+    styleguide?: StyleguideRawConfig;
     resolve?: RawResolveConfig;
     region?: Region;
-    'features.openapi'?: Record<string, any>;
-    'features.mockServer'?: Record<string, any>;
     organization?: string;
-};
-export declare type ResolvedConfig = Omit<RawConfig, 'lint' | 'apis'> & {
-    lint: ResolvedLintConfig;
+} & FeaturesConfig;
+export declare type ResolvedConfig = Omit<RawConfig, 'apis' | 'styleguide'> & {
     apis: Record<string, ResolvedApi>;
+    styleguide: ResolvedStyleguideConfig;
+};
+declare type FeaturesConfig = {
+    'features.openapi'?: Record<string, any>;
+    'features.mockServer'?: Record<string, any>;
 };
 export declare type RulesFields = 'rules' | 'oas2Rules' | 'oas3_0Rules' | 'oas3_1Rules' | 'preprocessors' | 'oas2Preprocessors' | 'oas3_0Preprocessors' | 'oas3_1Preprocessors' | 'decorators' | 'oas2Decorators' | 'oas3_0Decorators' | 'oas3_1Decorators';
+export {};

package/lib/config/utils.d.ts

@@ -1,13 +1,13 @@
 import { Config } from './config';
-import type { Api, DeprecatedRawConfig, Plugin, RawConfig, RawResolveConfig, ResolveConfig, ResolvedLintConfig, RulesFields } from './types';
+import type { Api, DeprecatedInRawConfig, Plugin, RawConfig, RawResolveConfig, ResolveConfig, ResolvedStyleguideConfig, RulesFields } from './types';
 export declare function parsePresetName(presetName: string): {
     pluginId: string;
     configName: string;
 };
-export declare function transformApiDefinitionsToApis(apiDefinitions?: Record<string, string>): Record<string, Api>;
+export declare function transformApiDefinitionsToApis(apiDefinitions?: DeprecatedInRawConfig['apiDefinitions']): Record<string, Api> | undefined;
 export declare function prefixRules<T extends Record<string, any>>(rules: T, prefix: string): any;
-export declare function mergeExtends(rulesConfList: ResolvedLintConfig[]): Omit<ResolvedLintConfig, RulesFields> & Required<Pick<ResolvedLintConfig, RulesFields>>;
-export declare function getMergedConfig(config: Config, entrypointAlias?: string): Config;
-export declare function transformConfig(rawConfig: DeprecatedRawConfig | RawConfig): RawConfig;
+export declare function mergeExtends(rulesConfList: ResolvedStyleguideConfig[]): Omit<ResolvedStyleguideConfig, RulesFields> & Required<Pick<ResolvedStyleguideConfig, RulesFields>>;
+export declare function getMergedConfig(config: Config, apiName?: string): Config;
+export declare function transformConfig(rawConfig: DeprecatedInRawConfig & RawConfig): RawConfig;
 export declare function getResolveConfig(resolve?: RawResolveConfig): ResolveConfig;
 export declare function getUniquePlugins(plugins: Plugin[]): Plugin[];

package/lib/config/utils.js

@@ -12,9 +12,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniquePlugins = exports.getResolveConfig = exports.transformConfig = exports.getMergedConfig = exports.mergeExtends = exports.prefixRules = exports.transformApiDefinitionsToApis = exports.parsePresetName = void 0;
-const colorette_1 = require("colorette");
 const utils_1 = require("../utils");
 const config_1 = require("./config");
+const logger_1 = require("../logger");
 function parsePresetName(presetName) {
     if (presetName.indexOf('/') > -1) {
         const [pluginId, configName] = presetName.split('/');
@@ -25,14 +25,26 @@ function parsePresetName(presetName) {
     }
 }
 exports.parsePresetName = parsePresetName;
-function transformApiDefinitionsToApis(apiDefinitions = {}) {
-    let apis = {};
+function transformApiDefinitionsToApis(apiDefinitions) {
+    if (!apiDefinitions)
+        return undefined;
+    const apis = {};
     for (const [apiName, apiPath] of Object.entries(apiDefinitions)) {
         apis[apiName] = { root: apiPath };
     }
     return apis;
 }
 exports.transformApiDefinitionsToApis = transformApiDefinitionsToApis;
+function transformApis(legacyApis) {
+    if (!legacyApis)
+        return undefined;
+    const apis = {};
+    for (let _a of Object.entries(legacyApis)) {
+        const [apiName, _b] = _a, { lint } = _b, apiContent = __rest(_b, ["lint"]);
+        apis[apiName] = Object.assign({ styleguide: lint }, apiContent);
+    }
+    return apis;
+}
 function prefixRules(rules, prefix) {
     if (!prefix)
         return rules;
@@ -61,9 +73,9 @@ function mergeExtends(rulesConfList) {
         pluginPaths: [],
         extendPaths: [],
     };
-    for (let rulesConf of rulesConfList) {
+    for (const rulesConf of rulesConfList) {
         if (rulesConf.extends) {
-            throw new Error(`\`extends\` is not supported in shared configs yet: ${JSON.stringify(rulesConf, null, 2)}.`);
+            throw new Error(`'extends' is not supported in shared configs yet: ${JSON.stringify(rulesConf, null, 2)}.`);
         }
         Object.assign(result.rules, rulesConf.rules);
         Object.assign(result.oas2Rules, rulesConf.oas2Rules);
@@ -93,44 +105,49 @@ function mergeExtends(rulesConfList) {
     return result;
 }
 exports.mergeExtends = mergeExtends;
-function getMergedConfig(config, entrypointAlias) {
+function getMergedConfig(config, apiName) {
     var _a, _b, _c, _d, _e, _f;
     const extendPaths = [
-        ...Object.values(config.apis).map((api) => { var _a; return (_a = api === null || api === void 0 ? void 0 : api.lint) === null || _a === void 0 ? void 0 : _a.extendPaths; }),
-        (_b = (_a = config.rawConfig) === null || _a === void 0 ? void 0 : _a.lint) === null || _b === void 0 ? void 0 : _b.extendPaths,
+        ...Object.values(config.apis).map((api) => { var _a; return (_a = api === null || api === void 0 ? void 0 : api.styleguide) === null || _a === void 0 ? void 0 : _a.extendPaths; }),
+        (_b = (_a = config.rawConfig) === null || _a === void 0 ? void 0 : _a.styleguide) === null || _b === void 0 ? void 0 : _b.extendPaths,
     ]
         .flat()
-        .filter(Boolean);
+        .filter(utils_1.isTruthy);
     const pluginPaths = [
-        ...Object.values(config.apis).map((api) => { var _a; return (_a = api === null || api === void 0 ? void 0 : api.lint) === null || _a === void 0 ? void 0 : _a.pluginPaths; }),
-        (_d = (_c = config.rawConfig) === null || _c === void 0 ? void 0 : _c.lint) === null || _d === void 0 ? void 0 : _d.pluginPaths,
+        ...Object.values(config.apis).map((api) => { var _a; return (_a = api === null || api === void 0 ? void 0 : api.styleguide) === null || _a === void 0 ? void 0 : _a.pluginPaths; }),
+        (_d = (_c = config.rawConfig) === null || _c === void 0 ? void 0 : _c.styleguide) === null || _d === void 0 ? void 0 : _d.pluginPaths,
     ]
         .flat()
-        .filter(Boolean);
-    return entrypointAlias
-        ? new config_1.Config(Object.assign(Object.assign({}, config.rawConfig), { lint: Object.assign(Object.assign({}, (config.apis[entrypointAlias]
-                ? config.apis[entrypointAlias].lint
-                : config.rawConfig.lint)), { extendPaths,
-                pluginPaths }), 'features.openapi': Object.assign(Object.assign({}, config['features.openapi']), (_e = config.apis[entrypointAlias]) === null || _e === void 0 ? void 0 : _e['features.openapi']), 'features.mockServer': Object.assign(Object.assign({}, config['features.mockServer']), (_f = config.apis[entrypointAlias]) === null || _f === void 0 ? void 0 : _f['features.mockServer']) }), config.configFile)
+        .filter(utils_1.isTruthy);
+    return apiName
+        ? new config_1.Config(Object.assign(Object.assign({}, config.rawConfig), { styleguide: Object.assign(Object.assign({}, (config.apis[apiName]
+                ? config.apis[apiName].styleguide
+                : config.rawConfig.styleguide)), { extendPaths,
+                pluginPaths }), 'features.openapi': Object.assign(Object.assign({}, config['features.openapi']), (_e = config.apis[apiName]) === null || _e === void 0 ? void 0 : _e['features.openapi']), 'features.mockServer': Object.assign(Object.assign({}, config['features.mockServer']), (_f = config.apis[apiName]) === null || _f === void 0 ? void 0 : _f['features.mockServer']) }), config.configFile)
         : config;
 }
 exports.getMergedConfig = getMergedConfig;
-function transformConfig(rawConfig) {
-    if (rawConfig.apis && rawConfig.apiDefinitions) {
-        throw new Error("Do not use 'apiDefinitions' field. Use 'apis' instead.\n");
+function checkForDeprecatedFields(deprecatedField, updatedField, rawConfig) {
+    const isDeprecatedFieldInApis = rawConfig.apis &&
+        Object.values(rawConfig.apis).some((api) => api[deprecatedField]);
+    if (rawConfig[deprecatedField] && rawConfig[updatedField]) {
+        utils_1.showErrorForDeprecatedField(deprecatedField, updatedField);
     }
-    if (rawConfig['features.openapi'] &&
-        rawConfig.referenceDocs) {
-        throw new Error("Do not use 'referenceDocs' field. Use 'features.openapi' instead.\n");
+    if (rawConfig[deprecatedField] || isDeprecatedFieldInApis) {
+        utils_1.showWarningForDeprecatedField(deprecatedField, updatedField);
     }
-    const _a = rawConfig, { apiDefinitions, referenceDocs } = _a, rest = __rest(_a, ["apiDefinitions", "referenceDocs"]);
-    if (apiDefinitions) {
-        process.stderr.write(`The ${colorette_1.yellow('apiDefinitions')} field is deprecated. Use ${colorette_1.green('apis')} instead. Read more about this change: https://redocly.com/docs/api-registry/guides/migration-guide-config-file/#changed-properties\n`);
-    }
-    if (referenceDocs) {
-        process.stderr.write(`The ${colorette_1.yellow('referenceDocs')} field is deprecated. Use ${colorette_1.green('features.openapi')} instead. Read more about this change: https://redocly.com/docs/api-registry/guides/migration-guide-config-file/#changed-properties\n`);
+}
+function transformConfig(rawConfig) {
+    const migratedFields = [
+        ['apiDefinitions', 'apis'],
+        ['referenceDocs', 'features.openapi'],
+        ['lint', 'styleguide'], // TODO: update docs
+    ];
+    for (const [deprecatedField, updatedField] of migratedFields) {
+        checkForDeprecatedFields(deprecatedField, updatedField, rawConfig);
     }
-    return Object.assign({ 'features.openapi': referenceDocs, apis: transformApiDefinitionsToApis(apiDefinitions) }, rest);
+    const { apis, apiDefinitions, referenceDocs, lint } = rawConfig, rest = __rest(rawConfig, ["apis", "apiDefinitions", "referenceDocs", "lint"]);
+    return Object.assign({ 'features.openapi': referenceDocs, apis: transformApis(apis) || transformApiDefinitionsToApis(apiDefinitions), styleguide: lint }, rest);
 }
 exports.transformConfig = transformConfig;
 function getResolveConfig(resolve) {
@@ -152,7 +169,7 @@ function getUniquePlugins(plugins) {
             seen.add(p.id);
         }
         else if (p.id) {
-            process.stderr.write(`Duplicate plugin id "${colorette_1.yellow(p.id)}".\n`);
+            logger_1.logger.warn(`Duplicate plugin id "${logger_1.colorize.red(p.id)}".\n`);
         }
     }
     return results;

package/lib/decorators/common/registry-dependencies.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegistryDependencies = void 0;
 const redocly_1 = require("../../redocly");
 const RegistryDependencies = () => {
-    let registryDependencies = new Set();
+    const registryDependencies = new Set();
     return {
         DefinitionRoot: {
             leave(_, ctx) {

package/lib/decorators/common/remove-x-internal.js

@@ -51,8 +51,8 @@ const RemoveXInternal = ({ internalFlagProperty }) => {
         any: {
             enter: (node, ctx) => {
                 removeInternal(node, ctx);
-            }
-        }
+            },
+        },
     };
 };
 exports.RemoveXInternal = RemoveXInternal;

package/lib/env.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+export declare const isBrowser: boolean;
+export declare const env: NodeJS.ProcessEnv;

package/lib/env.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.env = exports.isBrowser = void 0;
+exports.isBrowser = 
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+typeof window !== 'undefined' || typeof self !== 'undefined' || typeof process === 'undefined'; // main and worker thread
+exports.env = exports.isBrowser ? {} : process.env || {};

package/lib/format/codeframes.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAstNodeByPointer = exports.getLineColLocation = exports.getCodeframe = void 0;
-const colorette_1 = require("colorette");
 const yamlAst = require("yaml-ast-parser");
 const ref_utils_1 = require("../ref-utils");
+const logger_1 = require("../logger");
 const MAX_LINE_LENGTH = 150;
 const MAX_CODEFRAME_LINES = 3;
 // TODO: temporary
@@ -11,7 +11,7 @@ function parsePointer(pointer) {
     return pointer.substr(2).split('/').map(ref_utils_1.unescapePointer);
 }
 function getCodeframe(location, color) {
-    colorette_1.options.enabled = color;
+    logger_1.colorOptions.enabled = color;
     const { start, end = { line: start.line, col: start.col + 1 }, source } = location;
     const lines = source.getLines();
     const startLineNum = start.line;
@@ -28,16 +28,22 @@ function getCodeframe(location, color) {
         const line = lines[i - 1] || '';
         if (line !== '')
             currentPad = padSize(line);
-        let startIdx = i === startLineNum ? start.col - 1 : currentPad;
-        let endIdx = i === endLineNum ? end.col - 1 : line.length;
-        prefixedLines.push([`${i}`, markLine(line, startIdx, endIdx, colorette_1.red)]);
+        const startIdx = i === startLineNum ? start.col - 1 : currentPad;
+        const endIdx = i === endLineNum ? end.col - 1 : line.length;
+        prefixedLines.push([`${i}`, markLine(line, startIdx, endIdx, logger_1.colorize.red)]);
         if (!color)
             prefixedLines.push(['', underlineLine(line, startIdx, endIdx)]);
     }
     if (skipLines > 0) {
-        prefixedLines.push([`…`, `${whitespace(currentPad)}${colorette_1.gray(`< ${skipLines} more lines >`)}`]);
+        prefixedLines.push([
+            `…`,
+            `${whitespace(currentPad)}${logger_1.colorize.gray(`< ${skipLines} more lines >`)}`,
+        ]);
         // print last line
-        prefixedLines.push([`${endLineNum}`, markLine(lines[endLineNum - 1], -1, end.col - 1, colorette_1.red)]);
+        prefixedLines.push([
+            `${endLineNum}`,
+            markLine(lines[endLineNum - 1], -1, end.col - 1, logger_1.colorize.red),
+        ]);
         if (!color)
             prefixedLines.push(['', underlineLine(lines[endLineNum - 1], -1, end.col - 1)]);
     }
@@ -48,7 +54,7 @@ function getCodeframe(location, color) {
         [`${endLineNum + 1}`, markLine(lines[endLineNum - 1 + 1])],
         [`${endLineNum + 2}`, markLine(lines[endLineNum - 1 + 2])],
     ]);
-    function markLine(line, startIdx = -1, endIdx = +Infinity, variant = colorette_1.gray) {
+    function markLine(line, startIdx = -1, endIdx = +Infinity, variant = logger_1.colorize.gray) {
         if (!color)
             return line;
         if (!line)
@@ -66,14 +72,14 @@ function printPrefixedLines(lines) {
     const padLen = Math.max(...existingLines.map(([prefix]) => prefix.length));
     const dedentLen = Math.min(...existingLines.map(([_, line]) => (line === '' ? Infinity : padSize(line))));
     return existingLines
-        .map(([prefix, line]) => colorette_1.gray(leftPad(padLen, prefix) + ' |') +
+        .map(([prefix, line]) => logger_1.colorize.gray(leftPad(padLen, prefix) + ' |') +
         (line ? ' ' + limitLineLength(line.substring(dedentLen)) : ''))
         .join('\n');
 }
 function limitLineLength(line, maxLen = MAX_LINE_LENGTH) {
     const overflowLen = line.length - maxLen;
     if (overflowLen > 0) {
-        const charsMoreText = colorette_1.gray(`...<${overflowLen} chars>`);
+        const charsMoreText = logger_1.colorize.gray(`...<${overflowLen} chars>`);
         return line.substring(0, maxLen - charsMoreText.length) + charsMoreText;
     }
     else {