@niibase/uniwind 1.7.0 → 1.8.0

package/dist/common/core/native/store.js

@@ -7,7 +7,6 @@ exports.UniwindStore = void 0;
 var _reactNative = require("react-native");
 var _consts = require("../../common/consts");
 var _listener = require("../listener");
-var _nativeUtils = require("./native-utils");
 var _parsers = require("./parsers");
 var _runtime = require("./runtime");
 const emptyState = {
@@ -51,18 +50,18 @@ class UniwindStoreBuilder {
     const commonPlatformVars = scopedVars[`${_consts.UNIWIND_PLATFORM_VARIABLES}${commonPlatform}`];
     const platformVars = scopedVars[`${_consts.UNIWIND_PLATFORM_VARIABLES}${platform}`];
     if (commonPlatformVars) {
-      Object.defineProperties(vars, Object.getOwnPropertyDescriptors(commonPlatformVars));
+      Object.assign(vars, commonPlatformVars);
     }
     if (platformVars) {
-      Object.defineProperties(vars, Object.getOwnPropertyDescriptors(platformVars));
+      Object.assign(vars, platformVars);
     }
     this.keyframes = keyframes;
     this.stylesheet = stylesheet;
     this.vars = Object.fromEntries(themes.map(theme => {
-      const clonedVars = (0, _nativeUtils.cloneWithAccessors)(vars);
+      const clonedVars = Object.create(vars);
       const themeVars = scopedVars[`${_consts.UNIWIND_THEME_VARIABLES}${theme}`];
       if (themeVars) {
-        Object.defineProperties(clonedVars, Object.getOwnPropertyDescriptors(themeVars));
+        Object.assign(clonedVars, themeVars);
       }
       return [theme, clonedVars];
     }));
@@ -72,7 +71,7 @@ class UniwindStoreBuilder {
     }
   };
   resolveStyles(classNames, componentProps, state, uniwindContext) {
-    const result = {};
+    const resultGetters = {};
     const theme = uniwindContext.scopedTheme ?? this.runtime.currentThemeName;
     let vars = this.vars[theme];
     const originalVars = vars;
@@ -108,95 +107,50 @@ class UniwindStoreBuilder {
           }
           if (property[0] === "-") {
             if (vars === originalVars) {
-              vars = (0, _nativeUtils.cloneWithAccessors)(originalVars);
+              vars = Object.create(originalVars);
             }
-            Object.defineProperty(vars, property, {
-              configurable: true,
-              enumerable: true,
-              get: valueGetter
-            });
+            vars[property] = valueGetter;
           } else {
-            Object.defineProperty(result, property, {
-              configurable: true,
-              enumerable: true,
-              get: () => valueGetter.call(vars)
-            });
+            resultGetters[property] = valueGetter;
           }
           bestBreakpoints.set(property, style);
         }
       }
     }
