tailwind-variants 3.2.2 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-variants",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "🦄 Tailwindcss first-class variant API",
   "keywords": [
     "tailwindcss",
@@ -25,19 +25,34 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./lite": {
-      "types": "./dist/lite.d.ts",
-      "import": "./dist/lite.js",
-      "require": "./dist/lite.cjs"
+      "import": {
+        "types": "./dist/lite.d.ts",
+        "default": "./dist/lite.js"
+      },
+      "require": {
+        "types": "./dist/lite.d.cts",
+        "default": "./dist/lite.cjs"
+      }
     },
     "./utils": {
-      "types": "./dist/utils.d.ts",
-      "import": "./dist/utils.js",
-      "require": "./dist/utils.cjs"
+      "import": {
+        "types": "./dist/utils.d.ts",
+        "default": "./dist/utils.js"
+      },
+      "require": {
+        "types": "./dist/utils.d.cts",
+        "default": "./dist/utils.cjs"
+      }
     },
     "./dist/*": "./dist/*",
     "./package.json": "./package.json"
@@ -51,60 +66,22 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "dev": "tsup --watch",
-    "build": "tsup && node copy-types.cjs",
-    "typecheck": "tsc --noEmit",
-    "prepack": "clean-package",
-    "benchmark": "node benchmark.js",
-    "postpack": "clean-package restore",
-    "lint": "eslint . src/**/*.{js,ts}",
-    "lint:fix": "eslint --fix . src/**/*.{js,ts}",
-    "test": "jest --verbose",
-    "test:watch": "jest --watch --no-verbose",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path .",
-    "release": "bumpp --execute='pnpm run changelog' --all",
-    "prepublishOnly": "pnpm run build",
-    "release:check": "pnpm run lint && pnpm run typecheck && pnpm run test && pnpm run build"
-  },
   "devDependencies": {
-    "@commitlint/cli": "19.5.0",
-    "@commitlint/config-conventional": "19.5.0",
-    "@jest/globals": "29.7.0",
-    "@swc-node/jest": "1.8.12",
-    "@swc/cli": "0.5.0",
-    "@swc/core": "1.9.2",
-    "@swc/helpers": "0.5.15",
-    "@swc/jest": "0.2.37",
-    "@types/jest": "29.5.14",
-    "@types/node": "22.9.0",
-    "@typescript-eslint/eslint-plugin": "8.14.0",
-    "@typescript-eslint/parser": "8.14.0",
-    "benchmark": "2.1.4",
-    "bumpp": "10.2.0",
-    "changelogithub": "13.16.0",
-    "class-variance-authority": "0.7.0",
-    "clean-package": "2.2.0",
-    "conventional-changelog-cli": "5.0.0",
-    "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-config-ts-lambdas": "1.2.3",
-    "eslint-import-resolver-typescript": "3.6.3",
-    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-jest": "28.9.0",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-promise": "7.1.0",
-    "expect": "29.7.0",
-    "jest": "29.7.0",
-    "postcss": "8.5.6",
-    "prettier": "3.3.3",
-    "prettier-eslint": "16.3.0",
-    "prettier-eslint-cli": "8.0.1",
-    "tailwindcss": "4.1.11",
-    "ts-node": "10.9.2",
-    "tsup": "8.5.0",
-    "typescript": "5.6.3"
+    "@biomejs/biome": "2.5.5",
+    "@commitlint/cli": "21.2.1",
+    "@commitlint/config-conventional": "21.2.0",
+    "@commitlint/types": "21.2.0",
+    "@types/node": "26.1.1",
+    "bumpp": "11.1.0",
+    "changelogithub": "14.0.0",
+    "conventional-changelog": "8.1.0",
+    "conventional-changelog-angular": "9.2.1",
+    "esbuild": "0.28.1",
+    "tailwind-merge": "3.6.0",
+    "tinybench": "6.1.2",
+    "tsup": "8.5.1",
+    "typescript": "5.6.3",
+    "vitest": "4.1.10"
   },
   "peerDependencies": {
     "tailwind-merge": ">=3.0.0",
@@ -113,10 +90,29 @@
   "peerDependenciesMeta": {
     "tailwind-merge": {
       "optional": true
+    },
+    "tailwindcss": {
+      "optional": true
     }
   },
   "engines": {
-    "node": ">=16.x",
-    "pnpm": ">=7.x"
+    "pnpm": ">=7.x",
+    "node": ">=16.9.x"
+  },
+  "scripts": {
+    "dev": "tsup --config .config/tsup.config.ts --watch",
+    "build": "tsup --config .config/tsup.config.ts",
+    "typecheck": "tsc --noEmit && pnpm typecheck:types",
+    "typecheck:types": "tsc -p .config/tsconfig.type-tests.json",
+    "benchmark": "pnpm build && node benchmark/run.mjs",
+    "lint": "biome check .",
+    "lint:fix": "biome check --write .",
+    "test": "vitest run --config .config/vitest.config.ts",
+    "test:watch": "vitest --config .config/vitest.config.ts",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path .",
+    "release": "bumpp --execute='pnpm run changelog' --all",
+    "release:check": "pnpm run lint && pnpm run typecheck && pnpm run test && pnpm run build",
+    "clean": "pnpm clean:cache && pnpm i",
+    "clean:cache": "find . \\( -name 'dist' -o -name 'node_modules' -o -name 'pnpm-lock.yaml' \\) -prune -exec rm -rf '{}' +"
   }
-}
+}

