pasika 0.10.25 → 0.10.27

package/dist/eslint/pasika/index.js

@@ -729,6 +729,7 @@ var noArbitraryTailwindRule = {
 
 // eslint/rules/unknown-utility.ts
 import { existsSync, readdirSync, readFileSync as readFileSync2, statSync } from "fs";
+import { createRequire as createRequire2 } from "module";
 import path5 from "path";
 var PREFIX_NAMESPACES = {
   bg: ["color"],
@@ -935,6 +936,31 @@ var STATIC_COLOR_SPECIALS = /* @__PURE__ */ new Set(["transparent", "current", "
 var NUMERIC_TOKEN_RE = /^-?(?:\d+\.?\d*|\.\d+)(?:%|px|rem|em)?$/;
 var SIDE_WIDTH_TOKEN_RE = /^(?:x|y|t|r|b|l|s|e)-(?:\d+\.?\d*|\.\d+)(?:%|px|rem|em)?$/;
 var OFFSET_TOKEN_RE = /^offset-(?:\d+\.?\d*|\.\d+)(?:%|px|rem|em)?$/;
+var require2 = createRequire2(import.meta.url);
+var tailwindMerge;
+function getTailwindMerge() {
+  if (tailwindMerge !== void 0) return tailwindMerge ?? void 0;
+  try {
+    const moduleValue = require2("tailwind-merge");
+    if (typeof moduleValue === "object" && moduleValue !== null && "twMerge" in moduleValue && typeof moduleValue.twMerge === "function") {
+      const merge = moduleValue.twMerge;
+      tailwindMerge = (...classLists) => {
+        const result = Reflect.apply(merge, void 0, classLists);
+        return typeof result === "string" ? result : classLists.join(" ");
+      };
+    } else {
+      tailwindMerge = null;
+    }
+  } catch {
+    tailwindMerge = null;
+  }
+  return tailwindMerge ?? void 0;
+}
+function isBuiltInTailwindUtility(utility) {
+  const twMerge = getTailwindMerge();
+  if (!twMerge) return void 0;
+  return twMerge(utility, utility) === utility;
+}
 function stylesheetFiles(dir) {
   let entries;
   try {
@@ -1124,7 +1150,7 @@ function isKnown(className, inventory) {
       if (!inventory.defaultsReset && DEFAULT_TOKENS[prefix]?.includes(token)) return true;
       return false;
     }
-    return !inventory.utilityPrefixes.has(prefix);
+    return isBuiltInTailwindUtility(utility) ?? !inventory.utilityPrefixes.has(prefix);
   }
   if (NUMERIC_TOKEN_RE.test(token) || SIDE_WIDTH_TOKEN_RE.test(token) || OFFSET_TOKEN_RE.test(token)) return true;
   if (PREFIX_BUILTINS[prefix]?.includes(token)) return true;
@@ -1184,7 +1210,13 @@ var unknownUtilityRule = {
         return;
       }
       if (expression.type === "TemplateLiteral") {
-        for (const quasi of expression.quasis) reportUnknownClasses(node, quasi.value.raw);
+        const lastQuasi = expression.quasis.length - 1;
+        for (const [index, quasi] of expression.quasis.entries()) {
+          let value = quasi.value.raw;
+          if (index > 0) value = value.replace(/^\S*/, "");
+          if (index < lastQuasi) value = value.replace(/\S*$/, "");
+          reportUnknownClasses(node, value);
+        }
         return;
       }
       if (expression.type === "LogicalExpression") {
@@ -7276,6 +7308,7 @@ function stringValues(value) {
   return value.elements.flatMap((element) => element.value.type === "String" ? [element.value.value] : []);
 }
 var SOURCE_GLOB_PATTERN = /(?:^|[^a-z])(?:[cm]?[jt]sx?)(?:[^a-z]|$)/i;
+var REQUIRED_NON_SOURCE_EXTENSIONS = ["css", "json", "md"];
 var DIRECT_ESLINT_PATTERN = /(?:^|&&|\|\||;)\s*(?:npx\s+)?eslint(?:\s|$)/;
 var REPOSITORY_ARGUMENT_PATTERN = /(?:^|\s)\.(?=\s|$)/;
 var PRETTIER_PATTERN = /\bprettier\b/;
@@ -7289,6 +7322,9 @@ function runsPrettier(command) {
 function runsNamedScript(command, name) {
   return command.includes(`npm run ${name}`);
 }
+function globIncludesExtension(glob, extension) {
+  return new RegExp(`(?:^|[^a-z])${extension}(?:[^a-z]|$)`, "i").test(glob);
+}
 var lintSetupRule = {
   meta: {
     schema: [],
@@ -7338,22 +7374,28 @@ var lintSetupRule = {
           });
         }
         const lintStagedConfig = root.members.find((member) => memberName2(member) === "lint-staged");
-        const runsStagedScript = (name) => lintStagedConfig?.value.type === "Object" && lintStagedConfig.value.members.some(
-          (member) => stringValues(member.value).some((command) => runsNamedScript(command, name))
+        const stagedMembers = lintStagedConfig?.value.type === "Object" ? lintStagedConfig.value.members : [];
+        const runsStagedScriptForGlob = (name, matchesGlob) => stagedMembers.some(
+          (member) => matchesGlob(memberName2(member)) && stringValues(member.value).some((command) => runsNamedScript(command, name))
         );
-        const hasStagedLintEntry = lintStagedConfig?.value.type === "Object" && lintStagedConfig.value.members.some(
-          (member) => SOURCE_GLOB_PATTERN.test(memberName2(member)) && stringValues(member.value).some((command) => runsNamedScript(command, "lint:staged"))
+        const runsStagedScriptForExtension = (name, extension) => runsStagedScriptForGlob(name, (glob) => globIncludesExtension(glob, extension));
+        const hasStagedSourceLint = runsStagedScriptForGlob("lint:staged", (glob) => SOURCE_GLOB_PATTERN.test(glob));
+        const hasStagedNonSourceLint = REQUIRED_NON_SOURCE_EXTENSIONS.every(
+          (extension) => runsStagedScriptForExtension("lint:staged", extension)
         );
-        if (!hasStagedLintEntry) {
+        if (!hasStagedSourceLint || !hasStagedNonSourceLint) {
           context.report({
             node: lintStagedConfig ?? node,
-            message: 'package.json lint-staged must run "npm run lint:staged --" for staged JavaScript or TypeScript files.'
+            message: 'package.json lint-staged must run "npm run lint:staged --" for staged JavaScript, TypeScript, CSS, Markdown, and JSON files.'
           });
         }
-        if (!runsStagedScript("format:staged")) {
+        const hasStagedNonSourceFormat = REQUIRED_NON_SOURCE_EXTENSIONS.every(
+          (extension) => runsStagedScriptForExtension("format:staged", extension)
+        );
+        if (!hasStagedNonSourceFormat) {
           context.report({
             node: lintStagedConfig ?? node,
-            message: 'package.json lint-staged must run "npm run format:staged --" for staged files ESLint does not already format.'
+            message: 'package.json lint-staged must run "npm run format:staged --" for staged CSS, Markdown, and JSON files.'
           });
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pasika",
-  "version": "0.10.25",
+  "version": "0.10.27",
   "description": "Reusable agent setup package",
   "repository": {
     "type": "git",
@@ -54,10 +54,13 @@
     "typecheck": "tsc --noEmit"
   },
   "lint-staged": {
-    "!(*.ts|*.mts|*.cts|*.tsx|*.js|*.cjs|*.mjs|*.jsx)": "npm run format:staged --",
-    "*.ts|*.mts|*.cts|*.tsx|*.js|*.cjs|*.mjs|*.jsx": [
+    "*.{cjs,cts,js,jsx,mjs,mts,ts,tsx}": [
       "npm run lint:staged --",
       "npm run test:unit:staged --"
+    ],
+    "*.{css,json,md}": [
+      "npm run lint:staged --",
+      "npm run format:staged --"
     ]
   },
   "dependencies": {