fnts 3.0.2 → 3.0.4

package/lens/get.d.ts

@@ -6,7 +6,7 @@ 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 string> = Source extends Record<string, unknown> ? Path extends `${number}.${infer Right}` ? Get<Source, Right> : Path extends `${infer Left extends keyof Source}.${infer Right}` ? Get<Exclude<Source[Left], undefined>, Right> | Extract<Source[Left], undefined> : Path extends keyof Source ? Source[Path] : never : Source extends any[] ? Path extends `${infer Index extends number}.${infer Right}` ? Get<Exclude<Source[Index], undefined>, Right> | Extract<Source[Index], undefined> : Path extends `${infer Index extends number}` ? Source[Index] : 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.

package/lens/set.d.ts

@@ -1,18 +1,17 @@
 /**
  * @module Lens
  */
-import type { Unshift } from '../types/unshift';
 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 string, Value> = Source extends Record<string, unknown> ? Path extends `${number}.${infer Right}` ? Set<Source, Right, Value> : Path extends `${infer Left extends keyof Source}.${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.

package/lens/set.js

@@ -12,7 +12,6 @@ export default function set(...args) {
             return (path, value) => setter(args[0], path, value);
         }
         case 2: {
-            // @ts-ignore
             return (source) => setter(source, args[0], args[1]);
         }
         case 3: {
@@ -21,10 +20,7 @@ export default function set(...args) {
         }
     }
 }
-function setter(source, path, value
-// @ts-ignore
-) {
-    // @ts-ignore
+function setter(source, path, value) {
     const keys = path.split('.');
     const length = keys.length;
     let result = structuredClone(source);
@@ -40,6 +36,5 @@ function setter(source, path, value
             scope = scope?.[keys?.[index]];
         }
     }
-    // @ts-ignore
     return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnts",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "license": "MIT",
   "author": "Dmytro Vasylkivskyi",
   "description": "TypeScript / JavaScript FP utilities",
@@ -16,7 +16,7 @@
   "repository": "https://github.com/drizzer14/fnts",
   "type": "module",
   "peerDependencies": {
-    "typescript": ">=5.0 <=5.3.3"
+    "typescript": ">=5.0"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/tsconfig.json

@@ -11,7 +11,6 @@
     "esModuleInterop": true,
     "strict": true,
     "alwaysStrict": true,
-    "skipLibCheck": true,
     "noImplicitAny": true,
     "noUnusedLocals": false,
     "strictNullChecks": true,

package/types/flatten.d.ts

@@ -12,23 +12,27 @@ export type Flattenable = Record<string, unknown> | any[]
  * combined through dot-notation.
  */
 export type Flatten<
-  Source extends Record<string, unknown> | any[],
-> = keyof Source extends keyof any[]
-  ? `${number}`
-  : (
-    | keyof Source
-    | keyof {
+  Source extends Flattenable,
+> = (
+  Source extends Record<string, unknown>
+    ? (keyof {
       [
         Key in keyof Source as
           Key extends string
-            ? Source[Key] extends Record<string, unknown>
-              ? `${Key}.${Flatten<Source[Key]>}`
-              : Source[Key] extends any[]
-                ? Source[Key] extends Array<any[]> | Record<string, unknown>[]
-                    ? `${Key}.${number}` | `${Key}.${number}.${Flatten<Source[Key][number]>}`
-                    : `${Key}.${number}`
-                : Key
+            ? (Source[Key] extends Flattenable
+              ? 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 any[] | 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>]