eslint-plugin-better-tailwindcss 3.5.2 → 3.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (251) hide show
  1. package/README.md +2 -0
  2. package/lib/cjs/configs/config.d.ts +4 -0
  3. package/lib/cjs/configs/config.d.ts.map +1 -1
  4. package/lib/cjs/configs/config.js +4 -0
  5. package/lib/cjs/configs/config.js.map +1 -1
  6. package/lib/cjs/rules/enforce-consistent-class-order.d.ts.map +1 -1
  7. package/lib/cjs/rules/enforce-consistent-class-order.js +4 -3
  8. package/lib/cjs/rules/enforce-consistent-class-order.js.map +1 -1
  9. package/lib/cjs/rules/enforce-consistent-important-position.d.ts +19 -0
  10. package/lib/cjs/rules/enforce-consistent-important-position.d.ts.map +1 -0
  11. package/lib/cjs/rules/enforce-consistent-important-position.js +97 -0
  12. package/lib/cjs/rules/enforce-consistent-important-position.js.map +1 -0
  13. package/lib/cjs/rules/enforce-consistent-variable-syntax.d.ts.map +1 -1
  14. package/lib/cjs/rules/enforce-consistent-variable-syntax.js +14 -48
  15. package/lib/cjs/rules/enforce-consistent-variable-syntax.js.map +1 -1
  16. package/lib/cjs/rules/enforce-shorthand-classes.d.ts +2 -0
  17. package/lib/cjs/rules/enforce-shorthand-classes.d.ts.map +1 -1
  18. package/lib/cjs/rules/enforce-shorthand-classes.js +173 -33
  19. package/lib/cjs/rules/enforce-shorthand-classes.js.map +1 -1
  20. package/lib/cjs/rules/no-conflicting-classes.d.ts.map +1 -1
  21. package/lib/cjs/rules/no-conflicting-classes.js +12 -12
  22. package/lib/cjs/rules/no-conflicting-classes.js.map +1 -1
  23. package/lib/cjs/rules/no-deprecated-classes.d.ts +17 -0
  24. package/lib/cjs/rules/no-deprecated-classes.d.ts.map +1 -0
  25. package/lib/cjs/rules/no-deprecated-classes.js +99 -0
  26. package/lib/cjs/rules/no-deprecated-classes.js.map +1 -0
  27. package/lib/cjs/rules/no-duplicate-classes.js +12 -51
  28. package/lib/cjs/rules/no-duplicate-classes.js.map +1 -1
  29. package/lib/cjs/rules/no-restricted-classes.d.ts.map +1 -1
  30. package/lib/cjs/rules/no-restricted-classes.js +23 -36
  31. package/lib/cjs/rules/no-restricted-classes.js.map +1 -1
  32. package/lib/cjs/rules/no-unregistered-classes.d.ts.map +1 -1
  33. package/lib/cjs/rules/no-unregistered-classes.js +14 -14
  34. package/lib/cjs/rules/no-unregistered-classes.js.map +1 -1
  35. package/lib/cjs/tailwindcss/custom-component-classes.async.v4.d.ts.map +1 -1
  36. package/lib/cjs/tailwindcss/custom-component-classes.async.v4.js +31 -3
  37. package/lib/cjs/tailwindcss/custom-component-classes.async.v4.js.map +1 -1
  38. package/lib/cjs/tailwindcss/dissect-classes.async.v3.d.ts +3 -0
  39. package/lib/cjs/tailwindcss/dissect-classes.async.v3.d.ts.map +1 -0
  40. package/lib/cjs/tailwindcss/{class-variants.async.v3.js → dissect-classes.async.v3.js} +24 -4
  41. package/lib/cjs/tailwindcss/dissect-classes.async.v3.js.map +1 -0
  42. package/lib/cjs/tailwindcss/dissect-classes.async.v4.d.ts +3 -0
  43. package/lib/cjs/tailwindcss/dissect-classes.async.v4.d.ts.map +1 -0
  44. package/lib/cjs/tailwindcss/dissect-classes.async.v4.js +32 -0
  45. package/lib/cjs/tailwindcss/dissect-classes.async.v4.js.map +1 -0
  46. package/lib/cjs/tailwindcss/dissect-classes.async.worker.v3.d.ts +2 -0
  47. package/lib/cjs/tailwindcss/dissect-classes.async.worker.v3.d.ts.map +1 -0
  48. package/lib/cjs/tailwindcss/{class-variants.async.worker.v3.js → dissect-classes.async.worker.v3.js} +3 -3
  49. package/lib/cjs/tailwindcss/dissect-classes.async.worker.v3.js.map +1 -0
  50. package/lib/cjs/tailwindcss/dissect-classes.async.worker.v4.d.ts +2 -0
  51. package/lib/cjs/tailwindcss/dissect-classes.async.worker.v4.d.ts.map +1 -0
  52. package/lib/cjs/tailwindcss/{class-variants.async.worker.v4.js → dissect-classes.async.worker.v4.js} +3 -3
  53. package/lib/cjs/tailwindcss/dissect-classes.async.worker.v4.js.map +1 -0
  54. package/lib/cjs/tailwindcss/dissect-classes.d.ts +23 -0
  55. package/lib/cjs/tailwindcss/dissect-classes.d.ts.map +1 -0
  56. package/lib/cjs/tailwindcss/{shorthand-classes.js → dissect-classes.js} +7 -7
  57. package/lib/cjs/tailwindcss/dissect-classes.js.map +1 -0
  58. package/lib/cjs/utils/class.d.ts +11 -0
  59. package/lib/cjs/utils/class.d.ts.map +1 -0
  60. package/lib/cjs/utils/class.js +24 -0
  61. package/lib/cjs/utils/class.js.map +1 -0
  62. package/lib/cjs/utils/lint.d.ts +7 -0
  63. package/lib/cjs/utils/lint.d.ts.map +1 -0
  64. package/lib/cjs/utils/lint.js +46 -0
  65. package/lib/cjs/utils/lint.js.map +1 -0
  66. package/lib/cjs/utils/utils.d.ts +3 -1
  67. package/lib/cjs/utils/utils.d.ts.map +1 -1
  68. package/lib/cjs/utils/utils.js +20 -15
  69. package/lib/cjs/utils/utils.js.map +1 -1
  70. package/lib/esm/configs/config.d.ts +4 -0
  71. package/lib/esm/configs/config.d.ts.map +1 -1
  72. package/lib/esm/configs/config.js +4 -0
  73. package/lib/esm/configs/config.js.map +1 -1
  74. package/lib/esm/rules/enforce-consistent-class-order.d.ts.map +1 -1
  75. package/lib/esm/rules/enforce-consistent-class-order.js +4 -3
  76. package/lib/esm/rules/enforce-consistent-class-order.js.map +1 -1
  77. package/lib/esm/rules/enforce-consistent-important-position.d.ts +19 -0
  78. package/lib/esm/rules/enforce-consistent-important-position.d.ts.map +1 -0
  79. package/lib/esm/rules/enforce-consistent-important-position.js +93 -0
  80. package/lib/esm/rules/enforce-consistent-important-position.js.map +1 -0
  81. package/lib/esm/rules/enforce-consistent-variable-syntax.d.ts.map +1 -1
  82. package/lib/esm/rules/enforce-consistent-variable-syntax.js +14 -48
  83. package/lib/esm/rules/enforce-consistent-variable-syntax.js.map +1 -1
  84. package/lib/esm/rules/enforce-shorthand-classes.d.ts +2 -0
  85. package/lib/esm/rules/enforce-shorthand-classes.d.ts.map +1 -1
  86. package/lib/esm/rules/enforce-shorthand-classes.js +173 -33
  87. package/lib/esm/rules/enforce-shorthand-classes.js.map +1 -1
  88. package/lib/esm/rules/no-conflicting-classes.d.ts.map +1 -1
  89. package/lib/esm/rules/no-conflicting-classes.js +13 -13
  90. package/lib/esm/rules/no-conflicting-classes.js.map +1 -1
  91. package/lib/esm/rules/no-deprecated-classes.d.ts +17 -0
  92. package/lib/esm/rules/no-deprecated-classes.d.ts.map +1 -0
  93. package/lib/esm/rules/no-deprecated-classes.js +95 -0
  94. package/lib/esm/rules/no-deprecated-classes.js.map +1 -0
  95. package/lib/esm/rules/no-duplicate-classes.js +13 -52
  96. package/lib/esm/rules/no-duplicate-classes.js.map +1 -1
  97. package/lib/esm/rules/no-restricted-classes.d.ts.map +1 -1
  98. package/lib/esm/rules/no-restricted-classes.js +24 -37
  99. package/lib/esm/rules/no-restricted-classes.js.map +1 -1
  100. package/lib/esm/rules/no-unregistered-classes.d.ts.map +1 -1
  101. package/lib/esm/rules/no-unregistered-classes.js +15 -15
  102. package/lib/esm/rules/no-unregistered-classes.js.map +1 -1
  103. package/lib/esm/tailwindcss/custom-component-classes.async.v4.d.ts.map +1 -1
  104. package/lib/esm/tailwindcss/custom-component-classes.async.v4.js +31 -3
  105. package/lib/esm/tailwindcss/custom-component-classes.async.v4.js.map +1 -1
  106. package/lib/esm/tailwindcss/dissect-classes.async.v3.d.ts +3 -0
  107. package/lib/esm/tailwindcss/dissect-classes.async.v3.d.ts.map +1 -0
  108. package/lib/esm/tailwindcss/dissect-classes.async.v3.js +30 -0
  109. package/lib/esm/tailwindcss/dissect-classes.async.v3.js.map +1 -0
  110. package/lib/esm/tailwindcss/dissect-classes.async.v4.d.ts +3 -0
  111. package/lib/esm/tailwindcss/dissect-classes.async.v4.d.ts.map +1 -0
  112. package/lib/esm/tailwindcss/dissect-classes.async.v4.js +29 -0
  113. package/lib/esm/tailwindcss/dissect-classes.async.v4.js.map +1 -0
  114. package/lib/esm/tailwindcss/dissect-classes.async.worker.v3.d.ts +2 -0
  115. package/lib/esm/tailwindcss/dissect-classes.async.worker.v3.d.ts.map +1 -0
  116. package/lib/esm/tailwindcss/{class-variants.async.worker.v3.js → dissect-classes.async.worker.v3.js} +3 -3
  117. package/lib/esm/tailwindcss/dissect-classes.async.worker.v3.js.map +1 -0
  118. package/lib/esm/tailwindcss/dissect-classes.async.worker.v4.d.ts +2 -0
  119. package/lib/esm/tailwindcss/dissect-classes.async.worker.v4.d.ts.map +1 -0
  120. package/lib/esm/tailwindcss/{class-variants.async.worker.v4.js → dissect-classes.async.worker.v4.js} +3 -3
  121. package/lib/esm/tailwindcss/dissect-classes.async.worker.v4.js.map +1 -0
  122. package/lib/esm/tailwindcss/dissect-classes.d.ts +23 -0
  123. package/lib/esm/tailwindcss/dissect-classes.d.ts.map +1 -0
  124. package/lib/esm/tailwindcss/{shorthand-classes.js → dissect-classes.js} +6 -6
  125. package/lib/esm/tailwindcss/dissect-classes.js.map +1 -0
  126. package/lib/esm/utils/class.d.ts +11 -0
  127. package/lib/esm/utils/class.d.ts.map +1 -0
  128. package/lib/esm/utils/class.js +21 -0
  129. package/lib/esm/utils/class.js.map +1 -0
  130. package/lib/esm/utils/lint.d.ts +7 -0
  131. package/lib/esm/utils/lint.d.ts.map +1 -0
  132. package/lib/esm/utils/lint.js +43 -0
  133. package/lib/esm/utils/lint.js.map +1 -0
  134. package/lib/esm/utils/utils.d.ts +3 -1
  135. package/lib/esm/utils/utils.d.ts.map +1 -1
  136. package/lib/esm/utils/utils.js +18 -15
  137. package/lib/esm/utils/utils.js.map +1 -1
  138. package/package.json +9 -9
  139. package/lib/cjs/async-utils/string.d.ts +0 -2
  140. package/lib/cjs/async-utils/string.d.ts.map +0 -1
  141. package/lib/cjs/async-utils/string.js +0 -10
  142. package/lib/cjs/async-utils/string.js.map +0 -1
  143. package/lib/cjs/tailwindcss/class-variants.async.v3.d.ts +0 -3
  144. package/lib/cjs/tailwindcss/class-variants.async.v3.d.ts.map +0 -1
  145. package/lib/cjs/tailwindcss/class-variants.async.v3.js.map +0 -1
  146. package/lib/cjs/tailwindcss/class-variants.async.v4.d.ts +0 -3
  147. package/lib/cjs/tailwindcss/class-variants.async.v4.d.ts.map +0 -1
  148. package/lib/cjs/tailwindcss/class-variants.async.v4.js +0 -14
  149. package/lib/cjs/tailwindcss/class-variants.async.v4.js.map +0 -1
  150. package/lib/cjs/tailwindcss/class-variants.async.worker.v3.d.ts +0 -2
  151. package/lib/cjs/tailwindcss/class-variants.async.worker.v3.d.ts.map +0 -1
  152. package/lib/cjs/tailwindcss/class-variants.async.worker.v3.js.map +0 -1
  153. package/lib/cjs/tailwindcss/class-variants.async.worker.v4.d.ts +0 -2
  154. package/lib/cjs/tailwindcss/class-variants.async.worker.v4.d.ts.map +0 -1
  155. package/lib/cjs/tailwindcss/class-variants.async.worker.v4.js.map +0 -1
  156. package/lib/cjs/tailwindcss/class-variants.d.ts +0 -14
  157. package/lib/cjs/tailwindcss/class-variants.d.ts.map +0 -1
  158. package/lib/cjs/tailwindcss/class-variants.js +0 -24
  159. package/lib/cjs/tailwindcss/class-variants.js.map +0 -1
  160. package/lib/cjs/tailwindcss/custom-component-classes.async.d.ts +0 -2
  161. package/lib/cjs/tailwindcss/custom-component-classes.async.d.ts.map +0 -1
  162. package/lib/cjs/tailwindcss/custom-component-classes.async.js +0 -43
  163. package/lib/cjs/tailwindcss/custom-component-classes.async.js.map +0 -1
  164. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v3.d.ts +0 -2
  165. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v3.d.ts.map +0 -1
  166. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v3.js +0 -6
  167. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v3.js.map +0 -1
  168. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v4.d.ts +0 -2
  169. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v4.d.ts.map +0 -1
  170. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v4.js +0 -6
  171. package/lib/cjs/tailwindcss/custom-component-classes.async.worker.v4.js.map +0 -1
  172. package/lib/cjs/tailwindcss/shorthand-classes.async.d.ts +0 -4
  173. package/lib/cjs/tailwindcss/shorthand-classes.async.d.ts.map +0 -1
  174. package/lib/cjs/tailwindcss/shorthand-classes.async.js +0 -129
  175. package/lib/cjs/tailwindcss/shorthand-classes.async.js.map +0 -1
  176. package/lib/cjs/tailwindcss/shorthand-classes.async.v3.d.ts +0 -3
  177. package/lib/cjs/tailwindcss/shorthand-classes.async.v3.d.ts.map +0 -1
  178. package/lib/cjs/tailwindcss/shorthand-classes.async.v3.js +0 -54
  179. package/lib/cjs/tailwindcss/shorthand-classes.async.v3.js.map +0 -1
  180. package/lib/cjs/tailwindcss/shorthand-classes.async.v4.d.ts +0 -3
  181. package/lib/cjs/tailwindcss/shorthand-classes.async.v4.d.ts.map +0 -1
  182. package/lib/cjs/tailwindcss/shorthand-classes.async.v4.js +0 -54
  183. package/lib/cjs/tailwindcss/shorthand-classes.async.v4.js.map +0 -1
  184. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v3.d.ts +0 -2
  185. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v3.d.ts.map +0 -1
  186. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v3.js +0 -10
  187. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v3.js.map +0 -1
  188. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v4.d.ts +0 -2
  189. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v4.d.ts.map +0 -1
  190. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v4.js +0 -10
  191. package/lib/cjs/tailwindcss/shorthand-classes.async.worker.v4.js.map +0 -1
  192. package/lib/cjs/tailwindcss/shorthand-classes.d.ts +0 -15
  193. package/lib/cjs/tailwindcss/shorthand-classes.d.ts.map +0 -1
  194. package/lib/cjs/tailwindcss/shorthand-classes.js.map +0 -1
  195. package/lib/esm/async-utils/string.d.ts +0 -2
  196. package/lib/esm/async-utils/string.d.ts.map +0 -1
  197. package/lib/esm/async-utils/string.js +0 -7
  198. package/lib/esm/async-utils/string.js.map +0 -1
  199. package/lib/esm/tailwindcss/class-variants.async.v3.d.ts +0 -3
  200. package/lib/esm/tailwindcss/class-variants.async.v3.d.ts.map +0 -1
  201. package/lib/esm/tailwindcss/class-variants.async.v3.js +0 -10
  202. package/lib/esm/tailwindcss/class-variants.async.v3.js.map +0 -1
  203. package/lib/esm/tailwindcss/class-variants.async.v4.d.ts +0 -3
  204. package/lib/esm/tailwindcss/class-variants.async.v4.d.ts.map +0 -1
  205. package/lib/esm/tailwindcss/class-variants.async.v4.js +0 -11
  206. package/lib/esm/tailwindcss/class-variants.async.v4.js.map +0 -1
  207. package/lib/esm/tailwindcss/class-variants.async.worker.v3.d.ts +0 -2
  208. package/lib/esm/tailwindcss/class-variants.async.worker.v3.d.ts.map +0 -1
  209. package/lib/esm/tailwindcss/class-variants.async.worker.v3.js.map +0 -1
  210. package/lib/esm/tailwindcss/class-variants.async.worker.v4.d.ts +0 -2
  211. package/lib/esm/tailwindcss/class-variants.async.worker.v4.d.ts.map +0 -1
  212. package/lib/esm/tailwindcss/class-variants.async.worker.v4.js.map +0 -1
  213. package/lib/esm/tailwindcss/class-variants.d.ts +0 -14
  214. package/lib/esm/tailwindcss/class-variants.d.ts.map +0 -1
  215. package/lib/esm/tailwindcss/class-variants.js +0 -21
  216. package/lib/esm/tailwindcss/class-variants.js.map +0 -1
  217. package/lib/esm/tailwindcss/custom-component-classes.async.d.ts +0 -2
  218. package/lib/esm/tailwindcss/custom-component-classes.async.d.ts.map +0 -1
  219. package/lib/esm/tailwindcss/custom-component-classes.async.js +0 -8
  220. package/lib/esm/tailwindcss/custom-component-classes.async.js.map +0 -1
  221. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v3.d.ts +0 -2
  222. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v3.d.ts.map +0 -1
  223. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v3.js +0 -4
  224. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v3.js.map +0 -1
  225. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v4.d.ts +0 -2
  226. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v4.d.ts.map +0 -1
  227. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v4.js +0 -4
  228. package/lib/esm/tailwindcss/custom-component-classes.async.worker.v4.js.map +0 -1
  229. package/lib/esm/tailwindcss/shorthand-classes.async.d.ts +0 -4
  230. package/lib/esm/tailwindcss/shorthand-classes.async.d.ts.map +0 -1
  231. package/lib/esm/tailwindcss/shorthand-classes.async.js +0 -125
  232. package/lib/esm/tailwindcss/shorthand-classes.async.js.map +0 -1
  233. package/lib/esm/tailwindcss/shorthand-classes.async.v3.d.ts +0 -3
  234. package/lib/esm/tailwindcss/shorthand-classes.async.v3.d.ts.map +0 -1
  235. package/lib/esm/tailwindcss/shorthand-classes.async.v3.js +0 -51
  236. package/lib/esm/tailwindcss/shorthand-classes.async.v3.js.map +0 -1
  237. package/lib/esm/tailwindcss/shorthand-classes.async.v4.d.ts +0 -3
  238. package/lib/esm/tailwindcss/shorthand-classes.async.v4.d.ts.map +0 -1
  239. package/lib/esm/tailwindcss/shorthand-classes.async.v4.js +0 -51
  240. package/lib/esm/tailwindcss/shorthand-classes.async.v4.js.map +0 -1
  241. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v3.d.ts +0 -2
  242. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v3.d.ts.map +0 -1
  243. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v3.js +0 -8
  244. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v3.js.map +0 -1
  245. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v4.d.ts +0 -2
  246. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v4.d.ts.map +0 -1
  247. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v4.js +0 -8
  248. package/lib/esm/tailwindcss/shorthand-classes.async.worker.v4.js.map +0 -1
  249. package/lib/esm/tailwindcss/shorthand-classes.d.ts +0 -15
  250. package/lib/esm/tailwindcss/shorthand-classes.d.ts.map +0 -1
  251. package/lib/esm/tailwindcss/shorthand-classes.js.map +0 -1
