feat: use xml-js for standard JSON output (#7)

BREAKING CHANGE: uniform response output via xml-js library.
patrickmichalina · Jan 29, 2019 · 155bdb0 · 155bdb0
1 parent c4a1654
commit 155bdb0
Show file tree

Hide file tree

Showing 17 changed files with 406 additions and 407 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,13 +42,15 @@
     "rxjs": "^6.3.3",
     "typescript-monads": "^3.10.0",
     "uuid": "^3.3.2",
+    "xml-js": "^1.6.9",
     "xmldom": "^0.1.27"
   },
   "devDependencies": {
     "@types/fs-extra": "^5.0.4",
     "@types/node": "^10.12.19",
     "@types/node-fetch": "^2.1.4",
     "@types/uuid": "^3.4.4",
+    "@types/xml-js": "^1.0.0",
     "@types/xmldom": "^0.1.29",
     "fs-extra": "^7.0.1",
     "rollup": "^1.1.2",

diff --git a/scripts/api/ast.ts b/scripts/api/ast.ts
@@ -117,7 +117,7 @@ generateTypes()
               docs: [{ description: action.documentation.replace(/\*/g, '') }],
               name: action.actionName,
               bodyText: `return createStandardRequestBodyFromString(generateRequestElements('${action.soapRequestNode}')([${action.input.parameters.map(a => `'${a.name}'`).join(',')}])(${action.input.parameters.map(a => a.name).join(',')}))
-                .map(mapResponseXmlToJson<any>('${action.output.ref}')())
+                .map(mapResponseXmlToJson<any>('${action.output.ref}'))
               `,
               parameters: action.input.parameters
                 .map<ParameterDeclarationStructure>(p => {

diff --git a/src/api/advancedsecurity.ts b/src/api/advancedsecurity.ts
diff --git a/src/api/analytics.ts b/src/api/analytics.ts
@@ -15,7 +15,7 @@ export class Analytics {
      */
     static GetSupportedRules(ConfigurationToken: ReferenceToken) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:GetSupportedRules')(['ConfigurationToken'])(ConfigurationToken))
-                        .map(mapResponseXmlToJson<any>('tan:GetSupportedRulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:GetSupportedRulesResponse'))
 
     }
 
@@ -34,7 +34,7 @@ export class Analytics {
      */
     static CreateRules(ConfigurationToken: ReferenceToken, Rule: Config) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:CreateRules')(['ConfigurationToken','Rule'])(ConfigurationToken,Rule))
-                        .map(mapResponseXmlToJson<any>('tan:CreateRulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:CreateRulesResponse'))
 
     }
 
@@ -45,7 +45,7 @@ export class Analytics {
      */
     static DeleteRules(ConfigurationToken: ReferenceToken, RuleName: string) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:DeleteRules')(['ConfigurationToken','RuleName'])(ConfigurationToken,RuleName))
-                        .map(mapResponseXmlToJson<any>('tan:DeleteRulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:DeleteRulesResponse'))
 
     }
 
@@ -56,7 +56,7 @@ export class Analytics {
      */
     static GetRules(ConfigurationToken: ReferenceToken) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:GetRules')(['ConfigurationToken'])(ConfigurationToken))
-                        .map(mapResponseXmlToJson<any>('tan:GetRulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:GetRulesResponse'))
 
     }
 
@@ -67,7 +67,7 @@ export class Analytics {
      */
     static GetRuleOptions(ConfigurationToken: ReferenceToken, RuleType?: any) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:GetRuleOptions')(['ConfigurationToken','RuleType'])(ConfigurationToken,RuleType))
-                        .map(mapResponseXmlToJson<any>('tan:GetRuleOptionsResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:GetRuleOptionsResponse'))
 
     }
 
@@ -78,7 +78,7 @@ export class Analytics {
      */
     static ModifyRules(ConfigurationToken: ReferenceToken, Rule: Config) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:ModifyRules')(['ConfigurationToken','Rule'])(ConfigurationToken,Rule))
-                        .map(mapResponseXmlToJson<any>('tan:ModifyRulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:ModifyRulesResponse'))
 
     }
 
@@ -87,7 +87,7 @@ export class Analytics {
      */
     static GetServiceCapabilities() {
         return createStandardRequestBodyFromString(generateRequestElements('tan:GetServiceCapabilities')([])())
-                        .map(mapResponseXmlToJson<any>('tan:GetServiceCapabilitiesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:GetServiceCapabilitiesResponse'))
 
     }
 
@@ -100,7 +100,7 @@ export class Analytics {
      */
     static GetSupportedAnalyticsModules(ConfigurationToken: ReferenceToken) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:GetSupportedAnalyticsModules')(['ConfigurationToken'])(ConfigurationToken))
-                        .map(mapResponseXmlToJson<any>('tan:GetSupportedAnalyticsModulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:GetSupportedAnalyticsModulesResponse'))
 
     }
 
@@ -111,7 +111,7 @@ export class Analytics {
      */
     static GetAnalyticsModuleOptions(ConfigurationToken: ReferenceToken, Type?: any) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:GetAnalyticsModuleOptions')(['ConfigurationToken','Type'])(ConfigurationToken,Type))
-                        .map(mapResponseXmlToJson<any>('tan:GetAnalyticsModuleOptionsResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:GetAnalyticsModuleOptionsResponse'))
 
     }
 
@@ -137,7 +137,7 @@ export class Analytics {
      */
     static CreateAnalyticsModules(ConfigurationToken: ReferenceToken, AnalyticsModule: Config) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:CreateAnalyticsModules')(['ConfigurationToken','AnalyticsModule'])(ConfigurationToken,AnalyticsModule))
-                        .map(mapResponseXmlToJson<any>('tan:CreateAnalyticsModulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:CreateAnalyticsModulesResponse'))
 
     }
 
@@ -148,7 +148,7 @@ export class Analytics {
      */
     static DeleteAnalyticsModules(ConfigurationToken: ReferenceToken, AnalyticsModuleName: string) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:DeleteAnalyticsModules')(['ConfigurationToken','AnalyticsModuleName'])(ConfigurationToken,AnalyticsModuleName))
-                        .map(mapResponseXmlToJson<any>('tan:DeleteAnalyticsModulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:DeleteAnalyticsModulesResponse'))
 
     }
 
@@ -159,7 +159,7 @@ export class Analytics {
      */
     static GetAnalyticsModules(ConfigurationToken: ReferenceToken) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:GetAnalyticsModules')(['ConfigurationToken'])(ConfigurationToken))
-                        .map(mapResponseXmlToJson<any>('tan:GetAnalyticsModulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:GetAnalyticsModulesResponse'))
 
     }
 
@@ -171,7 +171,7 @@ export class Analytics {
      */
     static ModifyAnalyticsModules(ConfigurationToken: ReferenceToken, AnalyticsModule: Config) {
         return createStandardRequestBodyFromString(generateRequestElements('tan:ModifyAnalyticsModules')(['ConfigurationToken','AnalyticsModule'])(ConfigurationToken,AnalyticsModule))
-                        .map(mapResponseXmlToJson<any>('tan:ModifyAnalyticsModulesResponse')())
+                        .map(mapResponseXmlToJson<any>('tan:ModifyAnalyticsModulesResponse'))
 
     }