From da06c4aa32527c649dd346ab49d84b019cac9dcb Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 8 Sep 2021 02:27:44 +0000 Subject: [PATCH] Migrate CacheStorage to dom --- api-reports/2_12.txt | 35 ++++++++++--------- api-reports/2_13.txt | 35 ++++++++++--------- .../cachestorage => }/CacheStorage.scala | 3 +- .../dom/WindowOrWorkerGlobalScope.scala | 1 - .../experimental/cachestorage/package.scala | 14 ++++++++ 5 files changed, 53 insertions(+), 35 deletions(-) rename src/main/scala/org/scalajs/dom/{experimental/cachestorage => }/CacheStorage.scala (96%) create mode 100644 src/main/scala/org/scalajs/dom/experimental/cachestorage/package.scala diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index c4933f46b..fce8f73b1 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -767,6 +767,22 @@ CSSStyleSheet[JC] def removeImport(lIndex: Int): Unit CSSStyleSheet[JC] def removeRule(lIndex: Int): Unit CSSStyleSheet[JC] def title: String CSSStyleSheet[JC] def `type`: String +Cache[JC] def add(request: RequestInfo): js.Promise[Unit] +Cache[JC] def addAll(requests: js.Array[RequestInfo]): js.Promise[Unit] +Cache[JC] def delete(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[Boolean] +Cache[JC] def keys(request: js.UndefOr[RequestInfo]?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Request]] +Cache[JC] def `match`(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.UndefOr[Response]] +Cache[JC] def matchAll(request: RequestInfo?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Response]] +Cache[JC] def put(request: RequestInfo, response: Response): js.Promise[Unit] +CacheQueryOptions[JT] var cacheName: String +CacheQueryOptions[JT] var ignoreMethod: Boolean +CacheQueryOptions[JT] var ignoreSearch: Boolean +CacheQueryOptions[JT] var ignoreVary: Boolean +CacheStorage[JT] def delete(cacheName: String): js.Promise[Boolean] +CacheStorage[JT] def has(cacheName: String): js.Promise[Boolean] +CacheStorage[JT] def keys(): js.Promise[js.Array[String]] +CacheStorage[JT] def `match`(request: RequestInfo, options: CacheQueryOptions?): js.Promise[js.Any] +CacheStorage[JT] def open(cacheName: String): js.Promise[Cache] CanvasGradient[JC] def addColorStop(offset: Double, color: String): Unit CanvasPattern[JC] CanvasRenderingContext2D[JC] def arc(x: Double, y: Double, radius: Double, startAngle: Double, endAngle: Double): Unit @@ -24321,22 +24337,9 @@ experimental/beacon/package[SO] type BeaconNavigator = dom.Navigator (@deprecat experimental/beacon/package[SO] type BeaconWorkerNavigator = dom.WorkerNavigator (@deprecated in 2.0.0) experimental/beacon/package[SO] implicit def toBeaconNavigator(n: Navigator): BeaconNavigator (@deprecated in 2.0.0) experimental/beacon/package[SO] implicit def toBeaconWorkerNavigator(n: WorkerNavigator): BeaconWorkerNavigator (@deprecated in 2.0.0) -experimental/cachestorage/Cache[JC] def add(request: RequestInfo): js.Promise[Unit] -experimental/cachestorage/Cache[JC] def addAll(requests: js.Array[RequestInfo]): js.Promise[Unit] -experimental/cachestorage/Cache[JC] def delete(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[Boolean] -experimental/cachestorage/Cache[JC] def keys(request: js.UndefOr[RequestInfo]?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Request]] -experimental/cachestorage/Cache[JC] def `match`(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.UndefOr[Response]] -experimental/cachestorage/Cache[JC] def matchAll(request: RequestInfo?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Response]] -experimental/cachestorage/Cache[JC] def put(request: RequestInfo, response: Response): js.Promise[Unit] -experimental/cachestorage/CacheQueryOptions[JT] var cacheName: String -experimental/cachestorage/CacheQueryOptions[JT] var ignoreMethod: Boolean -experimental/cachestorage/CacheQueryOptions[JT] var ignoreSearch: Boolean -experimental/cachestorage/CacheQueryOptions[JT] var ignoreVary: Boolean -experimental/cachestorage/CacheStorage[JT] def delete(cacheName: String): js.Promise[Boolean] -experimental/cachestorage/CacheStorage[JT] def has(cacheName: String): js.Promise[Boolean] -experimental/cachestorage/CacheStorage[JT] def keys(): js.Promise[js.Array[String]] -experimental/cachestorage/CacheStorage[JT] def `match`(request: RequestInfo, options: CacheQueryOptions?): js.Promise[js.Any] -experimental/cachestorage/CacheStorage[JT] def open(cacheName: String): js.Promise[Cache] +experimental/cachestorage/package[SO] type Cache = dom.Cache (@deprecated in 2.0.0) +experimental/cachestorage/package[SO] type CacheQueryOptions = dom.CacheQueryOptions (@deprecated in 2.0.0) +experimental/cachestorage/package[SO] type CacheStorage = dom.CacheStorage (@deprecated in 2.0.0) experimental/deviceorientation/DeviceAcceleration[JT] val x: Double experimental/deviceorientation/DeviceAcceleration[JT] val y: Double experimental/deviceorientation/DeviceAcceleration[JT] val z: Double diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index c4933f46b..fce8f73b1 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -767,6 +767,22 @@ CSSStyleSheet[JC] def removeImport(lIndex: Int): Unit CSSStyleSheet[JC] def removeRule(lIndex: Int): Unit CSSStyleSheet[JC] def title: String CSSStyleSheet[JC] def `type`: String +Cache[JC] def add(request: RequestInfo): js.Promise[Unit] +Cache[JC] def addAll(requests: js.Array[RequestInfo]): js.Promise[Unit] +Cache[JC] def delete(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[Boolean] +Cache[JC] def keys(request: js.UndefOr[RequestInfo]?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Request]] +Cache[JC] def `match`(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.UndefOr[Response]] +Cache[JC] def matchAll(request: RequestInfo?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Response]] +Cache[JC] def put(request: RequestInfo, response: Response): js.Promise[Unit] +CacheQueryOptions[JT] var cacheName: String +CacheQueryOptions[JT] var ignoreMethod: Boolean +CacheQueryOptions[JT] var ignoreSearch: Boolean +CacheQueryOptions[JT] var ignoreVary: Boolean +CacheStorage[JT] def delete(cacheName: String): js.Promise[Boolean] +CacheStorage[JT] def has(cacheName: String): js.Promise[Boolean] +CacheStorage[JT] def keys(): js.Promise[js.Array[String]] +CacheStorage[JT] def `match`(request: RequestInfo, options: CacheQueryOptions?): js.Promise[js.Any] +CacheStorage[JT] def open(cacheName: String): js.Promise[Cache] CanvasGradient[JC] def addColorStop(offset: Double, color: String): Unit CanvasPattern[JC] CanvasRenderingContext2D[JC] def arc(x: Double, y: Double, radius: Double, startAngle: Double, endAngle: Double): Unit @@ -24321,22 +24337,9 @@ experimental/beacon/package[SO] type BeaconNavigator = dom.Navigator (@deprecat experimental/beacon/package[SO] type BeaconWorkerNavigator = dom.WorkerNavigator (@deprecated in 2.0.0) experimental/beacon/package[SO] implicit def toBeaconNavigator(n: Navigator): BeaconNavigator (@deprecated in 2.0.0) experimental/beacon/package[SO] implicit def toBeaconWorkerNavigator(n: WorkerNavigator): BeaconWorkerNavigator (@deprecated in 2.0.0) -experimental/cachestorage/Cache[JC] def add(request: RequestInfo): js.Promise[Unit] -experimental/cachestorage/Cache[JC] def addAll(requests: js.Array[RequestInfo]): js.Promise[Unit] -experimental/cachestorage/Cache[JC] def delete(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[Boolean] -experimental/cachestorage/Cache[JC] def keys(request: js.UndefOr[RequestInfo]?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Request]] -experimental/cachestorage/Cache[JC] def `match`(request: RequestInfo, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.UndefOr[Response]] -experimental/cachestorage/Cache[JC] def matchAll(request: RequestInfo?, options: js.UndefOr[CacheQueryOptions]?): js.Promise[js.Array[Response]] -experimental/cachestorage/Cache[JC] def put(request: RequestInfo, response: Response): js.Promise[Unit] -experimental/cachestorage/CacheQueryOptions[JT] var cacheName: String -experimental/cachestorage/CacheQueryOptions[JT] var ignoreMethod: Boolean -experimental/cachestorage/CacheQueryOptions[JT] var ignoreSearch: Boolean -experimental/cachestorage/CacheQueryOptions[JT] var ignoreVary: Boolean -experimental/cachestorage/CacheStorage[JT] def delete(cacheName: String): js.Promise[Boolean] -experimental/cachestorage/CacheStorage[JT] def has(cacheName: String): js.Promise[Boolean] -experimental/cachestorage/CacheStorage[JT] def keys(): js.Promise[js.Array[String]] -experimental/cachestorage/CacheStorage[JT] def `match`(request: RequestInfo, options: CacheQueryOptions?): js.Promise[js.Any] -experimental/cachestorage/CacheStorage[JT] def open(cacheName: String): js.Promise[Cache] +experimental/cachestorage/package[SO] type Cache = dom.Cache (@deprecated in 2.0.0) +experimental/cachestorage/package[SO] type CacheQueryOptions = dom.CacheQueryOptions (@deprecated in 2.0.0) +experimental/cachestorage/package[SO] type CacheStorage = dom.CacheStorage (@deprecated in 2.0.0) experimental/deviceorientation/DeviceAcceleration[JT] val x: Double experimental/deviceorientation/DeviceAcceleration[JT] val y: Double experimental/deviceorientation/DeviceAcceleration[JT] val z: Double diff --git a/src/main/scala/org/scalajs/dom/experimental/cachestorage/CacheStorage.scala b/src/main/scala/org/scalajs/dom/CacheStorage.scala similarity index 96% rename from src/main/scala/org/scalajs/dom/experimental/cachestorage/CacheStorage.scala rename to src/main/scala/org/scalajs/dom/CacheStorage.scala index 339da48e7..709850749 100644 --- a/src/main/scala/org/scalajs/dom/experimental/cachestorage/CacheStorage.scala +++ b/src/main/scala/org/scalajs/dom/CacheStorage.scala @@ -1,6 +1,5 @@ -package org.scalajs.dom.experimental.cachestorage +package org.scalajs.dom -import org.scalajs.dom._ import scala.scalajs.js import scala.scalajs.js.annotation._ diff --git a/src/main/scala/org/scalajs/dom/WindowOrWorkerGlobalScope.scala b/src/main/scala/org/scalajs/dom/WindowOrWorkerGlobalScope.scala index d633b0034..79d5d7e7c 100644 --- a/src/main/scala/org/scalajs/dom/WindowOrWorkerGlobalScope.scala +++ b/src/main/scala/org/scalajs/dom/WindowOrWorkerGlobalScope.scala @@ -1,6 +1,5 @@ package org.scalajs.dom -import org.scalajs.dom.experimental.cachestorage.CacheStorage import scala.scalajs.js import scala.scalajs.js.| diff --git a/src/main/scala/org/scalajs/dom/experimental/cachestorage/package.scala b/src/main/scala/org/scalajs/dom/experimental/cachestorage/package.scala new file mode 100644 index 000000000..57e2848ac --- /dev/null +++ b/src/main/scala/org/scalajs/dom/experimental/cachestorage/package.scala @@ -0,0 +1,14 @@ +package org.scalajs +package dom.experimental + +package object cachestorage { + + @deprecated("use dom.CacheQueryOptions instead", "2.0.0") + type CacheQueryOptions = dom.CacheQueryOptions + + @deprecated("use dom.CacheStorage instead", "2.0.0") + type CacheStorage = dom.CacheStorage + + @deprecated("use dom.Cache instead", "2.0.0") + type Cache = dom.Cache +}