@telepix-lab/telepix-ui 0.9.2 → 0.9.3

package/dist/cjs/index.js

@@ -7,36 +7,7 @@ var sonner = require('sonner');
 
 function r(e){var t,f,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e)){var o=e.length;for(t=0;t<o;t++)e[t]&&(f=r(e[t]))&&(n&&(n+=" "),n+=f);}else for(f in e)e[f]&&(n&&(n+=" "),n+=f);return n}function clsx(){for(var e,t,f=0,n="",o=arguments.length;f<o;f++)(e=arguments[f])&&(t=r(e))&&(n&&(n+=" "),n+=t);return n}
 
-/**
- * Concatenates two arrays faster than the array spread operator.
- */
-const concatArrays = (array1, array2) => {
-  // Pre-allocate for better V8 optimization
-  const combinedArray = new Array(array1.length + array2.length);
-  for (let i = 0; i < array1.length; i++) {
-    combinedArray[i] = array1[i];
-  }
-  for (let i = 0; i < array2.length; i++) {
-    combinedArray[array1.length + i] = array2[i];
-  }
-  return combinedArray;
-};
-
-// Factory function ensures consistent object shapes
-const createClassValidatorObject = (classGroupId, validator) => ({
-  classGroupId,
-  validator
-});
-// Factory ensures consistent ClassPartObject shape
-const createClassPartObject = (nextPart = new Map(), validators = null, classGroupId) => ({
-  nextPart,
-  validators,
-  classGroupId
-});
 const CLASS_PART_SEPARATOR = '-';
