From 59fe665c1b712abf68dc671ea00c1f4080d5327f Mon Sep 17 00:00:00 2001 From: exoego Date: Sat, 22 Feb 2020 17:13:41 +0900 Subject: [PATCH] Deprecate helper method unrelated to nodejs --- .../src/test/scala/io/scalajs/nodejs/TestHelper.scala | 7 +++++++ .../io/scalajs/nodejs/child_process/ChildProcessTest.scala | 2 +- .../src/test/scala/io/scalajs/nodejs/fs/FsTest.scala | 2 +- .../src/test/scala/io/scalajs/nodejs/os/OSTest.scala | 2 +- .../test/scala/io/scalajs/nodejs/url/URLObjectTest.scala | 5 +++-- core/src/main/scala/io/scalajs/util/DateHelper.scala | 3 +++ core/src/main/scala/io/scalajs/util/JSONHelper.scala | 4 ++++ core/src/main/scala/io/scalajs/util/ScalaJsHelper.scala | 4 ++++ 8 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 app/nodejs-v10/src/test/scala/io/scalajs/nodejs/TestHelper.scala diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/TestHelper.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/TestHelper.scala new file mode 100644 index 000000000..76a87a297 --- /dev/null +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/TestHelper.scala @@ -0,0 +1,7 @@ +package io.scalajs.nodejs + +import scala.scalajs.js + +object TestHelper { + def isDefined(obj: js.Any): Boolean = obj != null && !js.isUndefined(obj) +} diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala index 3d3fe6116..142bcf6ec 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala @@ -2,7 +2,7 @@ package io.scalajs.nodejs package child_process import io.scalajs.nodejs.buffer.Buffer -import io.scalajs.util.ScalaJsHelper._ +import io.scalajs.nodejs.TestHelper._ import io.scalajs.util.NodeJSConverters._ import scala.concurrent.{ExecutionContext, Promise} diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala index b02670d24..37a0e004e 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala @@ -2,7 +2,7 @@ package io.scalajs.nodejs.fs import io.scalajs.nodejs.setImmediate import io.scalajs.util.NodeJSConverters._ -import io.scalajs.util.ScalaJsHelper._ +import io.scalajs.nodejs.TestHelper._ import scala.concurrent.{ExecutionContext, Promise} import org.scalatest.funspec.AsyncFunSpec diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala index 4e8a7f628..a29b0140f 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala @@ -1,6 +1,6 @@ package io.scalajs.nodejs.os -import io.scalajs.util.ScalaJsHelper._ +import io.scalajs.nodejs.TestHelper._ import org.scalatest.funspec.AnyFunSpec /** diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala index a6499ec79..a4fc6e23b 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala @@ -1,9 +1,10 @@ package io.scalajs.nodejs package url -import io.scalajs.util.JSONHelper._ import org.scalatest.funspec.AnyFunSpec +import scala.scalajs.js + /** * URLObject Tests */ @@ -14,7 +15,7 @@ class URLObjectTest extends AnyFunSpec { it("should break down URLs into components") { assert( - urlObject.toJson === "\"https://www.google.com/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#q=node\"" + js.JSON.stringify(urlObject) === "\"https://www.google.com/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#q=node\"" ) // """{"protocol":"https:","slashes":true,"auth":null,"host":"www.google.com","port":null,"hostname":"www.google.com","hash":"#q=node","search":"?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8","query":"sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8","pathname":"/webhp","path":"/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8","href":"https://www.google.com/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#q=node"}""" } diff --git a/core/src/main/scala/io/scalajs/util/DateHelper.scala b/core/src/main/scala/io/scalajs/util/DateHelper.scala index 2f2df85e6..f0020c7e9 100644 --- a/core/src/main/scala/io/scalajs/util/DateHelper.scala +++ b/core/src/main/scala/io/scalajs/util/DateHelper.scala @@ -6,12 +6,14 @@ import scala.scalajs.js /** * Date Helper */ +@deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") object DateHelper { /** * Date Enrichment * @param date0 the given [[js.Date date]] */ + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") implicit final class DateEnrichment(private val date0: js.Date) extends AnyVal { @inline def +(duration: Duration) = new js.Date(date0.getTime() + duration.toMillis) @@ -39,6 +41,7 @@ object DateHelper { * Duration Enrichment * @param duration the given [[Duration duration]] */ + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") implicit final class DurationEnrichment(private val duration: Duration) extends AnyVal { @inline def +(date: js.Date) = new js.Date(date.getTime() + duration.toMillis) diff --git a/core/src/main/scala/io/scalajs/util/JSONHelper.scala b/core/src/main/scala/io/scalajs/util/JSONHelper.scala index 076bc510a..400200022 100644 --- a/core/src/main/scala/io/scalajs/util/JSONHelper.scala +++ b/core/src/main/scala/io/scalajs/util/JSONHelper.scala @@ -5,12 +5,14 @@ import scala.scalajs.js /** * JSON Helper */ +@deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") object JSONHelper { /** * JSON Conversions * @param value the given JavaScript value */ + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") implicit final class JSONConversionsToJson[T <: js.Any](val value: T) extends AnyVal { @inline def toJson: String = js.JSON.stringify(value) @@ -23,11 +25,13 @@ object JSONHelper { * JSON Conversions * @param text the given text string */ + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") implicit final class JSONConversionFromJson(val text: String) extends AnyVal { @inline def fromJson[T <: js.Any]: T = js.JSON.parse(text).asInstanceOf[T] } + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") implicit final class ScalaJsJSONEnrichment(val json: js.JSON.type) extends AnyVal { @inline def parseAs[T](text: String): T = diff --git a/core/src/main/scala/io/scalajs/util/ScalaJsHelper.scala b/core/src/main/scala/io/scalajs/util/ScalaJsHelper.scala index 5cff8723d..0e0fd537b 100644 --- a/core/src/main/scala/io/scalajs/util/ScalaJsHelper.scala +++ b/core/src/main/scala/io/scalajs/util/ScalaJsHelper.scala @@ -5,14 +5,17 @@ import scala.scalajs.js /** * ScalaJS Convenience Helper Functions */ +@deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") object ScalaJsHelper { //////////////////////////////////////////////////////////////////////// // Convenience Functions //////////////////////////////////////////////////////////////////////// + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") @inline def die[T](message: String): T = throw new IllegalStateException(message) + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") @inline def isDefined(obj: js.Any): Boolean = obj != null && !js.isUndefined(obj) @@ -24,6 +27,7 @@ object ScalaJsHelper { * js.Dynamic to Value Extensions * @param obj the given [[js.Dynamic object]] */ + @deprecated("Unrelated to Node.js. Use your own extension method.", "v0.10.0") implicit final class JsAnyExtensions(val obj: js.Any) extends AnyVal { @inline def asUndefOr[T]: js.UndefOr[T] = obj.asInstanceOf[js.UndefOr[T]]