Updated for Blazor 3.0.0-preview4. (#22)

DanielCarmingham · galvesribeiro · commit e07ce27284f8 · 2019-04-30T09:22:29.000-03:00
* Updates for 3.0.0-preview for compatibility.  Also removed BlazorExtensions.Logging dependency from Test project.

* Added dotnet core installer for 3.0.100-preview4 to CI

* Removed myget.org package sources
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -4,6 +4,11 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+  - task: DotNetCoreInstaller@0
+    inputs:
+      packageType: 'sdk'
+      version: '3.0.100-preview4-011223'
+
   - task: Npm@1
     inputs:
       command: 'install'
diff --git a/.vsts-release.yml b/.vsts-release.yml
@@ -4,6 +4,11 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+  - task: DotNetCoreInstaller@0
+    inputs:
+      packageType: 'sdk'
+      version: '3.0.100-preview4-011223'
+
   - task: Npm@1
     inputs:
       command: 'install'
diff --git a/src/Blazor.Extensions.Storage.JS/Blazor.Extensions.Storage.JS.csproj b/src/Blazor.Extensions.Storage.JS/Blazor.Extensions.Storage.JS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
     <WebpackInputs Include="**\*.ts" Exclude="dist\**;node_modules\**" />
   </ItemGroup>
 
diff --git a/src/Blazor.Extensions.Storage/Blazor.Extensions.Storage.csproj b/src/Blazor.Extensions.Storage/Blazor.Extensions.Storage.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Title>Blazor Extensions Storage</Title>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blazor.Extensions.Storage/LocalStorage.cs b/src/Blazor.Extensions.Storage/LocalStorage.cs
@@ -7,30 +7,38 @@ namespace Blazor.Extensions.Storage
 {
     public class LocalStorage : IStorage
     {
-        public Task<int> Length() => JSRuntime.Current.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.LOCAL_STORAGE);
-        public Task Clear() => JSRuntime.Current.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.LOCAL_STORAGE);
+        private readonly IJSRuntime runtime;
+
+        public Task<int> Length() => this.runtime.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.LOCAL_STORAGE);
+
+        public Task Clear() => this.runtime.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.LOCAL_STORAGE);
+
+        public LocalStorage(IJSRuntime runtime)
+        {
+            this.runtime = runtime;
+        }
 
         public Task<TItem> GetItem<TItem>(string key)
         {
             if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
 
-            return JSRuntime.Current.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);
+            return this.runtime.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);
         }
 
-        public Task<string> Key(int index) => JSRuntime.Current.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.LOCAL_STORAGE, index);
+        public Task<string> Key(int index) => this.runtime.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.LOCAL_STORAGE, index);
 
         public Task RemoveItem(string key)
         {
             if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
 
-            return JSRuntime.Current.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);
+            return this.runtime.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);
         }
 
         public Task SetItem<TItem>(string key, TItem item)
         {
             if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
 
-            return JSRuntime.Current.InvokeAsync<object>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key, item);
+            return this.runtime.InvokeAsync<object>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key, item);
         }
     }
 }
diff --git a/src/Blazor.Extensions.Storage/SessionStorage.cs b/src/Blazor.Extensions.Storage/SessionStorage.cs
@@ -7,30 +7,38 @@ namespace Blazor.Extensions.Storage
 {
     public class SessionStorage : IStorage
     {
-        public Task<int> Length() => JSRuntime.Current.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.SESSION_STORAGE);
-        public Task Clear() => JSRuntime.Current.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.SESSION_STORAGE);
+        private readonly IJSRuntime runtime;
+
+        public Task<int> Length() => this.runtime.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.SESSION_STORAGE);
+
+        public Task Clear() => this.runtime.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.SESSION_STORAGE);
+
+        public SessionStorage(IJSRuntime runtime)
+        {
+            this.runtime = runtime;
+        }
 
         public Task<TItem> GetItem<TItem>(string key)
         {
             if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
 
-            return JSRuntime.Current.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);
+            return this.runtime.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);
         }
 
