@dxos/cli-util 0.8.4-main.fcc0d83b33 → 0.8.4-staging.60fe92afc8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli-util",
-  "version": "0.8.4-main.fcc0d83b33",
+  "version": "0.8.4-staging.60fe92afc8",
   "description": "Shared CLI utilities for DXOS CLI commands and plugins",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
@@ -30,27 +30,29 @@
     "src"
   ],
   "dependencies": {
-    "@effect/cli": "0.73.2",
-    "@effect/printer": "0.47.0",
-    "@effect/printer-ansi": "0.47.0",
-    "@dxos/app-toolkit": "0.8.4-main.fcc0d83b33",
-    "@dxos/client": "0.8.4-main.fcc0d83b33",
-    "@dxos/echo": "0.8.4-main.fcc0d83b33",
-    "@dxos/compute": "0.8.4-main.fcc0d83b33",
-    "@dxos/effect": "0.8.4-main.fcc0d83b33",
-    "@dxos/protocols": "0.8.4-main.fcc0d83b33",
-    "@dxos/debug": "0.8.4-main.fcc0d83b33",
-    "@dxos/log": "0.8.4-main.fcc0d83b33",
-    "@dxos/util": "0.8.4-main.fcc0d83b33",
-    "@dxos/errors": "0.8.4-main.fcc0d83b33"
+    "@effect/cli": "0.75.2",
+    "@effect/printer": "0.49.0",
+    "@effect/printer-ansi": "0.49.0",
+    "@dxos/app-toolkit": "0.8.4-staging.60fe92afc8",
+    "@dxos/client": "0.8.4-staging.60fe92afc8",
+    "@dxos/compute": "0.8.4-staging.60fe92afc8",
+    "@dxos/debug": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo-client": "0.8.4-staging.60fe92afc8",
+    "@dxos/effect": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo": "0.8.4-staging.60fe92afc8",
+    "@dxos/errors": "0.8.4-staging.60fe92afc8",
+    "@dxos/log": "0.8.4-staging.60fe92afc8",
+    "@dxos/functions": "0.8.4-staging.60fe92afc8",
+    "@dxos/protocols": "0.8.4-staging.60fe92afc8",
+    "@dxos/util": "0.8.4-staging.60fe92afc8"
   },
   "devDependencies": {
-    "effect": "3.20.0",
+    "effect": "3.21.3",
     "typescript": "^6.0.3",
-    "vitest": "4.1.5"
+    "vitest": "4.1.7"
   },
   "peerDependencies": {
-    "effect": "3.20.0"
+    "effect": "3.21.3"
   },
   "publishConfig": {
     "access": "public"

package/src/util/form-builder.test.ts

@@ -8,11 +8,11 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { FormBuilder, print } from '@dxos/cli-util';
-import { runAndForwardErrors } from '@dxos/effect';
+import { EffectEx } from '@dxos/effect';
 
 describe('FormBuilder', () => {
   it('option', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const builder = FormBuilder.make({ title: 'Option Test' }).pipe(
           FormBuilder.option('some', Option.some('value')),
@@ -25,7 +25,7 @@ describe('FormBuilder', () => {
     ));
 
   it('when', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const builder = FormBuilder.make({ title: 'When Test' }).pipe(
           FormBuilder.when(true, FormBuilder.set('included', 'true')),
@@ -38,7 +38,7 @@ describe('FormBuilder', () => {
     ));
 
   it('each', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const items = ['a', 'b', 'c'];
         const builder = FormBuilder.make({ title: 'Each Test' }).pipe(
@@ -51,7 +51,7 @@ describe('FormBuilder', () => {
     ));
 
   it('build', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const builder = FormBuilder.make({ title: 'Test' }).pipe(
           FormBuilder.set('foo', 100),
@@ -64,7 +64,7 @@ describe('FormBuilder', () => {
     ));
 
   it('nest', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const nested = FormBuilder.make({ title: 'Nested' }).pipe(
           FormBuilder.set('nested1', 'value1'),
@@ -83,7 +83,7 @@ describe('FormBuilder', () => {
     ));
 
   it('nestedOption', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const nested = FormBuilder.make({ title: 'Nested' }).pipe(FormBuilder.set('key', 'value'));
 
@@ -98,7 +98,7 @@ describe('FormBuilder', () => {
     ));
 
   it('multi-level nesting', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const grandchild = FormBuilder.make({ title: 'Grandchild' }).pipe(
           FormBuilder.set('grandchild1', 'value1'),
@@ -123,7 +123,7 @@ describe('FormBuilder', () => {
     ));
 
   it('pipeable build', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         const doc = FormBuilder.make({ title: 'Pipeable' }).pipe(
           FormBuilder.set('foo', 100),
@@ -135,7 +135,7 @@ describe('FormBuilder', () => {
     ));
 
   it('dual calling styles', () =>
-    runAndForwardErrors(
+    EffectEx.runAndForwardErrors(
       Effect.gen(function* () {
         // Curried style (pipe)
         const builder1 = FormBuilder.make({ title: 'Curried' }).pipe(

package/src/util/space-format.ts

@@ -86,14 +86,14 @@ export const formatSpace = Effect.fn(function* (space: Space, options: FormatSpa
 
   // The sync-state read does IO; cap it so a stuck space can't hang the
   // command. Falls back to a "no peers" placeholder.
-  const syncStateRaw = yield* tryWithFallback('getSyncState', () => space.internal.db.coreDatabase.getSyncState(), {
+  const syncStateRaw = yield* tryWithFallback('getSyncState', () => space.internal.db.getSyncState(), {
     peers: {},
   } as SpaceSyncState);
   const syncState = aggregateSyncState(syncStateRaw);
 
   const name = ready ? tryWithFallbackSync(() => space.properties.name, undefined) : 'loading...';
   const members = tryWithFallbackSync(() => space.members.get().length, 0);
-  const objects = tryWithFallbackSync(() => space.internal.db.coreDatabase.getAllObjectIds().length, 0);
+  const objects = tryWithFallbackSync(() => space.internal.db.getAllObjectIds().length, 0);
   const key = options.truncateKeys
     ? tryWithFallbackSync(() => space.key.truncate(), '')
     : tryWithFallbackSync(() => space.key.toHex(), '');

package/src/util/space.ts

@@ -10,8 +10,8 @@ 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 { QueueService } from '@dxos/compute';
-import { Database, type Key } from '@dxos/echo';
+import { Database, Feed, type Key } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-client';
 import { BaseError, type BaseErrorOptions } from '@dxos/errors';
 import { log } from '@dxos/log';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
@@ -39,7 +39,7 @@ export const spaceIdWithDefault = (spaceId: Option.Option<Key.SpaceId>) =>
 export const spaceLayer = (
   spaceId$: Option.Option<Key.SpaceId>,
   fallbackToPersonalSpace = false,
-): Layer.Layer<Database.Service | QueueService, never, ClientService> => {
+): Layer.Layer<Database.Service | Feed.FeedService, never, ClientService> => {
   const getSpace = Effect.fn(function* () {
     const client = yield* ClientService;
 
@@ -93,31 +93,17 @@ export const spaceLayer = (
     ),
   );
 
-  const queue = Layer.effect(
-    QueueService,
+  const feed = Layer.unwrapEffect(
     Effect.gen(function* () {
       const space = yield* getSpace();
       if (!space) {
-        return {
-          queues: {
-            get: (_dxn) => {
-              throw new Error('Queues not available');
-            },
-            create: () => {
-              throw new Error('Queues not available');
-            },
-          },
-          queue: undefined,
-        };
+        return Feed.notAvailable;
       }
-      return {
-        queues: space.queues,
-        queue: undefined,
-      };
+      return createFeedServiceLayer(space.queues);
     }),
   );
 
-  return Layer.merge(db, queue);
+  return Layer.merge(db, feed);
 };
 
 // TODO(dmaretskyi): There a race condition with edge connection not showing up.