@snack-uikit/locale 0.7.0 → 0.7.1-preview-c1f980c6.0

package/dist/typeUtils.d.ts

@@ -23,8 +23,11 @@ type PartialReadonlySetDeep<T> = unknown & ReadonlySet<PartialDeep<T>>;
 type PartialObjectDeep<ObjectType extends object> = {
     [KeyType in keyof ObjectType]?: PartialDeep<ObjectType[KeyType]>;
 };
-export type PathsToStringProps<T> = T extends string ? [] : {
-    [K in Extract<keyof T, string>]: [K, ...PathsToStringProps<T[K]>];
+/**
+ * https://stackoverflow.com/a/73179989
+ */
+type Dot<T extends string, U extends string> = '' extends U ? T : `${T}.${U}`;
+export type PathsToProps<T, V> = T extends V ? '' : {
+    [K in Extract<keyof T, string>]: Dot<K, PathsToProps<T[K], V>>;
 }[Extract<keyof T, string>];
-export type Join<T extends string[], D extends string> = T extends [] ? never : T extends [infer F] ? F : T extends [infer F, ...infer R] ? F extends string ? `${F}${D}${Join<Extract<R, string[]>, D>}` : never : string;
 export {};

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import { LOCALES } from './locales';
-import { Join, PartialDeep, PathsToStringProps } from './typeUtils';
+import { PartialDeep, PathsToProps } from './typeUtils';
 export type KnownLocaleLang = keyof typeof LOCALES;
 export type LocaleLang = KnownLocaleLang | string;
 export type LocaleDictionary = typeof LOCALES.en_GB;
 export type OverrideLocales = PartialDeep<Record<LocaleLang, LocaleDictionary>>;
-export type DottedTranslationKey<C extends keyof LocaleDictionary | undefined = undefined> = C extends string ? Join<PathsToStringProps<LocaleDictionary[C]>, '.'> : Join<PathsToStringProps<LocaleDictionary>, '.'>;
+export type DottedTranslationKey<C extends keyof LocaleDictionary | undefined = undefined> = C extends keyof LocaleDictionary ? PathsToProps<LocaleDictionary[C], string> : PathsToProps<LocaleDictionary, string>;

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Locale",
-  "version": "0.7.0",
+  "version": "0.7.1-preview-c1f980c6.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -37,5 +37,5 @@
   "devDependencies": {
     "@types/lodash.merge": "4.6.9"
   },
-  "gitHead": "bf1e1f3cfabccc1ee288c18722e33009bd001798"
+  "gitHead": "3ec993f2aba85ac8111cb418ef4161ffa8038efc"
 }

package/src/typeUtils.ts

@@ -47,18 +47,13 @@ type PartialObjectDeep<ObjectType extends object> = {
   [KeyType in keyof ObjectType]?: PartialDeep<ObjectType[KeyType]>;
 };
 
-export type PathsToStringProps<T> = T extends string
-  ? []
+/**
+ * https://stackoverflow.com/a/73179989
+ */
+type Dot<T extends string, U extends string> = '' extends U ? T : `${T}.${U}`;
+
+export type PathsToProps<T, V> = T extends V
+  ? ''
   : {
-      [K in Extract<keyof T, string>]: [K, ...PathsToStringProps<T[K]>];
+      [K in Extract<keyof T, string>]: Dot<K, PathsToProps<T[K], V>>;
     }[Extract<keyof T, string>];
-
-export type Join<T extends string[], D extends string> = T extends []
-  ? never
-  : T extends [infer F]
-    ? F
-    : T extends [infer F, ...infer R]
-      ? F extends string
-        ? `${F}${D}${Join<Extract<R, string[]>, D>}`
-        : never
-      : string;

package/src/types.ts

@@ -1,5 +1,5 @@
 import { LOCALES } from './locales';
-import { Join, PartialDeep, PathsToStringProps } from './typeUtils';
+import { PartialDeep, PathsToProps } from './typeUtils';
 
 export type KnownLocaleLang = keyof typeof LOCALES;
 
@@ -11,6 +11,5 @@ export type LocaleDictionary = typeof LOCALES.en_GB;
 // export type OverrideLocales = PartialDeep<Record<KnownLocaleLang, LocaleDictionary>> | Record<string, LocaleDictionary>;
 export type OverrideLocales = PartialDeep<Record<LocaleLang, LocaleDictionary>>;
 
-export type DottedTranslationKey<C extends keyof LocaleDictionary | undefined = undefined> = C extends string
-  ? Join<PathsToStringProps<LocaleDictionary[C]>, '.'>
-  : Join<PathsToStringProps<LocaleDictionary>, '.'>;
+export type DottedTranslationKey<C extends keyof LocaleDictionary | undefined = undefined> =
+  C extends keyof LocaleDictionary ? PathsToProps<LocaleDictionary[C], string> : PathsToProps<LocaleDictionary, string>;