+    const result = Object.fromEntries(Object.entries(resultGetters).map(([property, valueGetter]) => [property, valueGetter(vars)]));
     if (result.lineHeight !== void 0 && result.lineHeight < 6) {
-      Object.defineProperty(result, "lineHeight", {
-        value: result.fontSize * result.lineHeight,
-        configurable: true,
-        enumerable: true
-      });
+      result.lineHeight *= result.fontSize;
     }
     if (result.boxShadow !== void 0) {
-      Object.defineProperty(result, "boxShadow", {
-        value: (0, _parsers.parseBoxShadow)(result.boxShadow),
-        configurable: true,
-        enumerable: true
-      });
+      result.boxShadow = (0, _parsers.parseBoxShadow)(result.boxShadow);
     }
     if (result.visibility === "hidden") {
-      Object.defineProperty(result, "display", {
-        value: "none",
-        configurable: true,
-        enumerable: true
-      });
+      result.display = "none";
     }
     if (result.borderStyle !== void 0 && result.borderColor === void 0) {
-      Object.defineProperty(result, "borderColor", {
-        value: "#000000",
-        configurable: true,
-        enumerable: true
-      });
+      result.borderColor = "#000000";
     }
     if (result.outlineStyle !== void 0 && result.outlineColor === void 0) {
-      Object.defineProperty(result, "outlineColor", {
-        value: "#000000",
-        configurable: true,
-        enumerable: true
-      });
+      result.outlineColor = "#000000";
     }
     if (result.fontVariant !== void 0) {
-      Object.defineProperty(result, "fontVariant", {
-        value: (0, _parsers.parseFontVariant)(result.fontVariant),
-        configurable: true,
-        enumerable: true
-      });
+      result.fontVariant = (0, _parsers.parseFontVariant)(result.fontVariant);
     }
     (0, _parsers.parseTransformsMutation)(result);
     (0, _parsers.parseTransitionsMutation)(result);
     if (typeof result.animationName === "string") {
-      Object.defineProperty(result, "animationName", {
-        value: this.keyframes[result.animationName] ?? [],
-        configurable: true,
-        enumerable: true
-      });
+      result.animationName = this.keyframes[result.animationName] ?? [];
     } else if (Array.isArray(result.animationName)) {
-      Object.defineProperty(result, "animationName", {
-        value: result.animationName.map(animationName => this.keyframes[animationName] ?? void 0).filter(Boolean),
-        configurable: true,
-        enumerable: true
-      });
+      result.animationName = result.animationName.map(animationName => this.keyframes[animationName] ?? void 0).filter(Boolean);
     }
     if (result.experimental_backgroundImage !== void 0) {
-      Object.defineProperty(result, "experimental_backgroundImage", {
-        value: (0, _parsers.resolveGradient)(result.experimental_backgroundImage),
-        configurable: true,
-        enumerable: true
-      });
+      result.experimental_backgroundImage = (0, _parsers.resolveGradient)(result.experimental_backgroundImage);
     }
     if (result.textShadow !== void 0) {
       (0, _parsers.parseTextShadowMutation)(result);
     }
     return {
-      styles: {
-        ...result
-      },
+      styles: result,
       dependencies: Array.from(dependencies),
       dependencySum,
       hasDataAttributes

package/dist/common/hooks/useCSSVariable/getVariableValue.native.js

@@ -5,5 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getVariableValue = void 0;
 var _native = require("../../core/native");
-const getVariableValue = (name, uniwindContext) => _native.UniwindStore.vars[uniwindContext.scopedTheme ?? _native.UniwindRuntime.currentThemeName]?.[name];
+const getVariableValue = (name, uniwindContext) => {
+  const vars = _native.UniwindStore.vars[uniwindContext.scopedTheme ?? _native.UniwindRuntime.currentThemeName];
+  return vars?.[name]?.(vars);
+};
 exports.getVariableValue = getVariableValue;

package/dist/metro/index.cjs

@@ -1,10 +1,11 @@
 'use strict';
 
-const _package = require('../shared/uniwind.CFiAZ3D-.cjs');
+const config = require('../shared/uniwind.BEqYiPBB.cjs');
+const node_path = require('node:path');
+const _package = require('../shared/uniwind.DJ5M1Q4q.cjs');
 const FileStoreBase = require('metro-cache/private/stores/FileStore');
 const os = require('os');
 const path = require('path');
-const node_path = require('node:path');
 require('fs');
 require('@tailwindcss/node');
 require('lightningcss');
@@ -35,7 +36,7 @@ const patchMetroGraphToSupportUncachedModules = () => {
   original_traverseDependencies.__patched = true;
   function traverseDependencies(paths, options) {
     this.dependencies.forEach((dependency) => {
-      if (dependency.output.find((file) => file.data.css?.skipCache === true) && !paths.includes(dependency.path)) {
+      if (dependency.output.find((file) => file.data?.css?.skipCache === true) && !paths.includes(dependency.path)) {
         dependency.unstable_transformResultKey = `${dependency.unstable_transformResultKey}.`;
         paths.push(dependency.path);
       }
@@ -146,30 +147,45 @@ const webResolver = (extraComponents) => ({
   return resolver(context, `${_package.name}/components/${module}`, platform);
 };
 
-const withUniwindConfig = (config, uniwindConfig) => {
-  const bundlerConfig = _package.UniwindBundlerConfig.fromMetroConfig(uniwindConfig);
+const isUniwindRequest = (moduleName) => moduleName === _package.name || moduleName.startsWith(`${_package.name}/`);
+const withUniwindConfig = (config$1, uniwindConfig) => {
+  const bundlerConfig = config.UniwindBundlerConfig.fromMetroConfig(uniwindConfig);
+  const pinnedUniwindOrigin = node_path.join(config$1.projectRoot ?? process.cwd(), "package.json");
   patchMetroGraphToSupportUncachedModules();
   return {
-    ...config,
+    ...config$1,
     cacheStores: [cacheStore],
     transformerPath: require.resolve("./transformer.cjs"),
     transformer: {
-      ...config.transformer,
+      ...config$1.transformer,
       uniwind: bundlerConfig.toMetroConfig()
     },
     resolver: {
-      ...config.resolver,
+      ...config$1.resolver,
       sourceExts: [
-        ...config.resolver?.sourceExts ?? [],
+        ...config$1.resolver?.sourceExts ?? [],
         "css"
       ],
-      assetExts: config.resolver?.assetExts?.filter(
+      assetExts: config$1.resolver?.assetExts?.filter(
         (ext) => ext !== "css"
       ),
       resolveRequest: (context, moduleName, platform) => {
-        const resolver = config.resolver?.resolveRequest ?? context.resolveRequest;
-        const platformResolver = (platform === _package.Platform.Web ? webResolver : nativeResolver)(uniwindConfig.extraComponents ?? {});
-        const resolved = platformResolver({
+        const baseResolver = config$1.resolver?.resolveRequest ?? context.resolveRequest;
+        const resolver = (nextContext, nextModuleName, nextPlatform) => {
+          if (isUniwindRequest(nextModuleName)) {
+            return baseResolver(
+              {
+                ...nextContext,
+                originModulePath: pinnedUniwindOrigin
+              },
+              nextModuleName,
+              nextPlatform
+            );
+          }
+          return baseResolver(nextContext, nextModuleName, nextPlatform);
+        };
+        const platformResolver = platform === config.Platform.Web ? webResolver : nativeResolver;
+        const resolved = platformResolver(uniwindConfig.extraComponents ?? {})({
           context,
           moduleName,
           platform,

package/dist/metro/index.mjs

@@ -1,8 +1,9 @@
-import { n as name, U as UniwindBundlerConfig, P as Platform } from '../shared/uniwind.u-s1XVU8.mjs';
+import { U as UniwindBundlerConfig, P as Platform } from '../shared/uniwind.DgC4MT51.mjs';
+import { dirname, sep, basename, join } from 'node:path';
+import { n as name } from '../shared/uniwind.CFAAUZ2t.mjs';
 import FileStoreBase from 'metro-cache/private/stores/FileStore';
 import os from 'os';
 import path from 'path';
-import { dirname, sep, basename } from 'node:path';
 import 'fs';
 import '@tailwindcss/node';
 import 'lightningcss';
@@ -27,7 +28,7 @@ const patchMetroGraphToSupportUncachedModules = () => {
   original_traverseDependencies.__patched = true;
   function traverseDependencies(paths, options) {
     this.dependencies.forEach((dependency) => {
-      if (dependency.output.find((file) => file.data.css?.skipCache === true) && !paths.includes(dependency.path)) {
+      if (dependency.output.find((file) => file.data?.css?.skipCache === true) && !paths.includes(dependency.path)) {
         dependency.unstable_transformResultKey = `${dependency.unstable_transformResultKey}.`;
         paths.push(dependency.path);
       }
@@ -138,8 +139,10 @@ const webResolver = (extraComponents) => ({
   return resolver(context, `${name}/components/${module}`, platform);
 };
 
+const isUniwindRequest = (moduleName) => moduleName === name || moduleName.startsWith(`${name}/`);
 const withUniwindConfig = (config, uniwindConfig) => {
   const bundlerConfig = UniwindBundlerConfig.fromMetroConfig(uniwindConfig);
+  const pinnedUniwindOrigin = join(config.projectRoot ?? process.cwd(), "package.json");
   patchMetroGraphToSupportUncachedModules();
   return {
     ...config,
@@ -159,9 +162,22 @@ const withUniwindConfig = (config, uniwindConfig) => {
         (ext) => ext !== "css"
       ),
       resolveRequest: (context, moduleName, platform) => {
-        const resolver = config.resolver?.resolveRequest ?? context.resolveRequest;
-        const platformResolver = (platform === Platform.Web ? webResolver : nativeResolver)(uniwindConfig.extraComponents ?? {});
-        const resolved = platformResolver({
+        const baseResolver = config.resolver?.resolveRequest ?? context.resolveRequest;
+        const resolver = (nextContext, nextModuleName, nextPlatform) => {
+          if (isUniwindRequest(nextModuleName)) {
+            return baseResolver(
+              {
+                ...nextContext,
+                originModulePath: pinnedUniwindOrigin
+              },
+              nextModuleName,
+              nextPlatform
+            );
+          }
+          return baseResolver(nextContext, nextModuleName, nextPlatform);
+        };
+        const platformResolver = platform === Platform.Web ? webResolver : nativeResolver;
+        const resolved = platformResolver(uniwindConfig.extraComponents ?? {})({
           context,
           moduleName,
           platform,