-        public Task<string> Key(int index) => JSRuntime.Current.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.SESSION_STORAGE, index);
+        public Task<string> Key(int index) => this.runtime.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.SESSION_STORAGE, index);
 
         public Task RemoveItem(string key)
         {
             if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
 
-            return JSRuntime.Current.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);
+            return this.runtime.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);
         }
 
         public Task SetItem<TItem>(string key, TItem item)
         {
             if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
 
-            return JSRuntime.Current.InvokeAsync<TItem>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key, item);
+            return this.runtime.InvokeAsync<TItem>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key, item);
         }
     }
 }
diff --git a/test/Blazor.Extensions.Storage.Test/App.razor b/test/Blazor.Extensions.Storage.Test/App.razor
diff --git a/test/Blazor.Extensions.Storage.Test/Blazor.Extensions.Storage.Test.csproj b/test/Blazor.Extensions.Storage.Test/Blazor.Extensions.Storage.Test.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <RunCommand>dotnet</RunCommand>
-    <RunArguments>blazor serve</RunArguments>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazor.Extensions.Logging" Version="0.1.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" />
-    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Blazor.Extensions.Storage.Test/Interop/InteropStorage.cs b/test/Blazor.Extensions.Storage.Test/Interop/InteropStorage.cs
@@ -8,14 +8,21 @@ namespace Blazor.Extensions.Storage.Test.Interop
     /// </summary>
     public class InteropStorage
     {
+        private readonly IJSRuntime runtime;
+
+        public InteropStorage(IJSRuntime runtime)
+        {
+            this.runtime = runtime;
+        }
+
         /// <summary>
         /// Returns a session storage value.
         /// </summary>
         /// <param name="key">Key associated with stroed value.</param>
         /// <returns>Task that returns the stored value as a string.</returns>
         public async Task<string> GetSessionStorage(string key)
         {
-            return await JSRuntime.Current.InvokeAsync<string>(
+            return await this.runtime.InvokeAsync<string>(
                 "getSessionStorage",
                 key
             );
@@ -28,7 +35,7 @@ public async Task<string> GetSessionStorage(string key)
         /// <returns>Task that returns the stored value as a string.</returns>
         public async Task<string> GetLocalStorage(string key)
         {
-            return await JSRuntime.Current.InvokeAsync<string>(
+            return await this.runtime.InvokeAsync<string>(
                 "getLocalStorage",
                 key
             );
diff --git a/test/Blazor.Extensions.Storage.Test/Pages/Index.cshtml b/test/Blazor.Extensions.Storage.Test/Pages/Index.cshtml
diff --git a/test/Blazor.Extensions.Storage.Test/Pages/Index.razor b/test/Blazor.Extensions.Storage.Test/Pages/Index.razor
@@ -0,0 +1,87 @@
+@page "/"
+@inject SessionStorage SessionStorage
+@inject LocalStorage LocalStorage
+@inject HttpClient Http
+@inject InteropStorage  InteropStorage
+@inject IJSRuntime JSRuntime
+@using Blazor.Extensions.Storage.Test.Interop
+
+<h1>Test logging output:  (See debugger log for full output)</h1>
+
+<div>
+    @foreach (var message in log)
+    {
+        <div>@message</div>
+    }
+</div>
+
+@functions {
+    private WeatherForecast[] forecasts;
+
+    private List<string> log = new List<string>();
+
+    private async void LogInformation(object message)
+    {
+        log.Add(message.ToString());
+        var _ = await JSRuntime.InvokeAsync<object>("console.info", message);
+    }
+
+    private async void LogError(object message)
+    {
+        log.Add($"ERROR: {message.ToString()}");
+        var _ = await JSRuntime.InvokeAsync<object>("console.error", message);
+    }
+
+    protected override async Task OnInitAsync()
+    {
+        forecasts = (await Http.GetJsonAsync<WeatherForecast[]>("weather.json"));
+        var key = "forecasts";
+        try
+        {
+            await SessionStorage.SetItem<WeatherForecast[]>(key, forecasts);
+            await LocalStorage.SetItem<WeatherForecast[]>(key, forecasts);
+
+            var fromIopSession = await InteropStorage.GetSessionStorage(key);
+            var fromIopLocal = await InteropStorage.GetLocalStorage(key);
+
+            var iopSessionHasQuotes = fromIopSession.StartsWith("\"") || fromIopSession.EndsWith("\"");
+            var iopLocalHasQuotes = fromIopLocal.StartsWith("\"") || fromIopLocal.EndsWith("\"");
+
+            LogInformation($"Interop get from session storage contains extra quotes: {iopSessionHasQuotes}");
+            LogInformation(fromIopSession);
+            LogInformation($"Interop get from local storage contains extra quotes: {iopLocalHasQuotes}");
+            LogInformation(fromIopLocal);
+
+            var fromSession = await SessionStorage.GetItem<WeatherForecast[]>(key);
+            var fromLocal = await LocalStorage.GetItem<WeatherForecast[]>(key);
+
+            LogInformation("From session storage:");
+            LogInformation(fromSession);
+            LogInformation("From local storage:");
+            LogInformation(fromLocal);
+
+            LogInformation($"Total in session: {await SessionStorage.Length()}");
+            LogInformation($"Total in local: {await LocalStorage.Length()}");
+
+            LogInformation("Removing from session storage...");
+            await SessionStorage.RemoveItem(key);
+            LogInformation("Removing from local storage...");
+            await LocalStorage.RemoveItem(key);
+
+            LogInformation($"Total in session: {await SessionStorage.Length()}");
+            LogInformation($"Total in local: {await SessionStorage.Length()}");
+        }
+        catch (Exception ex)
+        {
+            LogError(ex);
+        }
+    }
+
+    class WeatherForecast
+    {
+        public DateTime Date { get; set; }
+        public int TemperatureC { get; set; }
+        public int TemperatureF { get; set; }
+        public string Summary { get; set; }
+    }
+}
diff --git a/test/Blazor.Extensions.Storage.Test/Pages/_Imports.razor b/test/Blazor.Extensions.Storage.Test/Pages/_Imports.razor
diff --git a/test/Blazor.Extensions.Storage.Test/Shared/MainLayout.cshtml b/test/Blazor.Extensions.Storage.Test/Shared/MainLayout.cshtml
diff --git a/test/Blazor.Extensions.Storage.Test/Shared/MainLayout.razor b/test/Blazor.Extensions.Storage.Test/Shared/MainLayout.razor
@@ -0,0 +1,5 @@
+@inherits LayoutComponentBase
+
+<div>
+    @Body
+</div>
diff --git a/test/Blazor.Extensions.Storage.Test/Startup.cs b/test/Blazor.Extensions.Storage.Test/Startup.cs
@@ -1,7 +1,6 @@
-using Blazor.Extensions.Logging;
-using Microsoft.AspNetCore.Blazor.Builder;
+using Blazor.Extensions.Storage.Test.Interop;
+using Microsoft.AspNetCore.Components.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace Blazor.Extensions.Storage.Test
 {
@@ -12,13 +11,10 @@ public void ConfigureServices(IServiceCollection services)
             //Add Blazor.Extensions.Storage
             services.AddStorage();
 
-            services.AddLogging(builder => builder
-                .AddBrowserConsole()
-                .SetMinimumLevel(LogLevel.Trace)
-            );
+            services.AddScoped<InteropStorage>();
         }
 
-        public void Configure(IBlazorApplicationBuilder app)
+        public void Configure(IComponentsApplicationBuilder app)
         {
             app.AddComponent<App>("app");
         }
diff --git a/test/Blazor.Extensions.Storage.Test/_Imports.razor b/test/Blazor.Extensions.Storage.Test/_Imports.razor
@@ -0,0 +1,7 @@
+@using System.Net.Http
+@using Microsoft.AspNetCore.Components.Layouts
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.JSInterop
+@using Blazor.Extensions.Storage
+@using Blazor.Extensions.Storage.Test
+@using Blazor.Extensions.Storage.Test.Shared
diff --git a/test/Blazor.Extensions.Storage.Test/_ViewImports.cshtml b/test/Blazor.Extensions.Storage.Test/_ViewImports.cshtml

Original file line number	Diff line number	Diff line change
`@@ -7,30 +7,38 @@ namespace Blazor.Extensions.Storage`
`7`	`7`	`{`
`8`	`8`	`public class LocalStorage : IStorage`
`9`	`9`	`{`
`10`		`- public Task<int> Length() => JSRuntime.Current.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.LOCAL_STORAGE);`
`11`		`- public Task Clear() => JSRuntime.Current.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.LOCAL_STORAGE);`
	`10`	`+ private readonly IJSRuntime runtime;`
	`11`	`+`
	`12`	`+ public Task<int> Length() => this.runtime.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.LOCAL_STORAGE);`
	`13`	`+`
	`14`	`+ public Task Clear() => this.runtime.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.LOCAL_STORAGE);`
	`15`	`+`
	`16`	`+ public LocalStorage(IJSRuntime runtime)`
	`17`	`+ {`
	`18`	`+ this.runtime = runtime;`
	`19`	`+ }`
`12`	`20`
`13`	`21`	`public Task<TItem> GetItem<TItem>(string key)`
`14`	`22`	`{`
`15`	`23`	`if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));`
`16`	`24`
`17`		`- return JSRuntime.Current.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);`
	`25`	`+ return this.runtime.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);`
`18`	`26`	`}`
`19`	`27`
`20`		`- public Task<string> Key(int index) => JSRuntime.Current.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.LOCAL_STORAGE, index);`
	`28`	`+ public Task<string> Key(int index) => this.runtime.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.LOCAL_STORAGE, index);`
`21`	`29`
`22`	`30`	`public Task RemoveItem(string key)`
`23`	`31`	`{`
`24`	`32`	`if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));`
`25`	`33`
`26`		`- return JSRuntime.Current.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);`
	`34`	`+ return this.runtime.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);`
`27`	`35`	`}`
`28`	`36`
`29`	`37`	`public Task SetItem<TItem>(string key, TItem item)`
`30`	`38`	`{`
`31`	`39`	`if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));`
`32`	`40`
`33`		`- return JSRuntime.Current.InvokeAsync<object>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key, item);`
	`41`	`+ return this.runtime.InvokeAsync<object>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key, item);`
`34`	`42`	`}`
`35`	`43`	`}`
`36`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,30 +7,38 @@ namespace Blazor.Extensions.Storage`
`7`	`7`	`{`
`8`	`8`	`public class SessionStorage : IStorage`
`9`	`9`	`{`
`10`		`- public Task<int> Length() => JSRuntime.Current.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.SESSION_STORAGE);`
`11`		`- public Task Clear() => JSRuntime.Current.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.SESSION_STORAGE);`
	`10`	`+ private readonly IJSRuntime runtime;`
	`11`	`+`
	`12`	`+ public Task<int> Length() => this.runtime.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.SESSION_STORAGE);`
	`13`	`+`
	`14`	`+ public Task Clear() => this.runtime.InvokeAsync<object>(MethodNames.CLEAR_METHOD, StorageTypeNames.SESSION_STORAGE);`
	`15`	`+`
	`16`	`+ public SessionStorage(IJSRuntime runtime)`
	`17`	`+ {`
	`18`	`+ this.runtime = runtime;`
	`19`	`+ }`
`12`	`20`
`13`	`21`	`public Task<TItem> GetItem<TItem>(string key)`
`14`	`22`	`{`
`15`	`23`	`if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));`
`16`	`24`
`17`		`- return JSRuntime.Current.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);`
	`25`	`+ return this.runtime.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);`
`18`	`26`	`}`
`19`	`27`
`20`		`- public Task<string> Key(int index) => JSRuntime.Current.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.SESSION_STORAGE, index);`
	`28`	`+ public Task<string> Key(int index) => this.runtime.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.SESSION_STORAGE, index);`
`21`	`29`
`22`	`30`	`public Task RemoveItem(string key)`
`23`	`31`	`{`
`24`	`32`	`if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));`
`25`	`33`
`26`		`- return JSRuntime.Current.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);`
	`34`	`+ return this.runtime.InvokeAsync<object>(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);`
`27`	`35`	`}`
`28`	`36`
`29`	`37`	`public Task SetItem<TItem>(string key, TItem item)`
`30`	`38`	`{`
`31`	`39`	`if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));`
`32`	`40`
`33`		`- return JSRuntime.Current.InvokeAsync<TItem>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key, item);`
	`41`	`+ return this.runtime.InvokeAsync<TItem>(MethodNames.SET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key, item);`
`34`	`42`	`}`
`35`	`43`	`}`
`36`	`44`	`}`