diff --git a/src/collection.js b/src/collection.js index 9d0d9ec..f67135b 100644 --- a/src/collection.js +++ b/src/collection.js @@ -15,7 +15,7 @@ export class Collection { } /** - * @param {string} item + * @param {string | number} item * @param {import('css-tree').CssLocation} node_location */ p(item, node_location) { diff --git a/src/index.js b/src/index.js index 3d1b806..07b9e2d 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ import parse from 'css-tree/parser' import walk from 'css-tree/walker' -import { calculate } from '@bramus/specificity/core' +import { calculateForAST } from '@bramus/specificity/core' import { isSupportsBrowserhack, isMediaBrowserhack } from './atrules/atrules.js' import { getCombinators, getComplexity, isAccessibility, isPrefixed, hasPseudoClass } from './selectors/utils.js' import { colorFunctions, colorKeywords, namedColors, systemColors } from './values/colors.js' @@ -326,15 +326,10 @@ export function analyze(css, options = {}) { uniqueSelectorComplexities.p(complexity, node.loc) // #region specificity - let [{ value: specificityObj }] = calculate(node) - let sa = specificityObj.a - let sb = specificityObj.b - let sc = specificityObj.c + let specificity = calculateForAST(node).toArray() + let [sa, sb, sc] = specificity - /** @type {Specificity} */ - let specificity = [sa, sb, sc] - - uniqueSpecificities.p(sa + ',' + sb + ',' + sc, node.loc) + uniqueSpecificities.p(specificity.toString(), node.loc) specificityA.push(sa) specificityB.push(sb)