From b4edc5839eb946d872181253e8009d65e62c9474 Mon Sep 17 00:00:00 2001 From: jonaro00 <54029719+jonaro00@users.noreply.github.com> Date: Mon, 28 Nov 2022 02:23:39 +0100 Subject: [PATCH 1/6] Optimize compiler, clean up generated output --- src.compiler/TranspilerBase.ts | 21 +++-- src.compiler/typescript/AlphaTabGenerator.ts | 22 +++-- src.compiler/typescript/EmitterBase.ts | 58 ++++++------ src/generated/CoreSettingsSerializer.ts | 35 ++++---- src/generated/DisplaySettingsSerializer.ts | 37 ++++---- src/generated/ImporterSettingsSerializer.ts | 21 +++-- src/generated/NotationSettingsSerializer.ts | 39 ++++---- src/generated/PlayerSettingsSerializer.ts | 53 ++++++----- src/generated/RenderingResourcesSerializer.ts | 49 +++++----- src/generated/SettingsSerializer.ts | 33 ++++--- .../SlidePlaybackSettingsSerializer.ts | 21 +++-- .../VibratoPlaybackSettingsSerializer.ts | 31 ++++--- src/generated/model/AutomationCloner.ts | 15 ++-- src/generated/model/AutomationSerializer.ts | 25 +++--- src/generated/model/BarSerializer.ts | 25 +++--- src/generated/model/BeatCloner.ts | 89 +++++++++---------- src/generated/model/BeatSerializer.ts | 89 +++++++++---------- src/generated/model/BendPointCloner.ts | 9 +- src/generated/model/BendPointSerializer.ts | 19 ++-- src/generated/model/ChordSerializer.ts | 29 +++--- src/generated/model/FermataSerializer.ts | 19 ++-- .../model/InstrumentArticulationSerializer.ts | 31 ++++--- src/generated/model/MasterBarSerializer.ts | 55 ++++++------ src/generated/model/NoteCloner.ts | 73 ++++++++------- src/generated/model/NoteSerializer.ts | 85 +++++++++--------- .../model/PlaybackInformationSerializer.ts | 31 ++++--- .../model/RenderStylesheetSerializer.ts | 17 ++-- src/generated/model/ScoreSerializer.ts | 47 +++++----- src/generated/model/SectionSerializer.ts | 19 ++-- src/generated/model/StaffSerializer.ts | 43 +++++---- src/generated/model/TrackSerializer.ts | 29 +++--- src/generated/model/TuningSerializer.ts | 21 +++-- src/generated/model/VoiceSerializer.ts | 21 +++-- 33 files changed, 587 insertions(+), 624 deletions(-) diff --git a/src.compiler/TranspilerBase.ts b/src.compiler/TranspilerBase.ts index d5b625399..942c74461 100644 --- a/src.compiler/TranspilerBase.ts +++ b/src.compiler/TranspilerBase.ts @@ -39,7 +39,7 @@ export default function (emitters: Emitter[], handleErrors: boolean = false) { }; const parsedCommandLine = ts.getParsedCommandLineOfConfigFile(commandLine.options.project!, commandLine.options, parseConfigFileHost, /*extendedConfigCache*/ undefined, commandLine.watchOptions)!; - const pretty = !!ts.sys.writeOutputIsTTY && ts.sys.writeOutputIsTTY(); + const pretty = !!ts.sys.writeOutputIsTTY?.(); if (pretty) { reportDiagnostic = createDiagnosticReporter(true); } @@ -51,14 +51,17 @@ export default function (emitters: Emitter[], handleErrors: boolean = false) { host: ts.createCompilerHost(parsedCommandLine.options), }); - const allDiagnostics = program.getConfigFileParsingDiagnostics().slice(); - const configFileParsingDiagnosticsLength = allDiagnostics.length; - allDiagnostics.push(...program.getSyntacticDiagnostics()); - - if (allDiagnostics.length === configFileParsingDiagnosticsLength) { - allDiagnostics.push(...program.getOptionsDiagnostics()); - allDiagnostics.push(...program.getGlobalDiagnostics()); - allDiagnostics.push(...program.getSemanticDiagnostics()); + let allDiagnostics: ts.Diagnostic[] = []; + if (handleErrors) { + allDiagnostics = program.getConfigFileParsingDiagnostics().slice(); + const syntacticDiagnostics = program.getSyntacticDiagnostics(); + if (syntacticDiagnostics.length) { + allDiagnostics.push(...syntacticDiagnostics); + } else { + allDiagnostics.push(...program.getOptionsDiagnostics()); + allDiagnostics.push(...program.getGlobalDiagnostics()); + allDiagnostics.push(...program.getSemanticDiagnostics()); + } } program.getTypeChecker(); diff --git a/src.compiler/typescript/AlphaTabGenerator.ts b/src.compiler/typescript/AlphaTabGenerator.ts index 6fac28aa0..1ac5a1d5e 100644 --- a/src.compiler/typescript/AlphaTabGenerator.ts +++ b/src.compiler/typescript/AlphaTabGenerator.ts @@ -1,8 +1,8 @@ import * as ts from 'typescript'; import cloneEmit from './CloneEmitter'; +import { GENERATED_FILE_HEADER } from './EmitterBase'; import serializerEmit from './SerializerEmitter'; import transpiler from '../TranspilerBase'; -import * as path from 'path'; import * as fs from 'fs'; transpiler([{ @@ -11,18 +11,16 @@ transpiler([{ }, { name: 'Serializer', emit: serializerEmit -}]); +}], false); // Write version file import { version } from '../../package.json'; const fileHandle = fs.openSync('src/generated/VersionInfo.ts', 'w'); -fs.writeSync(fileHandle, '// \n'); -fs.writeSync(fileHandle, '// This code was auto-generated.\n'); -fs.writeSync(fileHandle, '// Changes to this file may cause incorrect behavior and will be lost if\n'); -fs.writeSync(fileHandle, '// the code is regenerated.\n'); -fs.writeSync(fileHandle, '// \n'); -fs.writeSync(fileHandle, 'export class VersionInfo {\n'); -fs.writeSync(fileHandle, ` public static readonly version:string = '${version}';\n`); -fs.writeSync(fileHandle, ` public static readonly date:string = '${new Date().toISOString()}';\n`); -fs.writeSync(fileHandle, '}\n'); -ts.sys.exit(ts.ExitStatus.Success); \ No newline at end of file +fs.writeSync(fileHandle, `\ +${GENERATED_FILE_HEADER} +export class VersionInfo { + public static readonly version: string = '${version}'; + public static readonly date: string = '${new Date().toISOString()}'; +} +`); +ts.sys.exit(ts.ExitStatus.Success); diff --git a/src.compiler/typescript/EmitterBase.ts b/src.compiler/typescript/EmitterBase.ts index 9d59f7fbf..17792e0ce 100644 --- a/src.compiler/typescript/EmitterBase.ts +++ b/src.compiler/typescript/EmitterBase.ts @@ -2,6 +2,13 @@ import * as path from 'path'; import * as ts from 'typescript'; import * as fs from 'fs'; +export const GENERATED_FILE_HEADER = `\ +// +// This code was auto-generated. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// ` + export default function createEmitter(jsDocMarker: string, generate: (program: ts.Program, classDeclaration: ts.ClassDeclaration) => ts.SourceFile) { function generateClass(program: ts.Program, classDeclaration: ts.ClassDeclaration) { @@ -11,39 +18,33 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t ); const result = generate(program, classDeclaration); - const defaultClass = result.statements.filter(stmt => ts.isClassDeclaration(stmt) && + const defaultClass = result.statements.find(stmt => ts.isClassDeclaration(stmt) && stmt.modifiers!.find(m => m.kind === ts.SyntaxKind.ExportKeyword) - )[0] as ts.ClassDeclaration; + ) as ts.ClassDeclaration; const targetFileName = path.join( path.resolve(program.getCompilerOptions().baseUrl!), 'src/generated', path.dirname(sourceFileName), - defaultClass.name!.text + '.ts' + `${defaultClass.name!.text}.ts` ); fs.mkdirSync(path.dirname(targetFileName), { recursive: true }); const fileHandle = fs.openSync(targetFileName, 'w'); - fs.writeSync(fileHandle, '// \n'); - fs.writeSync(fileHandle, '// This code was auto-generated.\n'); - fs.writeSync(fileHandle, '// Changes to this file may cause incorrect behavior and will be lost if\n'); - fs.writeSync(fileHandle, '// the code is regenerated.\n'); - fs.writeSync(fileHandle, '// \n'); + fs.writeSync( + fileHandle, + `${GENERATED_FILE_HEADER}\n` + ); const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); const source = printer.printNode(ts.EmitHint.Unspecified, result, result); const servicesHost: ts.LanguageServiceHost = { getScriptFileNames: () => [targetFileName], - getScriptVersion: fileName => result.languageVersion.toString(), - getScriptSnapshot: fileName => { - if (fileName != targetFileName) { - return undefined; - } - - return ts.ScriptSnapshot.fromString(source); - }, + getScriptVersion: () => result.languageVersion.toString(), + getScriptSnapshot: fileName => + fileName === targetFileName ? ts.ScriptSnapshot.fromString(source) : undefined, getCurrentDirectory: () => process.cwd(), getCompilationSettings: () => program.getCompilerOptions(), getDefaultLibFileName: options => ts.getDefaultLibFilePath(options), @@ -55,7 +56,7 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t }; const languageService = ts.createLanguageService(servicesHost, ts.createDocumentRegistry()); - const textChanges: ts.TextChange[] = languageService.getFormattingEditsForDocument(targetFileName, { + const formattingChanges: ts.TextChange[] = languageService.getFormattingEditsForDocument(targetFileName, { convertTabsToSpaces: true, insertSpaceAfterCommaDelimiter: true, insertSpaceAfterKeywordsInControlFlowStatements: true, @@ -64,32 +65,23 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t indentStyle: ts.IndentStyle.Smart, indentSize: 4, tabSize: 4, - }); - textChanges.sort((a, b) => b.span.start - a.span.start); + } as ts.FormatCodeSettings); + formattingChanges.sort((a, b) => b.span.start - a.span.start); let finalText = source; - for (const textChange of textChanges) { - const { span } = textChange; - finalText = finalText.slice(0, span.start) + textChange.newText - + finalText.slice(span.start + span.length); + for (const { span, newText } of formattingChanges) { + finalText = `${finalText.slice(0, span.start)}${newText}${finalText.slice(span.start + span.length)}`; } - - finalText = finalText.replace(/\/\/ */g, ''); + finalText = finalText.replace(/\/\/ */g, '').replace(/ +$/gm, ''); fs.writeSync(fileHandle, finalText); - fs.writeSync(fileHandle, '\n'); - fs.closeSync(fileHandle); } function scanSourceFile(program: ts.Program, sourceFile: ts.SourceFile) { sourceFile.statements.forEach(stmt => { - if (ts.isClassDeclaration(stmt)) { - const isActive = ts.getJSDocTags(stmt).find(t => t.tagName.text === jsDocMarker); - if (isActive) { - generateClass(program, stmt); - } - } + if (ts.isClassDeclaration(stmt) && ts.getJSDocTags(stmt).some(t => t.tagName.text === jsDocMarker)) + generateClass(program, stmt); }); } diff --git a/src/generated/CoreSettingsSerializer.ts b/src/generated/CoreSettingsSerializer.ts index 18f54d8e3..d201a8ba2 100644 --- a/src/generated/CoreSettingsSerializer.ts +++ b/src/generated/CoreSettingsSerializer.ts @@ -10,30 +10,30 @@ export class CoreSettingsSerializer { public static fromJson(obj: CoreSettings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: CoreSettings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); + } + const o = new Map(); /*@target web*/ - o.set("scriptfile", obj.scriptFile); + o.set("scriptfile", obj.scriptFile); /*@target web*/ - o.set("fontdirectory", obj.fontDirectory); + o.set("fontdirectory", obj.fontDirectory); /*@target web*/ - o.set("file", obj.file); + o.set("file", obj.file); /*@target web*/ - o.set("tex", obj.tex); + o.set("tex", obj.tex); /*@target web*/ - o.set("tracks", obj.tracks); - o.set("enablelazyloading", obj.enableLazyLoading); - o.set("engine", obj.engine); - o.set("loglevel", obj.logLevel as number); - o.set("useworkers", obj.useWorkers); - o.set("includenotebounds", obj.includeNoteBounds); - return o; + o.set("tracks", obj.tracks); + o.set("enablelazyloading", obj.enableLazyLoading); + o.set("engine", obj.engine); + o.set("loglevel", obj.logLevel as number); + o.set("useworkers", obj.useWorkers); + o.set("includenotebounds", obj.includeNoteBounds); + return o; } public static setProperty(obj: CoreSettings, property: string, v: unknown): boolean { switch (property) { @@ -72,8 +72,7 @@ export class CoreSettingsSerializer { case "includenotebounds": obj.includeNoteBounds = v! as boolean; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/DisplaySettingsSerializer.ts b/src/generated/DisplaySettingsSerializer.ts index 627d570e2..400196725 100644 --- a/src/generated/DisplaySettingsSerializer.ts +++ b/src/generated/DisplaySettingsSerializer.ts @@ -12,25 +12,25 @@ export class DisplaySettingsSerializer { public static fromJson(obj: DisplaySettings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: DisplaySettings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("scale", obj.scale); - o.set("stretchforce", obj.stretchForce); - o.set("layoutmode", obj.layoutMode as number); - o.set("staveprofile", obj.staveProfile as number); - o.set("barsperrow", obj.barsPerRow); - o.set("startbar", obj.startBar); - o.set("barcount", obj.barCount); - o.set("barcountperpartial", obj.barCountPerPartial); - o.set("resources", RenderingResourcesSerializer.toJson(obj.resources)); - o.set("padding", obj.padding); - return o; + } + const o = new Map(); + o.set("scale", obj.scale); + o.set("stretchforce", obj.stretchForce); + o.set("layoutmode", obj.layoutMode as number); + o.set("staveprofile", obj.staveProfile as number); + o.set("barsperrow", obj.barsPerRow); + o.set("startbar", obj.startBar); + o.set("barcount", obj.barCount); + o.set("barcountperpartial", obj.barCountPerPartial); + o.set("resources", RenderingResourcesSerializer.toJson(obj.resources)); + o.set("padding", obj.padding); + return o; } public static setProperty(obj: DisplaySettings, property: string, v: unknown): boolean { switch (property) { @@ -61,7 +61,7 @@ export class DisplaySettingsSerializer { case "padding": obj.padding = v as number[] | null; return true; - } + } if (["resources"].indexOf(property) >= 0) { RenderingResourcesSerializer.fromJson(obj.resources, v as Map); return true; @@ -74,8 +74,7 @@ export class DisplaySettingsSerializer { } } } - } - return false; + } + return false; } } - diff --git a/src/generated/ImporterSettingsSerializer.ts b/src/generated/ImporterSettingsSerializer.ts index e904e7052..0dfd683b2 100644 --- a/src/generated/ImporterSettingsSerializer.ts +++ b/src/generated/ImporterSettingsSerializer.ts @@ -9,18 +9,18 @@ export class ImporterSettingsSerializer { public static fromJson(obj: ImporterSettings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: ImporterSettings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("encoding", obj.encoding); - o.set("mergepartgroupsinmusicxml", obj.mergePartGroupsInMusicXml); - o.set("beattextaslyrics", obj.beatTextAsLyrics); - return o; + } + const o = new Map(); + o.set("encoding", obj.encoding); + o.set("mergepartgroupsinmusicxml", obj.mergePartGroupsInMusicXml); + o.set("beattextaslyrics", obj.beatTextAsLyrics); + return o; } public static setProperty(obj: ImporterSettings, property: string, v: unknown): boolean { switch (property) { @@ -33,8 +33,7 @@ export class ImporterSettingsSerializer { case "beattextaslyrics": obj.beatTextAsLyrics = v! as boolean; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/NotationSettingsSerializer.ts b/src/generated/NotationSettingsSerializer.ts index 1c97325c6..25221c46b 100644 --- a/src/generated/NotationSettingsSerializer.ts +++ b/src/generated/NotationSettingsSerializer.ts @@ -13,32 +13,32 @@ export class NotationSettingsSerializer { public static fromJson(obj: NotationSettings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: NotationSettings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("notationmode", obj.notationMode as number); - o.set("fingeringmode", obj.fingeringMode as number); + } + const o = new Map(); + o.set("notationmode", obj.notationMode as number); + o.set("fingeringmode", obj.fingeringMode as number); { const m = new Map(); o.set("elements", m); for (const [k, v] of obj.elements!) { m.set(k.toString(), v); } - } - o.set("rhythmmode", obj.rhythmMode as number); - o.set("rhythmheight", obj.rhythmHeight); - o.set("transpositionpitches", obj.transpositionPitches); - o.set("displaytranspositionpitches", obj.displayTranspositionPitches); - o.set("smallgracetabnotes", obj.smallGraceTabNotes); - o.set("extendbendarrowsontiednotes", obj.extendBendArrowsOnTiedNotes); - o.set("extendlineeffectstobeatend", obj.extendLineEffectsToBeatEnd); - o.set("slurheight", obj.slurHeight); - return o; + } + o.set("rhythmmode", obj.rhythmMode as number); + o.set("rhythmheight", obj.rhythmHeight); + o.set("transpositionpitches", obj.transpositionPitches); + o.set("displaytranspositionpitches", obj.displayTranspositionPitches); + o.set("smallgracetabnotes", obj.smallGraceTabNotes); + o.set("extendbendarrowsontiednotes", obj.extendBendArrowsOnTiedNotes); + o.set("extendlineeffectstobeatend", obj.extendLineEffectsToBeatEnd); + o.set("slurheight", obj.slurHeight); + return o; } public static setProperty(obj: NotationSettings, property: string, v: unknown): boolean { switch (property) { @@ -51,7 +51,7 @@ export class NotationSettingsSerializer { case "elements": obj.elements = new Map(); JsonHelper.forEach(v, (v, k) => { - obj.elements.set(JsonHelper.parseEnum(k, NotationElement)!, v as boolean); + obj.elements.set(JsonHelper.parseEnum(k, NotationElement)!, v as boolean); }); return true; case "rhythmmode": @@ -78,8 +78,7 @@ export class NotationSettingsSerializer { case "slurheight": obj.slurHeight = v! as number; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/PlayerSettingsSerializer.ts b/src/generated/PlayerSettingsSerializer.ts index 2882e418f..4ba603515 100644 --- a/src/generated/PlayerSettingsSerializer.ts +++ b/src/generated/PlayerSettingsSerializer.ts @@ -12,33 +12,33 @@ export class PlayerSettingsSerializer { public static fromJson(obj: PlayerSettings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: PlayerSettings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("soundfont", obj.soundFont); - o.set("enableplayer", obj.enablePlayer); - o.set("enablecursor", obj.enableCursor); - o.set("enableanimatedbeatcursor", obj.enableAnimatedBeatCursor); - o.set("enableelementhighlighting", obj.enableElementHighlighting); - o.set("enableuserinteraction", obj.enableUserInteraction); - o.set("scrolloffsetx", obj.scrollOffsetX); - o.set("scrolloffsety", obj.scrollOffsetY); - o.set("scrollmode", obj.scrollMode as number); - o.set("scrollspeed", obj.scrollSpeed); + } + const o = new Map(); + o.set("soundfont", obj.soundFont); + o.set("enableplayer", obj.enablePlayer); + o.set("enablecursor", obj.enableCursor); + o.set("enableanimatedbeatcursor", obj.enableAnimatedBeatCursor); + o.set("enableelementhighlighting", obj.enableElementHighlighting); + o.set("enableuserinteraction", obj.enableUserInteraction); + o.set("scrolloffsetx", obj.scrollOffsetX); + o.set("scrolloffsety", obj.scrollOffsetY); + o.set("scrollmode", obj.scrollMode as number); + o.set("scrollspeed", obj.scrollSpeed); /*@target web*/ - o.set("nativebrowsersmoothscroll", obj.nativeBrowserSmoothScroll); - o.set("songbookbendduration", obj.songBookBendDuration); - o.set("songbookdipduration", obj.songBookDipDuration); - o.set("vibrato", VibratoPlaybackSettingsSerializer.toJson(obj.vibrato)); - o.set("slide", SlidePlaybackSettingsSerializer.toJson(obj.slide)); - o.set("playtripletfeel", obj.playTripletFeel); - o.set("buffertimeinmilliseconds", obj.bufferTimeInMilliseconds); - return o; + o.set("nativebrowsersmoothscroll", obj.nativeBrowserSmoothScroll); + o.set("songbookbendduration", obj.songBookBendDuration); + o.set("songbookdipduration", obj.songBookDipDuration); + o.set("vibrato", VibratoPlaybackSettingsSerializer.toJson(obj.vibrato)); + o.set("slide", SlidePlaybackSettingsSerializer.toJson(obj.slide)); + o.set("playtripletfeel", obj.playTripletFeel); + o.set("buffertimeinmilliseconds", obj.bufferTimeInMilliseconds); + return o; } public static setProperty(obj: PlayerSettings, property: string, v: unknown): boolean { switch (property) { @@ -92,7 +92,7 @@ export class PlayerSettingsSerializer { case "buffertimeinmilliseconds": obj.bufferTimeInMilliseconds = v! as number; return true; - } + } if (["vibrato"].indexOf(property) >= 0) { VibratoPlaybackSettingsSerializer.fromJson(obj.vibrato, v as Map); return true; @@ -105,7 +105,7 @@ export class PlayerSettingsSerializer { } } } - } + } if (["slide"].indexOf(property) >= 0) { SlidePlaybackSettingsSerializer.fromJson(obj.slide, v as Map); return true; @@ -118,8 +118,7 @@ export class PlayerSettingsSerializer { } } } - } - return false; + } + return false; } } - diff --git a/src/generated/RenderingResourcesSerializer.ts b/src/generated/RenderingResourcesSerializer.ts index fb0bed86e..c6ca49028 100644 --- a/src/generated/RenderingResourcesSerializer.ts +++ b/src/generated/RenderingResourcesSerializer.ts @@ -11,32 +11,32 @@ export class RenderingResourcesSerializer { public static fromJson(obj: RenderingResources, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: RenderingResources | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("copyrightfont", Font.toJson(obj.copyrightFont)); - o.set("titlefont", Font.toJson(obj.titleFont)); - o.set("subtitlefont", Font.toJson(obj.subTitleFont)); - o.set("wordsfont", Font.toJson(obj.wordsFont)); - o.set("effectfont", Font.toJson(obj.effectFont)); - o.set("fretboardnumberfont", Font.toJson(obj.fretboardNumberFont)); - o.set("tablaturefont", Font.toJson(obj.tablatureFont)); - o.set("gracefont", Font.toJson(obj.graceFont)); - o.set("stafflinecolor", Color.toJson(obj.staffLineColor)); - o.set("barseparatorcolor", Color.toJson(obj.barSeparatorColor)); - o.set("barnumberfont", Font.toJson(obj.barNumberFont)); - o.set("barnumbercolor", Color.toJson(obj.barNumberColor)); - o.set("fingeringfont", Font.toJson(obj.fingeringFont)); - o.set("markerfont", Font.toJson(obj.markerFont)); - o.set("mainglyphcolor", Color.toJson(obj.mainGlyphColor)); - o.set("secondaryglyphcolor", Color.toJson(obj.secondaryGlyphColor)); - o.set("scoreinfocolor", Color.toJson(obj.scoreInfoColor)); - return o; + } + const o = new Map(); + o.set("copyrightfont", Font.toJson(obj.copyrightFont)); + o.set("titlefont", Font.toJson(obj.titleFont)); + o.set("subtitlefont", Font.toJson(obj.subTitleFont)); + o.set("wordsfont", Font.toJson(obj.wordsFont)); + o.set("effectfont", Font.toJson(obj.effectFont)); + o.set("fretboardnumberfont", Font.toJson(obj.fretboardNumberFont)); + o.set("tablaturefont", Font.toJson(obj.tablatureFont)); + o.set("gracefont", Font.toJson(obj.graceFont)); + o.set("stafflinecolor", Color.toJson(obj.staffLineColor)); + o.set("barseparatorcolor", Color.toJson(obj.barSeparatorColor)); + o.set("barnumberfont", Font.toJson(obj.barNumberFont)); + o.set("barnumbercolor", Color.toJson(obj.barNumberColor)); + o.set("fingeringfont", Font.toJson(obj.fingeringFont)); + o.set("markerfont", Font.toJson(obj.markerFont)); + o.set("mainglyphcolor", Color.toJson(obj.mainGlyphColor)); + o.set("secondaryglyphcolor", Color.toJson(obj.secondaryGlyphColor)); + o.set("scoreinfocolor", Color.toJson(obj.scoreInfoColor)); + return o; } public static setProperty(obj: RenderingResources, property: string, v: unknown): boolean { switch (property) { @@ -91,8 +91,7 @@ export class RenderingResourcesSerializer { case "scoreinfocolor": obj.scoreInfoColor = Color.fromJson(v)!; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/SettingsSerializer.ts b/src/generated/SettingsSerializer.ts index f9a43a382..cbeb3fb26 100644 --- a/src/generated/SettingsSerializer.ts +++ b/src/generated/SettingsSerializer.ts @@ -14,20 +14,20 @@ export class SettingsSerializer { public static fromJson(obj: Settings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: Settings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("core", CoreSettingsSerializer.toJson(obj.core)); - o.set("display", DisplaySettingsSerializer.toJson(obj.display)); - o.set("notation", NotationSettingsSerializer.toJson(obj.notation)); - o.set("importer", ImporterSettingsSerializer.toJson(obj.importer)); - o.set("player", PlayerSettingsSerializer.toJson(obj.player)); - return o; + } + const o = new Map(); + o.set("core", CoreSettingsSerializer.toJson(obj.core)); + o.set("display", DisplaySettingsSerializer.toJson(obj.display)); + o.set("notation", NotationSettingsSerializer.toJson(obj.notation)); + o.set("importer", ImporterSettingsSerializer.toJson(obj.importer)); + o.set("player", PlayerSettingsSerializer.toJson(obj.player)); + return o; } public static setProperty(obj: Settings, property: string, v: unknown): boolean { if (["core", ""].indexOf(property) >= 0) { @@ -42,7 +42,7 @@ export class SettingsSerializer { } } } - } + } if (["display", ""].indexOf(property) >= 0) { DisplaySettingsSerializer.fromJson(obj.display, v as Map); return true; @@ -55,7 +55,7 @@ export class SettingsSerializer { } } } - } + } if (["notation"].indexOf(property) >= 0) { NotationSettingsSerializer.fromJson(obj.notation, v as Map); return true; @@ -68,7 +68,7 @@ export class SettingsSerializer { } } } - } + } if (["importer"].indexOf(property) >= 0) { ImporterSettingsSerializer.fromJson(obj.importer, v as Map); return true; @@ -81,7 +81,7 @@ export class SettingsSerializer { } } } - } + } if (["player"].indexOf(property) >= 0) { PlayerSettingsSerializer.fromJson(obj.player, v as Map); return true; @@ -94,8 +94,7 @@ export class SettingsSerializer { } } } - } - return false; + } + return false; } } - diff --git a/src/generated/SlidePlaybackSettingsSerializer.ts b/src/generated/SlidePlaybackSettingsSerializer.ts index d2cd24c86..86b2ad92a 100644 --- a/src/generated/SlidePlaybackSettingsSerializer.ts +++ b/src/generated/SlidePlaybackSettingsSerializer.ts @@ -9,18 +9,18 @@ export class SlidePlaybackSettingsSerializer { public static fromJson(obj: SlidePlaybackSettings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: SlidePlaybackSettings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("simpleslidepitchoffset", obj.simpleSlidePitchOffset); - o.set("simpleslidedurationratio", obj.simpleSlideDurationRatio); - o.set("shiftslidedurationratio", obj.shiftSlideDurationRatio); - return o; + } + const o = new Map(); + o.set("simpleslidepitchoffset", obj.simpleSlidePitchOffset); + o.set("simpleslidedurationratio", obj.simpleSlideDurationRatio); + o.set("shiftslidedurationratio", obj.shiftSlideDurationRatio); + return o; } public static setProperty(obj: SlidePlaybackSettings, property: string, v: unknown): boolean { switch (property) { @@ -33,8 +33,7 @@ export class SlidePlaybackSettingsSerializer { case "shiftslidedurationratio": obj.shiftSlideDurationRatio = v! as number; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/VibratoPlaybackSettingsSerializer.ts b/src/generated/VibratoPlaybackSettingsSerializer.ts index f623538f4..1ba37a12c 100644 --- a/src/generated/VibratoPlaybackSettingsSerializer.ts +++ b/src/generated/VibratoPlaybackSettingsSerializer.ts @@ -9,23 +9,23 @@ export class VibratoPlaybackSettingsSerializer { public static fromJson(obj: VibratoPlaybackSettings, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v)); } public static toJson(obj: VibratoPlaybackSettings | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("notewidelength", obj.noteWideLength); - o.set("notewideamplitude", obj.noteWideAmplitude); - o.set("noteslightlength", obj.noteSlightLength); - o.set("noteslightamplitude", obj.noteSlightAmplitude); - o.set("beatwidelength", obj.beatWideLength); - o.set("beatwideamplitude", obj.beatWideAmplitude); - o.set("beatslightlength", obj.beatSlightLength); - o.set("beatslightamplitude", obj.beatSlightAmplitude); - return o; + } + const o = new Map(); + o.set("notewidelength", obj.noteWideLength); + o.set("notewideamplitude", obj.noteWideAmplitude); + o.set("noteslightlength", obj.noteSlightLength); + o.set("noteslightamplitude", obj.noteSlightAmplitude); + o.set("beatwidelength", obj.beatWideLength); + o.set("beatwideamplitude", obj.beatWideAmplitude); + o.set("beatslightlength", obj.beatSlightLength); + o.set("beatslightamplitude", obj.beatSlightAmplitude); + return o; } public static setProperty(obj: VibratoPlaybackSettings, property: string, v: unknown): boolean { switch (property) { @@ -53,8 +53,7 @@ export class VibratoPlaybackSettingsSerializer { case "beatslightamplitude": obj.beatSlightAmplitude = v! as number; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/AutomationCloner.ts b/src/generated/model/AutomationCloner.ts index fc0e50ff6..20359463f 100644 --- a/src/generated/model/AutomationCloner.ts +++ b/src/generated/model/AutomationCloner.ts @@ -6,13 +6,12 @@ import { Automation } from "@src/model/Automation"; export class AutomationCloner { public static clone(original: Automation): Automation { - const clone = new Automation(); - clone.isLinear = original.isLinear; - clone.type = original.type; - clone.value = original.value; - clone.ratioPosition = original.ratioPosition; - clone.text = original.text; - return clone; + const clone = new Automation(); + clone.isLinear = original.isLinear; + clone.type = original.type; + clone.value = original.value; + clone.ratioPosition = original.ratioPosition; + clone.text = original.text; + return clone; } } - diff --git a/src/generated/model/AutomationSerializer.ts b/src/generated/model/AutomationSerializer.ts index 8c2f04fa9..41b24bdb0 100644 --- a/src/generated/model/AutomationSerializer.ts +++ b/src/generated/model/AutomationSerializer.ts @@ -10,20 +10,20 @@ export class AutomationSerializer { public static fromJson(obj: Automation, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Automation | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("islinear", obj.isLinear); - o.set("type", obj.type as number); - o.set("value", obj.value); - o.set("ratioposition", obj.ratioPosition); - o.set("text", obj.text); - return o; + } + const o = new Map(); + o.set("islinear", obj.isLinear); + o.set("type", obj.type as number); + o.set("value", obj.value); + o.set("ratioposition", obj.ratioPosition); + o.set("text", obj.text); + return o; } public static setProperty(obj: Automation, property: string, v: unknown): boolean { switch (property) { @@ -42,8 +42,7 @@ export class AutomationSerializer { case "text": obj.text = v! as string; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/BarSerializer.ts b/src/generated/model/BarSerializer.ts index 0f7a88fa5..80b3122b5 100644 --- a/src/generated/model/BarSerializer.ts +++ b/src/generated/model/BarSerializer.ts @@ -14,20 +14,20 @@ export class BarSerializer { public static fromJson(obj: Bar, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Bar | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("id", obj.id); - o.set("clef", obj.clef as number); - o.set("clefottava", obj.clefOttava as number); - o.set("voices", obj.voices.map(i => VoiceSerializer.toJson(i))); - o.set("similemark", obj.simileMark as number); - return o; + } + const o = new Map(); + o.set("id", obj.id); + o.set("clef", obj.clef as number); + o.set("clefottava", obj.clefOttava as number); + o.set("voices", obj.voices.map(i => VoiceSerializer.toJson(i))); + o.set("similemark", obj.simileMark as number); + return o; } public static setProperty(obj: Bar, property: string, v: unknown): boolean { switch (property) { @@ -51,8 +51,7 @@ export class BarSerializer { case "similemark": obj.simileMark = JsonHelper.parseEnum(v, SimileMark)!; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/BeatCloner.ts b/src/generated/model/BeatCloner.ts index e01487f59..3c66b5776 100644 --- a/src/generated/model/BeatCloner.ts +++ b/src/generated/model/BeatCloner.ts @@ -9,59 +9,58 @@ import { AutomationCloner } from "./AutomationCloner"; import { BendPointCloner } from "./BendPointCloner"; export class BeatCloner { public static clone(original: Beat): Beat { - const clone = new Beat(); - clone.index = original.index; - clone.notes = []; + const clone = new Beat(); + clone.index = original.index; + clone.notes = []; for (const i of original.notes!) { clone.addNote(NoteCloner.clone(i)); - } - clone.isEmpty = original.isEmpty; - clone.whammyStyle = original.whammyStyle; - clone.ottava = original.ottava; - clone.isLegatoOrigin = original.isLegatoOrigin; - clone.duration = original.duration; - clone.isLetRing = original.isLetRing; - clone.isPalmMute = original.isPalmMute; - clone.automations = []; + } + clone.isEmpty = original.isEmpty; + clone.whammyStyle = original.whammyStyle; + clone.ottava = original.ottava; + clone.isLegatoOrigin = original.isLegatoOrigin; + clone.duration = original.duration; + clone.isLetRing = original.isLetRing; + clone.isPalmMute = original.isPalmMute; + clone.automations = []; for (const i of original.automations!) { clone.automations.push(AutomationCloner.clone(i)); - } - clone.dots = original.dots; - clone.fadeIn = original.fadeIn; - clone.lyrics = original.lyrics ? original.lyrics.slice() : null; - clone.hasRasgueado = original.hasRasgueado; - clone.pop = original.pop; - clone.slap = original.slap; - clone.tap = original.tap; - clone.text = original.text; - clone.brushType = original.brushType; - clone.brushDuration = original.brushDuration; - clone.tupletDenominator = original.tupletDenominator; - clone.tupletNumerator = original.tupletNumerator; - clone.isContinuedWhammy = original.isContinuedWhammy; - clone.whammyBarType = original.whammyBarType; + } + clone.dots = original.dots; + clone.fadeIn = original.fadeIn; + clone.lyrics = original.lyrics ? original.lyrics.slice() : null; + clone.hasRasgueado = original.hasRasgueado; + clone.pop = original.pop; + clone.slap = original.slap; + clone.tap = original.tap; + clone.text = original.text; + clone.brushType = original.brushType; + clone.brushDuration = original.brushDuration; + clone.tupletDenominator = original.tupletDenominator; + clone.tupletNumerator = original.tupletNumerator; + clone.isContinuedWhammy = original.isContinuedWhammy; + clone.whammyBarType = original.whammyBarType; if (original.whammyBarPoints) { clone.whammyBarPoints = []; for (const i of original.whammyBarPoints!) { clone.addWhammyBarPoint(BendPointCloner.clone(i)); } - } - clone.vibrato = original.vibrato; - clone.chordId = original.chordId; - clone.graceType = original.graceType; - clone.pickStroke = original.pickStroke; - clone.tremoloSpeed = original.tremoloSpeed; - clone.crescendo = original.crescendo; - clone.displayStart = original.displayStart; - clone.playbackStart = original.playbackStart; - clone.displayDuration = original.displayDuration; - clone.playbackDuration = original.playbackDuration; - clone.dynamics = original.dynamics; - clone.invertBeamDirection = original.invertBeamDirection; - clone.preferredBeamDirection = original.preferredBeamDirection; - clone.isEffectSlurOrigin = original.isEffectSlurOrigin; - clone.beamingMode = original.beamingMode; - return clone; + } + clone.vibrato = original.vibrato; + clone.chordId = original.chordId; + clone.graceType = original.graceType; + clone.pickStroke = original.pickStroke; + clone.tremoloSpeed = original.tremoloSpeed; + clone.crescendo = original.crescendo; + clone.displayStart = original.displayStart; + clone.playbackStart = original.playbackStart; + clone.displayDuration = original.displayDuration; + clone.playbackDuration = original.playbackDuration; + clone.dynamics = original.dynamics; + clone.invertBeamDirection = original.invertBeamDirection; + clone.preferredBeamDirection = original.preferredBeamDirection; + clone.isEffectSlurOrigin = original.isEffectSlurOrigin; + clone.beamingMode = original.beamingMode; + return clone; } } - diff --git a/src/generated/model/BeatSerializer.ts b/src/generated/model/BeatSerializer.ts index 468a090ad..d5d82626e 100644 --- a/src/generated/model/BeatSerializer.ts +++ b/src/generated/model/BeatSerializer.ts @@ -27,54 +27,54 @@ export class BeatSerializer { public static fromJson(obj: Beat, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Beat | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("id", obj.id); - o.set("notes", obj.notes.map(i => NoteSerializer.toJson(i))); - o.set("isempty", obj.isEmpty); - o.set("whammystyle", obj.whammyStyle as number); - o.set("ottava", obj.ottava as number); - o.set("islegatoorigin", obj.isLegatoOrigin); - o.set("duration", obj.duration as number); - o.set("automations", obj.automations.map(i => AutomationSerializer.toJson(i))); - o.set("dots", obj.dots); - o.set("fadein", obj.fadeIn); - o.set("lyrics", obj.lyrics); - o.set("hasrasgueado", obj.hasRasgueado); - o.set("pop", obj.pop); - o.set("slap", obj.slap); - o.set("tap", obj.tap); - o.set("text", obj.text); - o.set("brushtype", obj.brushType as number); - o.set("brushduration", obj.brushDuration); - o.set("tupletdenominator", obj.tupletDenominator); - o.set("tupletnumerator", obj.tupletNumerator); - o.set("iscontinuedwhammy", obj.isContinuedWhammy); - o.set("whammybartype", obj.whammyBarType as number); + } + const o = new Map(); + o.set("id", obj.id); + o.set("notes", obj.notes.map(i => NoteSerializer.toJson(i))); + o.set("isempty", obj.isEmpty); + o.set("whammystyle", obj.whammyStyle as number); + o.set("ottava", obj.ottava as number); + o.set("islegatoorigin", obj.isLegatoOrigin); + o.set("duration", obj.duration as number); + o.set("automations", obj.automations.map(i => AutomationSerializer.toJson(i))); + o.set("dots", obj.dots); + o.set("fadein", obj.fadeIn); + o.set("lyrics", obj.lyrics); + o.set("hasrasgueado", obj.hasRasgueado); + o.set("pop", obj.pop); + o.set("slap", obj.slap); + o.set("tap", obj.tap); + o.set("text", obj.text); + o.set("brushtype", obj.brushType as number); + o.set("brushduration", obj.brushDuration); + o.set("tupletdenominator", obj.tupletDenominator); + o.set("tupletnumerator", obj.tupletNumerator); + o.set("iscontinuedwhammy", obj.isContinuedWhammy); + o.set("whammybartype", obj.whammyBarType as number); if (obj.whammyBarPoints !== null) { o.set("whammybarpoints", obj.whammyBarPoints?.map(i => BendPointSerializer.toJson(i))); - } - o.set("vibrato", obj.vibrato as number); - o.set("chordid", obj.chordId); - o.set("gracetype", obj.graceType as number); - o.set("pickstroke", obj.pickStroke as number); - o.set("tremolospeed", obj.tremoloSpeed as number | null); - o.set("crescendo", obj.crescendo as number); - o.set("displaystart", obj.displayStart); - o.set("playbackstart", obj.playbackStart); - o.set("displayduration", obj.displayDuration); - o.set("playbackduration", obj.playbackDuration); - o.set("dynamics", obj.dynamics as number); - o.set("invertbeamdirection", obj.invertBeamDirection); - o.set("preferredbeamdirection", obj.preferredBeamDirection as number | null); - o.set("beamingmode", obj.beamingMode as number); - return o; + } + o.set("vibrato", obj.vibrato as number); + o.set("chordid", obj.chordId); + o.set("gracetype", obj.graceType as number); + o.set("pickstroke", obj.pickStroke as number); + o.set("tremolospeed", obj.tremoloSpeed as number | null); + o.set("crescendo", obj.crescendo as number); + o.set("displaystart", obj.displayStart); + o.set("playbackstart", obj.playbackStart); + o.set("displayduration", obj.displayDuration); + o.set("playbackduration", obj.playbackDuration); + o.set("dynamics", obj.dynamics as number); + o.set("invertbeamdirection", obj.invertBeamDirection); + o.set("preferredbeamdirection", obj.preferredBeamDirection as number | null); + o.set("beamingmode", obj.beamingMode as number); + return o; } public static setProperty(obj: Beat, property: string, v: unknown): boolean { switch (property) { @@ -206,8 +206,7 @@ export class BeatSerializer { case "beamingmode": obj.beamingMode = JsonHelper.parseEnum(v, BeatBeamingMode)!; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/BendPointCloner.ts b/src/generated/model/BendPointCloner.ts index 41a8dea7f..fd43ff35a 100644 --- a/src/generated/model/BendPointCloner.ts +++ b/src/generated/model/BendPointCloner.ts @@ -6,10 +6,9 @@ import { BendPoint } from "@src/model/BendPoint"; export class BendPointCloner { public static clone(original: BendPoint): BendPoint { - const clone = new BendPoint(); - clone.offset = original.offset; - clone.value = original.value; - return clone; + const clone = new BendPoint(); + clone.offset = original.offset; + clone.value = original.value; + return clone; } } - diff --git a/src/generated/model/BendPointSerializer.ts b/src/generated/model/BendPointSerializer.ts index 4d08a2af4..077496dd1 100644 --- a/src/generated/model/BendPointSerializer.ts +++ b/src/generated/model/BendPointSerializer.ts @@ -9,17 +9,17 @@ export class BendPointSerializer { public static fromJson(obj: BendPoint, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: BendPoint | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("offset", obj.offset); - o.set("value", obj.value); - return o; + } + const o = new Map(); + o.set("offset", obj.offset); + o.set("value", obj.value); + return o; } public static setProperty(obj: BendPoint, property: string, v: unknown): boolean { switch (property) { @@ -29,8 +29,7 @@ export class BendPointSerializer { case "value": obj.value = v! as number; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/ChordSerializer.ts b/src/generated/model/ChordSerializer.ts index 39da50893..d522aa996 100644 --- a/src/generated/model/ChordSerializer.ts +++ b/src/generated/model/ChordSerializer.ts @@ -9,22 +9,22 @@ export class ChordSerializer { public static fromJson(obj: Chord, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Chord | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("name", obj.name); - o.set("firstfret", obj.firstFret); - o.set("strings", obj.strings); - o.set("barrefrets", obj.barreFrets); - o.set("showname", obj.showName); - o.set("showdiagram", obj.showDiagram); - o.set("showfingering", obj.showFingering); - return o; + } + const o = new Map(); + o.set("name", obj.name); + o.set("firstfret", obj.firstFret); + o.set("strings", obj.strings); + o.set("barrefrets", obj.barreFrets); + o.set("showname", obj.showName); + o.set("showdiagram", obj.showDiagram); + o.set("showfingering", obj.showFingering); + return o; } public static setProperty(obj: Chord, property: string, v: unknown): boolean { switch (property) { @@ -49,8 +49,7 @@ export class ChordSerializer { case "showfingering": obj.showFingering = v! as boolean; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/FermataSerializer.ts b/src/generated/model/FermataSerializer.ts index 904824fec..195ae0216 100644 --- a/src/generated/model/FermataSerializer.ts +++ b/src/generated/model/FermataSerializer.ts @@ -10,17 +10,17 @@ export class FermataSerializer { public static fromJson(obj: Fermata, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Fermata | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("type", obj.type as number); - o.set("length", obj.length); - return o; + } + const o = new Map(); + o.set("type", obj.type as number); + o.set("length", obj.length); + return o; } public static setProperty(obj: Fermata, property: string, v: unknown): boolean { switch (property) { @@ -30,8 +30,7 @@ export class FermataSerializer { case "length": obj.length = v! as number; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/InstrumentArticulationSerializer.ts b/src/generated/model/InstrumentArticulationSerializer.ts index f0d67f047..3c02c78cc 100644 --- a/src/generated/model/InstrumentArticulationSerializer.ts +++ b/src/generated/model/InstrumentArticulationSerializer.ts @@ -11,23 +11,23 @@ export class InstrumentArticulationSerializer { public static fromJson(obj: InstrumentArticulation, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: InstrumentArticulation | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("elementtype", obj.elementType); - o.set("staffline", obj.staffLine); - o.set("noteheaddefault", obj.noteHeadDefault as number); - o.set("noteheadhalf", obj.noteHeadHalf as number); - o.set("noteheadwhole", obj.noteHeadWhole as number); - o.set("techniquesymbol", obj.techniqueSymbol as number); - o.set("techniquesymbolplacement", obj.techniqueSymbolPlacement as number); - o.set("outputmidinumber", obj.outputMidiNumber); - return o; + } + const o = new Map(); + o.set("elementtype", obj.elementType); + o.set("staffline", obj.staffLine); + o.set("noteheaddefault", obj.noteHeadDefault as number); + o.set("noteheadhalf", obj.noteHeadHalf as number); + o.set("noteheadwhole", obj.noteHeadWhole as number); + o.set("techniquesymbol", obj.techniqueSymbol as number); + o.set("techniquesymbolplacement", obj.techniqueSymbolPlacement as number); + o.set("outputmidinumber", obj.outputMidiNumber); + return o; } public static setProperty(obj: InstrumentArticulation, property: string, v: unknown): boolean { switch (property) { @@ -55,8 +55,7 @@ export class InstrumentArticulationSerializer { case "outputmidinumber": obj.outputMidiNumber = v! as number; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/MasterBarSerializer.ts b/src/generated/model/MasterBarSerializer.ts index 92490a0c1..40250466b 100644 --- a/src/generated/model/MasterBarSerializer.ts +++ b/src/generated/model/MasterBarSerializer.ts @@ -18,36 +18,36 @@ export class MasterBarSerializer { public static fromJson(obj: MasterBar, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: MasterBar | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("alternateendings", obj.alternateEndings); - o.set("keysignature", obj.keySignature as number); - o.set("keysignaturetype", obj.keySignatureType as number); - o.set("isdoublebar", obj.isDoubleBar); - o.set("isrepeatstart", obj.isRepeatStart); - o.set("repeatcount", obj.repeatCount); - o.set("timesignaturenumerator", obj.timeSignatureNumerator); - o.set("timesignaturedenominator", obj.timeSignatureDenominator); - o.set("timesignaturecommon", obj.timeSignatureCommon); - o.set("tripletfeel", obj.tripletFeel as number); - o.set("section", SectionSerializer.toJson(obj.section)); - o.set("tempoautomation", AutomationSerializer.toJson(obj.tempoAutomation)); + } + const o = new Map(); + o.set("alternateendings", obj.alternateEndings); + o.set("keysignature", obj.keySignature as number); + o.set("keysignaturetype", obj.keySignatureType as number); + o.set("isdoublebar", obj.isDoubleBar); + o.set("isrepeatstart", obj.isRepeatStart); + o.set("repeatcount", obj.repeatCount); + o.set("timesignaturenumerator", obj.timeSignatureNumerator); + o.set("timesignaturedenominator", obj.timeSignatureDenominator); + o.set("timesignaturecommon", obj.timeSignatureCommon); + o.set("tripletfeel", obj.tripletFeel as number); + o.set("section", SectionSerializer.toJson(obj.section)); + o.set("tempoautomation", AutomationSerializer.toJson(obj.tempoAutomation)); if (obj.fermata !== null) { const m = new Map(); o.set("fermata", m); for (const [k, v] of obj.fermata!) { m.set(k.toString(), FermataSerializer.toJson(v)); } - } - o.set("start", obj.start); - o.set("isanacrusis", obj.isAnacrusis); - return o; + } + o.set("start", obj.start); + o.set("isanacrusis", obj.isAnacrusis); + return o; } public static setProperty(obj: MasterBar, property: string, v: unknown): boolean { switch (property) { @@ -84,9 +84,9 @@ export class MasterBarSerializer { case "fermata": obj.fermata = new Map(); JsonHelper.forEach(v, (v, k) => { - const i = new Fermata(); - FermataSerializer.fromJson(i, v as Map); - obj.addFermata(parseInt(k), i); + const i = new Fermata(); + FermataSerializer.fromJson(i, v as Map); + obj.addFermata(parseInt(k), i); }); return true; case "start": @@ -95,7 +95,7 @@ export class MasterBarSerializer { case "isanacrusis": obj.isAnacrusis = v! as boolean; return true; - } + } if (["section"].indexOf(property) >= 0) { if (v) { obj.section = new Section(); @@ -105,7 +105,7 @@ export class MasterBarSerializer { obj.section = null; } return true; - } + } if (["tempoautomation"].indexOf(property) >= 0) { if (v) { obj.tempoAutomation = new Automation(); @@ -115,8 +115,7 @@ export class MasterBarSerializer { obj.tempoAutomation = null; } return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/NoteCloner.ts b/src/generated/model/NoteCloner.ts index 889383993..bef3947ce 100644 --- a/src/generated/model/NoteCloner.ts +++ b/src/generated/model/NoteCloner.ts @@ -7,47 +7,46 @@ import { Note } from "@src/model/Note"; import { BendPointCloner } from "./BendPointCloner"; export class NoteCloner { public static clone(original: Note): Note { - const clone = new Note(); - clone.index = original.index; - clone.accentuated = original.accentuated; - clone.bendType = original.bendType; - clone.bendStyle = original.bendStyle; - clone.isContinuedBend = original.isContinuedBend; + const clone = new Note(); + clone.index = original.index; + clone.accentuated = original.accentuated; + clone.bendType = original.bendType; + clone.bendStyle = original.bendStyle; + clone.isContinuedBend = original.isContinuedBend; if (original.bendPoints) { clone.bendPoints = []; for (const i of original.bendPoints!) { clone.addBendPoint(BendPointCloner.clone(i)); } - } - clone.fret = original.fret; - clone.string = original.string; - clone.octave = original.octave; - clone.tone = original.tone; - clone.percussionArticulation = original.percussionArticulation; - clone.isVisible = original.isVisible; - clone.isLeftHandTapped = original.isLeftHandTapped; - clone.isHammerPullOrigin = original.isHammerPullOrigin; - clone.isSlurDestination = original.isSlurDestination; - clone.harmonicType = original.harmonicType; - clone.harmonicValue = original.harmonicValue; - clone.isGhost = original.isGhost; - clone.isLetRing = original.isLetRing; - clone.isPalmMute = original.isPalmMute; - clone.isDead = original.isDead; - clone.isStaccato = original.isStaccato; - clone.slideInType = original.slideInType; - clone.slideOutType = original.slideOutType; - clone.vibrato = original.vibrato; - clone.isTieDestination = original.isTieDestination; - clone.leftHandFinger = original.leftHandFinger; - clone.rightHandFinger = original.rightHandFinger; - clone.isFingering = original.isFingering; - clone.trillValue = original.trillValue; - clone.trillSpeed = original.trillSpeed; - clone.durationPercent = original.durationPercent; - clone.accidentalMode = original.accidentalMode; - clone.dynamics = original.dynamics; - return clone; + } + clone.fret = original.fret; + clone.string = original.string; + clone.octave = original.octave; + clone.tone = original.tone; + clone.percussionArticulation = original.percussionArticulation; + clone.isVisible = original.isVisible; + clone.isLeftHandTapped = original.isLeftHandTapped; + clone.isHammerPullOrigin = original.isHammerPullOrigin; + clone.isSlurDestination = original.isSlurDestination; + clone.harmonicType = original.harmonicType; + clone.harmonicValue = original.harmonicValue; + clone.isGhost = original.isGhost; + clone.isLetRing = original.isLetRing; + clone.isPalmMute = original.isPalmMute; + clone.isDead = original.isDead; + clone.isStaccato = original.isStaccato; + clone.slideInType = original.slideInType; + clone.slideOutType = original.slideOutType; + clone.vibrato = original.vibrato; + clone.isTieDestination = original.isTieDestination; + clone.leftHandFinger = original.leftHandFinger; + clone.rightHandFinger = original.rightHandFinger; + clone.isFingering = original.isFingering; + clone.trillValue = original.trillValue; + clone.trillSpeed = original.trillSpeed; + clone.durationPercent = original.durationPercent; + clone.accidentalMode = original.accidentalMode; + clone.dynamics = original.dynamics; + return clone; } } - diff --git a/src/generated/model/NoteSerializer.ts b/src/generated/model/NoteSerializer.ts index b5b8f2c6e..0ee327f76 100644 --- a/src/generated/model/NoteSerializer.ts +++ b/src/generated/model/NoteSerializer.ts @@ -22,52 +22,52 @@ export class NoteSerializer { public static fromJson(obj: Note, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Note | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("id", obj.id); - o.set("accentuated", obj.accentuated as number); - o.set("bendtype", obj.bendType as number); - o.set("bendstyle", obj.bendStyle as number); - o.set("iscontinuedbend", obj.isContinuedBend); + } + const o = new Map(); + o.set("id", obj.id); + o.set("accentuated", obj.accentuated as number); + o.set("bendtype", obj.bendType as number); + o.set("bendstyle", obj.bendStyle as number); + o.set("iscontinuedbend", obj.isContinuedBend); if (obj.bendPoints !== null) { o.set("bendpoints", obj.bendPoints?.map(i => BendPointSerializer.toJson(i))); - } - o.set("fret", obj.fret); - o.set("string", obj.string); - o.set("octave", obj.octave); - o.set("tone", obj.tone); - o.set("percussionarticulation", obj.percussionArticulation); - o.set("isvisible", obj.isVisible); - o.set("islefthandtapped", obj.isLeftHandTapped); - o.set("ishammerpullorigin", obj.isHammerPullOrigin); - o.set("isslurdestination", obj.isSlurDestination); - o.set("harmonictype", obj.harmonicType as number); - o.set("harmonicvalue", obj.harmonicValue); - o.set("isghost", obj.isGhost); - o.set("isletring", obj.isLetRing); - o.set("ispalmmute", obj.isPalmMute); - o.set("isdead", obj.isDead); - o.set("isstaccato", obj.isStaccato); - o.set("slideintype", obj.slideInType as number); - o.set("slideouttype", obj.slideOutType as number); - o.set("vibrato", obj.vibrato as number); - o.set("istiedestination", obj.isTieDestination); - o.set("lefthandfinger", obj.leftHandFinger as number); - o.set("righthandfinger", obj.rightHandFinger as number); - o.set("isfingering", obj.isFingering); - o.set("trillvalue", obj.trillValue); - o.set("trillspeed", obj.trillSpeed as number); - o.set("durationpercent", obj.durationPercent); - o.set("accidentalmode", obj.accidentalMode as number); - o.set("dynamics", obj.dynamics as number); - obj.toJson(o); - return o; + } + o.set("fret", obj.fret); + o.set("string", obj.string); + o.set("octave", obj.octave); + o.set("tone", obj.tone); + o.set("percussionarticulation", obj.percussionArticulation); + o.set("isvisible", obj.isVisible); + o.set("islefthandtapped", obj.isLeftHandTapped); + o.set("ishammerpullorigin", obj.isHammerPullOrigin); + o.set("isslurdestination", obj.isSlurDestination); + o.set("harmonictype", obj.harmonicType as number); + o.set("harmonicvalue", obj.harmonicValue); + o.set("isghost", obj.isGhost); + o.set("isletring", obj.isLetRing); + o.set("ispalmmute", obj.isPalmMute); + o.set("isdead", obj.isDead); + o.set("isstaccato", obj.isStaccato); + o.set("slideintype", obj.slideInType as number); + o.set("slideouttype", obj.slideOutType as number); + o.set("vibrato", obj.vibrato as number); + o.set("istiedestination", obj.isTieDestination); + o.set("lefthandfinger", obj.leftHandFinger as number); + o.set("righthandfinger", obj.rightHandFinger as number); + o.set("isfingering", obj.isFingering); + o.set("trillvalue", obj.trillValue); + o.set("trillspeed", obj.trillSpeed as number); + o.set("durationpercent", obj.durationPercent); + o.set("accidentalmode", obj.accidentalMode as number); + o.set("dynamics", obj.dynamics as number); + obj.toJson(o); + return o; } public static setProperty(obj: Note, property: string, v: unknown): boolean { switch (property) { @@ -180,8 +180,7 @@ export class NoteSerializer { case "dynamics": obj.dynamics = JsonHelper.parseEnum(v, DynamicValue)!; return true; - } - return obj.setProperty(property, v); + } + return obj.setProperty(property, v); } } - diff --git a/src/generated/model/PlaybackInformationSerializer.ts b/src/generated/model/PlaybackInformationSerializer.ts index 62f9ab5cc..90d3229d5 100644 --- a/src/generated/model/PlaybackInformationSerializer.ts +++ b/src/generated/model/PlaybackInformationSerializer.ts @@ -9,23 +9,23 @@ export class PlaybackInformationSerializer { public static fromJson(obj: PlaybackInformation, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: PlaybackInformation | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("volume", obj.volume); - o.set("balance", obj.balance); - o.set("port", obj.port); - o.set("program", obj.program); - o.set("primarychannel", obj.primaryChannel); - o.set("secondarychannel", obj.secondaryChannel); - o.set("ismute", obj.isMute); - o.set("issolo", obj.isSolo); - return o; + } + const o = new Map(); + o.set("volume", obj.volume); + o.set("balance", obj.balance); + o.set("port", obj.port); + o.set("program", obj.program); + o.set("primarychannel", obj.primaryChannel); + o.set("secondarychannel", obj.secondaryChannel); + o.set("ismute", obj.isMute); + o.set("issolo", obj.isSolo); + return o; } public static setProperty(obj: PlaybackInformation, property: string, v: unknown): boolean { switch (property) { @@ -53,8 +53,7 @@ export class PlaybackInformationSerializer { case "issolo": obj.isSolo = v! as boolean; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/RenderStylesheetSerializer.ts b/src/generated/model/RenderStylesheetSerializer.ts index 2132b1829..e88fdb532 100644 --- a/src/generated/model/RenderStylesheetSerializer.ts +++ b/src/generated/model/RenderStylesheetSerializer.ts @@ -9,24 +9,23 @@ export class RenderStylesheetSerializer { public static fromJson(obj: RenderStylesheet, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: RenderStylesheet | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("hidedynamics", obj.hideDynamics); - return o; + } + const o = new Map(); + o.set("hidedynamics", obj.hideDynamics); + return o; } public static setProperty(obj: RenderStylesheet, property: string, v: unknown): boolean { switch (property) { case "hidedynamics": obj.hideDynamics = v! as boolean; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/ScoreSerializer.ts b/src/generated/model/ScoreSerializer.ts index df30c54a5..35bb5c426 100644 --- a/src/generated/model/ScoreSerializer.ts +++ b/src/generated/model/ScoreSerializer.ts @@ -14,30 +14,30 @@ export class ScoreSerializer { public static fromJson(obj: Score, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Score | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("album", obj.album); - o.set("artist", obj.artist); - o.set("copyright", obj.copyright); - o.set("instructions", obj.instructions); - o.set("music", obj.music); - o.set("notices", obj.notices); - o.set("subtitle", obj.subTitle); - o.set("title", obj.title); - o.set("words", obj.words); - o.set("tab", obj.tab); - o.set("tempo", obj.tempo); - o.set("tempolabel", obj.tempoLabel); - o.set("masterbars", obj.masterBars.map(i => MasterBarSerializer.toJson(i))); - o.set("tracks", obj.tracks.map(i => TrackSerializer.toJson(i))); - o.set("stylesheet", RenderStylesheetSerializer.toJson(obj.stylesheet)); - return o; + } + const o = new Map(); + o.set("album", obj.album); + o.set("artist", obj.artist); + o.set("copyright", obj.copyright); + o.set("instructions", obj.instructions); + o.set("music", obj.music); + o.set("notices", obj.notices); + o.set("subtitle", obj.subTitle); + o.set("title", obj.title); + o.set("words", obj.words); + o.set("tab", obj.tab); + o.set("tempo", obj.tempo); + o.set("tempolabel", obj.tempoLabel); + o.set("masterbars", obj.masterBars.map(i => MasterBarSerializer.toJson(i))); + o.set("tracks", obj.tracks.map(i => TrackSerializer.toJson(i))); + o.set("stylesheet", RenderStylesheetSerializer.toJson(obj.stylesheet)); + return o; } public static setProperty(obj: Score, property: string, v: unknown): boolean { switch (property) { @@ -93,12 +93,11 @@ export class ScoreSerializer { obj.addTrack(i); } return true; - } + } if (["stylesheet"].indexOf(property) >= 0) { RenderStylesheetSerializer.fromJson(obj.stylesheet, v as Map); return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/SectionSerializer.ts b/src/generated/model/SectionSerializer.ts index 5ccd55603..a847437d6 100644 --- a/src/generated/model/SectionSerializer.ts +++ b/src/generated/model/SectionSerializer.ts @@ -9,17 +9,17 @@ export class SectionSerializer { public static fromJson(obj: Section, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Section | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("marker", obj.marker); - o.set("text", obj.text); - return o; + } + const o = new Map(); + o.set("marker", obj.marker); + o.set("text", obj.text); + return o; } public static setProperty(obj: Section, property: string, v: unknown): boolean { switch (property) { @@ -29,8 +29,7 @@ export class SectionSerializer { case "text": obj.text = v! as string; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/StaffSerializer.ts b/src/generated/model/StaffSerializer.ts index 40a3280b0..68d7873f5 100644 --- a/src/generated/model/StaffSerializer.ts +++ b/src/generated/model/StaffSerializer.ts @@ -14,31 +14,31 @@ export class StaffSerializer { public static fromJson(obj: Staff, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Staff | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("bars", obj.bars.map(i => BarSerializer.toJson(i))); + } + const o = new Map(); + o.set("bars", obj.bars.map(i => BarSerializer.toJson(i))); if (obj.chords !== null) { const m = new Map(); o.set("chords", m); for (const [k, v] of obj.chords!) { m.set(k.toString(), ChordSerializer.toJson(v)); } - } - o.set("capo", obj.capo); - o.set("transpositionpitch", obj.transpositionPitch); - o.set("displaytranspositionpitch", obj.displayTranspositionPitch); - o.set("stringtuning", TuningSerializer.toJson(obj.stringTuning)); - o.set("showtablature", obj.showTablature); - o.set("showstandardnotation", obj.showStandardNotation); - o.set("ispercussion", obj.isPercussion); - o.set("standardnotationlinecount", obj.standardNotationLineCount); - return o; + } + o.set("capo", obj.capo); + o.set("transpositionpitch", obj.transpositionPitch); + o.set("displaytranspositionpitch", obj.displayTranspositionPitch); + o.set("stringtuning", TuningSerializer.toJson(obj.stringTuning)); + o.set("showtablature", obj.showTablature); + o.set("showstandardnotation", obj.showStandardNotation); + o.set("ispercussion", obj.isPercussion); + o.set("standardnotationlinecount", obj.standardNotationLineCount); + return o; } public static setProperty(obj: Staff, property: string, v: unknown): boolean { switch (property) { @@ -53,9 +53,9 @@ export class StaffSerializer { case "chords": obj.chords = new Map(); JsonHelper.forEach(v, (v, k) => { - const i = new Chord(); - ChordSerializer.fromJson(i, v as Map); - obj.addChord(k, i); + const i = new Chord(); + ChordSerializer.fromJson(i, v as Map); + obj.addChord(k, i); }); return true; case "capo": @@ -79,12 +79,11 @@ export class StaffSerializer { case "standardnotationlinecount": obj.standardNotationLineCount = v! as number; return true; - } + } if (["stringtuning"].indexOf(property) >= 0) { TuningSerializer.fromJson(obj.stringTuning, v as Map); return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/TrackSerializer.ts b/src/generated/model/TrackSerializer.ts index b4e820398..5c948cbf1 100644 --- a/src/generated/model/TrackSerializer.ts +++ b/src/generated/model/TrackSerializer.ts @@ -15,21 +15,21 @@ export class TrackSerializer { public static fromJson(obj: Track, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Track | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("staves", obj.staves.map(i => StaffSerializer.toJson(i))); - o.set("playbackinfo", PlaybackInformationSerializer.toJson(obj.playbackInfo)); - o.set("color", Color.toJson(obj.color)); - o.set("name", obj.name); - o.set("shortname", obj.shortName); - o.set("percussionarticulations", obj.percussionArticulations.map(i => InstrumentArticulationSerializer.toJson(i))); - return o; + } + const o = new Map(); + o.set("staves", obj.staves.map(i => StaffSerializer.toJson(i))); + o.set("playbackinfo", PlaybackInformationSerializer.toJson(obj.playbackInfo)); + o.set("color", Color.toJson(obj.color)); + o.set("name", obj.name); + o.set("shortname", obj.shortName); + o.set("percussionarticulations", obj.percussionArticulations.map(i => InstrumentArticulationSerializer.toJson(i))); + return o; } public static setProperty(obj: Track, property: string, v: unknown): boolean { switch (property) { @@ -58,12 +58,11 @@ export class TrackSerializer { obj.percussionArticulations.push(i); } return true; - } + } if (["playbackinfo"].indexOf(property) >= 0) { PlaybackInformationSerializer.fromJson(obj.playbackInfo, v as Map); return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/TuningSerializer.ts b/src/generated/model/TuningSerializer.ts index 5fe512dc2..3dadd78a1 100644 --- a/src/generated/model/TuningSerializer.ts +++ b/src/generated/model/TuningSerializer.ts @@ -9,18 +9,18 @@ export class TuningSerializer { public static fromJson(obj: Tuning, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Tuning | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("isstandard", obj.isStandard); - o.set("name", obj.name); - o.set("tunings", obj.tunings); - return o; + } + const o = new Map(); + o.set("isstandard", obj.isStandard); + o.set("name", obj.name); + o.set("tunings", obj.tunings); + return o; } public static setProperty(obj: Tuning, property: string, v: unknown): boolean { switch (property) { @@ -33,8 +33,7 @@ export class TuningSerializer { case "tunings": obj.tunings = v! as number[]; return true; - } - return false; + } + return false; } } - diff --git a/src/generated/model/VoiceSerializer.ts b/src/generated/model/VoiceSerializer.ts index 51845b884..3d6820dc3 100644 --- a/src/generated/model/VoiceSerializer.ts +++ b/src/generated/model/VoiceSerializer.ts @@ -11,18 +11,18 @@ export class VoiceSerializer { public static fromJson(obj: Voice, m: unknown): void { if (!m) { return; - } - JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); + } + JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k, v)); } public static toJson(obj: Voice | null): Map | null { if (!obj) { return null; - } - const o = new Map(); - o.set("id", obj.id); - o.set("beats", obj.beats.map(i => BeatSerializer.toJson(i))); - o.set("isempty", obj.isEmpty); - return o; + } + const o = new Map(); + o.set("id", obj.id); + o.set("beats", obj.beats.map(i => BeatSerializer.toJson(i))); + o.set("isempty", obj.isEmpty); + return o; } public static setProperty(obj: Voice, property: string, v: unknown): boolean { switch (property) { @@ -40,8 +40,7 @@ export class VoiceSerializer { case "isempty": obj.isEmpty = v! as boolean; return true; - } - return false; + } + return false; } } - From 4a528e5afa3ae342849b4b5ff7acfdc153043448 Mon Sep 17 00:00:00 2001 From: jonaro00 <54029719+jonaro00@users.noreply.github.com> Date: Mon, 28 Nov 2022 03:06:18 +0100 Subject: [PATCH 2/6] Minor test cleanups --- src/importer/ScoreLoader.ts | 3 +-- src/model/Beat.ts | 4 ++-- test/audio/MidiFileGenerator.test.ts | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/importer/ScoreLoader.ts b/src/importer/ScoreLoader.ts index 38a3b13ab..d54e39da6 100644 --- a/src/importer/ScoreLoader.ts +++ b/src/importer/ScoreLoader.ts @@ -76,8 +76,7 @@ export class ScoreLoader { let importers: ScoreImporter[] = Environment.buildImporters(); Logger.debug( 'ScoreLoader', - 'Loading score from ' + data.length + ' bytes using ' + importers.length + ' importers', - null + 'Loading score from ' + data.length + ' bytes using ' + importers.length + ' importers' ); let score: Score | null = null; let bb: ByteBuffer = ByteBuffer.fromBuffer(data); diff --git a/src/model/Beat.ts b/src/model/Beat.ts index 0f5e05cf8..10ed8cbfb 100644 --- a/src/model/Beat.ts +++ b/src/model/Beat.ts @@ -762,10 +762,10 @@ export class Beat { points.splice(2, 1); points.splice(1, 1); } else { - Logger.warning('Model', 'Unsupported whammy type detected, fallback to custom', null); + Logger.warning('Model', 'Unsupported whammy type detected, fallback to custom'); } } else { - Logger.warning('Model', 'Unsupported whammy type detected, fallback to custom', null); + Logger.warning('Model', 'Unsupported whammy type detected, fallback to custom'); } } } diff --git a/test/audio/MidiFileGenerator.test.ts b/test/audio/MidiFileGenerator.test.ts index 246133a42..8a9e8cb4b 100644 --- a/test/audio/MidiFileGenerator.test.ts +++ b/test/audio/MidiFileGenerator.test.ts @@ -140,7 +140,7 @@ describe('MidiFileGeneratorTest', () => { new TrackEndEvent(3840, 0) // 3840 = end of bar ]; for (let i: number = 0; i < handler.midiEvents.length; i++) { - Logger.info('Test', `i[${i}] ${handler.midiEvents[i]}`); + // Logger.info('Test', `i[${i}] ${handler.midiEvents[i]}`); if (i < expectedEvents.length) { expect(expectedEvents[i].equals(handler.midiEvents[i])) .withContext(`i[${i}] expected[${expectedEvents[i]}] !== actual[${handler.midiEvents[i]}]`) From a7294e67da5dbea1fbce5f533b7b3c3ad7967b76 Mon Sep 17 00:00:00 2001 From: jonaro00 <54029719+jonaro00@users.noreply.github.com> Date: Tue, 29 Nov 2022 02:36:08 +0100 Subject: [PATCH 3/6] Fix vscode settings --- .vscode/launch.json | 15 +++------------ .vscode/settings.json | 13 +++++++------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8ce28f38b..1a31b5e12 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,7 +4,6 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ - { "name": "Launch C# Compiler", "type": "node", @@ -20,14 +19,12 @@ "ts-node/register" ], "cwd": "${workspaceRoot}", - "protocol": "inspector", "smartStep": false, "internalConsoleOptions": "openOnSessionStart", "env": { "TS_NODE_PROJECT": "tsconfig.build-csharp.json" } }, - { "name": "Launch Kotlin Compiler", "type": "node", @@ -43,14 +40,12 @@ "ts-node/register" ], "cwd": "${workspaceRoot}", - "protocol": "inspector", "smartStep": false, "internalConsoleOptions": "openOnSessionStart", "env": { "TS_NODE_PROJECT": "tsconfig.build-kotlin.json" } }, - { "name": "Launch TypeScript Generator", "type": "node", @@ -66,14 +61,12 @@ "ts-node/register" ], "cwd": "${workspaceRoot}", - "protocol": "inspector", "smartStep": false, "internalConsoleOptions": "openOnSessionStart", "env": { "TS_NODE_PROJECT": "tsconfig.build-csharp.json" } }, - { "name": "Launch JavaScript Compiler", "type": "node", @@ -83,11 +76,9 @@ "runtimeExecutable": "npm.cmd" }, "runtimeArgs": [ - "run-script", - "build", - "--inspect-brk=5858" - ], - "port": 5858 + "run", + "build" + ] } ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 78af7f1e9..c80290a82 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,8 @@ -{ - "files.exclude": { - "dist/lib.csharp/**": true, - "src.csharp/**": true, - "node_modules/**": true - } +{ + "files.exclude": { + "dist/lib.csharp/**": true, + "src.csharp/**": true, + "node_modules/**": true + }, + "files.eol": "\n" } \ No newline at end of file From 4b58b018f9c756ad055a54bd33a85c51fe353eb8 Mon Sep 17 00:00:00 2001 From: jonaro00 <54029719+jonaro00@users.noreply.github.com> Date: Sun, 18 Dec 2022 00:18:36 +0100 Subject: [PATCH 4/6] Fix requested changes --- src.compiler/typescript/EmitterBase.ts | 36 +++++++++++++------------- src/importer/ScoreLoader.ts | 2 +- test/audio/MidiFileGenerator.test.ts | 13 ++++------ 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src.compiler/typescript/EmitterBase.ts b/src.compiler/typescript/EmitterBase.ts index 17792e0ce..304420e9d 100644 --- a/src.compiler/typescript/EmitterBase.ts +++ b/src.compiler/typescript/EmitterBase.ts @@ -7,10 +7,12 @@ export const GENERATED_FILE_HEADER = `\ // This code was auto-generated. // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. -// ` - -export default function createEmitter(jsDocMarker: string, generate: (program: ts.Program, classDeclaration: ts.ClassDeclaration) => ts.SourceFile) { +// `; +export default function createEmitter( + jsDocMarker: string, + generate: (program: ts.Program, classDeclaration: ts.ClassDeclaration) => ts.SourceFile +) { function generateClass(program: ts.Program, classDeclaration: ts.ClassDeclaration) { const sourceFileName = path.relative( path.resolve(program.getCompilerOptions().baseUrl!, 'src'), @@ -18,8 +20,8 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t ); const result = generate(program, classDeclaration); - const defaultClass = result.statements.find(stmt => ts.isClassDeclaration(stmt) && - stmt.modifiers!.find(m => m.kind === ts.SyntaxKind.ExportKeyword) + const defaultClass = result.statements.find( + stmt => ts.isClassDeclaration(stmt) && stmt.modifiers!.find(m => m.kind === ts.SyntaxKind.ExportKeyword) ) as ts.ClassDeclaration; const targetFileName = path.join( @@ -33,10 +35,7 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t const fileHandle = fs.openSync(targetFileName, 'w'); - fs.writeSync( - fileHandle, - `${GENERATED_FILE_HEADER}\n` - ); + fs.writeSync(fileHandle, `${GENERATED_FILE_HEADER}\n`); const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); const source = printer.printNode(ts.EmitHint.Unspecified, result, result); @@ -49,10 +48,10 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t getCompilationSettings: () => program.getCompilerOptions(), getDefaultLibFileName: options => ts.getDefaultLibFilePath(options), fileExists: fileName => fileName === targetFileName, - readFile: fileName => fileName === targetFileName ? source : "", + readFile: fileName => (fileName === targetFileName ? source : ''), readDirectory: ts.sys.readDirectory, directoryExists: ts.sys.directoryExists, - getDirectories: ts.sys.getDirectories, + getDirectories: ts.sys.getDirectories }; const languageService = ts.createLanguageService(servicesHost, ts.createDocumentRegistry()); @@ -61,16 +60,16 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t insertSpaceAfterCommaDelimiter: true, insertSpaceAfterKeywordsInControlFlowStatements: true, insertSpaceBeforeAndAfterBinaryOperators: true, - newLineCharacter: "\n", + newLineCharacter: '\n', indentStyle: ts.IndentStyle.Smart, indentSize: 4, - tabSize: 4, + tabSize: 4 } as ts.FormatCodeSettings); formattingChanges.sort((a, b) => b.span.start - a.span.start); let finalText = source; - for (const { span, newText } of formattingChanges) { - finalText = `${finalText.slice(0, span.start)}${newText}${finalText.slice(span.start + span.length)}`; + for (const { span: { start, length }, newText } of formattingChanges) { + finalText = `${finalText.slice(0, start)}${newText}${finalText.slice(start + length)}`; } finalText = finalText.replace(/\/\/ */g, '').replace(/ +$/gm, ''); @@ -80,8 +79,9 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t function scanSourceFile(program: ts.Program, sourceFile: ts.SourceFile) { sourceFile.statements.forEach(stmt => { - if (ts.isClassDeclaration(stmt) && ts.getJSDocTags(stmt).some(t => t.tagName.text === jsDocMarker)) + if (ts.isClassDeclaration(stmt) && ts.getJSDocTags(stmt).some(t => t.tagName.text === jsDocMarker)) { generateClass(program, stmt); + } }); } @@ -89,5 +89,5 @@ export default function createEmitter(jsDocMarker: string, generate: (program: t program.getRootFileNames().forEach(file => { scanSourceFile(program, program.getSourceFile(file)!); }); - } -} \ No newline at end of file + }; +} diff --git a/src/importer/ScoreLoader.ts b/src/importer/ScoreLoader.ts index d54e39da6..172a7266a 100644 --- a/src/importer/ScoreLoader.ts +++ b/src/importer/ScoreLoader.ts @@ -76,7 +76,7 @@ export class ScoreLoader { let importers: ScoreImporter[] = Environment.buildImporters(); Logger.debug( 'ScoreLoader', - 'Loading score from ' + data.length + ' bytes using ' + importers.length + ' importers' + `Loading score from ${data.length} bytes using ${importers.length} importers` ); let score: Score | null = null; let bb: ByteBuffer = ByteBuffer.fromBuffer(data); diff --git a/test/audio/MidiFileGenerator.test.ts b/test/audio/MidiFileGenerator.test.ts index 8a9e8cb4b..a35201085 100644 --- a/test/audio/MidiFileGenerator.test.ts +++ b/test/audio/MidiFileGenerator.test.ts @@ -139,15 +139,12 @@ describe('MidiFileGeneratorTest', () => { // end of track new TrackEndEvent(3840, 0) // 3840 = end of bar ]; - for (let i: number = 0; i < handler.midiEvents.length; i++) { - // Logger.info('Test', `i[${i}] ${handler.midiEvents[i]}`); - if (i < expectedEvents.length) { - expect(expectedEvents[i].equals(handler.midiEvents[i])) - .withContext(`i[${i}] expected[${expectedEvents[i]}] !== actual[${handler.midiEvents[i]}]`) - .toEqual(true); - } - } expect(handler.midiEvents.length).toEqual(expectedEvents.length); + for (let i: number = 0; i < expectedEvents.length; i++) { + expect(expectedEvents[i].equals(handler.midiEvents[i])) + .withContext(`i[${i}] expected[${expectedEvents[i]}] !== actual[${handler.midiEvents[i]}]`) + .toEqual(true); + } }); it('grace-beats', async () => { From f55b0ad8ef76ebb4e3a4995fb4c501cc3c1618f4 Mon Sep 17 00:00:00 2001 From: jonaro00 <54029719+jonaro00@users.noreply.github.com> Date: Sun, 18 Dec 2022 00:23:28 +0100 Subject: [PATCH 5/6] Revert settings.json change --- .vscode/settings.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c80290a82..78af7f1e9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,7 @@ -{ - "files.exclude": { - "dist/lib.csharp/**": true, - "src.csharp/**": true, - "node_modules/**": true - }, - "files.eol": "\n" +{ + "files.exclude": { + "dist/lib.csharp/**": true, + "src.csharp/**": true, + "node_modules/**": true + } } \ No newline at end of file From 44d318ad7a21f1c570e59dde6fd230615605c71e Mon Sep 17 00:00:00 2001 From: Danielku15 Date: Sat, 14 Jan 2023 16:04:16 +0100 Subject: [PATCH 6/6] Create multiline blocks instead of comments --- src.compiler/BuilderHelpers.ts | 3 -- src.compiler/typescript/CloneEmitter.ts | 10 +++---- src.compiler/typescript/EmitterBase.ts | 7 ++--- .../typescript/Serializer.fromJson.ts | 6 ++-- .../typescript/Serializer.setProperty.ts | 29 ++++++++++--------- src.compiler/typescript/Serializer.toJson.ts | 3 +- src.compiler/typescript/SerializerEmitter.ts | 3 -- 7 files changed, 26 insertions(+), 35 deletions(-) diff --git a/src.compiler/BuilderHelpers.ts b/src.compiler/BuilderHelpers.ts index a52163f25..9b0bd2a92 100644 --- a/src.compiler/BuilderHelpers.ts +++ b/src.compiler/BuilderHelpers.ts @@ -46,9 +46,6 @@ function findNode(node: ts.Node, kind: ts.SyntaxKind): ts.Node | null { return null; } -export function addNewLines(stmts: ts.Statement[]) { - return stmts.map(stmt => ts.addSyntheticTrailingComment(stmt, ts.SyntaxKind.SingleLineCommentTrivia, '', true)); -} export function getTypeWithNullableInfo( checker: ts.TypeChecker, node: ts.TypeNode | undefined, diff --git a/src.compiler/typescript/CloneEmitter.ts b/src.compiler/typescript/CloneEmitter.ts index 1a0d5fb93..162f54974 100644 --- a/src.compiler/typescript/CloneEmitter.ts +++ b/src.compiler/typescript/CloneEmitter.ts @@ -5,7 +5,6 @@ import * as path from 'path'; import * as ts from 'typescript'; import createEmitter from './EmitterBase'; -import { addNewLines } from '../BuilderHelpers'; import { getTypeWithNullableInfo, unwrapArrayItemType } from '../BuilderHelpers'; function removeExtension(fileName: string) { @@ -137,7 +136,7 @@ function generateClonePropertyStatements( ] ) ) - ]) + ], true) ) ]; @@ -154,7 +153,7 @@ function generateClonePropertyStatements( ts.factory.createIdentifier('original'), propertyName ), - ts.factory.createBlock(loopItems), + ts.factory.createBlock(loopItems, true), undefined ) ); @@ -255,7 +254,7 @@ function generateCloneBody( }, new Array()); return ts.factory.createBlock( - addNewLines([ + [ // const clone = new Type(); ts.factory.createVariableStatement( undefined, @@ -274,8 +273,7 @@ function generateCloneBody( ...bodyStatements, // return json; ts.factory.createReturnStatement(ts.factory.createIdentifier('clone')) - ]) - ); + ], true); } function createCloneMethod( diff --git a/src.compiler/typescript/EmitterBase.ts b/src.compiler/typescript/EmitterBase.ts index 304420e9d..51849800b 100644 --- a/src.compiler/typescript/EmitterBase.ts +++ b/src.compiler/typescript/EmitterBase.ts @@ -37,7 +37,7 @@ export default function createEmitter( fs.writeSync(fileHandle, `${GENERATED_FILE_HEADER}\n`); - const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); + const printer = ts.createPrinter(); const source = printer.printNode(ts.EmitHint.Unspecified, result, result); const servicesHost: ts.LanguageServiceHost = { getScriptFileNames: () => [targetFileName], @@ -60,10 +60,10 @@ export default function createEmitter( insertSpaceAfterCommaDelimiter: true, insertSpaceAfterKeywordsInControlFlowStatements: true, insertSpaceBeforeAndAfterBinaryOperators: true, - newLineCharacter: '\n', indentStyle: ts.IndentStyle.Smart, indentSize: 4, - tabSize: 4 + tabSize: 4, + trimTrailingWhitespace: true } as ts.FormatCodeSettings); formattingChanges.sort((a, b) => b.span.start - a.span.start); @@ -71,7 +71,6 @@ export default function createEmitter( for (const { span: { start, length }, newText } of formattingChanges) { finalText = `${finalText.slice(0, start)}${newText}${finalText.slice(start + length)}`; } - finalText = finalText.replace(/\/\/ */g, '').replace(/ +$/gm, ''); fs.writeSync(fileHandle, finalText); fs.closeSync(fileHandle); diff --git a/src.compiler/typescript/Serializer.fromJson.ts b/src.compiler/typescript/Serializer.fromJson.ts index f1b5e5299..66e72906f 100644 --- a/src.compiler/typescript/Serializer.fromJson.ts +++ b/src.compiler/typescript/Serializer.fromJson.ts @@ -1,10 +1,10 @@ import * as ts from 'typescript'; -import { addNewLines, createNodeFromSource, setMethodBody } from '../BuilderHelpers'; +import { createNodeFromSource, setMethodBody } from '../BuilderHelpers'; import { JsonSerializable } from './Serializer.common'; function generateFromJsonBody(serializable: JsonSerializable, importer: (name: string, module: string) => void) { importer('JsonHelper', '@src/io/JsonHelper'); - return ts.factory.createBlock(addNewLines([ + return ts.factory.createBlock([ createNodeFromSource(`if(!m) { return; }`, ts.SyntaxKind.IfStatement), @@ -17,7 +17,7 @@ function generateFromJsonBody(serializable: JsonSerializable, importer: (name: s `JsonHelper.forEach(m, (v, k) => this.setProperty(obj, k.toLowerCase(), v));`, ts.SyntaxKind.ExpressionStatement ) - ])); + ], true); } export function createFromJsonMethod( diff --git a/src.compiler/typescript/Serializer.setProperty.ts b/src.compiler/typescript/Serializer.setProperty.ts index d2263914d..f63c6fffd 100644 --- a/src.compiler/typescript/Serializer.setProperty.ts +++ b/src.compiler/typescript/Serializer.setProperty.ts @@ -1,5 +1,5 @@ import * as ts from 'typescript'; -import { addNewLines, createNodeFromSource, setMethodBody } from '../BuilderHelpers'; +import { createNodeFromSource, setMethodBody } from '../BuilderHelpers'; import { isPrimitiveType } from '../BuilderHelpers'; import { hasFlag } from '../BuilderHelpers'; import { getTypeWithNullableInfo } from '../BuilderHelpers'; @@ -205,7 +205,7 @@ function generateSetPropertyBody( if (type.isNullable) { caseStatements.push( - ts.factory.createIfStatement(ts.factory.createIdentifier('v'), ts.factory.createBlock(loopItems)) + ts.factory.createIfStatement(ts.factory.createIdentifier('v'), ts.factory.createBlock(loopItems, true)) ); } else { caseStatements.push(...loopItems); @@ -291,8 +291,7 @@ function generateSetPropertyBody( undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createBlock( - addNewLines( - [ + [ itemSerializer.length > 0 && createNodeFromSource( `const i = new ${mapType.typeArguments![1].symbol.name}();`, @@ -321,8 +320,8 @@ function generateSetPropertyBody( [mapKey, mapValue] ) ) - ].filter(s => !!s) as ts.Statement[] - ) + ].filter(s => !!s) as ts.Statement[], + true ) ) ] @@ -429,11 +428,12 @@ function generateSetPropertyBody( ] ) ) - ]), - ts.factory.createBlock([assignField(ts.factory.createNull())]) + ], true), + ts.factory.createBlock([assignField(ts.factory.createNull())], true) ), ts.factory.createReturnStatement(ts.factory.createTrue()) - ] + ], + true ), !prop.partialNames ? undefined @@ -518,14 +518,15 @@ function generateSetPropertyBody( ), ts.factory.createBlock([ ts.factory.createReturnStatement(ts.factory.createTrue()) - ]) + ], true) ) - ].filter(s => !!s) as ts.Statement[] + ].filter(s => !!s) as ts.Statement[], + true ) ) - ]) + ], true) ) - ]) + ], true) ) ); } @@ -568,7 +569,7 @@ function generateSetPropertyBody( statements.push(ts.factory.createReturnStatement(ts.factory.createFalse())); } - return ts.factory.createBlock(addNewLines(statements)); + return ts.factory.createBlock(statements, true); } export function createSetPropertyMethod( diff --git a/src.compiler/typescript/Serializer.toJson.ts b/src.compiler/typescript/Serializer.toJson.ts index a3d643b68..75dbbdcd2 100644 --- a/src.compiler/typescript/Serializer.toJson.ts +++ b/src.compiler/typescript/Serializer.toJson.ts @@ -1,6 +1,5 @@ import * as ts from 'typescript'; import { - addNewLines, createNodeFromSource, setMethodBody, isPrimitiveType, @@ -250,7 +249,7 @@ function generateToJsonBody( statements.push(ts.factory.createReturnStatement(ts.factory.createIdentifier('o'))); - return ts.factory.createBlock(addNewLines(statements)); + return ts.factory.createBlock(statements, true); } export function createToJsonMethod( diff --git a/src.compiler/typescript/SerializerEmitter.ts b/src.compiler/typescript/SerializerEmitter.ts index cad7c1c1c..ee6c37cd0 100644 --- a/src.compiler/typescript/SerializerEmitter.ts +++ b/src.compiler/typescript/SerializerEmitter.ts @@ -73,7 +73,6 @@ export default createEmitter('json', (program, input) => { importedNames.add(name); statements.push( ts.factory.createImportDeclaration( - undefined, undefined, ts.factory.createImportClause( false, @@ -89,7 +88,6 @@ export default createEmitter('json', (program, input) => { statements.push( ts.factory.createClassDeclaration( - [], [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], input.name!.text + 'Serializer', undefined, @@ -105,7 +103,6 @@ export default createEmitter('json', (program, input) => { const sourceFile = ts.factory.createSourceFile( [ ts.factory.createImportDeclaration( - undefined, undefined, ts.factory.createImportClause( false,