Skip to content

Commit 2c102f2

Browse files
committed
work around invalid es6 code generated
ref rescript-lang/rescript#2456
1 parent d8ec2b4 commit 2c102f2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/Express.re

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[%%raw "import Express from 'express'"];
2+
13
type complete;
24

35
module Error = {
@@ -454,8 +456,8 @@ module Middleware = {
454456
"type": string,
455457
"limit": Js.Nullable.t(int),
456458
};
457-
[@bs.module "express"] [@bs.val] external json_ : jsonOptions => t = "json";
458-
[@bs.module "express"] [@bs.val]
459+
[@bs.scope "Express"] [@bs.val] external json_ : jsonOptions => t = "json";
460+
[@bs.scope "Express"] [@bs.val]
459461
external urlencoded_ : urlEncodedOptions => t = "urlencoded";
460462
let json = (~inflate=true, ~strict=true, ~limit=?, ()) =>
461463
json_({
@@ -659,7 +661,7 @@ module Router = {
659661
"mergeParams": Js.boolean,
660662
"strict": Js.boolean,
661663
};
662-
[@bs.module "express"] [@bs.val] external make_ : routerArgs => t = "Router";
664+
[@bs.scope "Express"] [@bs.val] external make_ : routerArgs => t = "Router";
663665
let make = (~caseSensitive=false, ~mergeParams=false, ~strict=false, ()) =>
664666
make_({
665667
"caseSensitive": caseSensitive |> Js.Boolean.to_js_boolean,
@@ -681,7 +683,8 @@ module App = {
681683
let useRouter = (app, router) => Router.asMiddleware(router) |> use(app);
682684
let useRouterOnPath = (app, ~path, router) =>
683685
Router.asMiddleware(router) |> useOnPath(app, ~path);
684-
[@bs.module] external make : unit => t = "express";
686+
[@bs.val] external make : unit => t = "Express";
687+
let make = make;
685688

686689
/*** [make ()] creates an instance of the App class. */
687690
external asMiddleware : t => Middleware.t = "%identity";
@@ -708,9 +711,9 @@ module Static = {
708711
[@bs.set] external etag : (options, Js.boolean) => unit = "";
709712
/* ... add all the other options */
710713
type t;
711-
[@bs.module "express"] external make : (string, options) => t = "static";
714+
[@bs.scope "Express"] [@bs.val] external make : (string, options) => t = "static";
712715

713716
/*** [make directory] creates a static middleware for [directory] */
714717
external asMiddleware : t => Middleware.t = "%identity";
715718
/*** [asMiddleware static] casts [static] to a Middleware type */
716-
};
719+
};

0 commit comments

Comments
 (0)