Merge pull request #1 from purescript-contrib/merge-back-to-web-fetch

sigma-andex · web-flow · commit 39f6f7eb115c · 2023-09-26T08:54:34.000+01:00
Merge back to web fetch
diff --git a/.tidyrc.json b/.tidyrc.json
@@ -0,0 +1,10 @@
+{
+  "importSort": "ide",
+  "importWrap": "source",
+  "indent": 2,
+  "operatorsFile": null,
+  "ribbon": 1,
+  "typeArrowPlacement": "first",
+  "unicode": "never",
+  "width": null
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based
 ## [Unreleased]
 
 Breaking changes:
+- Migrated from `web-promise` to `js-promise`
 
 - Fork from web-fetch
 - Rename package
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # purescript-fetch-core
 
-[![Latest release](http://img.shields.io/github/release/rowtype-yoga/purescript-fetch-core.svg)](https://github.com/rowtype-yoga/purescript-fetch-core/releases)
-[![Build status](https://github.com/rowtype-yoga/purescript-fetch-core/workflows/CI/badge.svg?branch=master)](https://github.com/rowtype-yoga/purescript-fetch-core/actions?query=workflow%3ACI+branch%3Amaster)
+[![Latest release](http://img.shields.io/github/release/purescript-contrib/purescript-js-fetch.svg)](https://github.com/purescript-contrib/purescript-js-fetch/releases)
+[![Build status](https://github.com/purescript-contrib/purescript-js-fetch/workflows/CI/badge.svg?branch=master)](https://github.com/purescript-contrib/purescript-js-fetch/actions?query=workflow%3ACI+branch%3Amaster)
 [![Pursuit](https://pursuit.purescript.org/packages/purescript-fetch-core/badge)](https://pursuit.purescript.org/packages/purescript-fetch-core)
 
 Types and low-level implementations for the [WHATWG Fetch Living Standard](https://fetch.spec.whatwg.org/).
@@ -11,9 +11,9 @@ For a high-level library see [`purescript-fetch`](https://github.com/rowtype-yog
 ## Installation
 
 ```
-spago install fetch-core
+spago install js-fetch
 ```
 
 ## Documentation
 
-Module documentation is [published on Pursuit](http://pursuit.purescript.org/packages/purescript-fetch-core).
+Module documentation is [published on Pursuit](http://pursuit.purescript.org/packages/purescript-js-fetch).
diff --git a/bower.json b/bower.json
@@ -1,11 +1,18 @@
 {
   "name": "purescript-fetch-core",
-  "license": ["MIT"],
+  "license": [
+    "MIT"
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/rowtype-yoga/purescript-fetch-core.git"
+    "url": "https://github.com/purescript-contrib/purescript-js-fetch.git"
   },
-  "ignore": ["**/.*", "node_modules", "bower_components", "output"],
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "output"
+  ],
   "dependencies": {
     "purescript-arraybuffer-types": "^v3.0.2",
     "purescript-arrays": "^v7.0.0",
diff --git a/package.json b/package.json
@@ -2,13 +2,14 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "eslint src && pulp build -- --censor-lib --strict",
+    "build": "eslint src && purs-tidy check --config-require src/**/*.purs && pulp build -- --censor-lib --strict",
     "test": "spago -x test.dhall test"
   },
   "devDependencies": {
-    "eslint": "^7.15.0",
-    "pulp": "16.0.0-0",
+    "eslint": "^8.28.0",
+    "pulp": "^16.0.2",
     "purescript-psa": "^0.8.2",
+    "purs-tidy": "^0.9.2",
     "rimraf": "^3.0.2"
   }
 }
diff --git a/spago.dhall b/spago.dhall
@@ -22,5 +22,5 @@
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs" ]
 , license = "MIT"
-, repository = "https://github.com/rowtype-yoga/purescript-fetch-core.git"
+, repository = "https://github.com/purescript-contrib/purescript-js-fetch.git"
 }
diff --git a/src/JS/Fetch/Core.js b/src/JS/Fetch/Core.js
diff --git a/src/JS/Fetch/Core.purs b/src/JS/Fetch/Core.purs
@@ -1,15 +1,15 @@
-module Fetch.Core
+module JS.Fetch
   ( FetchOptions
   , fetch
   , fetchWithOptions
   ) where
 
 import Effect (Effect)
 import Effect.Uncurried (EffectFn2, runEffectFn2)
+import JS.Fetch.AbortController (AbortSignal)
+import JS.Fetch.Request (Request)
+import JS.Fetch.Response (Response)
 import Prim.Row as Row
-import Fetch.Core.AbortController (AbortSignal)
-import Fetch.Core.Request (Request)
-import Fetch.Core.Response (Response)
 import Promise (Promise)
 
 type FetchOptions =
diff --git a/src/JS/Fetch/Fetch/AbortController.js b/src/JS/Fetch/Fetch/AbortController.js
diff --git a/src/JS/Fetch/Fetch/AbortController.purs b/src/JS/Fetch/Fetch/AbortController.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.AbortController where
+module JS.Fetch.AbortController where
 
 import Effect (Effect)
 import Prelude (Unit)
diff --git a/src/JS/Fetch/Fetch/Duplex.purs b/src/JS/Fetch/Fetch/Duplex.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.Duplex where
+module JS.Fetch.Duplex where
 
 import Prelude
 
diff --git a/src/JS/Fetch/Fetch/Headers.js b/src/JS/Fetch/Fetch/Headers.js
diff --git a/src/JS/Fetch/Fetch/Headers.purs b/src/JS/Fetch/Fetch/Headers.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.Headers
+module JS.Fetch.Headers
   ( Headers
   , fromFoldable
   , fromRecord
diff --git a/src/JS/Fetch/Fetch/Integrity.purs b/src/JS/Fetch/Fetch/Integrity.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.Integrity where
+module JS.Fetch.Integrity where
 
 import Data.Newtype (class Newtype)
 import Prelude (class Eq, class Ord)
diff --git a/src/JS/Fetch/Fetch/Referrer.purs b/src/JS/Fetch/Fetch/Referrer.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.Referrer where
+module JS.Fetch.Referrer where
 
 data Referrer
   = ReferrerNone
diff --git a/src/JS/Fetch/Fetch/ReferrerPolicy.purs b/src/JS/Fetch/Fetch/ReferrerPolicy.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.ReferrerPolicy where
+module JS.Fetch.ReferrerPolicy where
 
 import Data.Maybe (Maybe(..))
 
diff --git a/src/JS/Fetch/Fetch/Request.js b/src/JS/Fetch/Fetch/Request.js
diff --git a/src/JS/Fetch/Fetch/Request.purs b/src/JS/Fetch/Fetch/Request.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.Request
+module JS.Fetch.Request
   ( Request
   , RequestOptions
   , UnsafeRequestOptions
@@ -20,21 +20,21 @@ import Data.Newtype (un)
 import Data.Symbol (class IsSymbol)
 import Effect (Effect)
 import Effect.Uncurried (EffectFn2, runEffectFn2)
-import Fetch.Core.Duplex (Duplex)
-import Fetch.Core.Duplex as Duplex
-import Fetch.Core.Headers (Headers)
-import Fetch.Core.Integrity (Integrity(..))
-import Fetch.Core.Referrer (Referrer)
-import Fetch.Core.Referrer as Referrer
-import Fetch.Core.ReferrerPolicy (ReferrerPolicy)
-import Fetch.Core.ReferrerPolicy as ReferrerPolicy
-import Fetch.Core.RequestBody (RequestBody)
-import Fetch.Core.RequestCache (RequestCache)
-import Fetch.Core.RequestCache as RequestCache
-import Fetch.Core.RequestCredentials (RequestCredentials)
-import Fetch.Core.RequestCredentials as RequestCredentials
-import Fetch.Core.RequestMode (RequestMode)
-import Fetch.Core.RequestMode as RequestMode
+import JS.Fetch.Duplex (Duplex)
+import JS.Fetch.Duplex as Duplex
+import JS.Fetch.Headers (Headers)
+import JS.Fetch.Integrity (Integrity(..))
+import JS.Fetch.Referrer (Referrer)
+import JS.Fetch.Referrer as Referrer
+import JS.Fetch.ReferrerPolicy (ReferrerPolicy)
+import JS.Fetch.ReferrerPolicy as ReferrerPolicy
+import JS.Fetch.RequestBody (RequestBody)
+import JS.Fetch.RequestCache (RequestCache)
+import JS.Fetch.RequestCache as RequestCache
+import JS.Fetch.RequestCredentials (RequestCredentials)
+import JS.Fetch.RequestCredentials as RequestCredentials
+import JS.Fetch.RequestMode (RequestMode)
+import JS.Fetch.RequestMode as RequestMode
 import Prim.Row (class Lacks, class Union)
 import Prim.Row as R
 import Prim.RowList as RL
diff --git a/src/JS/Fetch/Fetch/RequestBody.js b/src/JS/Fetch/Fetch/RequestBody.js
diff --git a/src/JS/Fetch/Fetch/RequestBody.purs b/src/JS/Fetch/Fetch/RequestBody.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.RequestBody where
+module JS.Fetch.RequestBody where
 
 import Data.ArrayBuffer.Types (ArrayBuffer, ArrayView, Uint8Array)
 import Web.Streams.ReadableStream (ReadableStream)
diff --git a/src/JS/Fetch/Fetch/RequestCache.purs b/src/JS/Fetch/Fetch/RequestCache.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.RequestCache where
+module JS.Fetch.RequestCache where
 
 import Data.Maybe (Maybe(..))
 
diff --git a/src/JS/Fetch/Fetch/RequestCredentials.purs b/src/JS/Fetch/Fetch/RequestCredentials.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.RequestCredentials where
+module JS.Fetch.RequestCredentials where
 
 import Data.Maybe (Maybe(..))
 
diff --git a/src/JS/Fetch/Fetch/RequestMode.purs b/src/JS/Fetch/Fetch/RequestMode.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.RequestMode where
+module JS.Fetch.RequestMode where
 
 import Data.Maybe (Maybe(..))
 
diff --git a/src/JS/Fetch/Fetch/RequestRedirect.purs b/src/JS/Fetch/Fetch/RequestRedirect.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.RequestRedirect where
+module JS.Fetch.RequestRedirect where
 
 import Data.Maybe (Maybe(..))
 
diff --git a/src/JS/Fetch/Fetch/Response.js b/src/JS/Fetch/Fetch/Response.js
diff --git a/src/JS/Fetch/Fetch/Response.purs b/src/JS/Fetch/Fetch/Response.purs
@@ -1,4 +1,4 @@
-module Fetch.Core.Response
+module JS.Fetch.Response
   ( Response
   , arrayBuffer
   , blob
@@ -15,10 +15,10 @@ module Fetch.Core.Response
 
 import Data.ArrayBuffer.Types (ArrayBuffer, Uint8Array)
 import Effect (Effect)
-import Fetch.Core.Headers (Headers)
 import Foreign (Foreign)
-import Web.File.Blob (Blob)
+import JS.Fetch.Headers (Headers)
 import Promise (Promise)
+import Web.File.Blob (Blob)
 import Web.Streams.ReadableStream (ReadableStream)
 
 foreign import data Response :: Type
diff --git a/test/Main.purs b/test/Main.purs
@@ -9,12 +9,12 @@ import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
 import Effect.Class.Console (log)
-import Fetch.Core as Fetch
-import Fetch.Core.Duplex (Duplex(..))
-import Fetch.Core.Headers as Headers
-import Fetch.Core.Request as Request
-import Fetch.Core.RequestBody as RequestBody
-import Fetch.Core.Response as Response
+import JS.Fetch as Fetch
+import JS.Fetch.Duplex (Duplex(..))
+import JS.Fetch.Headers as Headers
+import JS.Fetch.Request as Request
+import JS.Fetch.RequestBody as RequestBody
+import JS.Fetch.Response as Response
 import Unsafe.Coerce (unsafeCoerce)
 
 main :: Effect Unit
@@ -26,10 +26,7 @@ main = launchAff_ do
     , headers: Headers.fromRecord { "Content-Type": "application/json" }
     , duplex: Half
     }
-  let _ = spy "request" request
   response <- Promise.toAffE $ unsafeCoerce $ Fetch.fetch request
   responseBody <- Promise.toAffE $ unsafeCoerce $ Response.text response
-  let _ = spy "response" response
   log $ show $ Response.status response
   log responseBody
-  log "You should add some tests."

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@`
`22`	`22`	`, packages = ./packages.dhall`
`23`	`23`	`, sources = [ "src/*/.purs" ]`
`24`	`24`	`, license = "MIT"`
`25`		`-, repository = "https://github.com/rowtype-yoga/purescript-fetch-core.git"`
	`25`	`+, repository = "https://github.com/purescript-contrib/purescript-js-fetch.git"`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Fetch.Core.AbortController where`
	`1`	`+module JS.Fetch.AbortController where`
`2`	`2`
`3`	`3`	`import Effect (Effect)`
`4`	`4`	`import Prelude (Unit)`