@@ -1,10 +1,12 @@
1
1
  import { DEFAULT_ATTRIBUTE_NAMES, DEFAULT_CALLEE_NAMES, DEFAULT_TAG_NAMES, DEFAULT_VARIABLE_NAMES } from "../options/default-options.js";
2
2
  import { ATTRIBUTE_SCHEMA, CALLEE_SCHEMA, ENTRYPOINT_SCHEMA, TAG_SCHEMA, TAILWIND_CONFIG_SCHEMA, VARIABLE_SCHEMA } from "../options/descriptions.js";
3
- import { getShorthandClasses } from "../tailwindcss/shorthand-classes.js";
3
+ import { getDissectedClasses } from "../tailwindcss/dissect-classes.js";
4
+ import { getUnregisteredClasses } from "../tailwindcss/unregistered-classes.js";
5
+ import { buildClass } from "../utils/class.js";
6
+ import { lintClasses } from "../utils/lint.js";
4
7
  import { getCommonOptions } from "../utils/options.js";
5
- import { escapeNestedQuotes } from "../utils/quotes.js";
6
8
  import { createRuleListener } from "../utils/rule.js";
7
- import { augmentMessageWithWarnings, display, splitClasses } from "../utils/utils.js";
9
+ import { augmentMessageWithWarnings, replacePlaceholders, splitClasses } from "../utils/utils.js";
8
10
  const defaultOptions = {
9
11
  attributes: DEFAULT_ATTRIBUTE_NAMES,
10
12
  callees: DEFAULT_CALLEE_NAMES,
@@ -41,47 +43,185 @@ export const enforceShorthandClasses = {
41
43
  }
42
44
  }
