Refactor to testable structure

Author: benwinding

Diff for: .vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

Diff for: package.json

@@ -12,24 +12,26 @@
   },
   "devDependencies": {
     "@firebase/app-types": "^0.3.9",
-    "@firebase/firestore-types": "^1.2.0",    
-    "@firebase/auth-types": "^0.6.0",    
+    "@firebase/auth-types": "^0.6.0",
+    "@firebase/firestore-types": "^1.2.0",
     "@firebase/util": "^0.2.11",
     "@types/firebase": "^3.2.1",
     "@types/node": "^10.9.4",
-    "@types/rx": "^4.1.1",
     "@types/react": "^16.8.13",
+    "@types/rx": "^4.1.1",
+    "firebase-mock": "^2.2.10",
+    "jest": "^24.8.0",
     "microbundle": "^0.11.0",
-    "typescript": "^3.0.3",
-    "tslint": "^5.16.0"
+    "tslint": "^5.16.0",
+    "typescript": "^3.0.3"
   },
   "homepage": "https://github.com/benwinding/react-admin-firebase",
   "email": "hello@benwinding.com",
   "license": "MIT",
   "scripts": {
     "build": "microbundle",
     "watch": "microbundle watch",
-    "cp-dist": "watch cp -r ./dist/ ./src-demo/node_modules/react-admin-firebase/dist/",
+    "cp-dist": "watch cp -r ./dist/ ./src-demo/node_modules/react-admin-firebase/",
     "start": "cd src-demo && yarn && yarn start"
   },
   "main": "dist/index.js",

Diff for: src-demo/src/App.js

@@ -6,11 +6,15 @@ import {
   FirebaseAuthProvider
 } from "react-admin-firebase";
 
-import { firebaseConfig as config } from './FIREBASE_CONFIG';
-config.debug = true;
+import { firebaseConfig } from './FIREBASE_CONFIG';
+firebaseConfig["debug"] = true;
+const options = {
+  logging: true,
+  rootRef: 'rootrefcollection/QQG2McwjR2Bohi9OwQzP'
+}
 
