Merge pull request #90 from contentstack/fix/DX-3038

[DX-3038], fix custom config for graphQL and updated regions

Author: aman19K

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/types-generator",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Contentstack type definition generation library",
   "private": false,
   "author": "Contentstack",

package.json

@@ -5,7 +5,11 @@ export const TOKEN_TYPE = {
 export const REGIONS = {
   US: "US",
   EU: "EU",
+  AWS_NA: "AWS-NA",
+  AWS_EU: "AWS-EU",
   AZURE_NA: "AZURE_NA",
   AZURE_EU: "AZURE_EU",
   GCP_NA: "GCP_NA",
+  GCP_EU: "GCP_EU",
+  CUSTOM: "CUSTOM",
 };

src/constants/index.ts

@@ -22,6 +22,7 @@ export async function graphqlTS({
   environment,
   branch,
   namespace,
+  host,
 }: GraphQLBase) {
   try {
     if (!token || !apiKey || !environment || !region) {
@@ -34,7 +35,9 @@ export async function graphqlTS({
     let config = {
       method: "post",
       maxBodyLength: Infinity,
-      url: `${GRAPHQL_REGION_URL_MAPPING[region]}/${apiKey}`,
+      url: host
+        ? `https://${host}/stacks/${apiKey}`
+        : `${GRAPHQL_REGION_URL_MAPPING[region]}/${apiKey}`,
       headers: {
         access_token: token,
         branch: "",
@@ -50,10 +53,10 @@ export async function graphqlTS({
       config.headers.branch = branch;
     }
 
-    if (!GRAPHQL_REGION_URL_MAPPING[region]) {
+    if (!GRAPHQL_REGION_URL_MAPPING[region] && !host) {
       throw {
         type: "validation",
-        error_message: `GraphQL content delivery api unavailable for '${region}' region`,
+        error_message: `GraphQL content delivery api unavailable for '${region}' region and no custom host provided`,
       };
     }
 
@@ -80,14 +83,19 @@ export async function graphqlTS({
           "Unauthorized: The apiKey, token or environment is not valid.",
       };
     } else {
-      let details = '';
-      if (error.response.data.errors[0]?.extensions?.errors?.[0]?.code === 'SCHEMA_BUILD_ERROR') {
-        error.response.data.errors[0].extensions.errors[0].details.forEach((element: {error: string}) => {
-          details += element.error + '\n'
-        });
+      let details = "";
+      if (
+        error.response.data.errors[0]?.extensions?.errors?.[0]?.code ===
+        "SCHEMA_BUILD_ERROR"
+      ) {
+        details = error.response.data.errors[0].extensions.errors[0].details
+          .map((element: { error: string }) => element.error)
+          .join("\n");
       }
       throw {
-        error_message: details ? details : error.response.data.errors[0]?.extensions?.errors[0].message,
+        error_message: details
+          ? details
+          : error.response.data.errors[0]?.extensions?.errors[0].message,
       };
     }
   }

src/graphqlTS/index.ts

@@ -18,12 +18,18 @@ export const initializeContentstackSdk = ({
           return Region.US;
         case REGIONS.EU:
           return Region.EU;
+        case REGIONS.AWS_NA:
+          return Region.US;
+        case REGIONS.AWS_EU:
+          return Region.EU;
         case REGIONS.AZURE_NA:
           return Region.AZURE_NA;
         case REGIONS.AZURE_EU:
           return Region.AZURE_EU;
         case REGIONS.GCP_NA:
           return Region.GCP_NA;
+        case REGIONS.GCP_EU:
+          return Region.GCP_EU;
         default:
           isCustomRegion = true;
           break;

src/sdk/utils.ts

@@ -1,7 +1,16 @@
 export interface StackConnectionConfig {
   apiKey: string;
   token: string;
-  region: "US" | "EU" | "AZURE_NA" | "AZURE_EU" | "GCP_NA";
+  region:
+    | "US"
+    | "EU"
+    | "AWS-NA"
+    | "AWS-EU"
+    | "AZURE_NA"
+    | "AZURE_EU"
+    | "GCP_NA"
+    | "GCP_EU"
+    | "CUSTOM";
   environment: string;
   branch?: string;
   host?: string;

src/types/index.ts

@@ -104,7 +104,7 @@ describe("graphqlTS function with errors", () => {
       });
     } catch (err: any) {
       expect(err.error_message).toEqual(
-        "GraphQL content delivery api unavailable for 'wrong-region' region"
+        "GraphQL content delivery api unavailable for 'wrong-region' region and no custom host provided"
       );
     }
   });

tests/integration/graphqlTS/graphqlTS.test.ts

@@ -137,7 +137,7 @@ describe("graphqlTS function with errors", () => {
       });
     } catch (err: any) {
       expect(err.error_message).toEqual(
-        "GraphQL content delivery api unavailable for 'wrong-region' region"
+        "GraphQL content delivery api unavailable for 'wrong-region' region and no custom host provided"
       );
     }
   });