houdini 2.0.0-next.4 → 2.0.0-next.6

package/build/cmd-cjs/index.js

@@ -79144,10 +79144,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 {
@@ -79164,14 +79164,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) {
@@ -79200,7 +79201,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();
@@ -79259,6 +79260,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: {
@@ -79269,7 +79273,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {
@@ -82369,7 +82374,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;
@@ -82394,12 +82399,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)
       )
@@ -82442,7 +82455,8 @@ function inlineType({
   includeFragments,
   allOptional,
   forceNonNull,
-  field
+  field,
+  input
 }) {
   const { type, wrappers } = unwrapType(config, rootType);
   let result;
@@ -82454,7 +82468,8 @@ function inlineType({
       missingScalars,
       type,
       body,
-      field
+      field,
+      input
     );
   } else if (graphql20.isEnumType(type)) {
     ensureImports({
@@ -82562,7 +82577,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"
@@ -82626,7 +82642,8 @@ function inlineType({
         missingScalars,
         includeFragments,
         allOptional,
-        field: null
+        field: null,
+        input: false
       });
       let objectType = fragmentType;
       if (fragmentType.type === "TSUnionType") {
@@ -83091,7 +83108,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({
@@ -83140,7 +83158,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
         body,
         visitedTypes,
         missingScalars,
-        variableDefinition.type
+        variableDefinition.type,
+        true
       );
     }
     body.push(
@@ -83158,7 +83177,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
                       filepath,
                       missingScalars,
                       definition2,
-                      body
+                      body,
+                      true
                     )
                   ),
                   definition2.type.kind !== "NonNullType"
@@ -83193,7 +83213,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
             missingScalars,
             includeFragments: false,
             allOptional: true,
-            field: null
+            field: null,
+            input: false
           })
         )
       )
@@ -83226,7 +83247,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
                 filepath,
                 missingScalars,
                 definition2,
-                body
+                body,
+                false
               )
             ),
             definition2.type.kind !== "NonNullType"
@@ -83289,7 +83311,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
               visitedTypes,
               missingScalars,
               includeFragments: true,
-              field: null
+              field: null,
+              input: false
             })
           })
         )
@@ -83385,7 +83408,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                   {
                     field: key,
                     parent: type.name
-                  }
+                  },
+                  false
                 )
               )
             );
@@ -83412,7 +83436,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                     {
                       field: key,
                       parent: type.name
-                    }
+                    },
+                    false
                   )
                 );
               } else if (graphql21.isEnumType(unwrapped.type)) {
@@ -83450,7 +83475,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),
@@ -83460,7 +83486,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                           filepath,
                           /* @__PURE__ */ new Set(),
                           arg,
-                          body
+                          body,
+                          graphql21.isInputType(arg.type)
                         )
                       )
                     );
@@ -83572,7 +83599,8 @@ function listDefinitions(config, filepath, body, docs) {
                               filepath,
                               /* @__PURE__ */ new Set(),
                               arg,
-                              body
+                              body,
+                              graphql21.isInputType(arg.type)
                             )
                           )
                         );
@@ -89184,12 +89212,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.4"
+    houdini: "^2.0.0-next.6"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.0-next.7"
+      "houdini-svelte": "^3.0.0-next.9"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/cmd-esm/index.js

@@ -79148,10 +79148,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 {
@@ -79168,14 +79168,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) {
@@ -79204,7 +79205,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();
@@ -79263,6 +79264,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: {
@@ -79273,7 +79277,8 @@ function scalarPropertyValue(config, filepath, missingScalars, target, body, fie
           missingScalars,
           target.ofType,
           body,
-          field
+          field,
+          input
         );
       }
       if (config.scalars?.[target.name]) {
@@ -82373,7 +82378,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;
@@ -82398,12 +82403,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)
       )
