Update for PureScript 0.15 and support parsing negative type-level integers (#42)

Author: thomashoneyman

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
 
       - uses: purescript-contrib/setup-purescript@main
         with:
-          purescript: "0.14.5"
-          spago: "0.20.3"
+          purescript: "0.15.0"
+          spago: "0.20.9"
           psa: "0.8.2"
           purs-tidy: "latest"
 

bench/bench.dhall

@@ -29,7 +29,6 @@ in conf // {
     , "ordered-collections"
     , "partial"
     , "prelude"
-    , "psci-support"
     , "st"
     , "strings"
     , "strings"

package.json

@@ -2,13 +2,13 @@
   "private": true,
   "scripts": {
     "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()\"",
+    "bench-file": "spago -x bench/bench.dhall build && node --expose-gc --input-type=\"module\" -e \"import { main } from './output/BenchFile/index.js';main()\"",
     "format": "purs-tidy format-in-place src test bench parse-package-set",
     "check": "purs-tidy check src test bench parse-package-set"
   },
   "devDependencies": {
-    "purescript": "^0.14.0",
-    "purs-tidy": "^0.3.0",
-    "spago": "^0.19.1"
+    "purescript": "^0.15.0",
+    "purs-tidy": "^0.8.0",
+    "spago": "^0.20.9"
   }
 }

packages.dhall

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

parse-package-set/Main.js

@@ -1,17 +1,22 @@
-const fs = require("fs");
-const os = require("os");
-const path = require("path");
-const process = require("process");
+import { mkdtempSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+import { hrtime } from "process";
 
-exports.tmpdir = (prefix) => () =>
-  fs.mkdtempSync(path.join(os.tmpdir(), prefix), "utf-8");
-
-exports.hrtime = () => {
-  const t = process.hrtime()
-  return { seconds: t[0], nanos: t[1] };
+const tmpdirImpl = function (prefix) {
+  return () => mkdtempSync(join(tmpdir(), prefix), "utf-8");
 };
+export { tmpdirImpl as tmpdir };
 
-exports.hrtimeDiff = (old) => () => {
-  const t = process.hrtime([old.seconds, old.nanos]);
+const hrtimeImpl = function () {
+  const t = hrtime();
   return { seconds: t[0], nanos: t[1] };
 };
+export { hrtimeImpl as hrtime };
+
+export function hrtimeDiff(old) {
+  return () => {
+    const t = hrtime([old.seconds, old.nanos]);
+    return { seconds: t[0], nanos: t[1] };
+  };
+}

parse-package-set/Main.purs

@@ -154,12 +154,11 @@ main = runAff_ (either throwException mempty) do
       [ "Error: cycle detected in module graph"
       ]
 
--- TODO: Upgrade packages ref to 0.14 package set
 defaultSpagoDhall :: String
 defaultSpagoDhall = Array.intercalate "\n"
   [ "{ name = \"test-parser\""
   , ", dependencies = [] : List Text"
-  , ", packages = https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210304/packages.dhall sha256:c88151fe7c05f05290224c9c1ae4a22905060424fb01071b691d3fe2e5bad4ca"
+  , ", packages = https://github.com/purescript/package-sets/releases/download/psc-0.15.0-20220507/packages.dhall sha256:cf54330f3bc1b25a093b69bff8489180c954b43668c81288901a2ec29a08cc64"
   , ", sources = [] : List Text"
   , "}"
   ]

parse-package-set/parse-package-set.dhall

@@ -35,7 +35,6 @@ in conf // {
     , "parallel"
     , "partial"
     , "prelude"
-    , "psci-support"
     , "st"
     , "strings"
     , "transformers"

spago.dhall

@@ -1,4 +1,6 @@
 { name = "language-cst-parser"
+, license = "MIT"
+, repository = "https://github.com/natefaubion/purescript-language-cst-parser.git"
 , dependencies =
   [ "arrays"
   , "console"

src/PureScript/CST/Parser.purs

@@ -423,8 +423,8 @@ parseType3 = defer \_ -> do
     Just os -> TypeOp ty os
 
 parseType4 :: Parser (Recovered Type)
-parseType4 = defer \_ ->
-  parseType5
+parseType4 = defer \_ -> do
+  parseTypeNegative <|> parseType5
 
 parseType5 :: Parser (Recovered Type)
 parseType5 = defer \_ -> do
@@ -439,7 +439,7 @@ parseTypeAtom = defer \_ ->
   TypeVar <$> parseIdent
     <|> TypeConstructor <$> parseQualifiedProper
     <|> uncurry TypeString <$> parseString
-    <|> uncurry TypeInt <$> parseInt
+    <|> uncurry (TypeInt Nothing) <$> parseInt
     <|> parseTypeParens
     <|> TypeRecord <$> braces parseRow
     <|> TypeOpName <$> parseQualifiedSymbol
@@ -456,6 +456,11 @@ parseTypeParens = do
     <|> parseTypeParen open
     <|> parseEmptyRow open
 
+parseTypeNegative :: Parser (Recovered Type)
+parseTypeNegative = do
+  negative <- tokKeyOperator "-"
+  uncurry (TypeInt (Just negative)) <$> parseInt
+
 parseRowParen :: SourceToken -> Parser (Recovered Type)
 parseRowParen open = do
   Tuple label separator <- try $ Tuple <$> parseLabel <*> tokDoubleColon

src/PureScript/CST/Range.purs

@@ -143,8 +143,14 @@ instance rangeOfType :: RangeOf e => RangeOf (Type e) where
       rangeOf n
     TypeString t _ ->
       t.range
-    TypeInt t _ ->
-      t.range
+    TypeInt neg t _ ->
+      case neg of
+        Nothing ->
+          t.range
+        Just n ->
+          { start: n.range.start
+          , end: t.range.end
+          }
     TypeRow w ->
       rangeOf w
     TypeRecord w ->
@@ -194,8 +200,8 @@ instance tokensOfType :: TokensOf e => TokensOf (Type e) where
       tokensOf n
     TypeString t _ ->
       singleton t
-    TypeInt t _ ->
-      singleton t
+    TypeInt neg t _ ->
+      foldMap singleton neg <> singleton t
     TypeRow w ->
       tokensOf w
     TypeRecord w ->

src/PureScript/CST/Types.purs

@@ -166,7 +166,7 @@ data Type e
   | TypeWildcard SourceToken
   | TypeHole (Name Ident)
   | TypeString SourceToken String
-  | TypeInt SourceToken IntValue
+  | TypeInt (Maybe SourceToken) SourceToken IntValue
   | TypeRow (Wrapped (Row e))
   | TypeRecord (Wrapped (Row e))
   | TypeForall SourceToken (NonEmptyArray (TypeVarBinding e)) SourceToken (Type e)

test/Main.purs

@@ -144,3 +144,20 @@ main = do
         true
       _ ->
         false
+
+  assertParse "Negative type-level integers"
+    """
+    cons
+      :: forall len len_plus_1 elem
+       . Add 1 len len_plus_1
+      => Compare len (-1) GT
+      => elem
+      -> Vect len elem
+      -> Vect len_plus_1 elem
+    cons elem (Vect arr) = Vect (A.cons elem arr)
+    """
+    case _ of
+      (ParseSucceeded _ :: RecoveredParserResult Declaration) ->
+        true
+      _ ->
+        false