fnts 3.0.3 → 3.0.4

package/lens/get.d.ts

@@ -1,24 +1,24 @@
 /**
  * @module Lens
  */
-import type { Flatten, Flattenable, NormalizeFlattenable } from '../types/flatten';
+import type { Flatten, Flattenable } from '../types/flatten';
 /**
  * Gets the value type inside a nested object type `Source` by provided `Path`
  * written in dot-notation.
  */
-export type Get<Source extends Flattenable, Path extends Flatten<NormalizeFlattenable<Source>>> = Path extends keyof Source ? Source[Path] : (Path extends `${infer Left}.${infer Right}` ? (Left extends keyof NormalizeFlattenable<Source> ? (NormalizeFlattenable<Source>[Left] extends Flattenable ? Get<NormalizeFlattenable<Source>[Left], Right> : never) : never) : never);
+export type Get<Source extends Flattenable, Path extends Flatten<Source>> = Source extends Record<string, unknown> ? (Path extends keyof Source ? Source[Path] : (Path extends `${infer Left}.${infer Right}` ? (Left extends keyof Source ? (Source[Left] extends Flattenable ? Get<Source[Left], Right> : never) : never) : never)) : Source extends any[] ? (Path extends `${number}` ? Source[number] : (Path extends `${infer Left}.${infer Right}` ? (Left extends `${number}` ? (Source[number] extends Flattenable ? Get<Source[number], Right> : never) : never) : never)) : never;
 /**
  * Gets the value inside a nested `source` object by provided `path`
  * written in dot-notation.
  */
-export default function get<Source extends Flattenable>(source: Source): <Path extends Flatten<NormalizeFlattenable<Source>>>(path: Path) => Get<Source, Path>;
+export default function get<Source extends Flattenable>(source: Source): <Path extends Flatten<Source>>(path: Path) => Get<Source, Path>;
 /**
  * Gets the value inside a nested `source` object by provided `path`
  * written in dot-notation.
  */
-export default function get<Source extends Flattenable, Path extends Flatten<NormalizeFlattenable<Source>>>(path: Path): (source: Source) => Get<Source, Path>;
+export default function get<Source extends Flattenable, Path extends Flatten<Source>>(path: Path): (source: Source) => Get<Source, Path>;
 /**
  * Gets the value inside a nested `source` object by provided `path`
  * written in dot-notation.
  */
-export default function get<Source extends Flattenable, Path extends Flatten<NormalizeFlattenable<Source>>>(source: Source, path: Path): Get<Source, Path>;
+export default function get<Source extends Flattenable, Path extends Flatten<Source>>(source: Source, path: Path): Get<Source, Path>;

package/lens/lens.d.ts

@@ -1,7 +1,7 @@
 /**
  * @module Lens
  */
-import type { Flatten, Flattenable, NormalizeFlattenable } from '../types';
+import type { Flatten, Flattenable } from '../types';
 import { Get } from './get.js';
 import { Set } from './set.js';
 /**
@@ -9,8 +9,8 @@ import { Set } from './set.js';
  * effectively creating a functional lens.
  */
 export interface Lens<Source extends Flattenable> {
-    <Path extends Flatten<NormalizeFlattenable<Source>>>(path: Path): Get<Source, Path>;
-    <Path extends Flatten<NormalizeFlattenable<Source>>, Value extends Get<Source, Path>>(path: Path, value: Value): Set<Source, Path, Value>;
+    <Path extends Flatten<Source>>(path: Path): Get<Source, Path>;
+    <Path extends Flatten<Source>, Value extends Get<Source, Path>>(path: Path, value: Value): Set<Source, Path, Value>;
 }
 /**
  * Creates a wrapper for a given `source` that provides access to both `get` and `set` functionalities for it,

package/lens/set.d.ts

@@ -1,30 +1,29 @@
 /**
  * @module Lens
  */
-import type { Unshift } from '../types/unshift';
-import type { Flatten, Flattenable, NormalizeFlattenable } from '../types/flatten';
+import type { Flatten, Flattenable } from '../types/flatten';
 import type { Get } from './get.js';
 /**
  * Sets the `Value` type inside a nested object type `Source` by provided `Path`
  * written in dot-notation.
  */
-export type Set<Source extends Flattenable, Path extends Flatten<NormalizeFlattenable<Source>>, Value extends Get<Source, Path>> = Source extends Record<string, unknown> ? (Path extends `${number}.${infer Right}` ? Set<Source, Right, Value> : (Path extends `${infer Left}.${infer Right}` ? {
-    [Key in keyof Source]: Key extends Exclude<keyof Source, Left> ? Source[Key] : Set<Exclude<Source[Left], undefined>, Right, Value>;
-} : (Path extends keyof Source ? {
-    [Key in keyof Source]: Key extends Exclude<keyof Source, Path> ? Source[Key] : Value;
-} : never))) : (Source extends any[] ? (Path extends `${infer Index extends number}.${infer Right}` ? Unshift<Source, Index, Set<Exclude<Source[Index], undefined>, Right, Value>> : (Path extends `${infer Index extends number}` ? Unshift<Source, Index, Value> : never)) : never);
+export type Set<Source extends Flattenable, Path extends Flatten<Source>, Value extends Get<Source, Path>> = Source extends Record<string, unknown> ? (Path extends keyof Source ? {
+    [Key in keyof Source]: Key extends Path ? Value : Source[Key];
+} : (Path extends `${infer Left}.${infer Right}` ? (Left extends keyof Source ? (Source[Left] extends Flattenable ? {
+    [Key in keyof Source]: (Key extends Left ? Set<Source[Left], Right, Value> : Source[Key]);
+} : never) : never) : never)) : Source extends any[] ? (Path extends `${number}` ? Value[] : (Path extends `${infer Left}.${infer Right}` ? (Left extends `${number}` ? (Source[number] extends Flattenable ? Set<Source[number], Right, Value>[] : never) : never) : never)) : never;
 /**
  * Sets the `value` inside a nested `source` object by provided `path`
  * written in dot-notation.
  */