package/dist/chunk-2JY7EID6.cjs

@@ -1,124 +0,0 @@
-'use strict';
-
-// src/utils.js
-var SPACE_REGEX = /\s+/g;
-var removeExtraSpaces = (str) => {
-  if (typeof str !== "string" || !str) return str;
-  return str.replace(SPACE_REGEX, " ").trim();
-};
-var cx = (...classnames) => {
-  const classList = [];
-  const buildClassString = (input) => {
-    if (!input && input !== 0 && input !== 0n) return;
-    if (Array.isArray(input)) {
-      for (let i = 0, len = input.length; i < len; i++) buildClassString(input[i]);
-      return;
-    }
-    const type = typeof input;
-    if (type === "string" || type === "number" || type === "bigint") {
-      if (type === "number" && input !== input) return;
-      classList.push(String(input));
-    } else if (type === "object") {
-      const keys = Object.keys(input);
-      for (let i = 0, len = keys.length; i < len; i++) {
-        const key = keys[i];
-        if (input[key]) classList.push(key);
-      }
-    }
-  };
-  for (let i = 0, len = classnames.length; i < len; i++) {
-    const c = classnames[i];
-    if (c !== null && c !== void 0) buildClassString(c);
-  }
-  return classList.length > 0 ? removeExtraSpaces(classList.join(" ")) : void 0;
-};
-var falsyToString = (value) => value === false ? "false" : value === true ? "true" : value === 0 ? "0" : value;
-var isEmptyObject = (obj) => {
-  if (!obj || typeof obj !== "object") return true;
-  for (const _ in obj) return false;
-  return true;
-};
-var isEqual = (obj1, obj2) => {
-  if (obj1 === obj2) return true;
-  if (!obj1 || !obj2) return false;
-  const keys1 = Object.keys(obj1);
-  const keys2 = Object.keys(obj2);
-  if (keys1.length !== keys2.length) return false;
-  for (let i = 0; i < keys1.length; i++) {
-    const key = keys1[i];
-    if (!keys2.includes(key)) return false;
-    if (obj1[key] !== obj2[key]) return false;
-  }
-  return true;
-};
-var isBoolean = (value) => value === true || value === false;
-var joinObjects = (obj1, obj2) => {
-  for (const key in obj2) {
-    if (Object.prototype.hasOwnProperty.call(obj2, key)) {
-      const val2 = obj2[key];
-      if (key in obj1) {
-        obj1[key] = cx(obj1[key], val2);
-      } else {
-        obj1[key] = val2;
-      }
-    }
-  }
-  return obj1;
-};
-var flat = (arr, target) => {
-  for (let i = 0; i < arr.length; i++) {
-    const el = arr[i];
-    if (Array.isArray(el)) flat(el, target);
-    else if (el) target.push(el);
-  }
-};
-function flatArray(arr) {
-  const flattened = [];
-  flat(arr, flattened);
-  return flattened;
-}
-var flatMergeArrays = (...arrays) => {
-  const result = [];
-  flat(arrays, result);
-  const filtered = [];
-  for (let i = 0; i < result.length; i++) {
-    if (result[i]) filtered.push(result[i]);
-  }
-  return filtered;
-};
-var mergeObjects = (obj1, obj2) => {
-  const result = {};
-  for (const key in obj1) {
-    const val1 = obj1[key];
-    if (key in obj2) {
-      const val2 = obj2[key];
-      if (Array.isArray(val1) || Array.isArray(val2)) {
-        result[key] = flatMergeArrays(val2, val1);
-      } else if (typeof val1 === "object" && typeof val2 === "object" && val1 && val2) {
-        result[key] = mergeObjects(val1, val2);
-      } else {
-        result[key] = val2 + " " + val1;
-      }
-    } else {
-      result[key] = val1;
-    }
-  }
-  for (const key in obj2) {
-    if (!(key in obj1)) {
-      result[key] = obj2[key];
-    }
-  }
-  return result;
-};
-
-exports.cx = cx;
-exports.falsyToString = falsyToString;
-exports.flat = flat;
-exports.flatArray = flatArray;
-exports.flatMergeArrays = flatMergeArrays;
-exports.isBoolean = isBoolean;
-exports.isEmptyObject = isEmptyObject;
-exports.isEqual = isEqual;
-exports.joinObjects = joinObjects;
-exports.mergeObjects = mergeObjects;
-exports.removeExtraSpaces = removeExtraSpaces;

