@dxos/client 2.28.3-dev.cb8eaf22 → 2.28.3-dev.d914f2b6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client",
-  "version": "2.28.3-dev.cb8eaf22",
+  "version": "2.28.3-dev.d914f2b6",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
@@ -10,21 +10,21 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.28.3-dev.cb8eaf22",
-    "@dxos/codec-protobuf": "2.28.3-dev.cb8eaf22",
-    "@dxos/config": "2.28.3-dev.cb8eaf22",
-    "@dxos/credentials": "2.28.3-dev.cb8eaf22",
-    "@dxos/crypto": "2.28.3-dev.cb8eaf22",
-    "@dxos/debug": "2.28.3-dev.cb8eaf22",
-    "@dxos/echo-db": "2.28.3-dev.cb8eaf22",
-    "@dxos/echo-protocol": "2.28.3-dev.cb8eaf22",
-    "@dxos/feed-store": "2.28.3-dev.cb8eaf22",
-    "@dxos/model-factory": "2.28.3-dev.cb8eaf22",
-    "@dxos/network-manager": "2.28.3-dev.cb8eaf22",
-    "@dxos/object-model": "2.28.3-dev.cb8eaf22",
-    "@dxos/protocols": "2.28.3-dev.cb8eaf22",
-    "@dxos/rpc": "2.28.3-dev.cb8eaf22",
-    "@dxos/util": "2.28.3-dev.cb8eaf22",
+    "@dxos/async": "2.28.3-dev.d914f2b6",
+    "@dxos/codec-protobuf": "2.28.3-dev.d914f2b6",
+    "@dxos/config": "2.28.3-dev.d914f2b6",
+    "@dxos/credentials": "2.28.3-dev.d914f2b6",
+    "@dxos/crypto": "2.28.3-dev.d914f2b6",
+    "@dxos/debug": "2.28.3-dev.d914f2b6",
+    "@dxos/echo-db": "2.28.3-dev.d914f2b6",
+    "@dxos/echo-protocol": "2.28.3-dev.d914f2b6",
+    "@dxos/feed-store": "2.28.3-dev.d914f2b6",
+    "@dxos/model-factory": "2.28.3-dev.d914f2b6",
+    "@dxos/network-manager": "2.28.3-dev.d914f2b6",
+    "@dxos/object-model": "2.28.3-dev.d914f2b6",
+    "@dxos/protocols": "2.28.3-dev.d914f2b6",
+    "@dxos/rpc": "2.28.3-dev.d914f2b6",
+    "@dxos/util": "2.28.3-dev.d914f2b6",
     "@polkadot/keyring": "6.11.1",
     "@polkadot/util": "6.11.1",
     "@polkadot/util-crypto": "6.11.1",
@@ -41,7 +41,8 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@dxos/random-access-multi-storage": "2.28.3-dev.cb8eaf22",
+    "@dxos/eslint-plugin": "~1.0.26",
+    "@dxos/random-access-multi-storage": "2.28.3-dev.d914f2b6",
     "@dxos/testutils": "2.28.2",
     "@dxos/toolchain-node-library": "2.28.2",
     "@types/debug": "^4.1.7",
@@ -52,8 +53,10 @@
     "@types/mocha": "~8.2.2",
     "@types/readable-stream": "^2.3.9",
     "@types/uuid": "~8.3.3",
+    "eslint": "^7.12.1",
     "expect": "~27.0.2",
     "mocha": "~8.4.0",
+    "typescript": "^4.5.2",
     "wait-for-expect": "^3.0.2"
   },
   "publishConfig": {

package/src/api/halo-proxy.ts

@@ -49,14 +49,6 @@ export class HaloProxy {
     return this._profile;
   }
 
-  /**
-   * Reset the identity and delete all key records.
-  */
-  async reset () {
-    await this._serviceProvider.services.SystemService.reset();
-    this.profileChanged.emit();
-  }
-
   // TODO(burdon): Should be part of profile object. Or use standard Result object.
   subscribeToProfile (cb: () => void): () => void {
     return this.profileChanged.on(cb);

package/src/api/party-proxy.ts

@@ -71,6 +71,7 @@ export class Party {
     if (this._database && this._serviceProvider instanceof ClientServiceProxy) {
       await this._database.init();
     }
+
     await this._database?.waitForItem({ type: PARTY_ITEM_TYPE });
   }
 
@@ -189,7 +190,7 @@ export class Party {
   }
 
   private getPropertiesItem () {
-    const items = this.database.select({ type: PARTY_ITEM_TYPE }).query().result;
+    const items = this.database.select({ type: PARTY_ITEM_TYPE }).query().entities;
     return items[0];
   }
 

package/src/client/client.test.ts

@@ -330,10 +330,9 @@ describe('Client', () => {
       client.registerModel(TestModel);
 
       const party = client.echo.queryParties().first;
-      const selection = party.database.select({ type: 'test' }).query();
-      await selection.update.waitForCondition(() => selection.result.length > 0);
-
-      const item = selection.expectOne();
+      const result = party.database.select({ type: 'test' }).query();
+      await result.update.waitForCondition(() => result.entities.length > 0);
+      const item = result.expectOne();
 
       expect(item.model.getProperty('prop')).toEqual('value1');
 

package/src/client/client.ts

@@ -232,6 +232,7 @@ export class Client {
   @synchronized
   async reset () {
     await this.services.SystemService.reset();
+    this._halo.profileChanged.emit();
     this._initialized = false;
   }
 

package/src/devtools/items.ts

@@ -19,8 +19,8 @@ const getData = (echo: DevtoolsServiceDependencies['echo']): SubscribeToItemsRes
       items: []
     };
 
-    const { result: items } = party.database.select().query();
-    for (const item of items) {
+    const queryResult = party.database.select().query();
+    for (const item of queryResult.entities) {
       partyInfo.items.push({
         id: item.id,
         type: item.type,

package/src/util/config.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2021 DXOS.org
+//
+
+import { Config, Envs, Defaults, Dynamics } from '@dxos/config';
+
+/**
+ * Helper to build config from the files supported by the config plugins.
+ */
+export const configProvider = async () => new Config(await Dynamics(), Envs(), Defaults());

package/src/util/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
+export * from './config';
 export * from './createWindowMessagePort';
 export * from './platform';
 export * from './subscription';