@fncts/query 0.0.14 → 0.0.15

package/_src/internal/Continue.ts

@@ -1,4 +1,5 @@
 import type { Described } from "@fncts/query/Described";
+import type { Request } from "@fncts/query/Request";
 
 import { QueryFailure } from "../QueryFailure.js";
 

package/_src/internal/Result.ts

@@ -29,7 +29,10 @@ export const enum ResultTag {
 
 export class Blocked<R, E, A> extends Result<R, E, A> {
   readonly _tag = ResultTag.Blocked;
-  constructor(readonly blockedRequests: BlockedRequests<R>, readonly cont: Continue<R, E, A>) {
+  constructor(
+    readonly blockedRequests: BlockedRequests<R>,
+    readonly cont: Continue<R, E, A>,
+  ) {
     super();
   }
 }

package/index.d.ts

@@ -1,9 +1,9 @@
-export type {} from "./Cache.js";
-export type {} from "./CompletedRequestMap.js";
-export type {} from "./DataSource.js";
-export type {} from "./DataSourceAspect.js";
-export type {} from "./Described.js";
 export type {} from "./global.js";
-export type {} from "./Query.js";
-export type {} from "./QueryFailure.js";
 export type {} from "./Request.js";
+export type {} from "./QueryFailure.js";
+export type {} from "./Query.js";
+export type {} from "./Described.js";
+export type {} from "./DataSourceAspect.js";
+export type {} from "./DataSource.js";
+export type {} from "./CompletedRequestMap.js";
+export type {} from "./Cache.js";

package/internal/BlockedRequest.d.ts

@@ -1,7 +1,7 @@
-import { Request } from "@fncts/query/Request";
 import { Ref } from "@fncts/io/Ref/definition";
 import { Maybe } from "@fncts/base/data/Maybe/definition";
 import { Either } from "@fncts/base/data/Either/definition";
+import type { Request } from "@fncts/query/Request";
 export declare const BlockedRequestTypeId: unique symbol;
 export type BlockedRequestTypeId = typeof BlockedRequestTypeId;
 /**

package/internal/BlockedRequests.d.ts

@@ -92,7 +92,7 @@ export declare class MapDataSources<R> extends BlockedRequestsFolder<R, BlockedR
  * @tsplus pipeable fncts.query.BlockedRequests mapDataSources
  * @tsplus location "@fncts/query/internal/BlockedRequests"
  */
-export declare function mapDataSources<R1>(f: DataSourceAspect<R1>): <R>(self: BlockedRequests<R>) => BlockedRequests<R1 | R>;
+export declare function mapDataSources<R1>(f: DataSourceAspect<R1>): <R>(self: BlockedRequests<R>) => BlockedRequests<R | R1>;
 export declare class ContramapEnvironment<R0, R> extends BlockedRequestsFolder<R, BlockedRequests<R0>> {
     readonly f: Described<(_: Environment<R0>) => Environment<R>>;
     constructor(f: Described<(_: Environment<R0>) => Environment<R>>);

package/internal/Continue.d.ts

@@ -1,6 +1,5 @@
 import { Query } from "@fncts/query/Query/definition";
 import { FIO } from "@fncts/io/IO/definition";
-import { Request } from "@fncts/query/Request";
 import { DataSource } from "@fncts/query/DataSource";
 import { Ref } from "@fncts/io/Ref/definition";
 import { Maybe } from "@fncts/base/data/Maybe/definition";
@@ -10,6 +9,7 @@ import { DataSourceAspect } from "@fncts/query/DataSourceAspect";
 import { Conc } from "@fncts/base/collection/immutable/Conc";
 import { Environment } from "@fncts/base/data/Environment/definition";
 import type { Described } from "@fncts/query/Described";
+import type { Request } from "@fncts/query/Request";
 export declare const ContinueTypeId: unique symbol;
 export type ContinueTypeId = typeof ContinueTypeId;
 export declare const ContinueVariance: unique symbol;
@@ -75,7 +75,7 @@ export declare function matchType<R, E, A, B, C>(cases: {
  * @tsplus pipeable fncts.query.Continue mapQuery
  * @tsplus location "@fncts/query/internal/Continue"
  */
-export declare function mapQuery<A, R1, E1, B>(f: (a: A) => Query<R1, E1, B>, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R1 | R, E1 | E, B>;
+export declare function mapQuery<A, R1, E1, B>(f: (a: A) => Query<R1, E1, B>, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R | R1, E | E1, B>;
 /**
  * @tsplus pipeable fncts.query.Continue match
  * @tsplus location "@fncts/query/internal/Continue"
@@ -85,7 +85,7 @@ export declare function match<E, A, B, C>(failure: (e: E) => B, success: (a: A)
  * @tsplus pipeable fncts.query.Continue matchCauseQuery
  * @tsplus location "@fncts/query/internal/Continue"
  */
-export declare function matchCauseQuery<E, A, R1, E1, B, R2, E2, C>(failure: (cause: Cause<E>) => Query<R1, E1, B>, success: (value: A) => Query<R2, E2, C>, __tsplusTrace?: string): <R>(self: Continue<R, E, A>) => Continue<R1 | R2 | R, E1 | E2, B | C>;
+export declare function matchCauseQuery<E, A, R1, E1, B, R2, E2, C>(failure: (cause: Cause<E>) => Query<R1, E1, B>, success: (value: A) => Query<R2, E2, C>, __tsplusTrace?: string): <R>(self: Continue<R, E, A>) => Continue<R | R1 | R2, E1 | E2, B | C>;
 /**
  * @tsplus pipeable fncts.query.Continue map
  * @tsplus location "@fncts/query/internal/Continue"
@@ -95,7 +95,7 @@ export declare function map<A, B>(f: (a: A) => B, __tsplusTrace?: string): <R, E
  * @tsplus pipeable fncts.query.Continue mapDataSources
  * @tsplus location "@fncts/query/internal/Continue"
  */
-export declare function mapDataSources<R1>(f: DataSourceAspect<R1>, __tsplusTrace?: string): <R, E, A>(self: Continue<R, E, A>) => Continue<R1 | R, E, A>;
+export declare function mapDataSources<R1>(f: DataSourceAspect<R1>, __tsplusTrace?: string): <R, E, A>(self: Continue<R, E, A>) => Continue<R | R1, E, A>;
 /**
  * @tsplus pipeable fncts.query.Continue mapError
  * @tsplus location "@fncts/query/internal/Continue"
@@ -110,17 +110,17 @@ export declare function mapErrorCause<E, E1>(f: (cause: Cause<E>) => Cause<E1>,
  * @tsplus pipeable fncts.query.Continue zipWith
  * @tsplus location "@fncts/query/internal/Continue"
  */
-export declare function zipWith<A, R1, E1, B, C>(that: Continue<R1, E1, B>, f: (a: A, b: B) => C, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R1 | R, E1 | E, C>;
+export declare function zipWith<A, R1, E1, B, C>(that: Continue<R1, E1, B>, f: (a: A, b: B) => C, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R | R1, E | E1, C>;
 /**
  * @tsplus pipeable fncts.query.Continue zipWithConcurrent
  * @tsplus location "@fncts/query/internal/Continue"
  */
-export declare function zipWithConcurrent<A, R1, E1, B, C>(that: Continue<R1, E1, B>, f: (a: A, b: B) => C, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R1 | R, E1 | E, C>;
+export declare function zipWithConcurrent<A, R1, E1, B, C>(that: Continue<R1, E1, B>, f: (a: A, b: B) => C, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R | R1, E | E1, C>;
 /**
  * @tsplus pipeable fncts.query.Continue zipWithBatched
  * @tsplus location "@fncts/query/internal/Continue"
  */
-export declare function zipWithBatched<A, R1, E1, B, C>(that: Continue<R1, E1, B>, f: (a: A, b: B) => C, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R1 | R, E1 | E, C>;
+export declare function zipWithBatched<A, R1, E1, B, C>(that: Continue<R1, E1, B>, f: (a: A, b: B) => C, __tsplusTrace?: string): <R, E>(self: Continue<R, E, A>) => Continue<R | R1, E | E1, C>;
 /**
  * @tsplus static fncts.query.ContinueOps collectAllConcurrent
  * @tsplus location "@fncts/query/internal/Continue"

package/internal/Parallel.d.ts

@@ -23,7 +23,7 @@ export declare class Parallel<R> {
  * @tsplus pipeable fncts.query.Parallel concat
  * @tsplus location "@fncts/query/internal/Parallel"
  */
-export declare function concat<R1>(that: Parallel<R1>): <R>(self: Parallel<R>) => Parallel<R1 | R>;
+export declare function concat<R1>(that: Parallel<R1>): <R>(self: Parallel<R>) => Parallel<R | R1>;
 /**
  * @tsplus getter fncts.query.Parallel isEmpty
  * @tsplus location "@fncts/query/internal/Parallel"

package/internal/Result.d.ts

@@ -82,7 +82,7 @@ export declare function map<A, B>(f: (a: A) => B, __tsplusTrace?: string): <R, E
  * @tsplus pipeable fncts.query.Result mapDataSources
  * @tsplus location "@fncts/query/internal/Result"
  */
-export declare function mapDataSources<R1>(f: DataSourceAspect<R1>): <R, E, A>(self: Result<R, E, A>) => Result<R1 | R, E, A>;
+export declare function mapDataSources<R1>(f: DataSourceAspect<R1>): <R, E, A>(self: Result<R, E, A>) => Result<R | R1, E, A>;
 /**
  * @tsplus pipeable fncts.query.Result mapError
  * @tsplus location "@fncts/query/internal/Result"

package/internal/Sequential.d.ts

@@ -22,7 +22,7 @@ export declare class Sequential<R> {
  * @tsplus pipeable fncts.query.Sequential concat
  * @tsplus location "@fncts/query/internal/Sequential"
  */
-export declare function concat<R1>(that: Sequential<R1>): <R>(self: Sequential<R>) => Sequential<R1 | R>;
+export declare function concat<R1>(that: Sequential<R1>): <R>(self: Sequential<R>) => Sequential<R | R1>;
 /**
  * @tsplus getter fncts.query.Sequential isEmpty
  * @tsplus location "@fncts/query/internal/Sequential"

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fncts/query",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "dependencies": {
-    "@fncts/base": "0.0.32",
-    "@fncts/io": "0.0.39",
-    "@fncts/typelevel": "0.0.15"
+    "@fncts/base": "0.0.33",
+    "@fncts/io": "0.0.40",
+    "@fncts/typelevel": "0.0.16"
   },
   "exports": {
     "./*": {