-export default function set<Source extends Flattenable>(source: Source): <Path extends Flatten<NormalizeFlattenable<Source>>, Value extends Get<Source, Path>>(path: Path, value: Value) => Set<Source, Path, Value>;
+export default function set<Source extends Flattenable>(source: Source): <Path extends Flatten<Source>, Value extends Get<Source, Path>>(path: Path, value: Value) => Set<Source, Path, Value>;
 /**
  * Sets the `value` inside a nested `source` object by provided `path`
  * written in dot-notation.
  */
-export default function set<Source extends Flattenable, Path extends Flatten<NormalizeFlattenable<Source>>, Value extends Get<Source, Path>>(path: Path, value: Value): (source: Source) => Set<Source, Path, Value>;
+export default function set<Source extends Flattenable, Path extends Flatten<Source>, Value extends Get<Source, Path>>(path: Path, value: Value): (source: Source) => Set<Source, Path, Value>;
 /**
  * Sets the `value` inside a nested `source` object by provided `path`
  * written in dot-notation.
  */
-export default function set<Source extends Flattenable, Path extends Flatten<NormalizeFlattenable<Source>>, Value extends Get<Source, Path>>(source: Source, path: Path, value: Value): Set<Source, Path, Value>;
+export default function set<Source extends Flattenable, Path extends Flatten<Source>, Value extends Get<Source, Path>>(source: Source, path: Path, value: Value): Set<Source, Path, Value>;

package/lens/set.js

@@ -21,7 +21,6 @@ export default function set(...args) {
     }
 }
 function setter(source, path, value) {
-    // @ts-ignore
     const keys = path.split('.');
     const length = keys.length;
     let result = structuredClone(source);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnts",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "license": "MIT",
   "author": "Dmytro Vasylkivskyi",
   "description": "TypeScript / JavaScript FP utilities",

package/types/flatten.d.ts

@@ -5,12 +5,7 @@
 /**
  * Type subjective to flattening.
  */
-export type Flattenable = Record<string, unknown> | Array<any>
-
-export type NormalizeFlattenable<Source extends Flattenable> = 
-  Source extends Array<infer Element>
-    ? Record<`${number}`, Element>
-    : Source
+export type Flattenable = Record<string, unknown> | any[]
 
 /**
  * Recursively flattens object type to a union of its keys
@@ -18,15 +13,26 @@ export type NormalizeFlattenable<Source extends Flattenable> =
  */
 export type Flatten<
   Source extends Flattenable,
-> = | keyof NormalizeFlattenable<Source>
-    | keyof {
+> = (
+  Source extends Record<string, unknown>
+    ? (keyof {
       [
         Key in keyof Source as
           Key extends string
             ? (Source[Key] extends Flattenable
-              // @ts-ignore
-              ? `${Key}.${Flatten<NormalizeFlattenable<Source[Key]>>}`
-              : Key)
+              ? Key | `${Key}.${Flatten<Source[Key]>}`
+              : (Source[Key] extends any[]
+                ? Key | `${Key}.${number}.${Flatten<Source[Key][number]>}`
+                : Key))
             : never
-      ]: never
-    }
+      ]: void
+    })
+    : (Source extends any[]
+      ? (Source[number] extends Flattenable
+        ? `${number}` | `${number}.${Flatten<Source[number]>}`
+        : `${number}`)
+      : never)
+  // So that Flatten is recognized to always return strings
+) extends infer Key extends string
+      ? Key
+      : never

package/types/unshift.d.ts

@@ -8,9 +8,9 @@ import { Slice } from './slice'
 /**
  * Replaces `T` element on specified index `I` with `E`.
  */
-export type Unshift<T extends readonly any[], I extends number, E> =
-  I extends 0
-    ? [E, ...Slice<T, 1>]
-    : I extends Trim<T, 1>['length']
-      ? [...Trim<T, 1>, E]
-      : [...Trim<T, Slice<T, I>['length']>, E, ...Slice<Slice<T, I>, 1>]
+export type Unshift<Array extends ReadonlyArray<any>, Index extends number, Element> =
+  Index extends 0
+    ? [Element, ...Slice<Array, 1>]
+    : Index extends Trim<Array, 1>['length']
+      ? [...Trim<Array, 1>, Element]
+      : [...Trim<Array, Slice<Array, Index>['length']>, Element, ...Slice<Slice<Array, Index>, 1>]