@nyc-transit-kit/soda3 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nyc-transit-kit/soda3",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -24,8 +24,8 @@
     "test": "bun test ./test"
   },
   "dependencies": {
-    "@nyc-transit-kit/contracts": "0.1.1",
-    "effect": "4.0.0-beta.83"
+    "@nyc-transit-kit/contracts": "0.1.3",
+    "effect": "4.0.0-beta.92"
   },
   "publishConfig": {
     "access": "public"

package/src/client.ts

@@ -1,6 +1,12 @@
 export { catalogSearch } from "./catalog"
 export { exportResponse } from "./export"
 export { Soda3HttpLive } from "./internal/http"
-export type { Soda3ClientConfigShape } from "./internal/services"
-export { Soda3ClientConfig, Soda3Live } from "./internal/services"
+export type { Soda3ClientConfigShape, Soda3LayerOptions } from "./internal/services"
+export {
+  Soda3ClientConfig,
+  Soda3Live,
+  soda3ConfigLayer,
+  soda3FetchLayer,
+  soda3Layer
+} from "./internal/services"
 export { queryRows } from "./query"

package/src/errors.ts

@@ -47,5 +47,12 @@ export type Soda3ClientError =
   | TimeoutError
   | RetryExhaustedError
 
+export const isSoda3ClientError = (value: unknown): value is Soda3ClientError =>
+  value instanceof InvalidInputError ||
+  value instanceof ProviderHttpError ||
+  value instanceof ProviderContractError ||
+  value instanceof TimeoutError ||
+  value instanceof RetryExhaustedError
+
 export const isRetryableProviderError = (error: Soda3ClientError): error is ProviderHttpError =>
   error._tag === "ProviderHttpError" && error.retryable

package/src/index.ts

@@ -1,7 +1,14 @@
 export const packageName = "@nyc-transit-kit/soda3"
 export { buildCatalogSearchUrl, catalogSearch } from "./catalog"
-export type { Soda3ClientConfigShape } from "./client"
-export { Soda3ClientConfig, Soda3HttpLive, Soda3Live } from "./client"
+export type { Soda3ClientConfigShape, Soda3LayerOptions } from "./client"
+export {
+  Soda3ClientConfig,
+  Soda3HttpLive,
+  Soda3Live,
+  soda3ConfigLayer,
+  soda3FetchLayer,
+  soda3Layer
+} from "./client"
 export {
   buildExportUrl,
   buildQueryUrl,
@@ -16,6 +23,7 @@ export type { Soda3ClientError } from "./errors"
 export {
   InvalidInputError,
   isRetryableProviderError,
+  isSoda3ClientError,
   ProviderContractError,
   ProviderHttpError,
   RetryExhaustedError,

package/src/internal/services.ts

@@ -1,5 +1,6 @@
 import * as Context from "effect/Context"
 import * as Layer from "effect/Layer"
+import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient"
 import { Soda3HttpLive } from "./http"
 
 export interface Soda3ClientConfigShape {
@@ -8,6 +9,10 @@ export interface Soda3ClientConfigShape {
   readonly timeoutMs?: number
 }
 
+export interface Soda3LayerOptions extends Soda3ClientConfigShape {
+  readonly fetch?: typeof fetch
+}
+
 export class Soda3ClientConfig extends Context.Service<Soda3ClientConfig, Soda3ClientConfigShape>()(
   "@nyc-transit-kit/soda3/Soda3ClientConfig"
 ) {
@@ -16,4 +21,21 @@ export class Soda3ClientConfig extends Context.Service<Soda3ClientConfig, Soda3C
   })
 }
 
-export const Soda3Live = Layer.mergeAll(Soda3ClientConfig.Default, Soda3HttpLive)
+export const soda3ConfigLayer = (options: Soda3ClientConfigShape = {}) =>
+  Layer.succeed(Soda3ClientConfig)({
+    retryTimes: options.retryTimes ?? 0,
+    ...(options.appToken === undefined ? {} : { appToken: options.appToken }),
+    ...(options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs })
+  })
+
+export const soda3FetchLayer = (fetchImplementation?: typeof fetch) =>
+  fetchImplementation === undefined
+    ? Soda3HttpLive
+    : FetchHttpClient.layer.pipe(
+        Layer.provide(Layer.succeed(FetchHttpClient.Fetch, fetchImplementation))
+      )
+
+export const soda3Layer = (options: Soda3LayerOptions = {}) =>
+  Layer.mergeAll(soda3ConfigLayer(options), soda3FetchLayer(options.fetch))
+
+export const Soda3Live = soda3Layer()