@kubb/core 4.1.3 → 4.1.4

package/dist/mocks.d.cts

@@ -1,6 +1,6 @@
-import { File, ResolvedFile } from "./index-Bglrijef.cjs";
+import { File, ResolvedFile } from "./index-CWX6_-da.cjs";
 import { Logger } from "./logger-OWS6fqk0.cjs";
-import { PluginManager } from "./PluginManager-C62HGihR.cjs";
+import { PluginManager } from "./PluginManager-a3RiDAFC.cjs";
 
 //#region src/mocks/index.d.ts
 declare const mockedLogger: Logger;

package/dist/mocks.d.ts

@@ -1,6 +1,6 @@
-import { File, ResolvedFile } from "./index-3smcdUnJ.js";
+import { File, ResolvedFile } from "./index-CGJ3tdk-.js";
 import { Logger } from "./logger-B-4AXUmB.js";
-import { PluginManager } from "./PluginManager-H8G0i6KS.js";
+import { PluginManager } from "./PluginManager-BSUDeUfP.js";
 
 //#region src/mocks/index.d.ts
 declare const mockedLogger: Logger;

package/dist/mocks.js

@@ -1,9 +1,9 @@
 import { __export as __export$2 } from "./chunk-kPDogv7o.js";
-import "./fs-B7JGYSzW.js";
+import "./fs-BNC5Fj6t.js";
 import "./write-O9QWtBJ_.js";
-import { camelCase, pascalCase } from "./transformers-j70QaKtD.js";
-import { createFile, getSource } from "./FileManager-CkRuIf5a.js";
-import { r9 } from "./typescript-CKDlnZSX.js";
+import { camelCase, pascalCase } from "./transformers-BllSzdDt.js";
+import { createFile, getSource } from "./FileManager-B0V0rX5Z.js";
+import { r9 } from "./typescript-C8iCxnaF.js";
 import path from "node:path";
 import { builtinModules, createRequire } from "module";
 import * as url from "url";
