From 8209772a4996614e07f94f60fc4f58660fed72ff Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Thu, 5 Mar 2020 00:06:05 -0800 Subject: [PATCH] Update TS CommandContext type. --- Server/Server.csproj | 4 ++-- Server/wwwroot/scripts/BrowserSockets.js | 4 ++-- Server/wwwroot/scripts/BrowserSockets.js.map | 2 +- Server/wwwroot/scripts/BrowserSockets.ts | 6 +++--- Server/wwwroot/scripts/Models/CommandContext.js | 1 - .../wwwroot/scripts/Models/CommandContext.js.map | 1 - Server/wwwroot/scripts/Models/CommandResult.js | 1 + .../wwwroot/scripts/Models/CommandResult.js.map | 1 + .../{CommandContext.ts => CommandResult.ts} | 2 +- Server/wwwroot/scripts/ResultsParser.js | 14 +++++++------- Server/wwwroot/scripts/ResultsParser.js.map | 2 +- Server/wwwroot/scripts/ResultsParser.ts | 16 ++++++++-------- 12 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 Server/wwwroot/scripts/Models/CommandContext.js delete mode 100644 Server/wwwroot/scripts/Models/CommandContext.js.map create mode 100644 Server/wwwroot/scripts/Models/CommandResult.js create mode 100644 Server/wwwroot/scripts/Models/CommandResult.js.map rename Server/wwwroot/scripts/Models/{CommandContext.ts => CommandResult.ts} (86%) diff --git a/Server/Server.csproj b/Server/Server.csproj index 9cd34561..a448c770 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -35,8 +35,8 @@ - + @@ -112,7 +112,7 @@ - + True True diff --git a/Server/wwwroot/scripts/BrowserSockets.js b/Server/wwwroot/scripts/BrowserSockets.js index 1391790f..1aa1ee83 100644 --- a/Server/wwwroot/scripts/BrowserSockets.js +++ b/Server/wwwroot/scripts/BrowserSockets.js @@ -137,8 +137,8 @@ function applyMessageHandlers(hubConnection) { }; xhr.send(); }); - hubConnection.on("CommandContextCreated", (context) => { - AddConsoleHTML(CreateCommandHarness(context).outerHTML); + hubConnection.on("CommandContextCreated", (result) => { + AddConsoleHTML(CreateCommandHarness(result).outerHTML); }); hubConnection.on("ServiceID", (serviceID) => { ServiceID = serviceID; diff --git a/Server/wwwroot/scripts/BrowserSockets.js.map b/Server/wwwroot/scripts/BrowserSockets.js.map index 95694ae4..bb5bef73 100644 --- a/Server/wwwroot/scripts/BrowserSockets.js.map +++ b/Server/wwwroot/scripts/BrowserSockets.js.map @@ -1 +1 @@ -{"version":3,"file":"BrowserSockets.js","sourceRoot":"","sources":["BrowserSockets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAK1C,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACjI,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,CAAC,IAAI,UAAe,CAAC;AAC3B,MAAM,CAAC,IAAI,SAAiB,CAAC;AAC7B,MAAM,CAAC,IAAI,SAAkB,CAAC;AAE9B,MAAM,UAAU,OAAO;IACnB,IAAI,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,UAAU,GAAG,IAAI,OAAO,CAAC,oBAAoB,EAAE;SAC1C,OAAO,CAAC,aAAa,CAAC;SACtB,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;SAC9C,KAAK,EAAE,CAAC;IAEb,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEjC,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9B,SAAS,GAAG,KAAK,CAAC;QAClB,gBAAgB,CAAC,8EAA8E,CAAC,CAAC;IACrG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACT,SAAS,GAAG,IAAI,CAAC;IACrB,CAAC,CAAC,CAAA;IACF,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QACxC,SAAS,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE;YAC7B,EAAE,CAAC,SAAS,CAAC,oBAAoB,EAC7B,mEAAmE,EACnE,gGAAgG,CAAC,CAAC;YACtG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;SACxC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAAA,CAAC;AAEF,SAAS,oBAAoB,CAAC,aAAa;IACvC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAgB,EAAE,UAAkB,EAAE,OAAe,EAAE,EAAE;QAC/E,IAAI,OAAO,EAAE;YACT,cAAc,CAAC,uCAAuC,UAAU,cAAc,OAAO,EAAE,CAAC,CAAC;YACzF,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;SAClD;IACL,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,OAAoB,EAAE,EAAE;QACrD,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC5E,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;QAClF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC;QAChF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC;QAC9E,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC5E,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;QACnC,QAAQ,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAa,EAAE,EAAE;QACnD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,MAAc,EAAE,EAAE;QACrD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,MAAc,EAAE,EAAE;QACnD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,MAA2B,EAAE,EAAE;QAC7D,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAChC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,MAA4B,EAAE,EAAE;QAC/D,wBAAwB,CAAC,MAAM,CAAC,CAAC;QACjC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,cAAsB,EAAE,YAAoB,EAAE,EAAE;QAChF,IAAI,cAAc,EAAE;YAChB,gBAAgB,CAAC,cAAc,CAAC,CAAC;SACpC;QACD,IAAI,YAAY,EAAE;YACd,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SACjC;IACL,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,OAAe,EAAE,EAAE;QACvD,cAAc,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,MAAc,EAAE,EAAE;QAChD,QAAQ,CAAC,MAAM,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,UAAkB,EAAE,EAAE;QACzD,IAAI,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,UAAU,GAAG,YAAY,CAAC,CAAC;QAC1E,IAAI,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACjD,gBAAgB,CAAC,SAAS,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxD,CAAC,CAAC,CAAA;IACF,aAAa,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC5E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACtD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC3E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,6BAA6B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACvF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QACzE,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC1E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAC,OAAuB,EAAE,EAAE;QAClE,cAAc,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,SAAiB,EAAE,EAAE;QAChD,SAAS,GAAG,SAAS,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,wBAAwB,EAAE,CAAC,cAAsB,EAAE,EAAE;QAClE,MAAM,CAAC,IAAI,CAAC,2BAA2B,cAAc,cAAc,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACP,CAAC"} \ No newline at end of file +{"version":3,"file":"BrowserSockets.js","sourceRoot":"","sources":["BrowserSockets.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/BrowserSockets.ts b/Server/wwwroot/scripts/BrowserSockets.ts index 92659321..62d68af8 100644 --- a/Server/wwwroot/scripts/BrowserSockets.ts +++ b/Server/wwwroot/scripts/BrowserSockets.ts @@ -3,7 +3,7 @@ import * as DataGrid from "./DataGrid.js"; import { Device } from "./Models/Device.js"; import { PSCoreCommandResult } from "./Models/PSCoreCommandResult.js"; import { GenericCommandResult } from "./Models/GenericCommandResult.js"; -import { CommandContext } from "./Models/CommandContext.js"; +import { CommandResult } from "./Models/CommandResult.js"; import { CreateCommandHarness, AddCommandResultsHarness, AddPSCoreResultsHarness, UpdateResultsCount } from "./ResultsParser.js"; import { Store } from "./Store.js"; import { UserOptions } from "./Models/UserOptions.js"; @@ -152,8 +152,8 @@ function applyMessageHandlers(hubConnection) { }; xhr.send(); }); - hubConnection.on("CommandContextCreated", (context: CommandContext) => { - AddConsoleHTML(CreateCommandHarness(context).outerHTML); + hubConnection.on("CommandContextCreated", (result: CommandResult) => { + AddConsoleHTML(CreateCommandHarness(result).outerHTML); }); hubConnection.on("ServiceID", (serviceID: string) => { ServiceID = serviceID; diff --git a/Server/wwwroot/scripts/Models/CommandContext.js b/Server/wwwroot/scripts/Models/CommandContext.js deleted file mode 100644 index e46e87aa..00000000 --- a/Server/wwwroot/scripts/Models/CommandContext.js +++ /dev/null @@ -1 +0,0 @@ -//# sourceMappingURL=CommandContext.js.map \ No newline at end of file diff --git a/Server/wwwroot/scripts/Models/CommandContext.js.map b/Server/wwwroot/scripts/Models/CommandContext.js.map deleted file mode 100644 index 75b22041..00000000 --- a/Server/wwwroot/scripts/Models/CommandContext.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"CommandContext.js","sourceRoot":"","sources":["CommandContext.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Models/CommandResult.js b/Server/wwwroot/scripts/Models/CommandResult.js new file mode 100644 index 00000000..f197d614 --- /dev/null +++ b/Server/wwwroot/scripts/Models/CommandResult.js @@ -0,0 +1 @@ +//# sourceMappingURL=CommandResult.js.map \ No newline at end of file diff --git a/Server/wwwroot/scripts/Models/CommandResult.js.map b/Server/wwwroot/scripts/Models/CommandResult.js.map new file mode 100644 index 00000000..5fd06804 --- /dev/null +++ b/Server/wwwroot/scripts/Models/CommandResult.js.map @@ -0,0 +1 @@ +{"version":3,"file":"CommandResult.js","sourceRoot":"","sources":["CommandResult.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Models/CommandContext.ts b/Server/wwwroot/scripts/Models/CommandResult.ts similarity index 86% rename from Server/wwwroot/scripts/Models/CommandContext.ts rename to Server/wwwroot/scripts/Models/CommandResult.ts index 8f60a63f..45f8e050 100644 --- a/Server/wwwroot/scripts/Models/CommandContext.ts +++ b/Server/wwwroot/scripts/Models/CommandResult.ts @@ -1,4 +1,4 @@ -export interface CommandContext { +export interface CommandResult { ID: string; CommandMode: string; CommandText: string; diff --git a/Server/wwwroot/scripts/ResultsParser.js b/Server/wwwroot/scripts/ResultsParser.js index 4808a308..234949ee 100644 --- a/Server/wwwroot/scripts/ResultsParser.js +++ b/Server/wwwroot/scripts/ResultsParser.js @@ -1,21 +1,21 @@ import * as DataGrid from "./DataGrid.js"; import { ConsoleFrame } from "./UI.js"; import { FormatScriptOutput, FormatScriptOutputArray } from "./Utilities.js"; -export function CreateCommandHarness(context) { - var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse show"; +export function CreateCommandHarness(result) { + var collapseClass = result.TargetDeviceIDs.length > 1 ? "collapse" : "collapse show"; var commandHarness = document.createElement("div"); - var contextID = "c" + context.ID; + var contextID = "c" + result.ID; commandHarness.id = contextID; commandHarness.classList.add("command-harness"); commandHarness.innerHTML = `
- Command Type: ${context.CommandMode} | - Total Devices: ${context.TargetDeviceIDs.length} | + Command Type: ${result.CommandMode} | + Total Devices: ${result.TargetDeviceIDs.length} | Completed: 0% | Errors: 0 | - JSON - XML + JSON + XML
`; diff --git a/Server/wwwroot/scripts/ResultsParser.js.map b/Server/wwwroot/scripts/ResultsParser.js.map index d6a1f6d7..0dfd825d 100644 --- a/Server/wwwroot/scripts/ResultsParser.js.map +++ b/Server/wwwroot/scripts/ResultsParser.js.map @@ -1 +1 @@ -{"version":3,"file":"ResultsParser.js","sourceRoot":"","sources":["ResultsParser.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ResultsParser.js","sourceRoot":"","sources":["ResultsParser.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/ResultsParser.ts b/Server/wwwroot/scripts/ResultsParser.ts index 22050967..e04b16fb 100644 --- a/Server/wwwroot/scripts/ResultsParser.ts +++ b/Server/wwwroot/scripts/ResultsParser.ts @@ -1,25 +1,25 @@ -import { CommandContext } from "./Models/CommandContext.js"; +import { CommandResult } from "./Models/CommandResult.js"; import { PSCoreCommandResult } from "./Models/PSCoreCommandResult.js"; import * as DataGrid from "./DataGrid.js"; import { GenericCommandResult } from "./Models/GenericCommandResult.js"; import { ConsoleOutputDiv, TabContentWrapper, ConsoleFrame } from "./UI.js"; import { FormatScriptOutput, FormatScriptOutputArray } from "./Utilities.js"; -export function CreateCommandHarness(context: CommandContext): HTMLDivElement { - var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse show"; +export function CreateCommandHarness(result: CommandResult): HTMLDivElement { + var collapseClass = result.TargetDeviceIDs.length > 1 ? "collapse" : "collapse show"; var commandHarness = document.createElement("div"); - var contextID = "c" + context.ID; + var contextID = "c" + result.ID; commandHarness.id = contextID; commandHarness.classList.add("command-harness"); commandHarness.innerHTML = `
- Command Type: ${context.CommandMode} | - Total Devices: ${context.TargetDeviceIDs.length} | + Command Type: ${result.CommandMode} | + Total Devices: ${result.TargetDeviceIDs.length} | Completed: 0% | Errors: 0 | - JSON - XML + JSON + XML
`;