feat: ignore unneccssary output

Author: Saviio

src/storage/modules/QueryToken.ts

@@ -1,14 +1,13 @@
 import { Observable, OperatorFunction, from } from 'rxjs'
-import { combineAll, map, publishReplay, refCount, skipWhile, switchMap, take, tap } from 'rxjs/operators'
+import { combineAll, filter, map, publishReplay, refCount, skipWhile, switchMap, take, tap } from 'rxjs/operators'
 import { Selector } from './Selector'
 import { ProxySelector } from './ProxySelector'
 import { assert } from '../../utils/assert'
 import { TokenConsumed } from '../../exception/token'
-import { diff, Ops } from '../../utils/diff'
+import { diff, Ops, OpsType } from '../../utils/diff'
 
-export interface TraceResult<T> {
+export type TraceResult<T> = Ops & {
   result: T[]
-  ops: Ops
 }
 
 export type SelectorMeta<T> = Selector<T> | ProxySelector<T>
@@ -61,8 +60,9 @@ export class QueryToken<T> {
     return this.changes().pipe(
       map((result: T[]) => {
         const ops = diff(this.lastEmit, result, pk)
-        return { result, ops }
+        return { result, ...ops }
       }),
+      filter((xs) => xs.type !== OpsType.ShouldSkip),
       tap(({ result }) => (this.lastEmit = result)),
     )
   }

src/utils/diff.ts

@@ -16,7 +16,7 @@ export enum OpsType {
   // 2 = success but should skip
   Error,
   Success,
-  SuccessAndSkip,
+  ShouldSkip,
 }
 
 export type Ops = {
@@ -46,7 +46,7 @@ export const getPatchResult = <T>(oldList: T[], newList: T[], ops: Ops): T[] =>
   switch (ops.type) {
     case OpsType.Error:
       return newList
-    case OpsType.SuccessAndSkip:
+    case OpsType.ShouldSkip:
       return oldList
     case OpsType.Success:
     default:
@@ -176,7 +176,7 @@ export function diff<T>(oldList: T[], newList: T[], pk = '_id'): Ops {
 
   const arrayIsSame = reused === curr.length && prev.length === curr.length && reused !== 0
   return {
-    type: arrayIsSame ? OpsType.SuccessAndSkip : OpsType.Success,
+    type: arrayIsSame ? OpsType.ShouldSkip : OpsType.Success,
     ops: ret,
   }
 }

test/specs/storage/modules/QueryToken.spec.ts

@@ -95,10 +95,10 @@ export default describe('QueryToken Testcase', () => {
           .traces('_id')
           .pipe(skip(1))
           .subscribe((r) => {
-            const { result, ops } = r
+            const { result, type, ops } = r
             expect(result[0].note).to.equal(newNote)
-            expect(ops.type).to.equal(1)
-            ops.ops.forEach((op: Op, index: number) => {
+            expect(type).to.equal(1)
+            ops.forEach((op: Op, index: number) => {
               if (index === 0) {
                 expect(op.type).to.equal(1)
               } else {
@@ -123,10 +123,10 @@ export default describe('QueryToken Testcase', () => {
           .traces('_id')
           .pipe(skip(1))
           .subscribe((r) => {
-            const { result, ops } = r
+            const { result, type, ops } = r
             expect(result[0].note).to.equal(newNote)
-            expect(ops.type).to.equal(1)
-            ops.ops.forEach((op: Op, index: number) => {
+            expect(type).to.equal(1)
+            ops.forEach((op: Op, index: number) => {
               if (index === 0) {
                 expect(op.type).to.equal(1)
               } else {
@@ -241,8 +241,8 @@ export default describe('QueryToken Testcase', () => {
 
         const combined = queryToken.combine(queryToken2)
         combined.traces().subscribe((r) => {
-          expect(r.ops.type).to.equal(1)
-          r.ops.ops.forEach((op: Op, index: number) => {
+          expect(r.type).to.equal(1)
+          r.ops.forEach((op: Op, index: number) => {
             if (index < 25) {
               expect(op.type).to.equal(0)
             } else {
@@ -270,8 +270,8 @@ export default describe('QueryToken Testcase', () => {
 
         const combined = queryToken.combine(queryToken2)
         combined.traces().subscribe((r) => {
-          expect(r.ops.type).to.equal(1)
-          r.ops.ops.forEach((op: Op, index: number) => {
+          expect(r.type).to.equal(1)
+          r.ops.forEach((op: Op, index: number) => {
             if (index < 25) {
               expect(op.type).to.equal(0)
             } else {
@@ -374,8 +374,8 @@ export default describe('QueryToken Testcase', () => {
         queryToken.traces().subscribe()
         const concated = queryToken.concat(queryToken2)
         concated.traces().subscribe((r) => {
-          expect(r.ops.type).to.equal(1)
-          r.ops.ops.forEach((op: Op, index: number) => {
+          expect(r.type).to.equal(1)
+          r.ops.forEach((op: Op, index: number) => {
             if (index < 25) {
               expect(op.type).to.equal(0)
             } else {

tools/publish.ts

@@ -46,14 +46,14 @@ Promise.all([
   write('dist/cjs/README.md', README),
 ])
   .then(() => {
-    const { stderr, stdout } = shelljs.exec('npm publish dist/cjs')
+    const { stderr, stdout } = shelljs.exec('npm publish dist/cjs --tag=next')
     if (stderr) {
       throw stderr
     }
     console.info(stdout)
   })
   .then(() => {
-    const { stderr, stdout } = shelljs.exec('npm publish dist/es')
+    const { stderr, stdout } = shelljs.exec('npm publish dist/es --tag=next')
     if (stderr) {
       throw stderr
     }