Merge pull request #207 from reason-association/switch-to-rescript-promise

Switch to rescript-promise

Author: ryyppy

README.md

@@ -67,6 +67,7 @@ build specific pages (file `index_data/x.json` not found).
   - `/components`: ReScript / React components used by multiple pages
   - `/ffi`: (to be deprecated) Plain JS that some ReScript code binds to (use `raw` statements for that)
   - `/layouts`: All Next layouts used in our pages. Check out `src/common/App.res` for mapping layouts to routes
+- `plugins`: Contains plugins for all kinds of things: HighlightJS, MDX, webpack loader, etc.
 - `scripts`: Contains a mix of JS / ReScript based scripts that do all kind of code generation / code introspection logic
 - `tailwind.config.js`: Contains our Tailwind configuration for all the low level design tokens
 

bsconfig.json

@@ -10,7 +10,7 @@
     "reason-react",
     "bs-fetch",
     "@glennsl/bs-json",
-    "reason-promise"
+    "@ryyppy/rescript-promise"
   ],
   "ppx-flags": [],
   "sources": [

package.json

@@ -12,6 +12,7 @@
     "@mdx-js/loader": "^1.5.5",
     "@next/mdx": "^8.1.0",
     "@octokit/graphql-schema": "^7.4.0",
+    "@ryyppy/rescript-promise": "^0.0.2",
     "@zeit/next-css": "^1.0.1",
     "bs-fetch": "^0.3.1",
     "codemirror": "^5.54.0",
@@ -28,7 +29,6 @@
     "prettier": "^1.18.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "reason-promise": "^1.0.2",
     "reason-react": "^0.9.1",
     "remark-parse": "^7.0.1",
     "remark-slug": "^5.1.2",

src/BlogArticle.js

@@ -259,7 +259,7 @@ let getStaticProps: Next.GetStaticProps.t<props, Params.t> = ctx => {
 
   let props = {fullslug: fullslug}
   let ret = {"props": props}
-  Js.Promise.resolve(ret)
+  Promise.resolve(ret)
 }
 
 let getStaticPaths: Next.GetStaticPaths.t<Params.t> = () => {
@@ -271,5 +271,5 @@ let getStaticPaths: Next.GetStaticPaths.t<Params.t> = () => {
     },
   })
   let ret = {paths: paths, fallback: false}
-  Promise.resolved(ret)
+  Promise.resolve(ret)
 }

src/BlogArticle.res

@@ -25,13 +25,13 @@ module LoadScript = {
   external removeScript: (~src: string) => unit = "removeScript"
 
   let loadScriptPromise = (url: string): Promise.t<result<unit, string>> => {
-    let (p, resolve) = Promise.pending()
-    loadScript(
-      ~src=url,
-      ~onSuccess=() => resolve(Ok()),
-      ~onError=_err => resolve(Error(j`Could not load script: $url`)),
-    )->ignore
-    p
+    Promise.make((resolve, _reject) => {
+      loadScript(
+        ~src=url,
+        ~onSuccess=() => resolve(. Ok()),
+        ~onError=_err => resolve(. Error(j`Could not load script: $url`)),
+      )->ignore
+    })
   }
 }
 
