Update for PureScript 0.14 (#9)

* Update for PureScript 0.14

* integration -> parse-package-set

* avoid double-map in traversals

* Prim -> P

* fix missing space in imports

* Add PS prefix to avoid conflicts with Prim

* Update readme, remove unused import

* Revert "Add PS prefix to avoid conflicts with Prim"

This reverts commit 6f8b2e8.

* Update README

* Use 0.14 in CI

* Update Range.purs

* Update Range.purs

* Update imports

Author: thomashoneyman

.github/workflows/ci.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      
+
       - uses: purescript-contrib/setup-purescript@main
         with:
-          purescript: "0.13.8"
+          purescript: "0.14.0"
           spago: "0.19.0"
           psa: "0.8.2"
 

README.md

@@ -41,17 +41,17 @@ import Data.Set (Set)
 import Data.Set as Set
 import Data.Tuple (Tuple(..))
 import PureScript.CST.Traversal (foldMapModule, defaultMonoidalVisitor)
-import PureScript.CST.Types (Expr(..), Ident, Module, ModuleName, QualifiedName(..), SourceRange)
+import PureScript.CST.Types as CST
 
-type QualifiedIdent = Tuple (Maybe ModuleName) Ident
-type UsageMap = SemigroupMap QualifiedIdent (Set SourceRange)
+type QualifiedIdent = Tuple (Maybe CST.ModuleName) CST.Ident
+type UsageMap = SemigroupMap QualifiedIdent (Set CST.SourceRange)
 
-getExprIdents :: forall a. Module a -> UsageMap
+getExprIdents :: forall a. CST.Module a -> UsageMap
 getExprIdents = foldMapModule $ defaultMonoidalVisitor
   { onExpr = case _ of
-      ExprIdent (QualifiedName ident) ->
+      CST.ExprIdent (CST.QualifiedName ident) ->
         SemigroupMap
-          $ Map.singleton (Tuple ident.module ident.name)
+          $ Map.singleton (Tuple ident."module" ident.name)
           $ Set.singleton ident.token.range
       _ -> mempty
   }
@@ -66,3 +66,9 @@ slowest parse times along with the mean parse time for the set.
 ```sh
 npm run parse-package-set
 ```
+
+You can also benchmark a single file:
+
+```sh
+npm run bench-file MyModule.purs
+```

bench.dhall renamed to bench/bench.dhall

@@ -1,4 +1,4 @@
-let conf = ./spago.dhall
+let conf = ../spago.dhall
 
 in conf // {
   sources = conf.sources # [ "bench/**/*.purs" ],

package.json

@@ -1,11 +1,11 @@
 {
   "private": true,
   "scripts": {
-    "parse-package-set": "spago -x integration.dhall run",
-    "bench-file": "spago -x bench.dhall build && node --expose-gc -e \"require('./output/BenchFile/index.js').main()\""
+    "parse-package-set": "spago -x parse-package-set/parse-package-set.dhall run",
+    "bench-file": "spago -x bench/bench.dhall build && node --expose-gc -e \"require('./output/BenchFile/index.js').main()\""
   },
   "devDependencies": {
-    "purescript": "^0.13.8",
-    "spago": "^0.19.0"
+    "purescript": "^0.14.0",
+    "spago": "^0.19.1"
   }
 }

packages.dhall

@@ -1,4 +1,4 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200922/packages.dhall sha256:5edc9af74593eab8834d7e324e5868a3d258bbab75c5531d2eb770d4324a2900
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210304/packages.dhall sha256:c88151fe7c05f05290224c9c1ae4a22905060424fb01071b691d3fe2e5bad4ca
 
 in  upstream

integration/Main.js renamed to parse-package-set/Main.js

@@ -159,7 +159,7 @@ defaultSpagoDhall :: String
 defaultSpagoDhall = Array.intercalate "\n"
   [ "{ name = \"test-parser\""
   , ", dependencies = [] : List Text"
-  , ", packages = https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200922/packages.dhall sha256:5edc9af74593eab8834d7e324e5868a3d258bbab75c5531d2eb770d4324a2900"
+  , ", packages = https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210304/packages.dhall sha256:c88151fe7c05f05290224c9c1ae4a22905060424fb01071b691d3fe2e5bad4ca"
   , ", sources = [] : List Text"
   , "}"
   ]

integration/Main.purs renamed to parse-package-set/Main.purs

@@ -1,6 +1,6 @@
-let conf = ./spago.dhall
+let conf = ../spago.dhall
 
 in conf // {
-  sources = conf.sources # [ "integration/**/*.purs" ],
+  sources = conf.sources # [ "parse-package-set/**/*.purs" ],
   dependencies = conf.dependencies # [ "node-fs", "node-fs-aff", "strings", "node-child-process", "console", "avar", "now", "numbers" ]
 }