package/dist/chunk-52Z2HSI4.cjs

@@ -1,273 +0,0 @@
-'use strict';
-
-var chunk2JY7EID6_cjs = require('./chunk-2JY7EID6.cjs');
-
-// src/config.js
-var defaultConfig = {
-  twMerge: true,
-  twMergeConfig: {}
-};
-
-// src/state.js
-function createState() {
-  let cachedTwMerge = null;
-  let cachedTwMergeConfig = {};
-  let didTwMergeConfigChange = false;
-  return {
-    get cachedTwMerge() {
-      return cachedTwMerge;
-    },
-    set cachedTwMerge(value) {
-      cachedTwMerge = value;
-    },
-    get cachedTwMergeConfig() {
-      return cachedTwMergeConfig;
-    },
-    set cachedTwMergeConfig(value) {
-      cachedTwMergeConfig = value;
-    },
-    get didTwMergeConfigChange() {
-      return didTwMergeConfigChange;
-    },
-    set didTwMergeConfigChange(value) {
-      didTwMergeConfigChange = value;
-    },
-    reset() {
-      cachedTwMerge = null;
-      cachedTwMergeConfig = {};
-      didTwMergeConfigChange = false;
-    }
-  };
-}
-var state = createState();
-
-// src/core.js
-var getTailwindVariants = (cn) => {
-  const tv = (options, configProp) => {
-    const {
-      extend = null,
-      slots: slotProps = {},
-      variants: variantsProps = {},
-      compoundVariants: compoundVariantsProps = [],
-      compoundSlots = [],
-      defaultVariants: defaultVariantsProps = {}
-    } = options;
-    const config = { ...defaultConfig, ...configProp };
-    const base = extend?.base ? chunk2JY7EID6_cjs.cx(extend.base, options?.base) : options?.base;
-    const variants = extend?.variants && !chunk2JY7EID6_cjs.isEmptyObject(extend.variants) ? chunk2JY7EID6_cjs.mergeObjects(variantsProps, extend.variants) : variantsProps;
-    const defaultVariants = extend?.defaultVariants && !chunk2JY7EID6_cjs.isEmptyObject(extend.defaultVariants) ? { ...extend.defaultVariants, ...defaultVariantsProps } : defaultVariantsProps;
-    if (!chunk2JY7EID6_cjs.isEmptyObject(config.twMergeConfig) && !chunk2JY7EID6_cjs.isEqual(config.twMergeConfig, state.cachedTwMergeConfig)) {
-      state.didTwMergeConfigChange = true;
-      state.cachedTwMergeConfig = config.twMergeConfig;
-    }
-    const isExtendedSlotsEmpty = chunk2JY7EID6_cjs.isEmptyObject(extend?.slots);
-    const componentSlots = !chunk2JY7EID6_cjs.isEmptyObject(slotProps) ? {
-      // add "base" to the slots object
-      base: chunk2JY7EID6_cjs.cx(options?.base, isExtendedSlotsEmpty && extend?.base),
-      ...slotProps
-    } : {};
-    const slots = isExtendedSlotsEmpty ? componentSlots : chunk2JY7EID6_cjs.joinObjects(
-      { ...extend?.slots },
-      chunk2JY7EID6_cjs.isEmptyObject(componentSlots) ? { base: options?.base } : componentSlots
-    );
-    const compoundVariants = chunk2JY7EID6_cjs.isEmptyObject(extend?.compoundVariants) ? compoundVariantsProps : chunk2JY7EID6_cjs.flatMergeArrays(extend?.compoundVariants, compoundVariantsProps);
-    const component = (props) => {
-      if (chunk2JY7EID6_cjs.isEmptyObject(variants) && chunk2JY7EID6_cjs.isEmptyObject(slotProps) && isExtendedSlotsEmpty) {
-        return cn(base, props?.class, props?.className)(config);
-      }
-      if (compoundVariants && !Array.isArray(compoundVariants)) {
-        throw new TypeError(
-          `The "compoundVariants" prop must be an array. Received: ${typeof compoundVariants}`
-        );
-      }
-      if (compoundSlots && !Array.isArray(compoundSlots)) {
-        throw new TypeError(
-          `The "compoundSlots" prop must be an array. Received: ${typeof compoundSlots}`
-        );
-      }
-      const getVariantValue = (variant, vrs = variants, _slotKey = null, slotProps2 = null) => {
-        const variantObj = vrs[variant];
-        if (!variantObj || chunk2JY7EID6_cjs.isEmptyObject(variantObj)) {
-          return null;
-        }
-        const variantProp = slotProps2?.[variant] ?? props?.[variant];
-        if (variantProp === null) return null;
-        const variantKey = chunk2JY7EID6_cjs.falsyToString(variantProp);
-        if (typeof variantKey === "object") {
-          return null;
-        }
-        const defaultVariantProp = defaultVariants?.[variant];
-        const key = variantKey != null ? variantKey : chunk2JY7EID6_cjs.falsyToString(defaultVariantProp);
-        const value = variantObj[key || "false"];
-        return value;
-      };
-      const getVariantClassNames = () => {
-        if (!variants) return null;
-        const keys = Object.keys(variants);
-        const result = [];
-        for (let i = 0; i < keys.length; i++) {
-          const value = getVariantValue(keys[i], variants);
-          if (value) result.push(value);
-        }
-        return result;
-      };
-      const getVariantClassNamesBySlotKey = (slotKey, slotProps2) => {
-        if (!variants || typeof variants !== "object") return null;
-        const result = [];
-        for (const variant in variants) {
-          const variantValue = getVariantValue(variant, variants, slotKey, slotProps2);
-          const value = slotKey === "base" && typeof variantValue === "string" ? variantValue : variantValue && variantValue[slotKey];
-          if (value) result.push(value);
-        }
-        return result;
-      };
-      const propsWithoutUndefined = {};
-      for (const prop in props) {
-        const value = props[prop];
-        if (value !== void 0) propsWithoutUndefined[prop] = value;
-      }
-      const getCompleteProps = (key, slotProps2) => {
-        const initialProp = typeof props?.[key] === "object" ? {
-          [key]: props[key]?.initial
-        } : {};
-        return {
-          ...defaultVariants,
-          ...propsWithoutUndefined,
-          ...initialProp,
-          ...slotProps2
-        };
-      };
-      const getCompoundVariantsValue = (cv = [], slotProps2) => {
-        const result = [];
-        const cvLength = cv.length;
-        for (let i = 0; i < cvLength; i++) {
-          const { class: tvClass, className: tvClassName, ...compoundVariantOptions } = cv[i];
-          let isValid = true;
-          const completeProps = getCompleteProps(null, slotProps2);
-          for (const key in compoundVariantOptions) {
-            const value = compoundVariantOptions[key];
-            const completePropsValue = completeProps[key];
-            if (Array.isArray(value)) {
-              if (!value.includes(completePropsValue)) {
-                isValid = false;
-                break;
-              }
-            } else {
-              if ((value == null || value === false) && (completePropsValue == null || completePropsValue === false))
-                continue;
-              if (completePropsValue !== value) {
-                isValid = false;
-                break;
-              }
-            }
-          }
-          if (isValid) {
-            if (tvClass) result.push(tvClass);
-            if (tvClassName) result.push(tvClassName);
-          }
-        }
-        return result;
-      };
-      const getCompoundVariantClassNamesBySlot = (slotProps2) => {
-        const compoundClassNames = getCompoundVariantsValue(compoundVariants, slotProps2);
-        if (!Array.isArray(compoundClassNames)) return compoundClassNames;
-        const result = {};
-        const cnFn = cn;
-        for (let i = 0; i < compoundClassNames.length; i++) {
-          const className = compoundClassNames[i];
-          if (typeof className === "string") {
-            result.base = cnFn(result.base, className)(config);
-          } else if (typeof className === "object") {
-            for (const slot in className) {
-              result[slot] = cnFn(result[slot], className[slot])(config);
-            }
-          }
-        }
-        return result;
-      };
-      const getCompoundSlotClassNameBySlot = (slotProps2) => {
-        if (compoundSlots.length < 1) return null;
-        const result = {};
-        const completeProps = getCompleteProps(null, slotProps2);
-        for (let i = 0; i < compoundSlots.length; i++) {
-          const {
-            slots: slots2 = [],
-            class: slotClass,
-            className: slotClassName,
-            ...slotVariants
-          } = compoundSlots[i];
-          if (!chunk2JY7EID6_cjs.isEmptyObject(slotVariants)) {
-            let isValid = true;
-            for (const key in slotVariants) {
-              const completePropsValue = completeProps[key];
-              const slotVariantValue = slotVariants[key];
-              if (completePropsValue === void 0 || (Array.isArray(slotVariantValue) ? !slotVariantValue.includes(completePropsValue) : slotVariantValue !== completePropsValue)) {
-                isValid = false;
-                break;
-              }
-            }
-            if (!isValid) continue;
-          }
-          for (let j = 0; j < slots2.length; j++) {
-            const slotName = slots2[j];
-            if (!result[slotName]) result[slotName] = [];
-            result[slotName].push([slotClass, slotClassName]);
-          }
-        }
-        return result;
-      };
-      if (!chunk2JY7EID6_cjs.isEmptyObject(slotProps) || !isExtendedSlotsEmpty) {
-        const slotsFns = {};
-        if (typeof slots === "object" && !chunk2JY7EID6_cjs.isEmptyObject(slots)) {
-          const cnFn = cn;
-          for (const slotKey in slots) {
-            slotsFns[slotKey] = (slotProps2) => {
-              const compoundVariantClasses = getCompoundVariantClassNamesBySlot(slotProps2);
-              const compoundSlotClasses = getCompoundSlotClassNameBySlot(slotProps2);
-              return cnFn(
-                slots[slotKey],
-                getVariantClassNamesBySlotKey(slotKey, slotProps2),
-                compoundVariantClasses ? compoundVariantClasses[slotKey] : void 0,
-                compoundSlotClasses ? compoundSlotClasses[slotKey] : void 0,
-                slotProps2?.class,
-                slotProps2?.className
-              )(config);
-            };
-          }
-        }
-        return slotsFns;
-      }
-      return cn(
-        base,
-        getVariantClassNames(),
-        getCompoundVariantsValue(compoundVariants),
-        props?.class,
-        props?.className
-      )(config);
-    };
-    const getVariantKeys = () => {
-      if (!variants || typeof variants !== "object") return;
-      return Object.keys(variants);
-    };
-    component.variantKeys = getVariantKeys();
-    component.extend = extend;
-    component.base = base;
-    component.slots = slots;
-    component.variants = variants;
-    component.defaultVariants = defaultVariants;
-    component.compoundSlots = compoundSlots;
-    component.compoundVariants = compoundVariants;
-    return component;
-  };
-  const createTV = (configProp) => {
-    return (options, config) => tv(options, config ? chunk2JY7EID6_cjs.mergeObjects(configProp, config) : configProp);
-  };
-  return {
-    tv,
-    createTV
-  };
-};
-
-exports.defaultConfig = defaultConfig;
-exports.getTailwindVariants = getTailwindVariants;
-exports.state = state;

