react-native-unistyles 3.0.0-alpha.21 → 3.0.0-alpha.22

package/lib/commonjs/web/shadowRegistry.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UnistylesShadowRegistry = void 0;
-var _listener = require("./listener");
 var _registry = require("./registry");
 var _utils = require("./utils");
 var _variants2 = require("./variants");
@@ -17,9 +16,8 @@ class UnistylesShadowRegistryBuilder {
   dispose = () => {};
   // END MOCKS
 
-  webUnistylesMap = (0, _utils.createDoubleMap)();
-  disposeMap = (0, _utils.createDoubleMap)();
-  stylesMap = (0, _utils.createDoubleMap)();
+  resultsMap = (0, _utils.createDoubleMap)();
+  classNamesMap = (0, _utils.createDoubleMap)();
   add = (ref, _style, _variants, _args) => {
     // Style is not provided
     if (!_style) {
@@ -41,13 +39,19 @@ class UnistylesShadowRegistryBuilder {
     if (ref === null) {
       const secrets = (0, _utils.extractSecrets)(_style);
       secrets.forEach(({
-        __uni__refs
+        __uni__refs,
+        __uni__key
       }) => {
         __uni__refs.forEach(ref => {
           if ((0, _utils.isInDocument)(ref)) {
             return;
           }
-          this.remove(ref, _style);
+          const oldResult = this.resultsMap.get(ref, __uni__key);
+          this.resultsMap.delete(ref, __uni__key);
+          this.classNamesMap.delete(ref, __uni__key);
+          if (oldResult) {
+            _registry.UnistylesRegistry.remove(oldResult);
+          }
         });
       });
       return;
@@ -61,63 +65,61 @@ class UnistylesShadowRegistryBuilder {
       const {
         __uni__key,
         __uni__stylesheet,
-        __uni__refs,
         __uni__variants,
-        __uni__args = []
+        __uni__args = [],
+        __uni__refs
       } = secret;
       const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
       const style = newComputedStylesheet[__uni__key];
       const args = _args ?? __uni__args;
-      const resultHidden = typeof style === 'function' ? style(...args) : style;
-      const result = (0, _utils.extractHiddenProperties)(resultHidden);
+      const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
+      const result = typeof style === 'function' ? style(...args) : style;
       const {
-        variants
+        variantsResult
       } = Object.fromEntries((0, _variants2.getVariants)({
-        variants: result
-      }, _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants));
+        variantsResult: result
+      }, variants));
       const resultWithVariants = {
         ...result,
-        ...variants
+        ...variantsResult
       };
-      const storedWebUnistyle = this.webUnistylesMap.get(ref, __uni__key);
-      const webUnistyle = storedWebUnistyle ?? _registry.UnistylesRegistry.createStyles(resultWithVariants, __uni__key);
-      this.webUnistylesMap.set(ref, __uni__key, webUnistyle);
-      this.disposeMap.get(ref, __uni__key)?.();
-      this.disposeMap.set(ref, __uni__key, (0, _listener.listenToDependencies)({
+      const oldResult = this.resultsMap.get(ref, __uni__key);
+
+      // If results are the same do nothing
+      if ((0, _utils.equal)(oldResult, resultWithVariants)) {
+        return;
+      }
+      const oldClassNames = this.classNamesMap.get(ref, __uni__key);
+
+      // Remove old styles
+      if (oldResult) {
+        _registry.UnistylesRegistry.remove(oldResult);
+      }
+
+      // Remove old classnames from the ref
+      oldClassNames?.forEach(className => ref.classList.remove(className));
+      this.resultsMap.set(ref, __uni__key, resultWithVariants);
+      const className = _registry.UnistylesRegistry.add({
         key: __uni__key,
-        stylesheet: __uni__stylesheet,
         args,
-        className: webUnistyle.className,
-        unistyles: webUnistyle.unistyles
-      }));
-      if (!storedWebUnistyle) {
-        const styleTag = document.createElement('style');
-        const additionalClasses = resultWithVariants?._web?._classNames;
-        if (additionalClasses) {
-          ref.classList.add(...(Array.isArray(additionalClasses) ? additionalClasses : [additionalClasses]));
-        }
-        ref.classList.add(webUnistyle.className);
-        webUnistyle.unistyles.setStylesTarget(styleTag);
-        document.head.appendChild(styleTag);
-        __uni__refs.add(ref);
-        this.stylesMap.set(ref, __uni__key, styleTag);
-      }
-      if (storedWebUnistyle) {
-        _registry.UnistylesRegistry.updateStyles(webUnistyle.unistyles, resultWithVariants, webUnistyle.className);
+        stylesheet: __uni__stylesheet,
+        value: resultWithVariants,
+        variants
+      });
+      const injectedClassNames = resultWithVariants?._web?._classNames ?? [];
+      const newClassNames = injectedClassNames.concat(className);
+      const dependencies = (0, _utils.extractUnistyleDependencies)(resultWithVariants);
+      if (typeof __uni__stylesheet === 'function') {
+        // Add dependencies from dynamic styles to stylesheet
+        _registry.UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
       }
+      __uni__refs.add(ref);
+      this.classNamesMap.set(ref, __uni__key, newClassNames);
+      // Add new classnames to the ref
+      ref.classList.add(...newClassNames);
     });
   };
-  remove = (ref, style) => {
-    (0, _utils.extractSecrets)(style).forEach(({
-      __uni__key
-    }) => {
-      this.webUnistylesMap.delete(ref, __uni__key);
-      this.disposeMap.get(ref, __uni__key)?.();
-      this.disposeMap.delete(ref, __uni__key);
-      this.stylesMap.get(ref, __uni__key)?.remove();
-      this.stylesMap.delete(ref, __uni__key);
-    });
-  };
+  remove = () => {};
 }
 const UnistylesShadowRegistry = exports.UnistylesShadowRegistry = new UnistylesShadowRegistryBuilder();
 //# sourceMappingURL=shadowRegistry.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_listener","require","_registry","_utils","_variants2","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","webUnistylesMap","createDoubleMap","disposeMap","stylesMap","add","ref","_style","_variants","_args","Array","isArray","forEach","style","Object","keys","some","key","startsWith","secrets","extractSecrets","__uni__refs","isInDocument","remove","HTMLElement","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","UnistylesRegistry","getComputedStylesheet","args","resultHidden","result","extractHiddenProperties","variants","fromEntries","getVariants","length","resultWithVariants","storedWebUnistyle","get","webUnistyle","createStyles","set","listenToDependencies","stylesheet","className","unistyles","styleTag","document","createElement","additionalClasses","_web","_classNames","classList","setStylesTarget","head","appendChild","updateStyles","delete","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_registry","require","_utils","_variants2","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","resultsMap","createDoubleMap","classNamesMap","add","ref","_style","_variants","_args","Array","isArray","forEach","style","Object","keys","some","key","startsWith","secrets","extractSecrets","__uni__refs","__uni__key","isInDocument","oldResult","get","delete","UnistylesRegistry","remove","HTMLElement","secret","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","args","variants","length","result","variantsResult","fromEntries","getVariants","resultWithVariants","equal","oldClassNames","className","classList","set","stylesheet","value","injectedClassNames","_web","_classNames","newClassNames","concat","dependencies","extractUnistyleDependencies","addDependenciesToStylesheet","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/web/state.js

