@css-hooks/core 4.0.0-next.3 → 4.0.0-next.5

package/README.md

@@ -1,16 +1,16 @@
 <div align="center">
-  <a id="logomark" href="https://next.css-hooks.com"><img alt="CSS Hooks" src="https://github.com/css-hooks/css-hooks/raw/v4.0.0-next.3/.github/logomark.svg" height="128" /></a><br/><br/>
+  <a id="logomark" href="https://next.css-hooks.com"><img alt="CSS Hooks" src="https://github.com/css-hooks/css-hooks/raw/v4.0.0-next.5/.github/logomark.svg" height="128" /></a><br/><br/>
   <div id="wordmark">
-    <a href="https://next.css-hooks.com"><img alt="CSS Hooks" src="https://github.com/css-hooks/css-hooks/raw/v4.0.0-next.3/.github/wordmark-dark.svg" width="256"></a>
+    <a href="https://next.css-hooks.com"><img alt="CSS Hooks" src="https://github.com/css-hooks/css-hooks/raw/v4.0.0-next.5/.github/wordmark-dark.svg" width="256"></a>
   </div>
 </div>
 
 <br/>
 
 <div align="center" id="badges">
-  <a href="https://github.com/css-hooks/css-hooks/tree/v4.0.0-next.3"><img src="https://img.shields.io/badge/tag-v4.0.0--next.3-ffd700" alt="tag v4.0.0-next.3"></a>
-  <a href="https://www.npmjs.com/package/@css-hooks/core/v/4.0.0-next.3"><img src="https://img.shields.io/badge/npm-v4.0.0--next.3-ffd700" alt="npm version"></a>
-  <a href="https://github.com/css-hooks/css-hooks/blob/v4.0.0-next.3/LICENSE"><img src="https://img.shields.io/badge/license-MIT-ffd700" alt="license"></a>
+  <a href="https://github.com/css-hooks/css-hooks/tree/v4.0.0-next.5"><img src="https://img.shields.io/badge/tag-v4.0.0--next.5-ffd700" alt="tag v4.0.0-next.5"></a>
+  <a href="https://www.npmjs.com/package/@css-hooks/core/v/4.0.0-next.5"><img src="https://img.shields.io/badge/npm-v4.0.0--next.5-ffd700" alt="npm version"></a>
+  <a href="https://github.com/css-hooks/css-hooks/blob/v4.0.0-next.5/LICENSE"><img src="https://img.shields.io/badge/license-MIT-ffd700" alt="license"></a>
 </div>
 
 ---

package/cjs/index.js

@@ -135,7 +135,8 @@ function buildHooksSystem(stringify = String) {
         };
     };
 }
-const hashAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+const hashAlphabet = "abcdefghijklmnopqrstuvwxyz0123456789-_";
+const hashAlphabetLength = hashAlphabet.length;
 function createHash(value) {
     let h1 = 0xdeadbeef;
     let h2 = 0x41c6ce57;
@@ -152,9 +153,9 @@ function createHash(value) {
             Math.imul(h1 ^ (h1 >>> 13), 0xc2b2ae35);
     let hash = (h1 >>> 0) + 0x100000000 * (h2 & 0xf);
     let encoded = "";
-    for (let i = 0; i < 6; i++) {
-        encoded = hashAlphabet.charAt(hash % 64) + encoded;
-        hash = Math.floor(hash / 64);
+    for (let i = 0; i < 7; i++) {
+        encoded = hashAlphabet.charAt(hash % hashAlphabetLength) + encoded;
+        hash = Math.floor(hash / hashAlphabetLength);
     }
     return encoded;
 }

package/esm/index.js

@@ -132,7 +132,8 @@ export function buildHooksSystem(stringify = String) {
         };
     };
 }
-const hashAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+const hashAlphabet = "abcdefghijklmnopqrstuvwxyz0123456789-_";
+const hashAlphabetLength = hashAlphabet.length;
 function createHash(value) {
     let h1 = 0xdeadbeef;
     let h2 = 0x41c6ce57;
@@ -149,9 +150,9 @@ function createHash(value) {
             Math.imul(h1 ^ (h1 >>> 13), 0xc2b2ae35);
     let hash = (h1 >>> 0) + 0x100000000 * (h2 & 0xf);
     let encoded = "";
-    for (let i = 0; i < 6; i++) {
-        encoded = hashAlphabet.charAt(hash % 64) + encoded;
-        hash = Math.floor(hash / 64);
+    for (let i = 0; i < 7; i++) {
+        encoded = hashAlphabet.charAt(hash % hashAlphabetLength) + encoded;
+        hash = Math.floor(hash / hashAlphabetLength);
     }
     return encoded;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@css-hooks/core",
   "description": "CSS Hooks core library",
-  "version": "4.0.0-next.3",
+  "version": "4.0.0-next.5",
   "author": "Nick Saunders",
   "devDependencies": {
     "color": "^5.0.3",

package/types/index.d.ts

@@ -68,6 +68,10 @@ type CSSPropertyConflictKeys<CSSPropertyConflicts extends object, OverrideCSSPro
 type ForbidCSSPropertyConflicts<CSSPropertyConflicts extends object, OverrideCSSProperties> = {
     [P in CSSPropertyConflictKeys<CSSPropertyConflicts, OverrideCSSProperties>]?: never;
 };
+/** Preserves a style's shape while replacing conflicting property values. */
+type CSSPropertiesWithoutConflicts<CSSProperties, CSSPropertyConflicts extends object, OverrideCSSProperties> = {
+    [P in keyof CSSProperties]: P extends CSSPropertyConflictKeys<CSSPropertyConflicts, OverrideCSSProperties> ? never : CSSProperties[P];
+} & ForbidCSSPropertyConflicts<CSSPropertyConflicts, OverrideCSSProperties>;
 /**
  * An object containing the functions needed to support and use the configured
  * hooks
@@ -85,7 +89,7 @@ export interface CreateHooksResult<S, CSSProperties, CSSPropertyConflicts extend
      * Creates a function that enhances a style object with conditional override
      * styles.
      */
-    on: <OverrideCSSProperties extends CSSProperties, BaseCSSProperties extends Omit<CSSProperties, CSSPropertyConflictKeys<CSSPropertyConflicts, OverrideCSSProperties>>>(condition: Condition<S>, overrideStyle: OverrideCSSProperties) => (style: CSSProperties & BaseCSSProperties & ForbidCSSPropertyConflicts<CSSPropertyConflicts, OverrideCSSProperties>) => BaseCSSProperties & OverrideCSSProperties;
+    on: <OverrideCSSProperties extends CSSProperties, BaseCSSProperties extends Omit<CSSProperties, CSSPropertyConflictKeys<CSSPropertyConflicts, OverrideCSSProperties>>>(condition: Condition<S>, overrideStyle: OverrideCSSProperties) => (style: CSSPropertiesWithoutConflicts<CSSProperties & BaseCSSProperties, CSSPropertyConflicts, OverrideCSSProperties>) => BaseCSSProperties & OverrideCSSProperties;
     /**
      * Combines a list of conditions into a single condition which is true when
      * all of the specified conditions are true.