Update settings & FFI consistency (#58)

* Upda project configurations

* Remove currying for consistency

* Baby around parcel

Author: easafe

.github/workflows/CI.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: push
+on: [push, pull_request]
 
 jobs:
   build:

.gitignore

@@ -22,6 +22,7 @@ scratchpad.*
 scratchpadloader.*
 vendor
 .cache
+.vscode/
 .bundle
 
 .spago

package-lock.json

@@ -28,6 +28,9 @@
       },
       "devDependencies": {
             "jsdom": "^16.5.3",
-            "parcel": "^2.0.0-beta.2"
+            "parcel": "^2.2.1"
+      },
+      "alias": {
+            "xhr2": false
       }
 }

package.json

@@ -117,7 +117,7 @@ let additions =
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.4-20211030/packages.dhall sha256:5cd7c5696feea3d3f84505d311348b9e90a76c4ce3684930a0ff29606d2d816c
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.5-20220203/packages.dhall sha256:f8905bf5d7ce9d886cf4ef1c5893ab55de0b30c82c2b4137f272d075000fbc50
 
 let overrides = {=}
 

packages.dhall

@@ -19,7 +19,6 @@ You can edit this file as you like.
   , "foldable-traversable"
   , "foreign"
   , "foreign-object"
-  , "functions"
   , "maybe"
   , "newtype"
   , "nullable"

spago.dhall

@@ -3,12 +3,16 @@
 let messageEventData = 5,
     rawEventData = 6;
 
-exports.createEvent_ = function (name, message) {
-    return [messageEventData, name, message];
+exports.createEvent_ = function (name) {
+    return function (message) {
+        return [messageEventData, name, message];
+    };
 };
 
-exports.createRawEvent_ = function (name, handler) {
-    return [rawEventData, name, handler];
+exports.createRawEvent_ = function (name) {
+    return function (handler) {
+        return [rawEventData, name, handler];
+    };
 };
 
 exports.nodeValue_ = function (event) {
@@ -42,5 +46,3 @@ exports.selection_ = function (event) {
 
     return "";
 };
-
-

src/Flame/Html/Attribute/Event.js

@@ -3,8 +3,6 @@ module Flame.Html.Event (EventName, ToEvent, ToRawEvent, ToMaybeEvent, ToSpecial
 
 import Prelude
 
-import Data.Function.Uncurried (Fn2)
-import Data.Function.Uncurried as DFU
 import Data.Maybe (Maybe(..))
 import Data.Tuple (Tuple(..))
 import Effect (Effect)
@@ -29,8 +27,8 @@ foreign import checkedValue_ :: EffectFn1 Event Boolean
 foreign import preventDefault_ :: EffectFn1 Event Unit
 foreign import key_ :: EffectFn1 Event Key
 foreign import selection_ :: EffectFn1 Event String
-foreign import createEvent_ :: forall message. Fn2 EventName message (NodeData message)
-foreign import createRawEvent_ :: forall message. Fn2 EventName (Event -> Effect (Maybe message)) (NodeData message)
+foreign import createEvent_ :: forall message. EventName -> message -> (NodeData message)
+foreign import createRawEvent_ :: forall message. EventName -> (Event -> Effect (Maybe message)) -> (NodeData message)
 
 nodeValue :: Event -> Effect String
 nodeValue = FU.runEffectFn1 nodeValue_
@@ -49,11 +47,11 @@ selection = FU.runEffectFn1 selection_
 
 -- | Raises the given `message` for the event
 createEvent :: forall message. EventName -> message -> NodeData message
-createEvent name = DFU.runFn2 createEvent_ name
+createEvent name message = createEvent_ name message
 
 -- | Raises the given `message` for the given event, but also supplies the event itself
 createRawEvent :: forall message. EventName -> (Event -> Effect (Maybe message)) -> NodeData message
-createRawEvent = DFU.runFn2 createRawEvent_
+createRawEvent name handler = createRawEvent_ name handler
 
 -- | Helper for `message`s that expect an event
 createEventMessage :: forall message. EventName -> (Event -> message) -> NodeData message

src/Flame/Html/Attribute/Event.purs

@@ -6,12 +6,16 @@ let styleData = 1,
     attributeData = 4,
     keyData = 7;
 
-exports.createProperty_ = function (name, value) {
-    return [propertyData, name, value];
+exports.createProperty_ = function (name) {
+    return function (value) {
+        return [propertyData, name, value];
+    };
 };
 
-exports.createAttribute_ = function (name, value) {
-    return [attributeData, name, value];
+exports.createAttribute_ = function (name) {
+    return function (value) {
+        return [attributeData, name, value];
+    };
 };
 
 exports.createClass = function (array) {

src/Flame/Html/Attribute/Internal.js

@@ -4,8 +4,6 @@ module Flame.Html.Attribute.Internal (class ToClassList, class ToStyleList, ToBo
 import Data.Array as DA
 import Data.Either as DE
 import Data.Foldable as DF
-import Data.Function.Uncurried (Fn2)
-import Data.Function.Uncurried as DFU
 import Data.Maybe as DM
 import Data.String (Pattern(..))
 import Data.String as DS
@@ -58,19 +56,19 @@ instance foldableStyleList :: DF.Foldable f => ToStyleList (f (Tuple String Stri
       toStyleList = FO.fromFoldable
 
 --these functions cheat by only creating the necessary key on NodeData
-foreign import createProperty_ :: forall message. Fn2 Name Value (NodeData message)
-foreign import createAttribute_ :: forall message. Fn2 Name Value (NodeData message)
+foreign import createProperty_ :: forall message.  Name -> Value -> (NodeData message)
+foreign import createAttribute_ :: forall message. Name -> Value -> (NodeData message)
 foreign import createClass :: forall message. Array String -> NodeData message
 foreign import createStyle :: forall message. Object String -> NodeData message
 foreign import createKey :: forall message. String -> NodeData message
 
 -- | Sets a DOM property
 createProperty :: forall message. String -> String -> NodeData message
-createProperty = DFU.runFn2 createProperty_
+createProperty name value = createProperty_ name value
 
 -- | Creates a HTML attribute
 createAttribute :: forall message. String -> String -> NodeData message
-createAttribute = DFU.runFn2 createAttribute_
+createAttribute name value = createAttribute_ name value
 
 booleanToFalsyString :: Boolean -> String
 booleanToFalsyString =