react-native-css 0.0.0-nightly.99fdf44 → 0.0.0-nightly.a5002c5

package/dist/commonjs/metro/index.js

@@ -4,17 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withReactNativeCSS = withReactNativeCSS;
-var _nodePath = require("node:path");
 var _nodeProcess = require("node:process");
-var _debug = _interopRequireDefault(require("debug"));
-var _index = require("../compiler/index.js");
-var _injectionCode = require("./injection-code.js");
+var _cacheVersion = require("./cache-version.js");
 var _resolver = require("./resolver.js");
 var _typescript = require("./typescript.js");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* eslint-disable */
 
-const defaultLogger = (0, _debug.default)("react-native-css:metro");
+const metroOverrideResolution = {
+  type: "sourceFile",
+  filePath: require.resolve("./override")
+};
 function withReactNativeCSS(config, options) {
   if (typeof config === "function") {
     return async () => {
@@ -27,16 +26,15 @@ function withReactNativeCSS(config, options) {
   const {
     disableTypeScriptGeneration,
     typescriptEnvPath,
-    globalClassNamePolyfill = false,
-    logger = defaultLogger
+    globalClassNamePolyfill = false
   } = options || {};
-  const loggerEnabled = "enabled" in logger ? logger.enabled : true;
   if (disableTypeScriptGeneration !== true) {
     (0, _typescript.setupTypeScript)(typescriptEnvPath);
   }
   return {
     ...config,
-    // transformerPath: require.resolve("./metro-transformer"),
+    cacheVersion: (0, _cacheVersion.getCacheVersion)(config.cacheVersion, options),
+    transformerPath: require.resolve("./metro-transformer"),
     transformer: {
       ...config.transformer,
       reactNativeCSS: options
@@ -45,10 +43,8 @@ function withReactNativeCSS(config, options) {
       ...config.resolver,
       sourceExts: [...(config?.resolver?.sourceExts || []), "css"],
       resolveRequest: (context, moduleName, platform) => {
-        if (moduleName.includes("poison.pill")) {
-          return {
-            type: "empty"
-          };
+        if (moduleName.includes("react-native-css-metro-override")) {
+          return metroOverrideResolution;
         }
         const parentResolver = config.resolver?.resolveRequest ?? context.resolveRequest;
 
@@ -60,110 +56,6 @@ function withReactNativeCSS(config, options) {
         const resolved = resolver(parentResolver, context, moduleName, platform);
         return resolved;
       }
-    },
-    server: {
-      ...config.server,
-      enhanceMiddleware(metroMiddleware, metroServer) {
-        const bundler = metroServer.getBundler().getBundler();
-        if (!bundler.__react_native_css__patched) {
-          bundler.__react_native_css__patched = true;
-          const nativeCSSFiles = new Map();
-          const webCSSFiles = new Set();
-          const nativeInjectionPath = require.resolve("../native/metro");
-          const nativeInjectionFilepaths = [
-          // CommonJS
-          nativeInjectionPath,
-          // ES Module
-          nativeInjectionPath.replace(`dist${_nodePath.sep}commonjs`, `dist${_nodePath.sep}module`),
-          // TypeScript
-          nativeInjectionPath.replace(`dist${_nodePath.sep}commonjs`, `src`).replace(".js", ".ts")];
-          const webInjectionPath = require.resolve("../web/metro");
-          const webInjectionFilepaths = [
-          // CommonJS
-          webInjectionPath,
-          // ES Module
-          webInjectionPath.replace(`dist${_nodePath.sep}commonjs`, `dist${_nodePath.sep}module`),
-          // TypeScript
-          webInjectionPath.replace(`dist${_nodePath.sep}commonjs`, `src`).replace(".js", ".ts")];
-
-          // Keep the original
-          const transformFile = bundler.transformFile.bind(bundler);
-          const watcher = bundler.getWatcher();
-
-          // Patch with our functionality
-          bundler.transformFile = async function (filePath, transformOptions, fileBuffer) {
-            const isCss = /\.(s?css|sass)$/.test(filePath);
-            if (transformOptions.platform === "web") {
-              if (isCss) {
-                webCSSFiles.add(filePath);
-              } else if (webInjectionFilepaths.includes(filePath)) {
-                fileBuffer = (0, _injectionCode.getWebInjectionCode)(Array.from(webCSSFiles));
-              }
-              return transformFile(filePath, transformOptions, fileBuffer);
-            } else {
-              // Handle CSS files on native platforms
-              if (isCss) {
-                const webTransform = await transformFile(filePath, {
-                  ...transformOptions,
-                  // Force the platform to web for CSS files
-                  platform: "web",
-                  // Let the transformer know that we will handle compilation
-                  customTransformOptions: {
-                    ...transformOptions.customTransformOptions,
-                    reactNativeCSS: options
-                  }
-                }, fileBuffer);
-                const lastTransform = nativeCSSFiles.get(filePath);
-                const last = lastTransform?.[0];
-                const next = webTransform.output[0].data.css.code.toString();
-
-                // The CSS file has changed, we need to recompile the injection file
-                if (next !== last) {
-                  nativeCSSFiles.set(filePath, [next, (0, _index.compile)(next, {
-                    hexColors: options?.hexColors
-                  }).stylesheet()]);
-                  watcher.emit("change", {
-                    eventsQueue: nativeInjectionFilepaths.map(filePath => ({
-                      filePath,
-                      metadata: {
-                        modifiedTime: Date.now(),
-                        size: 1,
-                        // Can be anything
-                        type: "virtual" // Can be anything
-                      },
-                      type: "change"
-                    }))
-                  });
-                }
-                const nativeTransform = await transformFile(filePath, transformOptions, fileBuffer);
-
-                // Tell Expo to skip caching this file
-                nativeTransform.output[0].data.css = {
-                  skipCache: true,
-                  // Expo requires a `code` property
-                  code: ""
-                };
-                return nativeTransform;
-              } else if (nativeInjectionFilepaths.includes(filePath)) {
-                // If this is the injection file, we to swap its content with the
-                // compiled CSS files
-                fileBuffer = (0, _injectionCode.getNativeInjectionCode)(Array.from(nativeCSSFiles.keys()).map(key => (0, _nodePath.relative)((0, _nodePath.dirname)(filePath), key)), Array.from(nativeCSSFiles.values()).map(([, value]) => value));
-                if (loggerEnabled && fileBuffer) {
-                  logger(`Transformed ${filePath}`);
-                  logger(fileBuffer?.toString());
-                }
-              }
-              return transformFile(filePath, transformOptions, fileBuffer);
-            }
-          };
-        }
-
-        /**
-         * We don't modify the middleware, we just use this function to get the metroServer
-         * So simply return the existing middleware
-         */
-        return config.server?.enhanceMiddleware?.(metroMiddleware, metroServer) ?? metroMiddleware;
-      }
     }
   };
 }

package/dist/commonjs/metro/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_nodePath","require","_nodeProcess","_debug","_interopRequireDefault","_index","_injectionCode","_resolver","_typescript","e","__esModule","default","defaultLogger","debug","withReactNativeCSS","config","options","Number","versions","node","split","Error","disableTypeScriptGeneration","typescriptEnvPath","globalClassNamePolyfill","logger","loggerEnabled","enabled","setupTypeScript","transformer","reactNativeCSS","resolver","sourceExts","resolveRequest","context","moduleName","platform","includes","type","parentResolver","webResolver","nativeResolver","resolved","server","enhanceMiddleware","metroMiddleware","metroServer","bundler","getBundler","__react_native_css__patched","nativeCSSFiles","Map","webCSSFiles","Set","nativeInjectionPath","resolve","nativeInjectionFilepaths","replace","sep","webInjectionPath","webInjectionFilepaths","transformFile","bind","watcher","getWatcher","filePath","transformOptions","fileBuffer","isCss","test","add","getWebInjectionCode","Array","from","webTransform","customTransformOptions","lastTransform","get","last","next","output","data","css","code","toString","set","compile","hexColors","stylesheet","emit","eventsQueue","map","metadata","modifiedTime","Date","now","size","nativeTransform","skipCache","getNativeInjectionCode","keys","key","relative","dirname","values","value"],"sourceRoot":"../../../src","sources":["metro/index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_nodeProcess","require","_cacheVersion","_resolver","_typescript","metroOverrideResolution","type","filePath","resolve","withReactNativeCSS","config","options","Number","versions","node","split","Error","disableTypeScriptGeneration","typescriptEnvPath","globalClassNamePolyfill","setupTypeScript","cacheVersion","getCacheVersion","transformerPath","transformer","reactNativeCSS","resolver","sourceExts","resolveRequest","context","moduleName","platform","includes","parentResolver","webResolver","nativeResolver","resolved"],"sourceRoot":"../../../src","sources":["metro/index.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAKA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AARA;;AAoBA,MAAMI,uBAAuB,GAAG;EAC9BC,IAAI,EAAE,YAAY;EAClBC,QAAQ,EAAEN,OAAO,CAACO,OAAO,CAAC,YAAY;AACxC,CAAC;AAEM,SAASC,kBAAkBA,CAEhCC,MAAS,EAAEC,OAAmC,EAAK;EACnD,IAAI,OAAOD,MAAM,KAAK,UAAU,EAAE;IAChC,OAAQ,YAAY;MAClB,OAAOD,kBAAkB,CAAC,MAAMC,MAAM,CAAC,CAAC,EAAEC,OAAO,CAAC;IACpD,CAAC;EACH;EAEA,IAAIC,MAAM,CAACC,qBAAQ,CAACC,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;IAC5C,MAAM,IAAIC,KAAK,CAAC,2CAA2C,CAAC;EAC9D;EAEA,MAAM;IACJC,2BAA2B;IAC3BC,iBAAiB;IACjBC,uBAAuB,GAAG;EAC5B,CAAC,GAAGR,OAAO,IAAI,CAAC,CAAC;EAEjB,IAAIM,2BAA2B,KAAK,IAAI,EAAE;IACxC,IAAAG,2BAAe,EAACF,iBAAiB,CAAC;EACpC;EAEA,OAAO;IACL,GAAGR,MAAM;IACTW,YAAY,EAAE,IAAAC,6BAAe,EAACZ,MAAM,CAACW,YAAY,EAAEV,OAAO,CAAC;IAC3DY,eAAe,EAAEtB,OAAO,CAACO,OAAO,CAAC,qBAAqB,CAAC;IACvDgB,WAAW,EAAE;MACX,GAAGd,MAAM,CAACc,WAAW;MACrBC,cAAc,EAAEd;IAClB,CAAC;IACDe,QAAQ,EAAE;MACR,GAAGhB,MAAM,CAACgB,QAAQ;MAClBC,UAAU,EAAE,CAAC,IAAIjB,MAAM,EAAEgB,QAAQ,EAAEC,UAAU,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC;MAC5DC,cAAc,EAAEA,CAACC,OAAO,EAAEC,UAAU,EAAEC,QAAQ,KAAK;QACjD,IAAID,UAAU,CAACE,QAAQ,CAAC,iCAAiC,CAAC,EAAE;UAC1D,OAAO3B,uBAAuB;QAChC;QAEA,MAAM4B,cAAc,GAClBvB,MAAM,CAACgB,QAAQ,EAAEE,cAAc,IAAIC,OAAO,CAACD,cAAc;;QAE3D;QACA,IAAI,CAACT,uBAAuB,EAAE;UAC5B,OAAOc,cAAc,CAACJ,OAAO,EAAEC,UAAU,EAAEC,QAAQ,CAAC;QACtD;QAEA,MAAML,QAAQ,GAAGK,QAAQ,KAAK,KAAK,GAAGG,qBAAW,GAAGC,wBAAc;QAClE,MAAMC,QAAQ,GAAGV,QAAQ,CACvBO,cAAc,EACdJ,OAAO,EACPC,UAAU,EACVC,QACF,CAAC;QAED,OAAOK,QAAQ;MACjB;IACF;EACF,CAAC;AACH","ignoreList":[]}

package/dist/commonjs/metro/metro-transformer.js

@@ -21,11 +21,18 @@ async function transform(config, projectRoot, filePath, data, options) {
   });
   const css = cssFile.output[0].data.css.code.toString();
   const productionJS = (0, _index.compile)(css, {
-    ...options.reactNativeCSS,
+    ...config.reactNativeCSS,
     filename: filePath,
     projectRoot: projectRoot
   }).stylesheet();
   data = Buffer.from((0, _injectionCode.getNativeInjectionCode)([], [productionJS]));
-  return worker.transform(config, projectRoot, `${filePath}.js`, data, options);
+  const transform = await worker.transform(config, projectRoot, `${filePath}.js`, data, options);
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
+  transform.output[0].data.css = {
+    skipCache: true,
+    code: ""
+  };
+  return transform;
 }
 //# sourceMappingURL=metro-transformer.js.map

package/dist/commonjs/metro/metro-transformer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_metroConfig","require","_index","_injectionCode","worker","unstable_transformerPath","transform","config","projectRoot","filePath","data","options","isCss","type","test","platform","cssFile","css","output","code","toString","productionJS","compile","reactNativeCSS","filename","stylesheet","Buffer","from","getNativeInjectionCode"],"sourceRoot":"../../../src","sources":["metro/metro-transformer.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAOA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAEA,MAAMG,MAAM;AACV;AACAH,OAAO,CAACI,qCAAwB,CAA4C;AAEvE,eAAeC,SAASA,CAC7BC,MAA2B,EAC3BC,WAAmB,EACnBC,QAAgB,EAChBC,IAAY,EACZC,OAEC,EAC2B;EAC5B,MAAMC,KAAK,GAAGD,OAAO,CAACE,IAAI,KAAK,OAAO,IAAI,iBAAiB,CAACC,IAAI,CAACL,QAAQ,CAAC;EAE1E,IAAIE,OAAO,CAACI,QAAQ,KAAK,KAAK,IAAI,CAACH,KAAK,EAAE;IACxC,OAAOR,MAAM,CAACE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,OAAO,CAAC;EACvE;EAEA,MAAMK,OAAO,GAAI,MAAMZ,MAAM,CAACE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,EAAEC,IAAI,EAAE;IAC3E,GAAGC,OAAO;IACVI,QAAQ,EAAE;EACZ,CAAC,CAEA;EAED,MAAME,GAAG,GAAGD,OAAO,CAACE,MAAM,CAAC,CAAC,CAAC,CAACR,IAAI,CAACO,GAAG,CAACE,IAAI,CAACC,QAAQ,CAAC,CAAC;EAEtD,MAAMC,YAAY,GAAG,IAAAC,cAAO,EAACL,GAAG,EAAE;IAChC,GAAGN,OAAO,CAACY,cAAc;IACzBC,QAAQ,EAAEf,QAAQ;IAClBD,WAAW,EAAEA;EACf,CAAC,CAAC,CAACiB,UAAU,CAAC,CAAC;EAEff,IAAI,GAAGgB,MAAM,CAACC,IAAI,CAAC,IAAAC,qCAAsB,EAAC,EAAE,EAAE,CAACP,YAAY,CAAC,CAAC,CAAC;EAE9D,OAAOjB,MAAM,CAACE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAE,GAAGC,QAAQ,KAAK,EAAEC,IAAI,EAAEC,OAAO,CAAC;AAC/E","ignoreList":[]}
+{"version":3,"names":["_metroConfig","require","_index","_injectionCode","worker","unstable_transformerPath","transform","config","projectRoot","filePath","data","options","isCss","type","test","platform","cssFile","css","output","code","toString","productionJS","compile","reactNativeCSS","filename","stylesheet","Buffer","from","getNativeInjectionCode","skipCache"],"sourceRoot":"../../../src","sources":["metro/metro-transformer.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAMA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAMA,MAAMG,MAAM;AACV;AACAH,OAAO,CAACI,qCAAwB,CAA4C;AAEvE,eAAeC,SAASA,CAC7BC,MAEC,EACDC,WAAmB,EACnBC,QAAgB,EAChBC,IAAY,EACZC,OAA2B,EACC;EAC5B,MAAMC,KAAK,GAAGD,OAAO,CAACE,IAAI,KAAK,OAAO,IAAI,iBAAiB,CAACC,IAAI,CAACL,QAAQ,CAAC;EAE1E,IAAIE,OAAO,CAACI,QAAQ,KAAK,KAAK,IAAI,CAACH,KAAK,EAAE;IACxC,OAAOR,MAAM,CAACE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,OAAO,CAAC;EACvE;EAEA,MAAMK,OAAO,GAAI,MAAMZ,MAAM,CAACE,SAAS,CAACC,MAAM,EAAEC,WAAW,EAAEC,QAAQ,EAAEC,IAAI,EAAE;IAC3E,GAAGC,OAAO;IACVI,QAAQ,EAAE;EACZ,CAAC,CAEA;EAED,MAAME,GAAG,GAAGD,OAAO,CAACE,MAAM,CAAC,CAAC,CAAC,CAACR,IAAI,CAACO,GAAG,CAACE,IAAI,CAACC,QAAQ,CAAC,CAAC;EAEtD,MAAMC,YAAY,GAAG,IAAAC,cAAO,EAACL,GAAG,EAAE;IAChC,GAAGV,MAAM,CAACgB,cAAc;IACxBC,QAAQ,EAAEf,QAAQ;IAClBD,WAAW,EAAEA;EACf,CAAC,CAAC,CAACiB,UAAU,CAAC,CAAC;EAEff,IAAI,GAAGgB,MAAM,CAACC,IAAI,CAAC,IAAAC,qCAAsB,EAAC,EAAE,EAAE,CAACP,YAAY,CAAC,CAAC,CAAC;EAE9D,MAAMf,SAAS,GAAG,MAAMF,MAAM,CAACE,SAAS,CACtCC,MAAM,EACNC,WAAW,EACX,GAAGC,QAAQ,KAAK,EAChBC,IAAI,EACJC,OACF,CAAC;;EAED;EACCL,SAAS,CAASY,MAAM,CAAC,CAAC,CAAC,CAACR,IAAI,CAACO,GAAG,GAAG;IACtCY,SAAS,EAAE,IAAI;IACfV,IAAI,EAAE;EACR,CAAC;EAED,OAAOb,SAAS;AAClB","ignoreList":[]}

package/dist/commonjs/{native/metro.js → metro/override.js}

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-//# sourceMappingURL=metro.js.map
+//# sourceMappingURL=override.js.map

package/dist/commonjs/{native/metro.js.map → metro/override.js.map}

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../src","sources":["native/metro.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["metro/override.ts"],"mappings":"","ignoreList":[]}

package/dist/commonjs/metro/resolver.js

@@ -14,32 +14,23 @@ function isFromThisModule(filename) {
 }
 function nativeResolver(resolver, context, moduleName, platform) {
   const resolution = resolver(context, moduleName, platform);
-  if (
-  // Don't include our internal files
-  isFromThisModule(context.originModulePath) ||
-  // Only operate on source files
-  resolution.type !== "sourceFile" ||
-  // Skip the React Native barrel file to prevent infinite recursion
-  context.originModulePath.endsWith("react-native/index.js") ||
-  // Skip anything that isn't importing a React Native component
-  !(moduleName.startsWith("react-native") || moduleName.startsWith("react-native/"))) {
+  const isInternal = isFromThisModule(context.originModulePath);
+  const isReactNativeIndex = context.originModulePath.endsWith(`${_nodePath.sep}react-native${_nodePath.sep}index.js`);
+  if (isInternal || resolution.type !== "sourceFile" || isReactNativeIndex) {
     return resolution;
   }
   if (moduleName === "react-native") {
     return resolver(context, `react-native-css/components`, platform);
-  }
-  if (moduleName === "react-native-safe-area-context") {
+  } else if (moduleName === "react-native-safe-area-context") {
     return resolver(context, `react-native-css/components/react-native-safe-area-context`, platform);
+  } else if (resolution.filePath.includes(`${_nodePath.sep}react-native${_nodePath.sep}Libraries${_nodePath.sep}`)) {
+    const filename = (0, _nodePath.basename)(resolution.filePath.split(_nodePath.sep).at(-1) ?? "");
+    const module = filename.split(".").at(0);
+    if (module && _allowedModules.allowedModules.has(module)) {
+      return resolver(context, `react-native-css/components/${module}`, platform);
+    }
   }
-
-  // We only care about `react-native/Library/Components/<module>.js` components
-  const segments = resolution.filePath.split(_nodePath.sep);
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const module = (0, _nodePath.basename)(segments.at(-1)).split(".")[0];
-  if (!module || !_allowedModules.allowedModules.has(module)) {
-    return resolution;
-  }
-  return resolver(context, `react-native-css/components/${module}`, platform);
+  return resolution;
 }
 function webResolver(resolver, context, moduleName, platform) {
   const resolution = resolver(context, moduleName, platform);
@@ -49,7 +40,9 @@ function webResolver(resolver, context, moduleName, platform) {
   // Only operate on source files
   resolution.type !== "sourceFile" ||
   // Skip anything that isn't importing from `react-native-web`
-  !resolution.filePath.includes(`${_nodePath.sep}react-native-web${_nodePath.sep}`)) {
+  !resolution.filePath.includes(`${_nodePath.sep}react-native-web${_nodePath.sep}`) ||
+  // Skip internal react-native-web files
+  resolution.filePath.includes(`${_nodePath.sep}react-native-web${_nodePath.sep}dist${_nodePath.sep}vendor`)) {
     return resolution;
   }
 
@@ -57,7 +50,7 @@ function webResolver(resolver, context, moduleName, platform) {
   const segments = resolution.filePath.split(_nodePath.sep);
   const isIndex = segments.at(-1)?.startsWith("index.");
   const module = segments.at(-2);
-  if (!isIndex || !module || !_allowedModules.allowedModules.has(module)) {
+  if (!isIndex || !module || !_allowedModules.allowedModules.has(module) || module === "VirtualizedList") {
     return resolution;
   }
   return resolver(context, `react-native-css/components/${module}`, platform);

package/dist/commonjs/metro/resolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["_nodePath","require","_allowedModules","thisModuleDist","resolve","__dirname","thisModuleSrc","isFromThisModule","filename","startsWith","nativeResolver","resolver","context","moduleName","platform","resolution","originModulePath","type","endsWith","segments","filePath","split","sep","module","basename","at","allowedModules","has","webResolver","includes","isIndex"],"sourceRoot":"../../../src","sources":["metro/resolver.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_nodePath","require","_allowedModules","thisModuleDist","resolve","__dirname","thisModuleSrc","isFromThisModule","filename","startsWith","nativeResolver","resolver","context","moduleName","platform","resolution","isInternal","originModulePath","isReactNativeIndex","endsWith","sep","type","filePath","includes","basename","split","at","module","allowedModules","has","webResolver","segments","isIndex"],"sourceRoot":"../../../src","sources":["metro/resolver.ts"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/metro/typescript.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setupTypeScript = setupTypeScript;
 var _fs = require("fs");
+var _nodePath = require("node:path");
 var _commentJson = require("comment-json");
 var _picocolors = require("./picocolors.js");
 /* eslint-disable */
@@ -15,11 +16,15 @@ function setupTypeScript(envPath = "react-native-css-env.d.ts", name = "react-na
     if (!ts) {
       return;
     }
-    const configFileName = ts.findConfigFile("./", ts.sys.fileExists, "tsconfig.json");
+    const configFileName = ts.findConfigFile((0, _nodePath.resolve)("."), ts.sys.fileExists, "tsconfig.json");
+    if (!configFileName) return;
+    const configDirectory = (0, _nodePath.dirname)((0, _nodePath.resolve)(configFileName));
+    const environmentFile = (0, _nodePath.resolve)(envPath);
+    const relativeEnvironmentFile = (0, _nodePath.relative)(configDirectory, environmentFile);
     const userConfig = (0, _commentJson.parse)((0, _fs.readFileSync)(configFileName, {
       encoding: "utf-8"
     }));
-    if (typeof userConfig !== "object" || !userConfig || Array.isArray(userConfig)) {
+    if (typeof userConfig !== "object" || !userConfig || Array.isArray(userConfig) || Object.prototype.toString.call(userConfig) !== "[object Object]") {
       return;
     }
     const output = [];
@@ -30,17 +35,32 @@ function setupTypeScript(envPath = "react-native-css-env.d.ts", name = "react-na
 // NOTE: This file should not be edited and should be committed with your source code. It is generated by ${name}. If you need to move or disable this file, please see the documentation.`);
       output.push(`Created ${(0, _picocolors.cyan)(envPath)}`);
     }
-    userConfig.include ??= new _commentJson.CommentArray(envPath);
-    if (Array.isArray(userConfig.include) && !userConfig.include.includes(envPath)) {
-      userConfig.include.push(envPath);
+    if (Array.isArray(userConfig.include) && !(Array.isArray(userConfig.files) && userConfig.files.includes(relativeEnvironmentFile)) && !userConfig.include.includes(relativeEnvironmentFile)) {
+      userConfig.include.push(relativeEnvironmentFile);
       updatedConfig = true;
       output.push(`Updated ${configFileName} to include the ${(0, _picocolors.cyan)(envPath)} file`);
     }
+
+    // Resolve inheritance on a copy so comments and the user's own settings survive.
+    const effectiveConfig = ts.parseJsonConfigFileContent(JSON.parse(JSON.stringify(userConfig)), ts.sys, configDirectory, {}, (0, _nodePath.resolve)(configFileName));
+    if (!effectiveConfig.fileNames.some(file => (0, _nodePath.resolve)(file) === environmentFile)) {
+      // A files entry can include the declaration even when inherited include or
+      // exclude settings omit it. Preserve the original implicit include as well.
+      if (effectiveConfig.raw.include === undefined && effectiveConfig.raw.files === undefined) {
+        userConfig.include = new _commentJson.CommentArray("**/*");
+      }
+      userConfig.files ??= new _commentJson.CommentArray(...(effectiveConfig.raw.files || []));
+      if (Array.isArray(userConfig.files) && !userConfig.files.includes(relativeEnvironmentFile)) {
+        userConfig.files.push(relativeEnvironmentFile);
+        updatedConfig = true;
+        output.push(`Updated ${configFileName} to include the ${(0, _picocolors.cyan)(envPath)} file`);
+      }
+    }
     if (updatedConfig) {
       (0, _fs.writeFileSync)(configFileName, (0, _commentJson.stringify)(userConfig, null, 2));
     }
     if (output.length) {
-      console.log(`${(0, _picocolors.cyan)((0, _picocolors.bold)("NativeWind"))} made the following changes to your project to support TypeScript:\n  - ${output.join("\n  - ")}`);
+      console.log(`${(0, _picocolors.cyan)((0, _picocolors.bold)("Nativewind"))} made the following changes to your project to support TypeScript:\n  - ${output.join("\n  - ")}`);
     }
   } catch {}
 }

package/dist/commonjs/metro/typescript.js.map

@@ -1 +1 @@
-{"version":3,"names":["_fs","require","_commentJson","_picocolors","setupTypeScript","envPath","name","ts","configFileName","findConfigFile","sys","fileExists","userConfig","parse","readFileSync","encoding","Array","isArray","output","updatedConfig","existsSync","writeFileSync","push","cyan","include","CommentArray","includes","stringify","length","console","log","bold","join"],"sourceRoot":"../../../src","sources":["metro/typescript.ts"],"mappings":";;;;;;AACA,IAAAA,GAAA,GAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,WAAA,GAAAF,OAAA;AALA;;AAOO,SAASG,eAAeA,CAC7BC,OAAO,GAAG,2BAA2B,EACrCC,IAAI,GAAG,kBAAkB,EACzB;EACA,IAAI;IACF,MAAMC,EAAE,GAAGN,OAAO,CAAC,YAAY,CAAC;IAChC,IAAI,CAACM,EAAE,EAAE;MACP;IACF;IAEA,MAAMC,cAAc,GAAGD,EAAE,CAACE,cAAc,CACtC,IAAI,EACJF,EAAE,CAACG,GAAG,CAACC,UAAU,EACjB,eACF,CAAC;IAED,MAAMC,UAAU,GAAG,IAAAC,kBAAK,EACtB,IAAAC,gBAAY,EAACN,cAAc,EAAE;MAC3BO,QAAQ,EAAE;IACZ,CAAC,CACH,CAAC;IAED,IACE,OAAOH,UAAU,KAAK,QAAQ,IAC9B,CAACA,UAAU,IACXI,KAAK,CAACC,OAAO,CAACL,UAAU,CAAC,EACzB;MACA;IACF;IAEA,MAAMM,MAAgB,GAAG,EAAE;IAC3B,IAAIC,aAAa,GAAG,KAAK;IAEzB,IAAI,CAAC,IAAAC,cAAU,EAACf,OAAO,CAAC,EAAE;MACxB,IAAAgB,iBAAa,EACXhB,OAAO,EACP;AACR;AACA,4GAA4GC,IAAI,2EAC1G,CAAC;MACDY,MAAM,CAACI,IAAI,CAAC,WAAW,IAAAC,gBAAI,EAAClB,OAAO,CAAC,EAAE,CAAC;IACzC;IAEAO,UAAU,CAACY,OAAO,KAAK,IAAIC,yBAAY,CAACpB,OAAO,CAAC;IAChD,IACEW,KAAK,CAACC,OAAO,CAACL,UAAU,CAACY,OAAO,CAAC,IACjC,CAACZ,UAAU,CAACY,OAAO,CAACE,QAAQ,CAACrB,OAAO,CAAC,EACrC;MACAO,UAAU,CAACY,OAAO,CAACF,IAAI,CAACjB,OAAO,CAAC;MAChCc,aAAa,GAAG,IAAI;MACpBD,MAAM,CAACI,IAAI,CACT,WAAWd,cAAc,mBAAmB,IAAAe,gBAAI,EAAClB,OAAO,CAAC,OAC3D,CAAC;IACH;IAEA,IAAIc,aAAa,EAAE;MACjB,IAAAE,iBAAa,EAACb,cAAc,EAAE,IAAAmB,sBAAS,EAACf,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/D;IAEA,IAAIM,MAAM,CAACU,MAAM,EAAE;MACjBC,OAAO,CAACC,GAAG,CACT,GAAG,IAAAP,gBAAI,EAAC,IAAAQ,gBAAI,EAAC,YAAY,CAAC,CAAC,2EAA2Eb,MAAM,CAACc,IAAI,CAAC,QAAQ,CAAC,EAC7H,CAAC;IACH;EACF,CAAC,CAAC,MAAM,CAAC;AACX","ignoreList":[]}
+{"version":3,"names":["_fs","require","_nodePath","_commentJson","_picocolors","setupTypeScript","envPath","name","ts","configFileName","findConfigFile","resolve","sys","fileExists","configDirectory","dirname","environmentFile","relativeEnvironmentFile","relative","userConfig","parse","readFileSync","encoding","Array","isArray","Object","prototype","toString","call","output","updatedConfig","existsSync","writeFileSync","push","cyan","include","files","includes","effectiveConfig","parseJsonConfigFileContent","JSON","stringify","fileNames","some","file","raw","undefined","CommentArray","length","console","log","bold","join"],"sourceRoot":"../../../src","sources":["metro/typescript.ts"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/native/api.js

@@ -40,13 +40,17 @@ var _reactivity = require("./reactivity.js");
 var _resolve = require("./styles/resolve.js");
 /* eslint-disable  */
 
+const defaultMapping = {
+  className: "style"
+};
+
 /**
  * Generates a new Higher-Order component the wraps the base component and applies the styles.
  * This is added to the `interopComponents` map so that it can be used in the `wrapJSX` function
  * @param baseComponent
  * @param mapping
  */
-const styled = (baseComponent, mapping, options) => {
+const styled = (baseComponent, mapping = defaultMapping, options) => {
   let component;
   // const type = getComponentType(baseComponent);
 
@@ -70,7 +74,7 @@ const colorScheme = exports.colorScheme = {
     return _reactivity.colorScheme.get() ?? _reactNative.Appearance.getColorScheme() ?? "light";
   },
   set(value) {
-    return _reactivity.colorScheme.set(value);
+    return _reactivity.colorScheme.set(value === "unspecified" ? null : value);
   }
 };
 const useUnstableNativeVariable = exports.useUnstableNativeVariable = useNativeVariable;
@@ -84,19 +88,23 @@ function useNativeVariable(name) {
     name = name.slice(2);
   }
   const inheritedVariables = (0, _react.useContext)(_nativeInternal.VariableContext);
-  const [effect, setState] = (0, _react.useState)(() => {
+  const [, forceUpdate] = (0, _react.useState)(0);
+  const [effect] = (0, _react.useState)(() => {
     const effect = {
       observers: new Set(),
-      run: () => setState(state => ({
-        ...state
-      }))
+      run: () => forceUpdate(state => state + 1)
     };
     const get = observable => observable.get(effect);
-    return {
-      ...effect,
+    return Object.assign(effect, {
       get
-    };
+    });
   });
+  (0, _react.useEffect)(() => {
+    // React StrictMode replays setup after cleanup without another render.
+    if (effect.observers.size === 0) forceUpdate(state => state + 1);
+    return () => (0, _reactivity.cleanupEffect)(effect);
+  }, [effect]);
+  (0, _reactivity.cleanupEffect)(effect);
   return (0, _resolve.resolveValue)([{}, "var", [name]], effect.get, {
     inheritedVariables
   });

package/dist/commonjs/native/api.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_nativeInternal","_useNativeCss","_usePassthrough","_reactivity","_resolve","styled","baseComponent","mapping","options","component","configs","mappingToConfig","passThrough","props","usePassthrough","useNativeCss","name","displayName","exports","colorScheme","get","colorSchemeObs","Appearance","getColorScheme","set","value","useUnstableNativeVariable","useNativeVariable","useCssElement","incomingProps","config","useState","startsWith","slice","inheritedVariables","useContext","VariableContext","effect","setState","observers","Set","run","state","observable","resolveValue","vars","variables","Object","assign","VAR_SYMBOL","fromEntries","entries","map","k","v","replace"],"sourceRoot":"../../../src","sources":["native/api.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_nativeInternal","_useNativeCss","_usePassthrough","_reactivity","_resolve","defaultMapping","className","styled","baseComponent","mapping","options","component","configs","mappingToConfig","passThrough","props","usePassthrough","useNativeCss","name","displayName","exports","colorScheme","get","colorSchemeObs","Appearance","getColorScheme","set","value","useUnstableNativeVariable","useNativeVariable","useCssElement","incomingProps","config","useState","startsWith","slice","inheritedVariables","useContext","VariableContext","forceUpdate","effect","observers","Set","run","state","observable","Object","assign","useEffect","size","cleanupEffect","resolveValue","vars","variables","VAR_SYMBOL","fromEntries","entries","map","k","v","replace"],"sourceRoot":"../../../src","sources":["native/api.tsx"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/native/conditions/attributes.js

@@ -7,7 +7,7 @@ exports.testAttributes = testAttributes;
 function testAttributes(queries, props, guards) {
   return queries.every(query => testAttribute(query, props, guards));
 }
-function testAttribute([type, prop, operator, testValue], props, guards) {
+function testAttribute([type, prop, operator, testValue, caseSensitivity], props, guards) {
   let value = undefined;
   if (props) {
     if (type === "a") {
@@ -21,21 +21,28 @@ function testAttribute([type, prop, operator, testValue], props, guards) {
   if (!operator) {
     return value !== undefined && value !== null && value !== false;
   }
+  if (operator === "!") return !value;
+  if (value === undefined || value === null || testValue === undefined) return false;
+  if (typeof value !== "string" && typeof value !== "number" && typeof value !== "boolean") return false;
+  let actual = String(value);
+  if (caseSensitivity === "i") {
+    // CSS attribute flags fold ASCII letters only, not Unicode characters.
+    actual = actual.replace(/[A-Z]/g, letter => letter.toLowerCase());
+    testValue = testValue.replace(/[A-Z]/g, letter => letter.toLowerCase());
+  }
   switch (operator) {
-    case "!":
-      return !value;
     case "=":
-      return value == testValue;
+      return actual === testValue;
     case "~=":
-      return testValue && value?.toString().split(" ").includes(testValue);
+      return testValue !== "" && actual.split(/[\t\n\f\r ]+/).includes(testValue);
     case "|=":
-      return testValue && value?.toString().startsWith(testValue + "-");
+      return actual === testValue || actual.startsWith(testValue + "-");
     case "^=":
-      return testValue && value?.toString().startsWith(testValue);
+      return testValue !== "" && actual.startsWith(testValue);
     case "$=":
-      return testValue && value?.toString().endsWith(testValue);
+      return testValue !== "" && actual.endsWith(testValue);
     case "*=":
-      return testValue && value?.toString().includes(testValue);
+      return testValue !== "" && actual.includes(testValue);
     default:
       operator;
       return false;

package/dist/commonjs/native/conditions/attributes.js.map

@@ -1 +1 @@
-{"version":3,"names":["testAttributes","queries","props","guards","every","query","testAttribute","type","prop","operator","testValue","value","undefined","dataSet","push","toString","split","includes","startsWith","endsWith"],"sourceRoot":"../../../../src","sources":["native/conditions/attributes.ts"],"mappings":";;;;;;AAIO,SAASA,cAAcA,CAC5BC,OAAyB,EACzBC,KAAiD,EACjDC,MAAqB,EACrB;EACA,OAAOF,OAAO,CAACG,KAAK,CAAEC,KAAK,IAAKC,aAAa,CAACD,KAAK,EAAEH,KAAK,EAAEC,MAAM,CAAC,CAAC;AACtE;AAEA,SAASG,aAAaA,CACpB,CAACC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,SAAS,CAAiB,EACjDR,KAAiD,EACjDC,MAAqB,EACrB;EACA,IAAIQ,KAAc,GAAGC,SAAS;EAE9B,IAAIV,KAAK,EAAE;IACT,IAAIK,IAAI,KAAK,GAAG,EAAE;MAChBI,KAAK,GAAGT,KAAK,CAACM,IAAI,CAAC;IACrB,CAAC,MAAM;MACL,MAAMK,OAAO,GAAGX,KAAK,CAACW,OAA8C;MACpEF,KAAK,GAAGE,OAAO,GAAGL,IAAI,CAAC;IACzB;EACF;EAEAL,MAAM,CAACW,IAAI,CAAC,CAACP,IAAI,EAAEC,IAAI,EAAEG,KAAK,CAAC,CAAC;EAEhC,IAAI,CAACF,QAAQ,EAAE;IACb,OAAOE,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,KAAK;EACjE;EAEA,QAAQF,QAAQ;IACd,KAAK,GAAG;MACN,OAAO,CAACE,KAAK;IACf,KAAK,GAAG;MACN,OAAOA,KAAK,IAAID,SAAS;IAC3B,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACC,KAAK,CAAC,GAAG,CAAC,CAACC,QAAQ,CAACP,SAAS,CAAC;IACtE,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACG,UAAU,CAACR,SAAS,GAAG,GAAG,CAAC;IACnE,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACG,UAAU,CAACR,SAAS,CAAC;IAC7D,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACI,QAAQ,CAACT,SAAS,CAAC;IAC3D,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACE,QAAQ,CAACP,SAAS,CAAC;IAC3D;MACED,QAAQ;MACR,OAAO,KAAK;EAChB;AACF","ignoreList":[]}
+{"version":3,"names":["testAttributes","queries","props","guards","every","query","testAttribute","type","prop","operator","testValue","caseSensitivity","value","undefined","dataSet","push","actual","String","replace","letter","toLowerCase","split","includes","startsWith","endsWith"],"sourceRoot":"../../../../src","sources":["native/conditions/attributes.ts"],"mappings":";;;;;;AAIO,SAASA,cAAcA,CAC5BC,OAAyB,EACzBC,KAAiD,EACjDC,MAAqB,EACrB;EACA,OAAOF,OAAO,CAACG,KAAK,CAAEC,KAAK,IAAKC,aAAa,CAACD,KAAK,EAAEH,KAAK,EAAEC,MAAM,CAAC,CAAC;AACtE;AAEA,SAASG,aAAaA,CACpB,CAACC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,eAAe,CAAiB,EAClET,KAAiD,EACjDC,MAAqB,EACrB;EACA,IAAIS,KAAc,GAAGC,SAAS;EAE9B,IAAIX,KAAK,EAAE;IACT,IAAIK,IAAI,KAAK,GAAG,EAAE;MAChBK,KAAK,GAAGV,KAAK,CAACM,IAAI,CAAC;IACrB,CAAC,MAAM;MACL,MAAMM,OAAO,GAAGZ,KAAK,CAACY,OAA8C;MACpEF,KAAK,GAAGE,OAAO,GAAGN,IAAI,CAAC;IACzB;EACF;EAEAL,MAAM,CAACY,IAAI,CAAC,CAACR,IAAI,EAAEC,IAAI,EAAEI,KAAK,CAAC,CAAC;EAEhC,IAAI,CAACH,QAAQ,EAAE;IACb,OAAOG,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,KAAK;EACjE;EAEA,IAAIH,QAAQ,KAAK,GAAG,EAAE,OAAO,CAACG,KAAK;EACnC,IAAIA,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,IAAIF,SAAS,KAAKG,SAAS,EAClE,OAAO,KAAK;EAEd,IACE,OAAOD,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,SAAS,EAE1B,OAAO,KAAK;EACd,IAAII,MAAM,GAAGC,MAAM,CAACL,KAAK,CAAC;EAC1B,IAAID,eAAe,KAAK,GAAG,EAAE;IAC3B;IACAK,MAAM,GAAGA,MAAM,CAACE,OAAO,CAAC,QAAQ,EAAGC,MAAM,IAAKA,MAAM,CAACC,WAAW,CAAC,CAAC,CAAC;IACnEV,SAAS,GAAGA,SAAS,CAACQ,OAAO,CAAC,QAAQ,EAAGC,MAAM,IAAKA,MAAM,CAACC,WAAW,CAAC,CAAC,CAAC;EAC3E;EAEA,QAAQX,QAAQ;IACd,KAAK,GAAG;MACN,OAAOO,MAAM,KAAKN,SAAS;IAC7B,KAAK,IAAI;MACP,OACEA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACK,KAAK,CAAC,cAAc,CAAC,CAACC,QAAQ,CAACZ,SAAS,CAAC;IAExE,KAAK,IAAI;MACP,OAAOM,MAAM,KAAKN,SAAS,IAAIM,MAAM,CAACO,UAAU,CAACb,SAAS,GAAG,GAAG,CAAC;IACnE,KAAK,IAAI;MACP,OAAOA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACO,UAAU,CAACb,SAAS,CAAC;IACzD,KAAK,IAAI;MACP,OAAOA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACQ,QAAQ,CAACd,SAAS,CAAC;IACvD,KAAK,IAAI;MACP,OAAOA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACM,QAAQ,CAACZ,SAAS,CAAC;IACvD;MACED,QAAQ;MACR,OAAO,KAAK;EAChB;AACF","ignoreList":[]}

package/dist/commonjs/native/conditions/container-query.js

@@ -7,10 +7,9 @@ exports.DEFAULT_CONTAINER_NAME = void 0;
 exports.testContainerQueries = testContainerQueries;
 exports.testContainerQuery = testContainerQuery;
 var _reactivity = require("../reactivity.js");
+var _attributes = require("./attributes.js");
 /* eslint-disable */
 
-// import { testAttributes } from "./attributes";
-
 const DEFAULT_CONTAINER_NAME = exports.DEFAULT_CONTAINER_NAME = "c:___default___";
 function testContainerQueries(queries, inheritedContainers, guards, get) {
   return queries.every(query => {
@@ -25,14 +24,15 @@ function testContainerQuery(query, inheritedContainers, guards, get) {
     return false;
   }
 
-  // if (query.a && !testAttributes(query.a, container.props, guards)) {
-  //   return false;
-  // }
-
-  if (query.m && !testContainerMediaCondition(query.m, container, get)) {
+  // Ancestor snapshots have their own context guard. Their attributes must not
+  // be compared with this descendant's props by the ordinary attribute guards.
+  if (query.a && !(0, _attributes.testAttributes)(query.a, container.props, [])) {
+    return false;
+  }
+  if (query.m && !testContainerMediaCondition(query.m, container.key, get)) {
     return false;
   }
-  if (query.p && !testContainerPseudoCondition(query.p, container, get)) {
+  if (query.p && !testContainerPseudoCondition(query.p, container.key, get)) {
     return false;
   }
   return true;
@@ -83,11 +83,11 @@ function testContainerMediaCondition(condition, containerKey, get) {
           case ">":
             return left > right;
           case ">=":
-            return left > right;
+            return left >= right;
           case "<":
-            return left > right;
+            return left < right;
           case "<=":
-            return left > right;
+            return left <= right;
           default:
             condition[0];
             return false;