eslint-plugin-oxfmt 0.0.15 → 0.1.1

package/README.md

@@ -108,12 +108,12 @@ export default [
           vueIndentScriptAndStyle: false,
 
           // Experiments
-          experimentalSortImports: {
+          sortImports: {
             order: 'asc',
             newlinesBetween: true,
           },
-          experimentalSortPackageJson: { sortScripts: true },
-          experimentalTailwindcss: {
+          sortPackageJson: { sortScripts: true },
+          sortTailwindcss: {
             attributes: ['class', 'className', ':class'],
             functions: ['clsx', 'cn'],
             preserveDuplicates: false,
@@ -201,18 +201,18 @@ All options are optional and default to sensible values.
 
 ### Advanced Options
 
-| Option                        | Type                | Default  | Description                                                                  |
-| ----------------------------- | ------------------- | -------- | ---------------------------------------------------------------------------- |
-| `experimentalSortImports`     | `object`            | disabled | Experimental import sorting configuration                                    |
-| `experimentalSortPackageJson` | `boolean \| object` | `true`   | Experimental package.json sorting (object form: `{ sortScripts?: boolean }`) |
-| `experimentalTailwindcss`     | `object`            | disabled | Experimental Tailwind CSS class sorting (enable with `{}` for defaults)      |
+| Option            | Type                | Default  | Description                                                                  |
+| ----------------- | ------------------- | -------- | ---------------------------------------------------------------------------- |
+| `sortImports`     | `object`            | disabled | Experimental import sorting configuration                                    |
+| `sortPackageJson` | `boolean \| object` | `true`   | Experimental package.json sorting (object form: `{ sortScripts?: boolean }`) |
+| `sortTailwindcss` | `object`            | disabled | Experimental Tailwind CSS class sorting (enable with `{}` for defaults)      |
 
-#### Import sorting (`experimentalSortImports`)
+#### Import sorting (`sortImports`)
 
 Available keys:
 
-- `customGroups`: Ordered custom group definitions `{ elementNamePattern?: string[]; groupName?: string }[]`
-- `groups`: Ordered group list; supports nested arrays to merge groups (see perfectionist docs)
+- `customGroups`: Ordered custom group definitions `{ elementNamePattern?: string[]; groupName?: string; modifiers?: string[]; selector?: string }[]`
+- `groups`: Ordered group list; supports nested arrays and boundary markers like `{ newlinesBetween: boolean }`
 - `ignoreCase`: Ignore case when sorting (default `true`)
 - `internalPattern`: Glob patterns for internal imports
 - `newlinesBetween`: Insert blank lines between groups (default `true`)
@@ -221,7 +221,7 @@ Available keys:
 - `partitionByNewline`: Split groups by blank lines (default `false`)
 - `sortSideEffects`: Sort side-effect imports (default `false`)
 
-#### package.json sorting (`experimentalSortPackageJson`)
+#### package.json sorting (`sortPackageJson`)
 
 - Boolean to toggle (default `true`).
 - Object form: `{ sortScripts?: boolean }` (default `false`).
@@ -242,7 +242,7 @@ export default [
       'oxfmt/oxfmt': [
         'error',
         {
-          experimentalTailwindcss: {},
+          sortTailwindcss: {},
         },
       ],
     },
@@ -254,7 +254,7 @@ You can pass the Tailwind plugin options to control which attributes/functions a
 
 ```json
 {
-  "experimentalTailwindcss": {
+  "sortTailwindcss": {
     "attributes": ["class", "className", ":class"],
     "config": "./tailwind.config.js",
     "functions": ["clsx", "cn"],
@@ -294,7 +294,7 @@ export default [
               files: ['packages/**/src/**/*.{ts,tsx}'],
               options: {
                 printWidth: 90,
-                experimentalSortImports: {
+                sortImports: {
                   newlinesBetween: true,
                 },
               },
@@ -337,7 +337,7 @@ Add this to your `.vscode/settings.json`:
 }
 ```
 
-## Suppported languages
+## Supported languages
 
 - Check [Oxfmt - Supported languages](https://oxc.rs/docs/guide/usage/formatter.html#supported-languages)
 

package/dist/index.mjs

@@ -67,7 +67,7 @@ const configs = { recommended };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-oxfmt";
-var version = "0.0.15";
+var version = "0.1.1";
 
 //#endregion
 //#region src/meta.ts
@@ -183,7 +183,72 @@ const oxfmtOptionsSchema = {
 			],
 			type: "string"
 		},
-		experimentalSortImports: {
+		htmlWhitespaceSensitivity: {
+			description: `Specify the global whitespace sensitivity for HTML, Vue, Angular, and Handlebars.\n\n- (Default: "css")`,
+			enum: [
+				"css",
+				"ignore",
+				"strict"
+			],
+			type: "string"
+		},
+		ignorePatterns: {
+			description: `Ignore files matching these glob patterns. Current working directory is used as the root.`,
+			type: "array",
+			items: { type: "string" }
+		},
+		insertFinalNewline: {
+			description: `Whether to insert a final newline at the end of the file. (Default: true)`,
+			type: "boolean"
+		},
+		jsxSingleQuote: {
+			description: `Use single quotes instead of double quotes in JSX. (Default: false)`,
+			type: "boolean"
+		},
+		objectWrap: {
+			description: `How to wrap object literals when they could fit on one line or span multiple lines. (Default: "preserve")\nNOTE: In addition to Prettier's "preserve" and "collapse", we also support "always".`,
+			enum: [
+				"preserve",
+				"collapse",
+				"always"
+			],
+			type: "string"
+		},
+		printWidth: {
+			description: `The line length that the printer will wrap on. (Default: 100)`,
+			type: "integer"
+		},
+		proseWrap: {
+			description: `How to wrap prose.\n\nBy default, formatter will not change wrapping in markdown text since some services use a linebreak-sensitive renderer, e.g. GitHub comments and BitBucket.\nTo wrap prose to the print width, change this option to "always".\nIf 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".\n\n- (Default: "preserve")`,
+			enum: [
+				"always",
+				"never",
+				"preserve"
+			],
+			type: "string"
+		},
+		quoteProps: {
+			description: `Change when properties in objects are quoted. (Default: "as-needed")`,
+			enum: [
+				"as-needed",
+				"consistent",
+				"preserve"
+			],
+			type: "string"
+		},
+		semi: {
+			description: `Print semicolons at the ends of statements. (Default: true)`,
+			type: "boolean"
+		},
+		singleAttributePerLine: {
+			description: `Put each attribute on a new line in JSX. (Default: false)`,
+			type: "boolean"
+		},
+		singleQuote: {
+			description: `Use single quotes instead of double quotes. (Default: false)`,
+			type: "boolean"
+		},
+		sortImports: {
 			additionalProperties: false,
 			description: `Experimental: Sort import statements. Disabled by default.`,
 			type: "object",
@@ -203,17 +268,38 @@ const oxfmtOptionsSchema = {
 							groupName: {
 								description: `Name of the custom group, used in the groups option.`,
 								type: "string"
+							},
+							modifiers: {
+								description: `Modifiers to match the import characteristics.\nAll specified modifiers must be present (AND logic).\n\nPossible values: "side_effect", "type", "value", "default", "wildcard", "named"`,
+								type: "array",
+								items: { type: "string" }
+							},
+							selector: {
+								description: `Selector to match the import kind.\n\nPossible values: "type", "side_effect_style", "side_effect", "style", "index", "sibling", "parent", "subpath", "internal", "builtin", "external", "import"`,
+								type: "string"
 							}
 						}
 					}
 				},
 				groups: {
-					description: `Specifies a list of predefined import groups for sorting.\n\nEach import will be assigned a single group specified in the groups option (or the unknown group if no match is found).\nThe order of items in the groups option determines how groups are ordered.\n\nWithin a given group, members will be sorted according to the type, order, ignoreCase, etc. options.\n\nIndividual groups can be combined together by placing them in an array.\nThe order of groups in that array does not matter.\nAll members of the groups in the array will be sorted together as if they were part of a single group.\n\nPredefined groups are characterized by a single selector and potentially multiple modifiers.\nYou may enter modifiers in any order, but the selector must always come at the end.\n\nThe list of selectors is sorted from most to least important:\n- type — TypeScript type imports.\n- side-effect-style — Side effect style imports.\n- side-effect — Side effect imports.\n- style — Style imports.\n- index — Main file from the current directory.\n- sibling — Modules from the same directory.\n- parent — Modules from the parent directory.\n- subpath — Node.js subpath imports.\n- internal — Your internal modules.\n- builtin — Node.js Built-in Modules.\n- external — External modules installed in the project.\n- import — Any import.\n\nThe list of modifiers is sorted from most to least important:\n- side-effect — Side effect imports.\n- type — TypeScript type imports.\n- value — Value imports.\n- default — Imports containing the default specifier.\n- wildcard — Imports containing the wildcard (* as) specifier.\n- named — Imports containing at least one named specifier.\n- multiline — Imports on multiple lines.\n- singleline — Imports on a single line.\n\nSee also <https://perfectionist.dev/rules/sort-imports#groups> for details.\n\n- (Default: See below\njson\n[\n"type-import",\n["value-builtin", "value-external"],\n"type-internal",\n"value-internal",\n["type-parent", "type-sibling", "type-index"],\n["value-parent", "value-sibling", "value-index"],\n"unknown",\n])`,
+					description: `Specifies a list of predefined import groups for sorting.\n\nEach import will be assigned a single group specified in the groups option (or the \`unknown\` group if no match is found).\nThe order of items in the \`groups\` option determines how groups are ordered.\n\nWithin a given group, members will be sorted according to the type, order, ignoreCase, etc. options.\n\nIndividual groups can be combined together by placing them in an array.\nThe order of groups in that array does not matter.\nAll members of the groups in the array will be sorted together as if they were part of a single group.\n\nPredefined groups are characterized by a single selector and potentially multiple modifiers.\nYou may enter modifiers in any order, but the selector must always come at the end.\n\nThe list of selectors is sorted from most to least important:\n- \`type\` — TypeScript type imports.\n- \`side_effect_style\` — Side effect style imports.\n- \`side_effect\` — Side effect imports.\n- \`style\` — Style imports.\n- \`index\` — Main file from the current directory.\n- \`sibling\` — Modules from the same directory.\n- \`parent\` — Modules from the parent directory.\n- \`subpath\` — Node.js subpath imports.\n- \`internal\` — Your internal modules.\n- \`builtin\` — Node.js Built-in Modules.\n- \`external\` — External modules installed in the project.\n- \`import\` — Any import.\n\nThe list of modifiers is sorted from most to least important:\n- \`side_effect\` — Side effect imports.\n- \`type\` — TypeScript type imports.\n- \`value\` — Value imports.\n- \`default\` — Imports containing the default specifier.\n- \`wildcard\` — Imports containing the wildcard (\`* as\`) specifier.\n- \`named\` — Imports containing at least one named specifier.\n\n- Default: See below\n\`\`\`json\n[\n\"builtin\",\n\"external\",\n[\"internal\", \"subpath\"],\n[\"parent\", \"sibling\", \"index\"],\n\"style\",\n\"unknown\"\n]\n\`\`\`\n\nAlso, you can override the global \`newlinesBetween\` setting for specific group boundaries\nby including a \`{ \"newlinesBetween\": boolean }\` marker object in the \`groups\` list at the desired position.`,
 					type: "array",
-					items: { anyOf: [{ type: "string" }, {
-						type: "array",
-						items: { type: "string" }
-					}] }
+					items: { anyOf: [
+						{ type: "string" },
+						{
+							type: "array",
+							items: { type: "string" }
+						},
+						{
+							additionalProperties: false,
+							required: ["newlinesBetween"],
+							type: "object",
+							properties: { newlinesBetween: {
+								description: `A marker object for overriding \`newlinesBetween\` at a specific group boundary.`,
+								type: "boolean"
+							} }
+						}
+					] }
 				},
 				ignoreCase: {
 					description: `Ignore case when sorting. (Default: true)`,
@@ -247,7 +333,7 @@ const oxfmtOptionsSchema = {
 				}
 			}
 		},
-		experimentalSortPackageJson: {
+		sortPackageJson: {
 			description: `Experimental: Sort package.json keys. (Default: true)`,
 			oneOf: [{ type: "boolean" }, {
 				additionalProperties: false,
@@ -258,7 +344,7 @@ const oxfmtOptionsSchema = {
 				} }
 			}]
 		},
-		experimentalTailwindcss: {
+		sortTailwindcss: {
 			additionalProperties: false,
 			description: `Experimental: Enable Tailwind CSS class sorting in JSX class/className attributes.\nWhen enabled, class strings will be collected and passed to a callback for sorting.\nPass an object with options from "prettier-plugin-tailwindcss".\n\n- (Default: disabled)`,
 			type: "object",
@@ -291,71 +377,6 @@ const oxfmtOptionsSchema = {
 				}
 			}
 		},
-		htmlWhitespaceSensitivity: {
-			description: `Specify the global whitespace sensitivity for HTML, Vue, Angular, and Handlebars.\n\n- (Default: "css")`,
-			enum: [
-				"css",
-				"ignore",
-				"strict"
-			],
-			type: "string"
-		},
-		ignorePatterns: {
-			description: `Ignore files matching these glob patterns. Current working directory is used as the root.`,
-			type: "array",
-			items: { type: "string" }
-		},
-		insertFinalNewline: {
-			description: `Whether to insert a final newline at the end of the file. (Default: true)`,
-			type: "boolean"
-		},
-		jsxSingleQuote: {
-			description: `Use single quotes instead of double quotes in JSX. (Default: false)`,
-			type: "boolean"
-		},
-		objectWrap: {
-			description: `How to wrap object literals when they could fit on one line or span multiple lines. (Default: "preserve")\nNOTE: In addition to Prettier's "preserve" and "collapse", we also support "always".`,
-			enum: [
-				"preserve",
-				"collapse",
-				"always"
-			],
-			type: "string"
-		},
-		printWidth: {
-			description: `The line length that the printer will wrap on. (Default: 100)`,
-			type: "integer"
-		},
-		proseWrap: {
-			description: `How to wrap prose.\n\nBy default, formatter will not change wrapping in markdown text since some services use a linebreak-sensitive renderer, e.g. GitHub comments and BitBucket.\nTo wrap prose to the print width, change this option to "always".\nIf 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".\n\n- (Default: "preserve")`,
-			enum: [
-				"always",
-				"never",
-				"preserve"
-			],
-			type: "string"
-		},
-		quoteProps: {
-			description: `Change when properties in objects are quoted. (Default: "as-needed")`,
-			enum: [
-				"as-needed",
-				"consistent",
-				"preserve"
-			],
-			type: "string"
-		},
-		semi: {
-			description: `Print semicolons at the ends of statements. (Default: true)`,
-			type: "boolean"
-		},
-		singleAttributePerLine: {
-			description: `Put each attribute on a new line in JSX. (Default: false)`,
-			type: "boolean"
-		},
-		singleQuote: {
-			description: `Use single quotes instead of double quotes. (Default: false)`,
-			type: "boolean"
-		},
 		tabWidth: {
 			description: `Number of spaces per indentation level. (Default: 2)`,
 			type: "integer"
@@ -435,7 +456,7 @@ let formatViaOxfmt;
 const oxfmt = {
 	meta: {
 		defaultOptions: [],
-		fixable: "code",
+		fixable: "whitespace",
 		messages,
 		schema: [oxfmtRuleSchema],
 		type: "layout",
@@ -448,7 +469,7 @@ const oxfmt = {
 	create(context) {
 		if (!formatViaOxfmt) formatViaOxfmt = createSyncFn(join(dirWorkers, "oxfmt.mjs"));
 		const sourceText = context.sourceCode.text;
-		return { Program() {
+		return { [context.sourceCode.ast.type || "Program"]() {
 			try {
 				const formatResult = formatViaOxfmt(context.filename, sourceText, {
 					...context.options?.[0],
@@ -464,10 +485,10 @@ const oxfmt = {
 								end,
 								start
 							},
-							message: error.message
+							message: `Failed to format code: ${error.message}`
 						});
 					} else context.report({
-						message: error.message,
+						message: `Failed to format code: ${error.message}`,
 						loc: {
 							end: {
 								column: 0,
@@ -483,7 +504,7 @@ const oxfmt = {
 				else reportDifferences(context, sourceText, formatResult.code);
 			} catch {
 				context.report({
-					message: `Failed to format file ${context.filename}`,
+					message: `Failed to format file: ${context.filename}`,
 					loc: {
 						end: {
 							column: 0,

package/dts/rule-options.d.ts

@@ -24,16 +24,45 @@ export type OxfmtOxfmt = []|[{
   
   endOfLine?: ("lf" | "crlf" | "cr")
   
-  experimentalSortImports?: {
+  htmlWhitespaceSensitivity?: ("css" | "ignore" | "strict")
+  
+  ignorePatterns?: string[]
+  
+  insertFinalNewline?: boolean
+  
+  jsxSingleQuote?: boolean
+  
+  objectWrap?: ("preserve" | "collapse" | "always")
+  
+  printWidth?: number
+  
+  proseWrap?: ("always" | "never" | "preserve")
+  
+  quoteProps?: ("as-needed" | "consistent" | "preserve")
+  
+  semi?: boolean
+  
+  singleAttributePerLine?: boolean
+  
+  singleQuote?: boolean
+  
+  sortImports?: {
     
     customGroups?: {
       
       elementNamePattern?: string[]
       
       groupName?: string
+      
+      modifiers?: string[]
+      
+      selector?: string
     }[]
     
-    groups?: (string | string[])[]
+    groups?: (string | string[] | {
+      
+      newlinesBetween: boolean
+    })[]
     
     ignoreCase?: boolean
     
@@ -50,12 +79,12 @@ export type OxfmtOxfmt = []|[{
     sortSideEffects?: boolean
   }
   
-  experimentalSortPackageJson?: (boolean | {
+  sortPackageJson?: (boolean | {
     
     sortScripts?: boolean
   })
   
-  experimentalTailwindcss?: {
+  sortTailwindcss?: {
     
     attributes?: string[]
     
@@ -70,28 +99,6 @@ export type OxfmtOxfmt = []|[{
     stylesheet?: string
   }
   
-  htmlWhitespaceSensitivity?: ("css" | "ignore" | "strict")
-  
-  ignorePatterns?: string[]
-  
-  insertFinalNewline?: boolean
-  
-  jsxSingleQuote?: boolean
-  
-  objectWrap?: ("preserve" | "collapse" | "always")
-  
-  printWidth?: number
-  
-  proseWrap?: ("always" | "never" | "preserve")
-  
-  quoteProps?: ("as-needed" | "consistent" | "preserve")
-  
-  semi?: boolean
-  
-  singleAttributePerLine?: boolean
-  
-  singleQuote?: boolean
-  
   tabWidth?: number
   
   trailingComma?: ("all" | "es5" | "none")
@@ -122,16 +129,45 @@ export type OxfmtOxfmt = []|[{
       
       endOfLine?: ("lf" | "crlf" | "cr")
       
-      experimentalSortImports?: {
+      htmlWhitespaceSensitivity?: ("css" | "ignore" | "strict")
+      
+      ignorePatterns?: string[]
+      
+      insertFinalNewline?: boolean
+      
+      jsxSingleQuote?: boolean
+      
+      objectWrap?: ("preserve" | "collapse" | "always")
+      
+      printWidth?: number
+      
+      proseWrap?: ("always" | "never" | "preserve")
+      
+      quoteProps?: ("as-needed" | "consistent" | "preserve")
+      
+      semi?: boolean
+      
+      singleAttributePerLine?: boolean
+      
+      singleQuote?: boolean
+      
+      sortImports?: {
         
         customGroups?: {
           
           elementNamePattern?: string[]
           
           groupName?: string
+          
+          modifiers?: string[]
+          
+          selector?: string
         }[]
         
-        groups?: (string | string[])[]
+        groups?: (string | string[] | {
+          
+          newlinesBetween: boolean
+        })[]
         
         ignoreCase?: boolean
         
@@ -148,12 +184,12 @@ export type OxfmtOxfmt = []|[{
         sortSideEffects?: boolean
       }
       
-      experimentalSortPackageJson?: (boolean | {
+      sortPackageJson?: (boolean | {
         
         sortScripts?: boolean
       })
       
-      experimentalTailwindcss?: {
+      sortTailwindcss?: {
         
         attributes?: string[]
         
@@ -168,28 +204,6 @@ export type OxfmtOxfmt = []|[{
         stylesheet?: string
       }
       
-      htmlWhitespaceSensitivity?: ("css" | "ignore" | "strict")
-      
-      ignorePatterns?: string[]
-      
-      insertFinalNewline?: boolean
-      
-      jsxSingleQuote?: boolean
-      
-      objectWrap?: ("preserve" | "collapse" | "always")
-      
-      printWidth?: number
-      
-      proseWrap?: ("always" | "never" | "preserve")
-      
-      quoteProps?: ("as-needed" | "consistent" | "preserve")
-      
-      semi?: boolean
-      
-      singleAttributePerLine?: boolean
-      
-      singleQuote?: boolean
-      
       tabWidth?: number
       
       trailingComma?: ("all" | "es5" | "none")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-oxfmt",
   "type": "module",
-  "version": "0.0.15",
+  "version": "0.1.1",
   "description": "An ESLint plugin for formatting code with oxfmt.",
   "keywords": [
     "eslint",
@@ -43,8 +43,8 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "eslint": "^9.5.0",
-    "oxfmt": "0.x"
+    "eslint": "^9.5.0 || ^10.0.0",
+    "oxfmt": ">=0.35.0"
   },
   "dependencies": {
     "generate-differences": "^0.1.1",
@@ -53,26 +53,26 @@
     "synckit": "^0.11.12"
   },
   "devDependencies": {
-    "@ntnyq/eslint-config": "^6.0.0-beta.8",
+    "@ntnyq/eslint-config": "^6.0.0-beta.9",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^25.2.3",
-    "@typescript/native-preview": "^7.0.0-dev.20260212.1",
+    "@types/node": "^25.3.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260224.1",
     "bumpp": "^10.4.1",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.2",
     "eslint-parser-plain": "^0.1.1",
-    "eslint-typegen": "^2.3.0",
+    "eslint-typegen": "^2.3.1",
     "eslint-vitest-rule-tester": "^3.1.0",
     "husky": "^9.1.7",
     "nano-staged": "^0.9.0",
     "npm-run-all2": "^8.0.4",
-    "oxfmt": "^0.32.0",
+    "oxfmt": "^0.35.0",
     "show-invisibles": "^0.0.2",
     "tinyglobby": "^0.2.15",
     "tsdown": "^0.20.3",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18",
-    "eslint-plugin-oxfmt": "0.0.15"
+    "eslint-plugin-oxfmt": "0.1.1"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"