@dxos/client-services 0.4.6-main.e47f68d → 0.4.6-next.c12c15b

package/dist/lib/node/packlets/testing/index.cjs

@@ -31,7 +31,7 @@ __export(testing_exports, {
   syncItemsLocal: () => syncItemsLocal
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_RPI2D3AB = require("../../chunk-RPI2D3AB.cjs");
+var import_chunk_T7XOQKSY = require("../../chunk-T7XOQKSY.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -209,7 +209,7 @@ var createInvitation = (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_RPI2D3AB.ServiceContext) {
+  if (host instanceof import_chunk_T7XOQKSY.ServiceContext) {
     const hostHandler = host.getInvitationHandler({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -220,7 +220,7 @@ var createInvitation = (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_RPI2D3AB.ServiceContext) {
+  if (guest instanceof import_chunk_T7XOQKSY.ServiceContext) {
     const guestHandler = guest.getInvitationHandler({
       kind: invitation.kind
     });
@@ -229,7 +229,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   return guest.join(invitation, guestDeviceProfile);
 };
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_RPI2D3AB.ClientServicesHost({
+  return new import_chunk_T7XOQKSY.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -243,8 +243,8 @@ var createServiceContext = ({ signalContext = new import_messaging.MemorySignalM
     signalManager,
     transportFactory: import_network_manager.MemoryTransportFactory
   });
-  const modelFactory = (0, import_chunk_RPI2D3AB.createDefaultModelFactory)();
-  return new import_chunk_RPI2D3AB.ServiceContext(storage, networkManager, signalManager, modelFactory);
+  const modelFactory = (0, import_chunk_T7XOQKSY.createDefaultModelFactory)();
+  return new import_chunk_T7XOQKSY.ServiceContext(storage, networkManager, signalManager, modelFactory);
 };
 var createPeers = async (numPeers) => {
   const signalContext = new import_messaging.MemorySignalManagerContext();
@@ -328,7 +328,7 @@ var TestPeer = class {
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       metadataStore: this.metadataStore,
-      modelFactory: (0, import_chunk_RPI2D3AB.createDefaultModelFactory)(),
+      modelFactory: (0, import_chunk_T7XOQKSY.createDefaultModelFactory)(),
       snapshotStore: this.snapshotStore,
       blobStore: this.blobStore
     });
@@ -340,7 +340,7 @@ var TestPeer = class {
     return this._props.automergeHost ??= new import_echo_pipeline.AutomergeHost(this.storage.createDirectory("automerge"));
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_RPI2D3AB.DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore, this.automergeHost);
+    return this._props.dataSpaceManager ??= new import_chunk_T7XOQKSY.DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore, this.automergeHost);
   }
   async createIdentity() {
     this._props.signingContext ??= await createSigningContext(this.keyring);

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.4.6-main.e47f68d";
+export declare const DXOS_VERSION = "0.4.6-next.c12c15b";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.4.6-main.e47f68d",
+  "version": "0.4.6-next.c12c15b",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,44 +22,44 @@
   ],
   "dependencies": {
     "platform": "^1.3.6",
-    "@dxos/async": "0.4.6-main.e47f68d",
-    "@dxos/client-protocol": "0.4.6-main.e47f68d",
-    "@dxos/codec-protobuf": "0.4.6-main.e47f68d",
-    "@dxos/config": "0.4.6-main.e47f68d",
-    "@dxos/context": "0.4.6-main.e47f68d",
-    "@dxos/credentials": "0.4.6-main.e47f68d",
-    "@dxos/crypto": "0.4.6-main.e47f68d",
-    "@dxos/debug": "0.4.6-main.e47f68d",
-    "@dxos/document-model": "0.4.6-main.e47f68d",
-    "@dxos/echo-db": "0.4.6-main.e47f68d",
-    "@dxos/echo-pipeline": "0.4.6-main.e47f68d",
-    "@dxos/echo-schema": "0.4.6-main.e47f68d",
-    "@dxos/feed-store": "0.4.6-main.e47f68d",
-    "@dxos/invariant": "0.4.6-main.e47f68d",
-    "@dxos/keyring": "0.4.6-main.e47f68d",
-    "@dxos/keys": "0.4.6-main.e47f68d",
-    "@dxos/lock-file": "0.4.6-main.e47f68d",
-    "@dxos/log": "0.4.6-main.e47f68d",
-    "@dxos/messaging": "0.4.6-main.e47f68d",
-    "@dxos/model-factory": "0.4.6-main.e47f68d",
-    "@dxos/network-manager": "0.4.6-main.e47f68d",
-    "@dxos/node-std": "0.4.6-main.e47f68d",
-    "@dxos/protocols": "0.4.6-main.e47f68d",
-    "@dxos/random-access-storage": "0.4.6-main.e47f68d",
-    "@dxos/teleport": "0.4.6-main.e47f68d",
-    "@dxos/rpc": "0.4.6-main.e47f68d",
-    "@dxos/teleport-extension-gossip": "0.4.6-main.e47f68d",
-    "@dxos/teleport-extension-object-sync": "0.4.6-main.e47f68d",
-    "@dxos/text-model": "0.4.6-main.e47f68d",
-    "@dxos/timeframe": "0.4.6-main.e47f68d",
-    "@dxos/util": "0.4.6-main.e47f68d",
-    "@dxos/tracing": "0.4.6-main.e47f68d",
-    "@dxos/websocket-rpc": "0.4.6-main.e47f68d"
+    "@dxos/async": "0.4.6-next.c12c15b",
+    "@dxos/client-protocol": "0.4.6-next.c12c15b",
+    "@dxos/config": "0.4.6-next.c12c15b",
+    "@dxos/codec-protobuf": "0.4.6-next.c12c15b",
+    "@dxos/context": "0.4.6-next.c12c15b",
+    "@dxos/credentials": "0.4.6-next.c12c15b",
+    "@dxos/document-model": "0.4.6-next.c12c15b",
+    "@dxos/crypto": "0.4.6-next.c12c15b",
+    "@dxos/echo-db": "0.4.6-next.c12c15b",
+    "@dxos/debug": "0.4.6-next.c12c15b",
+    "@dxos/echo-pipeline": "0.4.6-next.c12c15b",
+    "@dxos/echo-schema": "0.4.6-next.c12c15b",
+    "@dxos/feed-store": "0.4.6-next.c12c15b",
+    "@dxos/invariant": "0.4.6-next.c12c15b",
+    "@dxos/keyring": "0.4.6-next.c12c15b",
+    "@dxos/lock-file": "0.4.6-next.c12c15b",
+    "@dxos/log": "0.4.6-next.c12c15b",
+    "@dxos/messaging": "0.4.6-next.c12c15b",
+    "@dxos/keys": "0.4.6-next.c12c15b",
+    "@dxos/model-factory": "0.4.6-next.c12c15b",
+    "@dxos/node-std": "0.4.6-next.c12c15b",
+    "@dxos/protocols": "0.4.6-next.c12c15b",
+    "@dxos/random-access-storage": "0.4.6-next.c12c15b",
+    "@dxos/network-manager": "0.4.6-next.c12c15b",
+    "@dxos/teleport": "0.4.6-next.c12c15b",
+    "@dxos/rpc": "0.4.6-next.c12c15b",
+    "@dxos/teleport-extension-gossip": "0.4.6-next.c12c15b",
+    "@dxos/teleport-extension-object-sync": "0.4.6-next.c12c15b",
+    "@dxos/tracing": "0.4.6-next.c12c15b",
+    "@dxos/timeframe": "0.4.6-next.c12c15b",
+    "@dxos/text-model": "0.4.6-next.c12c15b",
+    "@dxos/util": "0.4.6-next.c12c15b",
+    "@dxos/websocket-rpc": "0.4.6-next.c12c15b"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.4.6-main.e47f68d"
+    "@dxos/signal": "0.4.6-next.c12c15b"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/services/service-host.ts

@@ -8,7 +8,7 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { DocumentModel } from '@dxos/document-model';
 import { DataServiceImpl } from '@dxos/echo-pipeline';
-import { type TypedObject, base, getRawDoc, type DocStructure } from '@dxos/echo-schema';
+import { type TypedObject, base, getRawDoc, type SpaceDoc } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -348,10 +348,10 @@ export class ClientServicesHost {
 
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant(automergeIndex);
-    const document = await this._serviceContext.automergeHost.repo.find<DocStructure>(automergeIndex as any);
+    const document = await this._serviceContext.automergeHost.repo.find<SpaceDoc>(automergeIndex as any);
     await document.whenReady();
 
-    document.change((doc: DocStructure) => {
+    document.change((doc: SpaceDoc) => {
       assignDeep(doc, ['objects', obj[base]._id], getRawDoc(obj).handle.docSync());
     });
 

package/src/packlets/spaces/data-space-manager.ts

@@ -143,7 +143,7 @@ export class DataSpaceManager {
 
     const automergeRoot = this._automergeHost.repo.create();
     automergeRoot.change((doc: any) => {
-      doc.experimental_spaceKey = spaceKey.toHex();
+      doc.access = { spaceKey: spaceKey.toHex() };
     });
 
     const space = await this._constructSpace(metadata);

package/src/packlets/spaces/data-space.ts

@@ -391,9 +391,9 @@ export class DataSpace {
         }
 
         const doc = handle.docSync() ?? failedInvariant();
-        if (!doc.experimental_spaceKey) {
+        if (!doc.access?.spaceKey) {
           handle.change((doc: any) => {
-            doc.experimental_spaceKey = this.key.toHex();
+            doc.access = { spaceKey: this.key.toHex() };
           });
         }
       } catch (err) {

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.6-main.e47f68d";
+export const DXOS_VERSION = "0.4.6-next.c12c15b";