fix: colocate utility types and hkts

nullpub · Oct 8, 2020 · 1a9f8c2 · 1a9f8c2
1 parent 8e9f4e1
commit 1a9f8c2
Show file tree

Hide file tree

Showing 28 changed files with 74 additions and 60 deletions.
diff --git a/array.ts b/array.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _ } from "./hkts.ts";
+import type { _ } from "./types.ts";
 
 import * as D from "./derivations.ts";
 

diff --git a/datum.ts b/datum.ts
@@ -1,8 +1,8 @@
 import type * as TC from "./type_classes.ts";
-import type { _ } from "./hkts.ts";
+import type { _, Lazy } from "./types.ts";
 
 import { createSequenceTuple, createSequenceStruct } from "./sequence.ts";
-import { identity, isNotNil, Lazy } from "./fns.ts";
+import { identity, isNotNil } from "./fns.ts";
 import * as D from "./derivations.ts";
 
 /***************************************************************************************************

diff --git a/datum_either.ts b/datum_either.ts
@@ -1,7 +1,7 @@
 import type * as TC from "./type_classes.ts";
-import type { _, _0, _1 } from "./hkts.ts";
+import type { _, _0, _1, Lazy, Fn } from "./types.ts";
 
-import { Fn, identity, isNotNil, Lazy } from "./fns.ts";
+import { identity, isNotNil } from "./fns.ts";
 import * as DA from "./datum.ts";
 import * as E from "./either.ts";
 import * as D from "./derivations.ts";

diff --git a/decode.ts b/decode.ts
@@ -1,4 +1,4 @@
-import type { _ } from "./hkts.ts";
+import type { _ } from "./types.ts";
 import type * as TC from "./type_classes.ts";
 
 import { createPipeableMonad } from "./derivations.ts";

diff --git a/either.ts b/either.ts
@@ -1,8 +1,17 @@
 import type * as TC from "./type_classes.ts";
-import type { $, _0, _1, _2, Fix } from "./hkts.ts";
+import type {
+  $,
+  _0,
+  _1,
+  _2,
+  Fix,
+  Lazy,
+  Predicate,
+  Refinement,
+} from "./types.ts";
 
 import { createSequenceStruct, createSequenceTuple } from "./sequence.ts";
-import { isNotNil, Lazy, Predicate, Refinement } from "./fns.ts";
+import { isNotNil } from "./fns.ts";
 import * as D from "./derivations.ts";
 
 /***************************************************************************************************

diff --git a/fns.ts b/fns.ts
@@ -1,22 +1,4 @@
-/***************************************************************************************************
- * @section Types
- **************************************************************************************************/
-
-export type Fn<AS extends unknown[], B> = (...as: AS) => B;
-
-export type Nil = undefined | null;
-
-export interface Lazy<A> {
-  (): A;
-}
-
-export interface Predicate<A> {
-  (a: A): boolean;
-}
-
-export interface Refinement<A, B extends A> {
-  (a: A): a is B;
-}
+import type { Nil, Fn, Lazy } from "./types.ts";
 
 /***************************************************************************************************
  * @section Guards

diff --git a/guard.ts b/guard.ts
@@ -1,4 +1,4 @@
-import type { _ } from "./hkts.ts";
+import type { _ } from "./types.ts";
 
 import { pipe, Refinement } from "./fns.ts";
 import * as S from "./schemable.ts";

diff --git a/identity.ts b/identity.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _ } from "./hkts.ts";
+import type { _ } from "./types.ts";
 
 import { createMonad, createPipeableMonad } from "./derivations.ts";
 import { createSequenceTuple, createSequenceStruct } from "./sequence.ts";

diff --git a/io.ts b/io.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _ } from "./hkts.ts";
+import type { _ } from "./types.ts";
 
 import { createSequenceStruct, createSequenceTuple } from "./sequence.ts";
 import { constant, pipe } from "./fns.ts";

diff --git a/io_either.ts b/io_either.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { Fix, _, _0, _1 } from "./hkts.ts";
+import type { Fix, _, _0, _1 } from "./types.ts";
 import { constant, Lazy, pipe } from "./fns.ts";
 
 import * as E from "./either.ts";

diff --git a/iso.ts b/iso.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _0, _1 } from "./hkts.ts";
+import type { _0, _1 } from "./types.ts";
 
 import * as O from "./option.ts";
 import { constant, flow, identity } from "./fns.ts";

diff --git a/lens.ts b/lens.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _0, _1 } from "./hkts.ts";
+import type { _0, _1 } from "./types.ts";
 
 import * as O from "./option.ts";
 import type { Optional } from "./optional.ts";

diff --git a/option.ts b/option.ts
@@ -1,8 +1,8 @@
 import type * as TC from "./type_classes.ts";
-import type { $, _ } from "./hkts.ts";
+import type { $, _, Lazy, Predicate } from "./types.ts";
 
 import { createSequenceStruct, createSequenceTuple } from "./sequence.ts";
-import { isNotNil, Lazy, Predicate } from "./fns.ts";
+import { isNotNil } from "./fns.ts";
 import * as D from "./derivations.ts";
 
 /***************************************************************************************************

diff --git a/optional.ts b/optional.ts
@@ -12,7 +12,7 @@ import {
   flow,
   identity,
 } from "./fns.ts";
-import { _0, _1 } from "./hkts.ts";
+import { _0, _1 } from "./types.ts";
 
 /***************************************************************************************************
  * @section Types

diff --git a/prism.ts b/prism.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _0, _1 } from "./hkts.ts";
+import type { _0, _1 } from "./types.ts";
 
 import * as L from "./lens.ts";
 import * as O from "./option.ts";

diff --git a/reader.ts b/reader.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _0, _1 } from "./hkts.ts";
+import type { _0, _1 } from "./types.ts";
 
 import { createSequenceStruct, createSequenceTuple } from "./sequence.ts";
 import { identity, constant } from "./fns.ts";

diff --git a/record.ts b/record.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { $, _ } from "./hkts.ts";
+import type { $, _ } from "./types.ts";
 
 import * as D from "./derivations.ts";
 

diff --git a/schemable.ts b/schemable.ts
@@ -1,4 +1,4 @@
-import type { $, _ } from "./hkts.ts";
+import type { $, _ } from "./types.ts";
 import type { LS } from "./type_classes.ts";
 
 /***************************************************************************************************

diff --git a/sequence.ts b/sequence.ts
@@ -1,4 +1,4 @@
-import type { $, _, _0, _1 } from "./hkts.ts";
+import type { $ } from "./types.ts";
 import type { Apply, LS } from "./type_classes.ts";
 
 import { _reduce } from "./array.ts";
@@ -55,18 +55,21 @@ type SequenceTuple<T, R extends NonEmptyArray<$<T, any[]>>, L extends LS = 1> =
 // deno-fmt-ignore
 type CreateSequenceTuple = {
   <T, L extends 1>(A: Apply<T, L>):
-    <R extends NonEmptyArray<$<T, [any]>>>(...r: R) => SequenceTuple<T, R, L>;
+    <R extends NonEmptyArray<$<T, [unknown]>>>(...r: R) =>
+      SequenceTuple<T, R, L>;
   <T, L extends 2>(A: Apply<T, L>):
-    <R extends NonEmptyArray<$<T, [any, any]>>>(...r: R) => SequenceTuple<T, R, L>;
+    <R extends NonEmptyArray<$<T, [unknown, unknown]>>>(...r: R) =>
+      SequenceTuple<T, R, L>;
   <T, L extends 3>(A: Apply<T, L>):
-    <R extends NonEmptyArray<$<T, [any, any, any]>>>(...r: R) => SequenceTuple<T, R, L>;
+    <R extends NonEmptyArray<$<T, [unknown, unknown, unknown]>>>(...r: R) =>
+      SequenceTuple<T, R, L>;
 };
 
 /**
  * Create a sequence over tuple function from Apply
  */
 export const createSequenceTuple: CreateSequenceTuple = <T>(A: Apply<T>) =>
