From 50539e8a98c70e90d3cb3ae9e2762ed03f49dffb Mon Sep 17 00:00:00 2001 From: exoego Date: Fri, 11 Oct 2019 09:40:52 +0900 Subject: [PATCH] util.promisify is now function object with custom property --- app/current/src/main/scala/io/scalajs/nodejs/util/Util.scala | 5 ++--- .../src/test/scala/io/scalajs/nodejs/util/UtilTest.scala | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/current/src/main/scala/io/scalajs/nodejs/util/Util.scala b/app/current/src/main/scala/io/scalajs/nodejs/util/Util.scala index 957b166fc..e4db081b8 100644 --- a/app/current/src/main/scala/io/scalajs/nodejs/util/Util.scala +++ b/app/current/src/main/scala/io/scalajs/nodejs/util/Util.scala @@ -56,8 +56,7 @@ trait Util extends js.Object { def callbackify[T](original: js.Function): js.Function2[js.Any, T, Any] = js.native - def promisify(original: js.Function): js.Function = js.native - val promisify: PromisifyObject = js.native + val promisify: PromisifyObject = js.native @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10) val types: UtilTypes = js.native @@ -83,7 +82,7 @@ trait InspectObject extends js.Function2[js.Any, InspectOptions, String] with js } @js.native -trait PromisifyObject extends js.Object { +trait PromisifyObject extends js.Function1[js.Function, js.Function] { val custom: js.Symbol = js.native } diff --git a/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/util/UtilTest.scala b/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/util/UtilTest.scala index d1e690552..3082d41db 100644 --- a/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/util/UtilTest.scala +++ b/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/util/UtilTest.scala @@ -16,7 +16,8 @@ class UtilTest extends FunSpec { } it("have promisify") { - assert(Util.promisify.custom !== null) + assert(js.typeOf(Util.promisify(() => "")) === "function") + assert(js.typeOf(Util.promisify.custom) === "symbol") } it("have TextEncoder/TextDecoder") {