fix(operators): cleanup & optimization

packages/observables/package.json

@@ -10,7 +10,7 @@
     }
   ],
   "type": "module",
-  "main": "index.js",
+  "main": "src/index.js",
   "files": [
     "./src/*"
   ],

packages/observables/src/index.js

@@ -0,0 +1 @@
+export { connectionObservable } from './dom/window';

packages/operators/package.json

@@ -10,7 +10,7 @@
     }
   ],
   "type": "module",
-  "main": "index.js",
+  "main": "src/index.js",
   "files": [
     "./src/*"
   ],

packages/operators/src/request/cache.test.js → packages/operators/src/cache.test.js

@@ -3,6 +3,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { beforeEach, describe, expect, test } from 'vitest';
 
 import { cache } from './cache';
+import { log } from './log';
 
 describe('cache', () => {
   let testScheduler;
@@ -22,7 +23,9 @@ describe('cache', () => {
     testScheduler.run(({ cold, expectObservable }) => {
       const stream = cold('a', { a: () => triggerVal.shift() }).pipe(
         map(fn => fn()),
-        cache({ ttl: 2 })
+        log('operators:cache:default:input'),
+        cache({ ttl: 2 }),
+        log('operators:cache:default:output')
       );
 
       const unsubA = '-^!';

packages/operators/src/index.js

@@ -11,4 +11,4 @@ export {
   resolveBlob,
   distinctUntilResponseChanged
 } from './request/response';
-export { retryWhenError } from './request/retry';
+export { retryWhenRequestError } from './retry';

packages/operators/src/log.js

@@ -1,38 +1,35 @@
 import { bgGreen } from 'ansi-colors';
 import debug from 'debug';
-import { connectable, finalize, Observable, Subject } from 'rxjs';
+import { connectable, finalize, Subject, tap } from 'rxjs';
+
+import { pipeWhen } from './when';
 
 export const enableLog = tag => {
   debug.enable(tag);
 };
 
 export const log = tag => {
   var logger = debug(tag);
-  logger.log = console.log.bind(console);
+  logger.log = global.console.log.bind(console);
   var error = debug(`${tag}:error`);
 
-  if (debug.enabled(tag)) {
-    return source => {
-      return new Observable(observer => {
-        return source.subscribe({
-          next: val => {
-            logger(val);
-            observer.next(val);
-          },
-          error: err => {
-            error(err);
-            observer.error(err);
-          },
-          complete: () => {
-            logger(bgGreen.bold('Complete!'));
-            observer.complete();
-          }
-        });
-      });
-    };
-  } else {
-    return source => source;
-  }
+  return source =>
+    source.pipe(
+      pipeWhen(
+        () => debug.enabled(tag),
+        source =>
+          source.pipe(
+            tap({
+              subscribe: () => logger('subscribed'),
+              unsubscribe: () => logger('unsubscribed'),
+              finalize: () => logger('finalize'),
+              next: val => logger(val),
+              error: err => error(err),
+              complete: () => logger(bgGreen.bold('complete!'))
+            })
+          )
+      )
+    );
 };
 
 export const logResult = (tag, observable) => {
@@ -46,3 +43,33 @@ export const logResult = (tag, observable) => {
     ).connect();
   });
 };
+
+// export const log = tag => {
+//   var logger = debug(tag);
+//   logger.log = global.console.log.bind(console);
+//   var error = debug(`${tag}:error`);
+
+//   if (debug.enabled(tag)) {
+//     return source =>
+//       new Observable(observer => {
+//         source.subscribe({
+//           subscribe: () => logger('subscribed'),
+//           unsubscribe: () => logger('unsubscribed'),
+//           finalize: () => logger('finalize'),
+//           next: val => {
+//             logger(val);
+//             observer.next(val);
+//           },
+//           error: err => {
+//             error(err);
+//             observer.error(err);
+//           },
+//           complete: () => {
+//             logger(bgGreen.bold('complete!'));
+//             observer.complete();
+//           }
+//         });
+//       });
+//   }
+//   return source => source;
+// };

packages/operators/src/log.test.js

@@ -0,0 +1,11 @@
+import { describe, test } from 'vitest';
+
+describe('log', () => {
+  test('default', () => {
+    //TODO: add test
+  });
+
+  test('logResult', () => {
+    //TODO: add test
+  });
+});

packages/operators/src/request/request.js → packages/operators/src/request.js

@@ -2,7 +2,7 @@ import { concatMap, from, throwError } from 'rxjs';
 
 import { cache } from './cache';
 import { resolveBlob, resolveJSON, resolveText } from './response';
-import { retryWhenError } from './retry';
+import { retryWhenRequestError } from './retry';
 
 export const request = ({ retry, cache: cacheOptions } = {}) => {
   return source =>
@@ -14,7 +14,7 @@ export const request = ({ retry, cache: cacheOptions } = {}) => {
           return throwError(() => new Error('Failed to fetch: resource not valid'));
         }
       }),
-      retryWhenError(retry),
+      retryWhenRequestError(retry),
       cache(cacheOptions)
     );
 };