@master/eslint-plugin-css 2.0.0-rc.85 → 2.0.0-rc.86

package/dist/configs/base.d.ts

@@ -1,5 +1,4 @@
 import { Linter } from "eslint";
-
 //#region src/configs/base.d.ts
 declare const _default: Linter.Config;
 //#endregion

package/dist/configs/legacy.d.ts

@@ -1,5 +1,4 @@
 import { Linter } from "eslint";
-
 //#region src/configs/legacy.d.ts
 declare const _default: Linter.LegacyConfig;
 //#endregion

package/dist/configs/recommended.d.ts

@@ -1,5 +1,4 @@
 import { Linter } from "eslint";
-
 //#region src/configs/recommended.d.ts
 declare const _default: Linter.Config;
 //#endregion

package/dist/configs/stylesheet.d.ts

@@ -1,5 +1,4 @@
 import { Linter } from "eslint";
-
 //#region src/configs/stylesheet.d.ts
 declare const _default: Linter.Config;
 //#endregion

package/dist/create-rule.d.ts

@@ -1,11 +1,6 @@
 import { ESLintUtils } from "@typescript-eslint/utils";
-
 //#region src/create-rule.d.ts
-declare const _default: <Options extends readonly unknown[], MessageIds extends string>({
-  meta,
-  name,
-  ...rule
-}: Readonly<ESLintUtils.RuleWithMetaAndName<Options, MessageIds, unknown>>) => ESLintUtils.RuleModule<MessageIds, Options, unknown, ESLintUtils.RuleListener> & {
+declare const _default: <Options extends readonly unknown[], MessageIds extends string>({ meta, name, ...rule }: Readonly<ESLintUtils.RuleWithMetaAndName<Options, MessageIds, unknown>>) => ESLintUtils.RuleModule<MessageIds, Options, unknown, ESLintUtils.RuleListener> & {
   name: string;
 };
 //#endregion

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { TSESLint } from "@typescript-eslint/utils";
 import { Linter } from "eslint";
 import settings from "./settings.js";
-
 //#region src/index.d.ts
 declare const masterCSSPlugin: Omit<TSESLint.Linter.Plugin, 'configs'> & {
   configs: {

package/dist/plugin.d.ts

@@ -1,5 +1,4 @@
 import { TSESLint } from "@typescript-eslint/utils";
-
 //#region src/plugin.d.ts
 declare const plugin: TSESLint.Linter.Plugin;
 //#endregion

package/dist/rules/no-conflicting-classes.js

@@ -12,7 +12,7 @@ var no_conflicting_classes_default = create_rule_default({
 		docs: { description: "Disallow conflicting Master CSS classes" },
 		messages: {
 			collisionClass: "{{message}}",
-			partialCollisionClass: "Prefer \"{{replacement}}\" over \"{{actual}}\" because \"{{conflict}}\" overrides part of it."
+			partialCollisionClass: "{{message}}"
 		},
 		fixable: "code",
 		schema: []

package/dist/rules/no-invalid-classes.d.ts

@@ -1,5 +1,5 @@
 //#region src/rules/no-invalid-classes.d.ts
-declare const _default: import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidClass" | "disallowUnknownClass", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
+declare const _default: import("@typescript-eslint/utils/ts-eslint").RuleModule<"disallowUnknownClass" | "invalidClass", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
   name: string;
 };
 //#endregion

package/dist/rules/no-unapproved-raw-values.js

@@ -10,7 +10,7 @@ var no_unapproved_raw_values_default = create_rule_default({
 	meta: {
 		type: "suggestion",
 		docs: { description: "Disallow unapproved raw values in token-backed Master CSS classes" },
-		messages: { unapprovedRawValue: "Unexpected raw value \"{{value}}\" in \"{{className}}\". Use a token or allow it explicitly." },
+		messages: { unapprovedRawValue: "{{message}}" },
 		fixable: null,
 		schema: [{
 			type: "object",

package/dist/rules/prefer-canonical-classes.d.ts

@@ -1,5 +1,4 @@
 import { CanonicalClassNameOptions } from "@master/css-lint";
-
 //#region src/rules/prefer-canonical-classes.d.ts
 declare const _default: import("@typescript-eslint/utils/ts-eslint").RuleModule<"preferClass", [Required<CanonicalClassNameOptions>], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener> & {
   name: string;

package/dist/rules/prefer-canonical-classes.js

@@ -11,7 +11,7 @@ var prefer_canonical_classes_default = create_rule_default({
 	meta: {
 		type: "suggestion",
 		docs: { description: "Prefer canonical Master CSS classes" },
-		messages: { preferClass: "Prefer \"{{recommended}}\" over \"{{actual}}\"." },
+		messages: { preferClass: "{{message}}" },
 		fixable: "code",
 		schema: [{
 			type: "object",

package/dist/rules/sort-classes.js

@@ -11,7 +11,7 @@ var sort_classes_default = create_rule_default({
 		type: "layout",
 		fixable: "code",
 		docs: { description: "Sort Master CSS classes" },
-		messages: { invalidClassOrder: "No consistent class order followed." },
+		messages: { invalidClassOrder: "{{message}}" },
 		schema: []
 	},
 	defaultOptions: [],

package/dist/settings-schema.d.ts

@@ -1,5 +1,4 @@
 import { JSONSchema4 } from "@typescript-eslint/utils/json-schema";
-
 //#region src/settings-schema.d.ts
 declare const masterCSSSettingsSchema: JSONSchema4;
 declare const noInvalidClassesOptionsSchema: JSONSchema4;

package/dist/settings.d.ts

@@ -1,12 +1,11 @@
 import { MasterCSSManifest } from "./utils/master-css.js";
-
 //#region src/settings.d.ts
 declare const settings: {
-  manifest: any;
   classAttributes: string[];
   classFunctions: string[];
   classDeclarations: string[];
   ignoredKeys: string[];
+  manifest: any;
 };
 interface Settings {
   classAttributes?: string[];

package/dist/stylesheet-parser.d.ts

@@ -6,9 +6,9 @@ declare const _default: {
   parseForESLint(source: string): {
     ast: {
       type: string;
-      body: any[];
-      comments: any[];
-      tokens: any[];
+      body: undefined[];
+      comments: undefined[];
+      tokens: undefined[];
       sourceType: string;
       range: number[];
       loc: {
@@ -23,7 +23,7 @@ declare const _default: {
       };
     };
     visitorKeys: {
-      Program: any[];
+      Program: undefined[];
     };
   };
 };

package/dist/utils/define-source-visitors.d.ts

@@ -1,7 +1,6 @@
 import { MasterCSSLintContentRuleOptions, MasterCSSLintRuleId } from "@master/css-lint";
 import { MasterCSS } from "@master/css-engine";
 import { RuleContext, RuleListener } from "@typescript-eslint/utils/ts-eslint";
-
 //#region src/utils/define-source-visitors.d.ts
 type SourceRuleOptions = MasterCSSLintContentRuleOptions[keyof MasterCSSLintContentRuleOptions];
 interface DefineSourceVisitorsOptions {
@@ -11,11 +10,6 @@ interface DefineSourceVisitorsOptions {
   ruleOptions?: SourceRuleOptions;
 }
 declare function shouldUseSourceVisitors(context: RuleContext<any, any[]>): boolean;
-declare function defineSourceVisitors({
-  context,
-  css,
-  ruleId,
-  ruleOptions
-}: DefineSourceVisitorsOptions): RuleListener;
+declare function defineSourceVisitors({ context, css, ruleId, ruleOptions }: DefineSourceVisitorsOptions): RuleListener;
 //#endregion
 export { defineSourceVisitors as default, shouldUseSourceVisitors };

package/dist/utils/define-source-visitors.js

@@ -1,4 +1,4 @@
-import { messageIdByCode, stringifyLintDiagnosticData } from "./report-lint-diagnostics.js";
+import { messageIdByCode, stringifyLintDiagnosticMessageData } from "./report-lint-diagnostics.js";
 import { lintMasterCSSContent, masterCSSLintRuleIds } from "@master/css-lint";
 //#region src/utils/define-source-visitors.ts
 const SOURCE_LINT_FILE_RE = /\.mdx$/i;
@@ -27,7 +27,7 @@ function reportSourceDiagnostic(context, node, diagnostic) {
 		},
 		...messageId ? {
 			messageId,
-			data: stringifyLintDiagnosticData(diagnostic.data || { message: diagnostic.message })
+			data: stringifyLintDiagnosticMessageData(diagnostic)
 		} : { message: diagnostic.message }
 	};
 	if (fix) descriptor.fix = (fixer) => fixer.replaceTextRange([fix.range.start, fix.range.end], fix.text);

package/dist/utils/define-visitors.d.ts

@@ -2,12 +2,8 @@ import { TSESTree } from "@typescript-eslint/utils";
 import { Settings } from "../settings.js";
 import { RuleContext, RuleListener } from "@typescript-eslint/utils/ts-eslint";
 import resolveClassNode from "./resolve-class-node.js";
-
 //#region src/utils/define-visitors.d.ts
-declare function defineVisitors({
-  context,
-  settings
-}: {
+declare function defineVisitors({ context, settings }: {
   context: RuleContext<any, any[]>;
   settings: Settings;
 }, visitNode: (node: TSESTree.Node, resolved: ReturnType<typeof resolveClassNode>) => void): RuleListener;

package/dist/utils/master-css.d.ts

@@ -1,6 +1,5 @@
 import { createCSSWithNativeDeclarations } from "@master/css-validator";
 import { MasterCSS, MasterCSSManifest } from "@master/css";
-
 //#region src/utils/master-css.d.ts
 declare const defaultManifest: MasterCSSManifest;
 //#endregion

package/dist/utils/report-lint-diagnostics.d.ts

@@ -2,7 +2,6 @@ import { TSESTree } from "@typescript-eslint/utils";
 import { MasterCSSLintDiagnostic, MasterCSSLintFix } from "@master/css-lint";
 import { RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import { ResolvedClassNode } from "./resolve-class-node.js";
-
 //#region src/utils/report-lint-diagnostics.d.ts
 type FixRange = [number, number];
 interface ReportLintDiagnosticsOptions {
@@ -15,6 +14,9 @@ declare const messageIdByCode: Record<string, string>;
 declare function stringifyLintDiagnosticData(data?: MasterCSSLintDiagnostic['data']): {
   [k: string]: string;
 };
+declare function stringifyLintDiagnosticMessageData(diagnostic: Pick<MasterCSSLintDiagnostic, 'data' | 'message'>): {
+  [k: string]: string;
+};
 declare function reportLintDiagnostics(context: RuleContext<any, any[]>, node: TSESTree.Node, resolved: ResolvedClassNode, diagnostics: MasterCSSLintDiagnostic[], options?: ReportLintDiagnosticsOptions): void;
 //#endregion
-export { reportLintDiagnostics as default, messageIdByCode, stringifyLintDiagnosticData };
+export { reportLintDiagnostics as default, messageIdByCode, stringifyLintDiagnosticData, stringifyLintDiagnosticMessageData };

package/dist/utils/report-lint-diagnostics.js

@@ -13,6 +13,12 @@ const messageIdByCode = {
 function stringifyLintDiagnosticData(data = {}) {
 	return Object.fromEntries(Object.entries(data).filter(([, value]) => value !== void 0).map(([key, value]) => [key, Array.isArray(value) ? value.join(", ") : String(value)]));
 }
+function stringifyLintDiagnosticMessageData(diagnostic) {
+	return stringifyLintDiagnosticData({
+		...diagnostic.data,
+		message: diagnostic.message
+	});
+}
 function defaultFix(resolved, fix) {
 	if (fix.scope === "directive") return;
 	return {
@@ -35,7 +41,7 @@ function reportLintDiagnostics(context, node, resolved, diagnostics, options = {
 			},
 			...messageId ? {
 				messageId,
-				data: stringifyLintDiagnosticData(diagnostic.data || { message: diagnostic.message })
+				data: stringifyLintDiagnosticMessageData(diagnostic)
 			} : { message: diagnostic.message }
 		};
 		if (fix) descriptor.fix = (fixer) => fixer.replaceTextRange(fix.range, fix.text);
@@ -43,4 +49,4 @@ function reportLintDiagnostics(context, node, resolved, diagnostics, options = {
 	}
 }
 //#endregion
-export { reportLintDiagnostics as default, messageIdByCode, stringifyLintDiagnosticData };
+export { reportLintDiagnostics as default, messageIdByCode, stringifyLintDiagnosticData, stringifyLintDiagnosticMessageData };

package/dist/utils/resolve-class-node.d.ts

@@ -1,5 +1,4 @@
 import { RuleContext } from "@typescript-eslint/utils/ts-eslint";
-
 //#region src/utils/resolve-class-node.d.ts
 type ResolvedClassListUnescape = string | false;
 interface ResolvedClassListNode {

package/dist/utils/resolve-compose-directive-class-nodes.d.ts

@@ -1,6 +1,5 @@
 import { RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import { ResolvedClassNode } from "./resolve-class-node.js";
-
 //#region src/utils/resolve-compose-directive-class-nodes.d.ts
 interface ResolvedComposeDirectiveClassNode extends ResolvedClassNode {
   directiveStart: number;

package/dist/utils/resolve-context.d.ts

@@ -1,14 +1,13 @@
 import { MasterCSS } from "./master-css.js";
 import { RuleContext } from "@typescript-eslint/utils/ts-eslint";
-
 //#region src/utils/resolve-context.d.ts
 declare function resolveContext(context: RuleContext<any, any[]>): {
   settings: {
-    manifest: any;
     classAttributes: string[];
     classFunctions: string[];
     classDeclarations: string[];
     ignoredKeys: string[];
+    manifest: any;
   };
   options: any;
   css: MasterCSS;

package/dist/utils/with-visit-class-node.d.ts

@@ -1,7 +1,6 @@
 import { TSESTree } from "@typescript-eslint/utils";
 import { RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import resolveClassNode from "./resolve-class-node.js";
-
 //#region src/utils/with-visit-class-node.d.ts
 declare function withVisitClassNode(visit: (node: TSESTree.Node, resolved: ReturnType<typeof resolveClassNode>) => void, context: RuleContext<any, any[]>): (node: any) => void;
 //#endregion

package/package.json

@@ -47,12 +47,12 @@
   "dependencies": {
     "@typescript-eslint/utils": "^8.61.1",
     "typescript-eslint": "^8.61.1",
-    "@master/css": "^2.0.0-rc.85",
-    "@master/css-lexer": "^2.0.0-rc.85",
-    "@master/css-lint": "^2.0.0-rc.85",
-    "@master/css-project": "^2.0.0-rc.85",
-    "@master/css-preset": "^2.0.0-rc.85",
-    "@master/css-validator": "^2.0.0-rc.85"
+    "@master/css": "^2.0.0-rc.86",
+    "@master/css-lint": "^2.0.0-rc.86",
+    "@master/css-project": "^2.0.0-rc.86",
+    "@master/css-preset": "^2.0.0-rc.86",
+    "@master/css-lexer": "^2.0.0-rc.86",
+    "@master/css-validator": "^2.0.0-rc.86"
   },
   "devDependencies": {
     "@angular-eslint/template-parser": "^21.4.0",
@@ -65,9 +65,9 @@
     "svelte-eslint-parser": "^1.8.0",
     "ts-node": "^10.9.2",
     "vue-eslint-parser": "^10.4.1",
-    "@master/css-schema": "^2.0.0-rc.85"
+    "@master/css-schema": "^2.0.0-rc.86"
   },
-  "version": "2.0.0-rc.85",
+  "version": "2.0.0-rc.86",
   "scripts": {
     "build": "tsdown --config ../../shared/tsdown-package.config.ts",
     "dev": "tsdown --config ../../shared/tsdown-package.config.ts --watch",