WIP

src/create-apis.ts

@@ -1,15 +1,13 @@
 import {
   HandleAccessRequest,
   PermissionStore,
-  createPermissionObserver,
   createPermissionStore,
   createPermissions,
 } from "fake-permissions";
 import {
-  combineObservers,
-  type GeolocationAndGeolocationPermissionObserver,
-} from "./combine-observers.js";
-import { createGeolocationObserver } from "./geolocation-observer.js";
+  createGeolocationObserver,
+  type GeolocationObserver,
+} from "./geolocation-observer.js";
 import { createGeolocation } from "./geolocation.js";
 import {
   MutableLocationServices,
@@ -32,7 +30,7 @@ export function createAPIs({
 } = {}): {
   geolocation: Geolocation;
   locationServices: MutableLocationServices;
-  observer: GeolocationAndGeolocationPermissionObserver;
+  observer: GeolocationObserver;
   permissions: Permissions;
   permissionStore: PermissionStore;
   user: User;
@@ -53,10 +51,7 @@ export function createAPIs({
     user,
   });
 
-  const observer = combineObservers(
-    createGeolocationObserver(geolocation),
-    createPermissionObserver(permissions, { name: "geolocation" }),
-  );
+  const observer = createGeolocationObserver(geolocation, permissions);
 
   return {
     geolocation,

src/create-wrapped-apis.ts

@@ -1,16 +1,14 @@
 import {
   PermissionStore,
   createDelegatedPermissions,
-  createPermissionObserver,
   type HandleAccessRequest,
 } from "fake-permissions";
-import {
-  combineObservers,
-  type GeolocationAndGeolocationPermissionObserver,
-} from "./combine-observers.js";
 import { createAPIs } from "./create-apis.js";
 import { createDelegatedGeolocation } from "./delegated-geolocation.js";
-import { createGeolocationObserver } from "./geolocation-observer.js";
+import {
+  createGeolocationObserver,
+  type GeolocationObserver,
+} from "./geolocation-observer.js";
 import { MutableLocationServices } from "./location-services.js";
 import { User } from "./user.js";
 
@@ -34,7 +32,7 @@ export function createWrappedAPIs({
   geolocation: Geolocation;
   isUsingSuppliedAPIs: () => boolean;
   locationServices: MutableLocationServices;
-  observer: GeolocationAndGeolocationPermissionObserver;
+  observer: GeolocationObserver;
   permissions: Permissions;
   permissionStore: PermissionStore;
   selectAPIs: (useSuppliedAPIs: boolean) => void;
@@ -70,10 +68,7 @@ export function createWrappedAPIs({
       delegates: [fakePermissions, suppliedPermissions],
     });
 
-  const observer = combineObservers(
-    createGeolocationObserver(geolocation),
-    createPermissionObserver(permissions, { name: "geolocation" }),
-  );
+  const observer = createGeolocationObserver(geolocation, permissions);
 
   return {
     geolocation,

src/geolocation-observer.ts

@@ -1,3 +1,7 @@
+import {
+  createPermissionObserver,
+  type PermissionObserver,
+} from "fake-permissions";
 import type { PartialGeolocationCoordinates } from "./geolocation-coordinates.js";
 import { type GeolocationPositionErrorCode } from "./geolocation-position-error.js";
 
@@ -14,11 +18,17 @@ export type GeolocationObserver = {
     task?: () => Promise<void>,
     positionOptions?: PositionOptions,
   ): Promise<void>;
+  waitForPermissionState: PermissionObserver["waitForState"];
 };
 
 export function createGeolocationObserver(
   geolocation: Geolocation,
+  permissions: Permissions,
 ): GeolocationObserver {
+  const permissionObserver = createPermissionObserver(permissions, {
+    name: "geolocation",
+  });
+
   return {
     async waitForCoordinates(matcherOrMatchers = [], task, positionOptions) {
       const matchers = normalizeMatchers(matcherOrMatchers);
@@ -57,6 +67,8 @@ export function createGeolocationObserver(
         Promise.resolve(task?.()),
       ]);
     },
+
+    waitForPermissionState: permissionObserver.waitForState,
   };
 
   function isMatchingCoords(

src/index.ts

@@ -1,4 +1,3 @@
-export type { GeolocationAndGeolocationPermissionObserver } from "./combine-observers.js";
 export { compareCoordinates } from "./compare-coordinates.js";
 export { createAPIs } from "./create-apis.js";
 export { createWrappedAPIs } from "./create-wrapped-apis.js";

test/vitest/create-wrapped-apis.spec.ts

@@ -3,7 +3,7 @@ import {
   createAPIs,
   createPosition,
   createWrappedAPIs,
-  type GeolocationAndGeolocationPermissionObserver,
+  type GeolocationObserver,
 } from "fake-geolocation";
 import {
   afterEach,
@@ -24,7 +24,7 @@ describe("createWrappedAPIs()", () => {
   let suppliedUser: User;
 
   let geolocation: Geolocation;
-  let observer: GeolocationAndGeolocationPermissionObserver;
+  let observer: GeolocationObserver;
   let permissions: Permissions;
   let user: User;
   let selectAPIs: (useSuppliedAPIs: boolean) => void;