@@ -82446,7 +82459,8 @@ function inlineType({
   includeFragments,
   allOptional,
   forceNonNull,
-  field
+  field,
+  input
 }) {
   const { type, wrappers } = unwrapType(config, rootType);
   let result;
@@ -82458,7 +82472,8 @@ function inlineType({
       missingScalars,
       type,
       body,
-      field
+      field,
+      input
     );
   } else if (graphql20.isEnumType(type)) {
     ensureImports({
@@ -82566,7 +82581,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"
@@ -82630,7 +82646,8 @@ function inlineType({
         missingScalars,
         includeFragments,
         allOptional,
-        field: null
+        field: null,
+        input: false
       });
       let objectType = fragmentType;
       if (fragmentType.type === "TSUnionType") {
@@ -83095,7 +83112,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({
@@ -83144,7 +83162,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
         body,
         visitedTypes,
         missingScalars,
-        variableDefinition.type
+        variableDefinition.type,
+        true
       );
     }
     body.push(
@@ -83162,7 +83181,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
                       filepath,
                       missingScalars,
                       definition2,
-                      body
+                      body,
+                      true
                     )
                   ),
                   definition2.type.kind !== "NonNullType"
@@ -83197,7 +83217,8 @@ async function generateOperationTypeDefs(config, filepath, document, body, defin
             missingScalars,
             includeFragments: false,
             allOptional: true,
-            field: null
+            field: null,
+            input: false
           })
         )
       )
@@ -83230,7 +83251,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
                 filepath,
                 missingScalars,
                 definition2,
-                body
+                body,
+                false
               )
             ),
             definition2.type.kind !== "NonNullType"
@@ -83293,7 +83315,8 @@ async function generateFragmentTypeDefs(config, filepath, body, selections, defi
               visitedTypes,
               missingScalars,
               includeFragments: true,
-              field: null
+              field: null,
+              input: false
             })
           })
         )
@@ -83389,7 +83412,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                   {
                     field: key,
                     parent: type.name
-                  }
+                  },
+                  false
                 )
               )
             );
@@ -83416,7 +83440,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                     {
                       field: key,
                       parent: type.name
-                    }
+                    },
+                    false
                   )
                 );
               } else if (graphql21.isEnumType(unwrapped.type)) {
@@ -83454,7 +83479,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),
@@ -83464,7 +83490,8 @@ function typeDefinitions(config, filepath, body, docs, returnType) {
                           filepath,
                           /* @__PURE__ */ new Set(),
                           arg,
-                          body
+                          body,
+                          graphql21.isInputType(arg.type)
                         )
                       )
                     );
@@ -83576,7 +83603,8 @@ function listDefinitions(config, filepath, body, docs) {
                               filepath,
                               /* @__PURE__ */ new Set(),
                               arg,
-                              body
+                              body,
+                              graphql21.isInputType(arg.type)
                             )
                           )
                         );
@@ -89188,12 +89216,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.0-next.4"
+    houdini: "^2.0.0-next.6"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.0-next.7"
+      "houdini-svelte": "^3.0.0-next.9"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/codegen/generators/typescript/addReferencedInputTypes.d.ts

@@ -1,4 +1,4 @@
 import type { StatementKind } from 'ast-types/lib/gen/kinds';
 import * as graphql from 'graphql';
 import type { Config } from '../../../lib';
-export declare function addReferencedInputTypes(config: Config, filepath: string, body: StatementKind[], visitedTypes: Set<string>, missingScalars: Set<string>, rootType: graphql.TypeNode | graphql.GraphQLInputType): void;
+export declare function addReferencedInputTypes(config: Config, filepath: string, body: StatementKind[], visitedTypes: Set<string>, missingScalars: Set<string>, rootType: graphql.TypeNode | graphql.GraphQLInputType, input: boolean): void;

package/build/codegen/generators/typescript/inlineType.d.ts

@@ -3,7 +3,7 @@ import * as graphql from 'graphql';
 import type { Config } from '../../../lib';
 import { TypeWrapper } from '../../../lib';
 export declare const fragmentKey: " $fragments";
-export declare function inlineType({ config, filepath, rootType, selections, root, allowReadonly, body, visitedTypes, missingScalars, includeFragments, allOptional, forceNonNull, field, }: {
+export declare function inlineType({ config, filepath, rootType, selections, root, allowReadonly, body, visitedTypes, missingScalars, includeFragments, allOptional, forceNonNull, field, input, }: {
     config: Config;
     filepath: string;
     rootType: graphql.GraphQLNamedType;
@@ -20,6 +20,7 @@ export declare function inlineType({ config, filepath, rootType, selections, roo
     } | null;
     allOptional?: boolean;
     forceNonNull?: boolean;
+    input: boolean;
 }): TSTypeKind;
 export declare function wrapType(wrappers: TypeWrapper[], result: TSTypeKind, root: boolean, forceNullable?: boolean, forceNonNull?: boolean): TSTypeKind;
 export declare function selectionTypeInfo(schema: graphql.GraphQLSchema, filepath: string, rootType: graphql.GraphQLObjectType<any, any>, selection: graphql.SelectionNode): {