package/dist/chunk-LQJYWU4O.js

@@ -1,112 +0,0 @@
-// src/utils.js
-var SPACE_REGEX = /\s+/g;
-var removeExtraSpaces = (str) => {
-  if (typeof str !== "string" || !str) return str;
-  return str.replace(SPACE_REGEX, " ").trim();
-};
-var cx = (...classnames) => {
-  const classList = [];
-  const buildClassString = (input) => {
-    if (!input && input !== 0 && input !== 0n) return;
-    if (Array.isArray(input)) {
-      for (let i = 0, len = input.length; i < len; i++) buildClassString(input[i]);
-      return;
-    }
-    const type = typeof input;
-    if (type === "string" || type === "number" || type === "bigint") {
-      if (type === "number" && input !== input) return;
-      classList.push(String(input));
-    } else if (type === "object") {
-      const keys = Object.keys(input);
-      for (let i = 0, len = keys.length; i < len; i++) {
-        const key = keys[i];
-        if (input[key]) classList.push(key);
-      }
-    }
-  };
-  for (let i = 0, len = classnames.length; i < len; i++) {
-    const c = classnames[i];
-    if (c !== null && c !== void 0) buildClassString(c);
-  }
-  return classList.length > 0 ? removeExtraSpaces(classList.join(" ")) : void 0;
-};
-var falsyToString = (value) => value === false ? "false" : value === true ? "true" : value === 0 ? "0" : value;
-var isEmptyObject = (obj) => {
-  if (!obj || typeof obj !== "object") return true;
-  for (const _ in obj) return false;
-  return true;
-};
-var isEqual = (obj1, obj2) => {
-  if (obj1 === obj2) return true;
-  if (!obj1 || !obj2) return false;
-  const keys1 = Object.keys(obj1);
-  const keys2 = Object.keys(obj2);
-  if (keys1.length !== keys2.length) return false;
-  for (let i = 0; i < keys1.length; i++) {
-    const key = keys1[i];
-    if (!keys2.includes(key)) return false;
-    if (obj1[key] !== obj2[key]) return false;
-  }
-  return true;
-};
-var isBoolean = (value) => value === true || value === false;
-var joinObjects = (obj1, obj2) => {
-  for (const key in obj2) {
-    if (Object.prototype.hasOwnProperty.call(obj2, key)) {
-      const val2 = obj2[key];
-      if (key in obj1) {
-        obj1[key] = cx(obj1[key], val2);
-      } else {
-        obj1[key] = val2;
-      }
-    }
-  }
-  return obj1;
-};
-var flat = (arr, target) => {
-  for (let i = 0; i < arr.length; i++) {
-    const el = arr[i];
-    if (Array.isArray(el)) flat(el, target);
-    else if (el) target.push(el);
-  }
-};
-function flatArray(arr) {
-  const flattened = [];
-  flat(arr, flattened);
-  return flattened;
-}
-var flatMergeArrays = (...arrays) => {
-  const result = [];
-  flat(arrays, result);
-  const filtered = [];
-  for (let i = 0; i < result.length; i++) {
-    if (result[i]) filtered.push(result[i]);
-  }
-  return filtered;
-};
-var mergeObjects = (obj1, obj2) => {
-  const result = {};
-  for (const key in obj1) {
-    const val1 = obj1[key];
-    if (key in obj2) {
-      const val2 = obj2[key];
-      if (Array.isArray(val1) || Array.isArray(val2)) {
-        result[key] = flatMergeArrays(val2, val1);
-      } else if (typeof val1 === "object" && typeof val2 === "object" && val1 && val2) {
-        result[key] = mergeObjects(val1, val2);
-      } else {
-        result[key] = val2 + " " + val1;
-      }
-    } else {
-      result[key] = val1;
-    }
-  }
-  for (const key in obj2) {
-    if (!(key in obj1)) {
-      result[key] = obj2[key];
-    }
-  }
-  return result;
-};
-
-export { cx, falsyToString, flat, flatArray, flatMergeArrays, isBoolean, isEmptyObject, isEqual, joinObjects, mergeObjects, removeExtraSpaces };