houdini 2.0.0-next.3 → 2.0.0-next.5

package/build/codegen-cjs/index.js

@@ -65678,10 +65678,10 @@ var AST3 = recast2.types.builders;
 function unwrappedTsTypeReference(config, filepath, missingScalars, {
   type,
   wrappers
-}, body) {
+}, body, input) {
   let result;
   if (graphql6.isScalarType(type)) {
-    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null);
+    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null, input);
   } else if (graphql6.isEnumType(type)) {
     result = enumReference(config, body, type.name);
   } else {
@@ -65698,14 +65698,15 @@ function unwrappedTsTypeReference(config, filepath, missingScalars, {
   }
   return result;
 }
-function tsTypeReference(config, filepath, missingScalars, definition, body) {
+function tsTypeReference(config, filepath, missingScalars, definition, body, input) {
   const { type, wrappers } = unwrapType(config, definition.type);
   return unwrappedTsTypeReference(
     config,
     filepath,
     missingScalars,
     { type, wrappers },
-    body
+    body,
+    input
   );
 }
 function enumReference(config, body, name) {
@@ -65734,7 +65735,7 @@ function nullableField(inner, input = false) {
   }
   return AST3.tsUnionType(members);
 }
-function scalarPropertyValue(config, filepath, missingScalars, target, body, field) {
+function scalarPropertyValue(config, filepath, missingScalars, target, body, field, input) {
   if (config.configFile.features?.componentFields && target.name === config.componentScalar) {
     if (!field) {
       return AST3.tsNeverKeyword();
@@ -65793,6 +65794,9 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
       return AST3.tsBooleanKeyword();
     }
     case "ID": {
+      if (input) {
+        return AST3.tsUnionType([AST3.tsStringKeyword(), AST3.tsNumberKeyword()]);
+      }
       return AST3.tsStringKeyword();
     }
     default: {
@@ -65803,7 +65807,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {
@@ -68900,7 +68905,7 @@ var recast11 = __toESM(require_main2(), 1);
 var graphql19 = __toESM(require("graphql"), 1);
 var recast7 = __toESM(require_main2(), 1);
 var AST8 = recast7.types.builders;
-function addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, rootType) {
+function addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, rootType, input) {
   const { type } = unwrapType(config, rootType);
   if (graphql19.isScalarType(type)) {
     return;
@@ -68925,12 +68930,20 @@ function addReferencedInputTypes(config, filepath, body, visitedTypes, missingSc
   }
   const members = [];
   for (const field of Object.values(type.getFields())) {
-    addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, field.type);
+    addReferencedInputTypes(
+      config,
+      filepath,
+      body,
+      visitedTypes,
+      missingScalars,
+      field.type,
+      input
+    );
     members.push(
       AST8.tsPropertySignature(
         AST8.identifier(field.name),
         AST8.tsTypeAnnotation(
-          tsTypeReference(config, filepath, missingScalars, field, body)
+          tsTypeReference(config, filepath, missingScalars, field, body, input)
         ),
         graphql19.isNullableType(field.type)
       )
@@ -68973,7 +68986,8 @@ function inlineType({
   includeFragments,
   allOptional,
   forceNonNull,
-  field
+  field,
+  input
 }) {
   const { type, wrappers } = unwrapType(config, rootType);
   let result;
@@ -68985,7 +68999,8 @@ function inlineType({
       missingScalars,
       type,
       body,
-      field
+      field,
+      input
     );
   } else if (graphql20.isEnumType(type)) {
     ensureImports({
@@ -69093,7 +69108,8 @@ function inlineType({
           field: {
             field: attributeName,
             parent: type.name
-          }
+          },
+          input
         });
         const hasIncludeOrSkipDirective = selection.directives && selection.directives.filter(
           (directive) => directive.name.value === "include" || directive.name.value === "skip"
@@ -69157,7 +69173,8 @@ function inlineType({
         missingScalars,
         includeFragments,
         allOptional,
-        field: null
+        field: null,
+        input: false
       });
       let objectType = fragmentType;
       if (fragmentType.type === "TSUnionType") {
@@ -69622,7 +69639,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
     body,
     missingScalars,
     includeFragments: true,
-    field: null
+    field: null,
+    input: false
   });
   if (artifact.kind === "HoudiniQuery") {
     resultType = withLoadingState({
@@ -69671,7 +69689,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
         body,
         visitedTypes,
         missingScalars,
-        variableDefinition.type
+        variableDefinition.type,
+        true
       );
     }
     body.push(
@@ -69689,7 +69708,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
                       filepath,
                       missingScalars,
                       definition2,
-                      body
+                      body,
+                      true
                     )
                   ),
                   definition2.type.kind !== "NonNullType"
@@ -69724,7 +69744,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
             missingScalars,
             includeFragments: false,
             allOptional: true,
-            field: null
+            field: null,
+            input: false
           })
         )
       )
@@ -69757,7 +69778,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
                 filepath,
                 missingScalars,
                 definition2,
-                body
+                body,
+                false
               )
             ),
             definition2.type.kind !== "NonNullType"
@@ -69820,7 +69842,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
               visitedTypes,
               missingScalars,
               includeFragments: true,
-              field: null
+              field: null,
+              input: false
             })
           })
         )
@@ -69916,7 +69939,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                   {
                     field: key,
                     parent: type.name
-                  }
+                  },
+                  false
                 )
               )
             );
