typewritingclass 0.3.1 → 0.3.2

package/dist/index.cjs

@@ -138,16 +138,53 @@ function _cxCore(args) {
 }
 function warnConflicts(args) {
   const seen = /* @__PURE__ */ new Map();
+  const seenDeclCount = /* @__PURE__ */ new Map();
+  const warned = /* @__PURE__ */ new Set();
+  const propContexts = /* @__PURE__ */ new Map();
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (typeof arg === "string" || typeof arg === "function") continue;
-    for (const prop of Object.keys(arg.declarations)) {
-      if (seen.has(prop)) {
-        console.warn(
-          `[typewritingclass] cx() conflict: "${prop}" is set by arguments at index ${seen.get(prop)} and ${i}. The later value will override. If intentional, this warning can be ignored.`
-        );
+    const context = arg.mediaQueries.join("|") + "::" + arg.selectors.join("|");
+    const declKeys = Object.keys(arg.declarations);
+    for (const prop of declKeys) {
+      const key = context + "::" + prop;
+      if (seen.has(key)) {
+        const earlierCount = seenDeclCount.get(key);
+        if (earlierCount > 1 && declKeys.length === 1) {
+          seen.set(key, i);
+          seenDeclCount.set(key, declKeys.length);
+          continue;
+        }
+        const msg = `[typewritingclass] cx() conflict: "${prop}" is set by arguments at index ${seen.get(key)} and ${i}. The later value will override. If intentional, this warning can be ignored.`;
+        if (!warned.has(msg)) {
+          warned.add(msg);
+          console.warn(msg);
+        }
+      }
+      seen.set(key, i);
+      seenDeclCount.set(key, declKeys.length);
+      if (!propContexts.has(prop)) propContexts.set(prop, []);
+      propContexts.get(prop).push({ context, index: i, mediaQueries: arg.mediaQueries });
+    }
+  }
+  for (const [prop, entries] of propContexts) {
+    for (let j = 1; j < entries.length; j++) {
+      const later = entries[j];
+      if (later.mediaQueries.length === 0) continue;
+      for (let k = 0; k < j; k++) {
+        const earlier = entries[k];
+        if (earlier.context === later.context) continue;
+        if (earlier.mediaQueries.length === 0) continue;
+        const earlierSet = new Set(earlier.mediaQueries);
+        const laterSet = new Set(later.mediaQueries);
+        const isSubset = [...laterSet].every((q) => earlierSet.has(q)) || [...earlierSet].every((q) => laterSet.has(q));
+        if (isSubset) continue;
+        const msg = `[typewritingclass] cx() cascade hazard: "${prop}" is set by arg ${earlier.index} (${earlier.mediaQueries.join(" + ")}) and arg ${later.index} (${later.mediaQueries.join(" + ")}). When both queries match, arg ${later.index} wins due to source order. To fix, combine them: .sm(tw.dark(...)) instead of separate .sm(...).dark(...).`;
+        if (!warned.has(msg)) {
+          warned.add(msg);
+          console.warn(msg);
+        }
       }
-      seen.set(prop, i);
     }
   }
 }

package/dist/index.js

@@ -138,16 +138,53 @@ function _cxCore(args) {
 }
 function warnConflicts(args) {
   const seen = /* @__PURE__ */ new Map();
+  const seenDeclCount = /* @__PURE__ */ new Map();
+  const warned = /* @__PURE__ */ new Set();
+  const propContexts = /* @__PURE__ */ new Map();
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (typeof arg === "string" || typeof arg === "function") continue;
-    for (const prop of Object.keys(arg.declarations)) {
-      if (seen.has(prop)) {
-        console.warn(
-          `[typewritingclass] cx() conflict: "${prop}" is set by arguments at index ${seen.get(prop)} and ${i}. The later value will override. If intentional, this warning can be ignored.`
-        );
+    const context = arg.mediaQueries.join("|") + "::" + arg.selectors.join("|");
+    const declKeys = Object.keys(arg.declarations);
+    for (const prop of declKeys) {
+      const key = context + "::" + prop;
+      if (seen.has(key)) {
+        const earlierCount = seenDeclCount.get(key);
+        if (earlierCount > 1 && declKeys.length === 1) {
+          seen.set(key, i);
+          seenDeclCount.set(key, declKeys.length);
+          continue;
+        }
+        const msg = `[typewritingclass] cx() conflict: "${prop}" is set by arguments at index ${seen.get(key)} and ${i}. The later value will override. If intentional, this warning can be ignored.`;
+        if (!warned.has(msg)) {
+          warned.add(msg);
+          console.warn(msg);
+        }
+      }
+      seen.set(key, i);
+      seenDeclCount.set(key, declKeys.length);
+      if (!propContexts.has(prop)) propContexts.set(prop, []);
+      propContexts.get(prop).push({ context, index: i, mediaQueries: arg.mediaQueries });
+    }
+  }
+  for (const [prop, entries] of propContexts) {
+    for (let j = 1; j < entries.length; j++) {
+      const later = entries[j];
+      if (later.mediaQueries.length === 0) continue;
+      for (let k = 0; k < j; k++) {
+        const earlier = entries[k];
+        if (earlier.context === later.context) continue;
+        if (earlier.mediaQueries.length === 0) continue;
+        const earlierSet = new Set(earlier.mediaQueries);
+        const laterSet = new Set(later.mediaQueries);
+        const isSubset = [...laterSet].every((q) => earlierSet.has(q)) || [...earlierSet].every((q) => laterSet.has(q));
+        if (isSubset) continue;
+        const msg = `[typewritingclass] cx() cascade hazard: "${prop}" is set by arg ${earlier.index} (${earlier.mediaQueries.join(" + ")}) and arg ${later.index} (${later.mediaQueries.join(" + ")}). When both queries match, arg ${later.index} wins due to source order. To fix, combine them: .sm(tw.dark(...)) instead of separate .sm(...).dark(...).`;
+        if (!warned.has(msg)) {
+          warned.add(msg);
+          console.warn(msg);
+        }
       }
-      seen.set(prop, i);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typewritingclass",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "repository": {
     "type": "git",