react-native-unistyles 3.0.0-beta.3 → 3.0.0-beta.5

package/lib/module/web/shadowRegistry.js

@@ -1,11 +1,10 @@
 "use strict";
 
-import { UnistylesListener } from './listener';
-import { UnistylesRegistry } from './registry';
 import { deepMergeObjects } from '../utils';
-import { equal, extractSecrets, extractUnistyleDependencies, isInDocument } from './utils';
+import { extractSecrets, extractUnistyleDependencies } from './utils';
 import { getVariants } from './variants';
-class UnistylesShadowRegistryBuilder {
+import { UnistyleDependency } from '../specs';
+export class UnistylesShadowRegistry {
   // MOCKS
   name = 'UnistylesShadowRegistry';
   __type = 'web';
@@ -14,128 +13,81 @@ class UnistylesShadowRegistryBuilder {
   dispose = () => {};
   // END MOCKS
 
-  resultsMap = new Map();
-  classNamesMap = new Map();
-  selectedVariants = new Map();
   scopedTheme = undefined;
   disposeMap = new Map();
-  add = (ref, styles) => {
-    // Styles are not provided
-    if (!styles || !Array.isArray(styles)) {
-      return;
-    }
-
-    // Ref is unmounted
-    if (ref === null) {
-      styles.flat().forEach(style => {
-        extractSecrets(style)?.__uni__refs.forEach(ref => {
-          if (isInDocument(ref)) {
-            return;
-          }
-          const oldResult = this.resultsMap.get(ref);
-          this.resultsMap.delete(ref);
-          this.classNamesMap.delete(ref);
-          this.disposeMap.get(ref)?.();
-          this.disposeMap.delete(ref);
-          if (oldResult) {
-            UnistylesRegistry.remove(oldResult);
-          }
-        });
-      });
-      return;
-    }
-
-    // Ref is not an HTMLElement
-    if (!(ref instanceof HTMLElement)) {
+  constructor(services) {
+    this.services = services;
+  }
+  add = (ref, hash) => {
+    if (!(ref instanceof HTMLElement) || !hash) {
       return;
     }
+    this.services.registry.connect(ref, hash);
+  };
+  addStyles = unistyles => {
     const getParsedStyles = () => {
-      return styles.flat().flatMap(unistyleStyle => {
-        if (!unistyleStyle) {
-          return [];
-        }
-        const secrets = extractSecrets(unistyleStyle);
+      const allStyles = unistyles.map(unistyle => {
+        const secrets = extractSecrets(unistyle);
 
         // Regular style
         if (!secrets) {
-          return unistyleStyle;
+          return unistyle;
         }
         const {
           __uni__key,
           __uni__stylesheet,
           __uni__args = [],
-          __uni__refs
+          __uni_variants: variants
         } = secrets;
-        const newComputedStylesheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet, scopedTheme);
+        const newComputedStylesheet = this.services.registry.getComputedStylesheet(__uni__stylesheet, scopedTheme);
         const style = newComputedStylesheet[__uni__key];
-        const args = __uni__args;
-        const result = typeof style === 'function' ? style(...args) : style;
-        const {
-          variantsResult
-        } = Object.fromEntries(getVariants({
-          variantsResult: result
-        }, variants));
-        const resultWithVariants = deepMergeObjects(result, variantsResult ?? {});
+        const result = typeof style === 'function' ? style(...__uni__args) : style;
+        const variantsResult = getVariants(result, variants);
+        const resultWithVariants = deepMergeObjects(result, variantsResult);
         const dependencies = extractUnistyleDependencies(resultWithVariants);
         if (typeof __uni__stylesheet === 'function') {
           // Add dependencies from dynamic styles to stylesheet
-          UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
+          this.services.registry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
         }
-        __uni__refs.add(ref);
         return resultWithVariants;
       });
+      return deepMergeObjects(...allStyles);
     };
 
     // Copy scoped theme to not use referenced value
-    const variants = this.getVariants();
     const scopedTheme = this.scopedTheme;
     const parsedStyles = getParsedStyles();
-    const combinedStyles = deepMergeObjects(...parsedStyles);
-    const oldStyles = this.resultsMap.get(ref);
-    if (equal(combinedStyles, oldStyles)) {
-      return;
-    }
-    const oldClassNames = this.classNamesMap.get(ref);
-
-    // Remove old styles
-    if (oldStyles) {
-      UnistylesRegistry.remove(oldStyles);
-    }
-
-    // Remove old classnames from the ref
-    oldClassNames?.forEach(className => ref.classList.remove(className));
-    this.resultsMap.set(ref, combinedStyles);
     const {
-      hash
-    } = UnistylesRegistry.add(combinedStyles);
-    const injectedClassNames = combinedStyles?._web?._classNames ?? [];
-    const newClassNames = (Array.isArray(injectedClassNames) ? injectedClassNames : [injectedClassNames]).concat(hash);
-    const dependencies = Array.from(new Set(parsedStyles.flatMap(style => extractUnistyleDependencies(style))));
-    this.disposeMap.get(ref)?.();
-    this.disposeMap.set(ref, UnistylesListener.addListeners(dependencies, () => {
-      UnistylesRegistry.applyStyles(hash, deepMergeObjects(...getParsedStyles()));
-    }));
-    this.classNamesMap.set(ref, newClassNames);
-    // Add new classnames to the ref
-    ref.classList.add(...newClassNames);
-    ref.removeAttribute('styles');
-    return newClassNames;
-  };
-  selectVariants = variants => {
-    if (!variants) {
-      this.selectedVariants.clear();
-      return;
+      hash,
+      existingHash
+    } = this.services.registry.add(parsedStyles);
+    const injectedClassNames = parsedStyles?._web?._classNames ?? [];
+    const injectedClassName = Array.isArray(injectedClassNames) ? injectedClassNames.join(' ') : injectedClassNames;
+    const dependencies = extractUnistyleDependencies(parsedStyles);
+    const filteredDependencies = this.services.state.CSSVars ? dependencies.filter(dependency => dependency !== UnistyleDependency.Theme) : dependencies;
+    if (!existingHash) {
+      this.disposeMap.set(hash, this.services.listener.addListeners(filteredDependencies, () => {
+        this.services.registry.applyStyles(hash, getParsedStyles());
+      }));
     }
-    Object.entries(variants).forEach(([key, value]) => {
-      this.selectedVariants.set(key, value);
-    });
+    return {
+      injectedClassName,
+      hash
+    };
   };
   setScopedTheme = theme => {
     this.scopedTheme = theme;
   };
   getScopedTheme = () => this.scopedTheme;
-  getVariants = () => Object.fromEntries(this.selectedVariants.entries());
-  remove = () => {};
+  remove = (ref, hash) => {
+    if (!(ref instanceof HTMLElement) || !hash) {
+      return;
+    }
+    const removed = this.services.registry.remove(ref, hash);
+    if (removed) {
+      this.disposeMap.get(hash)?.();
+      this.disposeMap.delete(hash);
+    }
+  };
 }
-export const UnistylesShadowRegistry = new UnistylesShadowRegistryBuilder();
 //# sourceMappingURL=shadowRegistry.js.map

package/lib/module/web/shadowRegistry.js.map

@@ -1 +1 @@
-{"version":3,"names":["UnistylesListener","UnistylesRegistry","deepMergeObjects","equal","extractSecrets","extractUnistyleDependencies","isInDocument","getVariants","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","resultsMap","Map","classNamesMap","selectedVariants","scopedTheme","undefined","disposeMap","add","ref","styles","Array","isArray","flat","forEach","style","__uni__refs","oldResult","get","delete","remove","HTMLElement","getParsedStyles","flatMap","unistyleStyle","secrets","__uni__key","__uni__stylesheet","__uni__args","newComputedStylesheet","getComputedStylesheet","args","result","variantsResult","Object","fromEntries","variants","resultWithVariants","dependencies","addDependenciesToStylesheet","parsedStyles","combinedStyles","oldStyles","oldClassNames","className","classList","set","hash","injectedClassNames","_web","_classNames","newClassNames","concat","from","Set","addListeners","applyStyles","removeAttribute","selectVariants","clear","entries","key","value","setScopedTheme","theme","getScopedTheme","UnistylesShadowRegistry"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["deepMergeObjects","extractSecrets","extractUnistyleDependencies","getVariants","UnistyleDependency","UnistylesShadowRegistry","name","__type","equals","toString","dispose","scopedTheme","undefined","disposeMap","Map","constructor","services","add","ref","hash","HTMLElement","registry","connect","addStyles","unistyles","getParsedStyles","allStyles","map","unistyle","secrets","__uni__key","__uni__stylesheet","__uni__args","__uni_variants","variants","newComputedStylesheet","getComputedStylesheet","style","result","variantsResult","resultWithVariants","dependencies","addDependenciesToStylesheet","parsedStyles","existingHash","injectedClassNames","_web","_classNames","injectedClassName","Array","isArray","join","filteredDependencies","state","CSSVars","filter","dependency","Theme","set","listener","addListeners","applyStyles","setScopedTheme","theme","getScopedTheme","remove","removed","get","delete"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/state.js

@@ -1,19 +1,27 @@
 "use strict";
 
-import { UnistylesRuntime } from './runtime';
-import { error, isServer, schemeToTheme } from './utils';
-import { UnistylesListener } from './listener';
+import { error, hyphenate, isServer, schemeToTheme } from './utils';
 import { UnistyleDependency } from '../specs/NativePlatform';
-class UnistylesStateBuilder {
+export class UnistylesState {
+  isInitialized = false;
   themes = new Map();
+  cssThemes = new Map();
+  CSSVars = true;
   matchingBreakpoints = new Map();
   get breakpoint() {
     const [currentBreakpoint] = Array.from(this.matchingBreakpoints).reverse().find(([_key, value]) => value) ?? [];
     return currentBreakpoint;
   }
   hasAdaptiveThemes = false;
+  constructor(services) {
+    this.services = services;
+  }
   init = config => {
-    this.initThemes(config.themes);
+    if (this.isInitialized) {
+      return;
+    }
+    this.isInitialized = true;
+    this.initThemes(config.themes, config.settings?.CSSVars);
     this.initBreakpoints(config.breakpoints);
     if (config.settings) {
       this.initSettings(config.settings);
@@ -21,11 +29,33 @@ class UnistylesStateBuilder {
     if (isServer()) {
       return;
     }
-    UnistylesListener.initListeners();
+
+    // Ensure we have a themeName before calling this
+    // classList.add throws a "SyntaxError" DOMException if one of the arguments is an empty string.
+    if (!this.hasAdaptiveThemes && this.CSSVars && this.themeName) {
+      document.querySelector(':root')?.classList.add(this.themeName);
+    }
+    this.services.listener.initListeners();
   };
-  initThemes = (themes = {}) => {
+  initThemes = (themes = {}, CSSVars = true) => {
+    this.CSSVars = CSSVars;
     Object.entries(themes).forEach(([themeName, theme]) => {
       this.themes.set(themeName, theme);
+      if (CSSVars) {
+        this.services.registry.css.addTheme(themeName, theme);
+        const convertTheme = (key, value, prev = '-') => {
+          if (typeof value === 'object' && value !== null) {
+            return [key, Object.fromEntries(Object.entries(value).map(([nestedKey, nestedValue]) => convertTheme(nestedKey, nestedValue, `${prev}-${key}`)))];
+          }
+          if (typeof value === 'string') {
+            return [key, `var(${prev}-${hyphenate(key)})`];
+          }
+          return [key, value];
+        };
+        this.cssThemes.set(themeName, Object.fromEntries(Object.entries(theme).map(([key, value]) => {
+          return convertTheme(key, value);
+        })));
+      }
     });
   };
   initSettings = settings => {
@@ -39,7 +69,7 @@ class UnistylesStateBuilder {
       if (!this.themes.get('light') || !this.themes.get('dark')) {
         throw error(`You're trying to enable adaptiveThemes, but you didn't register both 'light' and 'dark' themes.`);
       }
-      this.themeName = schemeToTheme(UnistylesRuntime.colorScheme);
+      this.themeName = schemeToTheme(this.services.runtime.colorScheme);
       return;
     }
     if (settings.initialTheme) {
@@ -67,10 +97,9 @@ class UnistylesStateBuilder {
       this.matchingBreakpoints.set(breakpoint, mediaQuery.matches);
       mediaQuery.addEventListener('change', event => {
         this.matchingBreakpoints.set(breakpoint, event.matches);
-        UnistylesListener.emitChange(UnistyleDependency.Breakpoints);
+        this.services.listener.emitChange(UnistyleDependency.Breakpoints);
       });
     });
   };
 }
-export const UnistylesState = new UnistylesStateBuilder();
 //# sourceMappingURL=state.js.map

package/lib/module/web/state.js.map

@@ -1 +1 @@
-{"version":3,"names":["UnistylesRuntime","error","isServer","schemeToTheme","UnistylesListener","UnistyleDependency","UnistylesStateBuilder","themes","Map","matchingBreakpoints","breakpoint","currentBreakpoint","Array","from","reverse","find","_key","value","hasAdaptiveThemes","init","config","initThemes","initBreakpoints","breakpoints","settings","initSettings","initListeners","Object","entries","forEach","themeName","theme","set","adaptiveThemes","initialTheme","get","colorScheme","breakpointsEntries","length","sort","a","b","mediaQuery","window","matchMedia","matches","addEventListener","event","emitChange","Breakpoints","UnistylesState"],"sourceRoot":"../../../src","sources":["web/state.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["error","hyphenate","isServer","schemeToTheme","UnistyleDependency","UnistylesState","isInitialized","themes","Map","cssThemes","CSSVars","matchingBreakpoints","breakpoint","currentBreakpoint","Array","from","reverse","find","_key","value","hasAdaptiveThemes","constructor","services","init","config","initThemes","settings","initBreakpoints","breakpoints","initSettings","themeName","document","querySelector","classList","add","listener","initListeners","Object","entries","forEach","theme","set","registry","css","addTheme","convertTheme","key","prev","fromEntries","map","nestedKey","nestedValue","adaptiveThemes","initialTheme","get","runtime","colorScheme","breakpointsEntries","length","sort","a","b","mediaQuery","window","matchMedia","matches","addEventListener","event","emitChange","Breakpoints"],"sourceRoot":"../../../src","sources":["web/state.ts"],"mappings":";;AAIA,SAASA,KAAK,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,SAAS;AACnE,SAASC,kBAAkB,QAAQ,yBAAyB;AAM5D,OAAO,MAAMC,cAAc,CAAC;EACxBC,aAAa,GAAG,KAAK;EACrBC,MAAM,GAAG,IAAIC,GAAG,CAAyB,CAAC;EAC1CC,SAAS,GAAG,IAAID,GAAG,CAAyB,CAAC;EAE7CE,OAAO,GAAG,IAAI;EAENC,mBAAmB,GAAG,IAAIH,GAAG,CAAkB,CAAC;EAExD,IAAII,UAAUA,CAAA,EAAG;IACb,MAAM,CAACC,iBAAiB,CAAC,GAAGC,KAAK,CAACC,IAAI,CAAC,IAAI,CAACJ,mBAAmB,CAAC,CAC3DK,OAAO,CAAC,CAAC,CACTC,IAAI,CAAC,CAAC,CAACC,IAAI,EAAEC,KAAK,CAAC,KAAKA,KAAK,CAAC,IAAI,EAAE;IAEzC,OAAON,iBAAiB;EAC5B;EAIAO,iBAAiB,GAAG,KAAK;EAEzBC,WAAWA,CAASC,QAA2B,EAAE;IAAA,KAA7BA,QAA2B,GAA3BA,QAA2B;EAAG;EAElDC,IAAI,GAAIC,MAAuB,IAAK;IAChC,IAAI,IAAI,CAAClB,aAAa,EAAE;MACpB;IACJ;IAEA,IAAI,CAACA,aAAa,GAAG,IAAI;IACzB,IAAI,CAACmB,UAAU,CAACD,MAAM,CAACjB,MAAM,EAAEiB,MAAM,CAACE,QAAQ,EAAEhB,OAAO,CAAC;IACxD,IAAI,CAACiB,eAAe,CAACH,MAAM,CAACI,WAAW,CAAC;IAExC,IAAIJ,MAAM,CAACE,QAAQ,EAAE;MACjB,IAAI,CAACG,YAAY,CAACL,MAAM,CAACE,QAA6B,CAAC;IAC3D;IAEA,IAAIxB,QAAQ,CAAC,CAAC,EAAE;MACZ;IACJ;;IAEA;IACA;IACA,IAAI,CAAC,IAAI,CAACkB,iBAAiB,IAAI,IAAI,CAACV,OAAO,IAAI,IAAI,CAACoB,SAAS,EAAE;MAC3DC,QAAQ,CAACC,aAAa,CAAC,OAAO,CAAC,EAAEC,SAAS,CAACC,GAAG,CAAC,IAAI,CAACJ,SAAS,CAAC;IAClE;IAEA,IAAI,CAACR,QAAQ,CAACa,QAAQ,CAACC,aAAa,CAAC,CAAC;EAC1C,CAAC;EAEOX,UAAU,GAAGA,CAAClB,MAAM,GAAG,CAAC,CAAoB,EAAEG,OAAO,GAAG,IAAI,KAAK;IACrE,IAAI,CAACA,OAAO,GAAGA,OAAO;IAEtB2B,MAAM,CAACC,OAAO,CAAC/B,MAAM,CAAC,CAACgC,OAAO,CAAC,CAAC,CAACT,SAAS,EAAEU,KAAK,CAAC,KAAK;MACnD,IAAI,CAACjC,MAAM,CAACkC,GAAG,CAACX,SAAS,EAAEU,KAAiB,CAAC;MAE7C,IAAI9B,OAAO,EAAE;QACT,IAAI,CAACY,QAAQ,CAACoB,QAAQ,CAACC,GAAG,CAACC,QAAQ,CAACd,SAAS,EAAEU,KAAK,CAAC;QAErD,MAAMK,YAAY,GAAGA,CAACC,GAAW,EAAE3B,KAAU,EAAE4B,IAAI,GAAG,GAAG,KAAoB;UACzE,IAAI,OAAO5B,KAAK,KAAK,QAAQ,IAAIA,KAAK,KAAK,IAAI,EAAE;YAC7C,OAAO,CAAC2B,GAAG,EAAET,MAAM,CAACW,WAAW,CAACX,MAAM,CAACC,OAAO,CAACnB,KAAK,CAAC,CAAC8B,GAAG,CAAC,CAAC,CAACC,SAAS,EAAEC,WAAW,CAAC,KAAKN,YAAY,CAACK,SAAS,EAAEC,WAAW,EAAE,GAAGJ,IAAI,IAAID,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;UACrJ;UAEA,IAAI,OAAO3B,KAAK,KAAK,QAAQ,EAAE;YAC3B,OAAO,CAAC2B,GAAG,EAAE,OAAOC,IAAI,IAAI9C,SAAS,CAAC6C,GAAG,CAAC,GAAG,CAAC;UAClD;UAEA,OAAO,CAACA,GAAG,EAAE3B,KAAK,CAAC;QACvB,CAAC;QAED,IAAI,CAACV,SAAS,CAACgC,GAAG,CAACX,SAAS,EAAEO,MAAM,CAACW,WAAW,CAACX,MAAM,CAACC,OAAO,CAACE,KAAK,CAAC,CAACS,GAAG,CAAC,CAAC,CAACH,GAAG,EAAE3B,KAAK,CAAC,KAAK;UACzF,OAAO0B,YAAY,CAACC,GAAG,EAAE3B,KAAK,CAAC;QACnC,CAAC,CAAC,CAAmB,CAAC;MAC1B;IACJ,CAAC,CAAC;EACN,CAAC;EAEOU,YAAY,GAAIH,QAA2B,IAAK;IACpD,IAAI,CAACN,iBAAiB,GAAGM,QAAQ,EAAE0B,cAAc,IAAI,KAAK;IAE1D,IAAI1B,QAAQ,CAAC2B,YAAY,IAAI3B,QAAQ,CAAC0B,cAAc,EAAE;MAClD,MAAMpD,KAAK,CAAC,0GAA0G,CAAC;IAC3H;;IAEA;IACA,IAAI0B,QAAQ,CAAC0B,cAAc,EAAE;MACzB,IAAI,CAAC,IAAI,CAAC7C,MAAM,CAAC+C,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC/C,MAAM,CAAC+C,GAAG,CAAC,MAAM,CAAC,EAAE;QACvD,MAAMtD,KAAK,CAAC,iGAAiG,CAAC;MAClH;MAEA,IAAI,CAAC8B,SAAS,GAAG3B,aAAa,CAAC,IAAI,CAACmB,QAAQ,CAACiC,OAAO,CAACC,WAAW,CAAiB;MAEjF;IACJ;IAEA,IAAI9B,QAAQ,CAAC2B,YAAY,EAAE;MACvB,MAAMA,YAAY,GAAG,OAAO3B,QAAQ,CAAC2B,YAAY,KAAK,UAAU,GAC1D3B,QAAQ,CAAC2B,YAAY,CAAC,CAAC,GACvB3B,QAAQ,CAAC2B,YAAY;MAE3B,IAAI,CAAC,IAAI,CAAC9C,MAAM,CAAC+C,GAAG,CAACD,YAAY,CAAC,EAAE;QAChC,MAAMrD,KAAK,CAAC,kCAAkCqD,YAAY,6BAA6B,CAAC;MAC5F;MAEA,IAAI,CAACvB,SAAS,GAAGuB,YAAY;IACjC;EACJ,CAAC;EAEO1B,eAAe,GAAGA,CAACC,WAAW,GAAG,CAAC,CAAyB,KAAK;IACpE,IAAI,CAACA,WAAW,GAAGA,WAAW;IAC9B,MAAM6B,kBAAkB,GAAGpB,MAAM,CAACC,OAAO,CAACV,WAAW,CAAC;IAEtD,IAAI6B,kBAAkB,CAACC,MAAM,KAAK,CAAC,EAAE;MACjC,MAAM1D,KAAK,CAAC,sDAAsD,CAAC;IACvE;IAEA,IAAIyD,kBAAkB,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;MACpC,MAAMzD,KAAK,CAAC,6DAA6D,CAAC;IAC9E;IAEAyD,kBAAkB,CACbE,IAAI,CAAC,CAAC,GAAGC,CAAC,CAAC,EAAE,GAAGC,CAAC,CAAC,KAAKD,CAAC,GAAGC,CAAC,CAAC,CAC7BtB,OAAO,CAAC,CAAC,CAAC3B,UAAU,EAAEO,KAAK,CAAC,KAAK;MAC9B,IAAIjB,QAAQ,CAAC,CAAC,EAAE;QACZ;MACJ;MAEA,MAAM4D,UAAU,GAAGC,MAAM,CAACC,UAAU,CAAC,eAAe7C,KAAK,KAAK,CAAC;MAC/D,IAAI,CAACR,mBAAmB,CAAC8B,GAAG,CAAC7B,UAAU,EAAEkD,UAAU,CAACG,OAAO,CAAC;MAE5DH,UAAU,CAACI,gBAAgB,CAAC,QAAQ,EAAEC,KAAK,IAAI;QAC3C,IAAI,CAACxD,mBAAmB,CAAC8B,GAAG,CAAC7B,UAAU,EAAEuD,KAAK,CAACF,OAAO,CAAC;QACvD,IAAI,CAAC3C,QAAQ,CAACa,QAAQ,CAACiC,UAAU,CAAChE,kBAAkB,CAACiE,WAAW,CAAC;MACrE,CAAC,CAAC;IACN,CAAC,CAAC;EACV,CAAC;AACL","ignoreList":[]}

package/lib/module/web/types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=types.js.map

package/lib/module/web/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["web/types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/web/utils/common.js

@@ -2,7 +2,7 @@
 
 export const reduceObject = (obj, reducer) => Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, reducer(value, key)]));
 export const keyInObject = (obj, key) => key in obj;
-export const isServer = () => typeof window === 'undefined';
+export const isServer = () => typeof window === 'undefined' || typeof document === 'undefined';
 export const error = message => new Error(`Unistyles: ${message}`);
 export const equal = (a, b) => {
   if (Object.is(a, b)) {
@@ -17,12 +17,31 @@ export const equal = (a, b) => {
   }
   return keysA.every(key => Object.is(a[key], b[key]) && Object.prototype.hasOwnProperty.call(b, key));
 };
+export const hyphenate = propertyName => propertyName.replace(/[A-Z]/g, m => `-${m.toLowerCase()}`);
+export const serialize = obj => {
+  if (typeof obj !== 'object') {
+    return String(obj);
+  }
+  const sortedKeys = Object.keys(obj).sort();
+  const sortedKeyValuePairs = sortedKeys.map(key => `${key}:${serialize(obj[key])}`);
+  return `{${sortedKeyValuePairs.join(',')}}`;
+};
+
+// Based on https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js
+const cyrb53 = (data, seed = 0) => {
+  let h1 = 0xdeadbeef ^ seed;
+  let h2 = 0x41c6ce57 ^ seed;
+  for (let i = 0, ch; i < data.length; i++) {
+    ch = data.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
+  }
+  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507) ^ Math.imul(h2 ^ h2 >>> 13, 3266489909);
+  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507) ^ Math.imul(h1 ^ h1 >>> 13, 3266489909);
+  return 4294967296 * (2097151 & h2) + (h1 >>> 0);
+};
 export const generateHash = value => {
-  const str = JSON.stringify(value);
-  let hasher = 5381;
-  let length = str.length;
-  while (length--) hasher = hasher * 33 ^ str.charCodeAt(length);
-  return `unistyles-${(hasher >>> 0).toString(36)}`;
+  const serialized = serialize(value);
+  return `unistyles-${cyrb53(serialized).toString(36)}`;
 };
-export const hyphenate = propertyName => propertyName.replace(/[A-Z]/g, m => `-${m.toLowerCase()}`);
 //# sourceMappingURL=common.js.map

package/lib/module/web/utils/common.js.map

@@ -1 +1 @@
-{"version":3,"names":["reduceObject","obj","reducer","Object","fromEntries","entries","map","key","value","keyInObject","isServer","window","error","message","Error","equal","a","b","is","keysA","keys","length","every","prototype","hasOwnProperty","call","generateHash","str","JSON","stringify","hasher","charCodeAt","toString","hyphenate","propertyName","replace","m","toLowerCase"],"sourceRoot":"../../../../src","sources":["web/utils/common.ts"],"mappings":";;AAAA,OAAO,MAAMA,YAAY,GAAGA,CACxBC,GAAS,EACTC,OAA+D,KAC9DC,MAAM,CAACC,WAAW,CAACD,MAAM,CAACE,OAAO,CAACJ,GAAG,CAAC,CAACK,GAAG,CAAC,CAAC,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK,CAACD,GAAG,EAAEL,OAAO,CAACM,KAAK,EAAsBD,GAAG,CAAC,CAAC,CAAC,CAAoC;AAErJ,OAAO,MAAME,WAAW,GAAGA,CAAgCR,GAAM,EAAEM,GAAgB,KAAqBA,GAAG,IAAIN,GAAG;AAElH,OAAO,MAAMS,QAAQ,GAAGA,CAAA,KAAM,OAAOC,MAAM,KAAK,WAAW;AAE3D,OAAO,MAAMC,KAAK,GAAIC,OAAe,IAAK,IAAIC,KAAK,CAAC,cAAcD,OAAO,EAAE,CAAC;AAE5E,OAAO,MAAME,KAAK,GAAGA,CAAIC,CAAI,EAAEC,CAAI,KAAK;EACpC,IAAId,MAAM,CAACe,EAAE,CAACF,CAAC,EAAEC,CAAC,CAAC,EAAE;IACjB,OAAO,IAAI;EACf;EAEA,IACI,OAAOD,CAAC,KAAK,QAAQ,IAClBA,CAAC,KAAK,IAAI,IACV,OAAOC,CAAC,KAAK,QAAQ,IACrBA,CAAC,KAAK,IAAI,EACf;IACE,OAAO,KAAK;EAChB;EAEA,MAAME,KAAK,GAAGhB,MAAM,CAACiB,IAAI,CAACJ,CAAC,CAAmB;EAE9C,IAAIG,KAAK,CAACE,MAAM,KAAKlB,MAAM,CAACiB,IAAI,CAACH,CAAC,CAAC,CAACI,MAAM,EAAE;IACxC,OAAO,KAAK;EAChB;EAEA,OAAOF,KAAK,CAACG,KAAK,CAACf,GAAG,IAAIJ,MAAM,CAACe,EAAE,CAACF,CAAC,CAACT,GAAG,CAAC,EAAEU,CAAC,CAACV,GAAG,CAAC,CAAC,IAAIJ,MAAM,CAACoB,SAAS,CAACC,cAAc,CAACC,IAAI,CAACR,CAAC,EAAEV,GAAG,CAAC,CAAC;AACxG,CAAC;AAED,OAAO,MAAMmB,YAAY,GAAIlB,KAAU,IAAK;EACxC,MAAMmB,GAAG,GAAGC,IAAI,CAACC,SAAS,CAACrB,KAAK,CAAC;EACjC,IAAIsB,MAAM,GAAG,IAAI;EACjB,IAAIT,MAAM,GAAGM,GAAG,CAACN,MAAM;EAEvB,OAAOA,MAAM,EAAE,EAAES,MAAM,GAAIA,MAAM,GAAG,EAAE,GAAIH,GAAG,CAACI,UAAU,CAACV,MAAM,CAAC;EAEhE,OAAO,aAAa,CAACS,MAAM,KAAK,CAAC,EAAEE,QAAQ,CAAC,EAAE,CAAC,EAAE;AACrD,CAAC;AAED,OAAO,MAAMC,SAAS,GAAIC,YAAoB,IAAKA,YAAY,CAACC,OAAO,CAAC,QAAQ,EAAGC,CAAS,IAAK,IAAIA,CAAC,CAACC,WAAW,CAAC,CAAC,EAAE,CAAC","ignoreList":[]}
+{"version":3,"names":["reduceObject","obj","reducer","Object","fromEntries","entries","map","key","value","keyInObject","isServer","window","document","error","message","Error","equal","a","b","is","keysA","keys","length","every","prototype","hasOwnProperty","call","hyphenate","propertyName","replace","m","toLowerCase","serialize","String","sortedKeys","sort","sortedKeyValuePairs","join","cyrb53","data","seed","h1","h2","i","ch","charCodeAt","Math","imul","generateHash","serialized","toString"],"sourceRoot":"../../../../src","sources":["web/utils/common.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/utils/unistyle.js

@@ -2,8 +2,8 @@
 
 import { ColorScheme, Orientation } from '../../specs/types';
 import { isUnistylesMq, parseMq } from '../../mq';
-import { UnistylesState } from '../state';
 import { keyInObject, reduceObject } from './common';
+import { UnistylesWeb } from '../index';
 export const schemeToTheme = scheme => {
   switch (scheme) {
     case ColorScheme.Dark:
@@ -14,12 +14,27 @@ export const schemeToTheme = scheme => {
   }
 };
 export const assignSecrets = (object, secrets) => {
-  // @ts-expect-error - assign secrets to object
-  object.__uni__secrets__ = secrets;
+  const secretsId = Math.random().toString(36).slice(8);
+
+  // @ts-expect-error assign hidden secrets
+  object[`unistyles-${secretsId}`] = {};
+  // @ts-expect-error assign hidden secrets
+  Object.defineProperties(object[`unistyles-${secretsId}`], reduceObject(secrets, secret => ({
+    value: secret,
+    enumerable: false,
+    configurable: true
+  })));
   return object;
 };
 export const extractSecrets = object => {
-  return object && keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ : undefined;
+  if (!object) {
+    return undefined;
+  }
+  const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles-')) ?? [];
+  if (!secrets) {
+    return undefined;
+  }
+  return reduceObject(Object.getOwnPropertyDescriptors(secrets), secret => secret.value);
 };
 export const removeInlineStyles = values => {
   const returnValue = {};
@@ -31,17 +46,9 @@ export const removeInlineStyles = values => {
   return returnValue;
 };
 export const isInDocument = element => document.body.contains(element);
-export const extractMediaQueryValue = query => {
-  const [_, px] = query.match(/(\d+)px/) ?? [];
-  if (!px) {
-    return undefined;
-  }
-  const value = Number(px);
-  return Number.isNaN(value) ? undefined : value;
-};
-export const getMediaQuery = query => {
+export const getMediaQuery = (query, allBreakpoints) => {
   if (Object.values(Orientation).includes(query)) {
-    return `(orientation: ${query})`;
+    return `@media (orientation: ${query})`;
   }
   if (isUnistylesMq(query)) {
     const {
@@ -50,10 +57,13 @@ export const getMediaQuery = query => {
       minHeight,
       maxHeight
     } = parseMq(query);
-    return [minWidth ? `(min-width: ${minWidth}px)` : undefined, maxWidth ? `(max-width: ${maxWidth}px)` : undefined, minHeight ? `(min-height: ${minHeight}px)` : undefined, maxHeight ? `(max-height: ${maxHeight}px)` : undefined].filter(Boolean).join(' and ');
+    const queries = [minWidth ? `(min-width: ${minWidth}px)` : undefined, maxWidth ? `(max-width: ${maxWidth}px)` : undefined, minHeight ? `(min-height: ${minHeight}px)` : undefined, maxHeight ? `(max-height: ${maxHeight}px)` : undefined].filter(Boolean).join(' and ');
+    return `@media ${queries}`;
   }
-  const minWidth = UnistylesState.breakpoints && keyInObject(UnistylesState.breakpoints, query) ? UnistylesState.breakpoints[query] : undefined;
-  return `(min-width: ${minWidth ?? 0}px)`;
+  const breakpointValue = UnistylesWeb.runtime.breakpoints[query] ?? 0;
+  const nextBreakpoint = allBreakpoints.filter(b => b in UnistylesWeb.runtime.breakpoints).map(b => UnistylesWeb.runtime.breakpoints[b]).sort((a, b) => a - b).find(b => b > breakpointValue);
+  const queries = [`(min-width: ${breakpointValue}px)`, nextBreakpoint ? `(max-width: ${nextBreakpoint - 1}px)` : undefined].filter(Boolean).join(' and ');
+  return `@media ${queries}`;
 };
 export const extractUnistyleDependencies = value => {
   if (!value) {

package/lib/module/web/utils/unistyle.js.map

@@ -1 +1 @@
-{"version":3,"names":["ColorScheme","Orientation","isUnistylesMq","parseMq","UnistylesState","keyInObject","reduceObject","schemeToTheme","scheme","Dark","Light","assignSecrets","object","secrets","__uni__secrets__","extractSecrets","undefined","removeInlineStyles","values","returnValue","Object","defineProperties","value","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","Number","isNaN","getMediaQuery","includes","minWidth","maxWidth","minHeight","maxHeight","filter","Boolean","join","breakpoints","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ColorScheme","Orientation","isUnistylesMq","parseMq","keyInObject","reduceObject","UnistylesWeb","schemeToTheme","scheme","Dark","Light","assignSecrets","object","secrets","secretsId","Math","random","toString","slice","Object","defineProperties","secret","value","enumerable","configurable","extractSecrets","undefined","entries","find","key","startsWith","getOwnPropertyDescriptors","removeInlineStyles","values","returnValue","isInDocument","element","document","body","contains","getMediaQuery","query","allBreakpoints","includes","minWidth","maxWidth","minHeight","maxHeight","queries","filter","Boolean","join","breakpointValue","runtime","breakpoints","nextBreakpoint","b","map","sort","a","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/variants.js

@@ -1,34 +1,32 @@
 "use strict";
 
 import { deepMergeObjects } from '../utils';
-const hasVariants = value => 'variants' in value[1];
+import { keyInObject } from './utils';
+const hasVariants = value => {
+  return keyInObject(value, 'variants');
+};
 export const getVariants = (styles, selectedVariants) => {
-  return Object.entries(styles).filter(hasVariants).filter(([_key, {
-    variants
-  }]) => Object.keys(variants).some(variant => variant in variants)).map(([key, {
-    variants,
-    compoundVariants = []
-  }]) => {
-    const variantStyles = Object.entries(variants).flatMap(([variant, styles]) => {
-      const selectedVariant = selectedVariants[variant];
-      const selectedVariantStyles = styles[selectedVariant] ?? styles.default;
-      if (!selectedVariantStyles) {
-        return [];
-      }
-      return selectedVariantStyles;
-    });
-    const compoundVariantStyles = compoundVariants.flatMap(compoundVariant => {
-      const {
-        styles,
-        ...conditions
-      } = compoundVariant;
-      if (Object.entries(conditions).some(([variant, value]) => String(selectedVariants[variant]) !== String(value))) {
-        return [];
-      }
-      return styles;
-    });
-    const mergedVariantStyles = deepMergeObjects(...variantStyles, ...compoundVariantStyles);
-    return [key, mergedVariantStyles];
+  if (!hasVariants(styles)) {
+    return {};
+  }
+  const variantStyles = Object.entries(styles.variants).flatMap(([variant, styles]) => {
+    const selectedVariant = selectedVariants[variant];
+    const selectedVariantStyles = styles[selectedVariant] ?? styles.default;
+    if (!selectedVariantStyles) {
+      return [];
+    }
+    return selectedVariantStyles;
   });
+  const compoundVariantStyles = styles.compoundVariants?.flatMap(compoundVariant => {
+    const {
+      styles,
+      ...conditions
+    } = compoundVariant;
+    if (Object.entries(conditions).some(([variant, value]) => String(selectedVariants[variant]) !== String(value))) {
+      return [];
+    }
+    return styles;
+  }) ?? [];
+  return deepMergeObjects(...variantStyles, ...compoundVariantStyles);
 };
 //# sourceMappingURL=variants.js.map

package/lib/module/web/variants.js.map

@@ -1 +1 @@
-{"version":3,"names":["deepMergeObjects","hasVariants","value","getVariants","styles","selectedVariants","Object","entries","filter","_key","variants","keys","some","variant","map","key","compoundVariants","variantStyles","flatMap","selectedVariant","selectedVariantStyles","default","compoundVariantStyles","compoundVariant","conditions","String","mergedVariantStyles"],"sourceRoot":"../../../src","sources":["web/variants.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,UAAU;AAQ3C,MAAMC,WAAW,GAAsBC,KAAkB,IAAgD,UAAU,IAAIA,KAAK,CAAC,CAAC,CAAC;AAE/H,OAAO,MAAMC,WAAW,GAAGA,CAACC,MAAyC,EAAEC,gBAAqC,KAAK;EAC7G,OAAOC,MAAM,CAACC,OAAO,CAACH,MAAM,CAAC,CACxBI,MAAM,CAACP,WAAW,CAAC,CACnBO,MAAM,CAAC,CAAC,CAACC,IAAI,EAAE;IAAEC;EAAS,CAAC,CAAC,KAAKJ,MAAM,CAACK,IAAI,CAACD,QAAQ,CAAC,CAACE,IAAI,CAACC,OAAO,IAAIA,OAAO,IAAIH,QAAQ,CAAC,CAAC,CAC5FI,GAAG,CAAC,CAAC,CAACC,GAAG,EAAE;IAAEL,QAAQ;IAAEM,gBAAgB,GAAG;EAAG,CAAC,CAAC,KAAK;IACjD,MAAMC,aAAa,GAAGX,MAAM,CAACC,OAAO,CAACG,QAAQ,CAAC,CAACQ,OAAO,CAAC,CAAC,CAACL,OAAO,EAAET,MAAM,CAAC,KAAK;MAC1E,MAAMe,eAAe,GAAGd,gBAAgB,CAACQ,OAAO,CAAC;MACjD,MAAMO,qBAAqB,GAAGhB,MAAM,CAACe,eAAe,CAAC,IAAIf,MAAM,CAACiB,OAAO;MAEvE,IAAI,CAACD,qBAAqB,EAAE;QACxB,OAAO,EAAE;MACb;MAEA,OAAOA,qBAAqB;IAChC,CAAC,CAAC;IAEF,MAAME,qBAAqB,GAAGN,gBAAgB,CAACE,OAAO,CAACK,eAAe,IAAI;MACtE,MAAM;QAAEnB,MAAM;QAAE,GAAGoB;MAAW,CAAC,GAAGD,eAAe;MAEjD,IAAIjB,MAAM,CAACC,OAAO,CAACiB,UAAU,CAAC,CAACZ,IAAI,CAAC,CAAC,CAACC,OAAO,EAAEX,KAAK,CAAC,KAAKuB,MAAM,CAACpB,gBAAgB,CAACQ,OAAO,CAAC,CAAC,KAAKY,MAAM,CAACvB,KAAK,CAAC,CAAC,EAAE;QAC5G,OAAO,EAAE;MACb;MAEA,OAAOE,MAAM;IACjB,CAAC,CAAC;IAEF,MAAMsB,mBAAmB,GAAG1B,gBAAgB,CAAC,GAAGiB,aAAa,EAAE,GAAGK,qBAAqB,CAAC;IAExF,OAAO,CAACP,GAAG,EAAEW,mBAAmB,CAAC;EACrC,CAAC,CAAC;AACV,CAAC","ignoreList":[]}
+{"version":3,"names":["deepMergeObjects","keyInObject","hasVariants","value","getVariants","styles","selectedVariants","variantStyles","Object","entries","variants","flatMap","variant","selectedVariant","selectedVariantStyles","default","compoundVariantStyles","compoundVariants","compoundVariant","conditions","some","String"],"sourceRoot":"../../../src","sources":["web/variants.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,UAAU;AAC3C,SAASC,WAAW,QAAQ,SAAS;AAQrC,MAAMC,WAAW,GAAIC,KAAU,IAAkC;EAC7D,OAAOF,WAAW,CAACE,KAAK,EAAE,UAAU,CAAC;AACzC,CAAC;AAED,OAAO,MAAMC,WAAW,GAAGA,CAACC,MAAuB,EAAEC,gBAAqC,KAAK;EAC3F,IAAI,CAACJ,WAAW,CAACG,MAAM,CAAC,EAAE;IACtB,OAAO,CAAC,CAAC;EACb;EAEA,MAAME,aAAa,GAAGC,MAAM,CAACC,OAAO,CAACJ,MAAM,CAACK,QAAQ,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,OAAO,EAAEP,MAAM,CAAC,KAAK;IACjF,MAAMQ,eAAe,GAAGP,gBAAgB,CAACM,OAAO,CAAC;IACjD,MAAME,qBAAqB,GAAGT,MAAM,CAACQ,eAAe,CAAC,IAAIR,MAAM,CAACU,OAAO;IAEvE,IAAI,CAACD,qBAAqB,EAAE;MACxB,OAAO,EAAE;IACb;IAEA,OAAOA,qBAAqB;EAChC,CAAC,CAAC;EAEF,MAAME,qBAAqB,GAAGX,MAAM,CAACY,gBAAgB,EAAEN,OAAO,CAACO,eAAe,IAAI;IAC9E,MAAM;MAAEb,MAAM;MAAE,GAAGc;IAAW,CAAC,GAAGD,eAAe;IAEjD,IAAIV,MAAM,CAACC,OAAO,CAACU,UAAU,CAAC,CAACC,IAAI,CAAC,CAAC,CAACR,OAAO,EAAET,KAAK,CAAC,KAAKkB,MAAM,CAACf,gBAAgB,CAACM,OAAO,CAAC,CAAC,KAAKS,MAAM,CAAClB,KAAK,CAAC,CAAC,EAAE;MAC5G,OAAO,EAAE;IACb;IAEA,OAAOE,MAAM;EACjB,CAAC,CAAC,IAAI,EAAE;EAER,OAAOL,gBAAgB,CAAC,GAAGO,aAAa,EAAE,GAAGS,qBAAqB,CAAC;AACvE,CAAC","ignoreList":[]}

package/lib/typescript/src/components/index.d.ts

@@ -1,5 +1,4 @@
 export { Hide } from './Hide';
 export { Display } from './Display';
-export { Variants } from './Variants';
 export { ScopedTheme } from './ScopedTheme';
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA"}

package/lib/typescript/src/components/native/ActivityIndicator.d.ts

@@ -1,2 +1,4 @@
-export declare const ActivityIndicator: import("react").ForwardRefExoticComponent<import("react").RefAttributes<unknown>>;
+export declare const ActivityIndicator: import("react").ForwardRefExoticComponent<{
+    style?: import("../../types").UnistylesValues | Array<import("../../types").UnistylesValues>;
+} & import("react").RefAttributes<unknown>>;
 //# sourceMappingURL=ActivityIndicator.d.ts.map