@dxos/echo-db 2.28.3-dev.e4579238 → 2.28.4-dev.424a2abb

package/dist/src/{database → api}/database.d.ts

@@ -2,13 +2,11 @@ import { Event } from '@dxos/async';
 import { PublicKey } from '@dxos/crypto';
 import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { Model, ModelConstructor, ModelFactory } from '@dxos/model-factory';
-import { Selection } from '.';
-import { DataServiceHost } from './data-service-host';
-import { DatabaseBackend } from './database-backend';
+import { DatabaseBackend, DataServiceHost } from '../database';
 import { Entity } from './entity';
 import { Item } from './item';
 import { Link } from './link';
-import { RootFilter } from './selection';
+import { Selection, RootFilter } from './selection';
 export interface ItemCreationOptions<M extends Model> {
     model: ModelConstructor<M>;
     type?: ItemType;

package/dist/src/api/database.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/api/database.ts"],"names":[],"mappings":"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"}

package/dist/src/{database → api}/database.js

@@ -17,8 +17,8 @@ const assert_1 = __importDefault(require("assert"));
 const async_1 = require("@dxos/async");
 const model_factory_1 = require("@dxos/model-factory");
 const object_model_1 = require("@dxos/object-model");
+const database_1 = require("../database");
 const item_1 = require("./item");
-const item_manager_1 = require("./item-manager");
 const selection_1 = require("./selection");
 var State;
 (function (State) {
@@ -38,7 +38,7 @@ class Database {
         this._modelFactory = _modelFactory;
         this._backend = _backend;
         this._state = State.INITIAL;
-        this._itemManager = new item_manager_1.ItemManager(this._modelFactory, memberKey, this._backend.getWriteStream());
+        this._itemManager = new database_1.ItemManager(this._modelFactory, memberKey, this._backend.getWriteStream());
     }
     get isReadOnly() {
         return this._backend.isReadOnly;
@@ -118,13 +118,10 @@ class Database {
      * Waits for item matching the filter to be present and returns it.
      */
     async waitForItem(filter) {
-        const query = this.select(filter).query();
-        await query.update.waitForCondition(() => {
-            const { result } = query;
-            return Array.isArray(result) ? result.length > 0 : result !== undefined;
-        });
-        const item = Array.isArray(query.result) ? query.result[0] : query.result;
-        (0, assert_1.default)(item, 'Race condition detected');
+        const result = this.select(filter).query();
+        await result.update.waitForCondition(() => result.entities.length > 0);
+        const item = result.expectOne();
+        (0, assert_1.default)(item, 'Possible condition detected.');
         return item;
     }
     /**

package/dist/src/api/database.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../src/api/database.ts"],"names":[],"mappings":"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"}

package/dist/src/api/database.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"database.test.d.ts","sourceRoot":"","sources":["../../../src/api/database.test.ts"],"names":[],"mappings":""}

package/dist/src/{database → api}/database.test.js

@@ -12,20 +12,20 @@ const async_1 = require("@dxos/async");
 const model_factory_1 = require("@dxos/model-factory");
 const object_model_1 = require("@dxos/object-model");
 const testutils_1 = require("@dxos/testutils");
+const database_1 = require("../database");
 const selection_1 = require("./selection");
-const testing_1 = require("./testing");
 const OBJECT_ORG = 'example:object/org';
 const OBJECT_PERSON = 'example:object/person';
 const LINK_EMPLOYEE = 'example:link/employee';
 describe('Database', () => {
     describe('remote', () => {
         const setupBackend = async (modelFactory) => {
-            const backend = await (0, testing_1.createInMemoryDatabase)(modelFactory);
+            const backend = await (0, database_1.createInMemoryDatabase)(modelFactory);
             (0, testutils_1.afterTest)(() => backend.destroy());
             return backend;
         };
         const setupFrontend = async (modelFactory, dataServiceHost) => {
-            const frontend = await (0, testing_1.createRemoteDatabaseFromDataServiceHost)(modelFactory, dataServiceHost);
+            const frontend = await (0, database_1.createRemoteDatabaseFromDataServiceHost)(modelFactory, dataServiceHost);
             (0, testutils_1.afterTest)(() => frontend.destroy());
             return frontend;
         };
@@ -64,9 +64,8 @@ describe('Database', () => {
             const item = await database.createItem({ model: object_model_1.ObjectModel });
             (0, expect_1.default)(item.id).not.toBeUndefined();
             (0, expect_1.default)(item.model).toBeInstanceOf(object_model_1.ObjectModel);
-            const { result: items } = database.select().query();
-            (0, expect_1.default)(items).toHaveLength(1);
-            (0, expect_1.default)(items[0] === item).toBeTruthy();
+            const result = database.select().query();
+            (0, expect_1.default)(result.expectOne()).toBeTruthy();
         });
         (0, mocha_1.it)('mutate item with object model', async () => {
             const { frontend: database } = await setup();
@@ -87,9 +86,9 @@ describe('Database', () => {
             const { frontend: database } = await setup();
             const parent = await database.createItem({ model: object_model_1.ObjectModel });
             const child = await database.createItem({ model: object_model_1.ObjectModel, parent: parent.id });
-            const { result: items } = database.select().query();
-            (0, expect_1.default)(items).toHaveLength(2);
-            (0, expect_1.default)(items).toEqual([parent, child]);
+            const result = database.select().query();
+            (0, expect_1.default)(result.entities).toHaveLength(2);
+            (0, expect_1.default)(result.entities).toEqual([parent, child]);
             (0, expect_1.default)(parent.children).toHaveLength(1);
             (0, expect_1.default)(parent.children[0] === child).toBeTruthy();
         });
@@ -163,24 +162,23 @@ describe('Database', () => {
                 const modelFactory = new model_factory_1.ModelFactory().registerModel(object_model_1.ObjectModel).registerModel(model_factory_1.TestListModel);
                 const database = await setupBackend(modelFactory);
                 await Promise.all(Array.from({ length: 10 }).map(() => database.createItem({ model: model_factory_1.TestListModel })));
-                // TODO(burdon): Trigger result on initial subscription.
-                const query = database.select().query();
-                const items = query.result;
+                const result = database.select().query();
+                const items = result.entities;
                 (0, expect_1.default)(items).toHaveLength(10);
-                const update = query.update.waitForCount(1);
+                const update = result.update.waitForCount(1);
                 await items[0].delete();
                 await update;
                 {
-                    const { result: items } = query;
-                    (0, expect_1.default)(items).toHaveLength(9);
+                    const result = database.select().query();
+                    (0, expect_1.default)(result.entities).toHaveLength(9);
                 }
                 {
-                    const { result: items } = database.select().query({ deleted: selection_1.ItemFilterDeleted.SHOW_DELETED });
-                    (0, expect_1.default)(items).toHaveLength(10);
+                    const result = database.select().query({ deleted: selection_1.ItemFilterDeleted.SHOW_DELETED });
+                    (0, expect_1.default)(result.entities).toHaveLength(10);
                 }
                 {
-                    const { result: items } = database.select().query({ deleted: selection_1.ItemFilterDeleted.SHOW_DELETED_ONLY });
-                    (0, expect_1.default)(items).toHaveLength(1);
+                    const result = database.select().query({ deleted: selection_1.ItemFilterDeleted.SHOW_DELETED_ONLY });
+                    (0, expect_1.default)(result.entities).toHaveLength(1);
                 }
             });
             (0, mocha_1.it)('link between items generates updates to items', async () => {

package/dist/src/api/database.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"database.test.js","sourceRoot":"","sources":["../../../src/api/database.test.ts"],"names":[],"mappings":"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"}

package/dist/src/{database → api}/entity.d.ts

@@ -1,7 +1,7 @@
 import { Event } from '@dxos/async';
 import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { Model, ModelMeta, StateManager } from '@dxos/model-factory';
-import { ItemManager } from './item-manager';
+import { ItemManager } from '../database';
 /**
  * Base class for all ECHO entitities.
  *

package/dist/src/api/entity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../src/api/entity.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGrE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;GAIG;AACH,qBAAa,MAAM,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK;IAY9C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW;IAC5C,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAZxB,SAAS,CAAC,QAAQ,CAAC,SAAS,qBAA4B;IAExD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;gBAQrC,YAAY,EAAE,WAAW,EAC3B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,QAAQ,GAAG,SAAS,EAC5C,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAS5C,IAAI,EAAE,IAAK,MAAM,CAEhB;IAED,IAAI,IAAI,IAAK,QAAQ,GAAG,SAAS,CAEhC;IAED,IAAI,SAAS,IAAK,SAAS,CAE1B;IAED,IAAI,KAAK,IAAK,CAAC,CAMd;IAED;;;OAGG;IACH,SAAS,CAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,IAAI,KAAK,IAAI;CAG5C"}

package/dist/src/api/entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/api/entity.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,uCAAoC;AAGpC,qCAA+C;AAI/C;;;;GAIG;AACH,MAAa,MAAM;IAWjB,YACqB,YAAyB,EAC3B,GAAW,EACX,KAA2B,EAC5C,YAA0C;QAHvB,iBAAY,GAAZ,YAAY,CAAa;QAC3B,QAAG,GAAH,GAAG,CAAQ;QACX,UAAK,GAAL,KAAK,CAAsB;QAb9C,2CAA2C;QACxB,cAAS,GAAG,IAAI,aAAK,EAAe,CAAC;QAEvC,mBAAc,GAAG,IAAI,wBAAiB,EAAE,CAAC;QAaxD,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAElC,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE;YAClC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC/F;IACH,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE;YACnC,OAAO,IAAW,CAAC;SACpB;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,SAAS,CAAE,QAAgC;QACzC,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,QAAe,CAAC,CAAC;IAC5C,CAAC;CACF;AAnDD,wBAmDC"}

package/dist/src/api/index.d.ts

@@ -0,0 +1,7 @@
+export * from './database';
+export * from './entity';
+export * from './item';
+export * from './link';
+export * from './result-set';
+export * from './selection';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/api/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/api/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}

package/dist/src/api/index.js

@@ -0,0 +1,22 @@
+"use strict";
+//
+// Copyright 2022 DXOS.org
+//
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./database"), exports);
+__exportStar(require("./entity"), exports);
+__exportStar(require("./item"), exports);
+__exportStar(require("./link"), exports);
+__exportStar(require("./result-set"), exports);
+__exportStar(require("./selection"), exports);
+//# sourceMappingURL=index.js.map

package/dist/src/api/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,6CAA2B;AAC3B,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,+CAA6B;AAC7B,8CAA4B"}

package/dist/src/{database → api}/item.d.ts

@@ -1,7 +1,7 @@
 import { EchoEnvelope, ItemID, ItemMutation, ItemType, FeedWriter } from '@dxos/echo-protocol';
 import { Model, StateManager } from '@dxos/model-factory';
+import { ItemManager } from '../database';
 import { Entity } from './entity';
-import { ItemManager } from './item-manager';
 import type { Link } from './link';
 import { Selection } from './selection';
 /**

package/dist/src/api/item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../../src/api/item.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,SAAS,EAAsB,MAAM,aAAa,CAAC;AAI5D;;;;GAIG;AACH,qBAAa,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IA2C/D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IA1ChC;;OAEG;IACH,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAS;IAoBzB;;;;;;;OAOG;gBAED,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAAE,+BAA+B;IAC/D,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EACzB,YAAY,CAAC,sCAA0B,EACxD,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI;IAMlB,QAAQ;IAIjB,IAAI,QAAQ,YAEX;IAED,IAAI,OAAO,YAEV;IAED,IAAI,MAAM,IAAK,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAE9B;IAED,IAAI,QAAQ,IAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAE3B;IAED,IAAI,KAAK,IAAK,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAElC;IAED,IAAI,IAAI,IAAK,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAEjC;IAED;;OAEG;IACH,MAAM,IAAK,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAI/B;;OAEG;IAMG,MAAM;IAoBZ;;OAEG;IACG,OAAO;IAqBP,SAAS,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBjD;;;OAGG;IACH,gBAAgB,CAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS;IA0B5F;;;OAGG;IACH,OAAO,CAAC,aAAa;CAYtB"}

package/dist/src/api/item.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"item.js","sourceRoot":"","sources":["../../../src/api/item.ts"],"names":[],"mappings":"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"}

package/dist/src/{database → api}/link.d.ts

@@ -1,8 +1,8 @@
 import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { Model, StateManager } from '@dxos/model-factory';
+import { ItemManager } from '../database';
 import { Entity } from './entity';
 import { Item } from './item';
-import { ItemManager } from './item-manager';
 export interface LinkData {
     sourceId: ItemID;
     targetId: ItemID;

package/dist/src/api/link.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/api/link.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;CACnB;AAED;;GAEG;AACH,qBAAa,IAAI,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;gBAOvH,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAC9B,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAC1C,IAAI,EAAE,QAAQ;IAWhB,IAAI,MAAM,IAAK,IAAI,CAElB;IAED,IAAI,QAAQ,IAAK,MAAM,CAEtB;IAED,IAAI,QAAQ,IAAK,MAAM,CAEtB;IAED,IAAI,MAAM,IAAK,IAAI,CAAC,CAAC,CAAC,CAGrB;IAED,IAAI,MAAM,IAAK,IAAI,CAAC,CAAC,CAAC,CAGrB;CAQF"}

package/dist/src/api/link.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"link.js","sourceRoot":"","sources":["../../../src/api/link.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAM5B,qCAAkC;AAUlC;;GAEG;AACH,MAAa,IAA6F,SAAQ,eAAS;IAMzH,YACE,WAAwB,EACxB,MAAc,EACd,QAA8B,EAC9B,YAA0C,EAC1C,IAAc;QAEd,KAAK,CACH,WAAW,EACX,MAAM,EACN,QAAQ,EACR,YAAY,CACb,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;IAED,IAAI,MAAM;QACR,IAAA,gBAAM,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM;QACR,IAAA,gBAAM,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAClD,CAAC;CACF;AAlDD,oBAkDC"}

package/dist/src/{result.d.ts → api/result-set.d.ts}

@@ -25,4 +25,4 @@ export declare class ResultSet<T> {
      */
     waitFor(condition: (data: T[]) => boolean): Promise<T[]>;
 }
-//# sourceMappingURL=result.d.ts.map
+//# sourceMappingURL=result-set.d.ts.map

package/dist/src/api/result-set.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"result-set.d.ts","sourceRoot":"","sources":["../../../src/api/result-set.ts"],"names":[],"mappings":"AAMA,OAAO,EAAS,aAAa,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,qBAAa,SAAS,CAAC,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IAEpC;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAuB;gBAE7C,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;IAWzD,IAAI,KAAK,IAAK,CAAC,EAAE,CAGhB;IAED,IAAI,KAAK,IAAK,CAAC,CAId;IAED;;;OAGG;IACH,SAAS,CAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,IAAI;IAI1C;;;;OAIG;IACH,OAAO,CAAE,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAO1D"}

package/dist/src/{result.js → api/result-set.js}

@@ -56,4 +56,4 @@ class ResultSet {
     }
 }
 exports.ResultSet = ResultSet;
-//# sourceMappingURL=result.js.map
+//# sourceMappingURL=result-set.js.map

package/dist/src/api/result-set.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"result-set.js","sourceRoot":"","sources":["../../../src/api/result-set.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAAmD;AAEnD;;GAEG;AACH,MAAa,SAAS;IAUpB,YAAa,UAAyB,EAAE,MAAiB;QATxC,mBAAc,GAAG,IAAI,aAAK,EAAO,CAAC;QAInD;;WAEG;QACM,WAAM,GAAuB,IAAI,CAAC,cAAc,CAAC;QAGxD,IAAA,gBAAM,EAAC,UAAU,CAAC,CAAC;QACnB,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE;YAC3D,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,IAAI,KAAK;QACP,0DAA0D;QAC1D,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,KAAK;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7B,IAAA,gBAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,SAAS,CAAE,QAA+B;QACxC,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAE,SAAiC;QACxC,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACzB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACpC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;CACF;AApDD,8BAoDC"}

package/dist/src/{database → api}/selection.d.ts

@@ -48,7 +48,7 @@ export declare type SelectionRoot = Database | Entity;
 /**
  * Returned from each stage of the visitor.
  */
-export declare type SelectionContext<T extends Entity, R> = [entities: T[], result: R];
+export declare type SelectionContext<T extends Entity, R> = [entities: T[], result?: R];
 /**
  * Visitor callback.
  * The visitor is passed the current entities and result (accumulator),
@@ -60,6 +60,7 @@ export declare type Callable<T extends Entity, R> = (entities: T[], result: R) =
  * @param itemsProvider
  * @param updateEventProvider
  * @param root
+ * @param filter
  * @param value Initial reducer value.
  */
 export declare const createSelector: <R>(itemsProvider: () => Item[], updateEventProvider: () => Event<Entity[]>, root: SelectionRoot, filter: RootFilter | undefined, value: R) => Selection<Item<any>, R>;
@@ -83,12 +84,14 @@ export declare class Selection<T extends Entity<any>, R = void> {
     private readonly _visitor;
     private readonly _update;
     private readonly _root;
+    private readonly _reducer;
     /**
      * @param _visitor Executes the query.
      * @param _update The unfiltered update event.
      * @param _root The root of the selection. Must be a stable reference.
+     * @param _reducer
      */
-    constructor(_visitor: (options: QueryOptions) => SelectionContext<T, R>, _update: Event<Entity[]>, _root: SelectionRoot);
+    constructor(_visitor: (options: QueryOptions) => SelectionContext<T, R>, _update: Event<Entity[]>, _root: SelectionRoot, _reducer?: boolean);
     /**
      * Creates a derrived selection by aplying a mapping function to the result of the current selection.
      */
@@ -145,25 +148,36 @@ export declare class SelectionResult<T extends Entity, R = any> {
     private readonly _execute;
     private readonly _update;
     private readonly _root;
+    private readonly _reducer;
     /**
      * Fired when there are updates in the selection.
      * Only update that are relevant to the selection cause the update.
      */
-    readonly update: Event<T[]>;
+    readonly update: Event<SelectionResult<T, any>>;
     private _lastResult;
-    constructor(_execute: () => SelectionContext<T, R>, _update: Event<Entity[]>, _root: SelectionRoot);
+    constructor(_execute: () => SelectionContext<T, R>, _update: Event<Entity[]>, _root: SelectionRoot, _reducer: boolean);
     /**
-     * Get the result of this select.
+     * Re-run query.
      */
-    get result(): T[];
-    get value(): R;
-    /**
-     * If the result contains exatly one entity, returns it, errors otherwise.
-     */
-    expectOne(): T;
+    refresh(): this;
     /**
      * The root of the selection. Either a database or an item. Must be a stable reference.
      */
     get root(): SelectionRoot;
+    /**
+     * @deprecated
+     */
+    /**
+     * Get the result of this selection.
+     */
+    get entities(): T[];
+    /**
+     * Returns the selection or reducer result.
+     */
+    get value(): R extends void ? T[] : R;
+    /**
+     * Return the first element if the set has exactly one element.
+     */
+    expectOne(): T;
 }
 //# sourceMappingURL=selection.d.ts.map

package/dist/src/api/selection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"selection.d.ts","sourceRoot":"","sources":["../../../src/api/selection.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,oBAAY,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;AAMtC,oBAAY,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,CAAA;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAC9B,CAAA;AAED,oBAAY,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC;AAEjE,oBAAY,UAAU,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;AAEpE,oBAAY,YAAY,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;AAErF;;GAEG;AACH,oBAAY,iBAAiB;IAC3B;;OAEG;IACH,YAAY,IAAI;IAChB;;OAEG;IACH,YAAY,IAAI;IAChB;;OAEG;IACH,iBAAiB,IAAI;CACtB;AAED,oBAAY,YAAY,GAAG;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAA;CAC5B,CAAA;AAED;;GAEG;AACH,oBAAY,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE9C;;GAEG;AACH,oBAAY,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;AAE/E;;;;GAIG;AACH,oBAAY,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAA;AAE3E;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,qBAEV,MAAM,IAAI,EAAE,uBAEN,MAAM,MAAM,MAAM,EAAE,CAAC,QACpC,aAAa,UACX,UAAU,GAAG,SAAS,sCAa/B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,YACvB,KAAK,GAAG,CAAC,UACP,MAAM,MAAM,EAAE,CAAC,sCAE4E,CAAC;AAEtG;;;;;;;;GAQG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI;IAQlD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAV3B;;;;;OAKG;gBAEgB,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3D,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,UAAQ;IAGnC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAM3B;;OAEG;IAEH,KAAK,CAAE,OAAO,GAAE,YAAiB,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;IAIzD;;OAEG;IACH,IAAI,IAAI,IAAK,aAAa,CAEzB;IAED;;;OAGG;IACH,IAAI,CAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC;IAI/C;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClF,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC;IAMtF;;OAEG;IACH,QAAQ,CAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAWtF;;OAEG;IACH,MAAM,CAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAO/D;;OAEG;IACH,KAAK,CAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,GAAE,UAAe,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IAQlF;;OAEG;IACH,IAAI,CAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,GAAE,UAAe,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IAQjF;;OAEG;IACH,MAAM,CAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,GAAE,UAAe,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAQnF;;OAEG;IACH,MAAM,CAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,GAAE,UAAe,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CAOpF;AAED;;;GAGG;AACH,qBAAa,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,GAAG,GAAG;IAUlD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAZ3B;;;OAGG;IACH,QAAQ,CAAC,MAAM,iCAAmC;IAElD,OAAO,CAAC,WAAW,CAAgC;gBAGhC,QAAQ,EAAE,MAAM,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,EACtC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,OAAO;IAkBpC;;OAEG;IACH,OAAO;IAMP;;OAEG;IACH,IAAI,IAAI,IAAK,aAAa,CAEzB;IAED;;OAEG;IAMH;;OAEG;IACH,IAAI,QAAQ,IAAK,CAAC,EAAE,CAOnB;IAED;;OAEG;IACH,IAAI,KAAK,IAAK,CAAC,SAAS,IAAI,GAAG,CAAC,EAAE,GAAG,CAAC,CAOrC;IAED;;OAEG;IACH,SAAS,IAAK,CAAC;CAKhB"}

package/dist/src/{database → api}/selection.js

@@ -28,18 +28,18 @@ var ItemFilterDeleted;
      */
     ItemFilterDeleted[ItemFilterDeleted["SHOW_DELETED_ONLY"] = 2] = "SHOW_DELETED_ONLY";
 })(ItemFilterDeleted = exports.ItemFilterDeleted || (exports.ItemFilterDeleted = {}));
-const dedupe = (values) => Array.from(new Set(values));
 /**
  * Factory for selector that provides a root set of items.
  * @param itemsProvider
  * @param updateEventProvider
  * @param root
+ * @param filter
  * @param value Initial reducer value.
  */
 const createSelector = (
 // Provider is called each time the query is executed.
 itemsProvider, 
-// TODO(burdon): Why is this a provider?
+// TODO(burdon): Replace with direct event handler.
 updateEventProvider, root, filter, value) => {
     const predicate = filter ? filterToPredicate(filter) : () => true;
     const visitor = (options) => {
@@ -48,7 +48,7 @@ updateEventProvider, root, filter, value) => {
             .filter(predicate);
         return [items, value];
     };
-    return new Selection(visitor, updateEventProvider(), root);
+    return new Selection(visitor, updateEventProvider(), root, value !== undefined);
 };
 exports.createSelector = createSelector;
 /**
@@ -57,7 +57,7 @@ exports.createSelector = createSelector;
  * @param update
  * @param value Initial reducer value.
  */
-const createItemSelector = (root, update, value) => new Selection(() => [[root], value], update, root);
+const createItemSelector = (root, update, value) => new Selection(() => [[root], value], update, root, value !== undefined);
 exports.createItemSelector = createItemSelector;
 /**
  * Selections are used to construct database subscriptions.
@@ -73,23 +73,26 @@ class Selection {
      * @param _visitor Executes the query.
      * @param _update The unfiltered update event.
      * @param _root The root of the selection. Must be a stable reference.
+     * @param _reducer
      */
-    constructor(_visitor, _update, _root) {
+    constructor(_visitor, _update, _root, _reducer = false) {
         this._visitor = _visitor;
         this._update = _update;
         this._root = _root;
+        this._reducer = _reducer;
     }
     /**
      * Creates a derrived selection by aplying a mapping function to the result of the current selection.
      */
     _createSubSelection(map) {
-        return new Selection(options => map(this._visitor(options), options), this._update, this._root);
+        return new Selection(options => map(this._visitor(options), options), this._update, this._root, this._reducer);
     }
     /**
      * Finish the selection and return the result.
      */
+    // TODO(burdon): Rename exec.
     query(options = {}) {
-        return new SelectionResult(() => this._visitor(options), this._update, this._root);
+        return new SelectionResult(() => this._visitor(options), this._update, this._root, this._reducer);
     }
     /**
      * The root of the selection. Either a database or an item. Must be a stable reference.
@@ -176,61 +179,84 @@ exports.Selection = Selection;
  * Represents a live-query (subscription) that can notify about future updates to the relevant subset of items.
  */
 class SelectionResult {
-    constructor(_execute, _update, _root) {
+    constructor(_execute, _update, _root, _reducer) {
         this._execute = _execute;
         this._update = _update;
         this._root = _root;
+        this._reducer = _reducer;
         /**
          * Fired when there are updates in the selection.
          * Only update that are relevant to the selection cause the update.
          */
-        this.update = new async_1.Event();
-        this._lastResult = this._execute();
-        // TODO(burdon): Query updates are based on
-        // TODO(burdon): Every update should update reducer.
+        this.update = new async_1.Event(); // TODO(burdon): Result result object.
+        this._lastResult = [[]];
+        this.refresh();
         // Re-run if deps change.
-        // TODO(burdon): Explain this.
-        // TODO(burdon): Should also fire if entities have been REMOVED from the set?
         this.update.addEffect(() => _update.on(currentEntities => {
-            const result = this._execute();
-            const [entities] = result;
-            const set = new Set([...entities, ...this._lastResult[0]]);
-            this._lastResult = result;
-            if (currentEntities.some(entity => set.has(entity))) {
-                this.update.emit(entities);
+            const [previousEntities] = this._lastResult;
+            this.refresh();
+            // Filters mutation events only if selection (since we can't reason about deps of call methods).
+            const set = new Set([...previousEntities, ...this._lastResult[0]]);
+            if (this._reducer || currentEntities.some(entity => set.has(entity))) {
+                this.update.emit(this);
             }
         }));
     }
     /**
-     * Get the result of this select.
+     * Re-run query.
      */
-    // TODO(burdon): Rename entities.
-    // TODO(burdon): Don't trigger execute in getter (provide refresh method).
-    get result() {
-        const [entities] = this._execute();
-        return dedupe(entities);
+    refresh() {
+        const [entities, result] = this._execute();
+        this._lastResult = [dedupe(entities), result];
+        return this;
     }
-    // TODO(burdon): Better name for reducer result? Just return value directly?
-    get value() {
-        const [, value] = this._execute();
-        return value;
+    /**
+     * The root of the selection. Either a database or an item. Must be a stable reference.
+     */
+    get root() {
+        return this._root;
     }
     /**
-     * If the result contains exatly one entity, returns it, errors otherwise.
+     * @deprecated
      */
-    expectOne() {
-        const res = this.result;
-        (0, assert_1.default)(res.length === 1, 'Expected one result, got ' + res.length);
-        return res[0];
+    // TODO(burdon): Remove.
+    // get result () {
+    //   return this.entities;
+    // }
+    /**
+     * Get the result of this selection.
+     */
+    get entities() {
+        if (!this._lastResult) {
+            this.refresh();
+        }
+        const [entities] = this._lastResult;
+        return entities;
     }
     /**
-     * The root of the selection. Either a database or an item. Must be a stable reference.
+     * Returns the selection or reducer result.
      */
-    get root() {
-        return this._root;
+    get value() {
+        if (!this._lastResult) {
+            this.refresh();
+        }
+        const [entities, value] = this._lastResult;
+        return (this._reducer ? value : entities);
+    }
+    /**
+     * Return the first element if the set has exactly one element.
+     */
+    expectOne() {
+        const entities = this.entities;
+        (0, assert_1.default)(entities.length === 1, `Expected one result; got ${entities.length}`);
+        return entities[0];
     }
 }
 exports.SelectionResult = SelectionResult;
+//
+// Utils
+//
+const dedupe = (values) => Array.from(new Set(values));
 const coerceToId = (item) => {
     if (typeof item === 'string') {
         return item;