@drskillissue/ganko 0.3.0 → 0.3.1

package/dist/eslint-plugin.js

@@ -7,7 +7,7 @@ import {
   extensionsToGlobs,
   rules,
   rules2
-} from "./chunk-2VRVUMIE.js";
+} from "./chunk-AXFVBCJD.js";
 import "./chunk-EGRHWZRV.js";
 
 // src/eslint-adapter.ts

package/dist/index.cjs

@@ -3201,6 +3201,7 @@ var TypeResolver = class {
   checkPropertyOnType(tsType, propertyName) {
     const property = tsType.getProperty(propertyName);
     if (property !== void 0) return true;
+    if (this.checker.getIndexTypeOfType(tsType, import_typescript2.default.IndexKind.String) !== void 0) return true;
     if (tsType.isUnion()) {
       for (const constituent of tsType.types) {
         const flags = constituent.flags;
@@ -9593,7 +9594,22 @@ function isObjectLiteralTarget(graph, pa) {
   const variable = getVariableByNameInScope(graph, obj.text, pa.scope);
   if (!variable) return false;
   const init = variable.initializer;
-  return init !== null && import_typescript34.default.isObjectLiteralExpression(init);
+  if (init === null || !import_typescript34.default.isObjectLiteralExpression(init)) return false;
+  if (propertyExistsInLiteral(init, pa)) return false;
+  return true;
+}
+function propertyExistsInLiteral(literal, pa) {
+  let propName = null;
+  if (!pa.computed && import_typescript34.default.isIdentifier(pa.property)) propName = pa.property.text;
+  else if (import_typescript34.default.isStringLiteral(pa.property)) propName = pa.property.text;
+  if (propName === null) return false;
+  for (let i = 0; i < literal.properties.length; i++) {
+    const prop = literal.properties[i];
+    if (!prop) continue;
+    if (import_typescript34.default.isPropertyAssignment(prop) && import_typescript34.default.isIdentifier(prop.name) && prop.name.text === propName) return true;
+    if (import_typescript34.default.isShorthandPropertyAssignment(prop) && prop.name.text === propName) return true;
+  }
+  return false;
 }
 function getMemberAccessesOnIdentifier(fn, identifierName) {
   const cache = fn._memberAccessesByIdentifier;
@@ -27907,24 +27923,26 @@ function buildTailwindValidatorFromEval(utilities, variants, logger) {
     has(className) {
       if (staticValidator.has(className)) return true;
       const cached = batchCache.get(className);
-      if (cached !== void 0) return cached;
+      if (cached !== void 0) return cached !== null;
       return false;
     },
-    resolve() {
+    resolve(className) {
+      const cached = batchCache.get(className);
+      if (cached !== void 0) return cached;
       return null;
     },
     preloadBatch(classNames, results) {
       for (let i = 0; i < classNames.length; i++) {
         const name = classNames[i];
-        const valid = results[i];
-        if (name !== void 0 && valid !== void 0) {
-          batchCache.set(name, valid);
+        const css = results[i];
+        if (name !== void 0 && css !== void 0) {
+          batchCache.set(name, css);
         }
       }
       if (logger?.isLevelEnabled(Level.Debug)) {
         let validCount = 0;
         for (let i = 0; i < results.length; i++) {
-          if (results[i]) validCount++;
+          if (results[i] !== null) validCount++;
         }
         logger.debug(`tailwind: preloaded ${classNames.length} candidates (${validCount} valid)`);
       }
@@ -28120,7 +28138,7 @@ function getActivePolicy() {
 }
 
 // src/compilation/symbols/class-name.ts
-function createClassNameSymbol(name, selectors, filePaths) {
+function createClassNameSymbol(name, selectors, filePaths, tailwindResolvedCSS) {
   return {
     symbolKind: "className",
     name,
@@ -28129,7 +28147,8 @@ function createClassNameSymbol(name, selectors, filePaths) {
       kind: "css",
       selectors,
       filePaths
-    }
+    },
+    tailwindResolvedCSS: tailwindResolvedCSS ?? null
   };
 }
 
@@ -28600,7 +28619,7 @@ function pushToMapArray2(map, key, value2) {
   if (arr !== void 0) arr.push(value2);
   else map.set(key, [value2]);
 }
-function buildSymbolTable(trees, tailwindValidator) {
+function buildSymbolTable(trees, tailwindValidator, solidClassTokens) {
   const classNamesMap = /* @__PURE__ */ new Map();
   const selectorsMap = /* @__PURE__ */ new Map();
   const customPropertiesMap = /* @__PURE__ */ new Map();
@@ -28627,6 +28646,7 @@ function buildSymbolTable(trees, tailwindValidator) {
   const allSelectors = [];
   const allDeclarations = [];
   const allVariables = [];
+  const referencedCustomPropertyNamesSet = /* @__PURE__ */ new Set();
   const allAtRules = [];
   const allKeyframeAtRules = [];
   const allFontFaceAtRules = [];
@@ -28737,6 +28757,11 @@ function buildSymbolTable(trees, tailwindValidator) {
         customPropertiesMap.set(entity.name, createCustomPropertySymbol(entity, filePath));
       }
     }
+    const treeVariableRefs = tree.variableRefs;
+    for (let i = 0; i < treeVariableRefs.length; i++) {
+      const ref = treeVariableRefs[i];
+      if (ref) referencedCustomPropertyNamesSet.add(ref.name);
+    }
     const treeAtRules = tree.atRules;
     for (let i = 0; i < treeAtRules.length; i++) {
       const entity = treeAtRules[i];
@@ -28790,11 +28815,32 @@ function buildSymbolTable(trees, tailwindValidator) {
       if (!placeholdersByNameMap.has(ph.name)) placeholdersByNameMap.set(ph.name, ph);
     }
   }
+  const twValidator = tailwindValidator ?? null;
   const classNameSymbols = /* @__PURE__ */ new Map();
   for (const [name, entry] of classNamesMap) {
-    classNameSymbols.set(name, createClassNameSymbol(name, entry.selectors, [...entry.filePaths]));
+    const twCSS = twValidator !== null && twValidator.has(name) ? twValidator.resolve(name) : null;
+    classNameSymbols.set(name, createClassNameSymbol(name, entry.selectors, [...entry.filePaths], twCSS));
+  }
+  if (twValidator !== null && solidClassTokens !== null && solidClassTokens !== void 0) {
+    for (const name of solidClassTokens) {
+      if (classNameSymbols.has(name)) continue;
+      if (!twValidator.has(name)) continue;
+      const resolvedCSS = twValidator.resolve(name);
+      classNameSymbols.set(name, {
+        symbolKind: "className",
+        name,
+        filePath: null,
+        source: {
+          kind: "tailwind",
+          candidate: { raw: name, variants: [], utility: name, value: null, modifier: null, important: false, negative: false },
+          resolvedCSS,
+          declarations: [],
+          diagnostics: []
+        },
+        tailwindResolvedCSS: resolvedCSS
+      });
+    }
   }
-  const twValidator = tailwindValidator ?? null;
   const knownKeyframeNames = /* @__PURE__ */ new Set();
   for (let i = 0; i < allKeyframeAtRules.length; i++) {
     const kf = allKeyframeAtRules[i];
@@ -29151,8 +29197,9 @@ function buildSymbolTable(trees, tailwindValidator) {
     unusedFunctions: unusedFunctionsArr,
     unusedPlaceholders: unusedPlaceholdersArr,
     tokenCategories: [...tokensByCategoryMap.keys()],
+    referencedCustomPropertyNames: referencedCustomPropertyNamesSet,
     hasClassName(name) {
-      return classNameSymbols.has(name) || twValidator !== null && twValidator.has(name);
+      return classNameSymbols.has(name);
     },
     getClassName(name) {
       return classNameSymbols.get(name) ?? null;
@@ -32250,8 +32297,6 @@ function matchesRequiredAttributes(required, actual) {
     if (constraint === void 0) continue;
     if (!actual.has(constraint.name)) return 1 /* NoMatch */;
     if (constraint.operator === "exists") {
-      const existsValue = actual.get(constraint.name);
-      if (existsValue === null) hasConditional = true;
       continue;
     }
     const actualValue = actual.get(constraint.name);
@@ -32461,10 +32506,9 @@ function augmentCascadeWithTailwindFromSymbolTable(cascade, element, symbolTable
   for (let i = 0; i < classTokens.length; i++) {
     const token = classTokens[i];
     if (token === void 0) continue;
-    const classSymbol = symbolTable.classNames.get(token);
-    if (!classSymbol) continue;
-    if (classSymbol.source.kind !== "tailwind") continue;
-    const resolvedCSS = classSymbol.source.resolvedCSS;
+    const classSymbol = symbolTable.getClassName(token);
+    if (classSymbol === null) continue;
+    const resolvedCSS = classSymbol.tailwindResolvedCSS;
     if (resolvedCSS === null) continue;
     const declarations = parseTailwindCssDeclarations(resolvedCSS);
     for (let j = 0; j < declarations.length; j++) {
@@ -34152,13 +34196,13 @@ function buildConsistencyEvidence(input) {
   const lineHeight = normalizeDeviation(input.subjectLineHeightDeviation, input.cohortProfile.lineHeightDispersionPx, input.cohortProfile.medianLineHeightPx);
   const baselinesIrrelevant = input.context.baselineRelevance === "irrelevant";
   const blockAxisIsMainAxis = !input.context.crossAxisIsBlockAxis;
-  const suppressAll = blockAxisIsMainAxis;
+  const suppressAll = blockAxisIsMainAxis || baselinesIrrelevant;
   const offset = suppressAll ? ZERO_STRENGTH : offsetRaw;
   const declaredOffset = suppressAll ? ZERO_STRENGTH : declaredOffsetRaw;
-  const baselineStrength = baselinesIrrelevant || suppressAll ? ZERO_STRENGTH : resolveBaselineStrength(input, lineHeight);
-  const contextStrength = baselinesIrrelevant || suppressAll ? ZERO_STRENGTH : resolveContextStrength(input, lineHeight);
-  const replacedStrength = baselinesIrrelevant || suppressAll ? ZERO_STRENGTH : resolveReplacedControlStrength(input, lineHeight);
-  const compositionResult = baselinesIrrelevant || suppressAll ? null : resolveContentCompositionStrength(input);
+  const baselineStrength = suppressAll ? ZERO_STRENGTH : resolveBaselineStrength(input, lineHeight);
+  const contextStrength = suppressAll ? ZERO_STRENGTH : resolveContextStrength(input, lineHeight);
+  const replacedStrength = suppressAll ? ZERO_STRENGTH : resolveReplacedControlStrength(input, lineHeight);
+  const compositionResult = suppressAll ? null : resolveContentCompositionStrength(input);
   const compositionStrength = compositionResult ? compositionResult.evidence : ZERO_STRENGTH;
   const contextCertaintyPenalty = resolveContextCertaintyPenalty(input);
   const provenance = input.cohortProvenance;
@@ -35221,7 +35265,26 @@ function makeCompilation(solidTrees, cssTrees, tailwindConfig, packageManifest,
       if (cachedSymbolTable === null) {
         const allCssTrees = [];
         for (const tree of cssTrees.values()) allCssTrees.push(tree);
-        cachedSymbolTable = buildSymbolTable(allCssTrees, tailwindConfig?.validator ?? null);
+        let solidClassTokens = null;
+        if (tailwindConfig?.validator !== null && tailwindConfig?.validator !== void 0) {
+          const tokens = /* @__PURE__ */ new Set();
+          for (const st of solidTrees.values()) {
+            for (const [, idx] of st.staticClassTokensByElementId) {
+              for (let i = 0; i < idx.tokens.length; i++) {
+                const t = idx.tokens[i];
+                if (t) tokens.add(t);
+              }
+            }
+            for (const [, idx] of st.staticClassListKeysByElementId) {
+              for (let i = 0; i < idx.keys.length; i++) {
+                const t = idx.keys[i];
+                if (t) tokens.add(t);
+              }
+            }
+          }
+          solidClassTokens = tokens;
+        }
+        cachedSymbolTable = buildSymbolTable(allCssTrees, tailwindConfig?.validator ?? null, solidClassTokens);
       }
       return cachedSymbolTable;
     },
@@ -36840,10 +36903,7 @@ var jsxStyleNoUnusedCustomProp = defineAnalysisRule({
   requirement: { tier: 1 /* CrossSyntax */ },
   register(registry) {
     registry.registerCrossSyntaxAction((solidTree, symbolTable, emit) => {
-      const usedVarNames = /* @__PURE__ */ new Set();
-      for (const [name] of symbolTable.customProperties) {
-        usedVarNames.add(name);
-      }
+      const usedVarNames = symbolTable.referencedCustomPropertyNames;
       if (solidTree.jsxClassListAttributes.length > 0) return;
       let hasNonStaticClass = false;
       for (const [, idx] of solidTree.staticClassTokensByElementId) {
@@ -37803,7 +37863,7 @@ function normalizeStylePropertyKey(key) {
   if (key.includes("-")) return key.toLowerCase();
   return toKebabCase(key);
 }
-function isExemptFromCLS(element, flowFact, property, _semanticModel) {
+function isExemptFromCLS(element, flowFact, property, semanticModel) {
   if (!flowFact.inFlow) return true;
   if (POSITIONED_OFFSET_PROPERTIES.has(property) && flowFact.position !== null && flowFact.position !== "static") {
     return true;
@@ -37811,8 +37871,17 @@ function isExemptFromCLS(element, flowFact, property, _semanticModel) {
   if (hasLayoutContainment(element) || element.parentElementNode !== null && hasLayoutContainment(element.parentElementNode)) {
     return true;
   }
+  if (element.parentElementNode !== null && parentClipsOverflow(element.parentElementNode, semanticModel)) {
+    return true;
+  }
   return false;
 }
+var CLIPPING_OVERFLOW_VALUES = /* @__PURE__ */ new Set(["hidden", "clip"]);
+function parentClipsOverflow(parent, semanticModel) {
+  const snapshot = semanticModel.getSignalSnapshot(parent.elementId);
+  const signal = snapshot.signals.get("overflow");
+  return signal !== void 0 && signal.kind === 0 /* Known */ && CLIPPING_OVERFLOW_VALUES.has(signal.normalized);
+}
 function hasLayoutContainment(node) {
   const contain = node.inlineStyleValues.get("contain");
   if (contain === void 0) return false;