-  <R extends NonEmptyArray<$<T, [any]>>>(
+  <R extends NonEmptyArray<$<T, [unknown]>>>(
     ...r: R
   ): SequenceTuple<T, R> => {
     const [head, ...tail] = r;
@@ -96,15 +99,18 @@ type SequenceStruct<T, R extends Record<string, $<T, any[]>>, L extends LS = 1>
 // deno-fmt-ignore
 type CreateSequenceStruct = {
   <T, L extends 1>(A: Apply<T, L>):
-    <R extends Record<string, $<T, [any]>>>(r: NonEmptyRecord<R>) => SequenceStruct<T, R, L>;
+    <R extends Record<string, $<T, [any]>>>(r: NonEmptyRecord<R>) =>
+      SequenceStruct<T, R, L>;
   <T, L extends 2>(A: Apply<T, L>):
-    <R extends Record<string, $<T, [any, any]>>>(r: NonEmptyRecord<R>) => SequenceStruct<T, R, L>;
+    <R extends Record<string, $<T, [any, any]>>>(r: NonEmptyRecord<R>) =>
+      SequenceStruct<T, R, L>;
   <T, L extends 3>(A: Apply<T, L>):
-    <R extends Record<string, $<T, [any, any, any]>>>(r: NonEmptyRecord<R>) => SequenceStruct<T, R, L>;
+    <R extends Record<string, $<T, [any, any, any]>>>(r: NonEmptyRecord<R>) =>
+      SequenceStruct<T, R, L>;
 };
 
 export const createSequenceStruct: CreateSequenceStruct = <T>(A: Apply<T>) =>
-  <R extends Record<string, $<T, [any]>>>(
+  <R extends Record<string, $<T, any[]>>>(
     r: NonEmptyRecord<R>,
   ): SequenceStruct<T, R> => {
     const keys = Object.keys(r);

diff --git a/state.ts b/state.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _0, _1 } from "./hkts.ts";
+import type { _0, _1 } from "./types.ts";
 
 import * as D from "./derivations.ts";
 import { flow } from "./fns.ts";

diff --git a/task.ts b/task.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { _ } from "./hkts.ts";
+import type { _ } from "./types.ts";
 
 import { createMonad, createPipeableMonad } from "./derivations.ts";
 import { createSequenceTuple, createSequenceStruct } from "./sequence.ts";

diff --git a/task_either.ts b/task_either.ts
@@ -1,6 +1,6 @@
 import type * as TC from "./type_classes.ts";
-import type { _0, _1, _2, _3 } from "./hkts.ts";
-import { Lazy, pipe } from "./fns.ts";
+import type { _0, _1, Lazy } from "./types.ts";
+import { pipe } from "./fns.ts";
 
 import * as E from "./either.ts";
 import * as T from "./task.ts";

diff --git a/testing/derivations.test.ts b/testing/derivations.test.ts
@@ -1,6 +1,6 @@
 import { assertEquals } from "https://deno.land/std/testing/asserts.ts";
 
-import type { _ } from "../hkts.ts";
+import type { _ } from "../types.ts";
 
 import * as O from "../option.ts";
 import { createMonad } from "../derivations.ts";

diff --git a/these.ts b/these.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { Fix, _0, _1 } from "./hkts.ts";
+import type { Fix, _0, _1 } from "./types.ts";
 
 import * as D from "./derivations.ts";
 import * as E from "./either.ts";

diff --git a/traversal.ts b/traversal.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { $, _0, _1 } from "./hkts.ts";
+import type { $, _0, _1 } from "./types.ts";
 
 import * as I from "./identity.ts";
 import * as P from "./prism.ts";

diff --git a/tree.ts b/tree.ts
@@ -1,5 +1,5 @@
 import type * as TC from "./type_classes.ts";
-import type { $, _ } from "./hkts.ts";
+import type { $, _ } from "./types.ts";
 
 import * as A from "./array.ts";
 import * as D from "./derivations.ts";

diff --git a/type_classes.ts b/type_classes.ts
@@ -1,5 +1,4 @@
-import type { Predicate } from "./fns.ts";
-import type { $ } from "./hkts.ts";
+import type { $, Predicate } from "./types.ts";
 
 /***************************************************************************************************
  * Type Classes

diff --git a/hkts.ts → types.ts b/hkts.ts → types.ts
@@ -1,4 +1,22 @@
-import type { Refinement } from "./fns.ts";
+/***************************************************************************************************
+ * @section Utility Types
+ **************************************************************************************************/
+
+export type Fn<AS extends unknown[], B> = (...as: AS) => B;
+
+export type Nil = undefined | null;
+
+export interface Lazy<A> {
+  (): A;
+}
+
+export interface Predicate<A> {
+  (a: A): boolean;
+}
+
+export interface Refinement<A, B extends A> {
+  (a: A): a is B;
+}
 
 /***************************************************************************************************
  * @section Hole Types