pasika 0.10.144 → 0.10.146

package/dist/eslint/pasika/index.js

@@ -11524,6 +11524,16 @@ function sectionOf(symbol) {
   if (symbol.kind === "keyframes") return "keyframes";
   return symbol.kind;
 }
+function scopeOf(symbol, sheet) {
+  const enclosing = [...sheet.children].find(
+    (node) => node.loc && node.loc.start.line <= symbol.line && node.loc.end.line >= symbol.line
+  );
+  if (!enclosing?.loc) return "top-level";
+  if (symbol.kind === "theme-token" || symbol.kind === "root-variable" || enclosing.type === "Atrule" && enclosing.name === "layer") {
+    return `block:${enclosing.loc.start.offset.toString()}`;
+  }
+  return "top-level";
+}
 function ownerOf(symbol, graph, root) {
   const references = graph.references.filter((ref) => {
     if (ref.source !== "module" || !/\.(?:tsx|jsx)$/u.test(ref.file) || /\.(?:test|spec|stories)\.(?:tsx|jsx)$/u.test(ref.file)) {
@@ -11578,26 +11588,56 @@ var themeTokenOrderRule = {
       (symbol) => ["theme-token", "utility", "keyframes", "root-variable", "selector", "font-face"].includes(symbol.kind)
     ).map((symbol) => ({
       symbol,
-      group: groups.filter((group) => group.line < symbol.line).at(-1),
       owner: ownerOf(symbol, graph, root),
-      section: sectionOf(symbol)
+      section: sectionOf(symbol),
+      scope: scopeOf(symbol, context.sourceCode.ast)
     })).sort((a, b) => a.symbol.line - b.symbol.line);
+    let activeGroup;
+    let previousItem;
+    for (const item of items) {
+      const previousLine = previousItem?.symbol.line ?? 0;
+      const intervening = groups.filter((group) => group.line > previousLine && group.line < item.symbol.line).at(-1);
+      const previousScope = previousItem?.scope;
+      if (item.section !== previousItem?.section || item.scope !== previousScope) activeGroup = intervening;
+      else if (intervening) activeGroup = intervening;
+      item.group = activeGroup;
+      previousItem = item;
+    }
     return {
       "StyleSheet:exit"(node) {
+        for (const group of groups.filter((entry) => entry.label === "global")) {
+          context.report({
+            node,
+            loc: { start: { line: group.line, column: 1 }, end: { line: group.line, column: 2 } },
+            message: "Global CSS definitions must not have a group comment.",
+            fix(fixer) {
+              const start = context.sourceCode.getIndexFromLoc({ line: group.line, column: 1 });
+              const end = start + (lines[group.line - 1] ?? "").length;
+              const remaining = context.sourceCode.text.slice(end);
+              let newline = 0;
+              if (remaining.startsWith("\r\n")) newline = 2;
+              else if (remaining.startsWith("\n")) newline = 1;
+              return fixer.removeRange([start, end + newline]);
+            }
+          });
+        }
         let previous;
         for (const item of items) {
           const currentGroup = item.group;
           const actual = currentGroup?.label;
+          const reportedGroup = actual ?? "none";
           let message;
-          if (!currentGroup) {
-            message = `CSS definition "${item.symbol.name}" requires a component-path group comment (or /* Group: global */).`;
-          } else if (actual !== item.owner) {
-            message = `CSS definition "${item.symbol.name}" belongs to group "${item.owner}", not "${currentGroup.label}".`;
-          } else if (previous?.section === item.section && previous.group) {
-            if (previous.group !== currentGroup && previous.group.label.localeCompare(currentGroup.label) > 0) {
+          if (item.owner === "global" && currentGroup && currentGroup.label !== "global") {
+            message = "Global definitions must be ungrouped.";
+          } else if (item.owner !== "global" && !currentGroup) {
+            message = `CSS definition "${item.symbol.name}" requires a component-path group comment.`;
+          } else if (item.owner !== "global" && actual !== item.owner) {
+            message = `CSS definition "${item.symbol.name}" belongs to group "${item.owner}", not "${reportedGroup}".`;
+          } else if (previous?.section === item.section && previous.scope === item.scope) {
+            if (previous.owner !== item.owner && previous.owner.localeCompare(item.owner) > 0) {
               message = `CSS consumer groups in ${item.section} must be ordered alphabetically by path.`;
-            } else if (previous.group === currentGroup && previous.symbol.name.localeCompare(item.symbol.name) > 0) {
-              message = `CSS definitions in group "${previous.group.label}" must be alphabetical: "${item.symbol.name}" comes before "${previous.symbol.name}".`;
+            } else if (previous.owner === item.owner && previous.symbol.name.localeCompare(item.symbol.name) > 0) {
+              message = `CSS definitions in group "${item.owner}" must be alphabetical: "${item.symbol.name}" comes before "${previous.symbol.name}".`;
             }
           }
           if (message) {
@@ -11606,7 +11646,7 @@ var themeTokenOrderRule = {
               node,
               loc: { start: { line, column: 1 }, end: { line, column: 2 } },
               message,
-              ...currentGroup && actual !== item.owner && items.filter((candidate) => candidate.group === currentGroup).length === 1 ? {
+              ...item.owner !== "global" && currentGroup && actual !== item.owner && items.filter((candidate) => candidate.group === currentGroup).length === 1 ? {
                 fix(fixer) {
                   const start = context.sourceCode.getIndexFromLoc({ line: currentGroup.line, column: 1 });
                   const end = start + (lines[currentGroup.line - 1] ?? "").length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pasika",
-  "version": "0.10.144",
+  "version": "0.10.146",
   "description": "Reusable agent setup package",
   "repository": {
     "type": "git",