@@ -69943,7 +69967,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                     {
                       field: key,
                       parent: type.name
-                    }
+                    },
+                    false
                   )
                 );
               } else if (graphql21.isEnumType(unwrapped.type)) {
@@ -69981,7 +70006,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                       body,
                       visitedTypes,
                       /* @__PURE__ */ new Set(),
-                      arg.type
+                      arg.type,
+                      true
                     );
                     const prop = AST13.tsPropertySignature(
                       AST13.identifier(arg.name),
@@ -69991,7 +70017,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                           filepath,
                           /* @__PURE__ */ new Set(),
                           arg,
-                          body
+                          body,
+                          graphql21.isInputType(arg.type)
                         )
                       )
                     );
@@ -70103,7 +70130,8 @@ function listDefinitions(config, filepath, body, docs) {
                               filepath,
                               /* @__PURE__ */ new Set(),
                               arg,
-                              body
+                              body,
+                              graphql21.isInputType(arg.type)
                             )
                           )
                         );

package/build/codegen-esm/index.js

@@ -65677,10 +65677,10 @@ var AST3 = recast2.types.builders;
 function unwrappedTsTypeReference(config, filepath, missingScalars, {
   type,
   wrappers
-}, body) {
+}, body, input) {
   let result;
   if (graphql6.isScalarType(type)) {
-    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null);
+    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null, input);
   } else if (graphql6.isEnumType(type)) {
     result = enumReference(config, body, type.name);
   } else {
@@ -65697,14 +65697,15 @@ function unwrappedTsTypeReference(config, filepath, missingScalars, {
   }
   return result;
 }
-function tsTypeReference(config, filepath, missingScalars, definition, body) {
+function tsTypeReference(config, filepath, missingScalars, definition, body, input) {
   const { type, wrappers } = unwrapType(config, definition.type);
   return unwrappedTsTypeReference(
     config,
     filepath,
     missingScalars,
     { type, wrappers },
-    body
+    body,
+    input
   );
 }
 function enumReference(config, body, name) {
@@ -65733,7 +65734,7 @@ function nullableField(inner, input = false) {
   }
   return AST3.tsUnionType(members);
 }
-function scalarPropertyValue(config, filepath, missingScalars, target, body, field) {
+function scalarPropertyValue(config, filepath, missingScalars, target, body, field, input) {
   if (config.configFile.features?.componentFields && target.name === config.componentScalar) {
     if (!field) {
       return AST3.tsNeverKeyword();
@@ -65792,6 +65793,9 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
       return AST3.tsBooleanKeyword();
     }
     case "ID": {
+      if (input) {
+        return AST3.tsUnionType([AST3.tsStringKeyword(), AST3.tsNumberKeyword()]);
+      }
       return AST3.tsStringKeyword();
     }
     default: {
@@ -65802,7 +65806,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {
@@ -68899,7 +68904,7 @@ var recast11 = __toESM(require_main2(), 1);
 var recast7 = __toESM(require_main2(), 1);
 import * as graphql19 from "graphql";
 var AST8 = recast7.types.builders;
-function addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, rootType) {
+function addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, rootType, input) {
   const { type } = unwrapType(config, rootType);
   if (graphql19.isScalarType(type)) {
     return;
@@ -68924,12 +68929,20 @@ function addReferencedInputTypes(config, filepath, body, visitedTypes, missingSc
   }
   const members = [];
   for (const field of Object.values(type.getFields())) {
-    addReferencedInputTypes(config, filepath, body, visitedTypes, missingScalars, field.type);
+    addReferencedInputTypes(
+      config,
+      filepath,
+      body,
+      visitedTypes,
+      missingScalars,
+      field.type,
+      input
+    );
     members.push(
       AST8.tsPropertySignature(
         AST8.identifier(field.name),
         AST8.tsTypeAnnotation(
-          tsTypeReference(config, filepath, missingScalars, field, body)
+          tsTypeReference(config, filepath, missingScalars, field, body, input)
         ),
         graphql19.isNullableType(field.type)
       )
@@ -68972,7 +68985,8 @@ function inlineType({
   includeFragments,
   allOptional,
   forceNonNull,
-  field
+  field,
+  input
 }) {
   const { type, wrappers } = unwrapType(config, rootType);
   let result;
@@ -68984,7 +68998,8 @@ function inlineType({
       missingScalars,
       type,
       body,
-      field
+      field,
+      input
     );
   } else if (graphql20.isEnumType(type)) {
     ensureImports({
@@ -69092,7 +69107,8 @@ function inlineType({
           field: {
             field: attributeName,
             parent: type.name
-          }
+          },
+          input
         });
         const hasIncludeOrSkipDirective = selection.directives && selection.directives.filter(
           (directive) => directive.name.value === "include" || directive.name.value === "skip"
@@ -69156,7 +69172,8 @@ function inlineType({
         missingScalars,
         includeFragments,
         allOptional,
-        field: null
+        field: null,
+        input: false
       });
       let objectType = fragmentType;
       if (fragmentType.type === "TSUnionType") {
@@ -69621,7 +69638,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
     body,
     missingScalars,
     includeFragments: true,
-    field: null
+    field: null,
+    input: false
   });
   if (artifact.kind === "HoudiniQuery") {
     resultType = withLoadingState({
@@ -69670,7 +69688,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
         body,
         visitedTypes,
         missingScalars,
-        variableDefinition.type
+        variableDefinition.type,
+        true
       );
     }
     body.push(
@@ -69688,7 +69707,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
                       filepath,
                       missingScalars,
                       definition2,
-                      body
+                      body,
+                      true
                     )
                   ),
                   definition2.type.kind !== "NonNullType"
@@ -69723,7 +69743,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
             missingScalars,
             includeFragments: false,
             allOptional: true,
-            field: null
+            field: null,
+            input: false
           })
         )
       )
@@ -69756,7 +69777,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
                 filepath,
                 missingScalars,
                 definition2,
-                body
+                body,
+                false
               )
             ),
             definition2.type.kind !== "NonNullType"
@@ -69819,7 +69841,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
               visitedTypes,
               missingScalars,
               includeFragments: true,
-              field: null
+              field: null,
+              input: false
             })
           })
         )
@@ -69915,7 +69938,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                   {
                     field: key,
                     parent: type.name
-                  }
+                  },
+                  false
                 )
               )
             );
