recheck script generate config (#23)

* recheck script generate config

* update readme and config

* update

---------

Co-authored-by: Thanetpon Kultontikorn <[email protected]>

Author: taeyzzz

README.md

@@ -8,18 +8,14 @@ npm install agoda-graphql-csharp-generator @graphql-codegen/cli graphql
 
 ## how to use
 - create codegen config -> https://the-guild.dev/graphql/codegen/docs/config-reference/codegen-config
-- use plugin -> `agoda-graphql-csharp-generator`
+- generated codegen config
+```
+generate-codegen-config --schema-url 'https://graphql-schema.com' --graphql-dir './Agoda.Graphql/SupplyApi/Queries' --graphql-project 'Agoda.Graphql' --yml-out './codegen.yml'
+```
+- it will generated codegen.yml in this file will be all config
+- then use `gql-gen --config codegen.yml` to generated graphql files
 
 # Notes:
 - automate job to update semver version
 - automate job to create release and tags
 
-
-Found the Solution:
-- create custom plugin to generate share type class from schema
-    - pass list of graphql files
-    - create share type and use in each generated file
-- create custom plugin to generate query or mutation class using that share type
-- fix npm package to export 2 files
-- test with BAPI and SMAPI
-- make sure it's working with json converter

codegen.yml

@@ -2,8 +2,8 @@
 overwrite: true
 schema: "http://booking-query-high-qa.privatecloud.qa.agoda.is"
 headers:
-    API-Key: "uTSpgQLr9ZyuMSPCVca70SciyTtwBPaqTCsxSTBmrYDo8Opnp5"
-    Client-ID: 23
+    API-Key: "xxx"
+    Client-ID: "xxx"
 generates:
     ./Agoda.Graphql/BookingQueries/SharedTypes.generated.cs:
         documents:
@@ -16,70 +16,62 @@ generates:
             - "Agoda.Graphql/BookingQueries/PropertyBooking/GetCsvMetaData.graphql"
             - "Agoda.Graphql/BookingQueries/PropertyBooking/GetPropertyBookingByYCSCriteria.graphql"
         plugins:
-            - "./dist/agoda-csharp-shared.js"
+            - "agoda-graphql-csharp-generator/shared-types"
         config:
             namespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/DiscountBreakdown/BookingDiscountsByBookingIds.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/DiscountBreakdown/BookingDiscountsByBookingIds.graphql"
         plugins:
-            - "./dist/agoda-csharp-codegen.js"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries.DiscountBreakdown"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/DiscountBreakdown/DiscountBreakdownByBookingId.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/DiscountBreakdown/DiscountBreakdownByBookingId.graphql"
         plugins:
-            - "agoda-graphql-csharp-generator/codegen"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries.DiscountBreakdown"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/GetBookingDetailsByBookingId.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/GetBookingDetailsByBookingId.graphql"
         plugins:
-            - "agoda-graphql-csharp-generator/codegen"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/PropertyBooking/GetBookingListByBookingIds.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/PropertyBooking/GetBookingListByBookingIds.graphql"
         plugins:
-            - "agoda-graphql-csharp-generator/codegen"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries.PropertyBooking"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/PropertyBooking/GetCsvData.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/PropertyBooking/GetCsvData.graphql"
         plugins:
-            - "agoda-graphql-csharp-generator/codegen"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries.PropertyBooking"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/PropertyBooking/GetCsvDataWithoutPagination.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/PropertyBooking/GetCsvDataWithoutPagination.graphql"
         plugins:
-            - "agoda-graphql-csharp-generator/codegen"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries.PropertyBooking"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/PropertyBooking/GetCsvMetaData.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/PropertyBooking/GetCsvMetaData.graphql"
         plugins:
-            - "./dist/agoda-csharp-codegen.js"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries.PropertyBooking"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"
     Agoda.Graphql/BookingQueries/PropertyBooking/GetPropertyBookingByYCSCriteria.generated.cs:
         documents:
             - "Agoda.Graphql/BookingQueries/PropertyBooking/GetPropertyBookingByYCSCriteria.graphql"
         plugins:
-            - "./dist/agoda-csharp-codegen.js"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "Agoda.Graphql.BookingQueries.PropertyBooking"
-            sharedTypesNamespace: "Agoda.Graphql.BookingQueries"

package-lock.json

@@ -1,17 +1,17 @@
 {
   "name": "agoda-graphql-csharp-generator",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "main": "dist/agoda-csharp-codegen.js",
   "exports": {
-    "./shared": "./dist/agoda-csharp-shared.js",
-    "./codegen": "./dist/agoda-csharp-codegen.js"
+    "./shared-types": "./dist/agoda-csharp-shared-types.js",
+    "./operation": "./dist/agoda-csharp-operation.js"
   },
   "files": [
     "dist"
   ],
   "scripts": {
     "generate-codegen-config": "ts-node ./src/generate.ts --schema-url 'https://smapi-qa-http.privatecloud.qa.agoda.is/v2/graphql' --graphql-dir './Agoda.Graphql/SupplyApi/Queries' --graphql-project 'Agoda.Graphql' --yml-out './codegen.yml'",
-    "generate-codegen-config-with-headers": "ts-node ./src/generate.ts --schema-url 'http://booking-query-high-qa.privatecloud.qa.agoda.is' --graphql-dir './Agoda.Graphql/BookingQueries' --graphql-project 'Agoda.Graphql.BookingQueries' --yml-out './codegen.yml'  --header 'API-Key: uTSpgQLr9ZyuMSPCVca70SciyTtwBPaqTCsxSTBmrYDo8Opnp5' --header 'Client-ID: 23'",
+    "generate-codegen-config-with-headers": "ts-node ./src/generate.ts --schema-url 'http://booking-query-high-qa.privatecloud.qa.agoda.is' --graphql-dir './Agoda.Graphql/BookingQueries' --graphql-project 'Agoda.Graphql.BookingQueries' --yml-out './codegen.yml'  --header 'API-Key: xxx' --header 'Client-ID: xxx'",
     "generate-graphql-csharp": "gql-gen --config codegen.yml",
     "build": "tsc"
   },

package.json

@@ -37,7 +37,6 @@ const isEnumTypeFromSchema = (schema: GraphQLSchema, typeName: string): boolean
 // Plugin configuration interface
 interface AgodaCSharpCodegenConfig {
   namespace?: string;
-  sharedTypesNamespace?: string;  
 }
 
 // Type definitions
@@ -190,11 +189,11 @@ const getFieldTypeFromSchema = (parentType: GraphQLType | null, fieldName: strin
 
 // Helper function to extract type name from TypeNode
 const extractTypeName = (typeNode: TypeNode): string => {
-  if (typeNode.kind === 'NamedType') {
+  if (typeNode.kind === Kind.NAMED_TYPE) {
     return typeNode.name.value;
-  } else if (typeNode.kind === 'NonNullType') {
+  } else if (typeNode.kind === Kind.NON_NULL_TYPE) {
     return extractTypeName(typeNode.type);
-  } else if (typeNode.kind === 'ListType') {
+  } else if (typeNode.kind === Kind.LIST_TYPE) {
     return extractTypeName(typeNode.type);
   }
   return 'Unknown';
@@ -439,7 +438,6 @@ export const plugin: PluginFunction<AgodaCSharpCodegenConfig> = (
     }
 
     const operation = operationsDefinitions[0];
-    const operationName = operation.name;
     const variables = operation.variables;
     const rawQuery = (operation.document.rawSDL || '').replace(/"/g, '""');
 
@@ -537,7 +535,6 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Agoda.Graphql;
-using ${config.sharedTypesNamespace};
 
 namespace ${namespace}
 {

src/agoda-csharp-codegen.ts renamed to src/agoda-csharp-operation.ts

@@ -69,12 +69,35 @@ schema: "${schemaUrl}"
 
     // Generate shared types section first
     // Use the graphqlDir to determine both the output path and namespace
-    // Clean up the path by removing leading ./ and converting separators to dots
-    const cleanGraphqlDir = graphqlDir.replace(/^\.\//, '').replace(/[\/\\]/g, '.')
-    const sharedTypesNamespace = cleanGraphqlDir
+    
+    // For output path, use the original graphqlDir
     const sharedTypesOutputFile = `${graphqlDir}/SharedTypes.generated.cs`
     const normalizedSharedTypesOutputFile = sharedTypesOutputFile.replace(/\\/g, '/')
 
+    // For namespace, clean up the path and handle project name matching
+    const cleanGraphqlDir = graphqlDir.replace(/^\.\//, '').replace(/[\/\\]/g, '.')
+    let sharedTypesNamespace: string
+    
+    if (projectName) {
+        // If project name is provided, find the matching part in the graphqlDir and use it + the rest
+        const cleanGraphqlDirWithoutPrefix = cleanGraphqlDir.replace(/^(\.\.\/)+/, '').replace(/^\.\//, '')
+        const projectNameDots = projectName.replace(/[\/\\]/g, '.')
+        
+        // Find where the project name appears in the clean path
+        const projectIndex = cleanGraphqlDirWithoutPrefix.indexOf(projectNameDots)
+        
+        if (projectIndex !== -1) {
+            // Use the project name + everything after it
+            sharedTypesNamespace = cleanGraphqlDirWithoutPrefix.substring(projectIndex)
+        } else {
+            // If project name not found, use the full cleaned path as namespace
+            sharedTypesNamespace = cleanGraphqlDirWithoutPrefix
+        }
+    } else {
+        // Remove any relative path parts for namespace - make it generic
+        sharedTypesNamespace = cleanGraphqlDir.replace(/^(\.\.\/)+/, '').replace(/^\.\//, '')
+    }
+    
     config += `    ${normalizedSharedTypesOutputFile}:
         documents:
 `
@@ -84,7 +107,7 @@ schema: "${schemaUrl}"
 `
     }
     config += `        plugins:
-            - "agoda-graphql-csharp-generator/shared"
+            - "agoda-graphql-csharp-generator/shared-types"
         config:
             namespace: "${sharedTypesNamespace}"
 `
@@ -106,10 +129,9 @@ schema: "${schemaUrl}"
         documents:
             - "${normalizedGraphqlFile}"
         plugins:
-            - "agoda-graphql-csharp-generator/codegen"
+            - "agoda-graphql-csharp-generator/operation"
         config:
             namespace: "${namespace}"
-            sharedTypesNamespace: "${sharedTypesNamespace}"
 `
     }