pasika 0.10.112 → 0.10.113

package/dist/eslint/pasika/index.js

@@ -10376,12 +10376,21 @@ function applyOperationCount(utility) {
   return count;
 }
 function themeCandidate(name, utilityText) {
-  const match = /^@utility\s+[\w-]+\s*\{\s*@apply\s+\[(?<property>font-size|letter-spacing):(?<value>[^\]\r\n;{}]+)\];?\s*\}$/u.exec(
-    utilityText.trim()
+  const source = utilityText.trim();
+  const arbitrary = /^@utility\s+[\w-]+\s*\{\s*@apply\s+\[(?<property>font-size|letter-spacing):(?<value>[^\]\r\n;{}]+)\];?\s*\}$/u.exec(
+    source
   );
-  if (!match) return void 0;
-  const property = match.groups?.property;
-  const value = match.groups?.value?.trim();
+  const typed = /^@utility\s+[\w-]+\s*\{\s*@apply\s+(?<kind>text|tracking)-\((?<hint>length:)?(?<variable>--[a-z][a-z0-9-]*)\);?\s*\}$/u.exec(
+    source
+  );
+  const kind = typed?.groups?.kind;
+  const hint = typed?.groups?.hint;
+  if (kind === "text" && hint !== "length:") return void 0;
+  if (kind === "tracking" && hint !== void 0) return void 0;
+  let property = arbitrary?.groups?.property;
+  if (!property && kind === "text") property = "font-size";
+  if (!property && kind === "tracking") property = "letter-spacing";
+  const value = arbitrary?.groups?.value?.trim() ?? (typed?.groups?.variable ? `var(${typed.groups.variable})` : void 0);
   if (!property || !value) return void 0;
   const prefix = property === "font-size" ? "text-" : "tracking-";
   if (!name.startsWith(prefix) || name.length === prefix.length) return void 0;
