trying stuff with custom scalars

CHANGELOG.md

@@ -1,5 +1,10 @@
 For new changes see the new changelog built with [Notaku](https://notaku.so) and Notion: https://changelog.genql.dev
 
+## 2.11
+
+- Fix custom scalars typed with object types
+- Make required top level arguments with defaults non required
+
 ## 2.10.0
 
 Fixed problem generating interfaces without any implementation

integration-tests/generated/schema.graphql

@@ -44,6 +44,7 @@ type RecursiveType {
 type Repository {
   createdAt: String!
   forks(filter: String): ForkConnection
+  scalarButWithRequiredArgs(x: Int!): String!
   customScalar: MyCustomScalar
 }
 

integration-tests/generated/schema.ts

@@ -42,6 +42,7 @@ export interface RecursiveType {
 export interface Repository {
     createdAt: Scalars['String']
     forks: (ForkConnection | null)
+    scalarButWithRequiredArgs: Scalars['String']
     customScalar: (Scalars['MyCustomScalar'] | null)
     __typename: 'Repository'
 }
@@ -161,6 +162,7 @@ export interface RecursiveTypeGenqlSelection{
 export interface RepositoryGenqlSelection{
     createdAt?: boolean | number
     forks?: (ForkConnectionGenqlSelection & { __args?: {filter?: (Scalars['String'] | null)} })
+    scalarButWithRequiredArgs?: { __args: {x: Scalars['Int']} }
     customScalar?: boolean | number
     __typename?: boolean | number
     __scalar?: boolean | number

integration-tests/generated/types.ts

@@ -155,6 +155,15 @@ export default {
                     ]
                 }
             ],
+            "scalarButWithRequiredArgs": [
+                4,
+                {
+                    "x": [
+                        6,
+                        "Int!"
+                    ]
+                }
+            ],
             "customScalar": [
                 2
             ],

integration-tests/schema.graphql

@@ -46,6 +46,7 @@ type RecursiveType {
 type Repository {
     createdAt: String!
     forks(filter: String): ForkConnection
+    scalarButWithRequiredArgs(x: Int!): String!
     customScalar: MyCustomScalar
 }
 

integration-tests/tests/execution.ts

@@ -243,6 +243,8 @@ describe('execute queries', async function () {
             res?.account
             // no optional chaining because repository is non null
             expectType<string>(res.repository.createdAt)
+            // TODO
+            // expectType<never>(res.repository.scalarButWithRequiredArgs)
 
             expectType<Maybe<string>>(res.repository.__typename)
             expectType<Maybe<Maybe<string>[]>>(
@@ -254,7 +256,7 @@ describe('execute queries', async function () {
         }),
     )
     it(
-        'custom scalar',
+        'typed custom scalar',
         withServer(async () => {
             const res = await client.query({
                 repository: {
@@ -277,10 +279,30 @@ describe('execute queries', async function () {
 
             let customScalar = res.repository.customScalar
             assert(customScalar)
+            customScalar.x
 
             expectType<Maybe<{ x: string }>>(res.repository.customScalar)
         }),
     )
+    it(
+        'typed custom scalar with __scalar',
+        withServer(async () => {
+            const res = await client.query({
+                repository: {
+                    __args: {
+                        name: 'genql',
+                        owner: 'remorses',
+                    },
+                    __scalar: true,
+                },
+            })
+            console.log(JSON.stringify(res, null, 2))
+            // TODO
+            // res.repository.customScalar
+        }),
+    )
+
+    type t = { __args?: {} } extends { __args: any } ? 'ciao' : never
 
     it(
         'union types only 1 on_ normal syntax',

package.json

@@ -21,9 +21,9 @@
         "@types/mocha": "^10.0.1",
         "esno": "0.14.1",
         "graphql": "^16.6.0",
-        "native-fetch": "^4.0.2",
         "lerna": "^6.0.3",
+        "native-fetch": "^4.0.2",
         "sucrase": "^3.29.0",
-        "typescript": "4.8"
+        "typescript": "~5.3.3"
     }
 }