@docusaurus/module-type-aliases 2.0.0-beta.13 → 2.0.0-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/module-type-aliases",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "description": "Docusaurus module type aliases.",
   "types": "./src/index.d.ts",
   "publishConfig": {
@@ -12,12 +12,12 @@
     "directory": "packages/docusaurus-module-type-aliases"
   },
   "dependencies": {
-    "@docusaurus/types": "2.0.0-beta.13",
+    "@docusaurus/types": "2.0.0-beta.15",
     "@types/react": "*",
     "@types/react-helmet": "*",
     "@types/react-router-config": "*",
     "@types/react-router-dom": "*"
   },
   "license": "MIT",
-  "gitHead": "b6ca12aedf10a10c2375f4f8b7e7380cfd7c7202"
+  "gitHead": "32ec84ef3c0a238436e913b2026ab809e5750fa8"
 }

package/src/index.d.ts

@@ -64,7 +64,14 @@ declare module '@generated/i18n' {
     defaultLocale: string;
     locales: [string, ...string[]];
     currentLocale: string;
-    localeConfigs: Record<string, {label: string; direction: string}>;
+    localeConfigs: Record<
+      string,
+      {
+        label: string;
+        direction: string;
+        htmlLang: string;
+      }
+    >;
   };
   export = i18n;
 }
@@ -88,7 +95,7 @@ declare module '@theme/Layout' {
   import type {ReactNode} from 'react';
 
   export interface Props {
-    readonly children: ReactNode;
+    readonly children?: ReactNode;
     readonly title?: string;
     readonly description?: string;
   }
@@ -120,7 +127,7 @@ declare module '@docusaurus/constants' {
 
 declare module '@docusaurus/ErrorBoundary' {
   import type {ReactNode} from 'react';
-  import ErrorComponent from '@theme/Error';
+  import type ErrorComponent from '@theme/Error';
 
   export interface Props {
     readonly fallback?: typeof ErrorComponent;
@@ -162,10 +169,10 @@ declare module '@docusaurus/Link' {
 declare module '@docusaurus/Interpolate' {
   import type {ReactNode} from 'react';
 
-  // TODO use TS template literal feature to make values typesafe!
-  // (requires upgrading TS first)
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  export type ExtractInterpolatePlaceholders<Str extends string> = string;
+  export type ExtractInterpolatePlaceholders<Str extends string> =
+    Str extends `${string}{${infer Key}}${infer Rest}`
+      ? Key | ExtractInterpolatePlaceholders<Rest>
+      : never;
 
   export type InterpolateValues<
     Str extends string,
@@ -200,13 +207,18 @@ declare module '@docusaurus/Translate' {
 
   // TS type to ensure that at least one of id or message is always provided
   // (Generic permits to handled message provided as React children)
-  type IdOrMessage<MessageKey extends 'children' | 'message'> =
-    | ({[key in MessageKey]: string} & {id?: string})
-    | ({[key in MessageKey]?: string} & {id: string});
-
-  export type TranslateParam<Str extends string> = IdOrMessage<'message'> & {
+  type IdOrMessage<
+    MessageKey extends 'children' | 'message',
+    Str extends string,
+  > =
+    | ({[key in MessageKey]: Str} & {id?: string})
+    | ({[key in MessageKey]?: Str} & {id: string});
+
+  export type TranslateParam<Str extends string> = IdOrMessage<
+    'message',
+    Str
+  > & {
     description?: string;
-    values?: InterpolateValues<Str, string | number>;
   };
 
   export function translate<Str extends string>(
@@ -214,7 +226,10 @@ declare module '@docusaurus/Translate' {
     values?: InterpolateValues<Str, string | number>,
   ): string;
 
-  export type TranslateProps<Str extends string> = IdOrMessage<'children'> & {
+  export type TranslateProps<Str extends string> = IdOrMessage<
+    'children',
+    Str
+  > & {
     description?: string;
     values?: InterpolateValues<Str, ReactNode>;
   };