@kurtinatlanta/prettier 3.8.0-dev → 3.8.0-hoyt.1

package/index.mjs

@@ -7244,11 +7244,11 @@ var init_options6 = __esm({
 // src/main/plugins/builtin-plugins/utilities.js
 function toLazyLoadPlugin({
   name,
-  importPlugin: importPlugin2,
+  load,
   options: options7,
   languages,
-  parserNames,
-  printerNames
+  parsers: parserNames,
+  printers: printerNames
 }) {
   const plugin = { name };
   if (options7) {
@@ -7266,11 +7266,11 @@ function toLazyLoadPlugin({
         names.map((name2) => [
           name2,
           true ? async () => {
-            const loaded = await importPlugin2();
+            const loaded = await load();
             Object.assign(plugin, loaded);
             return loaded[property][name2];
           } : async () => {
-            const loaded = await importPlugin2();
+            const loaded = await load();
             plugin[property] = loaded[property];
             return loaded[property][name2];
           }
@@ -7280,6 +7280,9 @@ function toLazyLoadPlugin({
   }
   return plugin;
 }
+function toLazyLoadPlugins(...plugins2) {
+  return plugins2.map((plugin) => toLazyLoadPlugin(plugin));
+}
 var init_utilities = __esm({
   "src/main/plugins/builtin-plugins/utilities.js"() {
   }
@@ -7288,21 +7291,9 @@ var init_utilities = __esm({
 // src/main/plugins/builtin-plugins/production-plugins.js
 var production_plugins_exports = {};
 __export(production_plugins_exports, {
-  acorn: () => acorn,
-  angular: () => angular,
-  babel: () => babel,
-  estree: () => estree,
-  flow: () => flow,
-  glimmer: () => glimmer,
-  graphql: () => graphql,
-  html: () => html,
-  markdown: () => markdown,
-  meriyah: () => meriyah,
-  postcss: () => postcss,
-  typescript: () => typescript,
-  yaml: () => yaml
+  plugins: () => plugins
 });
-var acorn, angular, babel, estree, flow, glimmer, graphql, html, markdown, meriyah, postcss, typescript, yaml;
+var plugins;
 var init_production_plugins = __esm({
   "src/main/plugins/builtin-plugins/production-plugins.js"() {
     init_languages_evaluate();
@@ -7320,110 +7311,112 @@ var init_production_plugins = __esm({
     init_languages_evaluate8();
     init_options6();
     init_utilities();
-    acorn = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "acorn",
-      importPlugin: () => import("./plugins/acorn.mjs"),
-      parserNames: ["acorn", "espree"]
-    });
-    angular = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "angular",
-      importPlugin: () => import("./plugins/angular.mjs"),
-      parserNames: [
-        "__ng_action",
-        "__ng_binding",
-        "__ng_directive",
-        "__ng_interpolation"
-      ]
-    });
-    babel = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "babel",
-      importPlugin: () => import("./plugins/babel.mjs"),
-      parserNames: [
-        "__babel_estree",
-        "__js_expression",
-        "__ts_expression",
-        "__vue_event_binding",
-        "__vue_expression",
-        "__vue_ts_event_binding",
-        "__vue_ts_expression",
-        "babel",
-        "babel-flow",
-        "babel-ts",
-        "json",
-        "json-stringify",
-        "json5",
-        "jsonc"
-      ]
-    });
-    estree = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "estree",
-      importPlugin: () => import("./plugins/estree.mjs"),
-      options: options_default4,
-      languages: [...languages_evaluate_default6, ...languages_evaluate_default5],
-      printerNames: ["estree", "estree-json"]
-    });
-    flow = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "flow",
-      importPlugin: () => import("./plugins/flow.mjs"),
-      parserNames: ["flow"]
-    });
-    glimmer = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "glimmer",
-      importPlugin: () => import("./plugins/glimmer.mjs"),
-      languages: languages_evaluate_default3,
-      parserNames: ["glimmer"],
-      printerNames: ["glimmer"]
-    });
-    graphql = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "graphql",
-      importPlugin: () => import("./plugins/graphql.mjs"),
-      options: options_default2,
-      languages: languages_evaluate_default2,
-      parserNames: ["graphql"],
-      printerNames: ["graphql"]
-    });
-    html = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "html",
-      importPlugin: () => import("./plugins/html.mjs"),
-      options: options_default3,
-      languages: languages_evaluate_default4,
-      parserNames: ["angular", "html", "lwc", "mjml", "vue"],
-      printerNames: ["html"]
-    });
-    markdown = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "markdown",
-      importPlugin: () => import("./plugins/markdown.mjs"),
-      options: options_default5,
-      languages: languages_evaluate_default7,
-      parserNames: ["markdown", "mdx", "remark"],
-      printerNames: ["mdast"]
-    });
-    meriyah = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "meriyah",
-      importPlugin: () => import("./plugins/meriyah.mjs"),
-      parserNames: ["meriyah"]
-    });
-    postcss = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "postcss",
-      importPlugin: () => import("./plugins/postcss.mjs"),
-      options: options_default,
-      languages: languages_evaluate_default,
-      parserNames: ["css", "less", "scss"],
-      printerNames: ["postcss"]
-    });
-    typescript = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "typescript",
-      importPlugin: () => import("./plugins/typescript.mjs"),
-      parserNames: ["typescript"]
-    });
-    yaml = /* @__PURE__ */ toLazyLoadPlugin({
-      name: "yaml",
-      importPlugin: () => import("./plugins/yaml.mjs"),
-      options: options_default6,
-      languages: languages_evaluate_default8,
-      parserNames: ["yaml"],
-      printerNames: ["yaml"]
-    });
+    plugins = /* @__PURE__ */ toLazyLoadPlugins(
+      {
+        name: "acorn",
+        load: () => import("./plugins/acorn.mjs"),
+        parsers: ["acorn", "espree"]
+      },
+      {
+        name: "angular",
+        load: () => import("./plugins/angular.mjs"),
+        parsers: [
+          "__ng_action",
+          "__ng_binding",
+          "__ng_directive",
+          "__ng_interpolation"
+        ]
+      },
+      {
+        name: "babel",
+        load: () => import("./plugins/babel.mjs"),
+        parsers: [
+          "__babel_estree",
+          "__js_expression",
+          "__ts_expression",
+          "__vue_event_binding",
+          "__vue_expression",
+          "__vue_ts_event_binding",
+          "__vue_ts_expression",
+          "babel",
+          "babel-flow",
+          "babel-ts",
+          "json",
+          "json-stringify",
+          "json5",
+          "jsonc"
+        ]
+      },
+      {
+        name: "estree",
+        load: () => import("./plugins/estree.mjs"),
+        options: options_default4,
+        languages: [...languages_evaluate_default6, ...languages_evaluate_default5],
+        printers: ["estree", "estree-json"]
+      },
+      {
+        name: "flow",
+        load: () => import("./plugins/flow.mjs"),
+        parsers: ["flow"]
+      },
+      {
+        name: "glimmer",
+        load: () => import("./plugins/glimmer.mjs"),
+        languages: languages_evaluate_default3,
+        parsers: ["glimmer"],
+        printers: ["glimmer"]
+      },
+      {
+        name: "graphql",
+        load: () => import("./plugins/graphql.mjs"),
+        options: options_default2,
+        languages: languages_evaluate_default2,
+        parsers: ["graphql"],
+        printers: ["graphql"]
+      },
+      {
+        name: "html",
+        load: () => import("./plugins/html.mjs"),
+        options: options_default3,
+        languages: languages_evaluate_default4,
+        parsers: ["angular", "html", "lwc", "mjml", "vue"],
+        printers: ["html"]
+      },
+      {
+        name: "markdown",
+        load: () => import("./plugins/markdown.mjs"),
+        options: options_default5,
+        languages: languages_evaluate_default7,
+        parsers: ["markdown", "mdx", "remark"],
+        printers: ["mdast"]
+      },
+      {
+        name: "meriyah",
+        load: () => import("./plugins/meriyah.mjs"),
+        parsers: ["meriyah"]
+      },
+      {
+        name: "postcss",
+        load: () => import("./plugins/postcss.mjs"),
+        options: options_default,
+        languages: languages_evaluate_default,
+        parsers: ["css", "less", "scss"],
+        printers: ["postcss"]
+      },
+      {
+        name: "typescript",
+        load: () => import("./plugins/typescript.mjs"),
+        parsers: ["typescript"]
+      },
+      {
+        name: "yaml",
+        load: () => import("./plugins/yaml.mjs"),
+        options: options_default6,
+        languages: languages_evaluate_default8,
+        parsers: ["yaml"],
+        printers: ["yaml"]
+      }
+    );
   }
 });
 