-const authProvider = FirebaseAuthProvider(config);
-const dataProvider = FirebaseDataProvider(config);
+const authProvider = FirebaseAuthProvider(firebaseConfig);
+const dataProvider = FirebaseDataProvider(firebaseConfig, options);
 
 class App extends React.Component {
   render() {

Diff for: src/index.ts

@@ -1,9 +1,11 @@
-import firebaseRealTimeSaga from "./firebaseRealtimeSaga";
-import firebaseDataProvider from "./firebaseDataProvider";
-import firebaseAuthProvider from "./firebaseAuthProvider";
+import { RealtimeSaga } from "./providers/RealtimeSaga";
+import { DataProvider } from "./providers/DataProvider";
+import { AuthProvider } from "./providers/AuthProvider";
+import { RAFirebaseOptions } from "./providers/RAFirebaseOptions";
 
 export {
-  firebaseRealTimeSaga as FirebaseRealTimeSaga,
-  firebaseDataProvider as FirebaseDataProvider,
-  firebaseAuthProvider as FirebaseAuthProvider,
-}
+  RealtimeSaga as FirebaseRealTimeSaga,
+  DataProvider as FirebaseDataProvider,
+  AuthProvider as FirebaseAuthProvider,
+  RAFirebaseOptions as RAFirebaseOptions
+};

Diff for: src/arrayHelpers.ts renamed to src/misc/arrayHelpers.ts

@@ -6,7 +6,7 @@ import { FirebaseApp } from "@firebase/app-types";
 import { FirebaseAuth } from "@firebase/auth-types";
 
 import { AUTH_LOGIN, AUTH_LOGOUT, AUTH_ERROR, AUTH_CHECK } from "react-admin";
-import { log, EnableLogging } from "logger";
+import { log, EnableLogging } from "../misc/logger";
 
 class AuthClient {
   private app: FirebaseApp;
@@ -41,7 +41,7 @@ class AuthClient {
     await this.auth.signOut();
   }
 
-  public async HandleAuthError(params) {}
+  public async HandleAuthError(params) { }
 
   public async HandleAuthCheck(params) {
     try {
@@ -76,7 +76,7 @@ class AuthClient {
   }
 }
 
-function SetUpAuth(config: {}) {
+export function AuthProvider(config: {}) {
   if (!config) {
     throw new Error(
       "Please pass the Firebase config.json object to the FirebaseAuthProvider"
@@ -107,5 +107,3 @@ function SetUpAuth(config: {}) {
     }
   };
 }
-
-export default SetUpAuth;

Diff for: src/logger.ts renamed to src/misc/logger.ts

@@ -0,0 +1,58 @@
+import {
+  CREATE,
+  DELETE,
+  DELETE_MANY,
+  GET_LIST,
+  GET_MANY,
+  GET_MANY_REFERENCE,
+  GET_ONE,
+  UPDATE,
+  UPDATE_MANY
+} from "react-admin";
+import { log, EnableLogging } from "../misc/logger";
+import { RAFirebaseOptions } from "./RAFirebaseOptions";
+import { IFirebase } from "./database/firebase/Firebase.interface";
+import { FirebaseFactory } from "./database/firebase/FirebaseFactory";
+import { FirebaseClient } from "./database/FirebaseClient";
+
+export let fb: FirebaseClient;
+
+export function DataProvider(config: {}, options?: RAFirebaseOptions) {
+  if (!config) {
+    throw new Error("Please pass the Firebase config.json object to the FirebaseDataProvider");
+  }
+  console.log("react-admin-firebase:: Creating FirebaseDataProvider", { config, options });
+  const optionsSafe = options || {};
+  if (config["debug"] || optionsSafe.logging) {
+    EnableLogging();
+  }
+  const fireClient: IFirebase = FirebaseFactory.Create();
+  fireClient.init(config);
+  fb = new FirebaseClient(fireClient, optionsSafe);
+  async function providerApi(type: string, resourceName: string, params: any): Promise<any> {
+    log("FirebaseDataProvider: event", { type, resourceName, params });
+    switch (type) {
+      case GET_MANY:
+        return fb.apiGetMany(resourceName, params);
+      case GET_MANY_REFERENCE:
+        return fb.apiGetManyReference(resourceName, params);
+      case GET_LIST:
+        return fb.apiGetList(resourceName, params);
+      case GET_ONE:
+        return fb.apiGetOne(resourceName, params);
+      case CREATE:
+        return fb.apiCreate(resourceName, params);
+      case UPDATE:
+        return fb.apiUpdate(resourceName, params);
+      case UPDATE_MANY:
+        return fb.apiUpdateMany(resourceName, params);
+      case DELETE:
+        return fb.apiDelete(resourceName, params);
+      case DELETE_MANY:
+        return fb.apiDeleteMany(resourceName, params);
+      default:
+        return {};
+    }
+  }
+  return providerApi;
+}

Diff for: src/messageTypes.ts renamed to src/misc/messageTypes.ts

@@ -0,0 +1,4 @@
+export interface RAFirebaseOptions {
+  rootRef?: string;
+  logging?: boolean;
+}

Diff for: src/firebaseAuthProvider.ts renamed to src/providers/AuthProvider.ts

@@ -1,7 +1,5 @@
 import realtimeSaga from "ra-realtime";
-import {
-  fb
-} from "./firebaseDataProvider";
+import { fb } from "./DataProvider";
 
 const observeRequest = (dataProvider, options) => (type, resource, params) => {
   // If the paths are explicitly set in options
@@ -37,6 +35,6 @@ const observeRequest = (dataProvider, options) => (type, resource, params) => {
   };
 };
 
-export default (dataProvider, options) => {
+export function RealtimeSaga(dataProvider, options) {
   return realtimeSaga(observeRequest(dataProvider, options));
-};
+}