@@ -69942,7 +69966,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                     {
                       field: key,
                       parent: type.name
-                    }
+                    },
+                    false
                   )
                 );
               } else if (graphql21.isEnumType(unwrapped.type)) {
@@ -69980,7 +70005,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                       body,
                       visitedTypes,
                       /* @__PURE__ */ new Set(),
-                      arg.type
+                      arg.type,
+                      true
                     );
                     const prop = AST13.tsPropertySignature(
                       AST13.identifier(arg.name),
@@ -69990,7 +70016,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                           filepath,
                           /* @__PURE__ */ new Set(),
                           arg,
-                          body
+                          body,
+                          graphql21.isInputType(arg.type)
                         )
                       )
                     );
@@ -70102,7 +70129,8 @@ function listDefinitions(config, filepath, body, docs) {
                               filepath,
                               /* @__PURE__ */ new Set(),
                               arg,
-                              body
+                              body,
+                              graphql21.isInputType(arg.type)
                             )
                           )
                         );

package/build/lib/typescript.d.ts

@@ -6,15 +6,15 @@ import { TypeWrapper } from './graphql';
 export declare function unwrappedTsTypeReference(config: Config, filepath: string, missingScalars: Set<string>, { type, wrappers, }: {
     type: graphql.GraphQLNamedType;
     wrappers: TypeWrapper[];
-}, body: StatementKind[]): TSTypeKind;
+}, body: StatementKind[], input: boolean): TSTypeKind;
 export declare function tsTypeReference(config: Config, filepath: string, missingScalars: Set<string>, definition: {
     type: graphql.GraphQLScalarType | graphql.GraphQLInputType | graphql.GraphQLNamedType | graphql.TypeNode;
-}, body: StatementKind[]): TSTypeKind;
+}, body: StatementKind[], input: boolean): TSTypeKind;
 export declare function enumReference(config: Config, body: StatementKind[], name: string): recast.types.namedTypes.TSTypeReference;
 export declare function readonlyProperty(prop: recast.types.namedTypes.TSPropertySignature, enable?: boolean): recast.types.namedTypes.TSPropertySignature;
 export declare function nullableField(inner: TSTypeKind, input?: boolean): recast.types.namedTypes.TSUnionType;
 export declare function scalarPropertyValue(config: Config, filepath: string, missingScalars: Set<string>, target: graphql.GraphQLNamedType, body: StatementKind[], field: {
     parent: string;
     field: string;
-} | null): TSTypeKind;
+} | null, input: boolean): TSTypeKind;
 export declare function writeTsConfig(config: Config): Promise<void>;

