@effect/platform-browser 4.0.0-beta.43 → 4.0.0-beta.44

package/dist/IndexedDbTable.js

@@ -20,17 +20,19 @@ export const make = options => {
   // oxlint-disable-next-line typescript/no-extraneous-class
   class Table {}
   Object.assign(Table, Proto);
-  const readSchema = options.keyPath === undefined ? options.schema.mapFields(Struct.assign({
+  const readSchema = options.keyPath === undefined ? Schema.Struct({
+    ...options.schema.fields,
     key: IndexedDb.IDBValidKey
-  })) : options.schema;
+  }) : options.schema;
   Table.tableName = options.name;
   Table.tableSchema = options.schema;
   Table.readSchema = readSchema;
   Table.arraySchema = Schema.Array(readSchema);
-  Table.autoincrementSchema = options.autoIncrement ? options.schema.mapFields(Struct.omit([options.keyPath])) : options.schema;
+  Table.autoincrementSchema = options.autoIncrement ? Schema.Struct(Struct.omit(options.schema.fields, [options.keyPath])) : options.schema;
   Table.keyPath = options.keyPath;
   Table.indexes = options.indexes;
   Table.autoIncrement = options.autoIncrement === true;
+  Table.durability = options.durability ?? "relaxed";
   return Table;
 };
 //# sourceMappingURL=IndexedDbTable.js.map