integration.dhall renamed to parse-package-set/parse-package-set.dhall

@@ -21,6 +21,7 @@ import Data.Lazy as Z
 import Data.Maybe (Maybe(..))
 import Data.Newtype (unwrap)
 import Data.Tuple (Tuple(..))
+import Prim hiding (Type)
 import PureScript.CST.Lexer (lex)
 import PureScript.CST.Parser (Recovered, parseModuleBody, parseModuleHeader)
 import PureScript.CST.Parser as Parser

src/PureScript/CST.purs

@@ -6,10 +6,10 @@ module PureScript.CST.Lexer
 import Prelude
 
 import Control.Alt (class Alt, (<|>))
-import Data.Array (fold, foldMap, foldl)
 import Data.Array as Array
 import Data.Array.NonEmpty as NonEmptyArray
 import Data.Char as Char
+import Data.Foldable (fold, foldl, foldMap)
 import Data.Int (hexadecimal)
 import Data.Int as Int
 import Data.Lazy as Lazy

src/PureScript/CST/Lexer.purs

@@ -22,13 +22,16 @@ import Data.Maybe (Maybe(..), maybe)
 import Data.Set (Set)
 import Data.Set as Set
 import Data.Tuple (Tuple(..), uncurry)
+import Prim as P
+import Prim hiding (Type, Row)
 import PureScript.CST.Errors (ParseError(..), RecoveredError(..))
 import PureScript.CST.Layout (currentIndent)
 import PureScript.CST.Parser.Monad (Parser, Recovery(..), eof, lookAhead, many, optional, recover, take, try)
 import PureScript.CST.TokenStream (TokenStep(..), TokenStream, layoutStack)
 import PureScript.CST.TokenStream as TokenStream
 import PureScript.CST.Types (Binder(..), ClassFundep(..), DataCtor(..), DataMembers(..), Declaration(..), Delimited, DoStatement(..), Export(..), Expr(..), Fixity(..), FixityOp(..), Foreign(..), Guarded(..), GuardedExpr(..), Ident(..), Import(..), ImportDecl(..), Instance(..), InstanceBinding(..), Label(..), Labeled(..), LetBinding(..), Module(..), ModuleBody(..), ModuleHeader(..), ModuleName(..), Name(..), OneOrDelimited(..), Operator(..), PatternGuard(..), Proper(..), QualifiedName(..), RecordLabeled(..), RecordUpdate(..), Role(..), Row(..), Separated(..), SourceToken, Token(..), Type(..), TypeVarBinding(..), Where(..), Wrapped(..))
 
+type Recovered :: (P.Type -> P.Type) -> P.Type
 type Recovered f = f RecoveredError
 
 type RecoveryStrategy f = Parser (Recovered f) -> Parser (Recovered f)

src/PureScript/CST/Parser.purs

@@ -110,7 +110,7 @@ foldMaybe = mkFold
 foldArray :: forall a. Fold a (Array a)
 foldArray = mkFold
   { init: \_ ->
-      unsafePerformEffect $ liftST STArray.empty
+      unsafePerformEffect $ liftST STArray.new
   , step: \arr a ->
       unsafePerformEffect $ liftST do
         _ <- STArray.push a arr

src/PureScript/CST/Parser/Monad.purs

@@ -8,12 +8,13 @@ module PureScript.CST.Range
 import Prelude
 
 import Control.Lazy (defer)
-import Data.Array (foldMap)
 import Data.Array as Array
 import Data.Array.NonEmpty (NonEmptyArray)
 import Data.Array.NonEmpty as NonEmptyArray
+import Data.Foldable (foldMap)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Tuple (Tuple(..), fst, snd)
+import Prim hiding (Row, Type)
 import PureScript.CST.Errors (RecoveredError(..))
 import PureScript.CST.Range.TokenList (TokenList, cons, singleton)
 import PureScript.CST.Range.TokenList as TokenList

src/PureScript/CST/Range.purs

@@ -109,7 +109,7 @@ toUnfoldable = unfoldr (uncons' Nothing (\a b -> Just (Tuple a b)))
 
 toArray :: TokenList -> Array SourceToken
 toArray init = ST.run do
-  arr <- STArray.empty
+  arr <- STArray.new
   cur <- STRef.new init
   continue <- STRef.new true
   ST.while (STRef.read continue) do