@dxos/plugin-space 0.8.4-main.4a85c3132b → 0.8.4-main.51f1e5ca51

package/dist/lib/node-esm/cli/index.mjs

@@ -1,24 +1,20 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
-import {
-  IdentityCreated,
-  OperationResolver
-} from "../chunk-S2IELCDF.mjs";
-import {
-  SpaceEvents
-} from "../chunk-3DWZCVVQ.mjs";
-import {
-  meta
-} from "../chunk-SL4BJSUG.mjs";
+import "../chunk-HSLMI22Q.mjs";
 
 // src/cli/plugin.ts
 import * as Effect17 from "effect/Effect";
 import { ActivationEvents, Capability, Plugin as Plugin2 } from "@dxos/app-framework";
 import { AppPlugin } from "@dxos/app-toolkit";
+import { Operation } from "@dxos/compute";
 import { Tag } from "@dxos/echo";
 import { Collection as Collection2 } from "@dxos/echo";
 import { ClientEvents } from "@dxos/plugin-client/types";
 import { DataTypes } from "@dxos/schema";
 import { AnchoredTo, Employer, Event, HasConnection, HasRelationship, HasSubject, Organization, Person, Pipeline, Task } from "@dxos/types";
+import { IdentityCreated, OperationHandler, UndoMappings } from "#capabilities";
+import { meta } from "#meta";
+import { SpaceOperation } from "#operations";
+import { SpaceEvents } from "#types";
 
 // src/cli/commands/database/index.ts
 import * as Command5 from "@effect/cli/Command";
@@ -34,7 +30,7 @@ import { Plugin } from "@dxos/app-framework";
 import { AppActivationEvents, AppCapabilities } from "@dxos/app-toolkit";
 import { CommandConfig, Common, flushAndSync, print, spaceLayer } from "@dxos/cli-util";
 import { SpaceProperties } from "@dxos/client/echo";
-import { Database, Filter, Obj, Ref, Type } from "@dxos/echo";
+import { Database, Filter, Obj, Type } from "@dxos/echo";
 import { Collection } from "@dxos/echo";
 import { EntityKind, getTypeAnnotation } from "@dxos/echo/internal";
 
