@dxos/cli-util 0.8.4-main.9735255 → 0.8.4-main.bcb3aa67d6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli-util",
-  "version": "0.8.4-main.9735255",
+  "version": "0.8.4-main.bcb3aa67d6",
   "description": "Shared CLI utilities for DXOS CLI commands and plugins",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,26 +30,27 @@
     "src"
   ],
   "dependencies": {
-    "@effect/cli": "0.72.1",
+    "@effect/cli": "0.73.2",
     "@effect/printer": "0.47.0",
     "@effect/printer-ansi": "0.47.0",
-    "@dxos/client": "0.8.4-main.9735255",
-    "@dxos/echo": "0.8.4-main.9735255",
-    "@dxos/debug": "0.8.4-main.9735255",
-    "@dxos/errors": "0.8.4-main.9735255",
-    "@dxos/functions": "0.8.4-main.9735255",
-    "@dxos/effect": "0.8.4-main.9735255",
-    "@dxos/log": "0.8.4-main.9735255",
-    "@dxos/protocols": "0.8.4-main.9735255",
-    "@dxos/util": "0.8.4-main.9735255"
+    "@dxos/app-toolkit": "0.8.4-main.bcb3aa67d6",
+    "@dxos/debug": "0.8.4-main.bcb3aa67d6",
+    "@dxos/client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo": "0.8.4-main.bcb3aa67d6",
+    "@dxos/effect": "0.8.4-main.bcb3aa67d6",
+    "@dxos/errors": "0.8.4-main.bcb3aa67d6",
+    "@dxos/functions": "0.8.4-main.bcb3aa67d6",
+    "@dxos/log": "0.8.4-main.bcb3aa67d6",
+    "@dxos/protocols": "0.8.4-main.bcb3aa67d6",
+    "@dxos/util": "0.8.4-main.bcb3aa67d6"
   },
   "devDependencies": {
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "typescript": "^5.9.3",
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "effect": "3.19.11"
+    "effect": "3.20.0"
   },
   "publishConfig": {
     "access": "public"

package/src/util/runtime.ts

@@ -8,7 +8,7 @@ import { ClientService } from '@dxos/client';
 import { type Type } from '@dxos/echo';
 
 /** @deprecated Migrate to providing types via plugin capabilities. */
-export const withTypes: (...types: Type.Entity.Any[]) => Effect.Effect<void, never, ClientService> = (...types) =>
+export const withTypes: (...types: Type.AnyEntity[]) => Effect.Effect<void, never, ClientService> = (...types) =>
   Effect.gen(function* () {
     const client = yield* ClientService;
     yield* Effect.promise(() => client.addTypes(types));

package/src/util/space.ts

@@ -8,6 +8,7 @@ import * as Layer from 'effect/Layer';
 import * as Match from 'effect/Match';
 import * as Option from 'effect/Option';
 
+import { getPersonalSpace } from '@dxos/app-toolkit';
 import { ClientService } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
 import { Database, type Key } from '@dxos/echo';
@@ -26,26 +27,25 @@ export const getSpace = (spaceId: Key.SpaceId): Effect.Effect<Space, SpaceNotFou
 export const spaceIdWithDefault = (spaceId: Option.Option<Key.SpaceId>) =>
   Effect.gen(function* () {
     const client = yield* ClientService;
-    yield* Effect.promise(() => client.spaces.waitUntilReady());
-    return Option.getOrElse(spaceId, () => client.spaces.default.id);
+    return Option.getOrElse(spaceId, () => {
+      const personal = getPersonalSpace(client);
+      if (!personal) {
+        throw new Error('No space ID provided and no personal space found.');
+      }
+      return personal.id;
+    });
   });
 
 // TODO(wittjosiah): Factor out.
 export const spaceLayer = (
   spaceId$: Option.Option<Key.SpaceId>,
-  fallbackToDefaultSpace = false,
+  fallbackToPersonalSpace = false,
 ): Layer.Layer<Database.Service | QueueService, never, ClientService> => {
   const getSpace = Effect.fn(function* () {
     const client = yield* ClientService;
-    yield* Effect.promise(() => client.spaces.waitUntilReady());
-
-    const spaceId = Match.value(fallbackToDefaultSpace).pipe(
-      Match.when(true, () =>
-        spaceId$.pipe(
-          Option.getOrElse(() => client.spaces.default.id),
-          Option.some,
-        ),
-      ),
+
+    const spaceId = Match.value(fallbackToPersonalSpace).pipe(
+      Match.when(true, () => spaceId$.pipe(Option.orElse(() => Option.fromNullable(getPersonalSpace(client)?.id)))),
       Match.when(false, () => spaceId$),
       Match.exhaustive,
     );
@@ -75,7 +75,7 @@ export const spaceLayer = (
         }
         return { db: space.db };
       }),
-      ({ db }) => Effect.promise(() => db.flush({ indexes: true })),
+      ({ db }) => Effect.promise(() => db.flush()),
     ),
   );
 
@@ -129,8 +129,8 @@ export const waitForSync = Effect.fn(function* (space: Space) {
 });
 
 export const flushAndSync = Effect.fn(function* (opts?: Database.FlushOptions) {
-  yield* Database.Service.flush(opts);
-  const spaceId = yield* Database.Service.spaceId;
+  yield* Database.flush(opts);
+  const spaceId = yield* Database.spaceId;
   const space = yield* getSpace(spaceId);
   yield* waitForSync(space);
 });