free-types-core 0.8.0 → 0.8.2

package/dist/unwrap.d.ts

@@ -1,4 +1,4 @@
-import { ArrayKeys, Eq } from './utils';
+import { ArrayKeys, Eq, And, Extends, Not } from './utils';
 import { Type } from './Type';
 import { inferArgs } from './inferArgs';
 import { Generic, apply } from './apply';
@@ -22,7 +22,7 @@ declare global {
 }
 export { unwrap, Unwrapped, Search };
 /** Decompose a type into its constituents */
-declare type unwrap<T, From extends Search = TypesMap> = T extends readonly unknown[] ? unwrapLists<T> : _unwrap<T, From extends Type ? [From] : From>;
+declare type unwrap<T, From extends Search = TypesMap> = And<Extends<T, readonly unknown[]>, Not<Extends<From, Type | Type[]>>> extends true ? unwrapLists<T extends readonly unknown[] ? T : never> : _unwrap<T, From extends Type ? [From] : From>;
 declare type unwrapLists<T> = T extends unknown[] ? T extends [unknown, ...unknown[]] ? Unwrapped<'Tuple', Tuple, T> : Unwrapped<'Array', Array, [T[0]]> : T extends readonly [unknown, ...unknown[]] ? Unwrapped<'ReadonlyTuple', ReadonlyTuple, Mutable<T>> : Unwrapped<'ReadonlyArray', ReadonlyArray, [(T & unknown[])[0]]>;
 declare type Mutable<T> = {
     -readonly [K in keyof T]: K extends ArrayKeys ? T[K] : T[K];

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 export { Natural, Prev, Next, Subtract };
 export { ArrayKeys, Slice, ToTuple, Tuple, Head, Tail, Last, Init };
-export { Extends, Eq, IsUnknown, IsAny, IsOptional };
+export { Extends, Eq, And, Not, IsUnknown, IsAny, IsOptional };
 declare type Natural = [0, ..._Next];
 declare type Prev<I extends number> = number extends I ? number : number & _Prev[I];
 declare type _Prev = [never, ...Natural];
@@ -27,5 +27,8 @@ declare type IsUnknown<T> = unknown extends T ? IsAny<T> extends false ? true :
 declare type IsAny<T> = Extends<T | anything, T & anything>;
 declare type Extends<A, B> = [A] extends [B] ? true : false;
 declare type Eq<A, B> = [A] extends [B] ? [B] extends [A] ? true : false : false;
+declare type And<A, B> = Fork<A, Fork<B, B, false>, false>;
+declare type Fork<P, T, F> = P extends false ? F : T;
+declare type Not<T> = Extends<T, false>;
 declare const thing: unique symbol;
 declare type anything = typeof thing;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "free-types-core",
-    "version": "0.8.0",
+    "version": "0.8.2",
     "description": "A type-level library enabling the creation and the manipulation of type constructors which are detached from their type parameters.",
     "keywords:": [
         "higher kinded type",