package/dist/IndexedDbTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"IndexedDbTable.js","names":["pipeArguments","Schema","Struct","IndexedDb","TypeId","Proto","pipe","arguments","make","options","Table","Object","assign","readSchema","keyPath","undefined","schema","mapFields","key","IDBValidKey","tableName","name","tableSchema","arraySchema","Array","autoincrementSchema","autoIncrement","omit","indexes"],"sources":["../src/IndexedDbTable.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAAwBA,aAAa,QAAQ,iBAAiB;AAC9D,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAG3C,MAAMC,MAAM,GAAG,0CAA0C;AA2HzD,MAAMC,KAAK,GAAG;EACZ,CAACD,MAAM,GAAGA,MAAM;EAChBE,IAAIA,CAAA;IACF,OAAON,aAAa,CAAC,IAAI,EAAEO,SAAS,CAAC;EACvC;CACD;AAED;;;;AAIA,OAAO,MAAMC,IAAI,GAYfC,OAaD,IAMG;EACF;EACA,MAAMC,KAAK;EACXC,MAAM,CAACC,MAAM,CAACF,KAAK,EAAEL,KAAK,CAAC;EAC3B,MAAMQ,UAAU,GAAGJ,OAAO,CAACK,OAAO,KAAKC,SAAS,GAC3CN,OAAO,CAACO,MAA4B,CAACC,SAAS,CAACf,MAAM,CAACU,MAAM,CAAC;IAAEM,GAAG,EAAEf,SAAS,CAACgB;EAAW,CAAE,CAAC,CAAC,GAC9FV,OAAO,CAACO,MAAM;EAChBN,KAAa,CAACU,SAAS,GAAGX,OAAO,CAACY,IAAI;EACtCX,KAAa,CAACY,WAAW,GAAGb,OAAO,CAACO,MAAM;EAC1CN,KAAa,CAACG,UAAU,GAAGA,UAAU;EACrCH,KAAa,CAACa,WAAW,GAAGtB,MAAM,CAACuB,KAAK,CAACX,UAAiB,CAAC;EAC3DH,KAAa,CAACe,mBAAmB,GAAGhB,OAAO,CAACiB,aAAa,GACtDjB,OAAO,CAACO,MAA4B,CAACC,SAAS,CAACf,MAAM,CAACyB,IAAI,CAAC,CAAClB,OAAO,CAACK,OAAQ,CAAQ,CAAC,CAAC,GACvFL,OAAO,CAACO,MAAM;EAChBN,KAAa,CAACI,OAAO,GAAGL,OAAO,CAACK,OAAO;EACvCJ,KAAa,CAACkB,OAAO,GAAGnB,OAAO,CAACmB,OAAO;EACvClB,KAAa,CAACgB,aAAa,GAAGjB,OAAO,CAACiB,aAAa,KAAK,IAAI;EAC9D,OAAOhB,KAAY;AACrB,CAAC","ignoreList":[]}
+{"version":3,"file":"IndexedDbTable.js","names":["pipeArguments","Schema","Struct","IndexedDb","TypeId","Proto","pipe","arguments","make","options","Table","Object","assign","readSchema","keyPath","undefined","schema","fields","key","IDBValidKey","tableName","name","tableSchema","arraySchema","Array","autoincrementSchema","autoIncrement","omit","indexes","durability"],"sources":["../src/IndexedDbTable.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAAwBA,aAAa,QAAQ,iBAAiB;AAC9D,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAG3C,MAAMC,MAAM,GAAG,0CAA0C;AAoHzD,MAAMC,KAAK,GAAG;EACZ,CAACD,MAAM,GAAGA,MAAM;EAChBE,IAAIA,CAAA;IACF,OAAON,aAAa,CAAC,IAAI,EAAEO,SAAS,CAAC;EACvC;CACD;AAED;;;;AAIA,OAAO,MAAMC,IAAI,GAYfC,OAcD,IAMG;EACF;EACA,MAAMC,KAAK;EACXC,MAAM,CAACC,MAAM,CAACF,KAAK,EAAEL,KAAK,CAAC;EAC3B,MAAMQ,UAAU,GAAGJ,OAAO,CAACK,OAAO,KAAKC,SAAS,GAC5Cd,MAAM,CAACC,MAAM,CAAC;IACd,GAAIO,OAAO,CAACO,MAA4B,CAACC,MAAM;IAC/CC,GAAG,EAAEf,SAAS,CAACgB;GAChB,CAAC,GACAV,OAAO,CAACO,MAAM;EAChBN,KAAa,CAACU,SAAS,GAAGX,OAAO,CAACY,IAAI;EACtCX,KAAa,CAACY,WAAW,GAAGb,OAAO,CAACO,MAAM;EAC1CN,KAAa,CAACG,UAAU,GAAGA,UAAU;EACrCH,KAAa,CAACa,WAAW,GAAGtB,MAAM,CAACuB,KAAK,CAACX,UAAiB,CAAC;EAC3DH,KAAa,CAACe,mBAAmB,GAAGhB,OAAO,CAACiB,aAAa,GACvDzB,MAAM,CAACC,MAAM,CAACA,MAAM,CAACyB,IAAI,CAAElB,OAAO,CAACO,MAA4B,CAACC,MAAM,EAAE,CAACR,OAAO,CAACK,OAAQ,CAAQ,CAAC,CAAC,GACnGL,OAAO,CAACO,MAAM;EAChBN,KAAa,CAACI,OAAO,GAAGL,OAAO,CAACK,OAAO;EACvCJ,KAAa,CAACkB,OAAO,GAAGnB,OAAO,CAACmB,OAAO;EACvClB,KAAa,CAACgB,aAAa,GAAGjB,OAAO,CAACiB,aAAa,KAAK,IAAI;EAC5DhB,KAAa,CAACmB,UAAU,GAAGpB,OAAO,CAACoB,UAAU,IAAI,SAAS;EAC5D,OAAOnB,KAAY;AACrB,CAAC","ignoreList":[]}

package/dist/Permissions.d.ts

@@ -1,6 +1,9 @@
+/**
+ * @since 1.0.0
+ */
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
 declare const TypeId = "~@effect/platform-browser/Permissions";
 declare const ErrorTypeId = "~@effect/platform-browser/Permissions/PermissionsError";
 /**
@@ -68,7 +71,7 @@ export declare class PermissionsError extends PermissionsError_base<{
  * @since 1.0.0
  * @category Service
  */
-export declare const Permissions: ServiceMap.Service<Permissions, Permissions>;
+export declare const Permissions: Context.Service<Permissions, Permissions>;
 /**
  * A layer that directly interfaces with the `navigator.permissions` api
  *

package/dist/Permissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Permissions.d.ts","sourceRoot":"","sources":["../src/Permissions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,QAAA,MAAM,MAAM,0CAA0C,CAAA;AACtD,QAAA,MAAM,WAAW,2DAA2D,CAAA;AAE5E;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,SAAS,cAAc,EAC1C,IAAI,EAAE,IAAI,KACP,MAAM,CAAC,MAAM,CAGhB,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,EAC/C,gBAAgB,CACjB,CAAA;CACF;;;;AAED;;;GAGG;AACH,qBAAa,4BAA6B,SAAQ,kCAAsC;IACtF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CACxB,CAAC;IACA,IAAa,OAAO,IAAI,MAAM,CAE7B;CACF;;;;AAED;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,0BAA8B;IACtE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CACxB,CAAC;IACA,IAAa,OAAO,IAAI,MAAM,CAE7B;CACF;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,GAAG,oBAAoB,CAAA;;;;AAExF;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,sBAAqC;IACzE,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAA;CACxC,CAAC;gBACY,KAAK,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAA;KAAE;IAO9D,QAAQ,CAAC,CAAC,WAAW,CAAC,4DAAc;IAEpC,IAAa,OAAO,IAAI,MAAM,CAE7B;CACF;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAA2C,CAAA;AAEhH;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAe1C,CAAA"}
+{"version":3,"file":"Permissions.d.ts","sourceRoot":"","sources":["../src/Permissions.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAEzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,QAAA,MAAM,MAAM,0CAA0C,CAAA;AACtD,QAAA,MAAM,WAAW,2DAA2D,CAAA;AAE5E;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,SAAS,cAAc,EAC1C,IAAI,EAAE,IAAI,KACP,MAAM,CAAC,MAAM,CAGhB,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,EAC/C,gBAAgB,CACjB,CAAA;CACF;;;;AAED;;;GAGG;AACH,qBAAa,4BAA6B,SAAQ,kCAAsC;IACtF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CACxB,CAAC;IACA,IAAa,OAAO,IAAI,MAAM,CAE7B;CACF;;;;AAED;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,0BAA8B;IACtE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CACxB,CAAC;IACA,IAAa,OAAO,IAAI,MAAM,CAE7B;CACF;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,GAAG,oBAAoB,CAAA;;;;AAExF;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,sBAAqC;IACzE,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAA;CACxC,CAAC;gBACY,KAAK,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAA;KAAE;IAO9D,QAAQ,CAAC,CAAC,WAAW,CAAC,4DAAc;IAEpC,IAAa,OAAO,IAAI,MAAM,CAE7B;CACF;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAwC,CAAA;AAE1G;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAe1C,CAAA"}

package/dist/Permissions.js

@@ -1,10 +1,10 @@
 /**
  * @since 1.0.0
  */
+import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
 const TypeId = "~@effect/platform-browser/Permissions";
 const ErrorTypeId = "~@effect/platform-browser/Permissions/PermissionsError";
 /**
@@ -45,7 +45,7 @@ export class PermissionsError extends /*#__PURE__*/Data.TaggedError("Permissions
  * @since 1.0.0
  * @category Service
  */
-export const Permissions = /*#__PURE__*/ServiceMap.Service(TypeId);
+export const Permissions = /*#__PURE__*/Context.Service(TypeId);
 /**
  * A layer that directly interfaces with the `navigator.permissions` api
  *

package/dist/Permissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"Permissions.js","names":["Data","Effect","Layer","ServiceMap","TypeId","ErrorTypeId","PermissionsInvalidStateError","TaggedError","message","_tag","PermissionsTypeError","PermissionsError","constructor","props","cause","reason","Permissions","Service","layer","succeed","of","query","name","tryPromise","try","navigator","permissions","catch","DOMException"],"sources":["../src/Permissions.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,UAAU,MAAM,mBAAmB;AAE/C,MAAMC,MAAM,GAAG,uCAAuC;AACtD,MAAMC,WAAW,GAAG,wDAAwD;AAyB5E;;;;AAIA,OAAM,MAAOC,4BAA6B,sBAAQN,IAAI,CAACO,WAAW,CAAC,mBAAmB,CAEpF;EACA,IAAaC,OAAOA,CAAA;IAClB,OAAO,IAAI,CAACC,IAAI;EAClB;;AAGF;;;;AAIA,OAAM,MAAOC,oBAAqB,sBAAQV,IAAI,CAACO,WAAW,CAAC,WAAW,CAEpE;EACA,IAAaC,OAAOA,CAAA;IAClB,OAAO,IAAI,CAACC,IAAI;EAClB;;AASF;;;;AAIA,OAAM,MAAOE,gBAAiB,sBAAQX,IAAI,CAACO,WAAW,CAAC,kBAAkB,CAEvE;EACAK,YAAYC,KAAkD;IAC5D,KAAK,CAAC;MACJ,GAAGA,KAAK;MACRC,KAAK,EAAED,KAAK,CAACE,MAAM,CAACD;KACd,CAAC;EACX;EAES,CAACT,WAAW,IAAIA,WAAW;EAEpC,IAAaG,OAAOA,CAAA;IAClB,OAAO,IAAI,CAACO,MAAM,CAACP,OAAO;EAC5B;;AAGF;;;;AAIA,OAAO,MAAMQ,WAAW,gBAAiDb,UAAU,CAACc,OAAO,CAAcb,MAAM,CAAC;AAEhH;;;;;;AAMA,OAAO,MAAMc,KAAK,gBAA6BhB,KAAK,CAACiB,OAAO,CAC1DH,WAAW,eACXA,WAAW,CAACI,EAAE,CAAC;EACb,CAAChB,MAAM,GAAGA,MAAM;EAChBiB,KAAK,EAAGC,IAAI,IACVrB,MAAM,CAACsB,UAAU,CAAC;IAChBC,GAAG,EAAEA,CAAA,KAAMC,SAAS,CAACC,WAAW,CAACL,KAAK,CAAC;MAAEC;IAAI,CAAE,CAAiB;IAChEK,KAAK,EAAGb,KAAK,IACX,IAAIH,gBAAgB,CAAC;MACnBI,MAAM,EAAED,KAAK,YAAYc,YAAY,GACjC,IAAItB,4BAA4B,CAAC;QAAEQ;MAAK,CAAE,CAAC,GAC3C,IAAIJ,oBAAoB,CAAC;QAAEI;MAAK,CAAE;KACvC;GACJ;CACJ,CAAC,CACH","ignoreList":[]}
+{"version":3,"file":"Permissions.js","names":["Context","Data","Effect","Layer","TypeId","ErrorTypeId","PermissionsInvalidStateError","TaggedError","message","_tag","PermissionsTypeError","PermissionsError","constructor","props","cause","reason","Permissions","Service","layer","succeed","of","query","name","tryPromise","try","navigator","permissions","catch","DOMException"],"sources":["../src/Permissions.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,MAAMC,MAAM,GAAG,uCAAuC;AACtD,MAAMC,WAAW,GAAG,wDAAwD;AAyB5E;;;;AAIA,OAAM,MAAOC,4BAA6B,sBAAQL,IAAI,CAACM,WAAW,CAAC,mBAAmB,CAEpF;EACA,IAAaC,OAAOA,CAAA;IAClB,OAAO,IAAI,CAACC,IAAI;EAClB;;AAGF;;;;AAIA,OAAM,MAAOC,oBAAqB,sBAAQT,IAAI,CAACM,WAAW,CAAC,WAAW,CAEpE;EACA,IAAaC,OAAOA,CAAA;IAClB,OAAO,IAAI,CAACC,IAAI;EAClB;;AASF;;;;AAIA,OAAM,MAAOE,gBAAiB,sBAAQV,IAAI,CAACM,WAAW,CAAC,kBAAkB,CAEvE;EACAK,YAAYC,KAAkD;IAC5D,KAAK,CAAC;MACJ,GAAGA,KAAK;MACRC,KAAK,EAAED,KAAK,CAACE,MAAM,CAACD;KACd,CAAC;EACX;EAES,CAACT,WAAW,IAAIA,WAAW;EAEpC,IAAaG,OAAOA,CAAA;IAClB,OAAO,IAAI,CAACO,MAAM,CAACP,OAAO;EAC5B;;AAGF;;;;AAIA,OAAO,MAAMQ,WAAW,gBAA8ChB,OAAO,CAACiB,OAAO,CAAcb,MAAM,CAAC;AAE1G;;;;;;AAMA,OAAO,MAAMc,KAAK,gBAA6Bf,KAAK,CAACgB,OAAO,CAC1DH,WAAW,eACXA,WAAW,CAACI,EAAE,CAAC;EACb,CAAChB,MAAM,GAAGA,MAAM;EAChBiB,KAAK,EAAGC,IAAI,IACVpB,MAAM,CAACqB,UAAU,CAAC;IAChBC,GAAG,EAAEA,CAAA,KAAMC,SAAS,CAACC,WAAW,CAACL,KAAK,CAAC;MAAEC;IAAI,CAAE,CAAiB;IAChEK,KAAK,EAAGb,KAAK,IACX,IAAIH,gBAAgB,CAAC;MACnBI,MAAM,EAAED,KAAK,YAAYc,YAAY,GACjC,IAAItB,4BAA4B,CAAC;QAAEQ;MAAK,CAAE,CAAC,GAC3C,IAAIJ,oBAAoB,CAAC;QAAEI;MAAK,CAAE;KACvC;GACJ;CACJ,CAAC,CACH","ignoreList":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@effect/platform-browser",
   "type": "module",
-  "version": "4.0.0-beta.43",
+  "version": "4.0.0-beta.44",
   "license": "MIT",
   "description": "Platform specific implementations for the browser",
   "homepage": "https://effect.website",
@@ -45,12 +45,12 @@
     "provenance": true
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.43"
+    "effect": "^4.0.0-beta.44"
   },
   "devDependencies": {
     "mock-xmlhttprequest": "^8.4.1",
     "fake-indexeddb": "^6.2.5",
-    "effect": "^4.0.0-beta.43"
+    "effect": "^4.0.0-beta.44"
   },
   "dependencies": {
     "multipasta": "^0.2.7"

package/src/BrowserHttpClient.ts

@@ -2,6 +2,7 @@
  * @since 1.0.0
  */
 import * as Cause from "effect/Cause"
+import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import type { LazyArg } from "effect/Function"
 import * as Inspectable from "effect/Inspectable"
@@ -10,7 +11,6 @@ import * as Option from "effect/Option"
 import { type Pipeable, pipeArguments } from "effect/Pipeable"
 import * as Queue from "effect/Queue"
 import type * as Schema from "effect/Schema"
-import * as ServiceMap from "effect/ServiceMap"
 import * as Stream from "effect/Stream"
 import * as Cookies from "effect/unstable/http/Cookies"
 import * as Headers from "effect/unstable/http/Headers"
@@ -58,7 +58,7 @@ export type XHRResponseType = "arraybuffer" | "text"
  * @since 1.0.0
  * @category References
  */
-export const CurrentXHRResponseType: ServiceMap.Reference<XHRResponseType> = ServiceMap.Reference(
+export const CurrentXHRResponseType: Context.Reference<XHRResponseType> = Context.Reference(
   "@effect/platform-browser/BrowserHttpClient/CurrentXHRResponseType",
   { defaultValue: (): XHRResponseType => "text" }
 )
@@ -80,7 +80,7 @@ export const withXHRArrayBuffer = <A, E, R>(
  * @since 1.0.0
  * @category Services
  */
-export class XMLHttpRequest extends ServiceMap.Service<
+export class XMLHttpRequest extends Context.Service<
   XMLHttpRequest,
   LazyArg<globalThis.XMLHttpRequest>
 >()("@effect/platform-browser/BrowserHttpClient/XMLHttpRequest") {}
@@ -90,8 +90,8 @@ const makeXhrRequest = () => new globalThis.XMLHttpRequest()
 const makeXmlHttpRequest = HttpClient.make(
   (request, url, signal, fiber) =>
     Effect.suspend(() => {
-      const xhr = ServiceMap.getOrElse(
-        fiber.services,
+      const xhr = Context.getOrElse(
+        fiber.context,
         XMLHttpRequest,
         () => makeXhrRequest
       )()
@@ -387,6 +387,6 @@ class ClientResponseImpl extends IncomingMessageImpl<HttpClientError.HttpClientE
  * @since 1.0.0
  * @category Layers
  */
-export const layerXMLHttpRequest: Layer.Layer<HttpClient.HttpClient> = HttpClient.layerMergedServices(
+export const layerXMLHttpRequest: Layer.Layer<HttpClient.HttpClient> = HttpClient.layerMergedContext(
   Effect.succeed(makeXmlHttpRequest)
 )

package/src/BrowserWorkerRunner.ts

@@ -44,7 +44,7 @@ export const make = (self: MessagePort | Window): WorkerRunner.WorkerRunnerPlatf
       Effect.scopedWith(Effect.fnUntraced(function*(scope) {
         const closeLatch = Deferred.makeUnsafe<void, WorkerError>()
         const trackFiber = Fiber.runIn(scope)
-        const services = yield* Effect.services<R>()
+        const services = yield* Effect.context<R>()
         const runFork = Effect.runForkWith(services)
         const onExit = (exit: Exit.Exit<any, E>) => {
           if (exit._tag === "Failure" && !Cause.hasInterruptsOnly(exit.cause)) {

package/src/Clipboard.ts

@@ -1,10 +1,10 @@
 /**
  * @since 1.0.0
  */
+import * as Context from "effect/Context"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import * as ServiceMap from "effect/ServiceMap"
 
 const TypeId = "~@effect/platform-browser/Clipboard"
 const ErrorTypeId = "~@effect/platform-browser/Clipboard/ClipboardError"
@@ -38,7 +38,7 @@ export class ClipboardError extends Data.TaggedError("ClipboardError")<{
  * @since 1.0.0
  * @category Service
  */
-export const Clipboard: ServiceMap.Service<Clipboard, Clipboard> = ServiceMap.Service<Clipboard>(TypeId)
+export const Clipboard: Context.Service<Clipboard, Clipboard> = Context.Service<Clipboard>(TypeId)
 
 /**
  * @since 1.0.0

package/src/Geolocation.ts

@@ -2,11 +2,11 @@
  * @since 1.0.0
  */
 import * as Cause from "effect/Cause"
+import * as Context from "effect/Context"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Queue from "effect/Queue"
-import * as ServiceMap from "effect/ServiceMap"
 import * as Stream from "effect/Stream"
 
 const TypeId = "~@effect/platform-browser/Geolocation"
@@ -34,7 +34,7 @@ export interface Geolocation {
  * @since 1.0.0
  * @category Service
  */
-export const Geolocation: ServiceMap.Service<Geolocation, Geolocation> = ServiceMap.Service<Geolocation>(TypeId)
+export const Geolocation: Context.Service<Geolocation, Geolocation> = Context.Service<Geolocation>(TypeId)
 
 /**
  * @since 1.0.0

package/src/IndexedDb.ts

@@ -2,11 +2,11 @@
  * @since 4.0.0
  */
 import * as Config from "effect/Config"
+import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
 import * as SchemaIssue from "effect/SchemaIssue"
-import * as ServiceMap from "effect/ServiceMap"
 
 const TypeId = "~@effect/platform-browser/IndexedDb"
 
@@ -24,7 +24,7 @@ export interface IndexedDb {
  * @since 4.0.0
  * @category tag
  */
-export const IndexedDb: ServiceMap.Service<IndexedDb, IndexedDb> = ServiceMap.Service<IndexedDb, IndexedDb>(TypeId)
+export const IndexedDb: Context.Service<IndexedDb, IndexedDb> = Context.Service<IndexedDb, IndexedDb>(TypeId)
 
 /** @internal */
 const IDBFlatKey = Schema.Union([

package/src/IndexedDbDatabase.ts

@@ -1,13 +1,15 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "effect/Context"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
 import * as Inspectable from "effect/Inspectable"
 import * as Layer from "effect/Layer"
+import * as MutableRef from "effect/MutableRef"
 import * as Pipeable from "effect/Pipeable"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Semaphore from "effect/Semaphore"
 import * as Reactivity from "effect/unstable/reactivity/Reactivity"
 import * as Utils from "effect/Utils"
 import * as IndexedDb from "./IndexedDb.ts"
@@ -74,12 +76,13 @@ export class IndexedDbDatabaseError extends Data.TaggedError(
  * @since 4.0.0
  * @category models
  */
-export class IndexedDbDatabase extends ServiceMap.Service<
+export class IndexedDbDatabase extends Context.Service<
   IndexedDbDatabase,
   {
-    readonly database: globalThis.IDBDatabase
+    readonly database: MutableRef.MutableRef<globalThis.IDBDatabase>
     readonly IDBKeyRange: typeof globalThis.IDBKeyRange
     readonly reactivity: Reactivity.Reactivity["Service"]
+    readonly rebuild: Effect.Effect<void, IndexedDbDatabaseError>
   }
 >()(TypeId) {}
 
@@ -255,7 +258,6 @@ export const make = <
         database,
         IDBKeyRange,
         tables: initialVersion.tables,
-        transaction: undefined,
         reactivity
       })
     })
@@ -299,7 +301,6 @@ const makeProto = <
         database,
         IDBKeyRange,
         tables: options.version.tables,
-        transaction: undefined,
         reactivity
       })
     })
@@ -322,8 +323,8 @@ const layer = <DatabaseName extends string>(
     Effect.gen(function*() {
       const { IDBKeyRange, indexedDB } = yield* IndexedDb.IndexedDb
       const reactivity = yield* Reactivity.Reactivity
-      const serviceMap = yield* Effect.services()
-      const runForkWith = Effect.runForkWith(serviceMap)
+      const context = yield* Effect.context()
+      const runForkWith = Effect.runForkWith(context)
 
       let oldVersion = 0
       const migrations: Array<Any> = []
@@ -334,145 +335,177 @@ const layer = <DatabaseName extends string>(
       }
 
       const version = migrations.length
-      const database = yield* Effect.acquireRelease(
-        Effect.callback<globalThis.IDBDatabase, IndexedDbDatabaseError>(
-          (resume) => {
-            const request = indexedDB.open(databaseName, version)
-
-            request.onblocked = (event) => {
-              resume(
-                Effect.fail(
-                  new IndexedDbDatabaseError({
-                    reason: "Blocked",
-                    cause: event
-                  })
-                )
+      const database = MutableRef.make<globalThis.IDBDatabase>(null as any)
+
+      const open = Effect.callback<
+        void,
+        IndexedDbDatabaseError
+      >((resume) => {
+        const request = indexedDB.open(databaseName, version)
+
+        request.onblocked = (event) => {
+          resume(
+            Effect.fail(
+              new IndexedDbDatabaseError({
+                reason: "Blocked",
+                cause: event
+              })
+            )
+          )
+        }
+
+        request.onerror = (event) => {
+          const idbRequest = event.target as IDBRequest<IDBDatabase>
+
+          resume(
+            Effect.fail(
+              new IndexedDbDatabaseError({
+                reason: "OpenError",
+                cause: idbRequest.error
+              })
+            )
+          )
+        }
+
+        let fiber: Fiber.Fiber<void, IndexedDbDatabaseError> | undefined
+        request.onupgradeneeded = (event) => {
+          const idbRequest = event.target as IDBRequest<IDBDatabase>
+          const db = idbRequest.result
+          const transaction = idbRequest.transaction
+          oldVersion = event.oldVersion
+
+          MutableRef.set(database, db)
+
+          if (transaction === null) {
+            return resume(
+              Effect.fail(
+                new IndexedDbDatabaseError({
+                  reason: "TransactionError",
+                  cause: null
+                })
               )
-            }
-
-            request.onerror = (event) => {
-              const idbRequest = event.target as IDBRequest<IDBDatabase>
-
-              resume(
-                Effect.fail(
-                  new IndexedDbDatabaseError({
-                    reason: "OpenError",
-                    cause: idbRequest.error
-                  })
-                )
+            )
+          }
+
+          transaction.onabort = (event) => {
+            resume(
+              Effect.fail(
+                new IndexedDbDatabaseError({
+                  reason: "Aborted",
+                  cause: event
+                })
               )
-            }
-
-            let fiber: Fiber.Fiber<void, IndexedDbDatabaseError> | undefined
-            request.onupgradeneeded = (event) => {
-              const idbRequest = event.target as IDBRequest<IDBDatabase>
-              const database = idbRequest.result
-              const transaction = idbRequest.transaction
-              oldVersion = event.oldVersion
-
-              if (transaction === null) {
-                return resume(
-                  Effect.fail(
-                    new IndexedDbDatabaseError({
-                      reason: "TransactionError",
-                      cause: null
-                    })
-                  )
-                )
-              }
+            )
+          }
 
-              transaction.onabort = (event) => {
-                resume(
-                  Effect.fail(
-                    new IndexedDbDatabaseError({
-                      reason: "Aborted",
-                      cause: event
-                    })
-                  )
-                )
-              }
+          transaction.onerror = (event) => {
+            resume(
+              Effect.fail(
+                new IndexedDbDatabaseError({
+                  reason: "TransactionError",
+                  cause: event
+                })
+              )
+            )
+          }
 
-              transaction.onerror = (event) => {
-                resume(
-                  Effect.fail(
-                    new IndexedDbDatabaseError({
-                      reason: "TransactionError",
-                      cause: event
-                    })
-                  )
-                )
+          const effect = Effect.forEach(
+            migrations.slice(oldVersion),
+            (untypedMigration) => {
+              if (untypedMigration.previous === undefined) {
+                const migration = untypedMigration as any as AnySchema
+                const api = makeTransactionProto({
+                  database,
+                  IDBKeyRange,
+                  tables: migration.version.tables,
+                  transaction,
+                  reactivity
+                })
+                return (migration as any).migrate(api) as Effect.Effect<
+                  void,
+                  IndexedDbDatabaseError
+                >
+              } else if (untypedMigration.previous) {
+                const migration = untypedMigration as any as AnySchema
+                const fromApi = makeTransactionProto({
+                  database,
+                  IDBKeyRange,
+                  tables: migration.fromVersion.tables,
+                  transaction,
+                  reactivity
+                })
+                const toApi = makeTransactionProto({
+                  database,
+                  IDBKeyRange,
+                  tables: migration.version.tables,
+                  transaction,
+                  reactivity
+                })
+                return migration.migrate(fromApi, toApi) as Effect.Effect<
+                  void,
+                  IndexedDbDatabaseError
+                >
               }
 
-              const effect = Effect.forEach(
-                migrations.slice(oldVersion),
-                (untypedMigration) => {
-                  if (untypedMigration.previous === undefined) {
-                    const migration = untypedMigration as any as AnySchema
-                    const api = makeTransactionProto({
-                      database,
-                      IDBKeyRange,
-                      tables: migration.version.tables,
-                      transaction,
-                      reactivity
-                    })
-                    return (migration as any).migrate(api) as Effect.Effect<
-                      void,
-                      IndexedDbDatabaseError
-                    >
-                  } else if (untypedMigration.previous) {
-                    const migration = untypedMigration as any as AnySchema
-                    const fromApi = makeTransactionProto({
-                      database,
-                      IDBKeyRange,
-                      tables: migration.fromVersion.tables,
-                      transaction,
-                      reactivity
-                    })
-                    const toApi = makeTransactionProto({
-                      database,
-                      IDBKeyRange,
-                      tables: migration.version.tables,
-                      transaction,
-                      reactivity
-                    })
-                    return migration.migrate(fromApi, toApi) as Effect.Effect<
-                      void,
-                      IndexedDbDatabaseError
-                    >
-                  }
-
-                  return Effect.die(new Error("Invalid migration"))
-                },
-                { discard: true }
-              ).pipe(
-                Effect.mapError(
-                  (cause) =>
-                    new IndexedDbDatabaseError({
-                      reason: "UpgradeError",
-                      cause
-                    })
-                )
-              )
-              fiber = runForkWith(effect)
-              fiber.currentDispatcher.flush()
-            }
-
-            request.onsuccess = (event) => {
-              const idbRequest = event.target as IDBRequest<IDBDatabase>
-              const database = idbRequest.result
-              if (fiber) {
-                // ensure migration errors are propagated
-                resume(Effect.as(Fiber.join(fiber), database))
-              } else {
-                resume(Effect.succeed(database))
-              }
-            }
+              return Effect.die(new Error("Invalid migration"))
+            },
+            { discard: true }
+          ).pipe(
+            Effect.mapError(
+              (cause) =>
+                new IndexedDbDatabaseError({
+                  reason: "UpgradeError",
+                  cause
+                })
+            ),
+            Effect.provideService(IndexedDbQueryBuilder.IndexedDbTransaction, transaction)
+          )
+          fiber = runForkWith(effect)
+          fiber.currentDispatcher.flush()
+        }
+
+        request.onsuccess = (event) => {
+          const idbRequest = event.target as IDBRequest<IDBDatabase>
+          const db = idbRequest.result
+          MutableRef.set(database, db)
+          if (fiber) {
+            // ensure migration errors are propagated
+            resume(Effect.asVoid(Fiber.join(fiber)))
+          } else {
+            resume(Effect.void)
           }
-        ),
-        (database) => Effect.sync(() => database.close())
+        }
+      })
+
+      yield* Effect.addFinalizer(() => {
+        database.current?.close()
+        return Effect.void
+      })
+      yield* open
+
+      const rebuildLock = Semaphore.makeUnsafe(1).withPermit
+      const rebuild = Effect.callback<void, IndexedDbDatabaseError>((resume) => {
+        database.current?.close()
+        const request = indexedDB.deleteDatabase(databaseName)
+        request.onerror = (_) => {
+          resume(
+            Effect.fail(
+              new IndexedDbDatabaseError({
+                reason: "OpenError",
+                cause: request.error
+              })
+            )
+          )
+        }
+        request.onsuccess = () => {
+          resume(Effect.void)
+        }
+      }).pipe(
+        Effect.flatMap(() => open),
+        rebuildLock
       )
 
-      return IndexedDbDatabase.of({ database, IDBKeyRange, reactivity })
+      return IndexedDbDatabase.of({ database, IDBKeyRange, rebuild, reactivity })
     })
   ).pipe(
     Layer.provide(Reactivity.layer)
@@ -493,7 +526,7 @@ const makeTransactionProto = <Source extends IndexedDbVersion.AnyWithProps>({
   transaction,
   reactivity
 }: {
-  readonly database: globalThis.IDBDatabase
+  readonly database: MutableRef.MutableRef<globalThis.IDBDatabase>
   readonly IDBKeyRange: typeof globalThis.IDBKeyRange
   readonly tables: ReadonlyMap<string, IndexedDbVersion.Tables<Source>>
   readonly transaction: globalThis.IDBTransaction
@@ -503,11 +536,11 @@ const makeTransactionProto = <Source extends IndexedDbVersion.AnyWithProps>({
     database,
     IDBKeyRange,
     tables,
-    transaction,
     reactivity
   }) as any
 
   migration.transaction = transaction
+
   migration.createObjectStore = Effect.fnUntraced(function*(table: string) {
     const createTable = yield* Effect.fromNullishOr(tables.get(table)).pipe(
       Effect.mapError(
@@ -521,7 +554,7 @@ const makeTransactionProto = <Source extends IndexedDbVersion.AnyWithProps>({
 
     return yield* Effect.try({
       try: () =>
-        database.createObjectStore(createTable.tableName, {
+        database.current.createObjectStore(createTable.tableName, {
           keyPath: createTable.keyPath,
           autoIncrement: createTable.autoIncrement
         }),
@@ -545,7 +578,7 @@ const makeTransactionProto = <Source extends IndexedDbVersion.AnyWithProps>({
     )
 
     return yield* Effect.try({
-      try: () => database.deleteObjectStore(createTable.tableName),
+      try: () => database.current.deleteObjectStore(createTable.tableName),
       catch: (cause) =>
         new IndexedDbDatabaseError({
           reason: "TransactionError",