Comparing version 0.2.0 to 0.2.1
@@ -9,6 +9,6 @@ "use strict"; | ||
exports.mergeVariants = mergeVariants; | ||
exports.merge = merge; | ||
var _tailwindMerge = require("tailwind-merge"); | ||
var _lodashIsequal // FIXME: find the way to not to use lodash | ||
= _interopRequireDefault(require("lodash.isequal")); | ||
var _merge = require("./merge"); | ||
function _interopRequireDefault(obj) { | ||
@@ -120,3 +120,3 @@ return obj && obj.__esModule ? obj : { | ||
function getDefaultVariants(baseVariants, newVariants) { | ||
return (0, _merge).merge(baseVariants, newVariants); | ||
return merge(baseVariants, newVariants); | ||
} | ||
@@ -139,4 +139,14 @@ // FIXME: make newVariants as first priopity | ||
} | ||
function removeEmptyObjects(element) { | ||
return Object.keys(element).length === 0; | ||
} | ||
function merge() { | ||
for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){ | ||
args[_key] = arguments[_key]; | ||
} | ||
// const asdf = args.filter(removeEmptyObjects) | ||
return Object.assign({}, ...args.filter(removeEmptyObjects)); | ||
} | ||
//# sourceMappingURL=index.cjs.js.map |
@@ -19,3 +19,3 @@ import type { ClassProp, ClassValue, CxOptions, CxReturn, OmitUndefined, StringToBoolean } from "./types"; | ||
declare type Props<T> = T extends ConfigSchema ? ConfigVariants<T> & ClassProp : ClassProp; | ||
export declare function cvax<T>(config: Config<T>): (props?: Props<T>) => string; | ||
export declare function cvax<T>(config?: Config<T>): (props?: Props<T>) => string; | ||
export declare function mergeVariants<T, U>(baseVariants: Config<T>, newVariants: Config<U>): { | ||
@@ -28,5 +28,19 @@ base: string; | ||
}> : never : never : never : T_1 extends import("type-fest/source/internal").UnknownArrayOrTuple ? import("type-fest/source/conditional-simplify").ConditionalSimplifyDeep<U, Function | Iterable<unknown>, object> extends infer T_3 ? T_3 extends import("type-fest/source/conditional-simplify").ConditionalSimplifyDeep<U, Function | Iterable<unknown>, object> ? T_3 extends import("type-fest/source/internal").UnknownArrayOrTuple ? (Exclude<T_1, undefined>[number] | Exclude<T_3, undefined>[number])[] : never : never : never : never : never : never, Function | Iterable<unknown>, object>; | ||
defaultVariants: Pick<ConfigVariants<T>, Exclude<keyof T, keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)>> & Pick<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never, Exclude<keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never), ((Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never) extends infer T_5 ? { [Key in keyof T_5]-?: {} extends { [P in Key]: (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[Key]; } ? Key : never; } : never)[keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)]>> & Pick<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never, Exclude<((Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never) extends infer T_5 ? { [Key in keyof T_5]-?: {} extends { [P in Key]: (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[Key]; } ? Key : never; } : never)[keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)], keyof T>> & { [P_1 in ((Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never) extends infer T_5 ? { [Key in keyof T_5]-?: {} extends { [P in Key]: (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[Key]; } ? Key : never; } : never)[keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)] & keyof T]: ConfigVariants<T>[P_1] | Exclude<(Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[P_1], undefined>; } extends infer T_6 ? T_6 extends Pick<ConfigVariants<T>, Exclude<keyof T, keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)>> & Pick<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never, Exclude<keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never), ((Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never) extends infer T_5 ? { [Key in keyof T_5]-?: {} extends { [P in Key]: (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[Key]; } ? Key : never; } : never)[keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)]>> & Pick<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never, Exclude<((Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never) extends infer T_5 ? { [Key in keyof T_5]-?: {} extends { [P in Key]: (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[Key]; } ? Key : never; } : never)[keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)], keyof T>> & { [P_1 in ((Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never) extends infer T_5 ? { [Key in keyof T_5]-?: {} extends { [P in Key]: (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[Key]; } ? Key : never; } : never)[keyof (Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)] & keyof T]: ConfigVariants<T>[P_1] | Exclude<(Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} extends infer T_4 ? T_4 extends Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & {} ? T_4 extends unknown ? {} : never : never : never)[P_1], undefined>; } ? T_6 extends unknown ? {} : never : never : never; | ||
defaultVariants: Identity<Pick<ConfigVariants<T>, Exclude<keyof T, keyof Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>>> & Pick<Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>, Exclude<keyof Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>, OptionalPropertyNames<Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>>>> & Pick<Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>, Exclude<OptionalPropertyNames<Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>>, keyof T>> & SpreadProperties<ConfigVariants<T>, Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>, OptionalPropertyNames<Identity<Pick<ConfigVariants<U>, Exclude<keyof U, never>> & Pick<unknown, never> & SpreadProperties<ConfigVariants<U>, unknown, never>>> & keyof T>>; | ||
compoundVariants: ((T extends ConfigSchema ? (ConfigVariants<T> | ConfigVariantsMulti<T>) & ClassProp : ClassProp) | (U extends ConfigSchema ? (ConfigVariants<U> | ConfigVariantsMulti<U>) & ClassProp : ClassProp))[]; | ||
}; | ||
declare type OptionalPropertyNames<T> = { | ||
[Key in keyof T]-?: {} extends { | ||
[P in Key]: T[Key]; | ||
} ? Key : never; | ||
}[keyof T]; | ||
declare type SpreadProperties<Left, Right, Key extends keyof Left & keyof Right> = { | ||
[P in Key]: Left[P] | Exclude<Right[P], undefined>; | ||
}; | ||
declare type Identity<T> = T extends infer U ? { | ||
[Key in keyof U]: U[Key]; | ||
} : never; | ||
declare type SpreadTwo<Left, Right> = Identity<Pick<Left, Exclude<keyof Left, keyof Right>> & Pick<Right, Exclude<keyof Right, OptionalPropertyNames<Right>>> & Pick<Right, Exclude<OptionalPropertyNames<Right>, keyof Left>> & SpreadProperties<Left, Right, OptionalPropertyNames<Right> & keyof Left>>; | ||
declare type Spread<Args extends readonly [...any]> = Args extends [infer Left, ...infer Right] ? SpreadTwo<Left, Spread<Right>> : unknown; | ||
export declare function merge<Args extends object[]>(...args: [...Args]): Spread<Args>; | ||
export {}; |
import { twMerge } from "tailwind-merge"; | ||
import isEqual from "lodash.isequal"; // FIXME: find the way to not to use lodash | ||
import { merge } from "./merge"; | ||
function falsyToString(value) { | ||
@@ -126,4 +125,14 @@ return typeof value === "boolean" ? "".concat(value) : value === 0 ? "0" : value; | ||
} | ||
function removeEmptyObjects(element) { | ||
return Object.keys(element).length === 0; | ||
} | ||
export function merge() { | ||
for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){ | ||
args[_key] = arguments[_key]; | ||
} | ||
// const asdf = args.filter(removeEmptyObjects) | ||
return Object.assign({}, ...args.filter(removeEmptyObjects)); | ||
} | ||
//# sourceMappingURL=index.esm.js.map |
{ | ||
"name": "cvax", | ||
"version": "0.2.0", | ||
"version": "0.2.1", | ||
"description": "Customized CVA. fork 'class-variance-authority'", | ||
@@ -5,0 +5,0 @@ "repository": "https://github.com/alexvyber/cvax.git", |
19556
8
345