package/build/lib-cjs/index.js

@@ -78913,10 +78913,10 @@ var AST3 = recast2.types.builders;
 function unwrappedTsTypeReference(config, filepath, missingScalars, {
   type,
   wrappers
-}, body) {
+}, body, input) {
   let result;
   if (graphql6.isScalarType(type)) {
-    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null);
+    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null, input);
   } else if (graphql6.isEnumType(type)) {
     result = enumReference(config, body, type.name);
   } else {
@@ -78933,14 +78933,15 @@ function unwrappedTsTypeReference(config, filepath, missingScalars, {
   }
   return result;
 }
-function tsTypeReference(config, filepath, missingScalars, definition, body) {
+function tsTypeReference(config, filepath, missingScalars, definition, body, input) {
   const { type, wrappers } = unwrapType(config, definition.type);
   return unwrappedTsTypeReference(
     config,
     filepath,
     missingScalars,
     { type, wrappers },
-    body
+    body,
+    input
   );
 }
 function enumReference(config, body, name) {
@@ -78969,7 +78970,7 @@ function nullableField(inner, input = false) {
   }
   return AST3.tsUnionType(members);
 }
-function scalarPropertyValue(config, filepath, missingScalars, target, body, field) {
+function scalarPropertyValue(config, filepath, missingScalars, target, body, field, input) {
   if (config.configFile.features?.componentFields && target.name === config.componentScalar) {
     if (!field) {
       return AST3.tsNeverKeyword();
@@ -79028,6 +79029,9 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
       return AST3.tsBooleanKeyword();
     }
     case "ID": {
+      if (input) {
+        return AST3.tsUnionType([AST3.tsStringKeyword(), AST3.tsNumberKeyword()]);
+      }
       return AST3.tsStringKeyword();
     }
     default: {
@@ -79038,7 +79042,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {

package/build/lib-esm/index.js

@@ -78823,10 +78823,10 @@ var AST3 = recast2.types.builders;
 function unwrappedTsTypeReference(config, filepath, missingScalars, {
   type,
   wrappers
-}, body) {
+}, body, input) {
   let result;
   if (graphql6.isScalarType(type)) {
-    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null);
+    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null, input);
   } else if (graphql6.isEnumType(type)) {
     result = enumReference(config, body, type.name);
   } else {
@@ -78843,14 +78843,15 @@ function unwrappedTsTypeReference(config, filepath, missingScalars, {
   }
   return result;
 }
-function tsTypeReference(config, filepath, missingScalars, definition, body) {
+function tsTypeReference(config, filepath, missingScalars, definition, body, input) {
   const { type, wrappers } = unwrapType(config, definition.type);
   return unwrappedTsTypeReference(
     config,
     filepath,
     missingScalars,
     { type, wrappers },
-    body
+    body,
+    input
   );
 }
 function enumReference(config, body, name) {
@@ -78879,7 +78880,7 @@ function nullableField(inner, input = false) {
   }
   return AST3.tsUnionType(members);
 }
-function scalarPropertyValue(config, filepath, missingScalars, target, body, field) {
+function scalarPropertyValue(config, filepath, missingScalars, target, body, field, input) {
   if (config.configFile.features?.componentFields && target.name === config.componentScalar) {
     if (!field) {
       return AST3.tsNeverKeyword();
@@ -78938,6 +78939,9 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
       return AST3.tsBooleanKeyword();
     }
     case "ID": {
+      if (input) {
+        return AST3.tsUnionType([AST3.tsStringKeyword(), AST3.tsNumberKeyword()]);
+      }
       return AST3.tsStringKeyword();
     }
     default: {
@@ -78948,7 +78952,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {