👽 purescript 15

Author: codingedgar

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purescript-firebase",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "main": "index.js",
   "repository": "https://github.com/codingedgar/purescript-firebase.git",
   "author": "codingedgar <[email protected]>",
@@ -9,6 +9,8 @@
     "firebase": "9.9.2"
   },
   "devDependencies": {
-    "purs-tidy": "0.9.1"
+    "purescript": "0.15.4",
+    "purs-tidy": "0.9.1",
+    "spago": "0.20.9"
   }
 }

packages.dhall

@@ -99,6 +99,7 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.5-20220224/packages.dhall sha256:67cc3d4f0e8fb72bb1413ba94ddd72a3ceb0783eb725e3b22ad7568b3b581163
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20221114/packages.dhall
+        sha256:408417e1565850b0d5eae0d3ad9e11757202a1b44bb86c1ec2d595e4fef58141
 
 in  upstream

spago.dhall

@@ -14,19 +14,16 @@ to generate this file without the comments in this block.
 , dependencies =
   [ "aff"
   , "aff-promise"
+  , "argonaut"
   , "argonaut-core"
   , "effect"
   , "either"
   , "foreign"
-  , "foreign-generic"
   , "functions"
   , "maybe"
   , "nullable"
   , "point-free"
   , "prelude"
-  , "psci-support"
-  , "transformers"
-  , "undefined-or"
   , "unsafe-coerce"
   ]
 , packages = ./packages.dhall

src/Firebase/App.js

@@ -1,7 +1,7 @@
 // @ts-check
 const { initializeApp, getApp } = require("firebase/app");
 
