houdini 1.0.0 → 1.0.1

package/build/cmd-cjs/index.js

@@ -5100,7 +5100,7 @@ var require_definition = __commonJS({
     exports.assertInterfaceType = assertInterfaceType;
     exports.isUnionType = isUnionType13;
     exports.assertUnionType = assertUnionType;
-    exports.isEnumType = isEnumType11;
+    exports.isEnumType = isEnumType12;
     exports.assertEnumType = assertEnumType;
     exports.isInputObjectType = isInputObjectType8;
     exports.assertInputObjectType = assertInputObjectType;
@@ -5171,7 +5171,7 @@ var require_definition = __commonJS({
       return Constructor;
     }
     function isType(type) {
-      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType11(type) || isInputObjectType8(type) || isListType8(type) || isNonNullType10(type);
+      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType12(type) || isInputObjectType8(type) || isListType8(type) || isNonNullType10(type);
     }
     function assertType(type) {
       if (!isType(type)) {
@@ -5215,11 +5215,11 @@ var require_definition = __commonJS({
       }
       return type;
     }
-    function isEnumType11(type) {
+    function isEnumType12(type) {
       return (0, _instanceOf.default)(type, GraphQLEnumType4);
     }
     function assertEnumType(type) {
-      if (!isEnumType11(type)) {
+      if (!isEnumType12(type)) {
         throw new Error("Expected ".concat((0, _inspect.default)(type), " to be a GraphQL Enum type."));
       }
       return type;
@@ -5252,7 +5252,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isInputType(type) {
-      return isScalarType13(type) || isEnumType11(type) || isInputObjectType8(type) || isWrappingType(type) && isInputType(type.ofType);
+      return isScalarType13(type) || isEnumType12(type) || isInputObjectType8(type) || isWrappingType(type) && isInputType(type.ofType);
     }
     function assertInputType(type) {
       if (!isInputType(type)) {
@@ -5261,7 +5261,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isOutputType(type) {
-      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType11(type) || isWrappingType(type) && isOutputType(type.ofType);
+      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType12(type) || isWrappingType(type) && isOutputType(type.ofType);
     }
     function assertOutputType(type) {
       if (!isOutputType(type)) {
@@ -5270,7 +5270,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isLeafType4(type) {
-      return isScalarType13(type) || isEnumType11(type);
+      return isScalarType13(type) || isEnumType12(type);
     }
     function assertLeafType(type) {
       if (!isLeafType4(type)) {
@@ -5358,7 +5358,7 @@ var require_definition = __commonJS({
       }
     }
     function isNamedType4(type) {
-      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType11(type) || isInputObjectType8(type);
+      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType12(type) || isInputObjectType8(type);
     }
     function assertNamedType(type) {
       if (!isNamedType4(type)) {
@@ -73732,26 +73732,45 @@ function fragmentArguments(config2, filepath, definition) {
       if (!typeArg || typeArg.kind !== "StringValue") {
         return [];
       }
-      let type = typeArg.value;
-      let name = arg.name.value;
-      let required = false;
+      let type = parseArgumentTypeString(typeArg.value);
       let defaultValue = arg.value.fields?.find((arg2) => arg2.name.value === "default")?.value || null;
-      if (type[type.length - 1] === "!") {
-        type = type.slice(0, -1);
-        required = true;
-        defaultValue = null;
-      }
       return [
         {
-          name,
+          name: arg.name.value,
           type,
-          required,
+          required: type.kind === "NonNullType",
           defaultValue
         }
       ];
     }) || []
   );
 }
+function parseArgumentTypeString(input) {
+  if (input[input.length - 1] === "!") {
+    const inner = parseArgumentTypeString(input.substring(0, input.length - 1));
+    if (inner.kind === "NonNullType") {
+      throw new Error("invalid type" + input);
+    }
+    return {
+      kind: "NonNullType",
+      type: inner
+    };
+  }
+  if (input[input.length - 1] === "]") {
+    const inner = parseArgumentTypeString(input.substring(1, input.length - 1));
+    return {
+      kind: "ListType",
+      type: inner
+    };
+  }
+  return {
+    kind: "NamedType",
+    name: {
+      kind: "Name",
+      value: input
+    }
+  };
+}
 function collectDefaultArgumentValues(config2, filepath, definition) {
   let result = {};
   for (const { name, required, defaultValue } of fragmentArguments(
@@ -73814,19 +73833,9 @@ function fragmentArgumentsDefinitions(config2, filepath, definition) {
     return [];
   }
   return args.map((arg) => {
-    const innerType = {
-      kind: "NamedType",
-      name: {
-        kind: "Name",
-        value: arg.type
-      }
-    };
     return {
       kind: "VariableDefinition",
-      type: arg.required ? innerType : {
-        kind: "NonNullType",
-        type: innerType
-      },
+      type: arg.type,
       variable: {
         kind: "Variable",
         name: {
@@ -77163,7 +77172,7 @@ async function typeCheck(config2, docs) {
   const lists = [];
   const listTypes = [];
   const fragments = {};
-  for (const { document: parsed, filename } of docs) {
+  for (const { document: parsed, originalString, filename } of docs) {
     graphql25.visit(parsed, {
       [graphql25.Kind.FRAGMENT_DEFINITION](definition) {
         fragments[definition.name.value] = definition;
@@ -77361,7 +77370,7 @@ async function typeCheck(config2, docs) {
     paginateArgs(config2, filepath),
     noUnusedFragmentArguments(config2)
   );
-  for (const { filename, document: parsed } of docs) {
+  for (const { filename, document: parsed, originalString } of docs) {
     for (const error of graphql25.validate(config2.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError({
@@ -77597,24 +77606,15 @@ function validateFragmentArguments(config2, filepath, fragments) {
             )
           );
         } else {
-          const zipped = appliedArgumentNames.map(
-            (name) => [
-              appliedArguments[name],
-              fragmentArguments2[fragmentName].find((arg) => arg.name === name).type
-            ]
-          );
+          const zipped = appliedArgumentNames.map((name) => [
+            appliedArguments[name],
+            fragmentArguments2[fragmentName].find((arg) => arg.name === name).type
+          ]);
           for (const [applied, target] of zipped) {
-            if (applied.value.kind === graphql25.Kind.VARIABLE || applied.value.kind === graphql25.Kind.LIST || applied.value.kind === graphql25.Kind.OBJECT) {
-              continue;
-            }
-            const appliedType = applied.value.kind.substring(
-              0,
-              applied.value.kind.length - "Value".length
-            );
-            if (appliedType !== target) {
+            if (!valueIsType(config2, applied.value, target)) {
               ctx.reportError(
                 new graphql25.GraphQLError(
-                  `Invalid argument type. Expected ${target}, found ${appliedType}`
+                  `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
             }
@@ -77624,6 +77624,47 @@ function validateFragmentArguments(config2, filepath, fragments) {
     };
   };
 }
+function valueIsType(config2, value, targetType) {
+  if (value.kind === "NullValue") {
+    return targetType.kind !== "NonNullType";
+  }
+  if (targetType.kind === "NonNullType") {
+    targetType = targetType.type;
+  }
+  if (value.kind === "ListValue") {
+    if (targetType.kind !== "ListType") {
+      return false;
+    }
+    const listType = targetType.type;
+    return value.values.every((value2) => valueIsType(config2, value2, listType));
+  }
+  if (value.kind === "BooleanValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Boolean";
+  }
+  if (value.kind === "StringValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "String";
+  }
+  if (value.kind === "IntValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Int";
+  }
+  if (value.kind === "FloatValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Float";
+  }
+  if (value.kind === "ObjectValue" && targetType.kind === "NamedType") {
+    return true;
+  }
+  if (value.kind === "EnumValue" && targetType.kind === "NamedType") {
+    const enumType = config2.schema.getType(targetType.name.value);
+    if (!graphql25.isEnumType(enumType)) {
+      return false;
+    }
+    return enumType.getValues().some((enumValue) => enumValue.value === value.value);
+  }
+  if (value.kind === "Variable") {
+    return true;
+  }
+  return false;
+}
 function paginateArgs(config2, filepath) {
   return function(ctx) {
     let alreadyPaginated = false;
@@ -78683,8 +78724,8 @@ async function updatePackageJSON(targetPath) {
   }
   packageJSON.devDependencies = {
     ...packageJSON.devDependencies,
-    houdini: "^1.0.0",
-    "houdini-svelte": "^1.0.0"
+    houdini: "^1.0.1",
+    "houdini-svelte": "^1.0.1"
   };
   await fs_exports.writeFile(packagePath, JSON.stringify(packageJSON, null, 4));
 }

package/build/cmd-esm/index.js

@@ -5106,7 +5106,7 @@ var require_definition = __commonJS({
     exports.assertInterfaceType = assertInterfaceType;
     exports.isUnionType = isUnionType13;
     exports.assertUnionType = assertUnionType;
-    exports.isEnumType = isEnumType11;
+    exports.isEnumType = isEnumType12;
     exports.assertEnumType = assertEnumType;
     exports.isInputObjectType = isInputObjectType8;
     exports.assertInputObjectType = assertInputObjectType;
@@ -5177,7 +5177,7 @@ var require_definition = __commonJS({
       return Constructor;
     }
     function isType(type) {
-      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType11(type) || isInputObjectType8(type) || isListType8(type) || isNonNullType10(type);
+      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType12(type) || isInputObjectType8(type) || isListType8(type) || isNonNullType10(type);
     }
     function assertType(type) {
       if (!isType(type)) {
@@ -5221,11 +5221,11 @@ var require_definition = __commonJS({
       }
       return type;
     }
-    function isEnumType11(type) {
+    function isEnumType12(type) {
       return (0, _instanceOf.default)(type, GraphQLEnumType4);
     }
     function assertEnumType(type) {
-      if (!isEnumType11(type)) {
+      if (!isEnumType12(type)) {
         throw new Error("Expected ".concat((0, _inspect.default)(type), " to be a GraphQL Enum type."));
       }
       return type;
@@ -5258,7 +5258,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isInputType(type) {
-      return isScalarType13(type) || isEnumType11(type) || isInputObjectType8(type) || isWrappingType(type) && isInputType(type.ofType);
+      return isScalarType13(type) || isEnumType12(type) || isInputObjectType8(type) || isWrappingType(type) && isInputType(type.ofType);
     }
     function assertInputType(type) {
       if (!isInputType(type)) {
@@ -5267,7 +5267,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isOutputType(type) {
-      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType11(type) || isWrappingType(type) && isOutputType(type.ofType);
+      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType12(type) || isWrappingType(type) && isOutputType(type.ofType);
     }
     function assertOutputType(type) {
       if (!isOutputType(type)) {
@@ -5276,7 +5276,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isLeafType4(type) {
-      return isScalarType13(type) || isEnumType11(type);
+      return isScalarType13(type) || isEnumType12(type);
     }
     function assertLeafType(type) {
       if (!isLeafType4(type)) {
@@ -5364,7 +5364,7 @@ var require_definition = __commonJS({
       }
     }
     function isNamedType4(type) {
-      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType11(type) || isInputObjectType8(type);
+      return isScalarType13(type) || isObjectType12(type) || isInterfaceType12(type) || isUnionType13(type) || isEnumType12(type) || isInputObjectType8(type);
     }
     function assertNamedType(type) {
       if (!isNamedType4(type)) {
@@ -73737,26 +73737,45 @@ function fragmentArguments(config2, filepath, definition) {
       if (!typeArg || typeArg.kind !== "StringValue") {
         return [];
       }
-      let type = typeArg.value;
-      let name = arg.name.value;
-      let required = false;
+      let type = parseArgumentTypeString(typeArg.value);
       let defaultValue = arg.value.fields?.find((arg2) => arg2.name.value === "default")?.value || null;
-      if (type[type.length - 1] === "!") {
-        type = type.slice(0, -1);
-        required = true;
-        defaultValue = null;
-      }
       return [
         {
-          name,
+          name: arg.name.value,
           type,
-          required,
+          required: type.kind === "NonNullType",
           defaultValue
         }
       ];
     }) || []
   );
 }
+function parseArgumentTypeString(input) {
+  if (input[input.length - 1] === "!") {
+    const inner = parseArgumentTypeString(input.substring(0, input.length - 1));
+    if (inner.kind === "NonNullType") {
+      throw new Error("invalid type" + input);
+    }
+    return {
+      kind: "NonNullType",
+      type: inner
+    };
+  }
+  if (input[input.length - 1] === "]") {
+    const inner = parseArgumentTypeString(input.substring(1, input.length - 1));
+    return {
+      kind: "ListType",
+      type: inner
+    };
+  }
+  return {
+    kind: "NamedType",
+    name: {
+      kind: "Name",
+      value: input
+    }
+  };
+}
 function collectDefaultArgumentValues(config2, filepath, definition) {
   let result = {};
   for (const { name, required, defaultValue } of fragmentArguments(
@@ -73819,19 +73838,9 @@ function fragmentArgumentsDefinitions(config2, filepath, definition) {
     return [];
   }
   return args.map((arg) => {
-    const innerType = {
-      kind: "NamedType",
-      name: {
-        kind: "Name",
-        value: arg.type
-      }
-    };
     return {
       kind: "VariableDefinition",
-      type: arg.required ? innerType : {
-        kind: "NonNullType",
-        type: innerType
-      },
+      type: arg.type,
       variable: {
         kind: "Variable",
         name: {
@@ -77168,7 +77177,7 @@ async function typeCheck(config2, docs) {
   const lists = [];
   const listTypes = [];
   const fragments = {};
-  for (const { document: parsed, filename } of docs) {
+  for (const { document: parsed, originalString, filename } of docs) {
     graphql25.visit(parsed, {
       [graphql25.Kind.FRAGMENT_DEFINITION](definition) {
         fragments[definition.name.value] = definition;
@@ -77366,7 +77375,7 @@ async function typeCheck(config2, docs) {
     paginateArgs(config2, filepath),
     noUnusedFragmentArguments(config2)
   );
-  for (const { filename, document: parsed } of docs) {
+  for (const { filename, document: parsed, originalString } of docs) {
     for (const error of graphql25.validate(config2.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError({
@@ -77602,24 +77611,15 @@ function validateFragmentArguments(config2, filepath, fragments) {
             )
           );
         } else {
-          const zipped = appliedArgumentNames.map(
-            (name) => [
-              appliedArguments[name],
-              fragmentArguments2[fragmentName].find((arg) => arg.name === name).type
-            ]
-          );
+          const zipped = appliedArgumentNames.map((name) => [
+            appliedArguments[name],
+            fragmentArguments2[fragmentName].find((arg) => arg.name === name).type
+          ]);
           for (const [applied, target] of zipped) {
-            if (applied.value.kind === graphql25.Kind.VARIABLE || applied.value.kind === graphql25.Kind.LIST || applied.value.kind === graphql25.Kind.OBJECT) {
-              continue;
-            }
-            const appliedType = applied.value.kind.substring(
-              0,
-              applied.value.kind.length - "Value".length
-            );
-            if (appliedType !== target) {
+            if (!valueIsType(config2, applied.value, target)) {
               ctx.reportError(
                 new graphql25.GraphQLError(
-                  `Invalid argument type. Expected ${target}, found ${appliedType}`
+                  `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
             }
@@ -77629,6 +77629,47 @@ function validateFragmentArguments(config2, filepath, fragments) {
     };
   };
 }
+function valueIsType(config2, value, targetType) {
+  if (value.kind === "NullValue") {
+    return targetType.kind !== "NonNullType";
+  }
+  if (targetType.kind === "NonNullType") {
+    targetType = targetType.type;
+  }
+  if (value.kind === "ListValue") {
+    if (targetType.kind !== "ListType") {
+      return false;
+    }
+    const listType = targetType.type;
+    return value.values.every((value2) => valueIsType(config2, value2, listType));
+  }
+  if (value.kind === "BooleanValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Boolean";
+  }
+  if (value.kind === "StringValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "String";
+  }
+  if (value.kind === "IntValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Int";
+  }
+  if (value.kind === "FloatValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Float";
+  }
+  if (value.kind === "ObjectValue" && targetType.kind === "NamedType") {
+    return true;
+  }
+  if (value.kind === "EnumValue" && targetType.kind === "NamedType") {
+    const enumType = config2.schema.getType(targetType.name.value);
+    if (!graphql25.isEnumType(enumType)) {
+      return false;
+    }
+    return enumType.getValues().some((enumValue) => enumValue.value === value.value);
+  }
+  if (value.kind === "Variable") {
+    return true;
+  }
+  return false;
+}
 function paginateArgs(config2, filepath) {
   return function(ctx) {
     let alreadyPaginated = false;
@@ -78688,8 +78729,8 @@ async function updatePackageJSON(targetPath) {
   }
   packageJSON.devDependencies = {
     ...packageJSON.devDependencies,
-    houdini: "^1.0.0",
-    "houdini-svelte": "^1.0.0"
+    houdini: "^1.0.1",
+    "houdini-svelte": "^1.0.1"
   };
   await fs_exports.writeFile(packagePath, JSON.stringify(packageJSON, null, 4));
 }

package/build/codegen/transforms/fragmentVariables.d.ts

@@ -16,11 +16,12 @@ export declare function inlineFragmentArgs({ config, filepath, fragmentDefinitio
 export declare function withArguments(config: Config, node: graphql.FragmentSpreadNode): graphql.ArgumentNode[];
 export type FragmentArgument = {
     name: string;
-    type: string;
+    type: graphql.TypeNode;
     required: boolean;
     defaultValue: graphql.ValueNode | null;
 };
 export declare function fragmentArguments(config: Config, filepath: string, definition: graphql.FragmentDefinitionNode): FragmentArgument[];
+export declare function parseArgumentTypeString(input: string): graphql.TypeNode;
 export declare function collectWithArguments(config: Config, filepath: string, node: graphql.FragmentSpreadNode, scope?: ValueMap | null): {
     args: ValueMap | null;
     hash: string;

package/build/codegen/validators/typeCheck.d.ts

@@ -1,4 +1,5 @@
 import * as graphql from 'graphql';
 import type { Config, Document } from '../../lib';
 export default function typeCheck(config: Config, docs: Document[]): Promise<void>;
+export declare function valueIsType(config: Config, value: graphql.ValueNode, targetType: graphql.TypeNode): boolean;
 export declare function getAndVerifyNodeInterface(config: Config): graphql.GraphQLInterfaceType | null;