tsconfig.json should be strict (#549)

konfig-dev · Feb 8, 2024 · 93935f0 · 93935f0
1 parent c77dd5e
commit 93935f0
Show file tree

Hide file tree

Showing 43 changed files with 69 additions and 63 deletions.
diff --git a/generator/konfig-generator-api/src/main/java/com/konfigthis/api/GenerateApi.java b/generator/konfig-generator-api/src/main/java/com/konfigthis/api/GenerateApi.java
@@ -203,7 +203,8 @@ default ClientOptInput generateClientOptInput(GenerateBody body, File tmpDir, St
         configurator.setRemoveOperationIdPrefix(body.getConfig().getRemoveOperationIdPrefix());
         AdditionalProperties addnProp = body.getConfig().getAdditionalProperties();
         configurator.setAdditionalProperties(transformAdditionalPropertiesToMap(
-                body.getConfig().getAdditionalProperties(), body.getConfig().getPackageName(), body.getConfig().getGeneratorName()));
+                body.getConfig().getAdditionalProperties(), body.getConfig().getPackageName(),
+                body.getConfig().getGeneratorName(), body.getConfig().getGitUserId()));
 
         // Create folder for output
         File outputDir = outputDir(tmpDir, dirName);
@@ -249,7 +250,7 @@ default ClientOptInput generateClientOptInput(GenerateBody body, File tmpDir, St
      * Constructs a map of additional properties to be passed to the generator.
      */
     default Map<String, Object> transformAdditionalPropertiesToMap(AdditionalProperties additionalProperties,
-                                                                   String packageName, String generator) {
+                                                                   String packageName, String generator, String gitUserId) {
         Map<String, Object> map = new HashMap<>();
 
         // iterate over all properties of AdditionalProperites using reflection and put them in the map
@@ -272,6 +273,11 @@ default Map<String, Object> transformAdditionalPropertiesToMap(AdditionalPropert
             }
         });
 
+        if ("humanloop".equals(gitUserId)) {
+            putIfPresent(map, "tsConfigStrict", false);
+        } else {
+            putIfPresent(map, "tsConfigStrict", true);
+        }
         if (generator.equals("ruby"))
             putIfPresent(map, "isFaraday", true);
         if (generator.equals("typescript-axios"))

