diff --git a/src/cli/constant.js b/src/cli/constant.js index e693e72f3..01104de49 100644 --- a/src/cli/constant.js +++ b/src/cli/constant.js @@ -1,7 +1,5 @@ import { outdent } from "outdent"; -import prettierInternal from "./prettier-internal.js"; - -const { coreOptions } = prettierInternal; +import { coreOptions } from "./prettier-internal.js"; const categoryOrder = [ coreOptions.CATEGORY_OUTPUT, diff --git a/src/cli/context.js b/src/cli/context.js index f9e0e8769..6fba7eeaf 100644 --- a/src/cli/context.js +++ b/src/cli/context.js @@ -1,14 +1,10 @@ -import prettierInternal from "./prettier-internal.js"; +import { getLast } from "./utils.js"; import getContextOptions from "./options/get-context-options.js"; import { parseArgv, parseArgvWithoutPlugins, } from "./options/parse-cli-arguments.js"; -const { - utils: { getLast }, -} = prettierInternal; - /** * @typedef {Object} Context * @property logger diff --git a/src/cli/format.js b/src/cli/format.js index 7aa1f00c8..6a42ba810 100644 --- a/src/cli/format.js +++ b/src/cli/format.js @@ -2,15 +2,12 @@ import { promises as fs } from "node:fs"; import path from "node:path"; import chalk from "chalk"; import prettier from "../index.js"; -import thirdParty from "../common/third-party.cjs"; -import prettierInternal from "./prettier-internal.js"; +import { getStdin } from "../common/third-party.cjs"; +import { createIgnorer, errors } from "./prettier-internal.js"; import { expandPatterns, fixWindowsSlashes } from "./expand-patterns.js"; import getOptionsForFile from "./options/get-options-for-file.js"; import isTTY from "./is-tty.js"; -const { getStdin } = thirdParty; -const { createIgnorer, errors } = prettierInternal; - let createTwoFilesPatch; async function diff(a, b) { if (!createTwoFilesPatch) { diff --git a/src/cli/index.js b/src/cli/index.js index 02a5c288d..4b4424739 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -7,12 +7,7 @@ import { createDetailedUsage, createUsage } from "./usage.js"; import { formatStdin, formatFiles } from "./format.js"; import logFileInfoOrDie from "./file-info.js"; import logResolvedConfigPathOrDie from "./find-config-path.js"; -import prettierInternal from "./prettier-internal.js"; -import { printToScreen } from "./utils.js"; - -const { - utils: { isNonEmptyArray }, -} = prettierInternal; +import { printToScreen, isNonEmptyArray } from "./utils.js"; async function run(rawArguments) { // Create a default level logger, so we can log errors during `logLevel` parsing diff --git a/src/cli/options/create-minimist-options.js b/src/cli/options/create-minimist-options.js index a9caf12af..b42d75dc8 100644 --- a/src/cli/options/create-minimist-options.js +++ b/src/cli/options/create-minimist-options.js @@ -1,8 +1,4 @@ -import prettierInternal from "../prettier-internal.js"; - -const { - utils: { partition }, -} = prettierInternal; +import { partition } from "../utils.js"; export default function createMinimistOptions(detailedOptions) { const [boolean, string] = partition( diff --git a/src/cli/options/get-context-options.js b/src/cli/options/get-context-options.js index 9feb59c8b..367bc1be0 100644 --- a/src/cli/options/get-context-options.js +++ b/src/cli/options/get-context-options.js @@ -1,16 +1,12 @@ import prettier from "../../index.js"; -import prettierInternal from "../prettier-internal.js"; +import { optionsHiddenDefaults } from "../prettier-internal.js"; import * as constant from "../constant.js"; +import { arrayify } from "../utils.js"; import { normalizeDetailedOptionMap, createDetailedOptionMap, } from "./option-map.js"; -const { - optionsModule, - utils: { arrayify }, -} = prettierInternal; - function getContextOptions(plugins, pluginSearchDirs) { const { options: supportOptions, languages } = prettier.getSupportInfo({ showDeprecated: true, @@ -27,7 +23,7 @@ function getContextOptions(plugins, pluginSearchDirs) { const detailedOptions = arrayify(detailedOptionMap, "name"); const apiDefaultOptions = { - ...optionsModule.hiddenDefaults, + ...optionsHiddenDefaults, ...Object.fromEntries( supportOptions .filter(({ deprecated }) => !deprecated) diff --git a/src/cli/options/get-options-for-file.js b/src/cli/options/get-options-for-file.js index 320daeff9..d4dcb3d2d 100644 --- a/src/cli/options/get-options-for-file.js +++ b/src/cli/options/get-options-for-file.js @@ -1,12 +1,10 @@ import dashify from "dashify"; import prettier from "../../index.js"; -import prettierInternal from "../prettier-internal.js"; +import { normalizeApiOptions } from "../prettier-internal.js"; import minimist from "./minimist.js"; import createMinimistOptions from "./create-minimist-options.js"; import normalizeCliOptions from "./normalize-cli-options.js"; -const { optionsNormalizer } = prettierInternal; - function getOptions(argv, detailedOptions) { return Object.fromEntries( detailedOptions @@ -117,7 +115,7 @@ async function getOptionsForFile(context, filepath) { ...applyConfigPrecedence( context, options && - optionsNormalizer.normalizeApiOptions(options, context.supportOptions, { + normalizeApiOptions(options, context.supportOptions, { logger: context.logger, }) ), diff --git a/src/cli/options/normalize-cli-options.js b/src/cli/options/normalize-cli-options.js index 46edd1a3e..6ebddee37 100644 --- a/src/cli/options/normalize-cli-options.js +++ b/src/cli/options/normalize-cli-options.js @@ -1,11 +1,9 @@ import chalk from "chalk"; import leven from "leven"; -import prettierInternal from "../prettier-internal.js"; - -const { optionsNormalizer } = prettierInternal; +import { normalizeCliOptions as prettierNormalizeCliOptions } from "../prettier-internal.js"; function normalizeCliOptions(options, optionInfos, opts) { - return optionsNormalizer.normalizeCliOptions(options, optionInfos, { + return prettierNormalizeCliOptions(options, optionInfos, { colorsModule: chalk, levenshteinDistance: leven, ...opts, diff --git a/src/cli/options/option-map.js b/src/cli/options/option-map.js index c897f0426..4cb2bbc07 100644 --- a/src/cli/options/option-map.js +++ b/src/cli/options/option-map.js @@ -1,7 +1,5 @@ import dashify from "dashify"; -import prettierInternal from "../prettier-internal.js"; - -const { coreOptions } = prettierInternal; +import { coreOptions } from "../prettier-internal.js"; function normalizeDetailedOption(name, option) { return { diff --git a/src/cli/prettier-internal.js b/src/cli/prettier-internal.js index 9d314a41a..ea9c07668 100644 --- a/src/cli/prettier-internal.js +++ b/src/cli/prettier-internal.js @@ -1,3 +1,19 @@ import prettier from "../index.js"; -export default prettier.__internal; +const { + errors, + coreOptions, + createIgnorer, + optionsHiddenDefaults, + normalizeApiOptions, + normalizeCliOptions, +} = prettier.__internal; + +export { + errors, + coreOptions, + createIgnorer, + optionsHiddenDefaults, + normalizeApiOptions, + normalizeCliOptions, +}; diff --git a/src/cli/utils.js b/src/cli/utils.js index b763e6166..84bee8d66 100644 --- a/src/cli/utils.js +++ b/src/cli/utils.js @@ -1,3 +1,8 @@ +import prettier from "../index.js"; + +const { arrayify, getLast, isNonEmptyArray, partition } = + prettier.__internal.utils; + // eslint-disable-next-line no-console const printToScreen = console.log.bind(console); @@ -36,4 +41,12 @@ function pick(object, keys) { return Object.fromEntries(entries); } -export { printToScreen, groupBy, pick }; +export { + arrayify, + getLast, + isNonEmptyArray, + partition, + printToScreen, + groupBy, + pick, +}; diff --git a/src/index.js b/src/index.js index c3034e93b..3d6f03d45 100644 --- a/src/index.js +++ b/src/index.js @@ -18,8 +18,11 @@ import languages from "./languages.js"; import * as errors from "./common/errors.js"; import * as coreOptions from "./main/core-options.js"; import createIgnorer from "./common/create-ignorer.js"; -import * as optionsModule from "./main/options.js"; -import * as optionsNormalizer from "./main/options-normalizer.js"; +import { hiddenDefaults as optionsHiddenDefaults } from "./main/options.js"; +import { + normalizeApiOptions, + normalizeCliOptions, +} from "./main/options-normalizer.js"; import arrayify from "./utils/arrayify.js"; import getLast from "./utils/get-last.js"; import partition from "./utils/partition.js"; @@ -97,8 +100,9 @@ const prettier = { errors, coreOptions, createIgnorer, - optionsModule, - optionsNormalizer, + optionsHiddenDefaults, + normalizeApiOptions, + normalizeCliOptions, utils: { arrayify, getLast,