@@ -7447,7 +7440,7 @@ var require_ignore = __commonJS({
     var SLASH = "/";
     var TMP_KEY_IGNORE = "node-ignore";
     if (typeof Symbol !== "undefined") {
-      TMP_KEY_IGNORE = Symbol.for("node-ignore");
+      TMP_KEY_IGNORE = /* @__PURE__ */ Symbol.for("node-ignore");
     }
     var KEY_IGNORE = TMP_KEY_IGNORE;
     var define = (object, key2, value) => {
@@ -7880,7 +7873,7 @@ var require_ignore = __commonJS({
     module.exports = factory;
     factory.default = factory;
     module.exports.isPathValid = isPathValid;
-    define(module.exports, Symbol.for("setupWindows"), setupWindows);
+    define(module.exports, /* @__PURE__ */ Symbol.for("setupWindows"), setupWindows);
   }
 });
 
@@ -8490,8 +8483,8 @@ var commonDeprecatedHandler = (keyOrPair, redirectTo, { descriptor }) => {
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 
 // node_modules/vnopts/lib/constants.js
-var VALUE_NOT_EXIST = Symbol.for("vnopts.VALUE_NOT_EXIST");
-var VALUE_UNCHANGED = Symbol.for("vnopts.VALUE_UNCHANGED");
+var VALUE_NOT_EXIST = /* @__PURE__ */ Symbol.for("vnopts.VALUE_NOT_EXIST");
+var VALUE_UNCHANGED = /* @__PURE__ */ Symbol.for("vnopts.VALUE_UNCHANGED");
 
 // node_modules/vnopts/lib/handlers/invalid/common.js
 var INDENTATION = " ".repeat(2);
@@ -10017,7 +10010,7 @@ var path2 = {
 };
 var sep = defaultPlatform === "win32" ? path2.win32.sep : path2.posix.sep;
 minimatch.sep = sep;
-var GLOBSTAR = Symbol("globstar **");
+var GLOBSTAR = /* @__PURE__ */ Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
 var qmark2 = "[^/]";
 var star2 = qmark2 + "*?";
@@ -15873,7 +15866,7 @@ function printCommentsSeparately(path17, options7) {
   if (!value) {
     return {};
   }
-  const ignored = options7[Symbol.for("printedComments")];
+  const ignored = options7[/* @__PURE__ */ Symbol.for("printedComments")];
   const comments = (value.comments || []).filter((comment) => !ignored.has(comment));
   if (comments.length === 0) {
     return {
@@ -15917,8 +15910,8 @@ function printComments(path17, doc2, options7) {
 }
 function ensureAllCommentsPrinted(options7) {
   const {
-    [Symbol.for("comments")]: comments,
-    [Symbol.for("printedComments")]: printedComments
+    [/* @__PURE__ */ Symbol.for("comments")]: comments,
+    [/* @__PURE__ */ Symbol.for("printedComments")]: printedComments
   } = options7;
   for (const comment of comments) {
     if (!comment.printed && !printedComments.has(comment)) {
@@ -16196,12 +16189,12 @@ var core_options_evaluate_default = {
 
 // src/main/support.js
 function getSupportInfo({
-  plugins = [],
+  plugins: plugins2 = [],
   showDeprecated = false
 } = {}) {
-  const languages = plugins.flatMap((plugin) => plugin.languages ?? []);
+  const languages = plugins2.flatMap((plugin) => plugin.languages ?? []);
   const options7 = [];
-  for (const option of normalizeOptionSettings(Object.assign({}, ...plugins.map(({
+  for (const option of normalizeOptionSettings(Object.assign({}, ...plugins2.map(({
     options: options8
   }) => options8), core_options_evaluate_default))) {
     if (!showDeprecated && option.deprecated) {
@@ -16212,10 +16205,10 @@ function getSupportInfo({
         option.choices = option.choices.filter((choice) => !choice.deprecated);
       }
       if (option.name === "parser") {
-        option.choices = [...option.choices, ...collectParsersFromLanguages(option.choices, languages, plugins)];
+        option.choices = [...option.choices, ...collectParsersFromLanguages(option.choices, languages, plugins2)];
       }
     }
-    option.pluginDefaults = Object.fromEntries(plugins.filter((plugin) => plugin.defaultOptions?.[option.name] !== void 0).map((plugin) => [plugin.name, plugin.defaultOptions[option.name]]));
+    option.pluginDefaults = Object.fromEntries(plugins2.filter((plugin) => plugin.defaultOptions?.[option.name] !== void 0).map((plugin) => [plugin.name, plugin.defaultOptions[option.name]]));
     options7.push(option);
   }
   return {
@@ -16223,14 +16216,14 @@ function getSupportInfo({
     options: options7
   };
 }
-function* collectParsersFromLanguages(parserChoices, languages, plugins) {
+function* collectParsersFromLanguages(parserChoices, languages, plugins2) {
   const existingParsers = new Set(parserChoices.map((choice) => choice.value));
   for (const language of languages) {
     if (language.parsers) {
       for (const parserName of language.parsers) {
         if (!existingParsers.has(parserName)) {
           existingParsers.add(parserName);
-          const plugin = plugins.find((plugin2) => plugin2.parsers && Object.prototype.hasOwnProperty.call(plugin2.parsers, parserName));
+          const plugin = plugins2.find((plugin2) => plugin2.parsers && Object.prototype.hasOwnProperty.call(plugin2.parsers, parserName));
           let description = language.name;
           if (plugin?.name) {
             description += ` (plugin: ${plugin.name})`;
@@ -16716,7 +16709,7 @@ var method_find_last_default = findLast;
 import { builders as __doc_builders2 } from "./doc.mjs";
 
 // src/main/front-matter/constants.js
-var FRONT_MATTER_MARK = Symbol.for("PRETTIER_IS_FRONT_MATTER");
+var FRONT_MATTER_MARK = /* @__PURE__ */ Symbol.for("PRETTIER_IS_FRONT_MATTER");
 var FRONT_MATTER_VISITOR_KEYS = [];
 
 // src/main/front-matter/is-front-matter.js
@@ -16801,14 +16794,14 @@ function createGetVisitorKeysFunction(printerGetVisitorKeys, supportFrontMatter)
 var create_get_visitor_keys_function_default = createGetVisitorKeysFunction;
 
 // src/main/parser-and-printer.js
-function getParserPluginByParserName(plugins, parserName) {
+function getParserPluginByParserName(plugins2, parserName) {
   if (!parserName) {
     throw new Error("parserName is required.");
   }
   const plugin = method_find_last_default(
     /* OPTIONAL_OBJECT: false */
     0,
-    plugins,
+    plugins2,
     (plugin2) => plugin2.parsers && Object.prototype.hasOwnProperty.call(plugin2.parsers, parserName)
   );
   if (plugin) {
@@ -16820,14 +16813,14 @@ function getParserPluginByParserName(plugins, parserName) {
   }
   throw new ConfigError(message);
 }
-function getPrinterPluginByAstFormat(plugins, astFormat) {
+function getPrinterPluginByAstFormat(plugins2, astFormat) {
   if (!astFormat) {
     throw new Error("astFormat is required.");
   }
   const plugin = method_find_last_default(
     /* OPTIONAL_OBJECT: false */
     0,
-    plugins,
+    plugins2,
     (plugin2) => plugin2.printers && Object.prototype.hasOwnProperty.call(plugin2.printers, astFormat)
   );
   if (plugin) {
@@ -16840,10 +16833,10 @@ function getPrinterPluginByAstFormat(plugins, astFormat) {
   throw new ConfigError(message);
 }
 function resolveParser({
-  plugins,
+  plugins: plugins2,
   parser
 }) {
-  const plugin = getParserPluginByParserName(plugins, parser);
+  const plugin = getParserPluginByParserName(plugins2, parser);
   return initParser(plugin, parser);
 }
 function initParser(plugin, parserName) {
@@ -16856,7 +16849,6 @@ async function initPrinter(plugin, astFormat) {
   return normalizePrinter(printer);
 }
 var normalizedPrinters = /* @__PURE__ */ new WeakMap();
-var PRINTER_NORMALIZED_MARK = Symbol("PRINTER_NORMALIZED_MARK");
 function normalizePrinter(printer) {
   if (normalizedPrinters.has(printer)) {
     return normalizedPrinters.get(printer);
@@ -17155,10 +17147,10 @@ async function textToDoc(text, partialNextOptions, parentOptions, printAstToDoc2
 function printIgnored(path17, options7, printPath, args) {
   const {
     originalText,
-    [Symbol.for("comments")]: comments,
+    [/* @__PURE__ */ Symbol.for("comments")]: comments,
     locStart,
     locEnd,
-    [Symbol.for("printedComments")]: printedComments
+    [/* @__PURE__ */ Symbol.for("printedComments")]: printedComments
   } = options7;
   const { node } = path17;
   const start = locStart(node);
@@ -17256,8 +17248,8 @@ function callPluginPrintFunction(path17, options7, printPath, args, embeds) {
 }
 async function prepareToPrint(ast, options7) {
   const comments = ast.comments ?? [];
-  options7[Symbol.for("comments")] = comments;
-  options7[Symbol.for("printedComments")] = /* @__PURE__ */ new Set();
+  options7[/* @__PURE__ */ Symbol.for("comments")] = comments;
+  options7[/* @__PURE__ */ Symbol.for("printedComments")] = /* @__PURE__ */ new Set();
   attachComments(ast, options7);
   const {
     printer: {
@@ -17545,7 +17537,7 @@ var {
   printDocToString: printDocToStringWithoutNormalizeOptions
 } = __doc_printer;
 var BOM = "\uFEFF";
-var CURSOR = Symbol("cursor");
+var CURSOR = /* @__PURE__ */ Symbol("cursor");
 async function coreFormat(originalText, opts2, addAlignmentSize = 0) {
   if (!originalText || originalText.trim().length === 0) {
     return {
@@ -17583,7 +17575,7 @@ async function coreFormat(originalText, opts2, addAlignmentSize = 0) {
     }
     result.formatted = trimmed + convertEndOfLineOptionToCharacter(opts2.endOfLine);
   }
-  const comments = opts2[Symbol.for("comments")];
+  const comments = opts2[/* @__PURE__ */ Symbol.for("comments")];
   if (opts2.cursorOffset >= 0) {
     let oldCursorRegionStart;
     let oldCursorRegionText;
@@ -17855,15 +17847,7 @@ var CATEGORY_GLOBAL = "Global";
 var CATEGORY_SPECIAL = "Special";
 
 // src/main/plugins/load-builtin-plugins.js
-var loadBuiltinPluginsWithoutCache = true ? async function() {
-  return Object.values(
-    await Promise.resolve().then(() => (init_production_plugins(), production_plugins_exports))
-  );
-} : async function() {
-  return Object.values(
-    await null
-  );
-};
+var loadBuiltinPluginsWithoutCache = true ? async () => (await Promise.resolve().then(() => (init_production_plugins(), production_plugins_exports))).plugins : async () => (await null).plugins;
 var cache2;
 function loadBuiltinPlugins() {
   return cache2 ?? (cache2 = loadBuiltinPluginsWithoutCache());
@@ -17918,8 +17902,8 @@ function clearCache2() {
 }
 
 // src/main/plugins/load-plugins.js
-function loadPlugins(plugins = []) {
-  return Promise.all(plugins.map((plugin) => loadPlugin(plugin)));
+function loadPlugins(plugins2 = []) {
+  return Promise.all(plugins2.map((plugin) => loadPlugin(plugin)));
 }
 var load_plugins_default = loadPlugins;
 
@@ -18017,9 +18001,9 @@ async function getParser(file, options7) {
   if (config?.parser) {
     return config.parser;
   }
-  let plugins = options7.plugins ?? config?.plugins ?? [];
-  plugins = (await Promise.all([load_builtin_plugins_default(), load_plugins_default(plugins)])).flat();
-  return infer_parser_default({ plugins }, { physicalFile: file });
+  let plugins2 = options7.plugins ?? config?.plugins ?? [];
+  plugins2 = (await Promise.all([load_builtin_plugins_default(), load_plugins_default(plugins2)])).flat();
+  return infer_parser_default({ plugins: plugins2 }, { physicalFile: file });
 }
 var get_file_info_default = getFileInfo;
 
@@ -18027,7 +18011,7 @@ var get_file_info_default = getFileInfo;
 import * as doc from "./doc.mjs";
 
 // src/main/version.evaluate.js
-var version_evaluate_default = "3.8.0-dev";
+var version_evaluate_default = "3.8.0-hoyt.1";
 
 // src/utilities/public.js
 var public_exports = {};
@@ -18278,13 +18262,13 @@ function isNextLineEmpty2(text, startIndex) {
 function withPlugins(fn, optionsArgumentIndex = 1) {
   return async (...args) => {
     const options7 = args[optionsArgumentIndex] ?? {};
-    const { plugins = [] } = options7;
+    const { plugins: plugins2 = [] } = options7;
     args[optionsArgumentIndex] = {
       ...options7,
       plugins: (await Promise.all([
         load_builtin_plugins_default(),
         // TODO: standalone version allow `plugins` to be `prettierPlugins` which is an object, should allow that too
-        load_plugins_default(plugins)
+        load_plugins_default(plugins2)
       ])).flat()
     };
     return fn(...args);

package/internal/experimental-cli.mjs

@@ -2147,7 +2147,7 @@ var init_constants_evaluate = __esm({
       "angular",
       "lwc"
     ];
-    PRETTIER_VERSION = "3.8.0-dev";
+    PRETTIER_VERSION = "3.8.0-hoyt.1";
   }
 });
 

package/internal/legacy-cli.mjs

@@ -1324,7 +1324,7 @@ var {
 // src/cli/options/create-minimist-options.js
 function createMinimistOptions(detailedOptions) {
   const booleanNames = [];
-  const stringNames = [];
+  const stringNames = ["_"];
   const defaultValues = {};
   for (const option of detailedOptions) {
     const { name, alias, type } = option;
@@ -1426,7 +1426,7 @@ function parseArgv(rawArguments, detailedOptions, logger, keys2) {
         return [option.forwardToApi || camelCase(key), value];
       })
     ),
-    _: normalized._?.map(String),
+    _: normalized._,
     get __raw() {
       return argv2;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kurtinatlanta/prettier",
-  "version": "3.8.0-dev",
+  "version": "3.8.0-hoyt.1",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.cjs",
   "repository": "kurtinatlanta/prettier",
@@ -205,6 +205,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "prepublishOnly": "node -e \"assert.equal(require('.').version, require('../..').version)\""
+    "prepublishOnly": "node -e \"assert.equal(require('.').version, require('..').version)\""
   }
 }