fix(js-sdk): resolve circular import (#344)

openfga · Apr 9, 2024 · 37663a5 · 37663a5
2 parents e047a0c + 54808b5
commit 37663a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/config/clients/js/config.overrides.json b/config/clients/js/config.overrides.json
@@ -117,6 +117,7 @@
     "example/example1/package.json.mustache": {
       "destinationFilename": "example/example1/package.json",
       "templateType": "SupportingFiles"
-    }
+    },
+    ".madgerc": {}
   }
 }
diff --git a/config/clients/js/template/.github/dependabot.yaml b/config/clients/js/template/.github/dependabot.yaml
@@ -16,3 +16,5 @@ updates:
      dependencies:
         patterns:
           - "*"
+        exclude-patterns:
+          - "eslint"
diff --git a/config/clients/js/template/.madgerc b/config/clients/js/template/.madgerc
@@ -0,0 +1,7 @@
+{
+  "detectiveOptions": {
+    "ts": {
+      "skipTypeImports": true
+    }
+  }
+}
diff --git a/config/clients/js/template/common.mustache b/config/clients/js/template/common.mustache
@@ -3,7 +3,7 @@
 import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from "axios";
 
 import { Configuration } from "./configuration";
-import { Credentials } from "./credentials";
+import type { Credentials } from "./credentials";
 import {
   FgaApiError,
   FgaApiInternalError,
@@ -169,15 +169,13 @@ export async function attemptHttpRequest<B, R>(
 /**
  * creates an axios request function
  */
-export const createRequestFunction = function (axiosArgs: RequestArgs, axiosInstance: AxiosInstance, configuration: Configuration, credentials?: Credentials) {
+export const createRequestFunction = function (axiosArgs: RequestArgs, axiosInstance: AxiosInstance, configuration: Configuration, credentials: Credentials) {
   configuration.isValid();
 
   const retryParams = axiosArgs.options?.retryParams ? axiosArgs.options?.retryParams : configuration.retryParams;
   const maxRetry:number = retryParams ? retryParams.maxRetry : 0;
   const minWaitInMs:number = retryParams ? retryParams.minWaitInMs : 0;
-  if (!credentials) {
-    credentials = Credentials.init(configuration);
-  }
+
   return async (axios: AxiosInstance = axiosInstance) : PromiseResult<any> => {
     await setBearerAuthToObject(axiosArgs.options.headers, credentials!);