@ionic/portals-react-native 0.3.0 → 0.4.1

package/README.md

@@ -12,12 +12,12 @@
   <img src="https://img.shields.io/badge/platform-React%20Native%200.63.3%2B-blue?style=flat-square" alt="Supports React Native 0.63.3 and up" />
 </p>
 <p align="center">
-  <a href="https://github.com/ionic-team/ionic-portals/actions?query=workflow%3ACI"><img src="https://img.shields.io/github/workflow/status/ionic-team/react-native-ionic-portals/Verify?style=flat-square" /></a>
+  <a href="https://github.com/ionic-team/react-native-ionic-portals/actions/workflows/verify.yml"><img src="https://img.shields.io/github/actions/workflow/status/ionic-team/react-native-ionic-portals/verify.yml?branch=main&style=flat-square" /></a>
   <a href="https://www.npmjs.com/package/@ionic/portals-react-native"><img src="https://img.shields.io/npm/l/@ionic/portals-react-native?style=flat-square" /></a>
 </p>
 <p align="center">
   <a href="https://ionic.io/docs/portals"><img src="https://img.shields.io/static/v1?label=docs&message=ionic.io/portals&color=blue&style=flat-square" /></a>
-  <a href="https://twitter.com/ionicframework"><img src="https://img.shields.io/twitter/follow/ionicframework" /></a>
+  <a href="https://twitter.com/ionicframework"><img src="https://img.shields.io/badge/follow-%40ionicframework-1DA1F2?logo=twitter" alt="Follow @ionicframework"></a>
 </p>
 
 ---

package/ReactNativePortals.podspec

@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/**/*.{h,m,mm,swift}'
 
   s.dependency 'React-Core'
-  s.dependency 'IonicPortals', '~> 0.7.0'
-  s.dependency 'IonicLiveUpdates', '~> 0.2.0'
+  s.dependency 'IonicPortals', '~> 0.7.3'
+  s.dependency 'IonicLiveUpdates', '~> 0.4.0'
 end

package/android/build.gradle

@@ -125,7 +125,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     api "io.ionic:portals:0.7.+"
     //noinspection GradleDynamicVersion
-    api "io.ionic:liveupdates:0.2.+"
+    api "io.ionic:liveupdates:0.4.+"
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3"
 }

package/android/src/main/java/io/ionic/portals/reactnative/PortalView.kt

@@ -12,14 +12,12 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.getcapacitor.CapConfig
-import io.ionic.portals.Portal
 import io.ionic.portals.PortalFragment
-import io.ionic.portals.PortalManager
+import io.ionic.portals.WebVitals
 
 private data class PortalViewState(
     var fragment: PortalFragment?,
-    var portal: Portal?,
+    var portal: RNPortal?,
     var initialContext: HashMap<String, Any>?
 )
 
