tailwindcss 0.0.0-insiders.bd4dddd → 0.0.0-insiders.bda8421

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 (224) hide show
  1. package/LICENSE +1 -2
  2. package/README.md +13 -10
  3. package/colors.d.ts +3 -0
  4. package/defaultConfig.d.ts +3 -0
  5. package/defaultTheme.d.ts +4 -0
  6. package/lib/cli/build/deps.js +62 -0
  7. package/lib/cli/build/index.js +54 -0
  8. package/lib/cli/build/plugin.js +371 -0
  9. package/lib/cli/build/utils.js +88 -0
  10. package/lib/cli/build/watching.js +182 -0
  11. package/lib/cli/help/index.js +73 -0
  12. package/lib/cli/index.js +230 -0
  13. package/lib/cli/init/index.js +63 -0
  14. package/lib/cli-peer-dependencies.js +28 -7
  15. package/lib/cli.js +1 -741
  16. package/lib/corePluginList.js +17 -4
  17. package/lib/corePlugins.js +2503 -1839
  18. package/lib/css/preflight.css +32 -13
  19. package/lib/featureFlags.js +45 -28
  20. package/lib/index.js +1 -29
  21. package/lib/lib/cacheInvalidation.js +92 -0
  22. package/lib/lib/collapseAdjacentRules.js +30 -10
  23. package/lib/lib/collapseDuplicateDeclarations.js +13 -8
  24. package/lib/lib/content.js +214 -0
  25. package/lib/lib/defaultExtractor.js +240 -31
  26. package/lib/lib/evaluateTailwindFunctions.js +117 -50
  27. package/lib/lib/expandApplyAtRules.js +466 -230
  28. package/lib/lib/expandTailwindAtRules.js +156 -135
  29. package/lib/lib/findAtConfigPath.js +46 -0
  30. package/lib/lib/generateRules.js +554 -200
  31. package/lib/lib/getModuleDependencies.js +88 -37
  32. package/lib/lib/load-config.js +57 -0
  33. package/lib/lib/normalizeTailwindDirectives.js +39 -33
  34. package/lib/lib/offsets.js +355 -0
  35. package/lib/lib/partitionApplyAtRules.js +58 -0
  36. package/lib/lib/regex.js +74 -0
  37. package/lib/lib/remap-bitfield.js +89 -0
  38. package/lib/lib/resolveDefaultsAtRules.js +97 -69
  39. package/lib/lib/setupContextUtils.js +796 -341
  40. package/lib/lib/setupTrackingContext.js +66 -71
  41. package/lib/lib/sharedState.js +45 -14
  42. package/lib/lib/substituteScreenAtRules.js +14 -10
  43. package/lib/plugin.js +48 -0
  44. package/{nesting → lib/postcss-plugins/nesting}/README.md +2 -2
  45. package/lib/postcss-plugins/nesting/index.js +21 -0
  46. package/lib/postcss-plugins/nesting/plugin.js +89 -0
  47. package/lib/processTailwindFeatures.js +37 -27
  48. package/lib/public/colors.js +272 -246
  49. package/lib/public/create-plugin.js +9 -5
  50. package/lib/public/default-config.js +10 -6
  51. package/lib/public/default-theme.js +10 -6
  52. package/lib/public/load-config.js +12 -0
  53. package/lib/public/resolve-config.js +11 -6
  54. package/lib/util/applyImportantSelector.js +36 -0
  55. package/lib/util/bigSign.js +6 -1
  56. package/lib/util/buildMediaQuery.js +13 -6
  57. package/lib/util/cloneDeep.js +9 -6
  58. package/lib/util/cloneNodes.js +44 -4
  59. package/lib/util/color.js +70 -53
  60. package/lib/util/colorNames.js +752 -0
  61. package/lib/util/configurePlugins.js +7 -2
  62. package/lib/util/createPlugin.js +8 -6
  63. package/lib/util/createUtilityPlugin.js +16 -16
  64. package/lib/util/dataTypes.js +295 -113
  65. package/lib/util/defaults.js +12 -7
  66. package/lib/util/escapeClassName.js +13 -8
  67. package/lib/util/escapeCommas.js +7 -2
  68. package/lib/util/flattenColorPalette.js +11 -12
  69. package/lib/util/formatVariantSelector.js +235 -151
  70. package/lib/util/getAllConfigs.js +33 -12
  71. package/lib/util/hashConfig.js +9 -4
  72. package/lib/util/isKeyframeRule.js +7 -2
  73. package/lib/util/isPlainObject.js +8 -3
  74. package/lib/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +25 -15
  75. package/lib/util/log.js +25 -15
  76. package/lib/util/nameClass.js +27 -10
  77. package/lib/util/negateValue.js +25 -8
  78. package/lib/util/normalizeConfig.js +127 -82
  79. package/lib/util/normalizeScreens.js +128 -11
  80. package/lib/util/parseAnimationValue.js +44 -40
  81. package/lib/util/parseBoxShadowValue.js +34 -23
  82. package/lib/util/parseDependency.js +39 -55
  83. package/lib/util/parseGlob.js +36 -0
  84. package/lib/util/parseObjectStyles.js +15 -10
  85. package/lib/util/pluginUtils.js +172 -69
  86. package/lib/util/prefixSelector.js +30 -12
  87. package/lib/util/pseudoElements.js +212 -0
  88. package/lib/util/removeAlphaVariables.js +31 -0
  89. package/lib/util/resolveConfig.js +101 -87
  90. package/lib/util/resolveConfigPath.js +30 -12
  91. package/lib/util/responsive.js +11 -6
  92. package/lib/util/splitAtTopLevelOnly.js +51 -0
  93. package/lib/util/tap.js +6 -1
  94. package/lib/util/toColorValue.js +7 -3
  95. package/lib/util/toPath.js +22 -4
  96. package/lib/util/transformThemeValue.js +40 -30
  97. package/lib/util/validateConfig.js +37 -0
  98. package/lib/util/validateFormalSyntax.js +26 -0
  99. package/lib/util/withAlphaVariable.js +27 -15
  100. package/lib/value-parser/LICENSE +22 -0
  101. package/lib/value-parser/README.md +3 -0
  102. package/lib/value-parser/index.d.js +2 -0
  103. package/lib/value-parser/index.js +22 -0
  104. package/lib/value-parser/parse.js +259 -0
  105. package/lib/value-parser/stringify.js +38 -0
  106. package/lib/value-parser/unit.js +86 -0
  107. package/lib/value-parser/walk.js +16 -0
  108. package/loadConfig.d.ts +4 -0
  109. package/loadConfig.js +2 -0
  110. package/nesting/index.d.ts +4 -0
  111. package/nesting/index.js +2 -12
  112. package/package.json +60 -55
  113. package/peers/index.js +75503 -55095
  114. package/plugin.d.ts +11 -0
  115. package/resolveConfig.d.ts +31 -0
  116. package/scripts/generate-types.js +104 -0
  117. package/scripts/release-channel.js +18 -0
  118. package/scripts/release-notes.js +21 -0
  119. package/scripts/type-utils.js +27 -0
  120. package/src/cli/build/deps.js +56 -0
  121. package/src/cli/build/index.js +49 -0
  122. package/src/cli/build/plugin.js +437 -0
  123. package/src/cli/build/utils.js +76 -0
  124. package/src/cli/build/watching.js +229 -0
  125. package/src/cli/help/index.js +70 -0
  126. package/src/cli/index.js +216 -0
  127. package/src/cli/init/index.js +79 -0
  128. package/src/cli-peer-dependencies.js +7 -1
  129. package/src/cli.js +1 -811
  130. package/src/corePluginList.js +1 -1
  131. package/src/corePlugins.js +849 -243
  132. package/src/css/preflight.css +32 -13
  133. package/src/featureFlags.js +13 -9
  134. package/src/index.js +1 -28
  135. package/src/lib/cacheInvalidation.js +52 -0
  136. package/src/lib/collapseAdjacentRules.js +21 -2
  137. package/src/lib/content.js +249 -0
  138. package/src/lib/defaultExtractor.js +215 -33
  139. package/src/lib/evaluateTailwindFunctions.js +82 -8
  140. package/src/lib/expandApplyAtRules.js +512 -224
  141. package/src/lib/expandTailwindAtRules.js +102 -87
  142. package/src/lib/findAtConfigPath.js +48 -0
  143. package/src/lib/generateRules.js +541 -146
  144. package/src/lib/getModuleDependencies.js +70 -30
  145. package/src/lib/load-config.ts +44 -0
  146. package/src/lib/normalizeTailwindDirectives.js +1 -0
  147. package/src/lib/offsets.js +432 -0
  148. package/src/lib/partitionApplyAtRules.js +52 -0
  149. package/src/lib/regex.js +74 -0
  150. package/src/lib/remap-bitfield.js +82 -0
  151. package/src/lib/resolveDefaultsAtRules.js +55 -30
  152. package/src/lib/setupContextUtils.js +720 -190
  153. package/src/lib/setupTrackingContext.js +47 -61
  154. package/src/lib/sharedState.js +15 -4
  155. package/src/plugin.js +47 -0
  156. package/src/postcss-plugins/nesting/README.md +42 -0
  157. package/src/postcss-plugins/nesting/index.js +13 -0
  158. package/src/postcss-plugins/nesting/plugin.js +80 -0
  159. package/src/processTailwindFeatures.js +11 -4
  160. package/src/public/colors.js +22 -0
  161. package/src/public/default-config.js +1 -1
  162. package/src/public/default-theme.js +2 -2
  163. package/src/public/load-config.js +2 -0
  164. package/src/util/applyImportantSelector.js +27 -0
  165. package/src/util/buildMediaQuery.js +5 -3
  166. package/src/util/cloneNodes.js +40 -2
  167. package/src/util/color.js +39 -20
  168. package/src/util/colorNames.js +150 -0
  169. package/src/util/dataTypes.js +184 -26
  170. package/src/util/formatVariantSelector.js +272 -144
  171. package/src/util/getAllConfigs.js +21 -2
  172. package/src/util/isPlainObject.js +1 -1
  173. package/src/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +1 -1
  174. package/src/util/log.js +8 -8
  175. package/src/util/nameClass.js +4 -0
  176. package/src/util/negateValue.js +11 -3
  177. package/src/util/normalizeConfig.js +45 -6
  178. package/src/util/normalizeScreens.js +99 -4
  179. package/src/util/parseBoxShadowValue.js +4 -3
  180. package/src/util/parseDependency.js +37 -42
  181. package/src/util/parseGlob.js +24 -0
  182. package/src/util/pluginUtils.js +139 -24
  183. package/src/util/prefixSelector.js +31 -10
  184. package/src/util/pseudoElements.js +171 -0
  185. package/src/util/removeAlphaVariables.js +24 -0
  186. package/src/util/resolveConfig.js +70 -32
  187. package/src/util/resolveConfigPath.js +12 -1
  188. package/src/util/splitAtTopLevelOnly.js +52 -0
  189. package/src/util/toPath.js +1 -1
  190. package/src/util/transformThemeValue.js +13 -3
  191. package/src/util/validateConfig.js +26 -0
  192. package/src/util/validateFormalSyntax.js +34 -0
  193. package/src/util/withAlphaVariable.js +1 -1
  194. package/src/value-parser/LICENSE +22 -0
  195. package/src/value-parser/README.md +3 -0
  196. package/src/value-parser/index.d.ts +177 -0
  197. package/src/value-parser/index.js +28 -0
  198. package/src/value-parser/parse.js +303 -0
  199. package/src/value-parser/stringify.js +41 -0
  200. package/src/value-parser/unit.js +118 -0
  201. package/src/value-parser/walk.js +18 -0
  202. package/stubs/.gitignore +1 -0
  203. package/stubs/.prettierrc.json +6 -0
  204. package/stubs/{defaultConfig.stub.js → config.full.js} +290 -178
  205. package/stubs/postcss.config.js +6 -0
  206. package/stubs/tailwind.config.cjs +2 -0
  207. package/stubs/tailwind.config.js +2 -0
  208. package/stubs/tailwind.config.ts +3 -0
  209. package/types/config.d.ts +376 -0
  210. package/types/generated/.gitkeep +0 -0
  211. package/types/generated/colors.d.ts +298 -0
  212. package/types/generated/corePluginList.d.ts +1 -0
  213. package/types/generated/default-theme.d.ts +397 -0
  214. package/types/index.d.ts +11 -0
  215. package/CHANGELOG.md +0 -1959
  216. package/lib/constants.js +0 -37
  217. package/lib/lib/detectNesting.js +0 -34
  218. package/nesting/plugin.js +0 -41
  219. package/scripts/install-integrations.js +0 -27
  220. package/scripts/rebuildFixtures.js +0 -68
  221. package/src/constants.js +0 -17
  222. package/src/lib/detectNesting.js +0 -39
  223. /package/stubs/{simpleConfig.stub.js → config.simple.js} +0 -0
  224. /package/stubs/{defaultPostCssConfig.stub.js → postcss.config.cjs} +0 -0