-const EMPTY_CONFLICTS = [];
-// I use two dots here because one dot is used as prefix for class groups in plugins
-const ARBITRARY_PROPERTY_PREFIX = 'arbitrary..';
 const createClassGroupUtils = config => {
   const classMap = createClassMap(config);
   const {
@@ -44,73 +15,54 @@ const createClassGroupUtils = config => {
     conflictingClassGroupModifiers
   } = config;
   const getClassGroupId = className => {
-    if (className.startsWith('[') && className.endsWith(']')) {
-      return getGroupIdForArbitraryProperty(className);
-    }
     const classParts = className.split(CLASS_PART_SEPARATOR);
-    // Classes like `-inset-1` produce an empty string as first classPart. We assume that classes for negative values are used correctly and skip it.
-    const startIndex = classParts[0] === '' && classParts.length > 1 ? 1 : 0;
-    return getGroupRecursive(classParts, startIndex, classMap);
+    // Classes like `-inset-1` produce an empty string as first classPart. We assume that classes for negative values are used correctly and remove it from classParts.
+    if (classParts[0] === '' && classParts.length !== 1) {
+      classParts.shift();
+    }
+    return getGroupRecursive(classParts, classMap) || getGroupIdForArbitraryProperty(className);
   };
   const getConflictingClassGroupIds = (classGroupId, hasPostfixModifier) => {
-    if (hasPostfixModifier) {
-      const modifierConflicts = conflictingClassGroupModifiers[classGroupId];
-      const baseConflicts = conflictingClassGroups[classGroupId];
-      if (modifierConflicts) {
-        if (baseConflicts) {
-          // Merge base conflicts with modifier conflicts
-          return concatArrays(baseConflicts, modifierConflicts);
-        }
-        // Only modifier conflicts
-        return modifierConflicts;
-      }
-      // Fall back to without postfix if no modifier conflicts
-      return baseConflicts || EMPTY_CONFLICTS;
+    const conflicts = conflictingClassGroups[classGroupId] || [];
+    if (hasPostfixModifier && conflictingClassGroupModifiers[classGroupId]) {
+      return [...conflicts, ...conflictingClassGroupModifiers[classGroupId]];
     }
-    return conflictingClassGroups[classGroupId] || EMPTY_CONFLICTS;
+    return conflicts;
   };
   return {
     getClassGroupId,
     getConflictingClassGroupIds
   };
 };
-const getGroupRecursive = (classParts, startIndex, classPartObject) => {
-  const classPathsLength = classParts.length - startIndex;
-  if (classPathsLength === 0) {
+const getGroupRecursive = (classParts, classPartObject) => {
+  if (classParts.length === 0) {
     return classPartObject.classGroupId;
   }
-  const currentClassPart = classParts[startIndex];
+  const currentClassPart = classParts[0];
   const nextClassPartObject = classPartObject.nextPart.get(currentClassPart);
-  if (nextClassPartObject) {
-    const result = getGroupRecursive(classParts, startIndex + 1, nextClassPartObject);
-    if (result) return result;
+  const classGroupFromNextClassPart = nextClassPartObject ? getGroupRecursive(classParts.slice(1), nextClassPartObject) : undefined;
+  if (classGroupFromNextClassPart) {
+    return classGroupFromNextClassPart;
   }
-  const validators = classPartObject.validators;
-  if (validators === null) {
+  if (classPartObject.validators.length === 0) {
     return undefined;
   }
-  // Build classRest string efficiently by joining from startIndex onwards
-  const classRest = startIndex === 0 ? classParts.join(CLASS_PART_SEPARATOR) : classParts.slice(startIndex).join(CLASS_PART_SEPARATOR);
-  const validatorsLength = validators.length;
-  for (let i = 0; i < validatorsLength; i++) {
-    const validatorObj = validators[i];
-    if (validatorObj.validator(classRest)) {
-      return validatorObj.classGroupId;
+  const classRest = classParts.join(CLASS_PART_SEPARATOR);
+  return classPartObject.validators.find(({
+    validator
+  }) => validator(classRest))?.classGroupId;
+};
+const arbitraryPropertyRegex = /^\[(.+)\]$/;
+const getGroupIdForArbitraryProperty = className => {
+  if (arbitraryPropertyRegex.test(className)) {
+    const arbitraryPropertyClassName = arbitraryPropertyRegex.exec(className)[1];
+    const property = arbitraryPropertyClassName?.substring(0, arbitraryPropertyClassName.indexOf(':'));
+    if (property) {
+      // I use two dots here because one dot is used as prefix for class groups in plugins
+      return 'arbitrary..' + property;
     }
   }
-  return undefined;
 };
-/**
- * Get the class group ID for an arbitrary property.
- *
- * @param className - The class name to get the group ID for. Is expected to be string starting with `[` and ending with `]`.
- */
-const getGroupIdForArbitraryProperty = className => className.slice(1, -1).indexOf(':') === -1 ? undefined : (() => {
-  const content = className.slice(1, -1);
-  const colonIndex = content.indexOf(':');
-  const property = content.slice(0, colonIndex);
-  return property ? ARBITRARY_PROPERTY_PREFIX + property : undefined;
-})();
 /**
  * Exported for testing only
  */
@@ -119,77 +71,54 @@ const createClassMap = config => {
     theme,
     classGroups
   } = config;
-  return processClassGroups(classGroups, theme);
-};
-// Split into separate functions to maintain monomorphic call sites
-const processClassGroups = (classGroups, theme) => {
-  const classMap = createClassPartObject();
+  const classMap = {
+    nextPart: new Map(),
+    validators: []
+  };
   for (const classGroupId in classGroups) {
-    const group = classGroups[classGroupId];
-    processClassesRecursively(group, classMap, classGroupId, theme);
+    processClassesRecursively(classGroups[classGroupId], classMap, classGroupId, theme);
   }
   return classMap;
 };
 const processClassesRecursively = (classGroup, classPartObject, classGroupId, theme) => {
-  const len = classGroup.length;
-  for (let i = 0; i < len; i++) {
-    const classDefinition = classGroup[i];
-    processClassDefinition(classDefinition, classPartObject, classGroupId, theme);
-  }
-};
-// Split into separate functions for each type to maintain monomorphic call sites
-const processClassDefinition = (classDefinition, classPartObject, classGroupId, theme) => {
-  if (typeof classDefinition === 'string') {
-    processStringDefinition(classDefinition, classPartObject, classGroupId);
-    return;
-  }
-  if (typeof classDefinition === 'function') {
-    processFunctionDefinition(classDefinition, classPartObject, classGroupId, theme);
-    return;
-  }
-  processObjectDefinition(classDefinition, classPartObject, classGroupId, theme);
-};
-const processStringDefinition = (classDefinition, classPartObject, classGroupId) => {
-  const classPartObjectToEdit = classDefinition === '' ? classPartObject : getPart(classPartObject, classDefinition);
-  classPartObjectToEdit.classGroupId = classGroupId;
-};
-const processFunctionDefinition = (classDefinition, classPartObject, classGroupId, theme) => {
-  if (isThemeGetter(classDefinition)) {
-    processClassesRecursively(classDefinition(theme), classPartObject, classGroupId, theme);
-    return;
-  }
-  if (classPartObject.validators === null) {
-    classPartObject.validators = [];
-  }
-  classPartObject.validators.push(createClassValidatorObject(classGroupId, classDefinition));
-};
-const processObjectDefinition = (classDefinition, classPartObject, classGroupId, theme) => {
-  const entries = Object.entries(classDefinition);
-  const len = entries.length;
-  for (let i = 0; i < len; i++) {
-    const [key, value] = entries[i];
-    processClassesRecursively(value, getPart(classPartObject, key), classGroupId, theme);
-  }
+  classGroup.forEach(classDefinition => {
+    if (typeof classDefinition === 'string') {
+      const classPartObjectToEdit = classDefinition === '' ? classPartObject : getPart(classPartObject, classDefinition);
+      classPartObjectToEdit.classGroupId = classGroupId;
+      return;
+    }
+    if (typeof classDefinition === 'function') {
+      if (isThemeGetter(classDefinition)) {
+        processClassesRecursively(classDefinition(theme), classPartObject, classGroupId, theme);
+        return;
+      }
+      classPartObject.validators.push({
+        validator: classDefinition,
+        classGroupId
+      });
+      return;
+    }
+    Object.entries(classDefinition).forEach(([key, classGroup]) => {
+      processClassesRecursively(classGroup, getPart(classPartObject, key), classGroupId, theme);
+    });
+  });
 };
 const getPart = (classPartObject, path) => {
-  let current = classPartObject;
-  const parts = path.split(CLASS_PART_SEPARATOR);
-  const len = parts.length;
-  for (let i = 0; i < len; i++) {
-    const part = parts[i];
-    let next = current.nextPart.get(part);
-    if (!next) {
-      next = createClassPartObject();
-      current.nextPart.set(part, next);
-    }
-    current = next;
-  }
-  return current;
+  let currentClassPartObject = classPartObject;
+  path.split(CLASS_PART_SEPARATOR).forEach(pathPart => {
+    if (!currentClassPartObject.nextPart.has(pathPart)) {
+      currentClassPartObject.nextPart.set(pathPart, {
+        nextPart: new Map(),
+        validators: []
+      });
+    }
+    currentClassPartObject = currentClassPartObject.nextPart.get(pathPart);
+  });
+  return currentClassPartObject;
 };
-// Type guard maintains monomorphic check
-const isThemeGetter = func => 'isThemeGetter' in func && func.isThemeGetter === true;
+const isThemeGetter = func => func.isThemeGetter;
 
-// LRU cache implementation using plain objects for simplicity
+// LRU cache inspired from hashlru (https://github.com/dominictarr/hashlru/blob/v1.0.4/index.js) but object replaced with Map to improve performance
 const createLruCache = maxCacheSize => {
   if (maxCacheSize < 1) {
     return {
@@ -198,31 +127,31 @@ const createLruCache = maxCacheSize => {
     };
   }
   let cacheSize = 0;
-  let cache = Object.create(null);
-  let previousCache = Object.create(null);
+  let cache = new Map();
+  let previousCache = new Map();
   const update = (key, value) => {
-    cache[key] = value;
+    cache.set(key, value);
     cacheSize++;
     if (cacheSize > maxCacheSize) {
       cacheSize = 0;
       previousCache = cache;
-      cache = Object.create(null);
+      cache = new Map();
     }
   };
   return {
     get(key) {
-      let value = cache[key];
+      let value = cache.get(key);
       if (value !== undefined) {
         return value;
       }
-      if ((value = previousCache[key]) !== undefined) {
+      if ((value = previousCache.get(key)) !== undefined) {
         update(key, value);
         return value;
       }
     },
     set(key, value) {
-      if (key in cache) {
-        cache[key] = value;
+      if (cache.has(key)) {
+        cache.set(key, value);
       } else {
         update(key, value);
       }
@@ -231,15 +160,7 @@ const createLruCache = maxCacheSize => {
 };
 const IMPORTANT_MODIFIER = '!';
 const MODIFIER_SEPARATOR = ':';
-const EMPTY_MODIFIERS = [];
-// Pre-allocated result object shape for consistency
-const createResultObject = (modifiers, hasImportantModifier, baseClassName, maybePostfixModifierPosition, isExternal) => ({
-  modifiers,
-  hasImportantModifier,
-  baseClassName,
-  maybePostfixModifierPosition,
-  isExternal
-});
+const MODIFIER_SEPARATOR_LENGTH = MODIFIER_SEPARATOR.length;
 const createParseClassName = config => {
   const {
     prefix,
@@ -252,19 +173,17 @@ const createParseClassName = config => {
    * @see https://github.com/tailwindlabs/tailwindcss/blob/v3.2.2/src/util/splitAtTopLevelOnly.js
    */
   let parseClassName = className => {
-    // Use simple array with push for better performance
     const modifiers = [];
     let bracketDepth = 0;
     let parenDepth = 0;
     let modifierStart = 0;
     let postfixModifierPosition;
-    const len = className.length;
-    for (let index = 0; index < len; index++) {
-      const currentCharacter = className[index];
+    for (let index = 0; index < className.length; index++) {
+      let currentCharacter = className[index];
       if (bracketDepth === 0 && parenDepth === 0) {
         if (currentCharacter === MODIFIER_SEPARATOR) {
           modifiers.push(className.slice(modifierStart, index));
-          modifierStart = index + 1;
+          modifierStart = index + MODIFIER_SEPARATOR_LENGTH;
           continue;
         }
         if (currentCharacter === '/') {
@@ -272,31 +191,37 @@ const createParseClassName = config => {
           continue;
         }
       }
-      if (currentCharacter === '[') bracketDepth++;else if (currentCharacter === ']') bracketDepth--;else if (currentCharacter === '(') parenDepth++;else if (currentCharacter === ')') parenDepth--;
-    }
-    const baseClassNameWithImportantModifier = modifiers.length === 0 ? className : className.slice(modifierStart);
-    // Inline important modifier check
-    let baseClassName = baseClassNameWithImportantModifier;
-    let hasImportantModifier = false;
-    if (baseClassNameWithImportantModifier.endsWith(IMPORTANT_MODIFIER)) {
-      baseClassName = baseClassNameWithImportantModifier.slice(0, -1);
-      hasImportantModifier = true;
-    } else if (
-    /**
-     * In Tailwind CSS v3 the important modifier was at the start of the base class name. This is still supported for legacy reasons.
-     * @see https://github.com/dcastil/tailwind-merge/issues/513#issuecomment-2614029864
-     */
-    baseClassNameWithImportantModifier.startsWith(IMPORTANT_MODIFIER)) {
-      baseClassName = baseClassNameWithImportantModifier.slice(1);
-      hasImportantModifier = true;
+      if (currentCharacter === '[') {
+        bracketDepth++;
+      } else if (currentCharacter === ']') {
+        bracketDepth--;
+      } else if (currentCharacter === '(') {
+        parenDepth++;
+      } else if (currentCharacter === ')') {
+        parenDepth--;
+      }
     }
+    const baseClassNameWithImportantModifier = modifiers.length === 0 ? className : className.substring(modifierStart);
+    const baseClassName = stripImportantModifier(baseClassNameWithImportantModifier);
+    const hasImportantModifier = baseClassName !== baseClassNameWithImportantModifier;
     const maybePostfixModifierPosition = postfixModifierPosition && postfixModifierPosition > modifierStart ? postfixModifierPosition - modifierStart : undefined;
-    return createResultObject(modifiers, hasImportantModifier, baseClassName, maybePostfixModifierPosition);
+    return {
+      modifiers,
+      hasImportantModifier,
+      baseClassName,
+      maybePostfixModifierPosition
+    };
   };
   if (prefix) {
     const fullPrefix = prefix + MODIFIER_SEPARATOR;
     const parseClassNameOriginal = parseClassName;
-    parseClassName = className => className.startsWith(fullPrefix) ? parseClassNameOriginal(className.slice(fullPrefix.length)) : createResultObject(EMPTY_MODIFIERS, false, className, undefined, true);
+    parseClassName = className => className.startsWith(fullPrefix) ? parseClassNameOriginal(className.substring(fullPrefix.length)) : {
+      isExternal: true,
+      modifiers: [],
+      hasImportantModifier: false,
+      baseClassName: className,
+      maybePostfixModifierPosition: undefined
+    };
   }
   if (experimentalParseClassName) {
     const parseClassNameOriginal = parseClassName;
@@ -307,6 +232,19 @@ const createParseClassName = config => {
   }
   return parseClassName;
 };
+const stripImportantModifier = baseClassName => {
+  if (baseClassName.endsWith(IMPORTANT_MODIFIER)) {
+    return baseClassName.substring(0, baseClassName.length - 1);
+  }
+  /**
+   * In Tailwind CSS v3 the important modifier was at the start of the base class name. This is still supported for legacy reasons.
+   * @see https://github.com/dcastil/tailwind-merge/issues/513#issuecomment-2614029864
+   */
+  if (baseClassName.startsWith(IMPORTANT_MODIFIER)) {
+    return baseClassName.substring(1);
+  }
+  return baseClassName;
+};
 
 /**
  * Sorts modifiers according to following schema:
@@ -314,41 +252,26 @@ const createParseClassName = config => {
  * - When an arbitrary variant appears, it must be preserved which modifiers are before and after it
  */
 const createSortModifiers = config => {
-  // Pre-compute weights for all known modifiers for O(1) comparison
-  const modifierWeights = new Map();
-  // Assign weights to sensitive modifiers (highest priority, but preserve order)
-  config.orderSensitiveModifiers.forEach((mod, index) => {
-    modifierWeights.set(mod, 1000000 + index); // High weights for sensitive mods
-  });
-  return modifiers => {
-    const result = [];
-    let currentSegment = [];
-    // Process modifiers in one pass
-    for (let i = 0; i < modifiers.length; i++) {
-      const modifier = modifiers[i];
-      // Check if modifier is sensitive (starts with '[' or in orderSensitiveModifiers)
-      const isArbitrary = modifier[0] === '[';
-      const isOrderSensitive = modifierWeights.has(modifier);
-      if (isArbitrary || isOrderSensitive) {
-        // Sort and flush current segment alphabetically
-        if (currentSegment.length > 0) {
-          currentSegment.sort();
-          result.push(...currentSegment);
-          currentSegment = [];
-        }
-        result.push(modifier);
+  const orderSensitiveModifiers = Object.fromEntries(config.orderSensitiveModifiers.map(modifier => [modifier, true]));
+  const sortModifiers = modifiers => {
+    if (modifiers.length <= 1) {
+      return modifiers;
+    }
+    const sortedModifiers = [];
+    let unsortedModifiers = [];
+    modifiers.forEach(modifier => {
+      const isPositionSensitive = modifier[0] === '[' || orderSensitiveModifiers[modifier];
+      if (isPositionSensitive) {
+        sortedModifiers.push(...unsortedModifiers.sort(), modifier);
+        unsortedModifiers = [];
       } else {
-        // Regular modifier - add to current segment for batch sorting
-        currentSegment.push(modifier);
+        unsortedModifiers.push(modifier);
       }
-    }
-    // Sort and add any remaining segment items
-    if (currentSegment.length > 0) {
-      currentSegment.sort();
-      result.push(...currentSegment);
-    }
-    return result;
+    });
+    sortedModifiers.push(...unsortedModifiers.sort());
+    return sortedModifiers;
   };
+  return sortModifiers;
 };
 const createConfigUtils = config => ({
   cache: createLruCache(config.cacheSize),
@@ -403,11 +326,10 @@ const mergeClassList = (classList, configUtils) => {
       }
       hasPostfixModifier = false;
     }
-    // Fast path: skip sorting for empty or single modifier
-    const variantModifier = modifiers.length === 0 ? '' : modifiers.length === 1 ? modifiers[0] : sortModifiers(modifiers).join(':');
+    const variantModifier = sortModifiers(modifiers).join(':');
     const modifierId = hasImportantModifier ? variantModifier + IMPORTANT_MODIFIER : variantModifier;
     const classId = modifierId + classGroupId;
-    if (classGroupsInConflict.indexOf(classId) > -1) {
+    if (classGroupsInConflict.includes(classId)) {
       // Tailwind class omitted due to conflict
       continue;
     }
@@ -432,13 +354,13 @@ const mergeClassList = (classList, configUtils) => {
  *
  * Original code has MIT license: Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
  */
-const twJoin = (...classLists) => {
+function twJoin() {
   let index = 0;
   let argument;
   let resolvedValue;
   let string = '';
-  while (index < classLists.length) {
-    if (argument = classLists[index++]) {
+  while (index < arguments.length) {
+    if (argument = arguments[index++]) {
       if (resolvedValue = toValue(argument)) {
         string && (string += ' ');
         string += resolvedValue;
@@ -446,9 +368,8 @@ const twJoin = (...classLists) => {
     }
   }
   return string;
-};
+}
 const toValue = mix => {
-  // Fast path for strings
   if (typeof mix === 'string') {
     return mix;
   }
@@ -464,20 +385,20 @@ const toValue = mix => {
   }
   return string;
 };
-const createTailwindMerge = (createConfigFirst, ...createConfigRest) => {
+function createTailwindMerge(createConfigFirst, ...createConfigRest) {
   let configUtils;
   let cacheGet;
   let cacheSet;
-  let functionToCall;
-  const initTailwindMerge = classList => {
+  let functionToCall = initTailwindMerge;
+  function initTailwindMerge(classList) {
     const config = createConfigRest.reduce((previousConfig, createConfigCurrent) => createConfigCurrent(previousConfig), createConfigFirst());
     configUtils = createConfigUtils(config);
     cacheGet = configUtils.cache.get;
     cacheSet = configUtils.cache.set;
     functionToCall = tailwindMerge;
     return tailwindMerge(classList);
-  };
-  const tailwindMerge = classList => {
+  }
+  function tailwindMerge(classList) {
     const cachedResult = cacheGet(classList);
     if (cachedResult) {
       return cachedResult;
@@ -485,19 +406,19 @@ const createTailwindMerge = (createConfigFirst, ...createConfigRest) => {
     const result = mergeClassList(classList, configUtils);
     cacheSet(classList, result);
     return result;
+  }
+  return function callTailwindMerge() {
+    return functionToCall(twJoin.apply(null, arguments));
   };
-  functionToCall = initTailwindMerge;
-  return (...args) => functionToCall(twJoin(...args));
-};
-const fallbackThemeArr = [];
+}
 const fromTheme = key => {
-  const themeGetter = theme => theme[key] || fallbackThemeArr;
+  const themeGetter = theme => theme[key] || [];
   themeGetter.isThemeGetter = true;
   return themeGetter;
 };
 const arbitraryValueRegex = /^\[(?:(\w[\w-]*):)?(.+)\]$/i;
 const arbitraryVariableRegex = /^\((?:(\w[\w-]*):)?(.+)\)$/i;
-const fractionRegex = /^\d+(?:\.\d+)?\/\d+(?:\.\d+)?$/;
+const fractionRegex = /^\d+\/\d+$/;
 const tshirtUnitRegex = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/;
 const lengthUnitRegex = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))|\b(calc|min|max|clamp)\(.+\)|^0$/;
 const colorFunctionRegex = /^(rgba?|hsla?|hwb|(ok)?(lab|lch)|color-mix)\(.+\)$/;
@@ -523,8 +444,6 @@ const isArbitrarySize = value => getIsArbitraryValue(value, isLabelSize, isNever
 const isArbitraryValue = value => arbitraryValueRegex.test(value);
 const isArbitraryLength = value => getIsArbitraryValue(value, isLabelLength, isLengthOnly);
 const isArbitraryNumber = value => getIsArbitraryValue(value, isLabelNumber, isNumber);
-const isArbitraryWeight = value => getIsArbitraryValue(value, isLabelWeight, isAny);
-const isArbitraryFamilyName = value => getIsArbitraryValue(value, isLabelFamilyName, isNever);
 const isArbitraryPosition = value => getIsArbitraryValue(value, isLabelPosition, isNever);
 const isArbitraryImage = value => getIsArbitraryValue(value, isLabelImage, isImage);
 const isArbitraryShadow = value => getIsArbitraryValue(value, isLabelShadow, isShadow);
@@ -535,7 +454,6 @@ const isArbitraryVariablePosition = value => getIsArbitraryVariable(value, isLab
 const isArbitraryVariableSize = value => getIsArbitraryVariable(value, isLabelSize);
 const isArbitraryVariableImage = value => getIsArbitraryVariable(value, isLabelImage);
 const isArbitraryVariableShadow = value => getIsArbitraryVariable(value, isLabelShadow, true);
-const isArbitraryVariableWeight = value => getIsArbitraryVariable(value, isLabelWeight, true);
 // Helpers
 const getIsArbitraryValue = (value, testLabel, testValue) => {
   const result = arbitraryValueRegex.exec(value);
@@ -564,7 +482,6 @@ const isLabelSize = label => label === 'length' || label === 'size' || label ===
 const isLabelLength = label => label === 'length';
 const isLabelNumber = label => label === 'number';
 const isLabelFamilyName = label => label === 'family-name';
-const isLabelWeight = label => label === 'number' || label === 'weight';
 const isLabelShadow = label => label === 'shadow';
 const getDefaultConfig = () => {
   /**
@@ -623,8 +540,6 @@ const getDefaultConfig = () => {
   const scaleAlignSecondaryAxis = () => ['start', 'end', 'center', 'stretch', 'center-safe', 'end-safe'];
   const scaleMargin = () => ['auto', ...scaleUnambiguousSpacing()];
   const scaleSizing = () => [isFraction, 'auto', 'full', 'dvw', 'dvh', 'lvw', 'lvh', 'svw', 'svh', 'min', 'max', 'fit', ...scaleUnambiguousSpacing()];
-  const scaleSizingInline = () => [isFraction, 'screen', 'full', 'dvw', 'lvw', 'svw', 'min', 'max', 'fit', ...scaleUnambiguousSpacing()];
-  const scaleSizingBlock = () => [isFraction, 'screen', 'full', 'lh', 'dvh', 'lvh', 'svh', 'min', 'max', 'fit', ...scaleUnambiguousSpacing()];
   const scaleColor = () => [themeColor, isArbitraryVariable, isArbitraryValue];
   const scaleBgPosition = () => [...scalePosition(), isArbitraryVariablePosition, isArbitraryPosition, {
     position: [isArbitraryVariable, isArbitraryValue]
@@ -823,66 +738,40 @@ const getDefaultConfig = () => {
        */
       position: ['static', 'fixed', 'absolute', 'relative', 'sticky'],
       /**
-       * Inset
+       * Top / Right / Bottom / Left
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       inset: [{
         inset: scaleInset()
       }],
       /**
-       * Inset Inline
+       * Right / Left
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       'inset-x': [{
         'inset-x': scaleInset()
       }],
       /**
-       * Inset Block
+       * Top / Bottom
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       'inset-y': [{
         'inset-y': scaleInset()
       }],
       /**
-       * Inset Inline Start
+       * Start
        * @see https://tailwindcss.com/docs/top-right-bottom-left
-       * @todo class group will be renamed to `inset-s` in next major release
        */
       start: [{
-        'inset-s': scaleInset(),
-        /**
-         * @deprecated since Tailwind CSS v4.2.0 in favor of `inset-s-*` utilities.
-         * @see https://github.com/tailwindlabs/tailwindcss/pull/19613
-         */
         start: scaleInset()
       }],
       /**
-       * Inset Inline End
+       * End
        * @see https://tailwindcss.com/docs/top-right-bottom-left
-       * @todo class group will be renamed to `inset-e` in next major release
        */
       end: [{
-        'inset-e': scaleInset(),
-        /**
-         * @deprecated since Tailwind CSS v4.2.0 in favor of `inset-e-*` utilities.
-         * @see https://github.com/tailwindlabs/tailwindcss/pull/19613
-         */
         end: scaleInset()
       }],
-      /**
-       * Inset Block Start
-       * @see https://tailwindcss.com/docs/top-right-bottom-left
-       */
-      'inset-bs': [{
-        'inset-bs': scaleInset()
-      }],
-      /**
-       * Inset Block End
-       * @see https://tailwindcss.com/docs/top-right-bottom-left
-       */
-      'inset-be': [{
-        'inset-be': scaleInset()
-      }],
       /**
        * Top
        * @see https://tailwindcss.com/docs/top-right-bottom-left
@@ -1149,47 +1038,33 @@ const getDefaultConfig = () => {
         p: scaleUnambiguousSpacing()
       }],
       /**
-       * Padding Inline
+       * Padding X
        * @see https://tailwindcss.com/docs/padding
        */
       px: [{
         px: scaleUnambiguousSpacing()
       }],
       /**
-       * Padding Block
+       * Padding Y
        * @see https://tailwindcss.com/docs/padding
        */
       py: [{
         py: scaleUnambiguousSpacing()
       }],
       /**
-       * Padding Inline Start
+       * Padding Start
        * @see https://tailwindcss.com/docs/padding
        */
       ps: [{
         ps: scaleUnambiguousSpacing()
       }],
       /**
-       * Padding Inline End
+       * Padding End
        * @see https://tailwindcss.com/docs/padding
        */
       pe: [{
         pe: scaleUnambiguousSpacing()
       }],
-      /**
-       * Padding Block Start
-       * @see https://tailwindcss.com/docs/padding
-       */
-      pbs: [{
-        pbs: scaleUnambiguousSpacing()
-      }],
-      /**
-       * Padding Block End
-       * @see https://tailwindcss.com/docs/padding
-       */
-      pbe: [{
-        pbe: scaleUnambiguousSpacing()
-      }],
       /**
        * Padding Top
        * @see https://tailwindcss.com/docs/padding
@@ -1226,47 +1101,33 @@ const getDefaultConfig = () => {
         m: scaleMargin()
       }],
       /**
-       * Margin Inline
+       * Margin X
        * @see https://tailwindcss.com/docs/margin
        */
       mx: [{
         mx: scaleMargin()
       }],
       /**
-       * Margin Block
+       * Margin Y
        * @see https://tailwindcss.com/docs/margin
        */
       my: [{
         my: scaleMargin()
       }],
       /**
-       * Margin Inline Start
+       * Margin Start
        * @see https://tailwindcss.com/docs/margin
        */
       ms: [{
         ms: scaleMargin()
       }],
       /**
-       * Margin Inline End
+       * Margin End
        * @see https://tailwindcss.com/docs/margin
        */
       me: [{
         me: scaleMargin()
       }],
-      /**
-       * Margin Block Start
-       * @see https://tailwindcss.com/docs/margin
-       */
-      mbs: [{
-        mbs: scaleMargin()
-      }],
-      /**
-       * Margin Block End
-       * @see https://tailwindcss.com/docs/margin
-       */
-      mbe: [{
-        mbe: scaleMargin()
-      }],
       /**
        * Margin Top
        * @see https://tailwindcss.com/docs/margin
@@ -1329,48 +1190,6 @@ const getDefaultConfig = () => {
       size: [{
         size: scaleSizing()
       }],
-      /**
-       * Inline Size
-       * @see https://tailwindcss.com/docs/width
-       */
-      'inline-size': [{
-        inline: ['auto', ...scaleSizingInline()]
-      }],
-      /**
-       * Min-Inline Size
-       * @see https://tailwindcss.com/docs/min-width
-       */
-      'min-inline-size': [{
-        'min-inline': ['auto', ...scaleSizingInline()]
-      }],
-      /**
-       * Max-Inline Size
-       * @see https://tailwindcss.com/docs/max-width
-       */
-      'max-inline-size': [{
-        'max-inline': ['none', ...scaleSizingInline()]
-      }],
-      /**
-       * Block Size
-       * @see https://tailwindcss.com/docs/height
-       */
-      'block-size': [{
-        block: ['auto', ...scaleSizingBlock()]
-      }],
-      /**
-       * Min-Block Size
-       * @see https://tailwindcss.com/docs/min-height
-       */
-      'min-block-size': [{
-        'min-block': ['auto', ...scaleSizingBlock()]
-      }],
-      /**
-       * Max-Block Size
-       * @see https://tailwindcss.com/docs/max-height
-       */
-      'max-block-size': [{
-        'max-block': ['none', ...scaleSizingBlock()]
-      }],
       /**
        * Width
        * @see https://tailwindcss.com/docs/width
@@ -1443,7 +1262,7 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/font-weight
        */
       'font-weight': [{
-        font: [themeFontWeight, isArbitraryVariableWeight, isArbitraryWeight]
+        font: [themeFontWeight, isArbitraryVariable, isArbitraryNumber]
       }],
       /**
        * Font Stretch
@@ -1457,14 +1276,7 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/font-family
        */
       'font-family': [{
-        font: [isArbitraryVariableFamilyName, isArbitraryFamilyName, themeFont]
-      }],
-      /**
-       * Font Feature Settings
-       * @see https://tailwindcss.com/docs/font-feature-settings
-       */
-      'font-features': [{
-        'font-features': [isArbitraryValue]
+        font: [isArbitraryVariableFamilyName, isArbitraryValue, themeFont]
       }],
       /**
        * Font Variant Numeric
@@ -1883,47 +1695,33 @@ const getDefaultConfig = () => {
         border: scaleBorderWidth()
       }],
       /**
-       * Border Width Inline
+       * Border Width X
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-x': [{
         'border-x': scaleBorderWidth()
       }],
       /**
-       * Border Width Block
+       * Border Width Y
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-y': [{
         'border-y': scaleBorderWidth()
       }],
       /**
-       * Border Width Inline Start
+       * Border Width Start
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-s': [{
         'border-s': scaleBorderWidth()
       }],
       /**
-       * Border Width Inline End
+       * Border Width End
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-e': [{
         'border-e': scaleBorderWidth()
       }],
-      /**
-       * Border Width Block Start
-       * @see https://tailwindcss.com/docs/border-width
-       */
-      'border-w-bs': [{
-        'border-bs': scaleBorderWidth()
-      }],
-      /**
-       * Border Width Block End
-       * @see https://tailwindcss.com/docs/border-width
-       */
-      'border-w-be': [{
-        'border-be': scaleBorderWidth()
-      }],
       /**
        * Border Width Top
        * @see https://tailwindcss.com/docs/border-width
@@ -1998,47 +1796,33 @@ const getDefaultConfig = () => {
         border: scaleColor()
       }],
       /**
-       * Border Color Inline
+       * Border Color X
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-x': [{
         'border-x': scaleColor()
       }],
       /**
-       * Border Color Block
+       * Border Color Y
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-y': [{
         'border-y': scaleColor()
       }],
       /**
-       * Border Color Inline Start
+       * Border Color S
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-s': [{
         'border-s': scaleColor()
       }],
       /**
-       * Border Color Inline End
+       * Border Color E
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-e': [{
         'border-e': scaleColor()
       }],
-      /**
-       * Border Color Block Start
-       * @see https://tailwindcss.com/docs/border-color
-       */
-      'border-color-bs': [{
-        'border-bs': scaleColor()
-      }],
-      /**
-       * Border Color Block End
-       * @see https://tailwindcss.com/docs/border-color
-       */
-      'border-color-be': [{
-        'border-be': scaleColor()
-      }],
       /**
        * Border Color Top
        * @see https://tailwindcss.com/docs/border-color
@@ -2899,47 +2683,33 @@ const getDefaultConfig = () => {
         'scroll-m': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Margin Inline
+       * Scroll Margin X
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-mx': [{
         'scroll-mx': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Margin Block
+       * Scroll Margin Y
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-my': [{
         'scroll-my': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Margin Inline Start
+       * Scroll Margin Start
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-ms': [{
         'scroll-ms': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Margin Inline End
+       * Scroll Margin End
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-me': [{
         'scroll-me': scaleUnambiguousSpacing()
       }],
-      /**
-       * Scroll Margin Block Start
-       * @see https://tailwindcss.com/docs/scroll-margin
-       */
-      'scroll-mbs': [{
-        'scroll-mbs': scaleUnambiguousSpacing()
-      }],
-      /**
-       * Scroll Margin Block End
-       * @see https://tailwindcss.com/docs/scroll-margin
-       */
-      'scroll-mbe': [{
-        'scroll-mbe': scaleUnambiguousSpacing()
-      }],
       /**
        * Scroll Margin Top
        * @see https://tailwindcss.com/docs/scroll-margin
@@ -2976,47 +2746,33 @@ const getDefaultConfig = () => {
         'scroll-p': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Padding Inline
+       * Scroll Padding X
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-px': [{
         'scroll-px': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Padding Block
+       * Scroll Padding Y
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-py': [{
         'scroll-py': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Padding Inline Start
+       * Scroll Padding Start
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-ps': [{
         'scroll-ps': scaleUnambiguousSpacing()
       }],
       /**
-       * Scroll Padding Inline End
+       * Scroll Padding End
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-pe': [{
         'scroll-pe': scaleUnambiguousSpacing()
       }],
-      /**
-       * Scroll Padding Block Start
-       * @see https://tailwindcss.com/docs/scroll-padding
-       */
-      'scroll-pbs': [{
-        'scroll-pbs': scaleUnambiguousSpacing()
-      }],
-      /**
-       * Scroll Padding Block End
-       * @see https://tailwindcss.com/docs/scroll-padding
-       */
-      'scroll-pbe': [{
-        'scroll-pbe': scaleUnambiguousSpacing()
-      }],
       /**
        * Scroll Padding Top
        * @see https://tailwindcss.com/docs/scroll-padding
@@ -3151,15 +2907,15 @@ const getDefaultConfig = () => {
     conflictingClassGroups: {
       overflow: ['overflow-x', 'overflow-y'],
       overscroll: ['overscroll-x', 'overscroll-y'],
-      inset: ['inset-x', 'inset-y', 'inset-bs', 'inset-be', 'start', 'end', 'top', 'right', 'bottom', 'left'],
+      inset: ['inset-x', 'inset-y', 'start', 'end', 'top', 'right', 'bottom', 'left'],
       'inset-x': ['right', 'left'],
       'inset-y': ['top', 'bottom'],
       flex: ['basis', 'grow', 'shrink'],
       gap: ['gap-x', 'gap-y'],
-      p: ['px', 'py', 'ps', 'pe', 'pbs', 'pbe', 'pt', 'pr', 'pb', 'pl'],
+      p: ['px', 'py', 'ps', 'pe', 'pt', 'pr', 'pb', 'pl'],
       px: ['pr', 'pl'],
       py: ['pt', 'pb'],
-      m: ['mx', 'my', 'ms', 'me', 'mbs', 'mbe', 'mt', 'mr', 'mb', 'ml'],
+      m: ['mx', 'my', 'ms', 'me', 'mt', 'mr', 'mb', 'ml'],
       mx: ['mr', 'ml'],
       my: ['mt', 'mb'],
       size: ['w', 'h'],
@@ -3179,18 +2935,18 @@ const getDefaultConfig = () => {
       'rounded-b': ['rounded-br', 'rounded-bl'],
       'rounded-l': ['rounded-tl', 'rounded-bl'],
       'border-spacing': ['border-spacing-x', 'border-spacing-y'],
-      'border-w': ['border-w-x', 'border-w-y', 'border-w-s', 'border-w-e', 'border-w-bs', 'border-w-be', 'border-w-t', 'border-w-r', 'border-w-b', 'border-w-l'],
+      'border-w': ['border-w-x', 'border-w-y', 'border-w-s', 'border-w-e', 'border-w-t', 'border-w-r', 'border-w-b', 'border-w-l'],
       'border-w-x': ['border-w-r', 'border-w-l'],
       'border-w-y': ['border-w-t', 'border-w-b'],
-      'border-color': ['border-color-x', 'border-color-y', 'border-color-s', 'border-color-e', 'border-color-bs', 'border-color-be', 'border-color-t', 'border-color-r', 'border-color-b', 'border-color-l'],
+      'border-color': ['border-color-x', 'border-color-y', 'border-color-s', 'border-color-e', 'border-color-t', 'border-color-r', 'border-color-b', 'border-color-l'],
       'border-color-x': ['border-color-r', 'border-color-l'],
       'border-color-y': ['border-color-t', 'border-color-b'],
       translate: ['translate-x', 'translate-y', 'translate-none'],
       'translate-none': ['translate', 'translate-x', 'translate-y', 'translate-z'],
-      'scroll-m': ['scroll-mx', 'scroll-my', 'scroll-ms', 'scroll-me', 'scroll-mbs', 'scroll-mbe', 'scroll-mt', 'scroll-mr', 'scroll-mb', 'scroll-ml'],
+      'scroll-m': ['scroll-mx', 'scroll-my', 'scroll-ms', 'scroll-me', 'scroll-mt', 'scroll-mr', 'scroll-mb', 'scroll-ml'],
       'scroll-mx': ['scroll-mr', 'scroll-ml'],
       'scroll-my': ['scroll-mt', 'scroll-mb'],
-      'scroll-p': ['scroll-px', 'scroll-py', 'scroll-ps', 'scroll-pe', 'scroll-pbs', 'scroll-pbe', 'scroll-pt', 'scroll-pr', 'scroll-pb', 'scroll-pl'],
+      'scroll-p': ['scroll-px', 'scroll-py', 'scroll-ps', 'scroll-pe', 'scroll-pt', 'scroll-pr', 'scroll-pb', 'scroll-pl'],
       'scroll-px': ['scroll-pr', 'scroll-pl'],
       'scroll-py': ['scroll-pt', 'scroll-pb'],
       touch: ['touch-x', 'touch-y', 'touch-pz'],