From 93761f318cddcf26e65bf8229eca274a7fff8e60 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Thu, 7 Jan 2021 17:04:17 +0100
Subject: [PATCH] Fixed map parsing on JSON serializer

---
 src.compiler/typescript/SerializerEmitter.ts | 6 ++----
 src/generated/NotationSettingsSerializer.ts  | 2 +-
 src/generated/model/MasterBarSerializer.ts   | 2 +-
 src/generated/model/StaffSerializer.ts       | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src.compiler/typescript/SerializerEmitter.ts b/src.compiler/typescript/SerializerEmitter.ts
index dadc27755..b80081dbc 100644
--- a/src.compiler/typescript/SerializerEmitter.ts
+++ b/src.compiler/typescript/SerializerEmitter.ts
@@ -801,14 +801,12 @@ function generateSetPropertyBody(program: ts.Program,
                 ts.factory.createExpressionStatement(
                     ts.factory.createCallExpression(
                         ts.factory.createPropertyAccessExpression(
-                            ts.factory.createAsExpression(
-                                ts.factory.createIdentifier('v'),
-                                createStringUnknownMapNode()
-                            ),
+                            ts.factory.createIdentifier('JsonHelper'),
                             'forEach'
                         ),
                         undefined,
                         [
+                            ts.factory.createIdentifier('v'),
                             ts.factory.createArrowFunction(
                                 undefined,
                                 undefined,
diff --git a/src/generated/NotationSettingsSerializer.ts b/src/generated/NotationSettingsSerializer.ts
index deba6f6e7..9cb1cba31 100644
--- a/src/generated/NotationSettingsSerializer.ts
+++ b/src/generated/NotationSettingsSerializer.ts
@@ -48,7 +48,7 @@ export class NotationSettingsSerializer {
                 return true;
             case "elements":
                 obj.elements = new Map<NotationElement, boolean>();
-                (v as Map<string, unknown>).forEach((v, k) => {
+                JsonHelper.forEach(v, (v, k) => {
                     obj.elements.set((JsonHelper.parseEnum<NotationElement>(k, NotationElement)!), (v as boolean)); 
                 });
                 return true;
diff --git a/src/generated/model/MasterBarSerializer.ts b/src/generated/model/MasterBarSerializer.ts
index b0e8c8c3e..96e28b47a 100644
--- a/src/generated/model/MasterBarSerializer.ts
+++ b/src/generated/model/MasterBarSerializer.ts
@@ -81,7 +81,7 @@ export class MasterBarSerializer {
                 return true;
             case "fermata":
                 obj.fermata = new Map<number, Fermata>();
-                (v as Map<string, unknown>).forEach((v, k) => {
+                JsonHelper.forEach(v, (v, k) => {
                     const i = new Fermata(); 
                     FermataSerializer.fromJson(i, (v as Map<string, unknown>)); 
                     obj.fermata.set(parseInt(k), i); 
diff --git a/src/generated/model/StaffSerializer.ts b/src/generated/model/StaffSerializer.ts
index 93da74bf3..706f892c7 100644
--- a/src/generated/model/StaffSerializer.ts
+++ b/src/generated/model/StaffSerializer.ts
@@ -50,7 +50,7 @@ export class StaffSerializer {
                 return true;
             case "chords":
                 obj.chords = new Map<string, Chord>();
-                (v as Map<string, unknown>).forEach((v, k) => {
+                JsonHelper.forEach(v, (v, k) => {
                     const i = new Chord(); 
                     ChordSerializer.fromJson(i, (v as Map<string, unknown>)); 
                     obj.addChord(k, i);