free-types-core 1.0.0 → 1.0.2

package/dist/From.d.ts

@@ -1,9 +1,10 @@
-import { NamedConstraints } from './Type';
+import { Contra, NamedConstraints } from './Type';
 import { ArrayLike, Next, IsOptional, Mappable, Union2Tuple, Int } from './utils';
 export { From };
 type Named = ({
     [k: PropertyKey]: string;
 } | undefined)[];
+type None = {};
 /** Create a new `Type` based upon a Mappable `T`.
  *
  * Optionally take a tuple `Args` to specify which fields to turn into a parameter and in what order they must be applied. Parameters can be set to be optional. Named parameters are created automatically for object types, they can be renamed.
@@ -12,35 +13,37 @@ type Named = ({
 type From<T extends Mappable<any>, Args extends readonly (keyof T | undefined)[] | Named = never> = ([
     Args
 ] extends [never] ? (T extends unknown[] ? GetIndices<T> : Union2Tuple<keyof T>) extends infer K ? {
-    type: T;
     constraints: PseudoTuple<T, K>;
-    names: {};
+    names: None;
     keys: K;
 } : never : Args extends Named ? {
-    type: T;
     constraints: ToConstraints<T, Args>;
     names: GetNames<Args>;
     keys: GetKeys<Args>;
 } : {
-    type: T;
     constraints: PseudoTuple<T, Args>;
     names: Args extends (string | undefined)[] ? GenerateNames<Args> : {};
     keys: Required<Args>;
-}) extends infer D extends Descriptor ? FromTemplate<D> : never;
+}) extends infer D extends Descriptor ? FromTemplate<{
+    type: T;
+}, D> : never;
 type Descriptor = {
-    type: any;
     constraints: any;
     names: any;
     keys: any;
 };
-interface FromTemplate<D extends Descriptor> {
+interface FromTemplate<T extends {
+    type: any;
+}, D extends Descriptor> {
     [k: number]: unknown;
-    type: D['type'] extends infer Type ? unknown[] extends this['arguments'] ? Type : {
+    type: T['type'] extends infer Type ? unknown[] extends this['arguments'] ? Type : {
         [K in keyof Type]: Value<Type[K], this['arguments'], IndexOf<K, D['keys']>, D['constraints']>;
     } : never;
     namedConstraints: NamedConstraints<D>;
     names: D['names'];
     constraints: D['constraints'];
+    contra: Contra<D['constraints']>;
+    arg: any;
     arguments: unknown[];
 }
 type GetIndices<T extends unknown[]> = {
@@ -48,7 +51,7 @@ type GetIndices<T extends unknown[]> = {
 };
 export type Value<T, This extends ArrayLike, I, Constraints extends ArrayLike> = [
     I
-] extends [never] ? T : This[I & number] extends infer Arg ? (IsOptional<Constraints, I> extends true ? Arg extends undefined ? T : Arg : Arg) : never;
+] extends [never] ? T : IsOptional<Constraints, I> extends true ? This[I & number] extends undefined ? T : This[I & number] : This[I & number];
 export type IndexOf<T, Ts extends ArrayLike, L = Required<Ts>['length'], I = 0> = I extends L ? never : [T] extends [`${Ts[I & number]}`] ? I : IndexOf<T, Ts, L, Next<I>>;
 type PseudoTuple<T, Keys> = {
     [K in keyof Keys]: Exclude<T[Keys[K] & keyof T], undefined>;

package/dist/Type.d.ts

@@ -59,9 +59,9 @@ type _Type = {
     };
 };
 type Arg<This extends _Type, Args = This['names'] & This['constraints'], O extends PropertyKey = FindOptionalKeys<This['constraints'], This['names']>, R extends PropertyKey = Exclude<Norm<Exclude<keyof Args, ArrayKeys>>, O>> = {
-    [K in Norm<R>]: ArgVal<This, K>;
+    [K in Norm<R> as `${K & number}` | K]: ArgVal<This, K>;
 } & {
-    [K in Norm<O>]?: ArgVal<This, K>;
+    [K in Norm<O> as `${K & number}` | K]?: ArgVal<This, K>;
 };
 type FindOptionalKeys<Constraints, Names, O = Int<OptionalKeys<Constraints>>> = O | (keyof {
     [K in keyof Names as Names[K] extends O ? K : never]: never;

package/dist/helpers.d.ts

@@ -1,5 +1,5 @@
 import { Next, IsUnknown, Prev, OptionalKeys } from './utils';
-export { Get, At, Checked, Lossy, Optional, A, B, C, D, E, Applied };
+export { Get, At, Checked, Lossy, Optional, A, B, C, D, E, Applied, Valid };
 /** Fake `Type` for user friendly error messages */
 interface Type<In extends number | Names> extends BaseType {
     arg: Constraints<In>;
@@ -34,6 +34,11 @@ type Normalise<Index extends string | number> = Index extends number ? Next<Inde
 type Applied<This extends {
     arguments: any;
 }> = unknown[] extends This['arguments'] ? false : true;
+/** tell whether a Type is applied with all the correct arguments */
+type Valid<This extends {
+    arguments: any;
+    constraints: any;
+}> = Applied<This> extends false ? false : This['arguments'] extends This['constraints'] ? true : false;
 /** safely index `this` */
 type Get<K extends keyof This['arg'], This extends {
     arg: any;

package/dist/unwrap.d.ts

@@ -4,6 +4,7 @@ import { inferArgs } from './inferArgs';
 import { Generic, _apply, _Type } from './apply';
 import { TypesMap } from './TypesMap';
 import { Tuple, ReadonlyTuple, Array, ReadonlyArray } from './free-types';
+type ArrayURIs = 'Tuple' | 'ReadonlyTuple' | 'Array' | 'ReadonlyArray';
 type Search = _Type | SearchList;
 type SearchList = _Type[] | Record<string, _Type> | Interface;
 type Interface = {
@@ -22,7 +23,7 @@ declare global {
 }
 export { unwrap, Unwrapped, Search };
 /** Decompose a type into its constituents */
-type unwrap<T, From extends Search = TypesMap> = IsAny<T> extends true ? Any : (T extends readonly unknown[] ? From extends _Type | _Type[] ? null : unwrapLists<T> : null) extends infer R extends Unwrapped ? R : _unwrap<T, From extends _Type ? [From] : From>;
+type unwrap<T, From extends Search = Omit<TypesMap, ArrayURIs>> = IsAny<T> extends true ? Any : (T extends readonly unknown[] ? From extends _Type | _Type[] ? null : unwrapLists<T> : null) extends infer R extends Unwrapped ? R : _unwrap<T, From extends _Type ? [From] : From>;
 type unwrapLists<T extends readonly unknown[]> = T extends unknown[] ? any[] extends T ? Unwrapped<'Array', Array, [T[0]]> : Unwrapped<'Tuple', Tuple, T> : readonly any[] extends T ? Unwrapped<'ReadonlyArray', ReadonlyArray, [T[0]]> : Unwrapped<'ReadonlyTuple', ReadonlyTuple, Mutable<T>>;
 type Mutable<T> = {
     -readonly [K in keyof T]: T[K];

package/package.json

@@ -1,34 +1,34 @@
-{
-    "name": "free-types-core",
-    "version": "1.0.0",
-    "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",
-        "type constructor",
-        "typescript"
-    ],
-    "main": "./dist/index.js",
-    "types": "./dist/index.d.ts",
-    "files": [
-        "dist/*"
-    ],
-    "author": "Geoffrey Gourdet",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/geoffreytools/free-types-core"
-    },
-    "license": "ICS",
-    "devDependencies": {
-        "foo": "github:geoffreytools/Foo",
-        "ts-spec": "^1.7.0",
-        "ts-trace": "github:geoffreytools/ts-trace",
-        "typescript": "^4.9.5"
-    },
-    "scripts": {
-        "watch build": "tsc -p ./tsconfig-build.json --watch",
-        "watch test": "tsc --watch",
-        "build": "tsc -p ./tsconfig-build.json",
-        "trace": "bash ./node_modules/ts-trace/ts-trace.sh -i ./tsconfig-perf.json",
-        "diagnostics": "tsc -p ./tsconfig-perf.json --extendedDiagnostics"
-    }
-}
+{
+    "name": "free-types-core",
+    "version": "1.0.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",
+        "type constructor",
+        "typescript"
+    ],
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "files": [
+        "dist/*"
+    ],
+    "author": "Geoffrey Gourdet",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/geoffreytools/free-types-core"
+    },
+    "license": "ICS",
+    "devDependencies": {
+        "foo": "github:geoffreytools/Foo",
+        "ts-spec": "^1.7.0",
+        "ts-trace": "github:geoffreytools/ts-trace",
+        "typescript": "^4.9.5"
+    },
+    "scripts": {
+        "watch build": "tsc -p ./tsconfig-build.json --watch",
+        "watch test": "tsc --watch",
+        "build": "tsc -p ./tsconfig-build.json",
+        "trace": "bash ./node_modules/ts-trace/ts-trace.sh -i ./tsconfig-perf.json",
+        "diagnostics": "tsc -p ./tsconfig-perf.json --extendedDiagnostics"
+    }
+}