tokenami 0.0.87 → 0.0.88

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 @jjenzz
+Copyright (c) 2023 Jenna Smith (@jjenzz)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cli.js

@@ -872,15 +872,32 @@ function generatePlaceholderLayers(prefix) {
 function generateLayerStyles(styles) {
   const groupedBySelectors = /* @__PURE__ */ new Map();
   for (const [template, selectors] of Object.entries(styles)) {
-    const selectorKey = Array.from(selectors).sort().join(",");
-    const templates = groupedBySelectors.get(selectorKey) || [];
-    templates.push(template);
-    groupedBySelectors.set(selectorKey, templates);
+    const { pseudoElements, otherSelectors } = separateSelectors(selectors);
+    if (otherSelectors.length > 0) {
+      const groupedSelector = otherSelectors.sort().join(",");
+      const existingStyles = groupedBySelectors.get(groupedSelector) || "";
+      const newStyles = template.replace(SELECTOR_TAG, groupedSelector);
+      groupedBySelectors.set(groupedSelector, existingStyles + " " + newStyles);
+    }
+    for (const pseudoElement of pseudoElements) {
+      const existingStyles = groupedBySelectors.get(pseudoElement) || "";
+      const newStyles = template.replace(SELECTOR_TAG, pseudoElement);
+      groupedBySelectors.set(pseudoElement, existingStyles + " " + newStyles);
+    }
   }
-  const layerStyles = Array.from(groupedBySelectors.entries()).map(([selectors, templates]) => {
-    return templates.map((template) => template.replace(SELECTOR_TAG, selectors)).join(" ");
-  });
-  return layerStyles.join(" ");
+  return Array.from(groupedBySelectors.values()).join(" ");
+}
+function separateSelectors(selectors) {
+  const pseudoElements = [];
+  const otherSelectors = [];
+  for (const selector of selectors) {
+    if (isPseudoElementSelector(selector)) {
+      pseudoElements.push(selector);
+    } else {
+      otherSelectors.push(selector);
+    }
+  }
+  return { pseudoElements, otherSelectors };
 }
 function getPropertyConfigs(tokenProperties, config) {
   let propertyConfigs = /* @__PURE__ */ new Map();
@@ -1003,11 +1020,14 @@ function hashVariantProperty(variant, property) {
   return `--_${Tokenami2.hash(variant + property)}`;
 }
 function isElementSelector(selector = "") {
-  return isCombinatorSelector(selector) || /::/.test(selector) || selector === "&";
+  return isCombinatorSelector(selector) || isPseudoElementSelector(selector) || selector === "&";
 }
 function isCombinatorSelector(selector = "") {
   return isChildSelector(selector) || /(.+)\s\&/.test(selector);
 }
+function isPseudoElementSelector(selector = "") {
+  return /::/.test(selector);
+}
 function isChildSelector(selector = "") {
   return /&\s(.+)/.test(selector);
 }
@@ -1034,7 +1054,7 @@ function getParsedSelectors(propertySelector, selectorConfig, elementSelectors)
 
 // package.json
 var package_default = {
-  version: "0.0.86"};
+  version: "0.0.87"};
 
 // src/ts-plugin/error-codes.ts
 var INVALID_PROPERTY = 2353;
@@ -1114,7 +1134,7 @@ var TokenamiDiagnostics = class {
       }
       if (ts.isObjectLiteralExpression(value)) {
         return this.#validateComposeConfig(value, sourceFile);
-      } else if (value.getText().length > 0 && !ts.isIdentifier(key) && !ts.isStringLiteral(value) && !ts.isNumericLiteral(value) && !(ts.isPrefixUnaryExpression(value) && value.operator === ts.SyntaxKind.MinusToken && ts.isNumericLiteral(value.operand))) {
+      } else if (value.getText(sourceFile).length > 0 && !ts.isIdentifier(key) && !ts.isStringLiteral(value) && !ts.isNumericLiteral(value) && !(ts.isPrefixUnaryExpression(value) && value.operator === ts.SyntaxKind.MinusToken && ts.isNumericLiteral(value.operand))) {
         const start = value.getStart(sourceFile);
         const length = value.getWidth(sourceFile);
         return [{ ...diagnostic, start, length }];

package/dist/index.cjs

@@ -123,7 +123,7 @@ var TokenamiDiagnostics = class {
       }
       if (ts__default.default.isObjectLiteralExpression(value)) {
         return this.#validateComposeConfig(value, sourceFile);
-      } else if (value.getText().length > 0 && !ts__default.default.isIdentifier(key) && !ts__default.default.isStringLiteral(value) && !ts__default.default.isNumericLiteral(value) && !(ts__default.default.isPrefixUnaryExpression(value) && value.operator === ts__default.default.SyntaxKind.MinusToken && ts__default.default.isNumericLiteral(value.operand))) {
+      } else if (value.getText(sourceFile).length > 0 && !ts__default.default.isIdentifier(key) && !ts__default.default.isStringLiteral(value) && !ts__default.default.isNumericLiteral(value) && !(ts__default.default.isPrefixUnaryExpression(value) && value.operator === ts__default.default.SyntaxKind.MinusToken && ts__default.default.isNumericLiteral(value.operand))) {
         const start = value.getStart(sourceFile);
         const length = value.getWidth(sourceFile);
         return [{ ...diagnostic, start, length }];

package/dist/index.js

@@ -99,7 +99,7 @@ var TokenamiDiagnostics = class {
       }
       if (ts.isObjectLiteralExpression(value)) {
         return this.#validateComposeConfig(value, sourceFile);
-      } else if (value.getText().length > 0 && !ts.isIdentifier(key) && !ts.isStringLiteral(value) && !ts.isNumericLiteral(value) && !(ts.isPrefixUnaryExpression(value) && value.operator === ts.SyntaxKind.MinusToken && ts.isNumericLiteral(value.operand))) {
+      } else if (value.getText(sourceFile).length > 0 && !ts.isIdentifier(key) && !ts.isStringLiteral(value) && !ts.isNumericLiteral(value) && !(ts.isPrefixUnaryExpression(value) && value.operator === ts.SyntaxKind.MinusToken && ts.isNumericLiteral(value.operand))) {
         const start = value.getStart(sourceFile);
         const length = value.getWidth(sourceFile);
         return [{ ...diagnostic, start, length }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenami",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -45,8 +45,8 @@
   },
   "dependencies": {
     "@stitches/stringify": "^1.2.8",
-    "@tokenami/config": "0.0.87",
-    "@tokenami/ds": "0.0.87",
+    "@tokenami/config": "0.0.88",
+    "@tokenami/ds": "0.0.88",
     "acorn": "^8.11.3",
     "acorn-walk": "^8.3.2",
     "browserslist": "^4.24.4",
@@ -67,5 +67,5 @@
   "peerDependencies": {
     "typescript": ">= 5"
   },
-  "gitHead": "809a6c3d1dfca1b9eb9053555a5fed120e0c56d6"
+  "gitHead": "59517a01e2d410298f97cc9157ca92f7f5024712"
 }