Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the translation function fully type-safe #1193

Merged
merged 5 commits into from
Dec 7, 2020
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Prettier does not support typescript 4.1 syntax yet.
# Once they support it, we can remove this line.
# https://github.com/prettier/prettier/issues/9234
src/ts4.1/index.d.ts
7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
"description": "Internationalization for react done right. Using the i18next i18n ecosystem.",
"main": "dist/commonjs/index.js",
"types": "src/index.d.ts",
"typesVersions": {
">=4.1": {
"*": [
"src/ts4.1/index.d.ts"
]
}
},
"jsnext:main": "dist/es/index.js",
"module": "dist/es/index.js",
"keywords": [
Expand Down
196 changes: 196 additions & 0 deletions src/ts4.1/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
import i18next, { ReactOptions, i18n, ThirdPartyModule, Resource, TOptions, StringMap } from 'i18next';
import * as React from 'react';

/**
* This interface can be augmented by users to add types to `react-i18next` default resources.
*/
export interface Resources {}

type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think type Omit is already included in TypeScript.

Can be found here: https://www.typescriptlang.org/docs/handbook/utility-types.html#omittype-keys

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, this is coming from the original code, but it won't hurt if I remove it.


type ResourcesKey<T = keyof Resources> = [T] extends [never] ? string : T;

export type Namespace = ResourcesKey | ResourcesKey[];

export function setDefaults(options: ReactOptions): void;
export function getDefaults(): ReactOptions;
export function setI18n(instance: i18n): void;
export function getI18n(): i18n;
export const initReactI18next: ThirdPartyModule;
export function composeInitialProps(ForComponent: any): (ctx: unknown) => Promise<any>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a hard time understanding this function, it takes a component as a parameter, returns a context of unknown type, which returns a promise of any type?

  1. ForComponent is of type any? Could we be more specific of which type this is, maybe ReactNode | ReactElement?
  2. Same as above, but with the Promise, is there a possibilty for us to be more specific about the type, as any type should be avoided as much as possible.

Copy link
Member Author

@pedrodurek pedrodurek Dec 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those types are coming from the original code, so I don't know much about the composeInitialProps function, but I definitely agree, we shouldn't be using any, so we could create an issue to tackle that later.

export function getInitialProps(): {
initialI18nStore: {
[ns: string]: {};
};
initialLanguage: string;
};

export interface ReportNamespaces {
addUsedNamespaces(namespaces: Namespace[]): void;
getUsedNamespaces(): string[];
}

declare module 'i18next' {
interface i18n {
reportNamespaces: ReportNamespaces;
}
}

// Normalize single namespace
type OmitArrayProps<T> = Exclude<T, keyof any[]>;
type AppendKeys<K1, K2> = `${K1 & string}.${OmitArrayProps<K2> & string}`;
type Normalize2<T, K = keyof T> = K extends keyof T
? T[K] extends object
? AppendKeys<K, keyof T[K]> | AppendKeys<K, Normalize2<T[K]>>
: never
: never;
type Normalize<T> = keyof T | Normalize2<T>;

// Normalize multiple namespaces
type UnionToIntersection<U> = (U extends any
? (k: U) => void
: never) extends (k: infer I) => void
? I
: never;
type LastOf<T> = UnionToIntersection<
T extends any ? () => T : never
> extends () => infer R
? R
: never;
type AppendNS<N, K> = `${N & string}:${K & string}`;
type NormalizeMulti<T, U extends keyof T, L = LastOf<U>> = L extends U
? AppendNS<L, Normalize<T[L]>> | NormalizeMulti<T, Exclude<U, L>>
: never;

type NormalizeReturn<T, V> = V extends `${infer K}.${infer R}`
? K extends keyof T
? NormalizeReturn<T[K], R>
: never
: V extends keyof T
? T[V]
: never;

type NormalizeMultiReturn<T, V> = V extends `${infer N}:${infer R}`
? N extends keyof T
? NormalizeReturn<T[N], R>
: never
: never;

export type TFuncKey<N, T = Resources> = N extends (keyof T)[]
? NormalizeMulti<T, N[number]>
: N extends keyof T
? Normalize<T[N]>
: string;

export type TFuncReturn<N, P, T = Resources> = N extends (keyof T)[]
? NormalizeMultiReturn<T, P>
: N extends keyof T
? NormalizeReturn<T[N], P>
: string;

export interface TFunction<N extends Namespace> {
<K extends TFuncKey<N>, TInterpolationMap extends object = StringMap>(
key: K,
options?: TOptions<TInterpolationMap> | string,
): TFuncReturn<N, K>;
<K extends TFuncKey<N>, TInterpolationMap extends object = StringMap>(
key: K,
defaultValue?: string,
options?: TOptions<TInterpolationMap> | string,
): TFuncReturn<N, K>;
}

export interface TransProps<N extends Namespace, K extends TFuncKey<N>, E extends Element = HTMLDivElement>
extends React.HTMLProps<E> {
children?: React.ReactNode;
components?: readonly React.ReactNode[] | { [tagName: string]: React.ReactNode };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should readonly not be placed before components, like this:

readonly components?: React.ReactNode[] | { [tagName: string]: React.ReactNode };

Copy link
Member Author

@pedrodurek pedrodurek Dec 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, this is coming from the original code, but you're definetly right, readonly won't have any effect if placed after.

count?: number;
defaults?: string;
i18n?: i18n;
i18nKey?: K;
ns?: N;
parent?: string | React.ComponentType<any> | null; // used in React.createElement if not null
tOptions?: {};
values?: {};
t?: TFunction<N>;
}
export function Trans<N extends Namespace, K extends TFuncKey<N>, E extends Element = HTMLDivElement>(
props: TransProps<N, K, E>
): React.ReactElement;

export function useSSR(initialI18nStore: Resource, initialLanguage: string): void;

export interface UseTranslationOptions {
i18n?: i18n;
useSuspense?: boolean;
}

type UseTranslationResponse<N extends Namespace> = [TFunction<N>, i18n, boolean] & {
t: TFunction<N>;
i18n: i18n;
ready: boolean;
};
export function useTranslation<
N extends Namespace = Extract<ResourcesKey, 'translation'>
>(
ns?: N,
options?: UseTranslationOptions
): UseTranslationResponse<N>;

// Need to see usage to improve this
export function withSSR(): <Props>(
WrappedComponent: React.ComponentType<Props>,
) => {
({
initialI18nStore,
initialLanguage,
...rest
}: {
initialI18nStore: Resource;
initialLanguage: string;
} & Props): React.FunctionComponentElement<Props>;
getInitialProps: (ctx: unknown) => Promise<any>;
};

export interface WithTranslation<N extends Namespace> {
t: TFunction<N>;
i18n: i18n;
tReady: boolean;
}

export interface WithTranslationProps {
i18n?: i18n;
useSuspense?: boolean;
}

export function withTranslation<N extends Namespace>(
ns?: N,
options?: {
withRef?: boolean;
},
): <P extends WithTranslation<N>>(
component: React.ComponentType<P>,
) => React.ComponentType<Omit<P, keyof WithTranslation<N>> & WithTranslationProps>;

export interface I18nextProviderProps {
i18n: i18n;
defaultNS?: string;
}

export const I18nextProvider: React.FunctionComponent<I18nextProviderProps>;
export const I18nContext: React.Context<{ i18n: i18n }>;

export interface TranslationProps<N extends Namespace> {
children: (
t: TFunction<N>,
options: {
i18n: i18n;
lng: string;
},
ready: boolean,
) => React.ReactNode;
ns?: N;
i18n?: i18n;
}

export function Translation<N extends Namespace>(props: TranslationProps<N>): any;