@@ -77,16 +73,14 @@ var add = Command.make("add", {
   if (!metadata) {
     return yield* Effect.fail(new Error(`Unknown typename: ${selectedTypename}`));
   }
-  const object = yield* metadata.createObject({}, {
-    db
+  const result = yield* metadata.createObject({}, {
+    db,
+    target: collection
   });
+  const object = result.object;
   if (!Obj.isObject(object)) {
     return yield* Effect.fail(new Error(`Invalid object: ${object}`));
   }
-  const objectRef = Ref.make(object);
-  Obj.change(collection, (c) => {
-    c.objects.push(objectRef);
-  });
   if (json) {
     yield* Console.log(JSON.stringify(object, null, 2));
   } else {
@@ -277,9 +271,7 @@ var handler2 = ({ spaceId }) => Effect6.gen(function* () {
   const { json } = yield* CommandConfig6;
   const client = yield* ClientService2;
   const space2 = yield* getSpace(spaceId);
-  yield* Effect6.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect6.tryPromise(() => space2.db.flush());
   yield* waitForSync(space2);
   yield* Effect6.tryPromise(() => space2.close());
   if (json) {
@@ -312,8 +304,8 @@ var handler3 = Effect7.fn(function* ({ name }) {
   const space2 = yield* Effect7.tryPromise(() => client.spaces.create());
   yield* Effect7.tryPromise(() => space2.waitUntilReady());
   if (Option4.isSome(name)) {
-    Obj3.change(space2.properties, (p) => {
-      p.name = Option4.getOrUndefined(name);
+    Obj3.update(space2.properties, (obj) => {
+      obj.name = Option4.getOrUndefined(name);
     });
   }
   if (json) {
@@ -329,9 +321,7 @@ var handler3 = Effect7.fn(function* ({ name }) {
     }).pipe(FormBuilder3.set("key", space2.key.truncate()), FormBuilder3.set("name", space2.properties.name ?? "<none>"));
     yield* Console7.log(print3(FormBuilder3.build(builder)));
   }
-  yield* Effect7.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect7.tryPromise(() => space2.db.flush());
   yield* waitForSync2(space2);
 });
 var create = Command9.make("create", {
@@ -343,14 +333,18 @@ import * as Command10 from "@effect/cli/Command";
 import * as Options8 from "@effect/cli/Options";
 import * as Console8 from "effect/Console";
 import * as Effect8 from "effect/Effect";
+import * as Option5 from "effect/Option";
 import { CommandConfig as CommandConfig8, Common as Common6, formatSpace, getSpace as getSpace2, print as print4, printSpace, spaceIdWithDefault } from "@dxos/cli-util";
 import { ClientService as ClientService4 } from "@dxos/client";
-var handler4 = Effect8.fn(function* ({ spaceId }) {
+var handler4 = Effect8.fn(function* ({ spaceId, wait }) {
   const { json } = yield* CommandConfig8;
   const client = yield* ClientService4;
   const resolvedSpaceId = yield* spaceIdWithDefault(spaceId);
   const space2 = yield* getSpace2(resolvedSpaceId);
-  const formatted = yield* formatSpace(space2);
+  const waitSeconds = Option5.getOrElse(wait, () => 0);
+  const formatted = yield* formatSpace(space2, {
+    waitSeconds
+  });
   if (json) {
     yield* Console8.log(JSON.stringify(formatted, null, 2));
   } else {
@@ -358,7 +352,8 @@ var handler4 = Effect8.fn(function* ({ spaceId }) {
   }
 });
 var info = Command10.make("info", {
-  spaceId: Common6.spaceId.pipe(Options8.optional)
+  spaceId: Common6.spaceId.pipe(Options8.optional),
+  wait: Options8.integer("wait").pipe(Options8.withDescription("Wait up to this many seconds for the space to reach SPACE_READY. Default 0 \u2014 read whatever state is available immediately."), Options8.optional)
 }, handler4).pipe(Command10.withDescription("Show space info."));
 
 // src/cli/commands/space/join/join.ts
@@ -369,7 +364,7 @@ import * as Prompt2 from "@effect/cli/Prompt";
 import * as Console9 from "effect/Console";
 import * as Duration from "effect/Duration";
 import * as Effect10 from "effect/Effect";
-import * as Option5 from "effect/Option";
+import * as Option6 from "effect/Option";
 import { CommandConfig as CommandConfig9 } from "@dxos/cli-util";
 import { print as print5, waitForSync as waitForSync3 } from "@dxos/cli-util";
 import { FormBuilder as FormBuilder4 } from "@dxos/cli-util";
@@ -403,15 +398,7 @@ var acceptInvitation = ({ observable, callbacks }) => Effect9.gen(function* () {
           Effect9.gen(function* () {
             const callbackResult = yield* callbackEffect;
             const code = invitation2.authCode ?? callbackResult;
-            invariant(code, "No code provided", {
-              F: __dxlog_file,
-              L: 52,
-              S: this,
-              A: [
-                "code",
-                "'No code provided'"
-              ]
-            });
+            invariant(code, "No code provided", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 36, S: this, A: ["code", "'No code provided'"] });
             yield* Effect9.tryPromise(() => observable.authenticate(code));
           }).pipe(runAndForwardErrors).catch(() => {
           });
@@ -451,8 +438,8 @@ var handler5 = Effect10.fn(function* ({ invitationCode, authCode }) {
     observable: client.spaces.join(encoded),
     callbacks: {
       onReadyForAuth: (invitation2) => {
-        if (Option5.isSome(authCode)) {
-          return Effect10.succeed(Option5.getOrUndefined(authCode) ?? void 0);
+        if (Option6.isSome(authCode)) {
+          return Effect10.succeed(Option6.getOrUndefined(authCode) ?? void 0);
         }
         return Prompt2.text({
           message: "Enter the authentication code"
@@ -499,9 +486,7 @@ var handler5 = Effect10.fn(function* ({ invitationCode, authCode }) {
     }
     return;
   }
-  yield* Effect10.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect10.tryPromise(() => space2.db.flush());
   yield* waitForSync3(space2);
   if (json) {
     yield* Console9.log(JSON.stringify({
@@ -524,16 +509,21 @@ var join = Command11.make("join", {
 
 // src/cli/commands/space/list/list.ts
 import * as Command12 from "@effect/cli/Command";
+import * as Options10 from "@effect/cli/Options";
 import * as Console10 from "effect/Console";
 import * as Effect11 from "effect/Effect";
+import * as Option7 from "effect/Option";
 import { CommandConfig as CommandConfig10, formatSpace as formatSpace2, printSpace as printSpace2 } from "@dxos/cli-util";
 import { printList as printList4 } from "@dxos/cli-util";
 import { ClientService as ClientService6 } from "@dxos/client";
-var handler6 = Effect11.fn(function* () {
+var handler6 = Effect11.fn(function* ({ wait }) {
   const { json } = yield* CommandConfig10;
   const client = yield* ClientService6;
   const spaces = client.spaces.get();
-  const formattedSpaces = yield* Effect11.all(spaces.map(formatSpace2));
+  const waitSeconds = Option7.getOrElse(wait, () => 0);
+  const formattedSpaces = yield* Effect11.all(spaces.map((space2) => formatSpace2(space2, {
+    waitSeconds
+  })));
   if (json) {
     yield* Console10.log(JSON.stringify(formattedSpaces, null, 2));
   } else {
@@ -541,11 +531,13 @@ var handler6 = Effect11.fn(function* () {
     yield* Console10.log(printList4(formatted));
   }
 });
-var list = Command12.make("list", {}, handler6).pipe(Command12.withDescription("List all spaces available on this device."));
+var list = Command12.make("list", {
+  wait: Options10.integer("wait").pipe(Options10.withDescription("Wait up to this many seconds for each space to reach SPACE_READY before reading. Default 0 \u2014 print whatever state is available immediately so a stuck space cannot hang the command."), Options10.optional)
+}, handler6).pipe(Command12.withDescription("List all spaces available on this device."));
 
 // src/cli/commands/space/members/members.ts
 import * as Command13 from "@effect/cli/Command";
-import * as Options10 from "@effect/cli/Options";
+import * as Options11 from "@effect/cli/Options";
 import * as Console11 from "effect/Console";
 import * as Effect12 from "effect/Effect";
 import { CommandConfig as CommandConfig11, Common as Common7, getSpace as getSpace3, printList as printList5, spaceIdWithDefault as spaceIdWithDefault2 } from "@dxos/cli-util";
@@ -584,12 +576,12 @@ var handler7 = Effect12.fn(function* ({ spaceId }) {
   }
 });
 var members = Command13.make("members", {
-  spaceId: Common7.spaceId.pipe(Options10.optional)
+  spaceId: Common7.spaceId.pipe(Options11.optional)
 }, handler7).pipe(Command13.withDescription("List space members."));
 
 // src/cli/commands/space/open/open.ts
 import * as Command14 from "@effect/cli/Command";
-import * as Options11 from "@effect/cli/Options";
+import * as Options12 from "@effect/cli/Options";
 import * as Console12 from "effect/Console";
 import * as Effect13 from "effect/Effect";
 import { CommandConfig as CommandConfig12, Common as Common8, getSpace as getSpace4, waitForSync as waitForSync4 } from "@dxos/cli-util";
@@ -599,9 +591,7 @@ var handler8 = ({ spaceId }) => Effect13.gen(function* () {
   const client = yield* ClientService8;
   const space2 = yield* getSpace4(spaceId);
   yield* Effect13.tryPromise(() => space2.open());
-  yield* Effect13.tryPromise(() => space2.db.flush({
-    indexes: true
-  }));
+  yield* Effect13.tryPromise(() => space2.db.flush());
   yield* waitForSync4(space2);
   if (json) {
     yield* Console12.log(JSON.stringify({
@@ -613,7 +603,7 @@ var handler8 = ({ spaceId }) => Effect13.gen(function* () {
   }
 });
 var open = Command14.make("open", {
-  spaceId: Common8.spaceId.pipe(Options11.withDescription("Space ID to open."))
+  spaceId: Common8.spaceId.pipe(Options12.withDescription("Space ID to open."))
 }, handler8).pipe(Command14.withDescription("Open a space."));
 
 // src/cli/commands/space/schema/index.ts
@@ -621,10 +611,10 @@ import * as Command16 from "@effect/cli/Command";
 
 // src/cli/commands/space/schema/list/list.ts
 import * as Command15 from "@effect/cli/Command";
-import * as Options12 from "@effect/cli/Options";
+import * as Options13 from "@effect/cli/Options";
 import * as Console13 from "effect/Console";
 import * as Effect14 from "effect/Effect";
-import * as Option6 from "effect/Option";
+import * as Option8 from "effect/Option";
 import { CommandConfig as CommandConfig13, Common as Common9, getSpace as getSpace5, printList as printList6, spaceIdWithDefault as spaceIdWithDefault3 } from "@dxos/cli-util";
 import { ClientService as ClientService9 } from "@dxos/client";
 import { getTypeAnnotation as getTypeAnnotation2 } from "@dxos/echo/internal";
@@ -672,7 +662,7 @@ var handler9 = Effect14.fn(function* ({ spaceId, typename }) {
         version: schemaAnnotation.version
       };
     })
-  ].filter(createTypenameFilter(Option6.getOrUndefined(typename)));
+  ].filter(createTypenameFilter(Option8.getOrUndefined(typename)));
   if (json) {
     yield* Console13.log(JSON.stringify(mapSchemas(schemas), null, 2));
   } else {
@@ -681,8 +671,8 @@ var handler9 = Effect14.fn(function* ({ spaceId, typename }) {
   }
 });
 var list2 = Command15.make("list", {
-  spaceId: Common9.spaceId.pipe(Options12.optional),
-  typename: Options12.text("typename").pipe(Options12.withDescription("Filter schemas by typename."), Options12.optional)
+  spaceId: Common9.spaceId.pipe(Options13.optional),
+  typename: Options13.text("typename").pipe(Options13.withDescription("Filter schemas by typename."), Options13.optional)
 }, handler9).pipe(Command15.withDescription("List space schemas."));
 
 // src/cli/commands/space/schema/index.ts
@@ -692,7 +682,7 @@ var schema = Command16.make("schema").pipe(Command16.withDescription("Manage spa
 
 // src/cli/commands/space/share/share.ts
 import * as Command17 from "@effect/cli/Command";
-import * as Options13 from "@effect/cli/Options";
+import * as Options14 from "@effect/cli/Options";
 import * as Console14 from "effect/Console";
 import * as Effect15 from "effect/Effect";
 import { CommandConfig as CommandConfig14, Common as Common10, copyToClipboard, getSpace as getSpace6, openBrowser, print as print6, spaceIdWithDefault as spaceIdWithDefault4 } from "@dxos/cli-util";
@@ -748,26 +738,26 @@ Invitation: ${invitationCode}
   }
 });
 var share = Command17.make("share", {
-  spaceId: Common10.spaceId.pipe(Options13.optional),
-  multiple: Options13.boolean("multiple", {
+  spaceId: Common10.spaceId.pipe(Options14.optional),
+  multiple: Options14.boolean("multiple", {
     ifPresent: true
-  }).pipe(Options13.withDescription("Create a multi-use invitation.")),
-  open: Options13.boolean("open", {
+  }).pipe(Options14.withDescription("Create a multi-use invitation.")),
+  open: Options14.boolean("open", {
     ifPresent: true
-  }).pipe(Options13.withDescription("Open browser with invitation.")),
-  host: Options13.text("host").pipe(Options13.withDescription("Application Host URL."), Options13.withDefault("https://composer.space"))
+  }).pipe(Options14.withDescription("Open browser with invitation.")),
+  host: Options14.text("host").pipe(Options14.withDescription("Application Host URL."), Options14.withDefault("https://composer.space"))
 }, handler10).pipe(Command17.withDescription("Create space invitation."));
 
 // src/cli/commands/space/sync/sync.ts
 import * as Command18 from "@effect/cli/Command";
-import * as Options14 from "@effect/cli/Options";
+import * as Options15 from "@effect/cli/Options";
 import * as Duration2 from "effect/Duration";
 import * as Effect16 from "effect/Effect";
 import * as Schedule from "effect/Schedule";
 import { Common as Common11, getSpace as getSpace7, spaceIdWithDefault as spaceIdWithDefault5, waitForSync as waitForSync5, withTimeout } from "@dxos/cli-util";
 var sync = Command18.make("sync", {
-  spaceId: Common11.spaceId.pipe(Options14.optional),
-  spaceTimeout: Options14.integer("spaceTimeout").pipe(Options14.withDescription("The timeout to wait for the space to be available in milliseconds."), Options14.withDefault(5e3))
+  spaceId: Common11.spaceId.pipe(Options15.optional),
+  spaceTimeout: Options15.integer("spaceTimeout").pipe(Options15.withDescription("The timeout to wait for the space to be available in milliseconds."), Options15.withDefault(5e3))
 }, ({ spaceId, spaceTimeout }) => Effect16.gen(function* () {
   const resolvedSpaceId = yield* spaceIdWithDefault5(spaceId);
   const space2 = yield* getSpace7(resolvedSpaceId).pipe(Effect16.retry(Schedule.fixed("100 millis")), Effect16.timeout(Duration2.millis(spaceTimeout)));
@@ -802,11 +792,21 @@ var SpacePlugin = Plugin2.define(meta).pipe(
     metadata: {
       id: Collection2.Collection.typename,
       metadata: {
-        createObject: (props) => Effect17.sync(() => Collection2.make(props)),
-        addToCollectionOnCreate: true
+        createObject: (props, options) => Effect17.gen(function* () {
+          const object = Collection2.make(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId
+          });
+        })
       }
     }
   }),
+  AppPlugin.addOperationHandlerModule({
+    activate: OperationHandler
+  }),
   AppPlugin.addSchemaModule({
     schema: [
       ...DataTypes,
@@ -830,9 +830,9 @@ var SpacePlugin = Plugin2.define(meta).pipe(
       return baseUrl.toString();
     };
     return {
-      id: Capability.getModuleTag(OperationResolver),
-      activatesOn: ActivationEvents.SetupOperationResolver,
-      activate: () => OperationResolver({
+      id: Capability.getModuleTag(UndoMappings),
+      activatesOn: ActivationEvents.SetupOperationHandler,
+      activate: () => UndoMappings({
         createInvitationUrl,
         observability: false
       })
@@ -840,8 +840,8 @@ var SpacePlugin = Plugin2.define(meta).pipe(
   }),
   Plugin2.addModule({
     activatesOn: ClientEvents.IdentityCreated,
-    activatesAfter: [
-      SpaceEvents.DefaultSpaceReady
+    firesAfterActivation: [
+      SpaceEvents.PersonalSpaceReady
     ],
     activate: IdentityCreated
   }),