@@ -9,14 +9,18 @@ var _utils = require("./utils");
 var _listener = require("./listener");
 var _NativePlatform = require("../specs/NativePlatform");
 class UnistylesStateBuilder {
-  isSSR = (0, _utils.isServer)();
   themes = new Map();
+  matchingBreakpoints = new Map();
+  get breakpoint() {
+    const [currentBreakpoint] = Array.from(this.matchingBreakpoints).reverse().find(([_key, value]) => value) ?? [];
+    return currentBreakpoint;
+  }
   hasAdaptiveThemes = false;
   init = config => {
     this.initThemes(config.themes);
     this.initBreakpoints(config.breakpoints);
     this.initSettings(config.settings);
-    if (this.isSSR) {
+    if ((0, _utils.isServer)()) {
       return;
     }
     _listener.UnistylesListener.initListeners();
@@ -51,27 +55,15 @@ class UnistylesStateBuilder {
     this.themeName = typeof settings.initialTheme === 'function' ? settings.initialTheme() : settings.initialTheme;
   };
   initBreakpoints = (breakpoints = {}) => {
-    const breakpointsMap = new Map();
     this.breakpoints = breakpoints;
     Object.entries(breakpoints).sort(([, a], [, b]) => a - b).forEach(([breakpoint, value]) => {
       if ((0, _utils.isServer)()) {
         return;
       }
       const mediaQuery = window.matchMedia(`(min-width: ${value}px)`);
-      breakpointsMap.set(breakpoint, mediaQuery);
-      if (mediaQuery.matches) {
-        this.breakpoint = breakpoint;
-      }
+      this.matchingBreakpoints.set(breakpoint, mediaQuery.matches);
       mediaQuery.addEventListener('change', event => {
-        if (!event.matches) {
-          const [currentBreakpoint] = Array.from(breakpointsMap).find(([, mq]) => mq.matches) ?? [];
-          if (currentBreakpoint) {
-            this.breakpoint = currentBreakpoint;
-            _listener.UnistylesListener.emitChange(_NativePlatform.UnistyleDependency.Breakpoints);
-          }
-          return;
-        }
-        this.breakpoint = breakpoint;
+        this.matchingBreakpoints.set(breakpoint, event.matches);
         _listener.UnistylesListener.emitChange(_NativePlatform.UnistyleDependency.Breakpoints);
       });
     });

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

@@ -1 +1 @@
-{"version":3,"names":["_runtime","require","_utils","_listener","_NativePlatform","UnistylesStateBuilder","isSSR","isServer","themes","Map","hasAdaptiveThemes","init","config","initThemes","initBreakpoints","breakpoints","initSettings","settings","UnistylesListener","initListeners","Object","entries","forEach","themeName","theme","set","adaptiveThemes","themeNames","Array","from","keys","initialTheme","length","Error","schemeToTheme","UnistylesRuntime","colorScheme","breakpointsMap","sort","a","b","breakpoint","value","mediaQuery","window","matchMedia","matches","addEventListener","event","currentBreakpoint","find","mq","emitChange","UnistyleDependency","Breakpoints","UnistylesState","exports"],"sourceRoot":"../../../src","sources":["web/state.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_runtime","require","_utils","_listener","_NativePlatform","UnistylesStateBuilder","themes","Map","matchingBreakpoints","breakpoint","currentBreakpoint","Array","from","reverse","find","_key","value","hasAdaptiveThemes","init","config","initThemes","initBreakpoints","breakpoints","initSettings","settings","isServer","UnistylesListener","initListeners","Object","entries","forEach","themeName","theme","set","adaptiveThemes","themeNames","keys","initialTheme","length","Error","schemeToTheme","UnistylesRuntime","colorScheme","sort","a","b","mediaQuery","window","matchMedia","matches","addEventListener","event","emitChange","UnistyleDependency","Breakpoints","UnistylesState","exports"],"sourceRoot":"../../../src","sources":["web/state.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/web/{utils.js → utils/common.js}

@@ -3,24 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.warn = exports.schemeToTheme = exports.reduceObject = exports.keyInObject = exports.isServer = exports.isInDocument = exports.hexToRGBA = exports.getStyles = exports.extractSecrets = exports.extractHiddenProperties = exports.equal = exports.deepMergeObjects = exports.createDoubleMap = exports.assignSecrets = void 0;
-var _types = require("../specs/types");
+exports.warn = exports.reduceObject = exports.keyInObject = exports.isServer = exports.generateHash = exports.equal = exports.deepMergeObjects = exports.createDoubleMap = void 0;
 const reduceObject = (obj, reducer) => Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, reducer(value, key)]));
 exports.reduceObject = reduceObject;
 const keyInObject = (obj, key) => key in obj;
 exports.keyInObject = keyInObject;
-const schemeToTheme = scheme => {
-  switch (scheme) {
-    case _types.ColorScheme.Dark:
-      return 'dark';
-    case _types.ColorScheme.Light:
-    default:
-      return 'light';
-  }
-};
-exports.schemeToTheme = schemeToTheme;
-const hexToRGBA = (hex, opacity) => hex.replace('#', '').split(/(?=(?:..)*$)/).map(x => parseInt(x, 16)).filter(num => !isNaN(num)).reduce((acc, color) => `${acc}${color},`, 'rgba(').concat(`${opacity})`);
-exports.hexToRGBA = hexToRGBA;
 const isServer = () => typeof window === 'undefined';
 
 /**
@@ -62,32 +49,14 @@ const equal = (a, b) => {
   return keysA.every(key => Object.is(a[key], b[key]) && Object.prototype.hasOwnProperty.call(b, key));
 };
 exports.equal = equal;
-const assignSecrets = (object, secrets) => {
-  // @ts-expect-error - assign secrets to object
-  object[`__uni__secrets__${Math.random().toString(16).slice(2)}`] = secrets;
-  return object;
-};
-exports.assignSecrets = assignSecrets;
-const extractSecrets = object => {
-  const secrets = Object.entries(object).reduce((acc, [key, value]) => {
-    if (key.startsWith('__uni__secrets__')) {
-      acc.push(value);
-    }
-    return acc;
-  }, []);
-  return secrets;
-};
-exports.extractSecrets = extractSecrets;
-const getStyles = values => {
-  const returnValue = {};
-  Object.defineProperties(returnValue, reduceObject(values, value => ({
-    value,
-    enumerable: false,
-    configurable: true
-  })));
-  return returnValue;
+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)}`;
 };
-exports.getStyles = getStyles;
+exports.generateHash = generateHash;
 const createDoubleMap = () => {
   const map = new Map();
   return {
@@ -120,11 +89,4 @@ const createDoubleMap = () => {
   };
 };
 exports.createDoubleMap = createDoubleMap;
-const extractHiddenProperties = object => {
-  const hiddenProperties = Object.getOwnPropertyNames(object);
-  return Object.fromEntries(hiddenProperties.filter(key => !key.startsWith('__uni__')).map(key => [key, object[key]]));
-};
-exports.extractHiddenProperties = extractHiddenProperties;
-const isInDocument = element => document.body.contains(element);
-exports.isInDocument = isInDocument;
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=common.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["reduceObject","obj","reducer","Object","fromEntries","entries","map","key","value","exports","keyInObject","isServer","window","deepMergeObjects","sources","target","forEach","source","keys","sourceValue","targetValue","warn","message","console","equal","a","b","is","keysA","length","every","prototype","hasOwnProperty","call","generateHash","str","JSON","stringify","hasher","charCodeAt","toString","createDoubleMap","Map","get","secondKey","mapForKey","undefined","set","delete","callback"],"sourceRoot":"../../../../src","sources":["web/utils/common.ts"],"mappings":";;;;;;AAAO,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;AAAAE,OAAA,CAAAT,YAAA,GAAAA,YAAA;AAE9I,MAAMU,WAAW,GAAGA,CAAgCT,GAAM,EAAEM,GAAgB,KAAqBA,GAAG,IAAIN,GAAG;AAAAQ,OAAA,CAAAC,WAAA,GAAAA,WAAA;AAE3G,MAAMC,QAAQ,GAAGA,CAAA,KAAM,OAAOC,MAAM,KAAK,WAAW;;AAE3D;AACA;AACA;AAFAH,OAAA,CAAAE,QAAA,GAAAA,QAAA;AAGO,MAAME,gBAAgB,GAAGA,CAAqC,GAAGC,OAAiB,KAAK;EAC1F,MAAMC,MAAM,GAAG,CAAC,CAAM;EAEtBD,OAAO,CAACE,OAAO,CAACC,MAAM,IAAI;IACtBd,MAAM,CAACe,IAAI,CAACD,MAAM,CAAC,CAACD,OAAO,CAACT,GAAG,IAAI;MAC/B,MAAMY,WAAW,GAAGF,MAAM,CAACV,GAAG,CAAC;MAC/B,MAAMa,WAAW,GAAGL,MAAM,CAACR,GAAG,CAAC;MAE/B,IAAIJ,MAAM,CAACgB,WAAW,CAAC,IAAIA,WAAW,IAAIhB,MAAM,CAACiB,WAAW,CAAC,KAAKA,WAAW,EAAE;QAC3E;QACAL,MAAM,CAACR,GAAG,CAAC,GAAGM,gBAAgB,CAACO,WAAW,EAAED,WAAW,CAAC;QAExD;MACJ;;MAEA;MACAJ,MAAM,CAACR,GAAG,CAAC,GAAGY,WAAW;IAC7B,CAAC,CAAC;EACN,CAAC,CAAC;EAEF,OAAOJ,MAAM;AACjB,CAAC;AAAAN,OAAA,CAAAI,gBAAA,GAAAA,gBAAA;AAEM,MAAMQ,IAAI,GAAIC,OAAe,IAAKC,OAAO,CAACF,IAAI,CAAC,+BAA+BC,OAAO,EAAE,CAAC;AAAAb,OAAA,CAAAY,IAAA,GAAAA,IAAA;AAExF,MAAMG,KAAK,GAAGA,CAAIC,CAAI,EAAEC,CAAI,KAAK;EACpC,IAAIvB,MAAM,CAACwB,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,GAAGzB,MAAM,CAACe,IAAI,CAACO,CAAC,CAAmB;EAE9C,IAAIG,KAAK,CAACC,MAAM,KAAK1B,MAAM,CAACe,IAAI,CAACQ,CAAC,CAAC,CAACG,MAAM,EAAE;IACxC,OAAO,KAAK;EAChB;EAEA,OAAOD,KAAK,CAACE,KAAK,CAACvB,GAAG,IAAIJ,MAAM,CAACwB,EAAE,CAACF,CAAC,CAAClB,GAAG,CAAC,EAAEmB,CAAC,CAACnB,GAAG,CAAC,CAAC,IAAIJ,MAAM,CAAC4B,SAAS,CAACC,cAAc,CAACC,IAAI,CAACP,CAAC,EAAEnB,GAAG,CAAC,CAAC;AACxG,CAAC;AAAAE,OAAA,CAAAe,KAAA,GAAAA,KAAA;AAEM,MAAMU,YAAY,GAAI1B,KAAU,IAAK;EACxC,MAAM2B,GAAG,GAAGC,IAAI,CAACC,SAAS,CAAC7B,KAAK,CAAC;EACjC,IAAI8B,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;AAAA/B,OAAA,CAAAyB,YAAA,GAAAA,YAAA;AAEM,MAAMO,eAAe,GAAGA,CAAA,KAAgC;EAC3D,MAAMnC,GAAG,GAAG,IAAIoC,GAAG,CAAgC,CAAC;EAEpD,OAAO;IACHC,GAAG,EAAEA,CAACpC,GAAS,EAAEqC,SAAqB,KAAK;MACvC,MAAMC,SAAS,GAAGvC,GAAG,CAACqC,GAAG,CAACpC,GAAG,CAAC;MAE9B,IAAI,CAACsC,SAAS,EAAE;QACZ,OAAOC,SAAS;MACpB;MAEA,OAAOD,SAAS,CAACF,GAAG,CAACC,SAAS,CAAC;IACnC,CAAC;IACDG,GAAG,EAAEA,CAACxC,GAAS,EAAEqC,SAAqB,EAAEpC,KAAa,KAAK;MACtD,MAAMqC,SAAS,GAAGvC,GAAG,CAACqC,GAAG,CAACpC,GAAG,CAAC,IAAI,IAAImC,GAAG,CAAqB,CAAC;MAE/DpC,GAAG,CAACyC,GAAG,CAACxC,GAAG,EAAEsC,SAAS,CAAC;MACvBA,SAAS,CAACE,GAAG,CAACH,SAAS,EAAEpC,KAAK,CAAC;IACnC,CAAC;IACDwC,MAAM,EAAEA,CAACzC,GAAS,EAAEqC,SAAqB,KAAK;MAC1C,MAAMC,SAAS,GAAGvC,GAAG,CAACqC,GAAG,CAACpC,GAAG,CAAC;MAE9B,IAAI,CAACsC,SAAS,EAAE;QACZ;MACJ;MAEAA,SAAS,CAACG,MAAM,CAACJ,SAAS,CAAC;IAC/B,CAAC;IACD5B,OAAO,EAAGiC,QAAmE,IAAK;MAC9E3C,GAAG,CAACU,OAAO,CAAC,CAAC6B,SAAS,EAAEtC,GAAG,KAAK;QAC5BsC,SAAS,CAAC7B,OAAO,CAAC,CAACR,KAAK,EAAEoC,SAAS,KAAK;UACpCK,QAAQ,CAAC1C,GAAG,EAAEqC,SAAS,EAAEpC,KAAK,CAAC;QACnC,CAAC,CAAC;MACN,CAAC,CAAC;IACN;EACJ,CAAC;AACL,CAAC;AAAAC,OAAA,CAAAgC,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/commonjs/web/utils/index.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _common = require("./common");
+Object.keys(_common).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _common[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _common[key];
+    }
+  });
+});
+var _unistyle = require("./unistyle");
+Object.keys(_unistyle).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _unistyle[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _unistyle[key];
+    }
+  });
+});
+//# sourceMappingURL=index.js.map

package/lib/commonjs/web/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_common","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_unistyle"],"sourceRoot":"../../../../src","sources":["web/utils/index.ts"],"mappings":";;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,OAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,OAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,OAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,SAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,SAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,SAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,SAAA,CAAAL,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}

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

@@ -0,0 +1,82 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.schemeToTheme = exports.isInDocument = exports.hexToRGBA = exports.getStyles = exports.getMediaQuery = exports.extractUnistyleDependencies = exports.extractSecrets = exports.extractMediaQueryValue = exports.assignSecrets = void 0;
+var _types = require("../../specs/types");
+var _mq = require("../mq");
+var _state = require("../state");
+var _common = require("./common");
+const schemeToTheme = scheme => {
+  switch (scheme) {
+    case _types.ColorScheme.Dark:
+      return 'dark';
+    case _types.ColorScheme.Light:
+    default:
+      return 'light';
+  }
+};
+exports.schemeToTheme = schemeToTheme;
+const hexToRGBA = (hex, opacity) => hex.replace('#', '').split(/(?=(?:..)*$)/).map(x => parseInt(x, 16)).filter(num => !isNaN(num)).reduce((acc, color) => `${acc}${color},`, 'rgba(').concat(`${opacity})`);
+exports.hexToRGBA = hexToRGBA;
+const assignSecrets = (object, secrets) => {
+  // @ts-expect-error - assign secrets to object
+  object[`__uni__secrets__${Math.random().toString(16).slice(2)}`] = secrets;
+  return object;
+};
+exports.assignSecrets = assignSecrets;
+const extractSecrets = object => {
+  const secrets = Object.entries(object).reduce((acc, [key, value]) => {
+    if (key.startsWith('__uni__secrets__')) {
+      acc.push(value);
+    }
+    return acc;
+  }, []);
+  return secrets;
+};
+exports.extractSecrets = extractSecrets;
+const getStyles = values => {
+  const returnValue = {};
+  Object.defineProperties(returnValue, (0, _common.reduceObject)(values, value => ({
+    value,
+    enumerable: false,
+    configurable: true
+  })));
+  return returnValue;
+};
+exports.getStyles = getStyles;
+const isInDocument = element => document.body.contains(element);
+exports.isInDocument = isInDocument;
+const extractMediaQueryValue = query => {
+  const [_, px] = query.match(/(\d+)px/) ?? [];
+  if (!px) {
+    return undefined;
+  }
+  const value = Number(px);
+  return isNaN(value) ? undefined : value;
+};
+exports.extractMediaQueryValue = extractMediaQueryValue;
+const getMediaQuery = query => {
+  if (Object.values(_types.Orientation).includes(query)) {
+    return `(orientation: ${query})`;
+  }
+  if ((0, _mq.isUnistylesMq)(query)) {
+    const {
+      minWidth,
+      maxWidth,
+      minHeight,
+      maxHeight
+    } = (0, _mq.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 minWidth = _state.UnistylesState.breakpoints && (0, _common.keyInObject)(_state.UnistylesState.breakpoints, query) ? _state.UnistylesState.breakpoints[query] : undefined;
+  return `(min-width: ${minWidth ?? 0}px)`;
+};
+exports.getMediaQuery = getMediaQuery;
+const extractUnistyleDependencies = value => {
+  const dependencies = (0, _common.keyInObject)(value, 'uni__dependencies') ? value.uni__dependencies : [];
+  return dependencies;
+};
+exports.extractUnistyleDependencies = extractUnistyleDependencies;
+//# sourceMappingURL=unistyle.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_types","require","_mq","_state","_common","schemeToTheme","scheme","ColorScheme","Dark","Light","exports","hexToRGBA","hex","opacity","replace","split","map","x","parseInt","filter","num","isNaN","reduce","acc","color","concat","assignSecrets","object","secrets","Math","random","toString","slice","extractSecrets","Object","entries","key","value","startsWith","push","getStyles","values","returnValue","defineProperties","reduceObject","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","undefined","Number","getMediaQuery","Orientation","includes","isUnistylesMq","minWidth","maxWidth","minHeight","maxHeight","parseMq","Boolean","join","UnistylesState","breakpoints","keyInObject","extractUnistyleDependencies","dependencies","uni__dependencies"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/convert/boxShadow.js

@@ -1,9 +1,7 @@
 "use strict";
 
-import { media } from 'typestyle';
 import { deepMergeObjects, warn } from '../utils';
 import { validateShadow } from './shadow';
-import { convertBreakpoint } from './breakpoint';
 import { BOX_SHADOW_STYLES } from './types';
 import { extractShadowValue, normalizeColor, normalizeNumericValue } from './utils';
 const createBoxShadowValue = style => {
@@ -53,17 +51,19 @@ export const getBoxShadowStyle = styles => {
     } = extractShadowValue('shadowOffset', breakpoint, styles);
     const radius = extractShadowValue('shadowRadius', breakpoint, styles);
     const opacity = extractShadowValue('shadowOpacity', breakpoint, styles);
-    return media(convertBreakpoint(breakpoint), {
-      boxShadow: createBoxShadowValue({
-        shadowColor: color,
-        shadowOffset: {
-          width,
-          height
-        },
-        shadowRadius: radius,
-        shadowOpacity: opacity
-      })
-    });
+    return {
+      [breakpoint]: {
+        boxShadow: createBoxShadowValue({
+          shadowColor: color,
+          shadowOffset: {
+            width,
+            height
+          },
+          shadowRadius: radius,
+          shadowOpacity: opacity
+        })
+      }
+    };
   });
 
   // Merge all breakpoints styles into one

package/lib/module/web/convert/boxShadow.js.map

@@ -1 +1 @@
-{"version":3,"names":["media","deepMergeObjects","warn","validateShadow","convertBreakpoint","BOX_SHADOW_STYLES","extractShadowValue","normalizeColor","normalizeNumericValue","createBoxShadowValue","style","shadowColor","shadowOffset","shadowOpacity","shadowRadius","offsetX","width","offsetY","height","radius","color","getBoxShadowStyle","styles","missingStyles","filter","key","length","join","breakpointsSet","Set","error","breakpoints","Array","from","boxShadow","breakpointStyles","map","breakpoint","opacity"],"sourceRoot":"../../../../src","sources":["web/convert/boxShadow.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,WAAW;AAEjC,SAASC,gBAAgB,EAAEC,IAAI,QAAQ,UAAU;AACjD,SAASC,cAAc,QAAQ,UAAU;AACzC,SAASC,iBAAiB,QAAQ,cAAc;AAChD,SAASC,iBAAiB,QAAwB,SAAS;AAC3D,SAASC,kBAAkB,EAAEC,cAAc,EAAEC,qBAAqB,QAAQ,SAAS;AAEnF,MAAMC,oBAAoB,GAAIC,KAAgB,IAAK;EAC/C;EACA,MAAM;IAAEC,WAAW;IAAEC,YAAY;IAAEC,aAAa;IAAEC;EAAa,CAAC,GAAGJ,KAAK;EACxE,MAAMK,OAAO,GAAGP,qBAAqB,CAACI,YAAY,CAACI,KAAK,CAAC;EACzD,MAAMC,OAAO,GAAGT,qBAAqB,CAACI,YAAY,CAACM,MAAM,CAAC;EAC1D,MAAMC,MAAM,GAAGX,qBAAqB,CAACM,YAAY,CAAC;EAClD,MAAMM,KAAK,GAAGb,cAAc,CAACI,WAAW,EAAYE,aAAuB,CAAC;EAE5E,OAAO,GAAGE,OAAO,IAAIE,OAAO,IAAIE,MAAM,IAAIC,KAAK,EAAE;AACrD,CAAC;AAED,OAAO,MAAMC,iBAAiB,GAAIC,MAA2B,IAA0B;EACnF,MAAMC,aAAa,GAAGlB,iBAAiB,CAACmB,MAAM,CAACC,GAAG,IAAI,EAAEA,GAAG,IAAIH,MAAM,CAAC,CAAC;EAEvE,IAAIC,aAAa,CAACG,MAAM,EAAE;IACtBxB,IAAI,CAAC,wDAAwDqB,aAAa,CAACI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAExF,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,cAAc,GAAG,IAAIC,GAAG,CAAS,CAAC;EAExC,IAAI;IACA1B,cAAc,CAACE,iBAAiB,EAAEiB,MAAM,EAAEM,cAAc,CAAC;EAC7D,CAAC,CAAC,OAAOE,KAAK,EAAE;IACZ,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MAC3B5B,IAAI,CAAC4B,KAAK,CAAC;IACf;IAEA,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,WAAW,GAAGC,KAAK,CAACC,IAAI,CAACL,cAAc,CAAC;;EAE9C;EACA,IAAIG,WAAW,CAACL,MAAM,KAAK,CAAC,EAAE;IAC1B,OAAO;MACHQ,SAAS,EAAEzB,oBAAoB,CAACa,MAAmB;IACvD,CAAC;EACL;;EAEA;EACA,MAAMa,gBAAgB,GAAGJ,WAAW,CAACK,GAAG,CAACC,UAAU,IAAI;IACnD,MAAMjB,KAAK,GAAGd,kBAAkB,CAAC,aAAa,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IACnE,MAAM;MAAEN,KAAK;MAAEE;IAAO,CAAC,GAAGZ,kBAAkB,CAAC,cAAc,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IAChF,MAAMH,MAAM,GAAGb,kBAAkB,CAAC,cAAc,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IACrE,MAAMgB,OAAO,GAAGhC,kBAAkB,CAAC,eAAe,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IAEvE,OAAOtB,KAAK,CAACI,iBAAiB,CAACiC,UAAU,CAAC,EAAE;MACxCH,SAAS,EAAEzB,oBAAoB,CAAC;QAC5BE,WAAW,EAAES,KAAK;QAClBR,YAAY,EAAE;UACVI,KAAK;UACLE;QACJ,CAAC;QACDJ,YAAY,EAAEK,MAAM;QACpBN,aAAa,EAAEyB;MACnB,CAAC;IACL,CAAC,CAAC;EACN,CAAC,CAAC;;EAEF;EACA,OAAOrC,gBAAgB,CAAC,GAAGkC,gBAAgB,CAAC;AAChD,CAAC","ignoreList":[]}
+{"version":3,"names":["deepMergeObjects","warn","validateShadow","BOX_SHADOW_STYLES","extractShadowValue","normalizeColor","normalizeNumericValue","createBoxShadowValue","style","shadowColor","shadowOffset","shadowOpacity","shadowRadius","offsetX","width","offsetY","height","radius","color","getBoxShadowStyle","styles","missingStyles","filter","key","length","join","breakpointsSet","Set","error","breakpoints","Array","from","boxShadow","breakpointStyles","map","breakpoint","opacity"],"sourceRoot":"../../../../src","sources":["web/convert/boxShadow.ts"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,IAAI,QAAQ,UAAU;AACjD,SAASC,cAAc,QAAQ,UAAU;AACzC,SAASC,iBAAiB,QAAwB,SAAS;AAC3D,SAASC,kBAAkB,EAAEC,cAAc,EAAEC,qBAAqB,QAAQ,SAAS;AAEnF,MAAMC,oBAAoB,GAAIC,KAAgB,IAAK;EAC/C;EACA,MAAM;IAAEC,WAAW;IAAEC,YAAY;IAAEC,aAAa;IAAEC;EAAa,CAAC,GAAGJ,KAAK;EACxE,MAAMK,OAAO,GAAGP,qBAAqB,CAACI,YAAY,CAACI,KAAK,CAAC;EACzD,MAAMC,OAAO,GAAGT,qBAAqB,CAACI,YAAY,CAACM,MAAM,CAAC;EAC1D,MAAMC,MAAM,GAAGX,qBAAqB,CAACM,YAAY,CAAC;EAClD,MAAMM,KAAK,GAAGb,cAAc,CAACI,WAAW,EAAYE,aAAuB,CAAC;EAE5E,OAAO,GAAGE,OAAO,IAAIE,OAAO,IAAIE,MAAM,IAAIC,KAAK,EAAE;AACrD,CAAC;AAED,OAAO,MAAMC,iBAAiB,GAAIC,MAA2B,IAAK;EAC9D,MAAMC,aAAa,GAAGlB,iBAAiB,CAACmB,MAAM,CAACC,GAAG,IAAI,EAAEA,GAAG,IAAIH,MAAM,CAAC,CAAC;EAEvE,IAAIC,aAAa,CAACG,MAAM,EAAE;IACtBvB,IAAI,CAAC,wDAAwDoB,aAAa,CAACI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAExF,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,cAAc,GAAG,IAAIC,GAAG,CAAS,CAAC;EAExC,IAAI;IACAzB,cAAc,CAACC,iBAAiB,EAAEiB,MAAM,EAAEM,cAAc,CAAC;EAC7D,CAAC,CAAC,OAAOE,KAAK,EAAE;IACZ,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MAC3B3B,IAAI,CAAC2B,KAAK,CAAC;IACf;IAEA,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,WAAW,GAAGC,KAAK,CAACC,IAAI,CAACL,cAAc,CAAC;;EAE9C;EACA,IAAIG,WAAW,CAACL,MAAM,KAAK,CAAC,EAAE;IAC1B,OAAO;MACHQ,SAAS,EAAEzB,oBAAoB,CAACa,MAAmB;IACvD,CAAC;EACL;;EAEA;EACA,MAAMa,gBAAgB,GAAGJ,WAAW,CAACK,GAAG,CAACC,UAAU,IAAI;IACnD,MAAMjB,KAAK,GAAGd,kBAAkB,CAAC,aAAa,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IACnE,MAAM;MAAEN,KAAK;MAAEE;IAAO,CAAC,GAAGZ,kBAAkB,CAAC,cAAc,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IAChF,MAAMH,MAAM,GAAGb,kBAAkB,CAAC,cAAc,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IACrE,MAAMgB,OAAO,GAAGhC,kBAAkB,CAAC,eAAe,EAAE+B,UAAU,EAAEf,MAAM,CAAC;IAEvE,OAAO;MACH,CAACe,UAAU,GAAG;QACVH,SAAS,EAAEzB,oBAAoB,CAAC;UAC5BE,WAAW,EAAES,KAAK;UAClBR,YAAY,EAAE;YACVI,KAAK;YACLE;UACJ,CAAC;UACDJ,YAAY,EAAEK,MAAM;UACpBN,aAAa,EAAEyB;QACnB,CAAC;MACL;IACJ,CAAC;EACL,CAAC,CAAC;;EAEF;EACA,OAAOpC,gBAAgB,CAAC,GAAGiC,gBAAgB,CAAC;AAChD,CAAC","ignoreList":[]}

package/lib/module/web/convert/index.js

@@ -1,15 +1,13 @@
 "use strict";
 
-import { media } from 'typestyle';
-import { isPseudo } from '../pseudo';
-import { convertBreakpoint } from './breakpoint';
+import { isPseudo } from './pseudo';
 import { getStyle } from './style';
 import { deepMergeObjects } from '../utils';
 import { getTransformStyle } from './transform';
 import { isBoxShadow, isTextShadow, isTransform } from './utils';
 import { getTextShadowStyle } from './textShadow';
 import { getBoxShadowStyle } from './boxShadow';
-export const convertToTypeStyle = value => {
+export const convertUnistyles = value => {
   // Flag to mark if textShadow is already created
   let hasTextShadow = false;
   // Flag to mark if boxShadow is already created
@@ -25,11 +23,9 @@ export const convertToTypeStyle = value => {
 
     // Pseudo classes :hover, :before etc.
     if (isPseudo(unistylesKey)) {
-      const typestyleValues = convertToTypeStyle(unistylesValue);
+      const flattenValues = convertUnistyles(unistylesValue);
       return {
-        $nest: {
-          [unistylesKey.replace('_', '&:')]: typestyleValues
-        }
+        [unistylesKey]: flattenValues
       };
     }
 
@@ -59,7 +55,9 @@ export const convertToTypeStyle = value => {
     // Breakpoints
     if (typeof unistylesValue === 'object' && unistylesValue !== null) {
       return Object.entries(unistylesValue).map(([breakpointKey, breakpointValue]) => {
-        return media(convertBreakpoint(breakpointKey), getStyle(unistylesKey, breakpointValue));
+        return {
+          [breakpointKey]: getStyle(unistylesKey, breakpointValue)
+        };
       });
     }
 

package/lib/module/web/convert/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["media","isPseudo","convertBreakpoint","getStyle","deepMergeObjects","getTransformStyle","isBoxShadow","isTextShadow","isTransform","getTextShadowStyle","getBoxShadowStyle","convertToTypeStyle","value","hasTextShadow","hasBoxShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","typestyleValues","$nest","replace","map","breakpointKey","breakpointValue"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;AAEA,SAASA,KAAK,QAAQ,WAAW;AACjC,SAASC,QAAQ,QAAQ,WAAW;AACpC,SAASC,iBAAiB,QAAQ,cAAc;AAChD,SAASC,QAAQ,QAAQ,SAAS;AAClC,SAASC,gBAAgB,QAAQ,UAAU;AAC3C,SAASC,iBAAiB,QAAQ,aAAa;AAC/C,SAASC,WAAW,EAAEC,YAAY,EAAEC,WAAW,QAAQ,SAAS;AAChE,SAASC,kBAAkB,QAAQ,cAAc;AACjD,SAASC,iBAAiB,QAAQ,aAAa;AAE/C,OAAO,MAAMC,kBAAkB,GAAIC,KAAsB,IAAK;EAC1D;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,YAAY,GAAG,KAAK;EAExB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,uBAAuB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,UAAU,CAAC,EAAE;MACrK,OAAO,EAAE;IACb;;IAEA;IACA,IAAItB,QAAQ,CAACmB,YAAY,CAAC,EAAE;MACxB,MAAMI,eAAe,GAAGb,kBAAkB,CAACU,cAAiC,CAAC;MAE7E,OAAO;QACHI,KAAK,EAAE;UACH,CAACL,YAAY,CAACM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,GAAGF;QACvC;MACJ,CAAC;IACL;;IAEA;IACA,IAAIjB,YAAY,CAACa,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAOJ,kBAAkB,CAACG,KAAK,CAAC;IACpC;;IAEA;IACA,IAAIN,WAAW,CAACc,YAAY,CAAC,EAAE;MAC3B,IAAIN,YAAY,EAAE;QACd,OAAO,EAAE;MACb;MAEAA,YAAY,GAAG,IAAI;MAEnB,OAAOJ,iBAAiB,CAACE,KAAK,CAAC;IACnC;;IAEA;IACA,IAAIJ,WAAW,CAACY,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOhB,iBAAiB,CAACgB,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACM,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO7B,KAAK,CAACE,iBAAiB,CAAC0B,aAAa,CAAC,EAAEzB,QAAQ,CAACiB,YAAY,EAAES,eAAe,CAAC,CAAC;MAC3F,CAAC,CAAC;IACN;;IAEA;IACA,OAAO1B,QAAQ,CAACiB,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAOjB,gBAAgB,CAAC,GAAGW,WAAW,CAAC;AAC3C,CAAC","ignoreList":[]}
+{"version":3,"names":["isPseudo","getStyle","deepMergeObjects","getTransformStyle","isBoxShadow","isTextShadow","isTransform","getTextShadowStyle","getBoxShadowStyle","convertUnistyles","value","hasTextShadow","hasBoxShadow","stylesArray","Object","entries","_web","flatMap","unistylesKey","unistylesValue","includes","startsWith","flattenValues","map","breakpointKey","breakpointValue"],"sourceRoot":"../../../../src","sources":["web/convert/index.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,UAAU;AACnC,SAASC,QAAQ,QAAQ,SAAS;AAClC,SAASC,gBAAgB,QAAQ,UAAU;AAC3C,SAASC,iBAAiB,QAAQ,aAAa;AAC/C,SAASC,WAAW,EAAEC,YAAY,EAAEC,WAAW,QAAQ,SAAS;AAChE,SAASC,kBAAkB,QAAQ,cAAc;AACjD,SAASC,iBAAiB,QAAQ,aAAa;AAE/C,OAAO,MAAMC,gBAAgB,GAAIC,KAAsB,IAAK;EACxD;EACA,IAAIC,aAAa,GAAG,KAAK;EACzB;EACA,IAAIC,YAAY,GAAG,KAAK;EAExB,MAAMC,WAAW,GAAGC,MAAM,CAACC,OAAO,CAAC;IAC/B,GAAGL,KAAK;IACR,GAAGA,KAAK,CAACM;EACb,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,YAAY,EAAEC,cAAc,CAAC,KAAK;IAC3C;IACA,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,uBAAuB,CAAC,CAACC,QAAQ,CAACF,YAAY,CAAC,IAAIA,YAAY,CAACG,UAAU,CAAC,UAAU,CAAC,EAAE;MACrK,OAAO,EAAE;IACb;;IAEA;IACA,IAAIrB,QAAQ,CAACkB,YAAY,CAAC,EAAE;MACxB,MAAMI,aAAa,GAAGb,gBAAgB,CAACU,cAAiC,CAAC;MAEzE,OAAO;QAAE,CAACD,YAAY,GAAGI;MAAc,CAAC;IAC5C;;IAEA;IACA,IAAIjB,YAAY,CAACa,YAAY,CAAC,EAAE;MAC5B,IAAIP,aAAa,EAAE;QACf,OAAO,EAAE;MACb;MAEAA,aAAa,GAAG,IAAI;MAEpB,OAAOJ,kBAAkB,CAACG,KAAK,CAAC;IACpC;;IAEA;IACA,IAAIN,WAAW,CAACc,YAAY,CAAC,EAAE;MAC3B,IAAIN,YAAY,EAAE;QACd,OAAO,EAAE;MACb;MAEAA,YAAY,GAAG,IAAI;MAEnB,OAAOJ,iBAAiB,CAACE,KAAK,CAAC;IACnC;;IAEA;IACA,IAAIJ,WAAW,CAACY,YAAY,EAAEC,cAAc,CAAC,EAAE;MAC3C,OAAOhB,iBAAiB,CAACgB,cAAc,CAAC;IAC5C;;IAEA;IACA,IAAI,OAAOA,cAAc,KAAK,QAAQ,IAAIA,cAAc,KAAK,IAAI,EAAE;MAC/D,OAAOL,MAAM,CAACC,OAAO,CAACI,cAAc,CAAC,CAACI,GAAG,CAAC,CAAC,CAACC,aAAa,EAAEC,eAAe,CAAC,KAAK;QAC5E,OAAO;UAAE,CAACD,aAAa,GAAGvB,QAAQ,CAACiB,YAAY,EAAEO,eAAe;QAAE,CAAC;MACvE,CAAC,CAAC;IACN;;IAEA;IACA,OAAOxB,QAAQ,CAACiB,YAAY,EAAEC,cAAc,CAAC;EACjD,CAAC,CAA+B;EAEhC,OAAOjB,gBAAgB,CAAC,GAAGW,WAAW,CAAC;AAC3C,CAAC","ignoreList":[]}

package/lib/module/web/convert/pseudo.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["pseudos","isPseudo","selector","some","pseudo","startsWith"],"sourceRoot":"../../../../src","sources":["web/convert/pseudo.ts"],"mappings":";;AAAA,OAAO,MAAMA,OAAO,GAAG,CACnB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,iBAAiB,EACjB,eAAe,EACf,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,uBAAuB,EACvB,SAAS,EACT,WAAW,EACX,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,OAAO,EACP,WAAW,EACX,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,SAAS,EACT,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,MAAM,EACN,QAAQ,EACR,aAAa,EACb,eAAe,EACf,OAAO,EACP,OAAO,EACP,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,eAAe,EACf,WAAW,EACX,eAAe,EACf,OAAO,EACP,SAAS,EACT,qBAAqB,EACrB,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,YAAY,EACZ,aAAa,EACb,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,UAAU,EACV,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,4BAA4B,EAC5B,8BAA8B,EAC9B,qCAAqC,EACrC,8BAA8B,EAC9B,8BAA8B,EAC9B,iCAAiC,EACjC,uBAAuB,EACvB,iCAAiC,EACjC,yBAAyB,EACzB,oBAAoB,EACpB,+BAA+B,EAC/B,gCAAgC,EAChC,gCAAgC,EAChC,uBAAuB,EACvB,QAAQ,EACR,WAAW,EACX,SAAS,EACT,MAAM,EACN,uBAAuB,EACvB,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,SAAS,EACT,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,wBAAwB,EACxB,6BAA6B,EAC7B,sBAAsB,EACtB,sBAAsB,CAChB;AAEV,OAAO,MAAMC,QAAQ,GAAIC,QAAgB,IAAKF,OAAO,CAACG,IAAI,CAACC,MAAM,IAAIF,QAAQ,CAACG,UAAU,CAACD,MAAM,CAAC,CAAC","ignoreList":[]}