@@ -2,47 +2,98 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- exports.default = getModuleDependencies;
6
- var _fs = _interopRequireDefault(require("fs"));
7
- var _path = _interopRequireDefault(require("path"));
8
- var _resolve = _interopRequireDefault(require("resolve"));
9
- var _detective = _interopRequireDefault(require("detective"));
10
- function _interopRequireDefault(obj) {
5
+ Object.defineProperty(exports, "default", {
6
+ enumerable: true,
7
+ get: function() {
8
+ return getModuleDependencies;
9
+ }
10
+ });
11
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
12
+ const _path = /*#__PURE__*/ _interop_require_default(require("path"));
13
+ function _interop_require_default(obj) {
11
14
  return obj && obj.__esModule ? obj : {
12
15
  default: obj
13
16
  };
14
17
  }
15
- function createModule(file) {
16
- const source = _fs.default.readFileSync(file, 'utf-8');
17
- const requires = (0, _detective).default(source);
18
- return {
19
- file,
20
- requires
21
- };
18
+ let jsExtensions = [
19
+ ".js",
20
+ ".cjs",
21
+ ".mjs"
22
+ ];
23
+ // Given the current file `a.ts`, we want to make sure that when importing `b` that we resolve
24
+ // `b.ts` before `b.js`
25
+ //
26
+ // E.g.:
27
+ //
28
+ // a.ts
29
+ // b // .ts
30
+ // c // .ts
31
+ // a.js
32
+ // b // .js or .ts
33
+ let jsResolutionOrder = [
34
+ "",
35
+ ".js",
36
+ ".cjs",
37
+ ".mjs",
38
+ ".ts",
39
+ ".cts",
40
+ ".mts",
41
+ ".jsx",
42
+ ".tsx"
43
+ ];
44
+ let tsResolutionOrder = [
45
+ "",
46
+ ".ts",
47
+ ".cts",
48
+ ".mts",
49
+ ".tsx",
50
+ ".js",
51
+ ".cjs",
52
+ ".mjs",
53
+ ".jsx"
54
+ ];
55
+ function resolveWithExtension(file, extensions) {
56
+ // Try to find `./a.ts`, `./a.ts`, ... from `./a`
57
+ for (let ext of extensions){
58
+ let full = `${file}${ext}`;
59
+ if (_fs.default.existsSync(full) && _fs.default.statSync(full).isFile()) {
60
+ return full;
61
+ }
62
+ }
63
+ // Try to find `./a/index.js` from `./a`
64
+ for (let ext of extensions){
65
+ let full = `${file}/index${ext}`;
66
+ if (_fs.default.existsSync(full)) {
67
+ return full;
68
+ }
69
+ }
70
+ return null;
22
71
  }
23
- function getModuleDependencies(entryFile) {
24
- const rootModule = createModule(entryFile);
25
- const modules = [
26
- rootModule
27
- ];
28
- // Iterate over the modules, even when new
29
- // ones are being added
30
- for (const mdl of modules){
31
- mdl.requires.filter((dep)=>{
32
- // Only track local modules, not node_modules
33
- return dep.startsWith('./') || dep.startsWith('../');
34
- }).forEach((dep)=>{
35
- try {
36
- const basedir = _path.default.dirname(mdl.file);
37
- const depPath = _resolve.default.sync(dep, {
38
- basedir
39
- });
40
- const depModule = createModule(depPath);
41
- modules.push(depModule);
42
- } catch (_err) {
43
- // eslint-disable-next-line no-empty
44
- }
45
- });
72
+ function* _getModuleDependencies(filename, base, seen, ext = _path.default.extname(filename)) {
73
+ // Try to find the file
74
+ let absoluteFile = resolveWithExtension(_path.default.resolve(base, filename), jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder);
75
+ if (absoluteFile === null) return; // File doesn't exist
76
+ // Prevent infinite loops when there are circular dependencies
77
+ if (seen.has(absoluteFile)) return; // Already seen
78
+ seen.add(absoluteFile);
79
+ // Mark the file as a dependency
80
+ yield absoluteFile;
81
+ // Resolve new base for new imports/requires
82
+ base = _path.default.dirname(absoluteFile);
83
+ ext = _path.default.extname(absoluteFile);
84
+ let contents = _fs.default.readFileSync(absoluteFile, "utf-8");
85
+ // Find imports/requires
86
+ for (let match of [
87
+ ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
88
+ ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
89
+ ...contents.matchAll(/require\(['"`](.+)['"`]\)/gi)
90
+ ]){
91
+ // Bail out if it's not a relative file
92
+ if (!match[1].startsWith(".")) continue;
93
+ yield* _getModuleDependencies(match[1], base, seen, ext);
46
94
  }
47
- return modules;
95
+ }
96
+ function getModuleDependencies(absoluteFilePath) {
97
+ if (absoluteFilePath === null) return new Set();
98
+ return new Set(_getModuleDependencies(absoluteFilePath, _path.default.dirname(absoluteFilePath), new Set()));
48
99
  }
@@ -0,0 +1,57 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ function _export(target, all) {
6
+ for(var name in all)Object.defineProperty(target, name, {
7
+ enumerable: true,
8
+ get: all[name]
9
+ });
10
+ }
11
+ _export(exports, {
12
+ useCustomJiti: function() {
13
+ return useCustomJiti;
14
+ },
15
+ loadConfig: function() {
16
+ return loadConfig;
17
+ }
18
+ });
19
+ const _jiti = /*#__PURE__*/ _interop_require_default(require("jiti"));
20
+ const _sucrase = require("sucrase");
21
+ function _interop_require_default(obj) {
22
+ return obj && obj.__esModule ? obj : {
23
+ default: obj
24
+ };
25
+ }
26
+ let jiti = null;
27
+ function useCustomJiti(_jiti) {
28
+ jiti = _jiti();
29
+ }
30
+ function lazyJiti() {
31
+ return jiti !== null && jiti !== void 0 ? jiti : jiti = (0, _jiti.default)(__filename, {
32
+ interopDefault: true,
33
+ transform: (opts)=>{
34
+ // Sucrase can't transform import.meta so we have to use Babel
35
+ if (opts.source.includes("import.meta")) {
36
+ return require("jiti/dist/babel.js")(opts);
37
+ }
38
+ return (0, _sucrase.transform)(opts.source, {
39
+ transforms: [
40
+ "typescript",
41
+ "imports"
42
+ ]
43
+ });
44
+ }
45
+ });
46
+ }
47
+ function loadConfig(path) {
48
+ let config = function() {
49
+ try {
50
+ return path ? require(path) : {};
51
+ } catch {
52
+ return lazyJiti()(path);
53
+ }
54
+ }();
55
+ var _config_default;
56
+ return (_config_default = config.default) !== null && _config_default !== void 0 ? _config_default : config;
57
+ }
@@ -2,9 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- exports.default = normalizeTailwindDirectives;
6
- var _log = _interopRequireDefault(require("../util/log"));
7
- function _interopRequireDefault(obj) {
5
+ Object.defineProperty(exports, "default", {
6
+ enumerable: true,
7
+ get: function() {
8
+ return normalizeTailwindDirectives;
9
+ }
10
+ });
11
+ const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
12
+ function _interop_require_default(obj) {
8
13
  return obj && obj.__esModule ? obj : {
9
14
  default: obj
10
15
  };
@@ -14,64 +19,65 @@ function normalizeTailwindDirectives(root) {
14
19
  let layerDirectives = new Set();
15
20
  let applyDirectives = new Set();
16
21
  root.walkAtRules((atRule)=>{
17
- if (atRule.name === 'apply') {
22
+ if (atRule.name === "apply") {
18
23
  applyDirectives.add(atRule);
19
24
  }
20
- if (atRule.name === 'import') {
25
+ if (atRule.name === "import") {
21
26
  if (atRule.params === '"tailwindcss/base"' || atRule.params === "'tailwindcss/base'") {
22
- atRule.name = 'tailwind';
23
- atRule.params = 'base';
27
+ atRule.name = "tailwind";
28
+ atRule.params = "base";
24
29
  } else if (atRule.params === '"tailwindcss/components"' || atRule.params === "'tailwindcss/components'") {
25
- atRule.name = 'tailwind';
26
- atRule.params = 'components';
30
+ atRule.name = "tailwind";
31
+ atRule.params = "components";
27
32
  } else if (atRule.params === '"tailwindcss/utilities"' || atRule.params === "'tailwindcss/utilities'") {
28
- atRule.name = 'tailwind';
29
- atRule.params = 'utilities';
33
+ atRule.name = "tailwind";
34
+ atRule.params = "utilities";
30
35
  } else if (atRule.params === '"tailwindcss/screens"' || atRule.params === "'tailwindcss/screens'" || atRule.params === '"tailwindcss/variants"' || atRule.params === "'tailwindcss/variants'") {
31
- atRule.name = 'tailwind';
32
- atRule.params = 'variants';
36
+ atRule.name = "tailwind";
37
+ atRule.params = "variants";
33
38
  }
34
39
  }
35
- if (atRule.name === 'tailwind') {
36
- if (atRule.params === 'screens') {
37
- atRule.params = 'variants';
40
+ if (atRule.name === "tailwind") {
41
+ if (atRule.params === "screens") {
42
+ atRule.params = "variants";
38
43
  }
39
44
  tailwindDirectives.add(atRule.params);
40
45
  }
41
46
  if ([
42
- 'layer',
43
- 'responsive',
44
- 'variants'
47
+ "layer",
48
+ "responsive",
49
+ "variants"
45
50
  ].includes(atRule.name)) {
46
51
  if ([
47
- 'responsive',
48
- 'variants'
52
+ "responsive",
53
+ "variants"
49
54
  ].includes(atRule.name)) {
50
55
  _log.default.warn(`${atRule.name}-at-rule-deprecated`, [
51
56
  `The \`@${atRule.name}\` directive has been deprecated in Tailwind CSS v3.0.`,
52
- `Use \`@layer utilities\` or \`@layer components\` instead.`,
57
+ `Use \`@layer utilities\` or \`@layer components\` instead.`,
58
+ "https://tailwindcss.com/docs/upgrade-guide#replace-variants-with-layer"
53
59
  ]);
54
60
  }
55
61
  layerDirectives.add(atRule);
56
62
  }
57
63
  });
58
- if (!tailwindDirectives.has('base') || !tailwindDirectives.has('components') || !tailwindDirectives.has('utilities')) {
64
+ if (!tailwindDirectives.has("base") || !tailwindDirectives.has("components") || !tailwindDirectives.has("utilities")) {
59
65
  for (let rule of layerDirectives){
60
- if (rule.name === 'layer' && [
61
- 'base',
62
- 'components',
63
- 'utilities'
66
+ if (rule.name === "layer" && [
67
+ "base",
68
+ "components",
69
+ "utilities"
64
70
  ].includes(rule.params)) {
65
71
  if (!tailwindDirectives.has(rule.params)) {
66
72
  throw rule.error(`\`@layer ${rule.params}\` is used but no matching \`@tailwind ${rule.params}\` directive is present.`);
67
73
  }
68
- } else if (rule.name === 'responsive') {
69
- if (!tailwindDirectives.has('utilities')) {
70
- throw rule.error('`@responsive` is used but `@tailwind utilities` is missing.');
74
+ } else if (rule.name === "responsive") {
75
+ if (!tailwindDirectives.has("utilities")) {
76
+ throw rule.error("`@responsive` is used but `@tailwind utilities` is missing.");
71
77
  }
72
- } else if (rule.name === 'variants') {
73
- if (!tailwindDirectives.has('utilities')) {
74
- throw rule.error('`@variants` is used but `@tailwind utilities` is missing.');
78
+ } else if (rule.name === "variants") {
79
+ if (!tailwindDirectives.has("utilities")) {
80
+ throw rule.error("`@variants` is used but `@tailwind utilities` is missing.");
75
81
  }
76
82
  }
77
83
  }
@@ -0,0 +1,355 @@
1
+ // @ts-check
2
+ "use strict";
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ Object.defineProperty(exports, "Offsets", {
7
+ enumerable: true,
8
+ get: function() {
9
+ return Offsets;
10
+ }
11
+ });
12
+ const _bigSign = /*#__PURE__*/ _interop_require_default(require("../util/bigSign"));
13
+ const _remapbitfield = require("./remap-bitfield.js");
14
+ function _interop_require_default(obj) {
15
+ return obj && obj.__esModule ? obj : {
16
+ default: obj
17
+ };
18
+ }
19
+ class Offsets {
20
+ constructor(){
21
+ /**
22
+ * Offsets for the next rule in a given layer
23
+ *
24
+ * @type {Record<Layer, bigint>}
25
+ */ this.offsets = {
26
+ defaults: 0n,
27
+ base: 0n,
28
+ components: 0n,
29
+ utilities: 0n,
30
+ variants: 0n,
31
+ user: 0n
32
+ };
33
+ /**
34
+ * Positions for a given layer
35
+ *
36
+ * @type {Record<Layer, bigint>}
37
+ */ this.layerPositions = {
38
+ defaults: 0n,
39
+ base: 1n,
40
+ components: 2n,
41
+ utilities: 3n,
42
+ // There isn't technically a "user" layer, but we need to give it a position
43
+ // Because it's used for ordering user-css from @apply
44
+ user: 4n,
45
+ variants: 5n
46
+ };
47
+ /**
48
+ * The total number of functions currently registered across all variants (including arbitrary variants)
49
+ *
50
+ * @type {bigint}
51
+ */ this.reservedVariantBits = 0n;
52
+ /**
53
+ * Positions for a given variant
54
+ *
55
+ * @type {Map<string, bigint>}
56
+ */ this.variantOffsets = new Map();
57
+ }
58
+ /**
59
+ * @param {Layer} layer
60
+ * @returns {RuleOffset}
61
+ */ create(layer) {
62
+ return {
63
+ layer,
64
+ parentLayer: layer,
65
+ arbitrary: 0n,
66
+ variants: 0n,
67
+ parallelIndex: 0n,
68
+ index: this.offsets[layer]++,
69
+ propertyOffset: 0n,
70
+ property: "",
71
+ options: []
72
+ };
73
+ }
74
+ /**
75
+ * @param {string} name
76
+ * @returns {RuleOffset}
77
+ */ arbitraryProperty(name) {
78
+ return {
79
+ ...this.create("utilities"),
80
+ arbitrary: 1n,
81
+ property: name
82
+ };
83
+ }
84
+ /**
85
+ * Get the offset for a variant
86
+ *
87
+ * @param {string} variant
88
+ * @param {number} index
89
+ * @returns {RuleOffset}
90
+ */ forVariant(variant, index = 0) {
91
+ let offset = this.variantOffsets.get(variant);
92
+ if (offset === undefined) {
93
+ throw new Error(`Cannot find offset for unknown variant ${variant}`);
94
+ }
95
+ return {
96
+ ...this.create("variants"),
97
+ variants: offset << BigInt(index)
98
+ };
99
+ }
100
+ /**
101
+ * @param {RuleOffset} rule
102
+ * @param {RuleOffset} variant
103
+ * @param {VariantOption} options
104
+ * @returns {RuleOffset}
105
+ */ applyVariantOffset(rule, variant, options) {
106
+ options.variant = variant.variants;
107
+ return {
108
+ ...rule,
109
+ layer: "variants",
110
+ parentLayer: rule.layer === "variants" ? rule.parentLayer : rule.layer,
111
+ variants: rule.variants | variant.variants,
112
+ options: options.sort ? [].concat(options, rule.options) : rule.options,
113
+ // TODO: Technically this is wrong. We should be handling parallel index on a per variant basis.
114
+ // We'll take the max of all the parallel indexes for now.
115
+ // @ts-ignore
116
+ parallelIndex: max([
117
+ rule.parallelIndex,
118
+ variant.parallelIndex
119
+ ])
120
+ };
121
+ }
122
+ /**
123
+ * @param {RuleOffset} offset
124
+ * @param {number} parallelIndex
125
+ * @returns {RuleOffset}
126
+ */ applyParallelOffset(offset, parallelIndex) {
127
+ return {
128
+ ...offset,
129
+ parallelIndex: BigInt(parallelIndex)
130
+ };
131
+ }
132
+ /**
133
+ * Each variant gets 1 bit per function / rule registered.
134
+ * This is because multiple variants can be applied to a single rule and we need to know which ones are present and which ones are not.
135
+ * Additionally, every unique group of variants is grouped together in the stylesheet.
136
+ *
137
+ * This grouping is order-independent. For instance, we do not differentiate between `hover:focus` and `focus:hover`.
138
+ *
139
+ * @param {string[]} variants
140
+ * @param {(name: string) => number} getLength
141
+ */ recordVariants(variants, getLength) {
142
+ for (let variant of variants){
143
+ this.recordVariant(variant, getLength(variant));
144
+ }
145
+ }
146
+ /**
147
+ * The same as `recordVariants` but for a single arbitrary variant at runtime.
148
+ * @param {string} variant
149
+ * @param {number} fnCount
150
+ *
151
+ * @returns {RuleOffset} The highest offset for this variant
152
+ */ recordVariant(variant, fnCount = 1) {
153
+ this.variantOffsets.set(variant, 1n << this.reservedVariantBits);
154
+ // Ensure space is reserved for each "function" in the parallel variant
155
+ // by offsetting the next variant by the number of parallel variants
156
+ // in the one we just added.
157
+ // Single functions that return parallel variants are NOT handled separately here
158
+ // They're offset by 1 (or the number of functions) as usual
159
+ // And each rule returned is tracked separately since the functions are evaluated lazily.
160
+ // @see `RuleOffset.parallelIndex`
161
+ this.reservedVariantBits += BigInt(fnCount);
162
+ return {
163
+ ...this.create("variants"),
164
+ variants: this.variantOffsets.get(variant)
165
+ };
166
+ }
167
+ /**
168
+ * @param {RuleOffset} a
169
+ * @param {RuleOffset} b
170
+ * @returns {bigint}
171
+ */ compare(a, b) {
172
+ // Sort layers together
173
+ if (a.layer !== b.layer) {
174
+ return this.layerPositions[a.layer] - this.layerPositions[b.layer];
175
+ }
176
+ // When sorting the `variants` layer, we need to sort based on the parent layer as well within
177
+ // this variants layer.
178
+ if (a.parentLayer !== b.parentLayer) {
179
+ return this.layerPositions[a.parentLayer] - this.layerPositions[b.parentLayer];
180
+ }
181
+ // Sort based on the sorting function
182
+ for (let aOptions of a.options){
183
+ for (let bOptions of b.options){
184
+ if (aOptions.id !== bOptions.id) continue;
185
+ if (!aOptions.sort || !bOptions.sort) continue;
186
+ var _max;
187
+ let maxFnVariant = (_max = max([
188
+ aOptions.variant,
189
+ bOptions.variant
190
+ ])) !== null && _max !== void 0 ? _max : 0n;
191
+ // Create a mask of 0s from bits 1..N where N represents the mask of the Nth bit
192
+ let mask = ~(maxFnVariant | maxFnVariant - 1n);
193
+ let aVariantsAfterFn = a.variants & mask;
194
+ let bVariantsAfterFn = b.variants & mask;
195
+ // If the variants the same, we _can_ sort them
196
+ if (aVariantsAfterFn !== bVariantsAfterFn) {
197
+ continue;
198
+ }
199
+ let result = aOptions.sort({
200
+ value: aOptions.value,
201
+ modifier: aOptions.modifier
202
+ }, {
203
+ value: bOptions.value,
204
+ modifier: bOptions.modifier
205
+ });
206
+ if (result !== 0) return result;
207
+ }
208
+ }
209
+ // Sort variants in the order they were registered
210
+ if (a.variants !== b.variants) {
211
+ return a.variants - b.variants;
212
+ }
213
+ // Make sure each rule returned by a parallel variant is sorted in ascending order
214
+ if (a.parallelIndex !== b.parallelIndex) {
215
+ return a.parallelIndex - b.parallelIndex;
216
+ }
217
+ // Always sort arbitrary properties after other utilities
218
+ if (a.arbitrary !== b.arbitrary) {
219
+ return a.arbitrary - b.arbitrary;
220
+ }
221
+ // Always sort arbitrary properties alphabetically
222
+ if (a.propertyOffset !== b.propertyOffset) {
223
+ return a.propertyOffset - b.propertyOffset;
224
+ }
225
+ // Sort utilities, components, etc… in the order they were registered
226
+ return a.index - b.index;
227
+ }
228
+ /**
229
+ * Arbitrary variants are recorded in the order they're encountered.
230
+ * This means that the order is not stable between environments and sets of content files.
231
+ *
232
+ * In order to make the order stable, we need to remap the arbitrary variant offsets to
233
+ * be in alphabetical order starting from the offset of the first arbitrary variant.
234
+ */ recalculateVariantOffsets() {
235
+ // Sort the variants by their name
236
+ let variants = Array.from(this.variantOffsets.entries()).filter(([v])=>v.startsWith("[")).sort(([a], [z])=>fastCompare(a, z));
237
+ // Sort the list of offsets
238
+ // This is not necessarily a discrete range of numbers which is why
239
+ // we're using sort instead of creating a range from min/max
240
+ let newOffsets = variants.map(([, offset])=>offset).sort((a, z)=>(0, _bigSign.default)(a - z));
241
+ // Create a map from the old offsets to the new offsets in the new sort order
242
+ /** @type {[bigint, bigint][]} */ let mapping = variants.map(([, oldOffset], i)=>[
243
+ oldOffset,
244
+ newOffsets[i]
245
+ ]);
246
+ // Remove any variants that will not move letting us skip
247
+ // remapping if everything happens to be in order
248
+ return mapping.filter(([a, z])=>a !== z);
249
+ }
250
+ /**
251
+ * @template T
252
+ * @param {[RuleOffset, T][]} list
253
+ * @returns {[RuleOffset, T][]}
254
+ */ remapArbitraryVariantOffsets(list) {
255
+ let mapping = this.recalculateVariantOffsets();
256
+ // No arbitrary variants? Nothing to do.
257
+ // Everyhing already in order? Nothing to do.
258
+ if (mapping.length === 0) {
259
+ return list;
260
+ }
261
+ // Remap every variant offset in the list
262
+ return list.map((item)=>{
263
+ let [offset, rule] = item;
264
+ offset = {
265
+ ...offset,
266
+ variants: (0, _remapbitfield.remapBitfield)(offset.variants, mapping)
267
+ };
268
+ return [
269
+ offset,
270
+ rule
271
+ ];
272
+ });
273
+ }
274
+ /**
275
+ * @template T
276
+ * @param {[RuleOffset, T][]} list
277
+ * @returns {[RuleOffset, T][]}
278
+ */ sortArbitraryProperties(list) {
279
+ // Collect all known arbitrary properties
280
+ let known = new Set();
281
+ for (let [offset] of list){
282
+ if (offset.arbitrary === 1n) {
283
+ known.add(offset.property);
284
+ }
285
+ }
286
+ // No arbitrary properties? Nothing to do.
287
+ if (known.size === 0) {
288
+ return list;
289
+ }
290
+ // Sort the properties alphabetically
291
+ let properties = Array.from(known).sort();
292
+ // Create a map from the property name to its offset
293
+ let offsets = new Map();
294
+ let offset = 1n;
295
+ for (let property of properties){
296
+ offsets.set(property, offset++);
297
+ }
298
+ // Apply the sorted offsets to the list
299
+ return list.map((item)=>{
300
+ let [offset, rule] = item;
301
+ var _offsets_get;
302
+ offset = {
303
+ ...offset,
304
+ propertyOffset: (_offsets_get = offsets.get(offset.property)) !== null && _offsets_get !== void 0 ? _offsets_get : 0n
305
+ };
306
+ return [
307
+ offset,
308
+ rule
309
+ ];
310
+ });
311
+ }
312
+ /**
313
+ * @template T
314
+ * @param {[RuleOffset, T][]} list
315
+ * @returns {[RuleOffset, T][]}
316
+ */ sort(list) {
317
+ // Sort arbitrary variants so they're in alphabetical order
318
+ list = this.remapArbitraryVariantOffsets(list);
319
+ // Sort arbitrary properties so they're in alphabetical order
320
+ list = this.sortArbitraryProperties(list);
321
+ return list.sort(([a], [b])=>(0, _bigSign.default)(this.compare(a, b)));
322
+ }
323
+ }
324
+ /**
325
+ *
326
+ * @param {bigint[]} nums
327
+ * @returns {bigint|null}
328
+ */ function max(nums) {
329
+ let max = null;
330
+ for (const num of nums){
331
+ max = max !== null && max !== void 0 ? max : num;
332
+ max = max > num ? max : num;
333
+ }
334
+ return max;
335
+ }
336
+ /**
337
+ * A fast ASCII order string comparison function.
338
+ *
339
+ * Using `.sort()` without a custom compare function is faster
340
+ * But you can only use that if you're sorting an array of
341
+ * only strings. If you're sorting strings inside objects
342
+ * or arrays, you need must use a custom compare function.
343
+ *
344
+ * @param {string} a
345
+ * @param {string} b
346
+ */ function fastCompare(a, b) {
347
+ let aLen = a.length;
348
+ let bLen = b.length;
349
+ let minLen = aLen < bLen ? aLen : bLen;
350
+ for(let i = 0; i < minLen; i++){
351
+ let cmp = a.charCodeAt(i) - b.charCodeAt(i);
352
+ if (cmp !== 0) return cmp;
353
+ }
354
+ return aLen - bLen;
355
+ }