@@ -124,14 +124,14 @@ function traverseDoc$1(doc, onEnter, onExit, shouldTraverseConditionalGroups) {
 			case DOC_TYPE_ARRAY$1:
 			case DOC_TYPE_FILL$1: {
 				const parts = docType === DOC_TYPE_ARRAY$1 ? doc2 : doc2.parts;
-				for (let i = parts.length - 1; i >= 0; --i) docsStack.push(parts[i]);
+				for (let ic = parts.length, i = ic - 1; i >= 0; --i) docsStack.push(parts[i]);
 				break;
 			}
 			case DOC_TYPE_IF_BREAK$1:
 				docsStack.push(doc2.flatContents, doc2.breakContents);
 				break;
 			case DOC_TYPE_GROUP$1:
-				if (shouldTraverseConditionalGroups && doc2.expandedStates) for (let i = doc2.expandedStates.length - 1; i >= 0; --i) docsStack.push(doc2.expandedStates[i]);
+				if (shouldTraverseConditionalGroups && doc2.expandedStates) for (let ic = doc2.expandedStates.length, i = ic - 1; i >= 0; --i) docsStack.push(doc2.expandedStates[i]);
 				else docsStack.push(doc2.contents);
 				break;
 			case DOC_TYPE_ALIGN$1:
@@ -796,10 +796,11 @@ function printDocToString$1(doc, options) {
 								});
 								break;
 							} else {
+								const state = doc2.expandedStates[i];
 								const cmd = {
 									ind,
 									mode: MODE_FLAT$1,
-									doc: doc2.expandedStates[i]
+									doc: state
 								};
 								if (fits$1(cmd, cmds, rem, hasLineSuffix, groupModeMap)) {
 									cmds.push(cmd);
@@ -1019,7 +1020,8 @@ var public_default = public_exports$1;
 //#endregion
 //#region ../../node_modules/.pnpm/prettier@3.6.2/node_modules/prettier/index.mjs
 const require = createRequire(import.meta.url);
-dirname(fileURLToPath(import.meta.url));
+const __filename = fileURLToPath(import.meta.url);
+dirname(__filename);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1995,7 +1997,7 @@ var require_parse = __commonJS({ "node_modules/braces/lib/parse.js"(exports, mod
 			}
 			if (value === CHAR_LEFT_CURLY_BRACE) {
 				depth++;
-				block = push2({
+				const brace = {
 					type: "brace",
 					open: true,
 					close: false,
@@ -2004,7 +2006,8 @@ var require_parse = __commonJS({ "node_modules/braces/lib/parse.js"(exports, mod
 					commas: 0,
 					ranges: 0,
 					nodes: []
-				});
+				};
+				block = push2(brace);
 				stack2.push(block);
 				push2({
 					type: "open",
@@ -2160,6 +2163,12 @@ var require_constants2 = __commonJS({ "node_modules/micromatch/node_modules/pico
 	var END_ANCHOR = `(?:${SLASH_LITERAL}|$)`;
 	var START_ANCHOR = `(?:^|${SLASH_LITERAL})`;
 	var DOTS_SLASH = `${DOT_LITERAL}{1,2}${END_ANCHOR}`;
+	var NO_DOT = `(?!${DOT_LITERAL})`;
+	var NO_DOTS = `(?!${START_ANCHOR}${DOTS_SLASH})`;
+	var NO_DOT_SLASH = `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`;
+	var NO_DOTS_SLASH = `(?!${DOTS_SLASH})`;
+	var QMARK_NO_DOT = `[^.${SLASH_LITERAL}]`;
+	var STAR = `${QMARK}*?`;
 	var POSIX_CHARS = {
 		DOT_LITERAL,
 		PLUS_LITERAL,
@@ -2169,12 +2178,12 @@ var require_constants2 = __commonJS({ "node_modules/micromatch/node_modules/pico
 		QMARK,
 		END_ANCHOR,
 		DOTS_SLASH,
-		NO_DOT: `(?!${DOT_LITERAL})`,
-		NO_DOTS: `(?!${START_ANCHOR}${DOTS_SLASH})`,
-		NO_DOT_SLASH: `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`,
-		NO_DOTS_SLASH: `(?!${DOTS_SLASH})`,
-		QMARK_NO_DOT: `[^.${SLASH_LITERAL}]`,
-		STAR: `${QMARK}*?`,
+		NO_DOT,
+		NO_DOTS,
+		NO_DOT_SLASH,
+		NO_DOTS_SLASH,
+		QMARK_NO_DOT,
+		STAR,
 		START_ANCHOR
 	};
 	var WINDOWS_CHARS = {
@@ -2336,7 +2345,9 @@ var require_utils2 = __commonJS({ "node_modules/micromatch/node_modules/picomatc
 		return output;
 	};
 	exports.wrapOutput = (input, state = {}, options8 = {}) => {
-		let output = `${options8.contains ? "" : "^"}(?:${input})${options8.contains ? "" : "$"}`;
+		const prepend = options8.contains ? "" : "^";
+		const append = options8.contains ? "" : "$";
+		let output = `${prepend}(?:${input})${append}`;
 		if (state.negated === true) output = `(?:^(?!${output}).*$)`;
 		return output;
 	};
@@ -2848,7 +2859,8 @@ var require_parse2 = __commonJS({ "node_modules/micromatch/node_modules/picomatc
 						if (inner.includes(":")) {
 							const idx = prev.value.lastIndexOf("[");
 							const pre = prev.value.slice(0, idx);
-							const posix = POSIX_REGEX_SOURCE[prev.value.slice(idx + 2)];
+							const rest2 = prev.value.slice(idx + 2);
+							const posix = POSIX_REGEX_SOURCE[rest2];
 							if (posix) {
 								prev.value = pre + posix;
 								state.backtrack = true;
@@ -3374,7 +3386,8 @@ var require_parse2 = __commonJS({ "node_modules/micromatch/node_modules/picomatc
 				}
 			}
 		};
-		let source2 = create(utils$1.removePrefix(input, state));
+		const output = utils$1.removePrefix(input, state);
+		let source2 = create(output);
 		if (source2 && opts.strictSlashes !== true) source2 += `${SLASH_LITERAL}?`;
 		return source2;
 	};
@@ -4211,7 +4224,8 @@ var require_async2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/provider
 				callSuccessCallback(callback, entries);
 				return;
 			}
-			rpl(entries.map((entry) => makeRplTaskEntry(entry, settings)), (rplError, rplEntries) => {
+			const tasks = entries.map((entry) => makeRplTaskEntry(entry, settings));
+			rpl(tasks, (rplError, rplEntries) => {
 				if (rplError !== null) {
 					callFailureCallback(callback, rplError);
 					return;
@@ -4247,7 +4261,7 @@ var require_async2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/provider
 				callFailureCallback(callback, readdirError);
 				return;
 			}
-			rpl(names.map((name) => {
+			const tasks = names.map((name) => {
 				const path14 = common.joinPathSegments(directory, name, settings.pathSegmentSeparator);
 				return (done) => {
 					fsStat.stat(path14, settings.fsStatSettings, (error, stats) => {
@@ -4264,7 +4278,8 @@ var require_async2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/provider
 						done(null, entry);
 					});
 				};
-			}), (rplError, entries) => {
+			});
+			rpl(tasks, (rplError, entries) => {
 				if (rplError !== null) {
 					callFailureCallback(callback, rplError);
 					return;
@@ -5164,7 +5179,8 @@ var require_deep = __commonJS({ "node_modules/fast-glob/out/providers/filters/de
 		_getEntryLevel(basePath, entryPath) {
 			const entryPathDepth = entryPath.split("/").length;
 			if (basePath === "") return entryPathDepth;
-			return entryPathDepth - basePath.split("/").length;
+			const basePathDepth = basePath.split("/").length;
+			return entryPathDepth - basePathDepth;
 		}
 		_isSkippedSymbolicLink(entry) {
 			return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
@@ -5652,10 +5668,12 @@ var require_constants4 = __commonJS({ "node_modules/semver/internal/constants.js
 	var SEMVER_SPEC_VERSION = "2.0.0";
 	var MAX_LENGTH = 256;
 	var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+	var MAX_SAFE_COMPONENT_LENGTH = 16;
+	var MAX_SAFE_BUILD_LENGTH = MAX_LENGTH - 6;
 	module.exports = {
 		MAX_LENGTH,
-		MAX_SAFE_COMPONENT_LENGTH: 16,
-		MAX_SAFE_BUILD_LENGTH: MAX_LENGTH - 6,
+		MAX_SAFE_COMPONENT_LENGTH,
+		MAX_SAFE_BUILD_LENGTH,
 		MAX_SAFE_INTEGER,
 		RELEASE_TYPES: [
 			"major",
@@ -7529,7 +7547,8 @@ var require_src = __commonJS({ "node_modules/editorconfig/src/index.js"(exports)
 				var glob = section[0];
 				var options22 = section[1];
 				if (!glob) return;
-				if (!fnmatch(filepath, buildFullGlob(pathPrefix, glob))) return;
+				var fullGlob = buildFullGlob(pathPrefix, glob);
+				if (!fnmatch(filepath, fullGlob)) return;
 				matches = extendProps(matches, options22);
 			});
 			return matches;
@@ -7621,7 +7640,9 @@ var require_src = __commonJS({ "node_modules/editorconfig/src/index.js"(exports)
 	function parseSync(_filepath, _options) {
 		if (_options === void 0) _options = {};
 		var _a = opts(_filepath, _options), resolvedFilePath = _a[0], processedOptions = _a[1];
-		return parseFromConfigs(getConfigsForFiles(readConfigFilesSync(getConfigFileNames(resolvedFilePath, processedOptions))), resolvedFilePath, processedOptions);
+		var filepaths = getConfigFileNames(resolvedFilePath, processedOptions);
+		var files = readConfigFilesSync(filepaths);
+		return parseFromConfigs(getConfigsForFiles(files), resolvedFilePath, processedOptions);
 	}
 	exports.parseSync = parseSync;
 } });
@@ -8844,8 +8865,10 @@ var require_lib2 = __commonJS({ "node_modules/@babel/code-frame/lib/index.js"(ex
 		if (lineDiff2) for (let i = 0; i <= lineDiff2; i++) {
 			const lineNumber = i + startLine;
 			if (!startColumn) markerLines[lineNumber] = true;
-			else if (i === 0) markerLines[lineNumber] = [startColumn, source2[lineNumber - 1].length - startColumn + 1];
-			else if (i === lineDiff2) markerLines[lineNumber] = [0, endColumn];
+			else if (i === 0) {
+				const sourceLength = source2[lineNumber - 1].length;
+				markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
+			} else if (i === lineDiff2) markerLines[lineNumber] = [0, endColumn];
 			else markerLines[lineNumber] = [0, source2[lineNumber - i].length];
 		}
 		else if (startColumn === endColumn) if (startColumn) markerLines[startLine] = [startColumn, 0];
@@ -8860,7 +8883,8 @@ var require_lib2 = __commonJS({ "node_modules/@babel/code-frame/lib/index.js"(ex
 	function codeFrameColumns3(rawLines, loc, opts = {}) {
 		const shouldHighlight = opts.forceColor || isColorSupported() && opts.highlightCode;
 		const defs = getDefs(shouldHighlight);
-		const { start, end, markerLines } = getMarkerLines(loc, rawLines.split(NEWLINE), opts);
+		const lines = rawLines.split(NEWLINE);
+		const { start, end, markerLines } = getMarkerLines(loc, lines, opts);
 		const hasColumns = loc.start && typeof loc.start.column === "number";
 		const numberMaxWidth = String(end).length;
 		let frame = (shouldHighlight ? highlight(rawLines) : rawLines).split(NEWLINE, end).slice(start, end).map((line3, index2) => {
@@ -9053,7 +9077,8 @@ var require_ignore = __commonJS({ "node_modules/ignore/index.js"(exports, module
 		}],
 		[/\\\/\\\*\\\*(?=\\\/|$)/g, (_, index, str) => index + 6 < str.length ? "(?:\\/[^\\/]+)*" : "\\/.+"],
 		[/(^|[^\\]+)(\\\*)+(?=.+)/g, (_, p1, p2) => {
-			return p1 + p2.replace(/\\\*/g, "[^\\/]*");
+			const unescaped = p2.replace(/\\\*/g, "[^\\/]*");
+			return p1 + unescaped;
 		}],
 		[/\\\\\\(?=[$.|*+(){^])/g, () => ESCAPE],
 		[/\\\\/g, () => ESCAPE],
@@ -9485,7 +9510,8 @@ function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, ne
 	else {
 		const { callback } = optionsObj;
 		diffLines(oldStr, newStr, Object.assign(Object.assign({}, optionsObj), { callback: (diff) => {
-			callback(diffLinesResultToPatch(diff));
+			const patch = diffLinesResultToPatch(diff);
+			callback(patch);
 		} }));
 	}
 	function diffLinesResultToPatch(diff) {
@@ -10378,8 +10404,10 @@ function clearEditorconfigCache() {
 	editorconfigCache.clear();
 }
 async function loadEditorconfigInternal(file, { shouldCache }) {
-	const root2 = await findProjectRoot(path10.dirname(file), { shouldCache });
-	return editorconfig_to_prettier_default(await import_editorconfig.default.parse(file, { root: root2 }));
+	const directory = path10.dirname(file);
+	const root2 = await findProjectRoot(directory, { shouldCache });
+	const editorConfig = await import_editorconfig.default.parse(file, { root: root2 });
+	return editorconfig_to_prettier_default(editorConfig);
 }
 function loadEditorconfig(file, { shouldCache }) {
 	file = path10.resolve(file);
@@ -11886,7 +11914,7 @@ async function loadConfigFromPackageYaml(file) {
 var parseYaml;
 async function loadYaml(file) {
 	const content = await read_file_default(file);
-	if (!parseYaml) ({__parsePrettierYamlConfig: parseYaml} = await import("./yaml-BMiF8MYP.js"));
+	if (!parseYaml) ({__parsePrettierYamlConfig: parseYaml} = await import("./yaml-Bi_nSoU_.js"));
 	try {
 		return parseYaml(content);
 	} catch (error) {
@@ -12358,7 +12386,8 @@ function getFileProtocolModuleFormat(url3, _context, ignoreErrors) {
 	const format3 = extensionFormatMap[value];
 	if (format3) return format3;
 	if (ignoreErrors) return;
-	throw new ERR_UNKNOWN_FILE_EXTENSION(value, fileURLToPath(url3));
+	const filepath = fileURLToPath(url3);
+	throw new ERR_UNKNOWN_FILE_EXTENSION(value, filepath);
 }
 function getHttpProtocolModuleFormat() {}
 function defaultGetFormatWithoutErrors(url3, context) {
@@ -12498,7 +12527,8 @@ function exportsNotFound(subpath, packageJsonUrl, base) {
 	return new ERR_PACKAGE_PATH_NOT_EXPORTED(fileURLToPath(new URL$1(".", packageJsonUrl)), subpath, base && fileURLToPath(base));
 }
 function throwInvalidSubpath(request, match, packageJsonUrl, internal, base) {
-	throw new ERR_INVALID_MODULE_SPECIFIER(request, `request is not a valid match in pattern "${match}" for the "${internal ? "imports" : "exports"}" resolution of ${fileURLToPath(packageJsonUrl)}`, base && fileURLToPath(base));
+	const reason = `request is not a valid match in pattern "${match}" for the "${internal ? "imports" : "exports"}" resolution of ${fileURLToPath(packageJsonUrl)}`;
+	throw new ERR_INVALID_MODULE_SPECIFIER(request, reason, base && fileURLToPath(base));
 }
 function invalidPackageTarget(subpath, target, packageJsonUrl, internal, base) {
 	target = typeof target === "object" && target !== null ? JSON.stringify(target, null, "") : `${target}`;
@@ -12513,14 +12543,18 @@ function resolvePackageTargetString(target, subpath, match, packageJsonUrl, base
 				new URL$1(target);
 				isURL2 = true;
 			} catch {}
-			if (!isURL2) return packageResolve(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target + subpath, packageJsonUrl, conditions);
+			if (!isURL2) {
+				const exportTarget = pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target + subpath;
+				return packageResolve(exportTarget, packageJsonUrl, conditions);
+			}
 		}
 		throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
 	}
 	if (invalidSegmentRegEx.exec(target.slice(2)) !== null) if (deprecatedInvalidSegmentRegEx.exec(target.slice(2)) === null) {
 		if (!isPathMap) {
 			const request = pattern ? match.replace("*", () => subpath) : match + subpath;
-			emitInvalidSegmentDeprecation(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target, request, match, packageJsonUrl, internal, base, true);
+			const resolvedTarget = pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target;
+			emitInvalidSegmentDeprecation(resolvedTarget, request, match, packageJsonUrl, internal, base, true);
 		}
 	} else throw invalidPackageTarget(match, target, packageJsonUrl, internal, base);
 	const resolved = new URL$1(target, packageJsonUrl);
@@ -12531,7 +12565,10 @@ function resolvePackageTargetString(target, subpath, match, packageJsonUrl, base
 	if (invalidSegmentRegEx.exec(subpath) !== null) {
 		const request = pattern ? match.replace("*", () => subpath) : match + subpath;
 		if (deprecatedInvalidSegmentRegEx.exec(subpath) === null) {
-			if (!isPathMap) emitInvalidSegmentDeprecation(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target, request, match, packageJsonUrl, internal, base, false);
+			if (!isPathMap) {
+				const resolvedTarget = pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target, () => subpath) : target;
+				emitInvalidSegmentDeprecation(resolvedTarget, request, match, packageJsonUrl, internal, base, false);
+			}
 		} else throwInvalidSubpath(request, match, packageJsonUrl, internal, base);
 	}
 	if (pattern) return new URL$1(RegExpPrototypeSymbolReplace.call(patternRegEx, resolved.href, () => subpath));
@@ -12707,9 +12744,10 @@ function parsePackageName(specifier, base) {
 	const packageName = separatorIndex === -1 ? specifier : specifier.slice(0, separatorIndex);
 	if (invalidPackageNameRegEx.exec(packageName) !== null) validPackageName = false;
 	if (!validPackageName) throw new ERR_INVALID_MODULE_SPECIFIER(specifier, "is not a valid package name", fileURLToPath(base));
+	const packageSubpath = "." + (separatorIndex === -1 ? "" : specifier.slice(separatorIndex));
 	return {
 		packageName,
-		packageSubpath: "." + (separatorIndex === -1 ? "" : specifier.slice(separatorIndex)),
+		packageSubpath,
 		isScoped
 	};
 }
@@ -12900,7 +12938,8 @@ function getSearchFunction(stopDirectory) {
 }
 function searchPrettierConfig(startDirectory, options8 = {}) {
 	startDirectory = startDirectory ? path10.resolve(startDirectory) : process.cwd();
-	return getSearchFunction(mockable_default.getPrettierConfigSearchStopDirectory())(startDirectory, { cache: options8.shouldCache });
+	const stopDirectory = mockable_default.getPrettierConfigSearchStopDirectory();
+	return getSearchFunction(stopDirectory)(startDirectory, { cache: options8.shouldCache });
 }
 function clearCache() {
 	clearPrettierConfigCache();
@@ -12914,7 +12953,10 @@ function loadEditorconfig2(file, options8) {
 async function loadPrettierConfig2(file, options8) {
 	const shouldCache = options8.useCache;
 	let configFile = options8.config;
-	if (!configFile) configFile = await searchPrettierConfig(file ? path10.dirname(path10.resolve(file)) : void 0, { shouldCache });
+	if (!configFile) {
+		const directory = file ? path10.dirname(path10.resolve(file)) : void 0;
+		configFile = await searchPrettierConfig(directory, { shouldCache });
+	}
 	if (!configFile) return;
 	configFile = toPath(configFile);
 	return {
@@ -12938,7 +12980,8 @@ async function resolveConfig(fileUrlOrPath, options8) {
 	return merged;
 }
 async function resolveConfigFile(fileUrlOrPath) {
-	return await searchPrettierConfig(fileUrlOrPath ? path10.dirname(path10.resolve(toPath(fileUrlOrPath))) : void 0, { shouldCache: false }) ?? null;
+	const directory = fileUrlOrPath ? path10.dirname(path10.resolve(toPath(fileUrlOrPath))) : void 0;
+	return await searchPrettierConfig(directory, { shouldCache: false }) ?? null;
 }
 function mergeOverrides(configResult, filePath) {
 	const { config, configFile } = configResult || {};
@@ -13086,14 +13129,14 @@ function traverseDoc(doc2, onEnter, onExit, shouldTraverseConditionalGroups) {
 			case DOC_TYPE_ARRAY:
 			case DOC_TYPE_FILL: {
 				const parts = docType === DOC_TYPE_ARRAY ? doc3 : doc3.parts;
-				for (let i = parts.length - 1; i >= 0; --i) docsStack.push(parts[i]);
+				for (let ic = parts.length, i = ic - 1; i >= 0; --i) docsStack.push(parts[i]);
 				break;
 			}
 			case DOC_TYPE_IF_BREAK:
 				docsStack.push(doc3.flatContents, doc3.breakContents);
 				break;
 			case DOC_TYPE_GROUP:
-				if (shouldTraverseConditionalGroups && doc3.expandedStates) for (let i = doc3.expandedStates.length - 1; i >= 0; --i) docsStack.push(doc3.expandedStates[i]);
+				if (shouldTraverseConditionalGroups && doc3.expandedStates) for (let ic = doc3.expandedStates.length, i = ic - 1; i >= 0; --i) docsStack.push(doc3.expandedStates[i]);
 				else docsStack.push(doc3.contents);
 				break;
 			case DOC_TYPE_ALIGN:
@@ -13717,10 +13760,11 @@ function printDocToString(doc2, options8) {
 								});
 								break;
 							} else {
+								const state = doc3.expandedStates[i];
 								const cmd = {
 									ind,
 									mode: MODE_FLAT,
-									doc: doc3.expandedStates[i]
+									doc: state
 								};
 								if (fits(cmd, cmds, rem, hasLineSuffix, groupModeMap)) {
 									cmds.push(cmd);
@@ -14167,7 +14211,8 @@ function skipNewline(text, startIndex, options8) {
 var skip_newline_default = skipNewline;
 function hasNewline(text, startIndex, options8 = {}) {
 	const idx = skipSpaces(text, options8.backwards ? startIndex - 1 : startIndex, options8);
-	return idx !== skip_newline_default(text, idx, options8);
+	const idx2 = skip_newline_default(text, idx, options8);
+	return idx !== idx2;
 }
 var has_newline_default = hasNewline;
 function isNonEmptyArray(object) {
@@ -14409,15 +14454,18 @@ function printTrailingComment(path14, options8, previousComment) {
 	const printed = printComment(path14, options8);
 	const { printer: printer$1, originalText, locStart } = options8;
 	const isBlock = (_a = printer$1.isBlockComment) == null ? void 0 : _a.call(printer$1, comment);
-	if ((previousComment == null ? void 0 : previousComment.hasLineSuffix) && !(previousComment == null ? void 0 : previousComment.isBlock) || has_newline_default(originalText, locStart(comment), { backwards: true })) return {
-		doc: lineSuffix([
-			hardline,
-			is_previous_line_empty_default(originalText, locStart(comment)) ? hardline : "",
-			printed
-		]),
-		isBlock,
-		hasLineSuffix: true
-	};
+	if ((previousComment == null ? void 0 : previousComment.hasLineSuffix) && !(previousComment == null ? void 0 : previousComment.isBlock) || has_newline_default(originalText, locStart(comment), { backwards: true })) {
+		const isLineBeforeEmpty = is_previous_line_empty_default(originalText, locStart(comment));
+		return {
+			doc: lineSuffix([
+				hardline,
+				isLineBeforeEmpty ? hardline : "",
+				printed
+			]),
+			isBlock,
+			hasLineSuffix: true
+		};
+	}
 	if (!isBlock || (previousComment == null ? void 0 : previousComment.hasLineSuffix)) return {
 		doc: [lineSuffix([" ", printed]), breakParent],
 		isBlock,
@@ -14842,10 +14890,11 @@ function normalizeOptions(options8, optionInfos, { logger = false, isCLI = false
 			schemas: schemas2
 		});
 	} : Array.isArray(passThrough) ? (key2, value) => !passThrough.includes(key2) ? void 0 : { [key2]: value } : (key2, value) => ({ [key2]: value });
-	const normalizer = new Normalizer(optionInfosToSchemas(optionInfos, {
+	const schemas = optionInfosToSchemas(optionInfos, {
 		isCLI,
 		FlagSchema
-	}), {
+	});
+	const normalizer = new Normalizer(schemas, {
 		logger,
 		unknown,
 		descriptor
@@ -14945,16 +14994,19 @@ function getParserPluginByParserName(plugins, parserName) {
 	if (!parserName) throw new Error("parserName is required.");
 	const plugin = array_find_last_default(false, plugins, (plugin2) => plugin2.parsers && Object.prototype.hasOwnProperty.call(plugin2.parsers, parserName));
 	if (plugin) return plugin;
-	throw new ConfigError(`Couldn't resolve parser "${parserName}".`);
+	let message = `Couldn't resolve parser "${parserName}".`;
+	throw new ConfigError(message);
 }
 function getPrinterPluginByAstFormat(plugins, astFormat) {
 	if (!astFormat) throw new Error("astFormat is required.");
 	const plugin = array_find_last_default(false, plugins, (plugin2) => plugin2.printers && Object.prototype.hasOwnProperty.call(plugin2.printers, astFormat));
 	if (plugin) return plugin;
-	throw new ConfigError(`Couldn't find plugin for AST format "${astFormat}".`);
+	let message = `Couldn't find plugin for AST format "${astFormat}".`;
+	throw new ConfigError(message);
 }
 function resolveParser({ plugins, parser }) {
-	return initParser(getParserPluginByParserName(plugins, parser), parser);
+	const plugin = getParserPluginByParserName(plugins, parser);
+	return initParser(plugin, parser);
 }
 function initParser(plugin, parserName) {
 	const parserOrParserInitFunction = plugin.parsers[parserName];
@@ -15082,7 +15134,8 @@ async function textToDoc(text, partialNextOptions, parentOptions, printAstToDoc2
 		rangeEnd: void 0
 	}, { passThrough: true });
 	const { ast } = await parse_default(text, options8);
-	return stripTrailingHardline(await printAstToDoc2(ast, options8));
+	const doc2 = await printAstToDoc2(ast, options8);
+	return stripTrailingHardline(doc2);
 }
 function printIgnored(path14, options8) {
 	const { originalText, [Symbol.for("comments")]: comments, locStart, locEnd, [Symbol.for("printedComments")]: printedComments } = options8;
@@ -15427,7 +15480,8 @@ async function coreFormat(originalText, opts, addAlignmentSize = 0) {
 		};
 		const oldCursorNodeCharArray = oldCursorRegionText.split("");
 		oldCursorNodeCharArray.splice(cursorOffsetRelativeToOldCursorRegionStart, 0, CURSOR);
-		const cursorNodeDiff = diffArrays(oldCursorNodeCharArray, newCursorRegionText.split(""));
+		const newCursorNodeCharArray = newCursorRegionText.split("");
+		const cursorNodeDiff = diffArrays(oldCursorNodeCharArray, newCursorNodeCharArray);
 		let cursorOffset = newCursorRegionStart;
 		for (const entry of cursorNodeDiff) if (entry.removed) {
 			if (entry.value.includes(CURSOR)) break;
@@ -15558,10 +15612,12 @@ async function parse6(originalText, originalOptions, devOptions) {
 }
 async function formatAst(ast, options8) {
 	options8 = await normalize_format_options_default(options8);
-	return printDocToString(await printAstToDoc(ast, options8), options8);
+	const doc2 = await printAstToDoc(ast, options8);
+	return printDocToString(doc2, options8);
 }
 async function formatDoc(doc2, options8) {
-	const { formatted } = await formatWithCursor(printDocToDebug(doc2), {
+	const text = printDocToDebug(doc2);
+	const { formatted } = await formatWithCursor(text, {
 		...options8,
 		parser: "__js_expression"
 	});
@@ -16357,11 +16413,11 @@ var languages = [
 ];
 var { parsers, printers } = createParsersAndPrinters([
 	{
-		importPlugin: () => import("./acorn-B0JdnMwY.js"),
+		importPlugin: () => import("./acorn-Z0oy0vSt.js"),
 		parsers: ["acorn", "espree"]
 	},
 	{
-		importPlugin: () => import("./angular-CmU_K35W.js"),
+		importPlugin: () => import("./angular-BUlb_iaU.js"),
 		parsers: [
 			"__ng_action",
 			"__ng_binding",
@@ -16370,7 +16426,7 @@ var { parsers, printers } = createParsersAndPrinters([
 		]
 	},
 	{
-		importPlugin: () => import("./babel-CfF0c5A9.js"),
+		importPlugin: () => import("./babel-DfXTN9QX.js"),
 		parsers: [
 			"babel",
 			"babel-flow",
@@ -16389,25 +16445,25 @@ var { parsers, printers } = createParsersAndPrinters([
 		]
 	},
 	{
-		importPlugin: () => import("./estree-B_YMDsR7.js"),
+		importPlugin: () => import("./estree-Bt3vRtV3.js"),
 		printers: ["estree", "estree-json"]
 	},
 	{
-		importPlugin: () => import("./flow-Dc3wao4M.js"),
+		importPlugin: () => import("./flow-Bb8_yYns.js"),
 		parsers: ["flow"]
 	},
 	{
-		importPlugin: () => import("./glimmer-CwM1XZA1.js"),
+		importPlugin: () => import("./glimmer-By8WZPkK.js"),
 		parsers: ["glimmer"],
 		printers: ["glimmer"]
 	},
 	{
-		importPlugin: () => import("./graphql-KQQTidk7.js"),
+		importPlugin: () => import("./graphql-DsrNefXx.js"),
 		parsers: ["graphql"],
 		printers: ["graphql"]
 	},
 	{
-		importPlugin: () => import("./html-DQoJX7Yj.js"),
+		importPlugin: () => import("./html-Y5KDc150.js"),
 		parsers: [
 			"html",
 			"angular",
@@ -16418,7 +16474,7 @@ var { parsers, printers } = createParsersAndPrinters([
 		printers: ["html"]
 	},
 	{
-		importPlugin: () => import("./markdown-CDf4HsAQ.js"),
+		importPlugin: () => import("./markdown-Drl4Cbq5.js"),
 		parsers: [
 			"markdown",
 			"mdx",
@@ -16427,11 +16483,11 @@ var { parsers, printers } = createParsersAndPrinters([
 		printers: ["mdast"]
 	},
 	{
-		importPlugin: () => import("./meriyah-D8fyVkyI.js"),
+		importPlugin: () => import("./meriyah-Cz9whwp-.js"),
 		parsers: ["meriyah"]
 	},
 	{
-		importPlugin: () => import("./postcss-Dqh1XvaI.js"),
+		importPlugin: () => import("./postcss-Dfx_9buT.js"),
 		parsers: [
 			"css",
 			"less",
@@ -16440,11 +16496,11 @@ var { parsers, printers } = createParsersAndPrinters([
 		printers: ["postcss"]
 	},
 	{
-		importPlugin: () => import("./typescript-CabSmKb3.js"),
+		importPlugin: () => import("./typescript-BY9-7pw9.js"),
 		parsers: ["typescript"]
 	},
 	{
-		importPlugin: () => import("./yaml-BMiF8MYP.js"),
+		importPlugin: () => import("./yaml-Bi_nSoU_.js"),
 		parsers: ["yaml"],
 		printers: ["yaml"]
 	}
@@ -16658,12 +16714,13 @@ function hasSpaces(text, startIndex, options8 = {}) {
 var has_spaces_default = hasSpaces;
 function makeString(rawText, enclosingQuote, unescapeUnnecessaryEscapes) {
 	const otherQuote = enclosingQuote === "\"" ? "'" : "\"";
-	return enclosingQuote + string_replace_all_default(false, rawText, /\\(.)|(["'])/gsu, (match, escaped, quote) => {
+	const raw = string_replace_all_default(false, rawText, /\\(.)|(["'])/gsu, (match, escaped, quote) => {
 		if (escaped === otherQuote) return escaped;
 		if (quote === enclosingQuote) return "\\" + quote;
 		if (quote) return quote;
 		return unescapeUnnecessaryEscapes && /^[^\n\r"'0-7\\bfnrt-vx\u2028\u2029]$/u.test(escaped) ? escaped : "\\" + escaped;
-	}) + enclosingQuote;
+	});
+	return enclosingQuote + raw + enclosingQuote;
 }
 var make_string_default = makeString;
 function legacyGetNextNonSpaceNonCommentCharacterIndex(text, node, locEnd) {