implab/implabjs-djx Commit - r154:2a5720a0816e

Merge

cin -

r154:2a5720a0816e default

parent child

Context file:

r154:2a5720a0816e

Collapse all files

.hgtags +1 0

 d91ae4b711eeb2145b9685240e1afada904 v1.9.0-rc6
              af4f8424e83d56e89a64f39e19514ca10dbd43c6 v1.9.0
 f3ad8e6cffcf32fc5a555e55e8544227293d4c v1.10.0
+             d9c99ae7dec87ef47aded05def6a094a892df0e6 v1.10.1

djx/src/main/ts/store.ts +24 -5

                  };
              };
+             /**
+              * Wraps the query method of the store, the resulting method takes a query
+              * expression and returns two observable sequences. The first sequence represents
+              * the results of the query, the second sequence provides the updates to the
+              * query results.
+              *
+              * @param store The store used to query data
+              * @param includeUpdates The flag to include item updates not only additions and
+              *  deletions. By default this flag is set to true.
+              * @returns Two observable sequences
+              */
              export const queryEx = <T, Q, O>(store: Queryable<T, Q, O>, includeUpdates = true) =>
                  (query?: Q, options?: O): [data: QueryResults<T>, updates: QueryResults<T>] => {
-                     const pending: T[] = [];
-                     let results: PromiseOrValue<T[]> = pending;
+                     /** count active observers */
+                     let listeners = 0;
+                     let results: PromiseOrValue<T[]> = [];
                      const data = observe<OrderedUpdate<T>>(({ next, complete, error }) => {
                          const processResults = (items: T[]) =>
                              items.forEach((item, newIndex) => next({ item, newIndex, prevIndex: -1 }));
                          try {
-                             if (results === pending)
+                             // is there are no active observers here, we need to query actual
+                             // data from the store.
+                             if (listeners === 0)
                                  results = store.query(query, options);
                              if (isPromise(results)) {
                      const updates = observe<OrderedUpdate<T>>(({ next, complete, error, isClosed }) => {
                          try {
                              if (!isClosed() && isDjObservableResults<T>(results)) {
+                                 // subscribe fot the changes
+                                 listeners++;
                                  const h = results.observe((item, prevIndex, newIndex) => next({ item, prevIndex, newIndex }), includeUpdates);
-                                 return () => h.remove();
+                                 return () => {
+                                     // unsubscribe from changes
+                                     listeners--;
+                                     h.remove();
+                                 };
                              } else {
                                  complete();
                              }

djx/src/test/ts/observable-tests.ts +29 -11

                      "of(...) should terminate with error when a parameter is rejected"
                  );
-                 t.same(await of(1,2,3).collect(), [1,2,3], ".collect() should return the collected sequence");
-                 await t.rejects(of(1,2,3).collect(cancelled), ".collect() should support cancellation");
+                 t.same(await of(1, 2, 3).collect(), [1, 2, 3], ".collect() should return the collected sequence");
+                 await t.rejects(of(1, 2, 3).collect(cancelled), ".collect() should support cancellation");
              }).catch(() => { });
              tap.test(".tap() tests", async t => {
                  const side: number[] = [];
-                 of(1,2)
-                     .tap({next: v => side.push(v), complete: () => side.push(0)})
-                     .tap({next: v => side.push(v*v)})
+                 of(1, 2)
+                     .tap({ next: v => side.push(v), complete: () => side.push(0) })
+                     .tap({ next: v => side.push(v * v) })
                      .subscribe({});
-                 t.same(side, [1,1,2,4,0], ".tap() should be called in the order of registration");
+                 t.same(side, [1, 1, 2, 4, 0], ".tap() should be called in the order of registration");
                  side.length = 0;
                  await new Promise<void>(resolve => {
-                     of(1,2,delay(1).then(() => 3))
-                         .tap({next: v => side.push(v)})
-                         .tap({ next: v => v === 1 && resolve()})
+                     of(1, 2, delay(1).then(() => 3))
+                         .tap({ next: v => side.push(v) })
+                         .tap({ next: v => v === 1 && resolve() })
                          .subscribe({});
                  });
-                 t.same(side, [1,2], ".tap() should be processed synchronously");
+                 t.same(side, [1, 2], ".tap() should be processed synchronously");
+             }).catch(() => { });
+             tap.test(".while() tests", async t => {
+                 const seq = of(1, 2, 3, 4).while(v => v <= 2);
+                 t.same(await seq.collect(), [1, 2], "Should collect only taken elements");
-             }).catch(() => {});
  No newline at end of file
+                 const data: number[] = [];
+                 let complete = 0;
+                 seq.subscribe({
+                     next: v => data.push(v),
+                     complete: () => complete++
+                 });
+                 t.same(data, [1, 2], "Should receive only taken elements");
+                 t.equal(complete, 1, "Complete should run once");
+             }).catch(() => { });
  No newline at end of file

playground/build.gradle +2 -2

                  }
              }
-             npmInstall {
-                 //npmInstall.dependsOn it
+             task npmInstallLocalDeps {
+                 npmInstall.dependsOn it
                  dependsOn configurations.npmLocal
                  doFirst {

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages