Replace Mongo.Entry

Author: lukasturcani

src/Requests/Collection/Collection/Collection.purs

@@ -5,9 +5,9 @@ module Requests.Collection
     , fromEntries
     ) where
 
-import Mongo as Mongo
 import Data.Maybe (Maybe)
 import Requests.MoleculeKey (MoleculeKeyName, MoleculeKeyValue)
+import Foreign (Foreign)
 
 import Requests.Collection.Internal.Data
     ( Collection
@@ -34,6 +34,6 @@ get = Data.get
 fromEntries
     :: MoleculeKeyName
     -> Exports.CollectionName
-    -> Array Mongo.Entry
+    -> Array Foreign
     -> Exports.Collection
 fromEntries = Data.fromEntries

src/Requests/Collection/Collection/Data.js

@@ -1,4 +1,4 @@
-exports.toEntry
+exports._toEntry
     = helpers => moleculeKey => entry =>
 {
     const key = entry[moleculeKey];

src/Requests/Collection/Collection/Data.purs

@@ -8,11 +8,11 @@ module Requests.Collection.Internal.Data
     ) where
 
 import Prelude
-import Mongo as Mongo
 import Data.Array (concat)
 import Data.Map (Map, fromFoldable, lookup)
 import Data.Maybe (Maybe)
 import Data.Tuple (Tuple (Tuple))
+import Foreign (Foreign)
 import Requests.MoleculeKey (MoleculeKeyValue, MoleculeKeyName)
 
 
@@ -34,18 +34,18 @@ type Helpers =
     { tuple :: Unit -> Unit -> Tuple Unit Unit
     }
 
-foreign import toEntry
+foreign import _toEntry
     :: Helpers
     -> MoleculeKeyName
-    -> Mongo.Entry
+    -> Foreign
     -- Returns an empty array if conversion fails and an array of
     -- one tuple if it is successful.
     -> Array (Tuple MoleculeKeyValue CollectionValue)
 
 fromEntries
     :: MoleculeKeyName
     -> CollectionName
-    -> Array Mongo.Entry
+    -> Array Foreign
     -> Collection
 
 fromEntries key name' entries = Collection
@@ -54,4 +54,4 @@ fromEntries key name' entries = Collection
     }
   where
     helpers = { tuple: Tuple }
-    valueEntries = concat $ map (toEntry helpers key) entries
+    valueEntries = concat $ map (_toEntry helpers key) entries

src/Requests/Molecule/Molecule/Data.purs

@@ -15,7 +15,7 @@ import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe)
 import ValidatedMolecule as Validated
-import Mongo as Mongo
+import Foreign (Foreign)
 import Requests.MoleculeKey (MoleculeKeyValue, MoleculeKeyName)
 import Requests.MoleculeEntry (MoleculeEntry)
 import Requests.MoleculeEntry as MoleculeEntry
@@ -69,7 +69,7 @@ fromMoleculeEntry moleculeEntry = do
         )
 
 
-fromEntry :: MoleculeKeyName -> Mongo.Entry -> Maybe Molecule
+fromEntry :: MoleculeKeyName -> Foreign -> Maybe Molecule
 fromEntry moleculeKey entry = do
     moleculeEntry <- MoleculeEntry.fromEntry moleculeKey entry
     fromMoleculeEntry moleculeEntry

src/Requests/Molecule/Molecule/Molecule.purs

@@ -10,7 +10,7 @@ module Requests.Molecule
 
 import Data.Maybe (Maybe)
 import ValidatedMolecule as Validated
-import Mongo as Mongo
+import Foreign (Foreign)
 
 import Requests.Molecule.Internal.Data
     ( Molecule
@@ -42,7 +42,7 @@ constructed = Data.constructed
 toValidated :: Exports.Molecule -> Validated.Molecule
 toValidated = Data.toValidated
 
-fromEntry :: MoleculeKeyName -> Mongo.Entry -> Maybe Exports.Molecule
+fromEntry :: MoleculeKeyName -> Foreign -> Maybe Exports.Molecule
 fromEntry = Data.fromEntry
 
 fromMoleculeEntry

src/Requests/MoleculeEntry/MoleculeEntry.purs

@@ -18,7 +18,7 @@ import Data.Tuple (Tuple (..))
 import Data.Maybe (Maybe (..))
 import Data.Maybe.Utils as Maybe
 import Data.Foldable (foldM)
-import Mongo as Mongo
+import Foreign (Foreign)
 import Requests.MoleculeKey (MoleculeKeyName, MoleculeKeyValue)
 
 newtype AtomEntry     = AtomEntry (Array Int)
@@ -63,14 +63,14 @@ foreign import _fromEntry
     :: forall r
     .  Helpers
     -> MoleculeKeyName
-    -> Mongo.Entry
+    -> Foreign
     -> Maybe (MoleculeEntry r)
 
 
 fromEntry
     :: forall r
     .  MoleculeKeyName
-    -> Mongo.Entry
+    -> Foreign
     -> Maybe (MoleculeEntry r)
 
 fromEntry key entry =

src/Requests/PositionMatrix/PositionMatrix/PositionMatrix.purs

@@ -6,7 +6,7 @@ module Requests.PositionMatrix
     ) where
 
 import Data.Maybe (Maybe)
