Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: attempt for better perfs
  • Loading branch information
francoismassart committed Feb 17, 2022
commit a1c9b24107e5bf3b6522dc6847f4af0a4219c785
6 changes: 4 additions & 2 deletions lib/rules/classnames-order.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
const docsUrl = require('../util/docsUrl');
const customConfig = require('../util/customConfig');
const astUtil = require('../util/ast');
const order = require('../util/prettier/order');
const groupUtil = require('../util/groupMethods');
const removeDuplicatesFromClassnamesAndWhitespaces = require('../util/removeDuplicatesFromClassnamesAndWhitespaces');
const getOption = require('../util/settings');
const parserUtil = require('../util/parser');
const order = require('../util/prettier/order');
const createContextFallback = require('tailwindcss/lib/lib/setupContextUtils').createContext;

//------------------------------------------------------------------------------
// Rule Definition
Expand Down Expand Up @@ -87,6 +88,7 @@ module.exports = {
const removeDuplicates = getOption(context, 'removeDuplicates');

const mergedConfig = customConfig.resolve(twConfig);
const contextFallback = officialSorting ? createContextFallback(mergedConfig) : null;

//----------------------------------------------------------------------
// Helpers
Expand Down Expand Up @@ -302,7 +304,7 @@ module.exports = {
let validatedClassNamesValue = '';

if (officialSorting) {
orderedClassNames = order(classNames, mergedConfig);
orderedClassNames = order(classNames, contextFallback);
for (let i = 0; i < orderedClassNames.length; i++) {
const w = whitespaces[i] ?? '';
const cls = orderedClassNames[i];
Expand Down
15 changes: 10 additions & 5 deletions lib/util/prettier/order.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
var createContextFallback = require('tailwindcss/lib/lib/setupContextUtils').createContext;
var generateRulesFallback = require('tailwindcss/lib/lib/generateRules').generateRules;

var generatedMap = new Map();

function bigSign(bigIntValue) {
return (bigIntValue > 0n) - (bigIntValue < 0n);
}

function order(unordered, config) {
var context = createContextFallback(config);
function order(unordered, context) {
const classNamesWithOrder = [];
unordered.forEach((className) => {
const order =
generateRulesFallback(new Set([className]), context).sort(([a], [z]) => bigSign(z - a))[0]?.[0] ?? null;
let order;
if (generatedMap.has(className)) {
order = generatedMap.get(className);
} else {
order = generateRulesFallback(new Set([className]), context).sort(([a], [z]) => bigSign(z - a))[0]?.[0] ?? null;
generatedMap.set(className, order);
}
classNamesWithOrder.push([className, order]);
});

Expand Down