Skip to content

Commit dee694d

Browse files
authored
Fixed map parsing on JSON serializer (#501)
1 parent a654df4 commit dee694d

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

src.compiler/typescript/SerializerEmitter.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -801,14 +801,12 @@ function generateSetPropertyBody(program: ts.Program,
801801
ts.factory.createExpressionStatement(
802802
ts.factory.createCallExpression(
803803
ts.factory.createPropertyAccessExpression(
804-
ts.factory.createAsExpression(
805-
ts.factory.createIdentifier('v'),
806-
createStringUnknownMapNode()
807-
),
804+
ts.factory.createIdentifier('JsonHelper'),
808805
'forEach'
809806
),
810807
undefined,
811808
[
809+
ts.factory.createIdentifier('v'),
812810
ts.factory.createArrowFunction(
813811
undefined,
814812
undefined,

src/generated/NotationSettingsSerializer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class NotationSettingsSerializer {
4848
return true;
4949
case "elements":
5050
obj.elements = new Map<NotationElement, boolean>();
51-
(v as Map<string, unknown>).forEach((v, k) => {
51+
JsonHelper.forEach(v, (v, k) => {
5252
obj.elements.set((JsonHelper.parseEnum<NotationElement>(k, NotationElement)!), (v as boolean));
5353
});
5454
return true;

src/generated/model/MasterBarSerializer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class MasterBarSerializer {
8181
return true;
8282
case "fermata":
8383
obj.fermata = new Map<number, Fermata>();
84-
(v as Map<string, unknown>).forEach((v, k) => {
84+
JsonHelper.forEach(v, (v, k) => {
8585
const i = new Fermata();
8686
FermataSerializer.fromJson(i, (v as Map<string, unknown>));
8787
obj.fermata.set(parseInt(k), i);

src/generated/model/StaffSerializer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class StaffSerializer {
5050
return true;
5151
case "chords":
5252
obj.chords = new Map<string, Chord>();
53-
(v as Map<string, unknown>).forEach((v, k) => {
53+
JsonHelper.forEach(v, (v, k) => {
5454
const i = new Chord();
5555
ChordSerializer.fromJson(i, (v as Map<string, unknown>));
5656
obj.addChord(k, i);

0 commit comments

Comments
 (0)