-import Mongo as Mongo
+import Foreign (Foreign)
 import Requests.PositionMatrix.Internal.Data as Data
 import Requests.PositionMatrix.Internal.FromEntry as FromEntry
 import Requests.MoleculeKey (MoleculeKeyName, MoleculeKeyValue)
@@ -24,7 +24,7 @@ matrix = Data.matrix
 
 fromEntry
     :: MoleculeKeyName
-    -> Mongo.Entry
+    -> Foreign
     -> Maybe Exports.PositionMatrix
 
 fromEntry = FromEntry.fromEntry

src/Requests/PositionMatrix/PositionMatrix/fromEntry.purs

@@ -5,14 +5,14 @@ module Requests.PositionMatrix.Internal.FromEntry
 import Prelude
 import Requests.MoleculeKey (MoleculeKeyName)
 import Data.Maybe (Maybe)
+import Foreign (Foreign)
 import Requests.PositionMatrix.Internal.Data (PositionMatrix (..))
-import Mongo as Mongo
 
 import Requests.PositionMatrix.Internal.ToPositionMatrixEntry
     ( toPositionMatrixEntry
     )
 
-fromEntry :: MoleculeKeyName -> Mongo.Entry -> Maybe PositionMatrix
+fromEntry :: MoleculeKeyName -> Foreign -> Maybe PositionMatrix
 fromEntry moleculeKey entry = do
     matrixEntry <- toPositionMatrixEntry moleculeKey entry
     pure $ PositionMatrix

src/Requests/PositionMatrix/PositionMatrix/toPositionMatrixEntry.purs

@@ -3,7 +3,7 @@ module Requests.PositionMatrix.Internal.ToPositionMatrixEntry
     ) where
 
 import Prelude
-import Mongo as Mongo
+import Foreign (Foreign)
 import Data.Maybe (Maybe (Nothing, Just))
 import Requests.MoleculeKey (MoleculeKeyName)
 import ValidatedMolecule.Position (Position, position)
@@ -21,11 +21,13 @@ type Helpers =
 foreign import toPositionMatrixEntryImpl
     :: Helpers
     -> MoleculeKeyName
-    -> Mongo.Entry
+    -> Foreign
     -> Maybe PositionMatrixEntry
 
 toPositionMatrixEntry
-    :: MoleculeKeyName -> Mongo.Entry -> Maybe PositionMatrixEntry
+    :: MoleculeKeyName
+    -> Foreign
+    -> Maybe PositionMatrixEntry
 
 toPositionMatrixEntry = toPositionMatrixEntryImpl
     { nothing: Nothing

src/Requests/SortedCollection/SortedCollection/SortedCollection.purs

@@ -6,14 +6,14 @@ module Requests.SortedCollection
     , keys
     ) where
 
-import Prelude
+import Prelude (bind, map, pure, ($))
 import Data.Tuple (Tuple (Tuple))
 import Data.Array as Array
 import Data.Maybe.Utils as Maybe
 import Data.Map as Map
 import Requests.MoleculeKey (MoleculeKeyValue, MoleculeKeyName)
 import Requests.Molecule as Molecule
-import Mongo as Mongo
+import Foreign (Foreign)
 
 type CollectionName = String
 
@@ -29,7 +29,7 @@ keys (SortedCollection { _order }) = _order
 fromEntries
     :: CollectionName
     -> MoleculeKeyName
-    -> Array Mongo.Entry
+    -> Array Foreign
     -> SortedCollection
 
 fromEntries name key entries = SortedCollection
@@ -43,7 +43,7 @@ fromEntries name key entries = SortedCollection
 foreign import _toTuple
     :: (String -> String -> Tuple String String)
     -> MoleculeKeyName
-    -> Mongo.Entry
+    -> Foreign
     -> Array (Tuple String String)
 
 addMolecules
@@ -63,4 +63,3 @@ addMolecules
             (Molecule.key molecule)
             (Map.insert _name value (Molecule.properties molecule))
             (Molecule.toValidated molecule)
-

src/Requests/building-blocks/Request.purs

@@ -6,14 +6,15 @@ module Requests.BuildingBlocks.Internal.Request
 import Prelude
 import Effect.Promise (class Deferred, Promise, all, reject)
 import Data.Array as Array
-import Mongo as Mongo
 import Data.Maybe (Maybe (Nothing, Just))
 import Data.Maybe.Utils as Maybe
 import SelectingCollection (SelectingCollection, selectingCollection)
 import Requests.MoleculeKey (MoleculeKeyName, MoleculeKeyValue)
 import Requests.Collection as Collection
 import Requests.Utils as Utils
 import Data.Map (keys)
+import Mongo as Mongo
+import Foreign (Foreign)
 import Effect.Exception (error)
 
 import Requests.Molecule
@@ -64,7 +65,7 @@ foreign import _buildingBlockQuery
 
 foreign import _buildingBlockKeys
     :: MoleculeKeyName
-    -> Mongo.Entry
+    -> Foreign
     -> Array String
 
 
@@ -93,7 +94,7 @@ request options = do
                 )
             )
     let
-        maybeMolecule :: Mongo.Entry -> Maybe Molecule.Molecule
+        maybeMolecule :: Foreign -> Maybe Molecule.Molecule
         maybeMolecule = Molecule.fromEntry options.moleculeKey
 
         baseMolecules =