Use purescript-isometric, PS 0.9

.gitignore

@@ -4,3 +4,4 @@ node_modules
 bower_components
 .psci
 .psci_modules
+.pulp-cache

README.md

@@ -1,7 +1,7 @@
 ![cube composer](https://raw.githubusercontent.com/sharkdp/cube-composer/master/img/cube-composer.png)
 
-A puzzle game inspired by functional programming.
-It is written in [PureScript](https://github.com/purescript/purescript) and uses [Isomer.js](https://github.com/jdan/isomer) for the canvas rendering.
+A puzzle game inspired by functional programming,
+written in [PureScript](https://github.com/purescript/purescript).
 
 [**Play it online!**](http://david-peter.de/cube-composer)
 

bower.json

@@ -12,17 +12,17 @@
     "bower_components"
   ],
   "dependencies": {
-    "purescript-arrays": "^0.4.0",
-    "purescript-console": "^0.1.0",
-    "purescript-dom": "^0.2.7",
-    "purescript-enums": "^0.7.0",
-    "purescript-foldable-traversable": "^0.4.0",
-    "purescript-integers": "^0.2.0",
-    "purescript-maps": "^0.5.0",
-    "purescript-math": "^0.2.0",
-    "purescript-nullable": "^0.2.1",
-    "purescript-strings": "^0.7.0",
-    "Sortable": "RubaXa/Sortable#~1.3.0",
-    "isomer": "https://github.com/jdan/isomer.git#fbd7b9e86e542f482f94718d8fbf7f597c14a14d"
+    "purescript-arrays": "^1.1.0",
+    "purescript-console": "^1.0.0",
+    "purescript-dom": "^2.0.0",
+    "purescript-enums": "^1.0.0",
+    "purescript-foldable-traversable": "^1.0.0",
+    "purescript-integers": "^1.1.0",
+    "purescript-maps": "^1.1.0",
+    "purescript-math": "^2.0.0",
+    "purescript-nullable": "^1.0.0",
+    "purescript-strings": "^1.1.0",
+    "purescript-isometric": "^1.0.0",
+    "Sortable": "RubaXa/Sortable#~1.4.0"
   }
 }

docs/Helper.md

@@ -23,8 +23,6 @@ Operator to create tuples, especially for creating maps with
 infixl 6 tuple as :>
 ```
 
-_left-associative / precedence 6_
-
 #### `AStack`
 
 ``` purescript
@@ -69,6 +67,4 @@ Helper function to create levels from arrays of cubes (instead of lists)
 infixl 6 level as :->
 ```
 
-_left-associative / precedence 6_
-
 

docs/Sortable.md

@@ -3,7 +3,7 @@
 #### `installSortable`
 
 ``` purescript
-installSortable :: forall eff. Element -> Eff (dom :: DOM | eff) Unit -> Eff (dom :: DOM | eff) Unit
+installSortable :: forall eff. Element -> (Eff (dom :: DOM | eff) Unit) -> Eff (dom :: DOM | eff) Unit
 ```
 
 Install 'Sortable' on the given DOM element. The second argument is

docs/Storage.md

@@ -27,7 +27,7 @@ fromSaveable :: SaveableGameState -> GameState
 #### `unsafeLoadGameState`
 
 ``` purescript
-unsafeLoadGameState :: forall a eff. (a -> Maybe a) -> Maybe a -> Eff (storage :: STORAGE | eff) (Maybe SaveableGameState)
+unsafeLoadGameState :: forall a eff. (a -> Maybe a) -> (Maybe a) -> Eff (storage :: STORAGE | eff) (Maybe SaveableGameState)
 ```
 
 Retrieve the current game state from local storage (FFI, needs 'Just' and 'Nothing' as input)

docs/Types.md

@@ -18,6 +18,7 @@ Eq Cube
 Ord Cube
 Bounded Cube
 Enum Cube
+BoundedEnum Cube
 ```
 
 #### `Stack`

gulpfile.js

@@ -91,7 +91,6 @@ gulp.task("less", function() {
 gulp.task("concat", ["bundle"], function() {
     return gulp.src([
             "bower_components/Sortable/Sortable.min.js",
-            "bower_components/isomer/dist/isomer.min.js",
             "dist/main.js"
         ])
         .pipe(concat("main.js"))
@@ -110,7 +109,6 @@ gulp.task("docs", ["clean-docs"], function () {
             docgen: {
                 "DOMHelper": "docs/DOMHelper.md",
                 "Helper": "docs/Helper.md",
-                "Isomer": "docs/Isomer.md",
                 "Levels": "docs/Levels.md",
                 "Sortable": "docs/Sortable.md",
                 "Storage": "docs/Storage.md",

package.json

@@ -12,7 +12,7 @@
     "gulp": "^3.9.0",
     "gulp-concat": "^2.5.2",
     "gulp-less": "^3.0.3",
-    "gulp-purescript": "^0.8.0",
+    "gulp-purescript": "^1.0.0",
     "gulp-uglify": "^1.2.0",
     "rimraf": "^2.4.0"
   }

src/Foreign/Analytics.js → src/Analytics.js

@@ -1,5 +1,3 @@
-// module Analytics
-
 exports.analyticsEvent = function(category) {
   return function(action) {
     return function(label) {

src/Foreign/DOMHelper.js → src/DOMHelper.js

@@ -1,5 +1,3 @@
-// module DOMHelper
-
 exports.getSelectedValue = function (src) {
     return function() {
         return src.options[src.selectedIndex].value;

src/DOMHelper.purs

@@ -13,11 +13,11 @@ import DOM.Node.NonElementParentNode (getElementById)
 import DOM.Node.ParentNode (children)
 import DOM.Node.Types (HTMLCollection(), Element(), Document(), ElementId(..),
                        documentToNonElementParentNode, elementToParentNode)
-import Data.Either.Unsafe (fromRight)
+import Data.Either (fromRight)
 import Data.Foreign (toForeign)
-import Data.Maybe (Maybe(), maybe)
-import Data.Maybe.Unsafe (fromJust)
+import Data.Maybe (Maybe(), maybe, fromJust)
 import Data.Nullable (toMaybe)
+import Partial.Unsafe (unsafePartial)
 
 getDocument :: forall eff. Eff (dom :: DOM | eff) Document
 getDocument = window >>= document <#> htmlDocumentToDocument
@@ -28,14 +28,14 @@ getElementById' :: forall eff. String
 getElementById' id doc = do
   let docNode = documentToNonElementParentNode doc
   nullableEl <- getElementById (ElementId id) docNode
-  return $ toMaybe nullableEl
+  pure $ toMaybe nullableEl
 
 -- | Perform a DOM action with a single element which can be accessed by ID
 withElementById :: forall eff. String
                 -> Document
                 -> (Element -> Eff (dom :: DOM | eff) Unit)
                 -> Eff (dom :: DOM | eff) Unit
-withElementById id doc action = getElementById' id doc >>= maybe (return unit) action
+withElementById id doc action = getElementById' id doc >>= maybe (pure unit) action
 
 children' :: forall eff. Element -> Eff (dom :: DOM | eff) (Array HTMLElement)
 children' el = htmlCollectionToArray <$> children (elementToParentNode el)
@@ -45,13 +45,13 @@ addEventListener' etype listener target =
   addEventListener etype (eventListener listener) true target
 
 unsafeElementToHTMLElement :: Element -> HTMLElement
-unsafeElementToHTMLElement = fromRight <<< readHTMLElement <<< toForeign
+unsafeElementToHTMLElement = unsafePartial (fromRight <<< readHTMLElement <<< toForeign)
 
 unsafeEventToKeyboardEvent :: Event -> KeyboardEvent
-unsafeEventToKeyboardEvent = fromRight <<< readKeyboardEvent <<< toForeign
+unsafeEventToKeyboardEvent = unsafePartial (fromRight <<< readKeyboardEvent <<< toForeign)
 
 unsafeGetAttribute :: forall eff. String -> Element -> Eff (dom :: DOM | eff) String
-unsafeGetAttribute key el = (fromJust <<< toMaybe) <$> getAttribute key el
+unsafeGetAttribute key el = unsafePartial (fromJust <<< toMaybe) <$> getAttribute key el
 
 foreign import getSelectedValue :: forall eff. Element
                                 -> Eff (dom :: DOM | eff) String

src/Helper.purs

@@ -1,16 +1,16 @@
 module Helper where
 
 import Prelude
-import Data.List (toList)
+import Data.List (fromFoldable)
 import Data.Maybe (Maybe)
 import Data.Tuple (Tuple(..))
 import Data.StrMap as SM
 
-import Types
+import Types (Level, LevelId, Difficulty, Wall, Cube)
 
 -- | Create a StrMap from an Array of (key, value) pairs
 fromArray :: forall a. Array (Tuple String a) -> SM.StrMap a
-fromArray = SM.fromList <<< toList
+fromArray = SM.fromList <<< fromFoldable
 
 -- | Operator to create tuples, especially for creating maps with
 -- | `Map.fromList ["key1" :> "value1", "key2" :> "value2"]`
@@ -25,7 +25,7 @@ type AWall = Array AStack
 
 -- | Convert 2D Array to List
 convert :: AWall -> Wall
-convert = toList <<< map toList
+convert = fromFoldable <<< map fromFoldable
 
 -- | Helper type to create levels from arrays
 type LevelEntry = {