refactor(typescript-rxjs): destructure configuration in BaseApi

denyo · denyo · commit 673d67ca85b6 · 2020-02-27T14:43:19.000+01:00
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
@@ -35,12 +35,12 @@ export class Configuration {
     }
 
     get apiKey(): ((name: string) => string) | undefined {
-        const apiKey = this.configuration.apiKey;
+        const { apiKey } = this.configuration;
         return apiKey && (typeof apiKey === 'function' ? apiKey : () => apiKey);
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
-        const accessToken = this.configuration.accessToken;
+        const { accessToken } = this.configuration;
         return accessToken && (typeof accessToken === 'function' ? accessToken : () => accessToken);
     }
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
@@ -46,12 +46,12 @@ export class Configuration {
     }
 
     get apiKey(): ((name: string) => string) | undefined {
-        const apiKey = this.configuration.apiKey;
+        const { apiKey } = this.configuration;
         return apiKey && (typeof apiKey === 'function' ? apiKey : () => apiKey);
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
-        const accessToken = this.configuration.accessToken;
+        const { accessToken } = this.configuration;
         return accessToken && (typeof accessToken === 'function' ? accessToken : () => accessToken);
     }
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
@@ -46,12 +46,12 @@ export class Configuration {
     }
 
     get apiKey(): ((name: string) => string) | undefined {
-        const apiKey = this.configuration.apiKey;
+        const { apiKey } = this.configuration;
         return apiKey && (typeof apiKey === 'function' ? apiKey : () => apiKey);
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
-        const accessToken = this.configuration.accessToken;
+        const { accessToken } = this.configuration;
         return accessToken && (typeof accessToken === 'function' ? accessToken : () => accessToken);
     }
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
@@ -46,12 +46,12 @@ export class Configuration {
     }
 
     get apiKey(): ((name: string) => string) | undefined {
-        const apiKey = this.configuration.apiKey;
+        const { apiKey } = this.configuration;
         return apiKey && (typeof apiKey === 'function' ? apiKey : () => apiKey);
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
-        const accessToken = this.configuration.accessToken;
+        const { accessToken } = this.configuration;
         return accessToken && (typeof accessToken === 'function' ? accessToken : () => accessToken);
     }
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
@@ -46,12 +46,12 @@ export class Configuration {
     }
 
     get apiKey(): ((name: string) => string) | undefined {
-        const apiKey = this.configuration.apiKey;
+        const { apiKey } = this.configuration;
         return apiKey && (typeof apiKey === 'function' ? apiKey : () => apiKey);
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
-        const accessToken = this.configuration.accessToken;
+        const { accessToken } = this.configuration;
         return accessToken && (typeof accessToken === 'function' ? accessToken : () => accessToken);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ export class Configuration {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`get apiKey(): ((name: string) => string) \| undefined {`
`38`		`- const apiKey = this.configuration.apiKey;`
	`38`	`+ const { apiKey } = this.configuration;`
`39`	`39`	`return apiKey && (typeof apiKey === 'function' ? apiKey : () => apiKey);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`get accessToken(): ((name: string, scopes?: string[]) => string) \| undefined {`
`43`		`- const accessToken = this.configuration.accessToken;`
	`43`	`+ const { accessToken } = this.configuration;`
`44`	`44`	`return accessToken && (typeof accessToken === 'function' ? accessToken : () => accessToken);`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ export class Configuration {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`get apiKey(): ((name: string) => string) \| undefined {`
`49`		`- const apiKey = this.configuration.apiKey;`
	`49`	`+ const { apiKey } = this.configuration;`
`50`	`50`	`return apiKey && (typeof apiKey === 'function' ? apiKey : () => apiKey);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`get accessToken(): ((name: string, scopes?: string[]) => string) \| undefined {`
`54`		`- const accessToken = this.configuration.accessToken;`
	`54`	`+ const { accessToken } = this.configuration;`
`55`	`55`	`return accessToken && (typeof accessToken === 'function' ? accessToken : () => accessToken);`
`56`	`56`	`}`
`57`	`57`	`}`