Skip to content

Update to PureScript v0.15.0 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ jobs:
- uses: actions/checkout@v2

- uses: purescript-contrib/setup-purescript@main
with:
purescript: "unstable"

- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: "10"
node-version: "14"

- name: Install dependencies
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based
## [Unreleased]

Breaking changes:
- Migrate FFI to ES modules (#14 by @JordanMartinez)

New features:

Expand Down
14 changes: 7 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"package-lock.json"
],
"dependencies": {
"purescript-effect": "^3.0.0",
"purescript-partial": "^3.0.0",
"purescript-prelude": "^5.0.0",
"purescript-web-dom": "^5.0.0"
"purescript-effect": "master",
"purescript-partial": "master",
"purescript-prelude": "master",
"purescript-web-dom": "master"
},
"devDependencies": {
"purescript-assert": "^5.0.0",
"purescript-console": "^5.0.0",
"purescript-psci-support": "^5.0.0"
"purescript-assert": "master",
"purescript-console": "master",
"purescript-psci-support": "master"
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
"devDependencies": {
"parcel-bundler": "^1.12.3",
"pulp": "^15.0.0",
"purescript-psa": "^0.8.0",
"pulp": "16.0.0-0",
"purescript-psa": "^0.8.2",
"rimraf": "^2.6.3"
},
"dependencies": {
Expand Down
10 changes: 4 additions & 6 deletions src/Web/DOM/DOMParser.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
/* Web.DOM.DOMParser */
"use strict";

exports.makeDOMParser = function () {
export function makeDOMParser() {
return new DOMParser();
};
}

exports.parseFromString = function (documentType) {
export function parseFromString(documentType) {
return function (sourceString) {
return function (domParser) {
return function () { // Effect thunk
return domParser.parseFromString(sourceString, documentType);
};
};
};
};
}
10 changes: 4 additions & 6 deletions src/Web/DOM/XMLSerializer.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
/* Web.DOM.XMLSerializer */
"use strict";

exports.makeXMLSerializer = function () {
export function makeXMLSerializer() {
return new XMLSerializer();
};
}

exports.serializeToString = function (doc) {
export function serializeToString(doc) {
return function (xmlSerializer) {
return function () { // Effect thunk
return xmlSerializer.serializeToString(doc);
};
};
};
}
15 changes: 6 additions & 9 deletions test/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ module Test.Main where

import Prelude

import Data.Either (Either, fromRight, isLeft, isRight)
import Data.Either (Either, either)
import Data.Maybe (Maybe(..))
import Effect (Effect)
import Effect.Console (log)
import Partial.Unsafe (unsafePartial)
import Partial.Unsafe (unsafePartial, unsafeCrashWith)
import Test.Data as TD

import Web.DOM.Document (Document)
import Web.DOM.DOMParser (DOMParser, makeDOMParser, parseFromString
, parseXMLFromString, _getParserError)
import Web.DOM.XMLSerializer (XMLSerializer, makeXMLSerializer
, serializeToString)
import Web.DOM.XMLSerializer (XMLSerializer, makeXMLSerializer)

parseNoteDocRaw :: DOMParser -> Effect Document
parseNoteDocRaw = parseFromString "application/xml" TD.noteXml
Expand Down Expand Up @@ -42,12 +41,10 @@ main = do
Nothing -> log "no parse error found for garbageOut"
Just er -> log $ "Error is:" <> er
log "test 2"
shouldBeRight <- parseNoteDoc domParser
log $ "is Right? " <> show (isRight shouldBeRight)
shouldBeLeft <- parseGarbage domParser
log $ "is Left? " <> show (isLeft shouldBeLeft)
shouldBeRight <- either (\_ -> unsafeCrashWith "should be right") identity <$> parseNoteDoc domParser
either (const unit) (\_ -> unsafeCrashWith "should be left") <$> parseGarbage domParser
xmlSrlzr <- makeXMLSerializer
strFromNote <- unsafePartial $ serializeToString (fromRight shouldBeRight) xmlSrlzr
strFromNote <- unsafePartial $ serializeToString shouldBeRight xmlSrlzr
log $ "serialization of note is:\n" <> strFromNote

log "TODO: You should add some tests."