Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/_docs/components/Tables.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Table, TableCell, TableRow } from '../elements/Tables';
export const PropTable = ({
group,
}: {
group: keyof (typeof animus)['groupRegistry'];
group: keyof typeof animus['groupRegistry'];
}) => {
return (
<Table>
Expand Down
5 changes: 2 additions & 3 deletions packages/_docs/pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ class MyDocument extends Document {

ctx.renderPage = () =>
originalRenderPage({
enhanceApp: (App) => (props) => (
<App {...({ ...props, cache } as any)} />
),
enhanceApp: (App) => (props) =>
<App {...({ ...props, cache } as any)} />,
});

const initialProps = await Document.getInitialProps(ctx);
Expand Down
2 changes: 1 addition & 1 deletion packages/_integration/__tests__/variance.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('style props', () => {
describe('parsers', () => {
it('has the correct config', () => {
const propNamesRestricted: Assert<
(typeof space)['propNames'],
typeof space['propNames'],
('margin' | 'padding')[]
> = true;

Expand Down
16 changes: 8 additions & 8 deletions packages/core/src/Animus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class AnimusWithAll<
Variants extends Record<string, VariantConfig>,
States extends CSSPropMap<AbstractProps, SystemProps<BaseParser>>,
ActiveGroups extends Record<string, true>,
CustomProps extends Record<string, Prop>,
CustomProps extends Record<string, Prop>
> {
propRegistry = {} as PropRegistry;
groupRegistry = {} as GroupRegistry;
Expand Down Expand Up @@ -141,7 +141,7 @@ class AnimusWithSystem<
BaseStyles extends CSSProps<AbstractProps, SystemProps<BaseParser>>,
Variants extends Record<string, VariantConfig>,
States extends CSSPropMap<AbstractProps, SystemProps<BaseParser>>,
ActiveGroups extends Record<string, true>,
ActiveGroups extends Record<string, true>
> extends AnimusWithAll<
PropRegistry,
GroupRegistry,
Expand Down Expand Up @@ -184,7 +184,7 @@ class AnimusWithStates<
BaseParser extends Parser<PropRegistry>,
BaseStyles extends CSSProps<AbstractProps, SystemProps<BaseParser>>,
Variants extends Record<string, VariantConfig>,
States extends CSSPropMap<AbstractProps, SystemProps<BaseParser>>,
States extends CSSPropMap<AbstractProps, SystemProps<BaseParser>>
> extends AnimusWithSystem<
PropRegistry,
GroupRegistry,
Expand Down Expand Up @@ -225,7 +225,7 @@ class AnimusWithVariants<
GroupRegistry extends Record<string, (keyof PropRegistry)[]>,
BaseParser extends Parser<PropRegistry>,
BaseStyles extends CSSProps<AbstractProps, SystemProps<BaseParser>>,
Variants extends Record<string, VariantConfig>,
Variants extends Record<string, VariantConfig>
> extends AnimusWithStates<
PropRegistry,
GroupRegistry,
Expand Down Expand Up @@ -261,7 +261,7 @@ class AnimusWithVariants<
Keys extends keyof Props,
Base extends AbstractProps,
Props extends Record<Keys, AbstractProps>,
PropKey extends Readonly<string> = 'variant',
PropKey extends Readonly<string> = 'variant'
>(options: {
prop?: PropKey;
defaultVariant?: keyof Props;
Expand All @@ -285,7 +285,7 @@ class AnimusWithBase<
PropRegistry extends Record<string, Prop>,
GroupRegistry extends Record<string, (keyof PropRegistry)[]>,
BaseParser extends Parser<PropRegistry>,
BaseStyles extends CSSProps<AbstractProps, SystemProps<BaseParser>>,
BaseStyles extends CSSProps<AbstractProps, SystemProps<BaseParser>>
> extends AnimusWithVariants<
PropRegistry,
GroupRegistry,
Expand All @@ -305,7 +305,7 @@ class AnimusWithBase<
Keys extends keyof Props,
Base extends AbstractProps,
Props extends Record<Keys, AbstractProps>,
PropKey extends Readonly<string> = 'variant',
PropKey extends Readonly<string> = 'variant'
>(options: {
prop?: PropKey;
defaultVariant?: keyof Props;
Expand All @@ -328,7 +328,7 @@ class AnimusWithBase<
export class Animus<
PropRegistry extends Record<string, Prop>,
GroupRegistry extends Record<string, (keyof PropRegistry)[]>,
BaseParser extends Parser<PropRegistry>,
BaseParser extends Parser<PropRegistry>
> extends AnimusWithBase<PropRegistry, GroupRegistry, BaseParser, {}> {
constructor(props: PropRegistry, groups: GroupRegistry) {
super(props, groups, createParser(props) as BaseParser, {});
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/AnimusConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Prop } from './types/config';

export class AnimusConfig<
C extends Record<string, Prop> = {},
G extends Record<string, (keyof C)[]> = {},
G extends Record<string, (keyof C)[]> = {}
> {
#props = {} as C;
#groups = {} as G;
Expand All @@ -16,7 +16,7 @@ export class AnimusConfig<
addGroup<
Name extends string,
Conf extends Record<string, Prop>,
PropNames extends keyof Conf,
PropNames extends keyof Conf
>(name: Name, config: Conf) {
const newGroup = {
[name]: Object.keys(config),
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/AnimusExtended.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export class AnimusExtended<
Variants extends Record<string, VariantConfig>,
States extends CSSPropMap<AbstractProps, SystemProps<BaseParser>>,
ActiveGroups extends Record<string, true>,
CustomProps extends Record<string, Prop>,
CustomProps extends Record<string, Prop>
> {
propRegistry = {} as PropRegistry;
groupRegistry = {} as GroupRegistry;
Expand Down Expand Up @@ -88,7 +88,7 @@ export class AnimusExtended<
Keys extends keyof Props,
Base extends AbstractProps,
Props extends Record<Keys, AbstractProps>,
PropKey extends Readonly<string> = 'variant',
PropKey extends Readonly<string> = 'variant'
>(options: {
prop?: PropKey;
defaultVariant?: keyof Props;
Expand Down
22 changes: 11 additions & 11 deletions packages/core/src/legacy/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface AbstractParser {

export type PropertyValues<
Property extends keyof PropertyTypes,
All extends boolean = false,
All extends boolean = false
> = Exclude<
PropertyTypes<All extends true ? DefaultCSSPropertyValue : never>[Property],
All extends true ? never : object | any[]
Expand All @@ -49,10 +49,10 @@ export type ScaleValue<Config extends Prop> =
Config['scale'] extends keyof Theme
? keyof Theme[Config['scale']] | PropertyValues<Config['property']>
: Config['scale'] extends MapScale
? keyof Config['scale'] | PropertyValues<Config['property']>
: Config['scale'] extends ArrayScale
? Config['scale'][number] | PropertyValues<Config['property']>
: PropertyValues<Config['property'], true>;
? keyof Config['scale'] | PropertyValues<Config['property']>
: Config['scale'] extends ArrayScale
? Config['scale'][number] | PropertyValues<Config['property']>
: PropertyValues<Config['property'], true>;

/**
* Value or something
Expand Down Expand Up @@ -80,7 +80,7 @@ export type TransformerMap<Config extends Record<string, Prop>> = {
[P in Key<keyof Config>]: PropTransformer<Key<P>, Config[P]>;
};
export interface Parser<
Config extends Record<string, AbstractPropTransformer>,
Config extends Record<string, AbstractPropTransformer>
> {
(props: ParserProps<Config>, orderProps?: boolean): CSSObject;
propNames: (keyof Config)[];
Expand All @@ -98,7 +98,7 @@ export interface Variant<P extends AbstractParser> {
Keys extends keyof Props,
Base extends AbstractProps,
Props extends Record<Keys, AbstractProps>,
PropKey extends Readonly<string> = 'variant',
PropKey extends Readonly<string> = 'variant'
>(options: {
prop?: PropKey;
defaultVariant?: keyof Props;
Expand All @@ -114,13 +114,13 @@ export interface States<P extends AbstractParser> {
}

export interface CSS<P extends AbstractParser> {
<Props extends AbstractProps>(
config: CSSProps<Props, SystemProps<P>>
): (props: ThemeProps) => CSSObject;
<Props extends AbstractProps>(config: CSSProps<Props, SystemProps<P>>): (
props: ThemeProps
) => CSSObject;
}

export type ParserProps<
Config extends Record<string, AbstractPropTransformer>,
Config extends Record<string, AbstractPropTransformer>
> = ThemeProps<{
[P in keyof Config]?: Parameters<Config[P]['styleFn']>[2][Config[P]['prop']];
}>;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/legacy/createCss.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { create } from './create';

export function createCss<
Config extends Record<string, Prop>,
P extends Parser<TransformerMap<Config>>,
P extends Parser<TransformerMap<Config>>
>(config: Config): CSS<P> {
const parser = create(config);
const filteredProps = parser.propNames as string[];
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/legacy/createParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const renderPropValue = (
};

export function createParser<
Config extends Record<string, AbstractPropTransformer>,
Config extends Record<string, AbstractPropTransformer>
>(config: Config): Parser<Config> {
const propNames = orderPropNames(config);
const ctx: RenderContext = {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/legacy/createStates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { createCss } from './createCss';

export function createStates<
Config extends Record<string, Prop>,
P extends Parser<TransformerMap<Config>>,
P extends Parser<TransformerMap<Config>>
>(config: Config): States<P> {
const css: CSS<P> = createCss(config);

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/legacy/createVariant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { createCss } from './createCss';

export function createVariant<
Config extends Record<string, Prop>,
P extends Parser<TransformerMap<Config>>,
P extends Parser<TransformerMap<Config>>
>(config: Config): Variant<P> {
const css: CSS<P> = createCss(config);

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/legacy/responsive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const isMediaMap = (
intersection(Object.keys(val), BREAKPOINT_KEYS).length > 0;

interface ResponsiveParser<
Bp extends MediaQueryMap<string | number> | (string | number)[],
Bp extends MediaQueryMap<string | number> | (string | number)[]
> {
<C extends AbstractPropTransformer>(
value: Bp,
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/properties/styledOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import isPropValid from '@emotion/is-prop-valid';

export type ForwardableProps<
El extends keyof JSX.IntrinsicElements,
Reserved,
Reserved
> = Exclude<
El extends keyof JSX.IntrinsicElements
? keyof JSX.IntrinsicElements[El]
Expand All @@ -30,7 +30,7 @@ export const createStyledOptions = <T extends Record<string, any>>(
const bindShouldForward = <
El extends keyof JSX.IntrinsicElements = 'div',
Forward extends string = never,
Filter extends string = never,
Filter extends string = never
>(opts?: {
element?: El;
forward?: readonly Forward[];
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/styles/responsive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const isMediaMap = (
intersection(Object.keys(val), BREAKPOINT_KEYS).length > 0;

interface ResponsiveParser<
Bp extends MediaQueryMap<string | number> | (string | number)[],
Bp extends MediaQueryMap<string | number> | (string | number)[]
> {
<C extends Prop>(
value: Bp,
Expand Down
30 changes: 14 additions & 16 deletions packages/core/src/types/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type IsEmpty<T> = [] extends T ? true : false | {} extends T ? true : false;

export type PropertyValues<
Property extends Prop,
IncludeGlobals = false,
IncludeGlobals = false
> = Exclude<
PropertyTypes<
IncludeGlobals extends true ? DefaultCSSPropertyValue : never
Expand All @@ -44,25 +44,23 @@ type CompatValue<Key extends keyof CompatTheme> =
CompatTheme[Key] extends MapScale
? keyof CompatTheme[Key]
: CompatTheme[Key] extends ArrayScale
? CompatTheme[Key][number]
: never;
? CompatTheme[Key][number]
: never;

export type ScaleValue<Config extends Prop> =
Config['scale'] extends keyof Theme
?
| keyof Theme[Config['scale']]
| PropertyValues<Config, IsEmpty<Theme[Config['scale']]>>
: Config['scale'] extends MapScale
? keyof Config['scale'] | PropertyValues<Config, IsEmpty<Config['scale']>>
: Config['scale'] extends ArrayScale
?
| Config['scale'][number]
| PropertyValues<Config, IsEmpty<Config['scale']>>
: Config['scale'] extends keyof CompatTheme
?
| CompatValue<Config['scale']>
| PropertyValues<Config, IsEmpty<CompatTheme[Config['scale']]>>
: PropertyValues<Config, true>;
? keyof Config['scale'] | PropertyValues<Config, IsEmpty<Config['scale']>>
: Config['scale'] extends ArrayScale
? Config['scale'][number] | PropertyValues<Config, IsEmpty<Config['scale']>>
: Config['scale'] extends keyof CompatTheme
?
| CompatValue<Config['scale']>
| PropertyValues<Config, IsEmpty<CompatTheme[Config['scale']]>>
: PropertyValues<Config, true>;

export type Scale<Config extends Prop> = ResponsiveProp<
ScaleValue<Config> | ((theme: Theme) => ScaleValue<Config>)
Expand All @@ -80,7 +78,7 @@ export interface Parser<Config extends Record<string, Prop>> {

export type SystemProps<
P extends AbstractParser,
SafeProps = Omit<Arg<P>, 'theme'>,
SafeProps = Omit<Arg<P>, 'theme'>
> = {
[K in keyof SafeProps]: SafeProps[K];
};
Expand All @@ -99,6 +97,6 @@ export type CSSProps<Props, System> = {
[K in keyof Props]?: K extends keyof System
? System[K]
: K extends keyof PropertyTypes
? PropertyTypes[K]
: Omit<PropertyTypes, keyof System> & Omit<System, 'theme'>;
? PropertyTypes[K]
: Omit<PropertyTypes, keyof System> & Omit<System, 'theme'>;
};
2 changes: 1 addition & 1 deletion packages/theming/src/core/ThemeBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class ThemeWithRawColors<
Bps extends Breakpoints,
Scales,
Tokens,
Vars,
Vars
> extends ThemeWithAll<Bps, Scales, Tokens, Vars> {
constructor(breakpoints: Bps, scales: Scales, tokens: Tokens, vars: Vars) {
super(breakpoints, scales, tokens, vars);
Expand Down
8 changes: 4 additions & 4 deletions packages/theming/src/utils/createTheme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class ThemeBuilder<T extends AbstractTheme> {
*/
addColors<
Colors extends Record<string, string | number | CSSObject>,
NextColors extends LiteralPaths<Colors, '-'>,
NextColors extends LiteralPaths<Colors, '-'>
>(
colors: Colors
): ThemeBuilder<
Expand Down Expand Up @@ -87,7 +87,7 @@ export class ThemeBuilder<T extends AbstractTheme> {
Config extends Record<Modes, ModeColors>,
ColorAliases extends {
[K in keyof Config]: LiteralPaths<Config[K], '-', '_'>;
},
}
>(
initialMode: InitialMode,
modeConfig: Config
Expand Down Expand Up @@ -148,7 +148,7 @@ export class ThemeBuilder<T extends AbstractTheme> {
string | number,
string | number | Record<string, string | number>
>,
NewScale extends LiteralPaths<ReturnType<Fn>, '-'>,
NewScale extends LiteralPaths<ReturnType<Fn>, '-'>
>(
key: Key,
createScale: Fn
Expand All @@ -167,7 +167,7 @@ export class ThemeBuilder<T extends AbstractTheme> {
*/
updateScale<
Key extends keyof T,
Fn extends (tokens: T[Key]) => Record<string | number, unknown>,
Fn extends (tokens: T[Key]) => Record<string | number, unknown>
>(
key: Key,
updateFn: Fn
Expand Down
Loading