@@ -77,19 +77,29 @@ let attachCompilerAndLibraries = (~version: string, ~libraries: array<string>, (
   /* let compilerUrl = "/static/linked-bs-bundle.js"; */
 
   LoadScript.loadScriptPromise(compilerUrl)
-  ->Promise.mapError(_msg => j`Could not load compiler from url $compilerUrl`)
-  ->Promise.map(r =>
+  ->Promise.map(r => {
     switch r {
-    | Ok() => Belt.Array.map(libraries, lib => {
+    | Error(_) => Error(j`Could not load compiler from url $compilerUrl`)
+    | _ => r
+    }
+  })
+  ->Promise.then(r => {
+    let promises = switch r {
+    | Ok() =>
+      Belt.Array.map(libraries, lib => {
         let cmijUrl = CdnMeta.getLibraryCmijUrl(version, lib)
-        LoadScript.loadScriptPromise(cmijUrl)->Promise.mapError(_msg =>
-          j`Could not load cmij from url $cmijUrl`
+        LoadScript.loadScriptPromise(cmijUrl)->Promise.map(r =>
+          switch r {
+          | Error(_) => Error(j`Could not load cmij from url $cmijUrl`)
+          | _ => r
+          }
         )
       })
-    | Error(msg) => [Promise.resolved(Error(msg))]
+    | Error(msg) => [Promise.resolve(Error(msg))]
     }
-  )
-  ->Promise.flatMap(Promise.allArray)
+
+    Promise.all(promises)
+  })
   ->Promise.map(all => {
     // all: array(Promise.result(unit, string))
     let errors = Belt.Array.reduce(all, [], (acc, r) =>
@@ -275,7 +285,8 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
     }
   }
 
-  let dispatchError = (err: error) => setState(prev => {
+  let dispatchError = (err: error) =>
+    setState(prev => {
       let msg = switch err {
       | SetupError(msg) => msg
       | CompilerLoadingError(msg) => msg
@@ -296,7 +307,8 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
       | versions =>
         let latest = versions[0]
 
-        attachCompilerAndLibraries(~version=latest, ~libraries, ())->Promise.get(result =>
+        attachCompilerAndLibraries(~version=latest, ~libraries, ())
+        ->Promise.map(result =>
           switch result {
           | Ok() =>
             let instance = Compiler.make()
@@ -332,9 +344,10 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
             dispatchError(CompilerLoadingError(msg))
           }
         )
+        ->ignore
       }
     | SwitchingCompiler(ready, version, libraries) =>
-      attachCompilerAndLibraries(~version, ~libraries, ())->Promise.get(result =>
+      attachCompilerAndLibraries(~version, ~libraries, ())->Promise.map(result =>
         switch result {
         | Ok() =>
           // Make sure to remove the previous script from the DOM as well
@@ -371,7 +384,7 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
 
           dispatchError(CompilerLoadingError(msg))
         }
-      )
+      )->ignore
     | Compiling(ready, (lang, code)) =>
       let apiVersion = ready.selected.apiVersion
       let instance = ready.selected.instance
@@ -384,9 +397,7 @@ let useCompilerManager = (~initialLang: Lang.t=Res, ~onAction: option<action =>
         | Lang.Res => instance->Compiler.resCompile(code)
         }
       | UnknownVersion(apiVersion) =>
-        CompilationResult.UnexpectedError(
-          j`Can't handle result of compiler API version "$apiVersion"`,
-        )
+        CompilationResult.UnexpectedError(j`Can't handle result of compiler API version "$apiVersion"`)
       }
 
       setState(_ => Ready({...ready, result: FinalResult.Comp(compResult)}))

src/common/CompilerManagerHook.js

@@ -1374,6 +1374,11 @@
   resolved "https://registry.yarnpkg.com/@octokit/graphql-schema/-/graphql-schema-7.7.1.tgz#47b541a68ce5f3a6de3c02534b012696702ca658"
   integrity sha512-Wj0WYFRiqTeD/F5WGtXShsEnnAdfDfwB/Gq2rxsntKg/LintKxECFYNMV5wLVOLLNaXBc1f2q8AXHGxQyEbPKg==
 
+"@ryyppy/rescript-promise@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@ryyppy/rescript-promise/-/rescript-promise-0.0.2.tgz#9b9dccd724b40b7836e52158bc34deed8a75dddf"
+  integrity sha512-kKW7rWbtW63CM25JodnCIbBPP8sIiqxLgY2EGLFc9yj9nJTuPMLq08k8QY2v+ZMCiiOGD0AmY2lE7T3NRJqySA==
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -6613,11 +6618,6 @@ reanalyze@^2.5.0:
   resolved "https://registry.yarnpkg.com/reanalyze/-/reanalyze-2.10.0.tgz#bba9a73cc75c8c9ade6d1e993e3ccbff85dcd06b"
   integrity sha512-FJYDBOV7QNEeCco+lJxSYwc62BMTbR/CAEons5dccDZY7H9nBuVPN/uL0O2fbMGgELGU4yOUnaJSrWxe8c5rBA==
 
-reason-promise@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/reason-promise/-/reason-promise-1.1.1.tgz#966133fed21e748a50ffb8839a1da04912bcf380"
-  integrity sha512-xMXDiyzTjn7t9pq9aQrkgu8CLB5DILU70oWQ+LI20YecshypUwsw37TKOvCxgoFR3vo30ucF0/iWe2BZ181/jw==
-
 reason-react@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/reason-react/-/reason-react-0.9.1.tgz#30a887158200b659aa03e2d75ff4cc54dc462bb0"