Clean up

Author: velveteer

dist/app.js

@@ -24267,30 +24267,32 @@ exports.firebaseErrToError = function(fberr) {
 };
 
 },{"firebase/app":1,"firebase/auth":2,"firebase/database":3}],202:[function(require,module,exports){
-// Generated by psc version 0.10.3
 "use strict";
 var $foreign = require("./foreign");
 var Prelude = require("../Prelude");
 var Control_Monad_Aff = require("../Control.Monad.Aff");
 var Control_Monad_Eff = require("../Control.Monad.Eff");
 var Control_Monad_Eff_Exception = require("../Control.Monad.Eff.Exception");
-var Data_Foreign = require("../Data.Foreign");
 var Data_Generic = require("../Data.Generic");
 var Data_Maybe = require("../Data.Maybe");
-var Data_Show = require("../Data.Show");
-var Data_Eq = require("../Data.Eq");
 var Control_Apply = require("../Control.Apply");
 var Data_Unit = require("../Data.Unit");
-var Control_Semigroupoid = require("../Control.Semigroupoid");
+var Data_Show = require("../Data.Show");
+
+/**
+ *  Auth
+ */
 var User = function (x) {
     return x;
 };
+
+/**
+ *  firebase.database.DataSnapshot
+ *  Initialize
+ */
 var FirebaseConfig = function (x) {
     return x;
 };
-var showFirebaseErr = new Data_Show.Show(function (err) {
-    return $foreign.firebaseErrToString(err);
-});
 var onAuthStateChanged = function (app) {
     return function (callback) {
         return $foreign.onAuthStateChangedImpl(Data_Maybe.Just.create)(Data_Maybe.Nothing.value)(app)(callback);
@@ -24299,9 +24301,7 @@ var onAuthStateChanged = function (app) {
 var on = function (r) {
     return Control_Monad_Aff.makeAff(function (eb) {
         return function (cb) {
-            return $foreign.onImpl(r)(cb)(function ($15) {
-                return eb($foreign.firebaseErrToError($15));
-            });
+            return $foreign.onImpl(r)(cb)(eb);
         };
     });
 };
@@ -24387,11 +24387,6 @@ var genericUser = new Data_Generic.Generic(function (v) {
     } ]);
 });
 var showUser = new Data_Show.Show(Data_Generic.gShow(genericUser));
-var eqFirebaseErr = new Data_Eq.Eq(function (e1) {
-    return function (e2) {
-        return $foreign.firebaseErrToString(e1) === $foreign.firebaseErrToString(e2);
-    };
-});
 module.exports = {
     getCurrentUser: getCurrentUser, 
     mkConfig: mkConfig, 
@@ -24409,7 +24404,7 @@ module.exports = {
     signOut: $foreign.signOut
 };
 
-},{"../Control.Apply":10,"../Control.Monad.Aff":27,"../Control.Monad.Eff":38,"../Control.Monad.Eff.Exception":32,"../Control.Semigroupoid":66,"../Data.Eq":109,"../Data.Foreign":125,"../Data.Generic":137,"../Data.Maybe":154,"../Data.Show":182,"../Data.Unit":197,"../Prelude":244,"./foreign":201}],203:[function(require,module,exports){
+},{"../Control.Apply":10,"../Control.Monad.Aff":27,"../Control.Monad.Eff":38,"../Control.Monad.Eff.Exception":32,"../Data.Generic":137,"../Data.Maybe":154,"../Data.Show":182,"../Data.Unit":197,"../Prelude":244,"./foreign":201}],203:[function(require,module,exports){
 // Generated by psc version 0.10.3
 "use strict";
 var Prelude = require("../Prelude");
@@ -29574,7 +29569,6 @@ module.exports = {
 };
 
 },{"../Control.Applicative":8,"../Control.Bind":14,"../Halogen":234,"../Halogen.Component":209,"../Halogen.HTML":217,"../Halogen.HTML.Elements":214,"../Halogen.HTML.Events":215,"../Halogen.HTML.Properties":216,"../Halogen.Query.HalogenM":221,"../Prelude":244}],237:[function(require,module,exports){
-// Generated by psc version 0.10.3
 "use strict";
 var Prelude = require("../Prelude");
 var Control_Monad_Aff = require("../Control.Monad.Aff");
@@ -29597,14 +29591,21 @@ var Control_Bind = require("../Control.Bind");
 var Halogen_Query = require("../Halogen.Query");
 var Control_Applicative = require("../Control.Applicative");
 var Halogen_Aff_Util = require("../Halogen.Aff.Util");
-var Data_Unit = require("../Data.Unit");
+
+/**
+ *  Create coroutine to yield auth state changes
+ */
 var authProducer = function (app) {
     return Control_Coroutine_Aff.produce(function (emit) {
         return Firebase.onAuthStateChanged(app)(function (user) {
             return emit(new Data_Either.Left(user));
         });
     });
 };
+
+/**
+ *  Consume auth state message as Maybe User, and query our Container component
+ */
 var authConsumer = function (query) {
     return Control_Coroutine.consumer(Control_Monad_Aff.monadAff)(function (msg) {
         return Control_Bind.bind(Control_Monad_Aff.bindAff)(Debug_Trace.traceAnyA(Control_Monad_Aff.applicativeAff)(msg))(function () {
@@ -29625,7 +29626,9 @@ var main = Halogen_Aff_Util.runHalogenAff(Control_Bind.bind(Control_Monad_Aff.bi
         return Control_Bind.bind(Control_Monad_Aff.bindAff)(Control_Monad_Eff_Class.liftEff(Control_Monad_Aff.monadEffAff)(Firebase.appInit(config)))(function (v2) {
             return Control_Bind.bind(Control_Monad_Aff.bindAff)(Control_Monad_Eff_Class.liftEff(Control_Monad_Aff.monadEffAff)(function __do() {
                 var r = Control_Bind.bind(Control_Monad_Eff.bindEff)(Control_Bind.bind(Control_Monad_Eff.bindEff)(Firebase.getDatabase(v2))(Firebase.getRootRef))(Firebase.child("test"))();
-                return Control_Monad_Aff.runAff(Data_Function["const"](Control_Applicative.pure(Control_Monad_Eff.applicativeEff)(Data_Unit.unit)))(function (n) {
+                return Control_Monad_Aff.runAff(function (e) {
+                    return Debug_Trace.traceAnyA(Control_Monad_Eff.applicativeEff)(e);
+                })(function (n) {
                     return Debug_Trace.traceAnyA(Control_Monad_Eff.applicativeEff)(n);
                 })(Firebase.on(r))();
             }))(function () {
@@ -29656,7 +29659,7 @@ module.exports = {
     main: main
 };
 
-},{"../Container":4,"../Control.Applicative":8,"../Control.Bind":14,"../Control.Coroutine":18,"../Control.Coroutine.Aff":17,"../Control.Monad.Aff":27,"../Control.Monad.Aff.AVar":21,"../Control.Monad.Eff":38,"../Control.Monad.Eff.Class":30,"../Control.Monad.Eff.Exception":32,"../Data.Either":106,"../Data.Function":128,"../Data.Maybe":154,"../Data.Unit":197,"../Debug.Trace":200,"../Firebase":202,"../Halogen":234,"../Halogen.Aff":207,"../Halogen.Aff.Util":206,"../Halogen.Query":222,"../Halogen.VDom.Driver":228,"../Prelude":244}],238:[function(require,module,exports){
+},{"../Container":4,"../Control.Applicative":8,"../Control.Bind":14,"../Control.Coroutine":18,"../Control.Coroutine.Aff":17,"../Control.Monad.Aff":27,"../Control.Monad.Aff.AVar":21,"../Control.Monad.Eff":38,"../Control.Monad.Eff.Class":30,"../Control.Monad.Eff.Exception":32,"../Data.Either":106,"../Data.Function":128,"../Data.Maybe":154,"../Debug.Trace":200,"../Firebase":202,"../Halogen":234,"../Halogen.Aff":207,"../Halogen.Aff.Util":206,"../Halogen.Query":222,"../Halogen.VDom.Driver":228,"../Prelude":244}],238:[function(require,module,exports){
 "use strict";
 
 // module Math

src/Firebase.purs

@@ -16,6 +16,7 @@ module Firebase
 , FirebaseConfig
 , Provider
 , Database
+, DataSnapshot
 , Ref
 , User
 ) where
@@ -24,24 +25,16 @@ import Prelude
 import Control.Monad.Aff (Aff(), makeAff)
 import Control.Monad.Eff (Eff())
 import Control.Monad.Eff.Exception (Error())
-import Data.Foreign (Foreign())
 import Data.Generic (class Generic, gShow)
 import Data.Maybe (Maybe(..))
 
--- Kinds
-foreign import data FIREBASE :: !
-foreign import data Firebase :: *
-foreign import data FirebaseErr :: *
-
--- Error helpers
-foreign import firebaseErrToString :: FirebaseErr -> String
-foreign import firebaseErrToError :: FirebaseErr -> Error
-
-instance showFirebaseErr :: Show FirebaseErr where
-    show err = firebaseErrToString err
-
-instance eqFirebaseErr :: Eq FirebaseErr where
-    eq e1 e2 = (firebaseErrToString e1) == (firebaseErrToString e2)
+-- Foreign data
+foreign import data FIREBASE      :: ! -- Effects -- most methods
+foreign import data Firebase      :: * -- firebase.App
+foreign import data Provider      :: * -- firebase.auth.AuthProvider
+foreign import data Database      :: * -- firebase.database.Database
+foreign import data Ref           :: * -- firebase.database.Reference
+foreign import data DataSnapshot  :: *  -- firebase.database.DataSnapshot
 
 -- Initialize
 newtype FirebaseConfig =
@@ -61,7 +54,6 @@ mkConfig r = FirebaseConfig r
 foreign import appInit :: forall eff. FirebaseConfig -> Eff ( firebase :: FIREBASE | eff ) Firebase
 
 -- Auth
-type Provider = Foreign
 newtype User = User { displayName :: String
                     , email :: String
                     , photoURL :: String
@@ -96,10 +88,6 @@ foreign import signInWithPopup :: forall eff. Firebase -> Provider -> Eff ( fire
 foreign import signOut :: forall eff. Firebase -> Eff ( firebase :: FIREBASE | eff ) Unit
 
 -- Database and References
-type Database = Foreign
-type Ref = Foreign
-type DataSnapshot = Foreign
-
 foreign import getDatabase :: forall eff. Firebase -> Eff ( firebase :: FIREBASE | eff ) Database
 foreign import getRootRef :: forall eff. Database -> Eff ( firebase :: FIREBASE | eff ) Ref
 foreign import ref :: forall eff. String -> Database -> Eff ( firebase :: FIREBASE | eff ) Ref
@@ -109,11 +97,11 @@ foreign import onImpl
   :: forall eff
    . Ref
   -> (DataSnapshot -> Eff ( firebase :: FIREBASE | eff ) Unit)
-  -> (FirebaseErr -> Eff ( firebase :: FIREBASE | eff ) Unit)
+  -> (Error -> Eff ( firebase :: FIREBASE | eff ) Unit)
   -> Eff ( firebase :: FIREBASE | eff ) Unit
 
 on
   :: forall eff
    . Ref
   -> Aff (firebase :: FIREBASE | eff) DataSnapshot
-on r = makeAff (\eb cb -> onImpl r cb (eb <<< firebaseErrToError))
+on r = makeAff (\eb cb -> onImpl r cb eb)

src/Main.purs

@@ -66,7 +66,7 @@ main = HA.runHalogenAff do
   liftEff $ getDatabase app
     >>= getRootRef
       >>= child "test"
-        >>= (\r -> runAff (const (pure unit)) (\n -> traceAnyA n) $ on r)
+        >>= (\r -> runAff (\e -> traceAnyA e) (\n -> traceAnyA n) $ on r)
 
   -- Consume auth state changes and trigger effects
   io.subscribe $ CR.consumer \msg -> do