oxfmt 0.53.0 → 0.54.0

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { r as runCli } from "./bindings-ChKdN0o7.js";
+import { a as runCli, n as toNullable, t as toFormatFileResult } from "./napi-callbacks-C8y3J_xb.js";
 import Tinypool from "tinypool";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { extname } from "node:path";
@@ -17,38 +17,29 @@ async function disposeExternalFormatter() {
 	await pool?.destroy();
 	pool = null;
 }
-async function formatFile(options, code) {
-	return pool.run({
+function formatFile(options, code) {
+	return toFormatFileResult(pool.run({
 		options,
 		code
-	}, { name: "formatFile" }).catch((err) => {
-		if (err instanceof Error) throw err;
-		if (err !== null && typeof err === "object") {
-			const obj = err;
-			const newErr = new Error(obj.message);
-			newErr.name = obj.name;
-			throw newErr;
-		}
-		throw new Error(String(err));
-	});
+	}, { name: "formatFile" }));
 }
-async function formatEmbeddedCode(options, code) {
-	return pool.run({
+function formatEmbeddedCode(options, code) {
+	return toNullable(pool.run({
 		options,
 		code
-	}, { name: "formatEmbeddedCode" }).catch(() => null);
+	}, { name: "formatEmbeddedCode" }));
 }
-async function formatEmbeddedDoc(options, texts) {
-	return pool.run({
+function formatEmbeddedDoc(options, texts) {
+	return toNullable(pool.run({
 		options,
 		texts
-	}, { name: "formatEmbeddedDoc" }).catch(() => null);
+	}, { name: "formatEmbeddedDoc" }));
 }
-async function sortTailwindClasses(options, classes) {
-	return pool.run({
+function sortTailwindClasses(options, classes) {
+	return toNullable(pool.run({
 		classes,
 		options
-	}, { name: "sortTailwindClasses" }).catch(() => null);
+	}, { name: "sortTailwindClasses" }));
 }
 //#endregion
 //#region ../shared/src-js/utils.ts

package/dist/{dist-Cb-CB0nt.js → dist-ZI7w_ao-.js}

@@ -1,13 +1,13 @@
 import { o as __toESM } from "./chunk-CNf5ZN-e.js";
 import { n as init_babel, parsers as ra, t as babel_exports } from "./babel-DjR61Wf3.js";
 import index_exports, { t as init_prettier } from "./prettier-CttUn4xj.js";
-import { a as __toESM$1, t as __commonJSMin } from "./chunk-DSjvVL_1-CrjveNIv.js";
-import { a as sortClasses, c as cacheForDirs, d as expiringMap, f as loadIfExists, i as sortClassList, l as spliceChangesIntoString, n as error, o as warn, p as maybeResolve, r as getTailwindConfig$1, u as visit } from "./sorter-BZkvDMjt-X7PZZf-k.js";
+import { a as __toESM$1, t as __commonJSMin } from "./chunk-DSjvVL_1-BUO3FyMh.js";
+import { a as sortClasses, c as cacheForDirs, d as expiringMap, f as loadIfExists, i as sortClassList, l as spliceChangesIntoString, n as error, o as warn, p as maybeResolve, r as getTailwindConfig$1, u as visit } from "./sorter-BZkvDMjt-DCuU-7CM.js";
 import { parsers as fn, t as init_angular } from "./angular-4Mc0TmPv.js";
 import { n as postcss_exports, parsers as en, t as init_postcss } from "./postcss-BFLfznNY.js";
 import * as path from "node:path";
 import { isAbsolute } from "path";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.2b6f3c2_prettier-plugin-svelte@4.0.1_prettie_961279539c8b58c29c93389b521be834/node_modules/prettier-plugin-tailwindcss/dist/index.mjs
+//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.2b6f3c2_prettier-plugin-svelte@4.1.0_prettie_e3345e2f5995e2d14d8ee5c58c9c043a/node_modules/prettier-plugin-tailwindcss/dist/index.mjs
 init_angular();
 init_babel();
 init_postcss();
@@ -1160,7 +1160,7 @@ const { parsers, printers } = createPlugin([
 		staticAttrs: ["class"],
 		load: [{
 			name: "prettier-plugin-svelte",
-			importer: () => import("./plugin-DOvWpprN.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1))
+			importer: () => import("./plugin-CHUKsFCg.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1))
 		}],
 		parsers: { svelte: {} },
 		printers: { "svelte-ast": {} },

package/dist/index.d.ts

@@ -54,6 +54,7 @@ interface Oxfmtrc {
   /**
    * Include parentheses around a sole arrow function parameter.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: `"always"`
    */
   arrowParens?: ArrowParensConfig;
@@ -61,20 +62,21 @@ interface Oxfmtrc {
    * Put the `>` of a multi-line HTML (HTML, JSX, Vue, Angular) element at the end of the last line,
    * instead of being alone on the next line (does not apply to self closing elements).
    *
+   * - Languages: JSX, TSX, HTML, Angular, Vue, MJML, Svelte
    * - Default: `false`
    */
   bracketSameLine?: boolean;
   /**
    * Print spaces between brackets in object literals.
    *
+   * - Languages: JS, JSX, TS, TSX, JSON, JSONC, JSON5, GraphQL, YAML
    * - Default: `true`
    */
   bracketSpacing?: boolean;
   /**
    * Control whether to format embedded parts (For example, CSS-in-JS, or JS-in-Vue, etc.) in the file.
    *
-   * NOTE: XXX-in-JS support is incomplete.
-   *
+   * - Languages: JS, JSX, TS, TSX, HTML, Vue, Angular, Svelte, Markdown, MDX (languages with embedded code)
    * - Default: `"auto"`
    */
   embeddedLanguageFormatting?: EmbeddedLanguageFormattingConfig;
@@ -83,6 +85,7 @@ interface Oxfmtrc {
    *
    * NOTE: `"auto"` is not supported.
    *
+   * - Languages: All
    * - Default: `"lf"`
    * - Overrides `.editorconfig.end_of_line`
    */
@@ -90,6 +93,7 @@ interface Oxfmtrc {
   /**
    * Specify the global whitespace sensitivity for HTML, Vue, Angular, and Handlebars.
    *
+   * - Languages: HTML, Angular, Vue, Handlebars, Svelte
    * - Default: `"css"`
    */
   htmlWhitespaceSensitivity?: HtmlWhitespaceSensitivityConfig;
@@ -103,6 +107,7 @@ interface Oxfmtrc {
   /**
    * Whether to insert a final newline at the end of the file.
    *
+   * - Languages: All
    * - Default: `true`
    * - Overrides `.editorconfig.insert_final_newline`
    */
@@ -116,12 +121,14 @@ interface Oxfmtrc {
    *
    * Pass `true` or an object to enable with defaults, or omit/set `false` to disable.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: Disabled
    */
   jsdoc?: JsdocUserConfig;
   /**
    * Use single quotes instead of double quotes in JSX.
    *
+   * - Languages: JSX, TSX
    * - Default: `false`
    */
   jsxSingleQuote?: boolean;
@@ -131,6 +138,7 @@ interface Oxfmtrc {
    * By default, formats objects as multi-line if there is a newline prior to the first property.
    * Authors can use this heuristic to contextually improve readability, though it has some downsides.
    *
+   * - Languages: JS, JSX, TS, TSX, JSON, JSONC, JSON5
    * - Default: `"preserve"`
    */
   objectWrap?: ObjectWrapConfig;
@@ -146,6 +154,7 @@ interface Oxfmtrc {
    *
    * If you don't want line wrapping when formatting Markdown, you can set the `proseWrap` option to disable it.
    *
+   * - Languages: All
    * - Default: `100`
    * - Overrides `.editorconfig.max_line_length`
    */
@@ -157,24 +166,28 @@ interface Oxfmtrc {
    * To wrap prose to the print width, change this option to "always".
    * If you want to force all prose blocks to be on a single line and rely on editor/viewer soft wrapping instead, you can use "never".
    *
+   * - Languages: Markdown, MDX, YAML
    * - Default: `"preserve"`
    */
   proseWrap?: ProseWrapConfig;
   /**
    * Change when properties in objects are quoted.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: `"as-needed"`
    */
   quoteProps?: QuotePropsConfig;
   /**
    * Print semicolons at the ends of statements.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: `true`
    */
   semi?: boolean;
   /**
    * Enforce single attribute per line in HTML, Vue, and JSX.
    *
+   * - Languages: JSX, TSX, HTML, Angular, Vue, MJML, Svelte
    * - Default: `false`
    */
   singleAttributePerLine?: boolean;
@@ -183,6 +196,7 @@ interface Oxfmtrc {
    *
    * For JSX, you can set the `jsxSingleQuote` option.
    *
+   * - Languages: JS, JSX, TS, TSX, CSS, Less, SCSS, Markdown, MDX, YAML, Handlebars, Svelte
    * - Default: `false`
    * - Overrides `.editorconfig.quote_type`
    */
@@ -195,6 +209,7 @@ interface Oxfmtrc {
    *
    * Pass `true` or an object to enable with defaults, or omit/set `false` to disable.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: Disabled
    */
   sortImports?: SortImportsUserConfig;
@@ -205,6 +220,7 @@ interface Oxfmtrc {
    * But we believe it is clearer and easier to navigate.
    * For details, see each field's documentation.
    *
+   * - Languages: JSON (`package.json` only)
    * - Default: `true`
    */
   sortPackageJson?: SortPackageJsonUserConfig;
@@ -217,6 +233,7 @@ interface Oxfmtrc {
    *
    * Pass `true` or an object to enable with defaults, or omit/set `false` to disable.
    *
+   * - Languages: JS, JSX, TS, TSX, HTML, Vue, Angular, Handlebars, CSS, SCSS, Less, Svelte
    * - Default: Disabled
    */
   sortTailwindcss?: SortTailwindcssUserConfig;
@@ -231,12 +248,14 @@ interface Oxfmtrc {
    * but Oxfmt does NOT bundle or auto-install it.
    * You must install `svelte` yourself in your project, formatting will fail at runtime otherwise.
    *
+   * - Languages: Svelte
    * - Default: Disabled
    */
   svelte?: SvelteUserConfig;
   /**
    * Specify the number of spaces per indentation-level.
    *
+   * - Languages: All
    * - Default: `2`
    * - Overrides `.editorconfig.indent_size` (falls back to `.editorconfig.tab_width`)
    */
@@ -246,12 +265,14 @@ interface Oxfmtrc {
    *
    * A single-line array, for example, never gets trailing commas.
    *
+   * - Languages: JS, JSX, TS, TSX, JSONC, JSON5, TOML, CSS, Less, SCSS, YAML
    * - Default: `"all"`
    */
   trailingComma?: TrailingCommaConfig;
   /**
    * Indent lines with tabs instead of spaces.
    *
+   * - Languages: All
    * - Default: `false`
    * - Overrides `.editorconfig.indent_style`
    */
@@ -259,6 +280,7 @@ interface Oxfmtrc {
   /**
    * Whether or not to indent the code inside `<script>` and `<style>` tags in Vue files.
    *
+   * - Languages: Vue
    * - Default: `false`
    */
   vueIndentScriptAndStyle?: boolean;
@@ -359,6 +381,7 @@ interface FormatConfig {
   /**
    * Include parentheses around a sole arrow function parameter.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: `"always"`
    */
   arrowParens?: ArrowParensConfig;
@@ -366,20 +389,21 @@ interface FormatConfig {
    * Put the `>` of a multi-line HTML (HTML, JSX, Vue, Angular) element at the end of the last line,
    * instead of being alone on the next line (does not apply to self closing elements).
    *
+   * - Languages: JSX, TSX, HTML, Angular, Vue, MJML, Svelte
    * - Default: `false`
    */
   bracketSameLine?: boolean;
   /**
    * Print spaces between brackets in object literals.
    *
+   * - Languages: JS, JSX, TS, TSX, JSON, JSONC, JSON5, GraphQL, YAML
    * - Default: `true`
    */
   bracketSpacing?: boolean;
   /**
    * Control whether to format embedded parts (For example, CSS-in-JS, or JS-in-Vue, etc.) in the file.
    *
-   * NOTE: XXX-in-JS support is incomplete.
-   *
+   * - Languages: JS, JSX, TS, TSX, HTML, Vue, Angular, Svelte, Markdown, MDX (languages with embedded code)
    * - Default: `"auto"`
    */
   embeddedLanguageFormatting?: EmbeddedLanguageFormattingConfig;
@@ -388,6 +412,7 @@ interface FormatConfig {
    *
    * NOTE: `"auto"` is not supported.
    *
+   * - Languages: All
    * - Default: `"lf"`
    * - Overrides `.editorconfig.end_of_line`
    */
@@ -395,12 +420,14 @@ interface FormatConfig {
   /**
    * Specify the global whitespace sensitivity for HTML, Vue, Angular, and Handlebars.
    *
+   * - Languages: HTML, Angular, Vue, Handlebars, Svelte
    * - Default: `"css"`
    */
   htmlWhitespaceSensitivity?: HtmlWhitespaceSensitivityConfig;
   /**
    * Whether to insert a final newline at the end of the file.
    *
+   * - Languages: All
    * - Default: `true`
    * - Overrides `.editorconfig.insert_final_newline`
    */
@@ -414,12 +441,14 @@ interface FormatConfig {
    *
    * Pass `true` or an object to enable with defaults, or omit/set `false` to disable.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: Disabled
    */
   jsdoc?: JsdocUserConfig;
   /**
    * Use single quotes instead of double quotes in JSX.
    *
+   * - Languages: JSX, TSX
    * - Default: `false`
    */
   jsxSingleQuote?: boolean;
@@ -429,6 +458,7 @@ interface FormatConfig {
    * By default, formats objects as multi-line if there is a newline prior to the first property.
    * Authors can use this heuristic to contextually improve readability, though it has some downsides.
    *
+   * - Languages: JS, JSX, TS, TSX, JSON, JSONC, JSON5
    * - Default: `"preserve"`
    */
   objectWrap?: ObjectWrapConfig;
@@ -437,6 +467,7 @@ interface FormatConfig {
    *
    * If you don't want line wrapping when formatting Markdown, you can set the `proseWrap` option to disable it.
    *
+   * - Languages: All
    * - Default: `100`
    * - Overrides `.editorconfig.max_line_length`
    */
@@ -448,24 +479,28 @@ interface FormatConfig {
    * To wrap prose to the print width, change this option to "always".
    * If you want to force all prose blocks to be on a single line and rely on editor/viewer soft wrapping instead, you can use "never".
    *
+   * - Languages: Markdown, MDX, YAML
    * - Default: `"preserve"`
    */
   proseWrap?: ProseWrapConfig;
   /**
    * Change when properties in objects are quoted.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: `"as-needed"`
    */
   quoteProps?: QuotePropsConfig;
   /**
    * Print semicolons at the ends of statements.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: `true`
    */
   semi?: boolean;
   /**
    * Enforce single attribute per line in HTML, Vue, and JSX.
    *
+   * - Languages: JSX, TSX, HTML, Angular, Vue, MJML, Svelte
    * - Default: `false`
    */
   singleAttributePerLine?: boolean;
@@ -474,6 +509,7 @@ interface FormatConfig {
    *
    * For JSX, you can set the `jsxSingleQuote` option.
    *
+   * - Languages: JS, JSX, TS, TSX, CSS, Less, SCSS, Markdown, MDX, YAML, Handlebars, Svelte
    * - Default: `false`
    * - Overrides `.editorconfig.quote_type`
    */
@@ -486,6 +522,7 @@ interface FormatConfig {
    *
    * Pass `true` or an object to enable with defaults, or omit/set `false` to disable.
    *
+   * - Languages: JS, JSX, TS, TSX
    * - Default: Disabled
    */
   sortImports?: SortImportsUserConfig;
@@ -496,6 +533,7 @@ interface FormatConfig {
    * But we believe it is clearer and easier to navigate.
    * For details, see each field's documentation.
    *
+   * - Languages: JSON (`package.json` only)
    * - Default: `true`
    */
   sortPackageJson?: SortPackageJsonUserConfig;
@@ -508,6 +546,7 @@ interface FormatConfig {
    *
    * Pass `true` or an object to enable with defaults, or omit/set `false` to disable.
    *
+   * - Languages: JS, JSX, TS, TSX, HTML, Vue, Angular, Handlebars, CSS, SCSS, Less, Svelte
    * - Default: Disabled
    */
   sortTailwindcss?: SortTailwindcssUserConfig;
@@ -522,12 +561,14 @@ interface FormatConfig {
    * but Oxfmt does NOT bundle or auto-install it.
    * You must install `svelte` yourself in your project, formatting will fail at runtime otherwise.
    *
+   * - Languages: Svelte
    * - Default: Disabled
    */
   svelte?: SvelteUserConfig;
   /**
    * Specify the number of spaces per indentation-level.
    *
+   * - Languages: All
    * - Default: `2`
    * - Overrides `.editorconfig.indent_size` (falls back to `.editorconfig.tab_width`)
    */
@@ -537,12 +578,14 @@ interface FormatConfig {
    *
    * A single-line array, for example, never gets trailing commas.
    *
+   * - Languages: JS, JSX, TS, TSX, JSONC, JSON5, TOML, CSS, Less, SCSS, YAML
    * - Default: `"all"`
    */
   trailingComma?: TrailingCommaConfig;
   /**
    * Indent lines with tabs instead of spaces.
    *
+   * - Languages: All
    * - Default: `false`
    * - Overrides `.editorconfig.indent_style`
    */
@@ -550,6 +593,7 @@ interface FormatConfig {
   /**
    * Whether or not to indent the code inside `<script>` and `<style>` tags in Vue files.
    *
+   * - Languages: Vue
    * - Default: `false`
    */
   vueIndentScriptAndStyle?: boolean;

package/dist/index.js

@@ -1,5 +1,5 @@
-import { n as jsTextToDoc$1, t as format$1 } from "./bindings-ChKdN0o7.js";
-import { i as sortTailwindClasses, n as formatEmbeddedDoc, r as formatFile, t as formatEmbeddedCode } from "./apis-DOCQy_NG.js";
+import { i as jsTextToDoc$1, n as toNullable, r as format$1, t as toFormatFileResult } from "./napi-callbacks-C8y3J_xb.js";
+import { i as sortTailwindClasses, n as formatEmbeddedDoc, r as formatFile, t as formatEmbeddedCode } from "./apis-CngUzqDq.js";
 //#region src-js/index.ts
 /**
 * Define an oxfmt configuration with type inference.
@@ -13,34 +13,34 @@ function defineConfig(config) {
 async function format(fileName, sourceText, options) {
 	if (typeof fileName !== "string") throw new TypeError("`fileName` must be a string");
 	if (typeof sourceText !== "string") throw new TypeError("`sourceText` must be a string");
-	return format$1(fileName, sourceText, options ?? {}, (options, code) => formatFile({
+	return format$1(fileName, sourceText, options ?? {}, (options, code) => toFormatFileResult(formatFile({
 		options,
 		code
-	}), (options, code) => formatEmbeddedCode({
+	})), (options, code) => toNullable(formatEmbeddedCode({
 		options,
 		code
-	}), (options, texts) => formatEmbeddedDoc({
+	})), (options, texts) => toNullable(formatEmbeddedDoc({
 		options,
 		texts
-	}), (options, classes) => sortTailwindClasses({
+	})), (options, classes) => toNullable(sortTailwindClasses({
 		options,
 		classes
-	}));
+	})));
 }
 /**
 * Format a JS/TS snippet for Prettier `textToDoc()` plugin flow.
 */
 async function jsTextToDoc(sourceExt, sourceText, oxfmtPluginOptionsJson, parentContext) {
-	return jsTextToDoc$1(sourceExt, sourceText, oxfmtPluginOptionsJson, parentContext, (_options, _code) => Promise.reject(), (options, code) => formatEmbeddedCode({
+	return jsTextToDoc$1(sourceExt, sourceText, oxfmtPluginOptionsJson, parentContext, () => toFormatFileResult(Promise.reject("formatFile is unavailable for jsTextToDoc")), (options, code) => toNullable(formatEmbeddedCode({
 		options,
 		code
-	}), (options, texts) => formatEmbeddedDoc({
+	})), (options, texts) => toNullable(formatEmbeddedDoc({
 		options,
 		texts
-	}), (options, classes) => sortTailwindClasses({
+	})), (options, classes) => toNullable(sortTailwindClasses({
 		options,
 		classes
-	}));
+	})));
 }
 //#endregion
 export { defineConfig, format, jsTextToDoc };

package/dist/{jiti-Bb1dT6Cw-bfahw2Ut.js → jiti-Bb1dT6Cw-DPQUX1DC.js}

@@ -1,6 +1,6 @@
-import { a as __toESM, i as __require, t as __commonJSMin } from "./chunk-DSjvVL_1-CrjveNIv.js";
+import { a as __toESM, i as __require, t as __commonJSMin } from "./chunk-DSjvVL_1-BUO3FyMh.js";
 import { createRequire } from "node:module";
-//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.2b6f3c2_prettier-plugin-svelte@4.0.1_prettie_961279539c8b58c29c93389b521be834/node_modules/prettier-plugin-tailwindcss/dist/jiti-Bb1dT6Cw.mjs
+//#region ../../node_modules/.pnpm/prettier-plugin-tailwindcss@0.0.0-insiders.2b6f3c2_prettier-plugin-svelte@4.1.0_prettie_e3345e2f5995e2d14d8ee5c58c9c043a/node_modules/prettier-plugin-tailwindcss/dist/jiti-Bb1dT6Cw.mjs
 var require_jiti = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	(() => {
 		var e = { "./node_modules/.pnpm/mlly@1.8.0/node_modules/mlly/dist lazy recursive": function(e) {