43
45
  };
46
+ export const shorthands = [
47
+ [
48
+ [[/^w-(.*)$/, /^h-(.*)$/], ["size-$1"]]
49
+ ],
50
+ [
51
+ [[/^ml-(.*)$/, /^mr-(.*)$/, /^mt-(.*)$/, /^mb-(.*)$/], ["m-$1"]],
52
+ [[/^mx-(.*)$/, /^my-(.*)$/], ["m-$1"]],
53
+ [[/^ms-(.*)$/, /^me-(.*)$/], ["mx-$1"]],
54
+ [[/^ml-(.*)$/, /^mr-(.*)$/], ["mx-$1"]],
55
+ [[/^mt-(.*)$/, /^mb-(.*)$/], ["my-$1"]]
56
+ ],
57
+ [
58
+ [[/^pl-(.*)$/, /^pr-(.*)$/, /^pt-(.*)$/, /^pb-(.*)$/], ["p-$1"]],
59
+ [[/^px-(.*)$/, /^py-(.*)$/], ["p-$1"]],
60
+ [[/^ps-(.*)$/, /^pe-(.*)$/], ["px-$1"]],
61
+ [[/^pl-(.*)$/, /^pr-(.*)$/], ["px-$1"]],
62
+ [[/^pt-(.*)$/, /^pb-(.*)$/], ["py-$1"]]
63
+ ],
64
+ [
65
+ [[/^border-t-(.*)$/, /^border-b-(.*)$/, /^border-l-(.*)$/, /^border-r-(.*)$/], ["border-$1"]],
66
+ [[/^border-x-(.*)$/, /^border-y-(.*)$/], ["border-$1"]],
67
+ [[/^border-s-(.*)$/, /^border-e-(.*)$/], ["border-x-$1"]],
68
+ [[/^border-l-(.*)$/, /^border-r-(.*)$/], ["border-x-$1"]],
69
+ [[/^border-t-(.*)$/, /^border-b-(.*)$/], ["border-y-$1"]]
70
+ ],
71
+ [
72
+ [[/^border-spacing-x-(.*)$/, /^border-spacing-y-(.*)$/], ["border-spacing-$1"]]
73
+ ],
74
+ [
75
+ [[/^rounded-tl-(.*)$/, /^rounded-tr-(.*)$/, /^rounded-bl-(.*)$/, /^rounded-br-(.*)$/], ["rounded-$1"]],
76
+ [[/^rounded-tl-(.*)$/, /^rounded-tr-(.*)$/], ["rounded-t-$1"]],
77
+ [[/^rounded-bl-(.*)$/, /^rounded-br-(.*)$/], ["rounded-b-$1"]],
78
+ [[/^rounded-tl-(.*)$/, /^rounded-bl-(.*)$/], ["rounded-l-$1"]],
79
+ [[/^rounded-tr-(.*)$/, /^rounded-br-(.*)$/], ["rounded-r-$1"]]
80
+ ],
81
+ [
82
+ [[/^scroll-mt-(.*)$/, /^scroll-mb-(.*)$/, /^scroll-ml-(.*)$/, /^scroll-mr-(.*)$/], ["scroll-m-$1"]],
83
+ [[/^scroll-mx-(.*)$/, /^scroll-my-(.*)$/], ["scroll-m-$1"]],
84
+ [[/^scroll-ms-(.*)$/, /^scroll-me-(.*)$/], ["scroll-mx-$1"]],
85
+ [[/^scroll-ml-(.*)$/, /^scroll-mr-(.*)$/], ["scroll-mx-$1"]],
86
+ [[/^scroll-mt-(.*)$/, /^scroll-mb-(.*)$/], ["scroll-my-$1"]]
87
+ ],
88
+ [
89
+ [[/^scroll-pt-(.*)$/, /^scroll-pb-(.*)$/, /^scroll-pl-(.*)$/, /^scroll-pr-(.*)$/], ["scroll-p-$1"]],
90
+ [[/^scroll-px-(.*)$/, /^scroll-py-(.*)$/], ["scroll-p-$1"]],
91
+ [[/^scroll-pl-(.*)$/, /^scroll-pr-(.*)$/], ["scroll-px-$1"]],
92
+ [[/^scroll-ps-(.*)$/, /^scroll-pe-(.*)$/], ["scroll-px-$1"]],
93
+ [[/^scroll-pt-(.*)$/, /^scroll-pb-(.*)$/], ["scroll-py-$1"]]
94
+ ],
95
+ [
96
+ [[/^top-(.*)$/, /^right-(.*)$/, /^bottom-(.*)$/, /^left-(.*)$/], ["inset-$1"]],
97
+ [[/^inset-x-(.*)$/, /^inset-y-(.*)$/], ["inset-$1"]]
98
+ ],
99
+ [
100
+ [[/^divide-x-(.*)$/, /^divide-y-(.*)$/], ["divide-$1"]]
101
+ ],
102
+ [
103
+ [[/^space-x-(.*)$/, /^space-y-(.*)$/], ["space-$1"]]
104
+ ],
105
+ [
106
+ [[/^gap-x-(.*)$/, /^gap-y-(.*)$/], ["gap-$1"]]
107
+ ],
108
+ [
109
+ [[/^translate-x-(.*)$/, /^translate-y-(.*)$/], ["translate-$1"]]
110
+ ],
111
+ [
112
+ [[/^rotate-x-(.*)$/, /^rotate-y-(.*)$/], ["rotate-$1"]]
113
+ ],
114
+ [
115
+ [[/^skew-x-(.*)$/, /^skew-y-(.*)$/], ["skew-$1"]]
116
+ ],
117
+ [
118
+ [[/^scale-x-(.*)$/, /^scale-y-(.*)$/, /^scale-z-(.*)$/], ["scale-$1", "scale-3d"]],
119
+ [[/^scale-x-(.*)$/, /^scale-y-(.*)$/], ["scale-$1"]]
120
+ ],
121
+ [
122
+ [[/^content-(.*)$/, /^justify-content-(.*)$/], ["place-content-$1"]],
123
+ [[/^items-(.*)$/, /^justify-items-(.*)$/], ["place-items-$1"]],
124
+ [[/^self-(.*)$/, /^justify-self-(.*)$/], ["place-self-$1"]]
125
+ ],
126
+ [
127
+ [[/^overflow-hidden/, /^text-ellipsis/, /^whitespace-nowrap/], ["truncate"]]
128
+ ]
129
+ ];
44
130
  function lintLiterals(ctx, literals) {
45
131
  const { tailwindConfig } = getOptions(ctx);
46
132
  for (const literal of literals) {
47
133
  const classes = splitClasses(literal.content);
48
- const { shorthandClasses, warnings } = getShorthandClasses({ classes, configPath: tailwindConfig, cwd: ctx.cwd });
49
- for (const [longhands, shorthands] of shorthandClasses) {
50
- const finalClasses = [];
51
- for (const className of classes) {
52
- if (!longhands.includes(className)) {
53
- finalClasses.push(className);
54
- continue;
134
+ const { dissectedClasses, warnings } = getDissectedClasses({ classes, configPath: tailwindConfig, cwd: ctx.cwd });
135
+ const shorthandGroups = getShorthands(dissectedClasses);
136
+ const { unregisteredClasses } = getUnregisteredClasses({
137
+ classes: shorthandGroups
138
+ .flat()
139
+ .map(([, shorthands]) => shorthands)
140
+ .flat(),
141
+ configPath: tailwindConfig,
142
+ cwd: ctx.cwd
143
+ });
144
+ lintClasses(ctx, literal, (className, index, after) => {
145
+ for (const shorthandGroup of shorthandGroups) {
146
+ for (const [longhands, shorthands] of shorthandGroup) {
147
+ const longhandClasses = longhands.map(longhand => buildClass(longhand));
148
+ if (!longhandClasses.includes(className)) {
149
+ continue;
150
+ }
151
+ if (shorthands.some(shorthand => unregisteredClasses.includes(shorthand))) {
152
+ continue;
153
+ }
154
+ if (shorthands.every(shorthand => after.includes(shorthand))) {
155
+ return {
156
+ fix: ""
157
+ };
158
+ }
159
+ return {
160
+ fix: shorthands.filter(shorthand => !after.includes(shorthand)).join(" "),
161
+ message: augmentMessageWithWarnings(`Non shorthand class detected. Expected ${longhandClasses.join(" ")} to be ${shorthands.join(" ")}`, DOCUMENTATION_URL, warnings)
162
+ };
55
163
  }
56
- if (shorthands.some(shorthand => finalClasses.includes(shorthand))) {
57
- continue;
164
+ }
165
+ });
166
+ }
167
+ }
168
+ function getShorthands(dissectedClasses) {
169
+ const possibleShorthandClassesGroups = [];
170
+ for (const shorthandGroup of shorthands) {
171
+ const sortedShorthandGroup = shorthandGroup.sort((a, b) => b[0].length - a[0].length);
172
+ const possibleShorthandClasses = [];
173
+ shorthandLoop: for (const [patterns, substitutes] of sortedShorthandGroup) {
174
+ const longhands = [];
175
+ const groups = [];
176
+ for (const pattern of patterns) {
177
+ classNameLoop: for (const dissectedClass of dissectedClasses) {
178
+ const match = dissectedClass.base.match(pattern);
179
+ if (!match) {
180
+ continue classNameLoop;
181
+ }
182
+ for (let m = 0; m < match.length; m++) {
183
+ if (groups[m] === undefined) {
184
+ groups[m] = match[m];
185
+ continue;
186
+ }
187
+ if (m === 0) {
188
+ continue;
189
+ }
190
+ if (groups[m] !== match[m]) {
191
+ continue shorthandLoop;
192
+ }
193
+ }
194
+ longhands.push(dissectedClass);
58
195
  }
59
- finalClasses.push(...shorthands);
60
196
  }
61
- const escapedClasses = escapeNestedQuotes(finalClasses.join(" "), literal.openingQuote ?? literal.closingQuote ?? "`");
62
- const fixedClasses = [
63
- literal.openingQuote ?? "",
64
- literal.type === "TemplateLiteral" && literal.closingBraces ? literal.closingBraces : "",
65
- escapedClasses,
66
- literal.type === "TemplateLiteral" && literal.openingBraces ? literal.openingBraces : "",
67
- literal.closingQuote ?? ""
68
- ].join("");
69
- if (literal.raw === fixedClasses) {
197
+ const isImportantAtEnd = longhands.some(longhand => longhand.important[1]);
198
+ const isImportantAtStart = !isImportantAtEnd && longhands.some(longhand => longhand.important[0]);
199
+ const negative = longhands.some(longhand => longhand.negative);
200
+ const prefix = longhands[0]?.prefix ?? "";
201
+ const variants = longhands[0]?.variants ?? [];
202
+ const separator = longhands[0]?.separator ?? ":";
203
+ if (longhands.length !== patterns.length ||
204
+ longhands.some(longhand => (longhand?.important[0] || longhand?.important[1]) !== (isImportantAtStart || isImportantAtEnd)) ||
205
+ longhands.some(longhand => longhand?.negative !== negative) ||
206
+ longhands.some(longhand => longhand?.variants.join(separator) !== variants.join(separator))) {
70
207
  continue;
71
208
  }
72
- ctx.report({
73
- data: {
74
- longhand: display(longhands.join(", ")),
75
- shorthand: display(shorthands.join(", "))
76
- },
77
- fix(fixer) {
78
- return fixer.replaceTextRange(literal.range, fixedClasses);
79
- },
80
- loc: literal.loc,
81
- message: augmentMessageWithWarnings("Non shorthand class detected. Expected {{ longhand }} to be {{ shorthand }}", DOCUMENTATION_URL, warnings)
82
- });
209
+ if (longhands.length === patterns.length) {
210
+ possibleShorthandClasses.push([longhands, substitutes.map(substitute => buildClass({
211
+ base: replacePlaceholders(substitute, groups),
212
+ important: [isImportantAtStart, isImportantAtEnd],
213
+ negative,
214
+ prefix,
215
+ separator,
216
+ variants
217
+ }))]);
218
+ }
219
+ }
220
+ if (possibleShorthandClasses.length > 0) {
221
+ possibleShorthandClassesGroups.push(possibleShorthandClasses.sort((a, b) => b[0].length - a[0].length));
83
222
  }
84
223
  }
224
+ return possibleShorthandClassesGroups;
85
225
  }
86
226
  export function getOptions(ctx) {
87
227
  return getCommonOptions(ctx);
@@ -1 +1 @@
1
- {"version":3,"file":"enforce-shorthand-classes.js","sourceRoot":"","sources":["../../../src/rules/enforce-shorthand-classes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"enforce-shorthand-classes.js","sourceRoot":"","sources":["../../../src/rules/enforce-shorthand-classes.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"no-conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CACF;CACF,CAAC;AAYF,eAAO,MAAM,oBAAoB,EAAE,UAAU,CAAC,OAAO,CA4BpD,CAAC;AAoDF,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW;;;;;;EAE/C"}
1
+ {"version":3,"file":"no-conflicting-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CACF;CACF,CAAC;AAYF,eAAO,MAAM,oBAAoB,EAAE,UAAU,CAAC,OAAO,CA4BpD,CAAC;AAuDF,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW;;;;;;EAE/C"}
@@ -1,9 +1,10 @@
1
1
  import { DEFAULT_ATTRIBUTE_NAMES, DEFAULT_CALLEE_NAMES, DEFAULT_TAG_NAMES, DEFAULT_VARIABLE_NAMES } from "../options/default-options.js";
2
2
  import { ATTRIBUTE_SCHEMA, CALLEE_SCHEMA, ENTRYPOINT_SCHEMA, TAG_SCHEMA, TAILWIND_CONFIG_SCHEMA, VARIABLE_SCHEMA } from "../options/descriptions.js";
3
3
  import { getConflictingClasses } from "../tailwindcss/conflicting-classes.js";
4
+ import { lintClasses } from "../utils/lint.js";
4
5
  import { getCommonOptions } from "../utils/options.js";
5
6
  import { createRuleListener } from "../utils/rule.js";
6
- import { augmentMessageWithWarnings, getExactClassLocation, splitClasses } from "../utils/utils.js";
7
+ import { augmentMessageWithWarnings, splitClasses } from "../utils/utils.js";
7
8
  const defaultOptions = {
8
9
  attributes: DEFAULT_ATTRIBUTE_NAMES,
9
10
  callees: DEFAULT_CALLEE_NAMES,
@@ -48,10 +49,13 @@ function lintLiterals(ctx, literals) {
48
49
  if (Object.keys(conflictingClasses).length === 0) {
49
50
  continue;
50
51
  }
51
- for (const className in conflictingClasses) {
52
+ lintClasses(ctx, literal, className => {
53
+ if (!conflictingClasses[className]) {
54
+ return;
55
+ }
52
56
  const conflicts = Object.entries(conflictingClasses[className]);
53
57
  if (conflicts.length === 0) {
54
- continue;
58
+ return;
55
59
  }
56
60
  const conflictingClassNames = conflicts.map(([conflictingClassName]) => conflictingClassName);
57
61
  const conflictingProperties = conflicts.reduce((acc, [, properties]) => {
@@ -62,16 +66,12 @@ function lintLiterals(ctx, literals) {
62
66
  }
63
67
  return acc;
64
68
  }, []);
65
- ctx.report({
66
- data: {
67
- className,
68
- conflictingClassNames: conflictingClassNames.join(", "),
69
- conflictingProperties: conflictingProperties.map(conflictingProperty => `"${conflictingProperty}"`).join(", ")
70
- },
71
- loc: getExactClassLocation(literal, className),
72
- message: augmentMessageWithWarnings("Conflicting class detected: \"{{ className }}\" and \"{{ conflictingClassNames }}\" apply the same CSS properties: {{ conflictingProperties }}.", DOCUMENTATION_URL, warnings)
73
- });
74
- }
69
+ const conflictingClassString = conflictingClassNames.join(", ");
70
+ const conflictingPropertiesString = conflictingProperties.map(conflictingProperty => `"${conflictingProperty}"`).join(", ");
71
+ return {
72
+ message: augmentMessageWithWarnings(`Conflicting class detected: "${className}" and "${conflictingClassString}" apply the same CSS properties: ${conflictingPropertiesString}.`, DOCUMENTATION_URL, warnings)
73
+ };
74
+ });
75
75
  }
76
76
  }
77
77
  export function getOptions(ctx) {
@@ -1 +1 @@
1
- {"version":3,"file":"no-conflicting-classes.js","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"no-conflicting-classes.js","sourceRoot":"","sources":["../../../src/rules/no-conflicting-classes.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import type { Rule } from "eslint";
2
+ import type { AttributeOption, CalleeOption, ESLintRule, TagOption, VariableOption } from "../types/rule.js";
3
+ export type Options = [
4
+ Partial<AttributeOption & CalleeOption & TagOption & VariableOption & {
5
+ entryPoint?: string;
6
+ tailwindConfig?: string;
7
+ }>
8
+ ];
9
+ export declare const noDeprecatedClasses: ESLintRule<Options>;
10
+ export declare function getOptions(ctx: Rule.RuleContext): {
11
+ attributes: any;
12
+ callees: any;
13
+ tags: any;
14
+ tailwindConfig: any;
15
+ variables: any;
16
+ };
17
+ //# sourceMappingURL=no-deprecated-classes.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"no-deprecated-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-deprecated-classes.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CACF;CACF,CAAC;AAYF,eAAO,MAAM,mBAAmB,EAAE,UAAU,CAAC,OAAO,CA4BnD,CAAC;AA4EF,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW;;;;;;EAE/C"}
@@ -0,0 +1,95 @@
1
+ import { DEFAULT_ATTRIBUTE_NAMES, DEFAULT_CALLEE_NAMES, DEFAULT_TAG_NAMES, DEFAULT_VARIABLE_NAMES } from "../options/default-options.js";
2
+ import { ATTRIBUTE_SCHEMA, CALLEE_SCHEMA, ENTRYPOINT_SCHEMA, TAG_SCHEMA, TAILWIND_CONFIG_SCHEMA, VARIABLE_SCHEMA } from "../options/descriptions.js";
3
+ import { getDissectedClasses } from "../tailwindcss/dissect-classes.js";
4
+ import { buildClass } from "../utils/class.js";
5
+ import { lintClasses } from "../utils/lint.js";
6
+ import { getCommonOptions } from "../utils/options.js";
7
+ import { createRuleListener } from "../utils/rule.js";
8
+ import { augmentMessageWithWarnings, replacePlaceholders, splitClasses } from "../utils/utils.js";
9
+ const defaultOptions = {
10
+ attributes: DEFAULT_ATTRIBUTE_NAMES,
11
+ callees: DEFAULT_CALLEE_NAMES,
12
+ tags: DEFAULT_TAG_NAMES,
13
+ variables: DEFAULT_VARIABLE_NAMES
14
+ };
15
+ const DOCUMENTATION_URL = "https://github.com/schoero/eslint-plugin-better-tailwindcss/blob/main/docs/rules/no-deprecated-classes.md";
16
+ export const noDeprecatedClasses = {
17
+ name: "no-deprecated-classes",
18
+ rule: {
19
+ create: ctx => createRuleListener(ctx, getOptions(ctx), lintLiterals),
20
+ meta: {
21
+ docs: {
22
+ description: "Disallow the use of deprecated Tailwind CSS classes.",
23
+ recommended: false,
24
+ url: DOCUMENTATION_URL
25
+ },
26
+ fixable: "code",
27
+ schema: [
28
+ {
29
+ additionalProperties: false,
30
+ properties: {
31
+ ...CALLEE_SCHEMA,
32
+ ...ATTRIBUTE_SCHEMA,
33
+ ...VARIABLE_SCHEMA,
34
+ ...TAG_SCHEMA,
35
+ ...ENTRYPOINT_SCHEMA,
36
+ ...TAILWIND_CONFIG_SCHEMA
37
+ },
38
+ type: "object"
39
+ }
40
+ ],
41
+ type: "problem"
42
+ }
43
+ }
44
+ };
45
+ const deprecations = [
46
+ [/^shadow$/, "shadow-sm"],
47
+ [/^drop-shadow$/, "drop-shadow-sm"],
48
+ [/^blur$/, "blur-sm"],
49
+ [/^backdrop-blur$/, "backdrop-blur-sm"],
50
+ [/^rounded$/, "rounded-sm"],
51
+ [/^bg-opacity-(.*)$/],
52
+ [/^text-opacity-(.*)$/],
53
+ [/^border-opacity-(.*)$/],
54
+ [/^divide-opacity-(.*)$/],
55
+ [/^ring-opacity-(.*)$/],
56
+ [/^placeholder-opacity-(.*)$/],
57
+ [/^flex-shrink-(.*)$/, "shrink-$1"],
58
+ [/^flex-grow-(.*)$/, "grow-$1"],
59
+ [/^overflow-ellipsis$/, "text-ellipsis"],
60
+ [/^decoration-slice$/, "box-decoration-slice"],
61
+ [/^decoration-clone$/, "box-decoration-clone"]
62
+ ];
63
+ function lintLiterals(ctx, literals) {
64
+ const { tailwindConfig } = getOptions(ctx);
65
+ for (const literal of literals) {
66
+ const classes = splitClasses(literal.content);
67
+ const { dissectedClasses, warnings } = getDissectedClasses({ classes, configPath: tailwindConfig, cwd: ctx.cwd });
68
+ lintClasses(ctx, literal, className => {
69
+ const dissectedClass = dissectedClasses.find(dissectedClass => dissectedClass.className === className);
70
+ if (!dissectedClass) {
71
+ return;
72
+ }
73
+ for (const [pattern, replacement] of deprecations) {
74
+ const match = dissectedClass.base.match(pattern);
75
+ if (!match) {
76
+ continue;
77
+ }
78
+ if (!replacement) {
79
+ return {
80
+ message: augmentMessageWithWarnings(`Class "${className}" is deprecated. Check the tailwindcss documentation for more information: https://tailwindcss.com/docs/upgrade-guide#removed-deprecated-utilities`, DOCUMENTATION_URL, warnings)
81
+ };
82
+ }
83
+ const fix = buildClass({ ...dissectedClass, base: replacePlaceholders(replacement, match) });
84
+ return {
85
+ fix,
86
+ message: augmentMessageWithWarnings(`Deprecated class detected. Replace "${className}" with ${fix}.`, DOCUMENTATION_URL, warnings)
87
+ };
88
+ }
89
+ });
90
+ }
91
+ }
92
+ export function getOptions(ctx) {
93
+ return getCommonOptions(ctx);
94
+ }
95
+ //# sourceMappingURL=no-deprecated-classes.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"no-deprecated-classes.js","sourceRoot":"","sources":["../../../src/rules/no-deprecated-classes.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import { DEFAULT_ATTRIBUTE_NAMES, DEFAULT_CALLEE_NAMES, DEFAULT_TAG_NAMES, DEFAULT_VARIABLE_NAMES } from "../options/default-options.js";
2
2
  import { ATTRIBUTE_SCHEMA, CALLEE_SCHEMA, TAG_SCHEMA, VARIABLE_SCHEMA } from "../options/descriptions.js";
3
+ import { lintClasses } from "../utils/lint.js";
3
4
  import { getCommonOptions } from "../utils/options.js";
4
- import { escapeNestedQuotes } from "../utils/quotes.js";
5
5
  import { createRuleListener } from "../utils/rule.js";
6
- import { getExactClassLocation, splitClasses, splitWhitespaces } from "../utils/utils.js";
6
+ import { isClassSticky, splitClasses } from "../utils/utils.js";
7
7
  const defaultOptions = {
8
8
  attributes: DEFAULT_ATTRIBUTE_NAMES,
9
9
  callees: DEFAULT_CALLEE_NAMES,
@@ -44,58 +44,19 @@ function lintLiterals(ctx, literals) {
44
44
  const parentClasses = literal.priorLiterals
45
45
  ? getClassesFromLiteralNodes(literal.priorLiterals)
46
46
  : [];
47
- const duplicates = [];
48
- const classes = literal.content;
49
- const classChunks = splitClasses(classes);
50
- const whitespaceChunks = splitWhitespaces(classes);
51
- const finalChunks = [];
52
- const startsWithWhitespace = whitespaceChunks.length > 0 && whitespaceChunks[0] !== "";
53
- const endsWithWhitespace = whitespaceChunks.length > 0 && whitespaceChunks[whitespaceChunks.length - 1] !== "";
54
- for (let i = 0; i < whitespaceChunks.length; i++) {
55
- if (whitespaceChunks[i]) {
56
- finalChunks.push(whitespaceChunks[i]);
47
+ lintClasses(ctx, literal, (className, index, after) => {
48
+ const duplicateClassIndex = after.findIndex((afterClass, afterIndex) => afterClass === className && afterIndex < index);
49
+ // always keep sticky classes
50
+ if (isClassSticky(literal, index) || isClassSticky(literal, duplicateClassIndex)) {
51
+ return;
57
52
  }
58
- if (classChunks[i]) {
59
- // always push sticky classes without adding to the register
60
- if (!startsWithWhitespace && i === 0 && literal.closingBraces ||
61
- !endsWithWhitespace && i === classChunks.length - 1 && literal.openingBraces) {
62
- finalChunks.push(classChunks[i]);
63
- continue;
64
- }
65
- if (parentClasses.includes(classChunks[i])) {
66
- if (!duplicates.includes(classChunks[i])) {
67
- duplicates.push(classChunks[i]);
68
- }
69
- }
70
- else {
71
- finalChunks.push(classChunks[i]);
72
- parentClasses.push(classChunks[i]);
73
- }
53
+ if (parentClasses.includes(className) || duplicateClassIndex !== -1) {
54
+ return {
55
+ fix: "",
56
+ message: `Duplicate classname: "${className}}".`
57
+ };
74
58
  }
75
- }
76
- const escapedClasses = escapeNestedQuotes(finalChunks.join(""), literal.openingQuote ?? literal.closingQuote ?? "\"");
77
- const fixedClasses = [
78
- literal.openingQuote ?? "",
79
- literal.type === "TemplateLiteral" && literal.closingBraces ? literal.closingBraces : "",
80
- escapedClasses,
81
- literal.type === "TemplateLiteral" && literal.openingBraces ? literal.openingBraces : "",
82
- literal.closingQuote ?? ""
83
- ].join("");
84
- if (literal.raw === fixedClasses) {
85
- continue;
86
- }
87
- for (const className of duplicates) {
88
- ctx.report({
89
- data: {
90
- duplicateClassname: className
91
- },
92
- fix(fixer) {
93
- return fixer.replaceTextRange(literal.range, fixedClasses);
94
- },
95
- loc: getExactClassLocation(literal, className, false, true),
96
- message: "Duplicate classname: \"{{ duplicateClassname }}\"."
97
- });
98
- }
59
+ });
99
60
  }
100
61
  }
101
62
  function getClassesFromLiteralNodes(literals) {
@@ -1 +1 @@
1
- {"version":3,"file":"no-duplicate-classes.js","sourceRoot":"","sources":["../../../src/rules/no-duplicate-classes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"no-duplicate-classes.js","sourceRoot":"","sources":["../../../src/rules/no-duplicate-classes.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"no-restricted-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-restricted-classes.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG;YACnB,OAAO,EAAE,MAAM,CAAC;YAChB,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC,EAAE,CAAC;KACN,CACF;CACF,CAAC;AAYF,eAAO,MAAM,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAwDnD,CAAC;AAwEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW;;iBAlJ/B,MAAM;cACT,MAAM;kBACF,MAAM;;;;;;;EA6JvB"}
1
+ {"version":3,"file":"no-restricted-classes.d.ts","sourceRoot":"","sources":["../../../src/rules/no-restricted-classes.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACf,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CACL,eAAe,GACf,YAAY,GACZ,SAAS,GACT,cAAc,GACd;QACE,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG;YACnB,OAAO,EAAE,MAAM,CAAC;YAChB,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC,EAAE,CAAC;KACN,CACF;CACF,CAAC;AAYF,eAAO,MAAM,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAwDnD,CAAC;AA8CF,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW;;iBAxH/B,MAAM;cACT,MAAM;kBACF,MAAM;;;;;;;EAmIvB"}