Merge pull request #23 from srghma/patch-2

Serhii Khoma · web-flow · commit 597acb98f53b · 2021-04-09T09:39:46.000+03:00
fix: update to 0.14 -&gt; Module Global was not found
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,19 @@
+---
+name: Bug report
+about: Report an issue
+title: ""
+labels: bug
+assignees: ""
+---
+
+**Describe the bug**
+A clear and concise description of the bug.
+
+**To Reproduce**
+A minimal code example (preferably a runnable example on [Try PureScript](https://try.purescript.org)!) or steps to reproduce the issue.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/change-request.md b/.github/ISSUE_TEMPLATE/change-request.md
@@ -0,0 +1,21 @@
+---
+name: Change request
+about: Propose an improvement to this library
+title: ""
+labels: ""
+assignees: ""
+---
+
+**Is your change request related to a problem? Please describe.**
+A clear and concise description of the problem.
+
+Examples:
+
+- It's frustrating to have to [...]
+- I was looking for a function to [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what a good solution to you looks like, including any solutions you've already considered.
+
+**Additional context**
+Add any other context about the change request here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: PureScript Discourse
+    url: https://discourse.purescript.org/
+    about: Ask and answer questions here.
+  - name: Functional Programming Slack
+    url: https://functionalprogramming.slack.com
+    about: For casual chat and questions (use https://fpchat-invite.herokuapp.com to join).
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+**Description of the change**
+Clearly and concisely describe the purpose of the pull request. If this PR relates to an existing issue or change proposal, please link to it. Include any other background context that would help reviewers understand the motivation for this PR.
+
+---
+
+**Checklist:**
+
+- [ ] Added the change to the changelog's "Unreleased" section with a link to this PR and your username
+- [ ] Linked any existing issues or proposals that this pull request should close
+- [ ] Updated or added relevant documentation in the README and/or documentation directory
+- [ ] Added a test for the contribution (if applicable)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,51 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up PureScript toolchain
+        uses: purescript-contrib/setup-purescript@main
+
+      - name: Cache PureScript dependencies
+        uses: actions/cache@v2
+        with:
+          key: ${{ runner.os }}-spago-${{ hashFiles('**/*.dhall') }}
+          path: |
+            .spago
+            output
+
+      - name: Set up Node toolchain
+        uses: actions/setup-node@v1
+        with:
+          node-version: "12.x"
+
+      - name: Cache NPM dependencies
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Install NPM dependencies
+        run: npm install
+
+      - name: Build the project
+        run: npm run build
+
+      - name: Run tests
+        run: npm run test
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
 /.*
+!/.github
 !/.gitignore
 !/.npmrc
 !/.travis.yml
 /bower_components/
 /node_modules/
-/output/
+/output/
diff --git a/.travis.yml b/.travis.yml
diff --git a/bower.json b/bower.json
diff --git a/package.json b/package.json
@@ -5,8 +5,8 @@
     "test": "pulp test"
   },
   "devDependencies": {
-    "purescript-psa": "^0.7.3",
-    "purescript": "^0.13.0",
-    "pulp": "^13.0.0"
+    "purescript-psa": "^0.8.2",
+    "purescript": "^0.14.0",
+    "pulp": "^15.0.0"
   }
 }
diff --git a/packages.dhall b/packages.dhall
@@ -0,0 +1,4 @@
+let upstream =
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210311/packages.dhall sha256:3da8be2b7b4a0e7de6186591167b363023695accffb98a8639e9e7d06e2070d6
+
+in  upstream
diff --git a/spago.dhall b/spago.dhall
@@ -0,0 +1,20 @@
+{ name = "affjax"
+, dependencies =
+  [ "prelude"
+  , "effect"
+  , "exitcodes"
+  , "strings"
+  , "ordered-collections"
+  , "arrays"
+  , "console"
+  , "memoize"
+  , "transformers"
+  , "exists"
+  , "node-process"
+  , "free"
+  , "quickcheck"
+  , "spec"
+  ]
+, packages = ./packages.dhall
+, sources = [ "src/**/*.purs", "test/**/*.purs" ]
+}
diff --git a/src/Options/Applicative/BashCompletion.purs b/src/Options/Applicative/BashCompletion.purs
@@ -15,7 +15,7 @@ import Data.Either (Either(..))
 import Data.Exists (runExists)
 import Data.Foldable (fold)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List as List
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
 import Data.Newtype (un)
diff --git a/src/Options/Applicative/Builder.purs b/src/Options/Applicative/Builder.purs
@@ -104,7 +104,7 @@ import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
 import ExitCodes (ExitCode)
 import ExitCodes as ExitCode
-import Global (isFinite, isNaN, readFloat)
+import Data.Number as Number
 import Options.Applicative.Builder.Completer (bashCompleter, listCompleter)
 import Options.Applicative.Builder.Internal (class HasCompleter, class HasMetavar, class HasName, class HasValue, ArgumentFields(..), CommandFields(..), DefaultProp(..), FlagFields(..), Mod(..), OptionFields(..), fieldMod, mkCommand, mkParser, modCompleter, name, optionMod)
 import Options.Applicative.Builder.Internal (internal, Mod, OptionFields, FlagFields, ArgumentFields, CommandFields, class HasName, class HasCompleter, class HasValue, class HasMetavar) as Reexport
@@ -127,9 +127,9 @@ int = eitherReader $ \s -> case Int.fromString s of
 
 -- | Number 'Option' reader.
 number :: ReadM Number
-number = eitherReader $ \s -> let n = readFloat s in if isNaN n || not isFinite n
-  then Left $ "Can't parse as Number: `" <> show s <> "`"
-  else Right n
+number = eitherReader $ \s -> case Number.fromString s of
+  Nothing -> Left $ "Can't parse as Number: `" <> show s <> "`"
+  Just a -> Right a
 
 -- | Boolean 'Option' reader.
 boolean :: ReadM Boolean
diff --git a/src/Options/Applicative/Builder/Completer.purs b/src/Options/Applicative/Builder/Completer.purs
@@ -8,7 +8,8 @@ module Options.Applicative.Builder.Completer
 import Prelude
 
 import Control.Monad.Error.Class (try)
-import Data.Array (elem, foldr)
+import Data.Array (elem)
+import Data.Foldable (foldr)
 import Data.Array as Array
 import Data.Either (either)
 import Data.List as List
@@ -52,7 +53,8 @@ foreign import execSyncCommand :: String -> Effect String
 requote :: String -> String
 requote = toCharArray >>> List.fromFoldable >>> go' >>> List.toUnfoldable >>> fromCharArray
   where
-  go' s =
+  go' :: List.List Char -> List.List Char
+  go' = \s ->
     let
       -- Bash doesn't appear to allow "mixed" escaping
       -- in bash completions. So we don't have to really
@@ -78,6 +80,7 @@ requote = toCharArray >>> List.fromFoldable >>> go' >>> List.toUnfoldable >>> fr
       strong unescaped
 
     where
+      strong :: List.List Char -> List.List Char
       strong ss = '\'' List.: foldr go (List.singleton '\'') ss
         where
           -- If there's a single quote inside the
@@ -89,6 +92,7 @@ requote = toCharArray >>> List.fromFoldable >>> go' >>> List.toUnfoldable >>> fr
       -- Unescape a strongly quoted string
       -- We have two recursive functions, as we
       -- can enter and exit the strong escaping.
+      unescapeN :: List.List Char -> List.List Char
       unescapeN = goX
         where
           goX ('\'' List.: xs) = goN xs
@@ -101,13 +105,15 @@ requote = toCharArray >>> List.fromFoldable >>> go' >>> List.toUnfoldable >>> fr
           goN List.Nil = List.Nil
 
       -- Unescape an unquoted string
+      unescapeU :: List.List Char -> List.List Char
       unescapeU = goX
         where
           goX List.Nil = List.Nil
           goX ('\\' List.: x List.: xs) = x List.: goX xs
           goX (x List.: xs) = x List.: goX xs
 
       -- Unescape a weakly quoted string
+      unescapeD :: List.List Char -> List.List Char
       unescapeD = goX
         where
           -- Reached an escape character
diff --git a/src/Options/Applicative/Builder/Internal.purs b/src/Options/Applicative/Builder/Internal.purs
@@ -29,7 +29,8 @@ import Options.Applicative.Types (Completer, OptName, OptProperties(..), OptRead
 import Control.Alt (alt)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Newtype (class Newtype, over)
-import Data.Tuple (Tuple, fst, lookup)
+import Data.Tuple (Tuple, fst)
+import Data.Foldable (lookup)
 import Data.Tuple.Nested (Tuple3, (/\))
 
 newtype OptionFields a = OptionFields
diff --git a/src/Options/Applicative/Help/Chunk.purs b/src/Options/Applicative/Help/Chunk.purs
@@ -22,7 +22,7 @@ import Control.Alternative (class Alternative, class Plus)
 import Control.MonadZero (class MonadZero)
 import Data.Foldable (fold, foldr)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.Maybe (Maybe(..), fromMaybe, isNothing)
 import Data.Newtype (class Newtype, un)
 import Data.Tuple (Tuple(..))
diff --git a/src/Options/Applicative/Types.purs b/src/Options/Applicative/Types.purs
@@ -54,7 +54,7 @@ import Control.Monad.Trans.Class (lift)
 import Data.Bifunctor (bimap)
 import Data.Exists (Exists, mkExists, runExists)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List (List)
 import Data.List as List
 import Data.List.NonEmpty as NEL
diff --git a/src/Text/PrettyPrint/Leijen.purs b/src/Text/PrettyPrint/Leijen.purs
@@ -9,7 +9,7 @@ import Prelude hiding ((<$>))
 import Data.Array as Array
 import Data.Foldable (foldr, intercalate)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.Int as Int
 import Data.Lazy (Lazy, force, defer)
 import Data.List as List
diff --git a/test/Examples/Alternatives.purs b/test/Examples/Alternatives.purs
@@ -5,7 +5,7 @@ import Prelude
 import Control.Alt ((<|>))
 import Data.Array as Array
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Effect (Effect)
 import Effect.Class.Console (logShow)
 import Options.Applicative (Parser, ParserInfo, execParser, flag', helper, idm, info, short, (<**>))
diff --git a/test/Examples/Cabal.purs b/test/Examples/Cabal.purs
@@ -4,7 +4,7 @@ import Prelude
 
 import Control.Apply (lift2)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List (List)
 import Effect (Effect)
 import Effect.Class.Console (logShow)
diff --git a/test/Examples/Commands.purs b/test/Examples/Commands.purs
@@ -5,7 +5,7 @@ import Prelude
 import Control.Alt ((<|>))
 import Data.Array as Array
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List (intercalate)
 import Effect (Effect)
 import Effect.Class.Console (log)
diff --git a/test/Examples/Hello.purs b/test/Examples/Hello.purs
@@ -5,7 +5,7 @@ import Options.Applicative (Parser, ParserInfo, execParser, fullDesc, header, he
 import Data.Array (replicate)
 import Data.Foldable (sequence_)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Effect (Effect)
 import Effect.Console (log)
 

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`"test": "pulp test"`
`6`	`6`	`},`
`7`	`7`	`"devDependencies": {`
`8`		`- "purescript-psa": "^0.7.3",`
`9`		`- "purescript": "^0.13.0",`
`10`		`- "pulp": "^13.0.0"`
	`8`	`+ "purescript-psa": "^0.8.2",`
	`9`	`+ "purescript": "^0.14.0",`
	`10`	`+ "pulp": "^15.0.0"`
`11`	`11`	`}`
`12`	`12`	`}`