@@ -10428,98 +10437,87 @@ function isTypographySize(name) {
 }
 var utilityMappingRule = {
   meta: {
-    schema: [
-      {
-        type: "object",
-        properties: { preferThemeTokens: { type: "boolean" } },
-        additionalProperties: false
-      }
-    ],
+    schema: [],
     type: "problem",
     docs: {
-      description: "Require one styling operation per custom utility; optionally suggest theme-generated utilities."
+      description: "Require one styling operation per custom utility and enforce theme tokens instead of redundant mappings."
     }
   },
   create(context) {
-    const option = context.options[0];
-    const preferThemeTokens = typeof option === "object" && option !== null && "preferThemeTokens" in option && option.preferThemeTokens === true;
     return {
       "StyleSheet:exit"(node) {
         const utilities = atrulesNamed(node, "utility");
         const themeTokens = /* @__PURE__ */ new Set();
         const nameCounts = /* @__PURE__ */ new Map();
-        if (preferThemeTokens) {
-          let identity2 = function(value) {
-            const variable = /^var\((?<name>--[a-z][a-z0-9-]*)\)$/u.exec(value);
-            if (!variable) return lengthIdentity(value);
-            const name = variable.groups?.name;
-            if (!name || overriddenVariables.has(name)) return void 0;
-            const definitions = rootValues.get(name);
-            const definition = definitions?.length === 1 ? definitions[0] : void 0;
-            return definition ? lengthIdentity(definition) : void 0;
-          };
-          var identity = identity2;
-          for (const theme of atrulesNamed(node, "theme")) {
-            for (const child of blockChildren2(theme)) {
-              if (child.type === "Declaration") themeTokens.add(child.property);
-            }
-          }
-          for (const utility of utilities) {
-            const name = preludeIdentifiers(utility)[0] ?? "";
-            nameCounts.set(name, (nameCounts.get(name) ?? 0) + 1);
+        for (const theme of atrulesNamed(node, "theme")) {
+          for (const child of blockChildren2(theme)) {
+            if (child.type === "Declaration") themeTokens.add(child.property);
           }
-          const themeDefinitions = /* @__PURE__ */ new Map();
-          for (const theme of atrulesNamed(node, "theme")) {
-            for (const child of blockChildren2(theme)) {
-              if (child.type !== "Declaration") continue;
-              const value = declarationValue(context.sourceCode.getText(child));
-              if (!value) continue;
-              const definitions = themeDefinitions.get(child.property) ?? [];
-              definitions.push({ node: child, value });
-              themeDefinitions.set(child.property, definitions);
-            }
+        }
+        for (const utility of utilities) {
+          const name = preludeIdentifiers(utility)[0] ?? "";
+          nameCounts.set(name, (nameCounts.get(name) ?? 0) + 1);
+        }
+        const themeDefinitions = /* @__PURE__ */ new Map();
+        for (const theme of atrulesNamed(node, "theme")) {
+          for (const child of blockChildren2(theme)) {
+            if (child.type !== "Declaration") continue;
+            const value = declarationValue(context.sourceCode.getText(child));
+            if (!value) continue;
+            const definitions = themeDefinitions.get(child.property) ?? [];
+            definitions.push({ node: child, value });
+            themeDefinitions.set(child.property, definitions);
           }
-          const rootValues = /* @__PURE__ */ new Map();
-          const overriddenVariables = /* @__PURE__ */ new Set();
-          for (const cssRule of rules(node)) {
-            if (!("prelude" in cssRule) || !cssRule.prelude) continue;
-            const isRoot = context.sourceCode.getText(cssRule.prelude).trim() === ":root";
-            for (const child of blockChildren2(cssRule)) {
-              if (child.type !== "Declaration" || !child.property.startsWith("--")) continue;
-              if (!isRoot) {
-                overriddenVariables.add(child.property);
-                continue;
-              }
-              const value = declarationValue(context.sourceCode.getText(child));
-              if (!value) continue;
-              const definitions = rootValues.get(child.property) ?? [];
-              definitions.push(value);
-              rootValues.set(child.property, definitions);
+        }
+        const rootValues = /* @__PURE__ */ new Map();
+        const overriddenVariables = /* @__PURE__ */ new Set();
+        for (const cssRule of rules(node)) {
+          if (!("prelude" in cssRule) || !cssRule.prelude) continue;
+          const isRoot = context.sourceCode.getText(cssRule.prelude).trim() === ":root";
+          for (const child of blockChildren2(cssRule)) {
+            if (child.type !== "Declaration" || !child.property.startsWith("--")) continue;
+            if (!isRoot) {
+              overriddenVariables.add(child.property);
+              continue;
             }
-          }
-          for (const [name, definitions] of themeDefinitions) {
-            const definition = definitions.length === 1 ? definitions[0] : void 0;
-            if (!definition || canonicalToken(name)) continue;
-            if (!isTypographySize(name) && !name.startsWith("--tracking-")) continue;
-            if (name.includes("--", 2)) continue;
-            const value = identity2(definition.value);
+            const value = declarationValue(context.sourceCode.getText(child));
             if (!value) continue;
-            const prefix = name.startsWith("--text-") ? "--text-" : "--tracking-";
-            for (const [other, otherDefinitions] of themeDefinitions) {
-              const otherDefinition = otherDefinitions.length === 1 ? otherDefinitions[0] : void 0;
-              if (!canonicalToken(other) || !other.startsWith(prefix) || !otherDefinition) continue;
-              if (identity2(otherDefinition.value) !== value) continue;
-              if (prefix === "--text-" && ["--line-height", "--letter-spacing", "--font-weight"].some(
-                (suffix) => themeDefinitions.has(`${name}${suffix}`) || themeDefinitions.has(`${other}${suffix}`)
-              )) {
-                continue;
-              }
-              context.report({
-                node: definition.node,
-                message: `Theme token "${name}" duplicates the configured built-in "${other}" (${value}); reuse the "${other.slice(2)}" utility instead of defining an equivalent theme token.`
-              });
-              break;
+            const definitions = rootValues.get(child.property) ?? [];
+            definitions.push(value);
+            rootValues.set(child.property, definitions);
+          }
+        }
+        function identity(value) {
+          const variable = /^var\((?<name>--[a-z][a-z0-9-]*)\)$/u.exec(value);
+          if (!variable) return lengthIdentity(value);
+          const name = variable.groups?.name;
+          if (!name || overriddenVariables.has(name)) return void 0;
+          const definitions = rootValues.get(name);
+          const definition = definitions?.length === 1 ? definitions[0] : void 0;
+          return definition ? lengthIdentity(definition) : void 0;
+        }
+        for (const [name, definitions] of themeDefinitions) {
+          const definition = definitions.length === 1 ? definitions[0] : void 0;
+          if (!definition || canonicalToken(name)) continue;
+          if (!isTypographySize(name) && !name.startsWith("--tracking-")) continue;
+          if (name.includes("--", 2)) continue;
+          const value = identity(definition.value);
+          if (!value) continue;
+          const prefix = name.startsWith("--text-") ? "--text-" : "--tracking-";
+          for (const [other, otherDefinitions] of themeDefinitions) {
+            const otherDefinition = otherDefinitions.length === 1 ? otherDefinitions[0] : void 0;
+            if (!canonicalToken(other) || !other.startsWith(prefix) || !otherDefinition) continue;
+            if (identity(otherDefinition.value) !== value) continue;
+            if (prefix === "--text-" && ["--line-height", "--letter-spacing", "--font-weight"].some(
+              (suffix) => themeDefinitions.has(`${name}${suffix}`) || themeDefinitions.has(`${other}${suffix}`)
+            )) {
+              continue;
             }
+            context.report({
+              node: definition.node,
+              message: `Theme token "${name}" duplicates the configured built-in "${other}" (${value}); reuse the "${other.slice(2)}" utility instead of defining an equivalent theme token.`
+            });
+            break;
           }
         }
         for (const utility of utilities) {
@@ -10532,7 +10530,7 @@ var utilityMappingRule = {
             });
             continue;
           }
-          if (!preferThemeTokens || nameCounts.get(name) !== 1) continue;
+          if (nameCounts.get(name) !== 1) continue;
           const candidate = themeCandidate(name, context.sourceCode.getText(utility));
           if (!candidate || themeTokens.has(candidate.token)) continue;
           if (candidate.property === "font-size" && themeTokens.has(`--color-${name.slice(5)}`)) continue;

package/package.json

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