effect-cf 0.25.0 → 0.25.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # effect-cf
 
+## 0.25.1
+
+### Patch Changes
+
+- [#88](https://github.com/danieljvdm/effect-cf/pull/88) [`18941d4`](https://github.com/danieljvdm/effect-cf/commit/18941d418c296c39a36d909516eb22a74778c8e7) Thanks [@danieljvdm](https://github.com/danieljvdm)! - Upgrade to Effect 4 beta.107 and use its explicit environment-record config provider for
+  Cloudflare variables.
+
 ## 0.25.0
 
 ### Minor Changes

package/dist/{Binding-DI7u3fEY.d.mts → Binding-COCtoJXa.d.mts}

@@ -59,13 +59,16 @@ declare namespace WorkerConfig {
      * Keep empty-string env values as explicit `""` config values.
      *
      * By default (absent or `false`), empty strings are treated as missing
-     * config, matching `ConfigProvider.fromUnknown`.
+     * config, matching `ConfigProvider.fromEnvRecord`.
      */
     readonly preserveEmptyStrings?: boolean;
   }
   /**
    * Build a `ConfigProvider` from a Cloudflare worker `env` object.
    *
+   * Scalar vars and secrets use Effect's environment-record semantics;
+   * Cloudflare binding objects are ignored.
+   *
    * Empty-string values are treated as missing config by default; pass
    * `{ preserveEmptyStrings: true }` to keep them as explicit values.
    */

package/dist/{DurableObjectState-B5RCFnRy.mjs → DurableObjectState-CEh0DVw7.mjs}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { Cause, Config, ConfigProvider, Context, Data, Effect, Exit, Option, Result, Schema } from "effect";
+import { Cause, Config, ConfigProvider, Context, Data, Effect, Exit, Option, Predicate, Result, Schema } from "effect";
 //#region src/Environment.ts
 var Environment_exports = /* @__PURE__ */ __exportAll({
 	WorkerConfig: () => WorkerConfig,
@@ -16,7 +16,11 @@ let WorkerConfig;
 	_WorkerConfig.number = (name) => Config.number(name);
 	_WorkerConfig.integer = (name) => Config.int(name);
 	_WorkerConfig.boolean = (name) => Config.boolean(name);
-	const providerFromEnv = _WorkerConfig.providerFromEnv = (env, options) => ConfigProvider.fromUnknown(env, options);
+	const providerFromEnv = _WorkerConfig.providerFromEnv = (env, options) => {
+		const record = {};
+		for (const [key, value] of Object.entries(env)) if (Predicate.isString(value) || Predicate.isNumber(value) || Predicate.isBoolean(value)) record[key] = String(value);
+		return ConfigProvider.fromEnvRecord(record, options);
+	};
 	const providerWith = _WorkerConfig.providerWith = (makeProvider) => Effect.map(WorkerEnvironment, makeProvider);
 	const provider = _WorkerConfig.provider = providerWith(providerFromEnv);
 	_WorkerConfig.providerLayer = ConfigProvider.layer(provider);

package/dist/{Hyperdrive-BwYp8Rsz.d.mts → Hyperdrive-6p59yyVk.d.mts}

@@ -1,4 +1,4 @@
-import { c as WorkerEnvironment, r as BindingValidationError, t as BindingNotFoundError } from "./Binding-DI7u3fEY.mjs";
+import { c as WorkerEnvironment, r as BindingValidationError, t as BindingNotFoundError } from "./Binding-COCtoJXa.mjs";
 import { Context, Effect, Layer } from "effect";
 declare namespace Hyperdrive_d_exports {
   export { HyperdriveClient, HyperdriveDefinition, HyperdriveService, LayerOptions, Tag, TagClass, isHyperdrive, layer, make, makeClient };

package/dist/HyperdrivePg.d.mts

@@ -1,5 +1,5 @@
-import { c as WorkerEnvironment, r as BindingValidationError, t as BindingNotFoundError } from "./Binding-DI7u3fEY.mjs";
-import { n as LayerOptions, r as TagClass } from "./Hyperdrive-BwYp8Rsz.mjs";
+import { c as WorkerEnvironment, r as BindingValidationError, t as BindingNotFoundError } from "./Binding-COCtoJXa.mjs";
+import { n as LayerOptions, r as TagClass } from "./Hyperdrive-6p59yyVk.mjs";
 import { Layer } from "effect";
 import { PgClient } from "@effect/sql-pg";
 import { SqlClient, SqlError } from "effect/unstable/sql";

package/dist/Vitest.d.mts

@@ -1,5 +1,5 @@
-import { c as WorkerEnvironment, s as WorkerEnv } from "./Binding-DI7u3fEY.mjs";
-import { c as DurableObjectState, l as DurableObjectStateService, o as WorkflowInstanceStatusName } from "./WorkflowBinding--eMVaixT.mjs";
+import { c as WorkerEnvironment, s as WorkerEnv } from "./Binding-COCtoJXa.mjs";
+import { c as DurableObjectState, l as DurableObjectStateService, o as WorkflowInstanceStatusName } from "./WorkflowBinding-Bzs5kmoE.mjs";
 import { Effect, Layer } from "effect";
 import { DurableObject } from "cloudflare:workers";
 import { adminSecretsStore as adminSecretsStore$1, getQueueResult, introspectWorkflow as introspectWorkflow$1, introspectWorkflowInstance as introspectWorkflowInstance$1 } from "cloudflare:test";

package/dist/Vitest.mjs

@@ -1,4 +1,4 @@
-import { d as WorkerConfig, f as WorkerEnvironment, r as fromDurableObjectState, t as DurableObjectState } from "./DurableObjectState-B5RCFnRy.mjs";
+import { d as WorkerConfig, f as WorkerEnvironment, r as fromDurableObjectState, t as DurableObjectState } from "./DurableObjectState-CEh0DVw7.mjs";
 import { ConfigProvider, Effect, Exit, Layer } from "effect";
 import { env } from "cloudflare:workers";
 import { abortAllDurableObjects as abortAllDurableObjects$1, adminSecretsStore as adminSecretsStore$1, applyD1Migrations as applyD1Migrations$1, createExecutionContext, createMessageBatch, createPagesEventContext, createScheduledController, evictAllDurableObjects as evictAllDurableObjects$1, evictDurableObject as evictDurableObject$1, getQueueResult, introspectWorkflow as introspectWorkflow$1, introspectWorkflowInstance as introspectWorkflowInstance$1, listDurableObjectIds as listDurableObjectIds$1, reset as reset$1, runDurableObjectAlarm as runDurableObjectAlarm$1, runInDurableObject as runInDurableObject$1, waitOnExecutionContext } from "cloudflare:test";

package/dist/{WorkflowBinding--eMVaixT.d.mts → WorkflowBinding-Bzs5kmoE.d.mts}

@@ -1,4 +1,4 @@
-import { c as WorkerEnvironment, n as BindingService, r as BindingValidationError, s as WorkerEnv, t as BindingNotFoundError } from "./Binding-DI7u3fEY.mjs";
+import { c as WorkerEnvironment, n as BindingService, r as BindingValidationError, s as WorkerEnv, t as BindingNotFoundError } from "./Binding-COCtoJXa.mjs";
 import { Cause, Context, Effect, Layer, Option, Schema, Scope } from "effect";
 import { HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import { RpcStub, RpcTarget, WorkerEntrypoint } from "cloudflare:workers";

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { a as Environment_d_exports, c as WorkerEnvironment, i as Binding_d_exports, n as BindingService, o as WorkerConfig, r as BindingValidationError, s as WorkerEnv, t as BindingNotFoundError } from "./Binding-DI7u3fEY.mjs";
-import { t as Hyperdrive_d_exports } from "./Hyperdrive-BwYp8Rsz.mjs";
-import { A as Rpc_d_exports, C as QueueBinding_d_exports, D as RpcDefinition_d_exports, E as ReservedMethodName$2, M as DurableWebSocket, N as DurableObjectStorage_d_exports, O as ServiceFreeSchema$1, P as StorageOperationError, S as QueueDefinition_d_exports, T as Method$2, _ as AsyncMethodArgs, a as WorkflowInstanceCreateOptions, b as AsyncMethodSuccess, c as DurableObjectState, d as ExecutionContext, f as NativeRequest, g as ServiceBinding_d_exports, h as WorkerDefinition_d_exports, i as WorkflowInstanceCreateBatchOptions, j as DurableObjectWebSocket_d_exports, k as Provider, m as Worker_d_exports, n as WorkflowBinding_d_exports, p as WorkerContext, r as WorkflowInstance, s as WorkflowOperationError, t as WorkflowBindingClient, u as DurableObjectState_d_exports, v as AsyncMethodCloudflareReturn, w as Definition$4, x as Queue_d_exports, y as AsyncMethodKey } from "./WorkflowBinding--eMVaixT.mjs";
+import { a as Environment_d_exports, c as WorkerEnvironment, i as Binding_d_exports, n as BindingService, o as WorkerConfig, r as BindingValidationError, s as WorkerEnv, t as BindingNotFoundError } from "./Binding-COCtoJXa.mjs";
+import { t as Hyperdrive_d_exports } from "./Hyperdrive-6p59yyVk.mjs";
+import { A as Rpc_d_exports, C as QueueBinding_d_exports, D as RpcDefinition_d_exports, E as ReservedMethodName$2, M as DurableWebSocket, N as DurableObjectStorage_d_exports, O as ServiceFreeSchema$1, P as StorageOperationError, S as QueueDefinition_d_exports, T as Method$2, _ as AsyncMethodArgs, a as WorkflowInstanceCreateOptions, b as AsyncMethodSuccess, c as DurableObjectState, d as ExecutionContext, f as NativeRequest, g as ServiceBinding_d_exports, h as WorkerDefinition_d_exports, i as WorkflowInstanceCreateBatchOptions, j as DurableObjectWebSocket_d_exports, k as Provider, m as Worker_d_exports, n as WorkflowBinding_d_exports, p as WorkerContext, r as WorkflowInstance, s as WorkflowOperationError, t as WorkflowBindingClient, u as DurableObjectState_d_exports, v as AsyncMethodCloudflareReturn, w as Definition$4, x as Queue_d_exports, y as AsyncMethodKey } from "./WorkflowBinding-Bzs5kmoE.mjs";
 import { Config, Context, Data, DateTime, Duration, Effect, Layer, Option, Redacted, Schema, Scope } from "effect";
 import { Headers as Headers$1, HttpClient, HttpClientResponse } from "effect/unstable/http";
 import { OtlpExporter } from "effect/unstable/observability";

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { a as DurableObjectWebSocket_exports, c as causeMessage, d as WorkerConfig, f as WorkerEnvironment, i as fromExecutionContext, l as violationsMessage, n as DurableObjectState_exports, o as fromWebSocket, r as fromDurableObjectState, s as DurableObjectStorage_exports, t as DurableObjectState, u as Environment_exports } from "./DurableObjectState-B5RCFnRy.mjs";
+import { a as DurableObjectWebSocket_exports, c as causeMessage, d as WorkerConfig, f as WorkerEnvironment, i as fromExecutionContext, l as violationsMessage, n as DurableObjectState_exports, o as fromWebSocket, r as fromDurableObjectState, s as DurableObjectStorage_exports, t as DurableObjectState, u as Environment_exports } from "./DurableObjectState-CEh0DVw7.mjs";
 import { Clock, Config, ConfigProvider, Context, Data, DateTime, Duration, Effect, Exit, Function as Function$1, Layer, ManagedRuntime, Option, Predicate, Queue, Result, Schema } from "effect";
 import { FetchHttpClient, HttpClient, HttpClientRequest, HttpEffect, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import { OtlpExporter, OtlpLogger, OtlpMetrics, OtlpSerialization, OtlpTracer } from "effect/unstable/observability";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {
@@ -48,7 +48,7 @@
     "@cloudflare/containers": "catalog:",
     "@cloudflare/vitest-pool-workers": "catalog:",
     "@cloudflare/workers-types": "catalog:",
-    "@effect/platform-node": "^4.0.0-beta.105",
+    "@effect/platform-node": "^4.0.0-beta.107 <4.0.0-rc.0",
     "@effect/sql-d1": "catalog:",
     "@effect/sql-pg": "catalog:",
     "@effect/sql-sqlite-do": "catalog:",
@@ -60,10 +60,10 @@
   "peerDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.21.3",
     "@cloudflare/workers-types": "^4.20260611.1",
-    "@effect/sql-d1": "^4.0.0-beta.105",
-    "@effect/sql-pg": "^4.0.0-beta.105",
-    "@effect/sql-sqlite-do": "^4.0.0-beta.105",
-    "effect": "^4.0.0-beta.105"
+    "@effect/sql-d1": "^4.0.0-beta.107 <4.0.0-rc.0",
+    "@effect/sql-pg": "^4.0.0-beta.107 <4.0.0-rc.0",
+    "@effect/sql-sqlite-do": "^4.0.0-beta.107 <4.0.0-rc.0",
+    "effect": "^4.0.0-beta.107 <4.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/vitest-pool-workers": {

package/src/Environment.ts

@@ -1,4 +1,4 @@
-import { Config, ConfigProvider, Context, Effect, type Layer } from "effect";
+import { Config, ConfigProvider, Context, Effect, type Layer, Predicate } from "effect";
 
 /** Cloudflare worker environment object (`env`). */
 export type WorkerEnv = Cloudflare.Env;
@@ -78,7 +78,7 @@ export namespace WorkerConfig {
      * Keep empty-string env values as explicit `""` config values.
      *
      * By default (absent or `false`), empty strings are treated as missing
-     * config, matching `ConfigProvider.fromUnknown`.
+     * config, matching `ConfigProvider.fromEnvRecord`.
      */
     readonly preserveEmptyStrings?: boolean;
   }
@@ -86,11 +86,23 @@ export namespace WorkerConfig {
   /**
    * Build a `ConfigProvider` from a Cloudflare worker `env` object.
    *
+   * Scalar vars and secrets use Effect's environment-record semantics;
+   * Cloudflare binding objects are ignored.
+   *
    * Empty-string values are treated as missing config by default; pass
    * `{ preserveEmptyStrings: true }` to keep them as explicit values.
    */
-  export const providerFromEnv = (env: WorkerEnv, options?: ProviderOptions) =>
-    ConfigProvider.fromUnknown(env, options);
+  export const providerFromEnv = (env: WorkerEnv, options?: ProviderOptions) => {
+    const record: Record<string, string> = {};
+
+    for (const [key, value] of Object.entries(env)) {
+      if (Predicate.isString(value) || Predicate.isNumber(value) || Predicate.isBoolean(value)) {
+        record[key] = String(value);
+      }
+    }
+
+    return ConfigProvider.fromEnvRecord(record, options);
+  };
 
   /**
    * Build a `ConfigProvider` from the current `WorkerEnvironment` with a custom