diff --git a/generator/konfig-generator-api/src/main/resources/typescript-axios/common.mustache b/generator/konfig-generator-api/src/main/resources/typescript-axios/common.mustache
@@ -161,7 +161,7 @@ export const setOAuthToObject = async function (object: any, name: string, scope
         // check that the token is still valid
         const decodedToken = jwtDecode(previousToken);
         const currentTime = Date.now() / 1000;
-        if (decodedToken.exp < currentTime) {
+        if (decodedToken.exp !== undefined && decodedToken.exp < currentTime) {
           await authenticate();
         }
     }

diff --git a/generator/konfig-generator-api/src/main/resources/typescript-axios/error.mustache b/generator/konfig-generator-api/src/main/resources/typescript-axios/error.mustache
@@ -43,8 +43,8 @@ export class {{clientName}}Error extends Error {
     super(axiosError.message);
     this.name = "{{clientName}}Error";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/generator/konfig-generator-api/src/main/resources/typescript-axios/tsconfig.mustache b/generator/konfig-generator-api/src/main/resources/typescript-axios/tsconfig.mustache
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": {{tsConfigStrict}},
     "outDir": "dist",
     "rootDir": ".",
     {{#supportsES6}}

diff --git a/...on-tests/sdks/leap-workflows/typescript-leap-workflows-old-axios/sdks/typescript/error.ts b/...on-tests/sdks/leap-workflows/typescript-leap-workflows-old-axios/sdks/typescript/error.ts
@@ -52,8 +52,8 @@ export class LeapError extends Error {
     super(axiosError.message);
     this.name = "LeapError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...sts/sdks/leap-workflows/typescript-leap-workflows-old-axios/sdks/typescript/tsconfig.json b/...sts/sdks/leap-workflows/typescript-leap-workflows-old-axios/sdks/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/...-integration-tests/sdks/leap-workflows/typescript-leap-workflows/sdks/typescript/error.ts b/...-integration-tests/sdks/leap-workflows/typescript-leap-workflows/sdks/typescript/error.ts
@@ -52,8 +52,8 @@ export class LeapError extends Error {
     super(axiosError.message);
     this.name = "LeapError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...gration-tests/sdks/leap-workflows/typescript-leap-workflows/sdks/typescript/tsconfig.json b/...gration-tests/sdks/leap-workflows/typescript-leap-workflows/sdks/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/...r/konfig-integration-tests/sdks/splitit/typescript-splitit-old-axios/typescript/common.ts b/...r/konfig-integration-tests/sdks/splitit/typescript-splitit-old-axios/typescript/common.ts
@@ -150,7 +150,7 @@ export const setOAuthToObject = async function (object: any, name: string, scope
         // check that the token is still valid
         const decodedToken = jwtDecode(previousToken);
         const currentTime = Date.now() / 1000;
-        if (decodedToken.exp < currentTime) {
+        if (decodedToken.exp !== undefined && decodedToken.exp < currentTime) {
           await authenticate();
         }
     }

diff --git a/...or/konfig-integration-tests/sdks/splitit/typescript-splitit-old-axios/typescript/error.ts b/...or/konfig-integration-tests/sdks/splitit/typescript-splitit-old-axios/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptSplititError extends Error {
     super(axiosError.message);
     this.name = "TypescriptSplititError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...nfig-integration-tests/sdks/splitit/typescript-splitit-old-axios/typescript/tsconfig.json b/...nfig-integration-tests/sdks/splitit/typescript-splitit-old-axios/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/splitit/typescript-splitit/typescript/common.ts b/generator/konfig-integration-tests/sdks/splitit/typescript-splitit/typescript/common.ts
@@ -150,7 +150,7 @@ export const setOAuthToObject = async function (object: any, name: string, scope
         // check that the token is still valid
         const decodedToken = jwtDecode(previousToken);
         const currentTime = Date.now() / 1000;
-        if (decodedToken.exp < currentTime) {
+        if (decodedToken.exp !== undefined && decodedToken.exp < currentTime) {
           await authenticate();
         }
     }

diff --git a/generator/konfig-integration-tests/sdks/splitit/typescript-splitit/typescript/error.ts b/generator/konfig-integration-tests/sdks/splitit/typescript-splitit/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptSplititError extends Error {
     super(axiosError.message);
     this.name = "TypescriptSplititError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/generator/konfig-integration-tests/sdks/splitit/typescript-splitit/typescript/tsconfig.json b/generator/konfig-integration-tests/sdks/splitit/typescript-splitit/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-array-query-string/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-array-query-string/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptArrayQueryStringClientError extends Error {
     super(axiosError.message);
     this.name = "TypescriptArrayQueryStringClientError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...ator/konfig-integration-tests/sdks/typescript-array-query-string/typescript/tsconfig.json b/...ator/konfig-integration-tests/sdks/typescript-array-query-string/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-bellhop/README.md b/generator/konfig-integration-tests/sdks/typescript-bellhop/README.md
@@ -1,4 +1,4 @@
-# konfig
+# 
 
 |Language|Version|Package Manager|README|Source|
 |-|-|-|-|-|

diff --git a/generator/konfig-integration-tests/sdks/typescript-bellhop/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-bellhop/typescript/error.ts
@@ -52,8 +52,8 @@ export class BellhopError extends Error {
     super(axiosError.message);
     this.name = "BellhopError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/generator/konfig-integration-tests/sdks/typescript-bellhop/typescript/tsconfig.json b/generator/konfig-integration-tests/sdks/typescript-bellhop/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-file-upload-node/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-file-upload-node/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptFileUploadNodeClientError extends Error {
     super(axiosError.message);
     this.name = "TypescriptFileUploadNodeClientError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/generator/konfig-integration-tests/sdks/typescript-file-upload-node/typescript/tsconfig.json b/generator/konfig-integration-tests/sdks/typescript-file-upload-node/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-humanloop-old-axios/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-humanloop-old-axios/typescript/error.ts
@@ -70,8 +70,8 @@ export class HumanloopError extends Error {
     super(axiosError.message);
     this.name = "HumanloopError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...tor/konfig-integration-tests/sdks/typescript-humanloop-old-axios/typescript/tsconfig.json b/...tor/konfig-integration-tests/sdks/typescript-humanloop-old-axios/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": false,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-humanloop/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-humanloop/typescript/error.ts
@@ -70,8 +70,8 @@ export class HumanloopError extends Error {
     super(axiosError.message);
     this.name = "HumanloopError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/generator/konfig-integration-tests/sdks/typescript-humanloop/typescript/tsconfig.json b/generator/konfig-integration-tests/sdks/typescript-humanloop/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": false,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/...g-integration-tests/sdks/typescript-multipart-form-data-array-request/typescript/error.ts b/...g-integration-tests/sdks/typescript-multipart-form-data-array-request/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptMultipartFormDataArrayRequestClientError extends Error {
     super(axiosError.message);
     this.name = "TypescriptMultipartFormDataArrayRequestClientError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...egration-tests/sdks/typescript-multipart-form-data-array-request/typescript/tsconfig.json b/...egration-tests/sdks/typescript-multipart-form-data-array-request/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/...ntegration-tests/sdks/typescript-multipart-form-data-free-form-object/typescript/error.ts b/...ntegration-tests/sdks/typescript-multipart-form-data-free-form-object/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptMultipartFormDataFreeFormObjectClientError extends Error
     super(axiosError.message);
     this.name = "TypescriptMultipartFormDataFreeFormObjectClientError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...ation-tests/sdks/typescript-multipart-form-data-free-form-object/typescript/tsconfig.json b/...ation-tests/sdks/typescript-multipart-form-data-free-form-object/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-newscatcher-old-axios/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-newscatcher-old-axios/typescript/error.ts
@@ -52,8 +52,8 @@ export class NewscatcherError extends Error {
     super(axiosError.message);
     this.name = "NewscatcherError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...r/konfig-integration-tests/sdks/typescript-newscatcher-old-axios/typescript/tsconfig.json b/...r/konfig-integration-tests/sdks/typescript-newscatcher-old-axios/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-newscatcher/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-newscatcher/typescript/error.ts
@@ -52,8 +52,8 @@ export class NewscatcherError extends Error {
     super(axiosError.message);
     this.name = "NewscatcherError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/generator/konfig-integration-tests/sdks/typescript-newscatcher/typescript/tsconfig.json b/generator/konfig-integration-tests/sdks/typescript-newscatcher/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-no-relative-npm-link/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-no-relative-npm-link/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptNoRelativeNpmLinkClientError extends Error {
     super(axiosError.message);
     this.name = "TypescriptNoRelativeNpmLinkClientError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/...or/konfig-integration-tests/sdks/typescript-no-relative-npm-link/typescript/tsconfig.json b/...or/konfig-integration-tests/sdks/typescript-no-relative-npm-link/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-optional-api-key/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-optional-api-key/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptOptionalApiKeyError extends Error {
     super(axiosError.message);
     this.name = "TypescriptOptionalApiKeyError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;

diff --git a/generator/konfig-integration-tests/sdks/typescript-optional-api-key/typescript/tsconfig.json b/generator/konfig-integration-tests/sdks/typescript-optional-api-key/typescript/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "target": "ES2015",
     "module": "commonjs",
-    "noImplicitAny": true,
+    "strict": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [

diff --git a/generator/konfig-integration-tests/sdks/typescript-relative-npm-links/typescript/error.ts b/generator/konfig-integration-tests/sdks/typescript-relative-npm-links/typescript/error.ts
@@ -52,8 +52,8 @@ export class TypescriptRelativeNpmLinksClientError extends Error {
     super(axiosError.message);
     this.name = "TypescriptRelativeNpmLinksClientError";
     this.code = axiosError.code;
-    this.method = axiosError.config.method?.toUpperCase();
-    this.url = axiosError.config.url;
+    this.method = axiosError.config?.method?.toUpperCase();
+    this.url = axiosError.config?.url;
     this.status = axiosError.response?.status;
     this.statusText = axiosError.response?.statusText;
     this.responseBody = responseBody;