css-in-js-engine-pb 0.2.2 → 0.2.3

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.
@@ -0,0 +1,3 @@
1
+ import { StyleRule } from './types';
2
+ export declare function mergeStyleRules(rules: StyleRule[]): StyleRule;
3
+ //# sourceMappingURL=mergeStyleRules.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mergeStyleRules.d.ts","sourceRoot":"","sources":["../src/mergeStyleRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,CAU7D"}
@@ -0,0 +1,9 @@
1
+ export function mergeStyleRules(rules) {
2
+ const result = {};
3
+ for (const rule of rules) {
4
+ for (const key in rule) {
5
+ result[key] = rule[key];
6
+ }
7
+ }
8
+ return result;
9
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"resolveStyleRules.d.ts","sourceRoot":"","sources":["../src/resolveStyleRules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAa,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAmDhD,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,EACnE,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,WAAW,CAAC,EAAE,eAAe,GAC9B,aAAa,CAAC,KAAK,CAAC,CAetB"}
1
+ {"version":3,"file":"resolveStyleRules.d.ts","sourceRoot":"","sources":["../src/resolveStyleRules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAa,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAyEhD,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,EACnE,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,WAAW,CAAC,EAAE,eAAe,GAC9B,aAAa,CAAC,KAAK,CAAC,CAwBtB"}
@@ -1,32 +1,49 @@
1
1
  import { camelToKebab, resolveValue } from './utils/css';
2
2
  import { AtomicRuleCache } from './atomicCache';
3
- function buildAtomicClasses(rule, cache, cssRulesOut, atRule) {
3
+ function buildAtomicClasses(rule, cache, cssRulesOut, atRule, seenDecls = new Set()) {
4
4
  const classNames = [];
5
5
  for (const key in rule) {
6
6
  const val = rule[key];
7
7
  if (val == null)
8
8
  continue;
9
+ // --- at-rules (@media, @supports, etc.)
9
10
  if (key.startsWith('@') && typeof val === 'object') {
10
- const nested = buildAtomicClasses(val, cache, cssRulesOut, key);
11
+ const nested = buildAtomicClasses(val, cache, cssRulesOut, key, seenDecls);
11
12
  classNames.push(...nested);
12
13
  continue;
13
14
  }
15
+ // --- pseudo selectors (:hover, :active, etc.)
14
16
  if (key.startsWith(':') && typeof val === 'object') {
17
+ const selector = `&${key}`;
15
18
  for (const prop in val) {
16
19
  const v = val[prop];
17
20
  if (v == null || typeof v === 'object')
18
21
  continue;
19
- const decl = `${camelToKebab(prop)}:${resolveValue(v)}`;
20
- const res = cache.getOrCreate(`&${key}`, decl, atRule);
22
+ const cssProp = camelToKebab(prop);
23
+ const declKey = `${atRule !== null && atRule !== void 0 ? atRule : ''}|${selector}|${cssProp}`;
24
+ // 👇 LAST ONE WINS — drop earlier declarations
25
+ if (seenDecls.has(declKey))
26
+ continue;
27
+ seenDecls.add(declKey);
28
+ const decl = `${cssProp}:${resolveValue(v)}`;
29
+ const res = cache.getOrCreate(selector, decl, atRule);
21
30
  classNames.push(res.className);
22
31
  if (res.ruleText)
23
32
  cssRulesOut.push(res.ruleText);
24
33
  }
25
34
  continue;
26
35
  }
36
+ // --- normal properties
27
37
  if (typeof val !== 'object') {
28
- const decl = `${camelToKebab(key)}:${resolveValue(val)}`;
29
- const res = cache.getOrCreate('&', decl, atRule);
38
+ const cssProp = camelToKebab(key);
39
+ const selector = '&';
40
+ const declKey = `${atRule !== null && atRule !== void 0 ? atRule : ''}|${selector}|${cssProp}`;
41
+ // 👇 LAST ONE WINS — drop earlier declarations
42
+ if (seenDecls.has(declKey))
43
+ continue;
44
+ seenDecls.add(declKey);
45
+ const decl = `${cssProp}:${resolveValue(val)}`;
46
+ const res = cache.getOrCreate(selector, decl, atRule);
30
47
  classNames.push(res.className);
31
48
  if (res.ruleText)
32
49
  cssRulesOut.push(res.ruleText);
@@ -40,7 +57,9 @@ export function resolveStyleRulesForSlots(stylesBySlots, sharedCache) {
40
57
  const classNamesBySlot = {};
41
58
  for (const slot in stylesBySlots) {
42
59
  const rule = stylesBySlots[slot];
43
- const atomicClasses = buildAtomicClasses(rule !== null && rule !== void 0 ? rule : {}, cache, cssRules);
60
+ // 👇 NEW: fresh seenDecls PER SLOT
61
+ const seenDecls = new Set();
62
+ const atomicClasses = buildAtomicClasses(rule !== null && rule !== void 0 ? rule : {}, cache, cssRules, undefined, seenDecls);
44
63
  classNamesBySlot[slot] = atomicClasses.join(' ');
45
64
  }
46
65
  return { classNamesBySlot, cssRules };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "css-in-js-engine-pb",
3
- "version": "0.2.2",
3
+ "version": "0.2.3",
4
4
  "description": "A lightweight atomic CSS-in-JS engine built on the native CSS cascade",
5
5
  "license": "MIT",
6
6
  "type": "module",