@fncts/base 0.0.32 → 0.0.34

package/_src/optics/Optional/api/focus.ts

@@ -2,15 +2,13 @@ import type { POptional, POptionalPartiallyApplied } from "@fncts/base/optics/Op
 import type { PTraversal } from "@fncts/base/optics/Traversal";
 
 /**
- * @tsplus pipeable global focus 1
+ * @tsplus fluent global focus 1
  */
-export function focus<S, T, A, B>(optional: POptional<S, T, A, B>) {
-  return (self: S): POptionalPartiallyApplied<T, A, B> => {
-    return {
-      ...self.focus(optional as PTraversal<S, T, A, B>),
-      getMaybe: () => optional.getMaybe(self),
-      modifyMaybe: (f) => optional.modifyMaybe(f)(self),
-      getOrModify: () => optional.getOrModify(self),
-    };
+export function focus<S, T, A, B>(self: S, optional: POptional<S, T, A, B>): POptionalPartiallyApplied<T, A, B> {
+  return {
+    ...self.focus(optional as PTraversal<S, T, A, B>),
+    getMaybe: () => optional.getMaybe(self),
+    modifyMaybe: (f) => optional.modifyMaybe(f)(self),
+    getOrModify: () => optional.getOrModify(self),
   };
 }

package/_src/optics/Optional.ts

@@ -1,8 +1,10 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Optional/*.ts }
-export * from "./Optional/api.js";
 export * from "./Optional/definition.js";
+export * from "./Optional/api.js";
 // codegen:end
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Optional/api/*.ts }
-export * from "./Optional/api/compose.js";
 export * from "./Optional/api/focus.js";
+export * from "./Optional/api/compose.js";
 // codegen:end

package/_src/optics/Prism/api/focus.ts

@@ -2,13 +2,11 @@ import type { POptional } from "@fncts/base/optics/Optional";
 import type { PPrism, PPrismPartiallyApplied } from "@fncts/base/optics/Prism";
 
 /**
- * @tsplus pipeable global focus
+ * @tsplus fluent global focus
  */
-export function focus<S, T, A, B>(prism: PPrism<S, T, A, B>) {
-  return (self: S): PPrismPartiallyApplied<T, A, B> => {
-    return {
-      ...self.focus(prism as POptional<S, T, A, B>),
-      reverseGet: prism.reverseGet,
-    };
+export function focus<S, T, A, B>(self: S, prism: PPrism<S, T, A, B>): PPrismPartiallyApplied<T, A, B> {
+  return {
+    ...self.focus(prism as POptional<S, T, A, B>),
+    reverseGet: prism.reverseGet,
   };
 }

package/_src/optics/Prism.ts

@@ -1,9 +1,11 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Prism/*.ts }
 export * from "./Prism/definition.js";
 // codegen:end
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Prism/api/*.ts }
-export * from "./Prism/api/compose.js";
-export * from "./Prism/api/focus.js";
-export * from "./Prism/api/fromNullable.js";
 export * from "./Prism/api/just.js";
+export * from "./Prism/api/fromNullable.js";
+export * from "./Prism/api/focus.js";
+export * from "./Prism/api/compose.js";
 // codegen:end

package/_src/optics/Setter/api/focus.ts

@@ -1,13 +1,11 @@
 import type { PSetter, PSetterPartiallyApplied } from "@fncts/base/optics/Setter";
 
 /**
- * @tsplus pipeable global focus 3
+ * @tsplus fluent global focus 3
  */
-export function focus<S, T, A, B>(setter: PSetter<S, T, A, B>) {
-  return (self: S): PSetterPartiallyApplied<T, A, B> => {
-    return {
-      set: (b) => setter.set(b)(self),
-      modify: (f) => setter.modify(f)(self),
-    };
+export function focus<S, T, A, B>(self: S, setter: PSetter<S, T, A, B>): PSetterPartiallyApplied<T, A, B> {
+  return {
+    set: (b) => setter.set(b)(self),
+    modify: (f) => setter.modify(f)(self),
   };
 }

package/_src/optics/Setter.ts

@@ -1,3 +1,4 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Setter/*.ts }
 export * from "./Setter/definition.js";
 // codegen:end

package/_src/optics/Traversal/api/focus.ts

@@ -3,14 +3,12 @@ import type { PSetter } from "@fncts/base/optics/Setter";
 import type { PTraversal, PTraversalPartiallyApplied } from "@fncts/base/optics/Traversal";
 
 /**
- * @tsplus pipeable global focus 2
+ * @tsplus fluent global focus 2
  */
-export function focus<S, T, A, B>(traversal: PTraversal<S, T, A, B>) {
-  return (self: S): PTraversalPartiallyApplied<T, A, B> => {
-    return {
-      ...self.focus(traversal as PSetter<S, T, A, B>),
-      ...self.focus(traversal as Fold<S, A>),
-      modifyA: (F) => (f) => traversal.modifyA(F)(f)(self),
-    };
+export function focus<S, T, A, B>(self: S, traversal: PTraversal<S, T, A, B>): PTraversalPartiallyApplied<T, A, B> {
+  return {
+    ...self.focus(traversal as PSetter<S, T, A, B>),
+    ...self.focus(traversal as Fold<S, A>),
+    modifyA: (F) => (f) => traversal.modifyA(F)(f)(self),
   };
 }

package/_src/optics/Traversal.ts

@@ -1,8 +1,10 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Traversal/*.ts }
 export * from "./Traversal/definition.js";
 // codegen:end
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Traversal/api/*.ts }
-export * from "./Traversal/api/compose.js";
-export * from "./Traversal/api/focus.js";
 export * from "./Traversal/api/fromTraversable.js";
+export * from "./Traversal/api/focus.js";
+export * from "./Traversal/api/compose.js";
 // codegen:end

package/_src/optics.ts

@@ -1,12 +1,13 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: type-barrel, include: ./optics/*.ts }
-export type {} from "./optics/At.js";
-export type {} from "./optics/Fold.js";
-export type {} from "./optics/Getter.js";
-export type {} from "./optics/Index.js";
-export type {} from "./optics/Iso.js";
-export type {} from "./optics/Lens.js";
-export type {} from "./optics/Optional.js";
-export type {} from "./optics/Prism.js";
-export type {} from "./optics/Setter.js";
 export type {} from "./optics/Traversal.js";
+export type {} from "./optics/Setter.js";
+export type {} from "./optics/Prism.js";
+export type {} from "./optics/Optional.js";
+export type {} from "./optics/Lens.js";
+export type {} from "./optics/Iso.js";
+export type {} from "./optics/Index.js";
+export type {} from "./optics/Getter.js";
+export type {} from "./optics/Fold.js";
+export type {} from "./optics/At.js";
 // codegen:end

package/_src/typeclass/Monoid.ts

@@ -77,6 +77,7 @@ export function deriveStruct<A extends Record<string, any>>(
   const [requiredFields, optionalFields] = args;
   const nat: Record<string, unknown>     = {};
   for (const field in requiredFields) {
+    // @ts-expect-error
     nat[field] = (requiredFields[field] as Monoid<any>).nat;
   }
   for (const field in optionalFields) {

package/_src/typeclass/Semigroup/derivations.ts

@@ -45,6 +45,7 @@ export function deriveStruct<A extends Record<string, any>>(
     combine: (y) => (x) => {
       const out: Record<string, unknown> = {};
       for (const field in requiredFields) {
+        // @ts-expect-error
         out[field] = (requiredFields[field]! as Semigroup<any>).combine(y[field])(x[field]);
       }
       for (const field in optionalFields) {

package/_src/typeclass/Semigroup.ts

@@ -1,4 +1,5 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: Semigroup/*.ts, exclude: Semigroup/derivations.ts }
-export * from "./Semigroup/api.js";
 export * from "./Semigroup/definition.js";
+export * from "./Semigroup/api.js";
 // codegen:end

package/_src/typeclass/builtin.ts

@@ -1,3 +1,4 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./builtin/*.ts }
 export * from "./builtin/Symbol.js";
 // codegen:end

package/_src/typeclass.ts

@@ -1,33 +1,34 @@
-// codegen:start { preset: barrel, include: ./typeclass/*.ts, exclude: ./typeclass/Showable.ts }
-export * from "./typeclass/Align.js";
-export * from "./typeclass/Alt.js";
-export * from "./typeclass/Alternative.js";
-export * from "./typeclass/Applicative.js";
-export * from "./typeclass/ApplicativeExcept.js";
-export * from "./typeclass/Apply.js";
+/* eslint-disable simple-import-sort/exports */
+// codegen:start { preset: barrel, include: ./typeclass/*.ts, exclude: typeclass/Showable.ts }
 export * from "./typeclass/builtin.js";
-export * from "./typeclass/Chain.js";
-export * from "./typeclass/Closure.js";
-export * from "./typeclass/Fail.js";
-export * from "./typeclass/Filterable.js";
-export * from "./typeclass/FilterableWithIndex.js";
-export * from "./typeclass/Foldable.js";
-export * from "./typeclass/FoldableWithIndex.js";
-export * from "./typeclass/Functor.js";
-export * from "./typeclass/FunctorWithIndex.js";
-export * from "./typeclass/Has.js";
-export * from "./typeclass/Monad.js";
-export * from "./typeclass/MonadExcept.js";
-export * from "./typeclass/Monoid.js";
-export * from "./typeclass/Nil.js";
-export * from "./typeclass/Pointed.js";
-export * from "./typeclass/Semialign.js";
-export * from "./typeclass/Semigroup.js";
-export * from "./typeclass/Semimonoidal.js";
-export * from "./typeclass/Traversable.js";
-export * from "./typeclass/TraversableWithIndex.js";
-export * from "./typeclass/Witherable.js";
 export * from "./typeclass/WitherableWithIndex.js";
+export * from "./typeclass/Witherable.js";
+export * from "./typeclass/TraversableWithIndex.js";
+export * from "./typeclass/Traversable.js";
+export * from "./typeclass/Semimonoidal.js";
+export * from "./typeclass/Semigroup.js";
+export * from "./typeclass/Semialign.js";
+export * from "./typeclass/Pointed.js";
+export * from "./typeclass/Nil.js";
+export * from "./typeclass/Monoid.js";
+export * from "./typeclass/MonadExcept.js";
+export * from "./typeclass/Monad.js";
+export * from "./typeclass/Has.js";
+export * from "./typeclass/FunctorWithIndex.js";
+export * from "./typeclass/Functor.js";
+export * from "./typeclass/FoldableWithIndex.js";
+export * from "./typeclass/Foldable.js";
+export * from "./typeclass/FilterableWithIndex.js";
+export * from "./typeclass/Filterable.js";
+export * from "./typeclass/Fail.js";
+export * from "./typeclass/Closure.js";
+export * from "./typeclass/Chain.js";
+export * from "./typeclass/Apply.js";
+export * from "./typeclass/ApplicativeExcept.js";
+export * from "./typeclass/Applicative.js";
+export * from "./typeclass/Alternative.js";
+export * from "./typeclass/Alt.js";
+export * from "./typeclass/Align.js";
 // codegen:end
 
 export { Eq } from "./data/Eq.js";

package/_src/types.ts

@@ -1,4 +1,5 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: types/*.ts }
-export * from "./types/extractions.js";
 export * from "./types/utility.js";
+export * from "./types/extractions.js";
 // codegen:end

package/_src/util.ts

@@ -1,8 +1,9 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: type-barrel, include: ./util/*.ts }
-export type {} from "./util/AnsiFormat.js";
-export type {} from "./util/assert.js";
+export type {} from "./util/rand.js";
+export type {} from "./util/predicates.js";
 export type {} from "./util/pattern.js";
+export type {} from "./util/assert.js";
 export type {} from "./util/PCGRandom.js";
-export type {} from "./util/predicates.js";
-export type {} from "./util/rand.js";
+export type {} from "./util/AnsiFormat.js";
 // codegen:end

package/collection/Iterable/api.d.ts

@@ -14,7 +14,7 @@ export declare function ap<A>(fa: Iterable<A>): <B>(self: Iterable<(a: A) => B>)
  * @tsplus pipeable fncts.Iterable append
  * @tsplus location "@fncts/base/collection/Iterable/api"
  */
-export declare function append<B>(b: B): <A>(self: Iterable<A>) => Iterable<B | A>;
+export declare function append<B>(b: B): <A>(self: Iterable<A>) => Iterable<A | B>;
 /**
  * @tsplus getter fncts.Iterable toIterable
  * @tsplus location "@fncts/base/collection/Iterable/api"

package/collection/Iterable.d.ts

@@ -1,3 +1,3 @@
-export * from "./Iterable/api.js";
-export * from "./Iterable/constructors.js";
 export * from "./Iterable/definition.js";
+export * from "./Iterable/constructors.js";
+export * from "./Iterable/api.js";

package/collection/compat/Array.d.ts

@@ -1,2 +1,2 @@
-export * from "./Array/api.js";
 export * from "./Array/definition.js";
+export * from "./Array/api.js";

package/collection/immutable/Conc/api.d.ts

@@ -13,7 +13,7 @@ import type * as P from "@fncts/base/typeclass";
  * @tsplus pipeable fncts.Conc align
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function align<B>(fb: Conc<B>): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<import("../../../data/These").These<A, B>>;
+export declare function align<B>(fb: Conc<B>): <A>(self: Conc<A>) => Conc<These<A, B>>;
 /**
  * @tsplus pipeable fncts.Conc alignWith
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
@@ -23,7 +23,7 @@ export declare function alignWith<A, B, C>(fb: Conc<B>, f: (_: These<A, B>) => C
  * @tsplus pipeable fncts.Conc append
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function append<A2>(a: A2): <A1>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A1>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<A2 | A1>;
+export declare function append<A2>(a: A2): <A1>(self: Conc<A1>) => Conc<A1 | A2>;
 export declare class ConcBuilder<A> {
     private conc;
     constructor(conc?: Conc<A>);
@@ -59,7 +59,7 @@ export declare function chop<A, B>(f: (as: Conc<A>) => readonly [B, Conc<A>]): (
  * @tsplus pipeable fncts.Conc chunksOf
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function chunksOf(n: number): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<import("@fncts/base/collection/immutable/Conc/definition").Conc<A>>;
+export declare function chunksOf(n: number): <A>(self: Conc<A>) => Conc<Conc<A>>;
 /**
  * Transforms all elements of the Conc for as long as the specified partial function is defined.
  * @tsplus pipeable fncts.Conc collectWhile
@@ -75,7 +75,7 @@ export declare function compact<A>(self: Conc<Maybe<A>>): Conc<A>;
  * @tsplus pipeable fncts.Conc concat
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function concat<B>(that: Conc<B>): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<B | A>;
+export declare function concat<B>(that: Conc<B>): <A>(self: Conc<A>) => Conc<A | B>;
 /**
  * @tsplus pipeable fncts.Conc elem
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
@@ -90,7 +90,7 @@ export declare function some<A>(predicate: Predicate<A>): (as: Conc<A>) => boole
  * @tsplus pipeable fncts.Conc drop
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function drop(n: number): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<A>;
+export declare function drop(n: number): <A>(self: Conc<A>) => Conc<A>;
 /**
  * @tsplus pipeable fncts.Conc dropUntil
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
@@ -184,7 +184,7 @@ export declare function forEachWithIndex<A, B>(f: (i: number, a: A) => B): (self
  * @tsplus pipeable fncts.Conc get
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function get(n: number): <A>(as: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("../../../data/Maybe").Maybe<A>;
+export declare function get(n: number): <A>(as: Conc<A>) => Maybe<A>;
 /**
  * @tsplus getter fncts.Conc head
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
@@ -257,7 +257,7 @@ export declare function partitionWithIndex<A>(p: PredicateWithIndex<number, A>):
  * @tsplus pipeable fncts.Conc prepend
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function prepend<B>(a: B): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<B | A>;
+export declare function prepend<B>(a: B): <A>(self: Conc<A>) => Conc<A | B>;
 /**
  * @tsplus getter fncts.Conc reverse
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
@@ -272,12 +272,12 @@ export declare function separate<E, A>(self: Conc<Either<E, A>>): readonly [Conc
  * @tsplus pipeable fncts.Conc slice
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function slice(from: number, to: number): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<A>;
+export declare function slice(from: number, to: number): <A>(self: Conc<A>) => Conc<A>;
 /**
  * @tsplus pipeable fncts.Conc splitAt
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function splitAt(n: number): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => readonly [import("@fncts/base/collection/immutable/Conc/definition").Conc<A>, import("@fncts/base/collection/immutable/Conc/definition").Conc<A>];
+export declare function splitAt(n: number): <A>(self: Conc<A>) => readonly [Conc<A>, Conc<A>];
 /**
  * Splits this Conc on the first element that matches this predicate.
  * @tsplus pipeable fncts.Conc splitWhere
@@ -293,7 +293,7 @@ export declare function tail<A>(conc: Conc<A>): Maybe<Conc<A>>;
  * @tsplus pipeable fncts.Conc take
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function take(n: number): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<A>;
+export declare function take(n: number): <A>(self: Conc<A>) => Conc<A>;
 /**
  * @tsplus pipeable fncts.Conc takeWhile
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
@@ -326,7 +326,7 @@ export declare function unfold<A, B>(b: B, f: (b: B) => Maybe<readonly [A, B]>):
  * @tsplus pipeable-index fncts.Conc
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function unsafeGet(n: number): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => A;
+export declare function unsafeGet(n: number): <A>(self: Conc<A>) => A;
 /**
  * Returns the first element of this Conc. Note that this method is partial
  * in that it will throw an exception if the Conc is empty. Consider using
@@ -349,17 +349,17 @@ export declare function unsafeTail<A>(self: Conc<A>): Conc<A>;
  * @tsplus pipeable fncts.Conc unsafeUpdateAt
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function unsafeUpdateAt<A1>(i: number, a: A1): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<A1 | A>;
+export declare function unsafeUpdateAt<A1>(i: number, a: A1): <A>(self: Conc<A>) => Conc<A | A1>;
 /**
  * @tsplus pipeable fncts.Conc updateAt
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function updateAt<A1>(i: number, a: A1): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("../../../data/Maybe").Maybe<import("@fncts/base/collection/immutable/Conc/definition").Conc<A1 | A>>;
+export declare function updateAt<A1>(i: number, a: A1): <A>(self: Conc<A>) => Maybe<Conc<A | A1>>;
 /**
  * @tsplus pipeable fncts.Conc zip
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function zip<B>(fb: Conc<B>): <A>(self: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<readonly [A, B]>;
+export declare function zip<B>(fb: Conc<B>): <A>(self: Conc<A>) => Conc<readonly [A, B]>;
 /**
  * @tsplus pipeable fncts.Conc zipWith
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
@@ -374,4 +374,4 @@ export declare function zipWithIndex<A>(self: Conc<A>): Conc<readonly [A, number
  * @tsplus pipeable fncts.Conc zipWithIndexOffset
  * @tsplus location "@fncts/base/collection/immutable/Conc/api"
  */
-export declare function zipWithIndexOffset(offset: number): <A>(as: import("@fncts/base/collection/immutable/Conc/definition").Conc<A>) => import("@fncts/base/collection/immutable/Conc/definition").Conc<readonly [A, number]>;
+export declare function zipWithIndexOffset(offset: number): <A>(as: Conc<A>) => Conc<readonly [A, number]>;

package/collection/immutable/Conc.d.ts

@@ -1,6 +1,6 @@
-export * from "./Conc/api.js";
-export * from "./Conc/constructors.js";
 export * from "./Conc/definition.js";
-export * from "./Conc/api/empty.js";
-export * from "./Conc/api/makeBy.js";
+export * from "./Conc/constructors.js";
+export * from "./Conc/api.js";
 export * from "./Conc/api/replicate.js";
+export * from "./Conc/api/makeBy.js";
+export * from "./Conc/api/empty.js";

package/collection/immutable/Dictionary/api.d.ts

@@ -14,7 +14,7 @@ export declare function foldLeftWithIndex<A, B>(b: B, f: (k: string, b: B, a: A)
  * @tsplus pipeable fncts.Dictionary get
  * @tsplus location "@fncts/base/collection/immutable/Dictionary/api"
  */
-export declare function get(key: string): <A>(self: import("./definition").Dictionary<A>) => import("../../../data/Maybe").Maybe<A>;
+export declare function get(key: string): <A>(self: Dictionary<A>) => Maybe<A>;
 /**
  * @tsplus pipeable fncts.Dictionary set
  * @tsplus location "@fncts/base/collection/immutable/Dictionary/api"
@@ -24,7 +24,7 @@ export declare function set<A>(key: string, value: A): (self: Dictionary<A>) =>
  * @tsplus pipeable fncts.Dictionary remove
  * @tsplus location "@fncts/base/collection/immutable/Dictionary/api"
  */
-export declare function remove(key: string): <A>(self: import("./definition").Dictionary<A>) => import("./definition").Dictionary<A>;
+export declare function remove(key: string): <A>(self: Dictionary<A>) => Dictionary<A>;
 /**
  * @tsplus pipeable fncts.Dictionary update
  * @tsplus location "@fncts/base/collection/immutable/Dictionary/api"
@@ -61,4 +61,4 @@ export declare function toRecord<A>(self: Dictionary<A>): Record<string, A>;
  * @tsplus pipeable fncts.Dictionary unsafeGet
  * @tsplus location "@fncts/base/collection/immutable/Dictionary/api"
  */
-export declare function unsafeGet(key: string): <A>(self: import("./definition").Dictionary<A>) => A | undefined;
+export declare function unsafeGet(key: string): <A>(self: Dictionary<A>) => A | undefined;

package/collection/immutable/Dictionary.d.ts

@@ -1,2 +1,2 @@
-export * from "./Dictionary/api.js";
 export * from "./Dictionary/definition.js";
+export * from "./Dictionary/api.js";

package/collection/immutable/HashMap/api.d.ts

@@ -42,31 +42,31 @@ export declare function empty<K, V>(): HashMap<K, V>;
  * @tsplus pipeable fncts.HashMapOps fromFoldable
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function fromFoldable<F extends HKT, C, K, A>(config: P.HashEq<K>, S: P.Semigroup<A>, F: P.Foldable<F, C>): <K_, Q, W, X, I, S, R, E>(self: import("@fncts/typelevel/HKT.js").HKT.Kind<F, C, K_, Q, W, X, I, S, R, E, readonly [K, A]>) => HashMap<K, A>;
+export declare function fromFoldable<F extends HKT, C, K, A>(config: P.HashEq<K>, S: P.Semigroup<A>, F: P.Foldable<F, C>): <K_, Q, W, X, I, S, R, E>(self: HKT.Kind<F, C, K_, Q, W, X, I, S, R, E, readonly [K, A]>) => HashMap<K, A>;
 /**
  * Lookup the value for `key` in `map` using custom hash.
  * @tsplus pipeable fncts.HashMap getHash
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function getHash<K>(key: K, hash: number): <V>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => import("../../../data/Maybe.js").Maybe<V>;
+export declare function getHash<K>(key: K, hash: number): <V>(self: HashMap<K, V>) => Maybe<V>;
 /**
  * Lookup the value for `key` in `map` using internal hash function.
  * @tsplus pipeable fncts.HashMap get
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function get<K>(key: K): <V>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => import("../../../data/Maybe.js").Maybe<V>;
+export declare function get<K>(key: K): <V>(self: HashMap<K, V>) => Maybe<V>;
 /**
  * Does an entry exist for `key` in `map`? Uses custom `hash`.
  * @tsplus pipeable fncts.HashMap hasHash
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function hasHash<K>(key: K, hash: number): <V>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => boolean;
+export declare function hasHash<K>(key: K, hash: number): <V>(self: HashMap<K, V>) => boolean;
 /**
  * Does an entry exist for `key` in `map`? Uses internal hash function.
  * @tsplus pipeable fncts.HashMap has
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function has<K>(key: K): <V>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => boolean;
+export declare function has<K>(key: K): <V>(self: HashMap<K, V>) => boolean;
 /**
  * Alter the value stored for `key` in `map` using function `f` using custom hash.
  *
@@ -102,13 +102,13 @@ export declare function set<K, V>(key: K, value: V): (self: HashMap<K, V>) => Ha
  * @tsplus pipeable fncts.HashMap remove
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function remove<K>(key: K): <V>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>;
+export declare function remove<K>(key: K): <V>(self: HashMap<K, V>) => HashMap<K, V>;
 /**
  * Remove many keys
  * @tsplus pipeable fncts.HashMap removeMany
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function removeMany<K>(keys: Iterable<K>): <V>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>;
+export declare function removeMany<K>(keys: Iterable<K>): <V>(self: HashMap<K, V>) => HashMap<K, V>;
 /**
  * Mark `map` as mutable.
  * @tsplus getter fncts.HashMap beginMutation
@@ -192,7 +192,7 @@ export declare function mapWithIndex<K, V, A>(f: (k: K, v: V) => A): (self: Hash
  * @tsplus pipeable fncts.HashMap map
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function map<V, A>(f: (v: V) => A): <K>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, A>;
+export declare function map<V, A>(f: (v: V) => A): <K>(self: HashMap<K, V>) => HashMap<K, A>;
 /**
  * Chain over the map entries, the hash and equal of the 2 maps has to be the same
  * @tsplus pipeable fncts.HashMap flatMapWithIndex
@@ -228,7 +228,7 @@ export declare function filterMapWithIndex<K, A, B>(f: (k: K, a: A) => Maybe<B>)
  * @tsplus pipeable fncts.HashMap filterMap
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function filterMap<A, B>(f: (a: A) => Maybe<B>): <K>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, A>) => import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, B>;
+export declare function filterMap<A, B>(f: (a: A) => Maybe<B>): <K>(self: HashMap<K, A>) => HashMap<K, B>;
 /**
  * Filter out by predicate
  * @tsplus pipeable fncts.HashMap filterWithIndex
@@ -252,7 +252,7 @@ export declare function partitionMapWithIndex<K, V, A, B>(f: (i: K, a: V) => Eit
  * @tsplus pipeable fncts.HashMap partitionMap
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function partitionMap<V, A, B>(f: (a: V) => Either<A, B>): <K>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => readonly [import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, A>, import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, B>];
+export declare function partitionMap<V, A, B>(f: (a: V) => Either<A, B>): <K>(self: HashMap<K, V>) => readonly [HashMap<K, A>, HashMap<K, B>];
 /**
  * @tsplus pipeable fncts.HashMap partitionWithIndex
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
@@ -265,18 +265,42 @@ export declare function partitionWithIndex<K, V>(predicate: PredicateWithIndex<K
  */
 export declare function partition<V, B extends V>(refinement: Refinement<V, B>): <K>(self: HashMap<K, V>) => readonly [HashMap<K, V>, HashMap<K, B>];
 export declare function partition<V>(predicate: Predicate<V>): <K>(self: HashMap<K, V>) => readonly [HashMap<K, V>, HashMap<K, V>];
+/**
+ * Reduce a state over the map entries
+ * @tsplus pipeable fncts.HashMap foldLeftWithIndexWhile
+ * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
+ */
+export declare function foldLeftWithIndexWhile<K, V, Z>(z: Z, f: (k: K, z: Z, v: V) => Z, p: Predicate<Z>): (self: HashMap<K, V>) => Z;
 /**
  * Reduce a state over the map entries
  * @tsplus pipeable fncts.HashMap foldLeftWithIndex
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
 export declare function foldLeftWithIndex<K, V, Z>(z: Z, f: (k: K, z: Z, v: V) => Z): (self: HashMap<K, V>) => Z;
+/**
+ * Reduce a state over the map entries
+ * @tsplus pipeable fncts.HashMap foldLeftWhile
+ * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
+ */
+export declare function foldLeftWhile<V, Z>(z: Z, f: (z: Z, v: V) => Z, p: Predicate<Z>): <K>(self: HashMap<K, V>) => Z;
 /**
  * Reduce a state over the map entries
  * @tsplus pipeable fncts.HashMap foldLeft
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function foldLeft<V, Z>(z: Z, f: (z: Z, v: V) => Z): <K>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => Z;
+export declare function foldLeft<V, Z>(z: Z, f: (z: Z, v: V) => Z): <K>(self: HashMap<K, V>) => Z;
+/**
+ * @tsplus pipeable fncts.HashMap findWithIndex
+ * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
+ */
+export declare function findWithIndex<K, V, B extends V>(p: RefinementWithIndex<K, V, B>): (self: HashMap<K, V>) => Maybe<B>;
+export declare function findWithIndex<K, V>(p: PredicateWithIndex<K, V>): (self: HashMap<K, V>) => Maybe<V>;
+/**
+ * @tsplus pipeable fncts.HashMap find
+ * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
+ */
+export declare function find<V, B extends V>(p: Refinement<V, B>): <K>(self: HashMap<K, V>) => Maybe<B>;
+export declare function find<V>(p: Predicate<V>): <K>(self: HashMap<K, V>) => Maybe<V>;
 /**
  * @tsplus getter fncts.HashMap traverseWithIndex
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
@@ -293,7 +317,7 @@ export declare const traverse: P.Traversable<HashMapF>["traverse"];
  * @tsplus pipeable fncts.HashMap unsafeGet
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function unsafeGet<K>(key: K): <V>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, V>) => V | undefined;
+export declare function unsafeGet<K>(key: K): <V>(self: HashMap<K, V>) => V | undefined;
 /**
  * @tsplus getter fncts.HashMap witherWithIndex
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
@@ -332,4 +356,4 @@ export declare function union<K, A>(that: Iterable<readonly [K, A]>): (self: Has
  * @tsplus pipeable fncts.HashMap pop
  * @tsplus location "@fncts/base/collection/immutable/HashMap/api"
  */
-export declare function pop<K>(k: K): <A>(self: import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, A>) => import("../../../data/Maybe.js").Maybe<readonly [A, import("@fncts/base/collection/immutable/HashMap/definition").HashMap<K, A>]>;
+export declare function pop<K>(k: K): <A>(self: HashMap<K, A>) => Maybe<readonly [A, HashMap<K, A>]>;

package/collection/immutable/HashMap.d.ts

@@ -1,2 +1,2 @@
-export * from "./HashMap/api.js";
 export * from "./HashMap/definition.js";
+export * from "./HashMap/api.js";

package/collection/immutable/HashSet.d.ts

@@ -1,2 +1,2 @@
-export * from "./HashSet/api.js";
 export * from "./HashSet/definition.js";
+export * from "./HashSet/api.js";