@@ -31,10 +29,10 @@ internal class PortalViewManager(private val context: ReactApplicationContext) :
     @ReactProp(name = "portal")
     fun setPortal(viewGroup: ViewGroup, portal: ReadableMap) {
         val name = portal.getString("name") ?: return
-        when (val viewState = fragmentMap[viewGroup.id]) {
+        when (fragmentMap[viewGroup.id]) {
             null -> fragmentMap[viewGroup.id] = PortalViewState(
                 fragment = null,
-                portal = PortalManager.getPortal(name),
+                portal = RNPortalManager.getPortal(name),
                 initialContext = portal.getMap("initialContext")?.toHashMap()
             )
         }
@@ -69,18 +67,18 @@ internal class PortalViewManager(private val context: ReactApplicationContext) :
         val parentView = root.findViewById<ViewGroup>(viewId)
         setupLayout(parentView)
 
-        val portalFragment = PortalFragment(portal)
-
-        val configBuilder = CapConfig.Builder(context)
-            .setInitialFocus(false)
-
-        RNPortalManager.indexMap[portal.name]
-            ?.let(configBuilder::setStartPath)
-
-        portalFragment.setConfig(configBuilder.create())
+        val portalFragment = PortalFragment(portal.portal)
+        if (portal.onFCP != null || portal.onFID != null || portal.onTTFB != null) {
+            portalFragment.webVitalsCallback = { metric, duration ->
+                when (metric) {
+                    WebVitals.Metric.FCP -> portal.onFCP?.let { it(duration) }
+                    WebVitals.Metric.FID -> portal.onFID?.let { it(duration) }
+                    WebVitals.Metric.TTFB -> portal.onTTFB?.let { it(duration) }
+                }
+            }
+        }
 
         viewState.initialContext?.let(portalFragment::setInitialContext)
-
         viewState.fragment = portalFragment
 
         val fragmentActivity = context.currentActivity as? FragmentActivity ?: return

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativeLiveUpdatesModule.kt

@@ -4,7 +4,9 @@ import android.content.Context
 import com.facebook.react.bridge.*
 import io.ionic.liveupdates.LiveUpdate
 import io.ionic.liveupdates.LiveUpdateManager
-import io.ionic.liveupdates.network.FailStep
+import io.ionic.liveupdates.data.model.FailResult
+import io.ionic.liveupdates.data.model.Snapshot
+import io.ionic.liveupdates.data.model.SyncResult
 import io.ionic.liveupdates.network.SyncCallback
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.awaitClose
@@ -18,48 +20,18 @@ internal object LiveUpdatesModule {
             .asCoroutineDispatcher()
     )
 
-    private fun callbackToMap(
-        liveUpdate: LiveUpdate,
-        failStep: FailStep?,
-        failMsg: String?
-    ): ReadableMap =
-        if (failStep != null) {
-            val map = WritableNativeMap()
-            map.putString("appId", liveUpdate.appId)
-            map.putString("failStep", failStep.name)
-            map.putString("message", failMsg ?: "Sync failed for unknown reason")
-            map
-        } else {
-            liveUpdate.toReadableMap()
-        }
-
-    private fun callbackToResult(
-        liveUpdate: LiveUpdate,
-        failStep: FailStep?,
-        failMsg: String?
-    ): LiveUpdateResult =
-        if (failStep != null) {
-            LiveUpdateError(
-                appId = liveUpdate.appId,
-                failStep = failStep.name,
-                failMsg = failMsg ?: "Sync failed for unknown reason"
-            )
-        } else {
-            LiveUpdateSuccess(liveUpdate)
-        }
-
     fun syncOne(appId: String, context: Context, promise: Promise) {
         LiveUpdateManager.sync(
             context = context,
             appId = appId,
             callback = object : SyncCallback {
-                override fun onAppComplete(
-                    liveUpdate: LiveUpdate,
-                    failStep: FailStep?,
-                    failMsg: String?
-                ) {
-                    val map = callbackToMap(liveUpdate, failStep, failMsg)
-                    promise.resolve(map)
+                override fun onAppComplete(syncResult: SyncResult) {
+                    promise.resolve(syncResult.toReadableMap())
+
+                }
+
+                override fun onAppComplete(failResult: FailResult) {
+                    promise.resolve(failResult.toReadableMap())
                 }
 
                 override fun onSyncComplete() {
@@ -82,7 +54,6 @@ internal object LiveUpdatesModule {
         sync(emptyArray(), context, promise)
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     private fun sync(appIds: Array<String>, context: Context, promise: Promise) {
         liveUpdateScope.launch {
             val results = callbackFlow {
@@ -90,12 +61,12 @@ internal object LiveUpdatesModule {
                     context = context,
                     appIds = appIds,
                     callback = object : SyncCallback {
-                        override fun onAppComplete(
-                            liveUpdate: LiveUpdate,
-                            failStep: FailStep?,
-                            failMsg: String?
-                        ) {
-                            trySend(callbackToResult(liveUpdate, failStep, failMsg))
+                        override fun onAppComplete(syncResult: SyncResult) {
+                            trySend(LiveUpdateSuccess(syncResult))
+                        }
+
+                        override fun onAppComplete(failResult: FailResult) {
+                            trySend(LiveUpdateFailure(failResult))
                         }
 
                         override fun onSyncComplete() {
@@ -109,8 +80,8 @@ internal object LiveUpdatesModule {
 
             val syncResults = results.fold(SyncResults.empty()) { syncResults, result ->
                 when (result) {
-                    is LiveUpdateSuccess -> syncResults.liveUpdates.add(result.liveUpdate)
-                    is LiveUpdateError -> syncResults.errors.add(result)
+                    is LiveUpdateSuccess -> syncResults.results.add(result)
+                    is LiveUpdateFailure -> syncResults.errors.add(result)
                 }
 
                 return@fold syncResults
@@ -121,43 +92,24 @@ internal object LiveUpdatesModule {
     }
 }
 
-fun LiveUpdate.toReadableMap(): ReadableMap {
-    val map = WritableNativeMap()
-    map.putString("appId", appId)
-    map.putString("channel", channelName)
-    return map
-}
-
 private sealed class LiveUpdateResult
-
-private data class LiveUpdateError(val appId: String, val failStep: String, val failMsg: String) :
-    LiveUpdateResult() {
-    val asReadableMap: ReadableMap
-        get() {
-            val map = WritableNativeMap()
-            map.putString("appId", appId)
-            map.putString("failStep", failStep)
-            map.putString("message", failMsg)
-            return map
-        }
-}
-
-private data class LiveUpdateSuccess(val liveUpdate: LiveUpdate) : LiveUpdateResult()
+private data class LiveUpdateFailure(val failure: FailResult) : LiveUpdateResult()
+private data class LiveUpdateSuccess(val success: SyncResult): LiveUpdateResult()
 
 private data class SyncResults(
-    val liveUpdates: MutableList<LiveUpdate>,
-    val errors: MutableList<LiveUpdateError>
+    val results: MutableList<LiveUpdateSuccess>,
+    val errors: MutableList<LiveUpdateFailure>
 ) {
     val asReadableMap: ReadableMap
         get() {
             val map = WritableNativeMap()
 
-            val liveUpdatesArray = WritableNativeArray()
-            liveUpdates.forEach { liveUpdatesArray.pushMap(it.toReadableMap()) }
-            map.putArray("liveUpdates", liveUpdatesArray)
+            val syncResultsArray = WritableNativeArray()
+            results.forEach { syncResultsArray.pushMap(it.success.toReadableMap()) }
+            map.putArray("results", syncResultsArray)
 
             val errorsArray = WritableNativeArray()
-            errors.forEach { errorsArray.pushMap(it.asReadableMap) }
+            errors.forEach { errorsArray.pushMap(it.failure.toReadableMap()) }
             map.putArray("errors", errorsArray)
 
             return map
@@ -167,3 +119,34 @@ private data class SyncResults(
         fun empty() = SyncResults(mutableListOf(), mutableListOf())
     }
 }
+
+fun LiveUpdate.toReadableMap(): ReadableMap {
+    val map = WritableNativeMap()
+    map.putString("appId", appId)
+    map.putString("channel", channelName)
+    return map
+}
+
+fun Snapshot.toReadableMap(): ReadableMap {
+    val map = WritableNativeMap()
+    map.putString("id", id)
+    map.putString("buildId", buildId)
+    return map
+}
+
+fun SyncResult.toReadableMap(): ReadableMap {
+    val map = WritableNativeMap()
+    map.putMap("liveUpdate", liveUpdate.toReadableMap())
+    map.putMap("snapshot", snapshot?.let(Snapshot::toReadableMap))
+    map.putString("source", source.name.lowercase())
+    map.putBoolean("activeApplicationPathChanged", latestAppDirectoryChanged)
+    return map
+}
+
+fun FailResult.toReadableMap(): ReadableMap {
+    val map = WritableNativeMap()
+    map.putString("appId", liveUpdate.appId)
+    map.putString("failStep", failStep.name)
+    map.putString("message", failMsg ?: "Sync failed for unknown reason.")
+    return map
+}

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalManager.kt

@@ -4,24 +4,52 @@ import com.facebook.react.bridge.*
 import com.getcapacitor.Plugin
 import io.ionic.liveupdates.LiveUpdate
 import io.ionic.liveupdates.LiveUpdateManager
-import io.ionic.portals.Portal
-import io.ionic.portals.PortalBuilder
-import io.ionic.portals.PortalManager
-import io.ionic.portals.PortalsPlugin
+import io.ionic.portals.*
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.BufferedReader
 import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap
+
+
+internal data class RNPortal(
+    val portal: Portal,
+    val index: String?,
+    val plugins: List<PortalPlugin>,
+    var onFCP: ((Long) -> Unit)? = null,
+    var onTTFB: ((Long) -> Unit)? = null,
+    var onFID: ((Long) -> Unit)? = null
+)
+
+internal data class PortalPlugin(val androidClassPath: String, val iosClassName: String) {
+    companion object {
+        const val iosClassNameKey = "iosClassName"
+        const val androidClassPathKey = "androidClassPath"
+        fun fromReadableMap(map: ReadableMap): PortalPlugin? {
+            val androidClassPath = map.getString(androidClassPathKey) ?: return null
+            val iosClassName = map.getString(iosClassNameKey) ?: return null
+            return PortalPlugin(androidClassPath, iosClassName)
+        }
+    }
+
+    fun toReadableMap(): ReadableMap {
+        val map = WritableNativeMap()
+        map.putString(iosClassNameKey, iosClassName)
+        map.putString(androidClassPathKey, androidClassPath)
+        return map
+    }
+}
 
 internal object RNPortalManager {
     private val manager = PortalManager
-    internal val indexMap: MutableMap<String, String> = mutableMapOf()
+    private val portals: ConcurrentHashMap<String, RNPortal> = ConcurrentHashMap()
     private lateinit var reactApplicationContext: ReactApplicationContext
     private var usesSecureLiveUpdates = false
 
     fun register(key: String) = manager.register(key)
-    fun addPortal(map: ReadableMap): Portal? {
+
+    fun addPortal(map: ReadableMap): RNPortal? {
         val name = map.getString("name") ?: return null
         val portalBuilder = PortalBuilder(name)
 
@@ -32,28 +60,56 @@ internal object RNPortalManager {
             ?.toHashMap()
             ?.let(portalBuilder::setInitialContext)
 
-        map.getString("index")
-            ?.let { indexMap[name] = "/$it" }
 
-        map.getArray("androidPlugins")
-            ?.toArrayList()
-            ?.mapNotNull { it as? String }
-            ?.map {
-                Class.forName(it)
-                    .asSubclass(Plugin::class.java)
-            }
-            ?.forEach(portalBuilder::addPlugin)
+        val plugins: List<PortalPlugin> = map.getArray("plugins")
+            ?.let { rnArray ->
+                val list = mutableListOf<PortalPlugin>()
+                for (idx in 0 until rnArray.size()) {
+                    rnArray.getMap(idx)
+                        ?.let(PortalPlugin.Companion::fromReadableMap)
+                        ?.let(list::add)
+                }
+                return@let list
+            } ?: listOf()
+
+        plugins.map {
+            Class.forName(it.androidClassPath)
+                .asSubclass(Plugin::class.java)
+        }
+            .forEach(portalBuilder::addPlugin)
+
+        val assetMaps: List<AssetMap> = map.getArray("assetMaps")
+            ?.let { rnArray ->
+                val list = mutableListOf<AssetMap>()
+
+                for (idx in 0 until rnArray.size()) {
+                    rnArray.getMap(idx)
+                        ?.let assetMap@{ map ->
+                            val name = map.getString("name") ?: return@assetMap null
+                            AssetMap(
+                                name = name,
+                                virtualPath = map.getString("virtualPath") ?: "/$name",
+                                path = map.getString("startDir") ?: ""
+                            )
+                        }
+                        ?.let(list::add)
+                }
+
+                return@let list
+            } ?: listOf()
+
+        assetMaps.forEach(portalBuilder::addAssetMap)
 
         map.getMap("liveUpdate")
             ?.let { readableMap ->
                 val appId = readableMap.getString("appId") ?: return@let null
                 val channel = readableMap.getString("channel") ?: return@let null
                 val syncOnAdd = readableMap.getBoolean("syncOnAdd")
-                Pair(LiveUpdate(appId, channel, usesSecureLiveUpdates), syncOnAdd)
+                Pair(LiveUpdate(appId, channel, RNPortalManager.usesSecureLiveUpdates), syncOnAdd)
             }
             ?.let { (liveUpdate, updateOnAppLoad) ->
                 portalBuilder.setLiveUpdateConfig(
-                    context = reactApplicationContext,
+                    context = RNPortalManager.reactApplicationContext,
                     liveUpdateConfig = liveUpdate,
                     updateOnAppLoad = updateOnAppLoad
                 )
@@ -63,11 +119,18 @@ internal object RNPortalManager {
             .addPlugin(PortalsPlugin::class.java)
             .create()
 
-        manager.addPortal(portal)
-        return portal
+        val rnPortal = RNPortal(
+            portal = portal,
+            index = map.getString("index"),
+            plugins = plugins
+        )
+
+        portals[rnPortal.portal.name] = rnPortal
+        return rnPortal
     }
 
-    fun getPortal(name: String): Portal = manager.getPortal(name)
+    fun getPortal(name: String): RNPortal = portals[name]
+        ?: throw IllegalStateException("Portal with portalId $name not found in RNPortalManager")
 
     fun enableSecureLiveUpdates(keyPath: String) {
         LiveUpdateManager.secureLiveUpdatePEM = keyPath

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalsModule.kt

@@ -89,35 +89,32 @@ fun Map<*, *>.toReadableMap(): ReadableMap {
     }
 }
 
-fun List<*>.toReadableArray(): ReadableArray {
-    return (0 until size).fold(WritableNativeArray()) { array, index ->
-        when (val value = get(index)) {
-            is String -> array.pushString(value)
-            is Boolean -> array.pushBoolean(value)
-            is Int -> array.pushInt(value)
-            is Double -> array.pushDouble(value)
-            is Map<*, *> -> array.pushMap(value.toReadableMap())
-            is List<*> -> array.pushArray(value.toReadableArray())
-            null -> array.pushNull()
-            else -> array.pushString(value.toString())
-        }
-
-        return@fold array
+fun List<*>.toReadableArray(): ReadableArray = fold(WritableNativeArray()) { array, value ->
+    when (value) {
+        is String -> array.pushString(value)
+        is Boolean -> array.pushBoolean(value)
+        is Int -> array.pushInt(value)
+        is Double -> array.pushDouble(value)
+        is PortalPlugin -> array.pushMap(value.toReadableMap())
+        is Map<*, *> -> array.pushMap(value.toReadableMap())
+        is List<*> -> array.pushArray(value.toReadableArray())
+        null -> array.pushNull()
+        else -> array.pushString(value.toString())
     }
+    return@fold array
 }
 
-@Suppress("UNCHECKED_CAST")
-fun Portal.toReadableMap(): ReadableMap {
+internal fun RNPortal.toReadableMap(): ReadableMap {
     val map = WritableNativeMap()
-    map.putString("name", name)
-    map.putString("startDir", startDir)
-    RNPortalManager.indexMap[name]?.let { map.putString("index", it) }
-
-    initialContext?.let {
+    map.putString("name", portal.name)
+    map.putString("startDir", portal.startDir)
+    map.putArray("plugins", plugins.toReadableArray())
+    index?.let { map.putString("index", it) }
+    portal.initialContext?.let {
         if (it is Map<*, *>) map.putMap("initialContext", it.toReadableMap())
     }
 
-    liveUpdateConfig?.let { map.putMap("liveUpdate", it.toReadableMap()) }
+    portal.liveUpdateConfig?.let { map.putMap("liveUpdate", it.toReadableMap()) }
 
     return map
 }

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalsPackage.kt

@@ -11,6 +11,7 @@ class ReactNativePortalsPackage : ReactPackage {
         return listOf(
             PortalManagerModule(reactContext),
             PortalsPubSubModule(reactContext),
+            PortalWebVitalsModule(reactContext)
         )
     }
 

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativeWebVitalsModule.kt

@@ -0,0 +1,52 @@
+package io.ionic.portals.reactnative
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.modules.core.DeviceEventManagerModule
+
+internal class PortalWebVitalsModule(reactContext: ReactApplicationContext): ReactContextBaseJavaModule(reactContext) {
+    override fun getName() = "IONPortalsWebVitals"
+
+    @ReactMethod
+    fun registerOnFirstContentfulPaint(portalName: String, promise: Promise) {
+        RNPortalManager.getPortal(portalName).onFCP = { duration ->
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("vitals:fcp", mapOf("duration" to duration, "portalName" to portalName).toReadableMap())
+        }
+
+        promise.resolve(null)
+    }
+
+    @ReactMethod
+    fun registerOnFirstInputDelay(portalName: String, promise: Promise) {
+        RNPortalManager.getPortal(portalName).onFID = { duration ->
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("vitals:fid", mapOf("duration" to duration, "portalName" to portalName).toReadableMap())
+        }
+
+        promise.resolve(null)
+    }
+
+    @ReactMethod
+    fun registerOnTimeToFirstByte(portalName: String, promise: Promise) {
+        RNPortalManager.getPortal(portalName).onTTFB = { duration ->
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("vitals:ttfb", mapOf("duration" to duration, "portalName" to portalName).toReadableMap())
+        }
+
+        promise.resolve(null)
+    }
+
+    @ReactMethod
+    fun addListener(eventName: String) {
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int) {
+    }
+}

package/ios/AssetMap+Dict.swift

@@ -0,0 +1,28 @@
+//
+//  AssetMap+Dict.swift
+//  ReactNativePortals
+//
+//  Created by Steven Sherry on 3/29/23.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+import IonicPortals
+
+extension AssetMap {
+    init?(_ dict: [String: Any]) {
+        guard let name = dict["name"] as? String else { return nil }
+        self.init(
+            name: name,
+            virtualPath: dict["virtualPath"] as? String,
+            startDir: dict["startDir"] as? String ?? ""
+        )
+    }
+    
+    var dict: [String: Any] {
+        return [
+            "name": name,
+            "virtualPath": virtualPath,
+            "startDir": startDir
+        ]
+    }
+}

package/ios/ConcurrentDictionary.swift

@@ -0,0 +1,45 @@
+//
+//  ConcurrentHashMap.swift
+//  ReactNativePortals
+//
+//  Created by Steven Sherry on 3/31/23.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+import Foundation
+
+class ConcurrentDictionary<Key: Hashable, Value> {
+    private var _dict: Dictionary<Key, Value>
+    var dict: Dictionary<Key, Value> {
+        queue.sync { _dict }
+    }
+    private let queue: DispatchQueue
+    
+    init(label: String, dict: [Key: Value] = [:]) {
+        queue = DispatchQueue(label: label, qos: .userInitiated, attributes: .concurrent)
+        self._dict = dict
+    }
+    
+    subscript(_ key: Key) -> Value? {
+        get { queue.sync { _dict[key] } }
+        set {
+            queue.async(flags: .barrier) { [weak self] in
+                self?._dict[key] = newValue
+            }
+        }
+    }
+}
+
+extension ConcurrentDictionary: Collection {
+    var startIndex: Dictionary<Key, Value>.Index { dict.startIndex }
+    var endIndex: Dictionary<Key, Value>.Index { dict.endIndex }
+    func index(after i: Dictionary<Key, Value>.Index) -> Dictionary<Key, Value>.Index {
+        dict.index(after: i)
+    }
+    
+    subscript(position: Dictionary<Key, Value>.Index) -> Dictionary<Key, Value>.Element {
+        get {
+            dict[position]
+        }
+    }
+}