-exports.initializeAppImp = function (config) {
+export function initializeAppImp(config) {
   return function () {
     return initializeApp(config);
   }
@@ -12,7 +12,7 @@ exports.initializeAppImp = function (config) {
  * @param {String} name
  * @returns {() => import("firebase/app").FirebaseApp}
  */
- exports.getAppImp = function (name) {
+export function getAppImp(name) {
   return function () {
     return getApp(name);
   }
@@ -22,6 +22,6 @@ exports.initializeAppImp = function (config) {
  * 
  * @returns {import("firebase/app").FirebaseApp}
  */
-exports.getApp2Imp = function () {
-    return getApp();
+export function getApp2Imp() {
+  return getApp();
 }

src/Firebase/Auth.js

@@ -14,33 +14,33 @@ const {
   isSignInWithEmailLink,
 } = require("firebase/auth");
 
-exports.createUserWithEmailAndPasswordImp = function (email, password, auth) {
+export function createUserWithEmailAndPasswordImp(email, password, auth) {
   return function () {
     return createUserWithEmailAndPassword(auth, email, password);
   }
 }
 
-exports.signInAnonymouslyImp = function (auth) {
+export function signInAnonymouslyImp(auth) {
   return function () {
     return signInAnonymously(auth);
   }
 }
 
-exports.signInWithEmailAndPasswordImp = function (email, password, auth) {
+export function signInWithEmailAndPasswordImp(email, password, auth) {
   return function () {
     return signInWithEmailAndPassword(auth, email, password);
   }
 }
 
-exports.onAuthStateChangedImp = function (callback, auth) {
+export function onAuthStateChangedImp(callback, auth) {
   return function () {
     return onAuthStateChanged(auth, user => {
       callback(user)();
     });
   }
 }
 
-exports.signOutImp = function (auth) {
+export function signOutImp(auth) {
   return function () {
     return signOut(auth);
   }
@@ -50,7 +50,7 @@ exports.signOutImp = function (auth) {
  * 
  * @param {import("firebase/auth").User} user 
  */
-exports.getUserIdTokenImp = function (user, force) {
+export function getUserIdTokenImp(user, force) {
   return function () {
     return user.getIdToken(force)
   }
@@ -62,7 +62,7 @@ exports.getUserIdTokenImp = function (user, force) {
  * @param {import("firebase/app").FirebaseApp} firebase 
  * @returns {() => import("firebase/auth").Auth}
  */
-exports.getAuthImp = function (firebase) {
+export function getAuthImp(firebase) {
   return function () {
     return getAuth(firebase);
   }
@@ -75,7 +75,7 @@ exports.getAuthImp = function (firebase) {
  * @param {import("firebase/auth").ActionCodeSettings | undefined | null} config
  * @returns {() => Promise<void>}
  */
-exports.sendEmailVerificationImp = function (user, config) {
+export function sendEmailVerificationImp(user, config) {
   return function () {
     return sendEmailVerification(user, config)
   }
@@ -135,7 +135,7 @@ exports.sendEmailVerificationImp = function (user, config) {
  * @param { Locale } languageCode
  * @returns {() => void}
  */
-exports.setLanguageCodeImp = function (auth, languageCode) {
+export function setLanguageCodeImp(auth, languageCode) {
   return function () {
     auth.languageCode = languageCode
   }
@@ -146,7 +146,7 @@ exports.setLanguageCodeImp = function (auth, languageCode) {
  * @param {import("firebase/auth").Auth} auth
  * @returns {() => void}
  */
-exports.getLanguageCodeImp = function (auth) {
+export function getLanguageCodeImp(auth) {
   return function () {
     auth.languageCode
   }
@@ -157,7 +157,7 @@ exports.getLanguageCodeImp = function (auth) {
  * @param {import("firebase/auth").Auth} auth
  * @returns {() => Void}
  */
-exports.useDeviceLanguageImp = function (auth) {
+export function useDeviceLanguageImp(auth) {
   return function () {
     return useDeviceLanguage(auth)
   }
@@ -169,7 +169,7 @@ exports.useDeviceLanguageImp = function (auth) {
  * @param {import("firebase/auth").Auth} auth
  * @returns {() => () => Void} Unsubscribe
  */
-exports.onIdTokenChangedImp = function (callback, auth) {
+export function onIdTokenChangedImp(callback, auth) {
   return function () {
     return onIdTokenChanged(auth, user => {
       callback(user)();
@@ -184,7 +184,7 @@ exports.onIdTokenChangedImp = function (callback, auth) {
  * @param {import("firebase/auth").Auth} auth
  * @returns {() => Promise<Void>}
  */
-exports.sendSignInLinkToEmailImp = function (actionCodeSettings, email, auth) {
+export function sendSignInLinkToEmailImp(actionCodeSettings, email, auth) {
   return function () {
     return sendSignInLinkToEmail(auth, email, actionCodeSettings)
   }
@@ -196,7 +196,7 @@ exports.sendSignInLinkToEmailImp = function (actionCodeSettings, email, auth) {
  * @param {import("firebase/auth").Auth} auth
  * @returns {() => Boolean}
  */
-exports.isSignInWithEmailLinkImp = function (emailLink, auth) {
+export function isSignInWithEmailLinkImp(emailLink, auth) {
   return function () {
     return isSignInWithEmailLink(auth, emailLink)
   }
@@ -209,7 +209,7 @@ exports.isSignInWithEmailLinkImp = function (emailLink, auth) {
  * @param {import("firebase/auth").Auth} auth
  * @returns {() => Promise<import("firebase/auth").UserCredential>}
  */
-exports.signInWithEmailLinkImp = function (emailLink, email, auth) {
+export function signInWithEmailLinkImp(emailLink, email, auth) {
   return function () {
     return signInWithEmailLink(auth, email, emailLink)
   }

src/Firebase/Auth.purs

@@ -26,19 +26,18 @@ module Firebase.Auth
 
 import Prelude
 
-import Control.Monad.Except (runExcept)
 import Control.Promise (Promise, toAffE)
-import Data.Either (Either)
+import Data.Either (Either, note)
 import Data.Function.Uncurried (Fn1, Fn2, Fn3, runFn1, runFn2, runFn3)
 import Data.Generic.Rep (class Generic)
 import Data.Maybe (Maybe)
 import Data.Nullable (Nullable, null, toMaybe)
 import Effect (Effect)
 import Effect.Aff (Aff)
 import Firebase.App (FirebaseApp)
-import Foreign (MultipleErrors, fail, readString)
-import Foreign.Generic (Foreign, decode, encode, class Decode, class Encode, ForeignError(..))
 import Unsafe.Coerce (unsafeCoerce)
+import Data.Argonaut (class DecodeJson, class EncodeJson, Json, JsonDecodeError(..), encodeJson, decodeJson)
+import Data.Maybe (Maybe(..))
 
 foreign import data Auth :: Type
 
@@ -60,22 +59,26 @@ instance showLanguageCode :: Show LanguageCode where
 
 derive instance genericLanguageCode :: Generic LanguageCode _
 
-instance encodeLanguageCode :: Encode LanguageCode where
-  encode =
-    case _ of
-      Spanish -> "es"
-      SpanishLatinAmerica -> "es_419"
-      English -> "en"
-      >>> encode
-
-instance decodeLanguageCode :: Decode LanguageCode where
-  decode s =
-    readString s
-      >>= case _ of
-        "es" -> pure Spanish
-        "es_419" -> pure SpanishLatinAmerica
-        "en" -> pure English
-        x -> fail $ ForeignError ("cannot place locale" <> x)
+instance encodeJsonLanguageCode :: EncodeJson LanguageCode where
+  encodeJson =
+    ( case _ of
+        Spanish -> "es"
+        SpanishLatinAmerica -> "es_419"
+        English -> "en"
+    )
+      >>> encodeJson
+
+instance decodeJsonLanguageCode :: DecodeJson LanguageCode where
+  decodeJson json =
+    do
+      string <- decodeJson json
+      ( case string of
+          "es" -> pure Spanish
+          "es_419" -> pure SpanishLatinAmerica
+          "en" -> pure English
+          _ -> Nothing
+      )
+        # note (TypeMismatch string)
 
 foreign import getAuthImp :: FirebaseApp -> Effect Auth
 
@@ -133,15 +136,15 @@ foreign import sendEmailVerificationImp :: Fn2 User (Nullable ActionCodeSettings
 sendEmailVerification :: User -> Aff Unit
 sendEmailVerification user = runFn2 sendEmailVerificationImp user null # toAffE
 
-foreign import setLanguageCodeImp :: Fn2 Auth Foreign (Effect Unit)
+foreign import setLanguageCodeImp :: Fn2 Auth Json (Effect Unit)
 
 setLanguageCode :: LanguageCode -> Auth -> Effect Unit
-setLanguageCode lang auth = runFn2 setLanguageCodeImp auth (encode lang)
+setLanguageCode lang auth = runFn2 setLanguageCodeImp auth (encodeJson lang)
 
-foreign import getLanguageCodeImp :: Fn1 Auth (Effect Foreign)
+foreign import getLanguageCodeImp :: Fn1 Auth (Effect Json)
 
-getLanguageCode :: Auth -> Effect (Either MultipleErrors LanguageCode)
-getLanguageCode auth = runFn1 getLanguageCodeImp auth # map (decode >>> runExcept)
+getLanguageCode :: Auth -> Effect (Either JsonDecodeError LanguageCode)
+getLanguageCode auth = runFn1 getLanguageCodeImp auth # map decodeJson
 
 foreign import useDeviceLanguageImp :: Fn1 Auth (Effect Unit)