houdini 1.0.0 → 1.0.1

package/build/codegen-cjs/index.js

@@ -3347,7 +3347,7 @@ var require_definition = __commonJS({
     exports.assertInterfaceType = assertInterfaceType;
     exports.isUnionType = isUnionType7;
     exports.assertUnionType = assertUnionType;
-    exports.isEnumType = isEnumType6;
+    exports.isEnumType = isEnumType7;
     exports.assertEnumType = assertEnumType;
     exports.isInputObjectType = isInputObjectType2;
     exports.assertInputObjectType = assertInputObjectType;
@@ -3418,7 +3418,7 @@ var require_definition = __commonJS({
       return Constructor;
     }
     function isType(type) {
-      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType6(type) || isInputObjectType2(type) || isListType3(type) || isNonNullType6(type);
+      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType7(type) || isInputObjectType2(type) || isListType3(type) || isNonNullType6(type);
     }
     function assertType(type) {
       if (!isType(type)) {
@@ -3462,11 +3462,11 @@ var require_definition = __commonJS({
       }
       return type;
     }
-    function isEnumType6(type) {
+    function isEnumType7(type) {
       return (0, _instanceOf.default)(type, GraphQLEnumType);
     }
     function assertEnumType(type) {
-      if (!isEnumType6(type)) {
+      if (!isEnumType7(type)) {
         throw new Error("Expected ".concat((0, _inspect.default)(type), " to be a GraphQL Enum type."));
       }
       return type;
@@ -3499,7 +3499,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isInputType(type) {
-      return isScalarType7(type) || isEnumType6(type) || isInputObjectType2(type) || isWrappingType(type) && isInputType(type.ofType);
+      return isScalarType7(type) || isEnumType7(type) || isInputObjectType2(type) || isWrappingType(type) && isInputType(type.ofType);
     }
     function assertInputType(type) {
       if (!isInputType(type)) {
@@ -3508,7 +3508,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isOutputType(type) {
-      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType6(type) || isWrappingType(type) && isOutputType(type.ofType);
+      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType7(type) || isWrappingType(type) && isOutputType(type.ofType);
     }
     function assertOutputType(type) {
       if (!isOutputType(type)) {
@@ -3517,7 +3517,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isLeafType(type) {
-      return isScalarType7(type) || isEnumType6(type);
+      return isScalarType7(type) || isEnumType7(type);
     }
     function assertLeafType(type) {
       if (!isLeafType(type)) {
@@ -3605,7 +3605,7 @@ var require_definition = __commonJS({
       }
     }
     function isNamedType(type) {
-      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType6(type) || isInputObjectType2(type);
+      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType7(type) || isInputObjectType2(type);
     }
     function assertNamedType(type) {
       if (!isNamedType(type)) {
@@ -57486,26 +57486,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(
@@ -57568,19 +57587,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: {
@@ -60917,7 +60926,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) {
     graphql24.visit(parsed, {
       [graphql24.Kind.FRAGMENT_DEFINITION](definition) {
         fragments[definition.name.value] = definition;
@@ -61115,7 +61124,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 graphql24.validate(config2.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError({
@@ -61351,24 +61360,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 === graphql24.Kind.VARIABLE || applied.value.kind === graphql24.Kind.LIST || applied.value.kind === graphql24.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 graphql24.GraphQLError(
-                  `Invalid argument type. Expected ${target}, found ${appliedType}`
+                  `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
             }
@@ -61378,6 +61378,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 (!graphql24.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;

package/build/codegen-esm/index.js

@@ -3352,7 +3352,7 @@ var require_definition = __commonJS({
     exports.assertInterfaceType = assertInterfaceType;
     exports.isUnionType = isUnionType7;
     exports.assertUnionType = assertUnionType;
-    exports.isEnumType = isEnumType6;
+    exports.isEnumType = isEnumType7;
     exports.assertEnumType = assertEnumType;
     exports.isInputObjectType = isInputObjectType2;
     exports.assertInputObjectType = assertInputObjectType;
@@ -3423,7 +3423,7 @@ var require_definition = __commonJS({
       return Constructor;
     }
     function isType(type) {
-      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType6(type) || isInputObjectType2(type) || isListType3(type) || isNonNullType6(type);
+      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType7(type) || isInputObjectType2(type) || isListType3(type) || isNonNullType6(type);
     }
     function assertType(type) {
       if (!isType(type)) {
@@ -3467,11 +3467,11 @@ var require_definition = __commonJS({
       }
       return type;
     }
-    function isEnumType6(type) {
+    function isEnumType7(type) {
       return (0, _instanceOf.default)(type, GraphQLEnumType);
     }
     function assertEnumType(type) {
-      if (!isEnumType6(type)) {
+      if (!isEnumType7(type)) {
         throw new Error("Expected ".concat((0, _inspect.default)(type), " to be a GraphQL Enum type."));
       }
       return type;
@@ -3504,7 +3504,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isInputType(type) {
-      return isScalarType7(type) || isEnumType6(type) || isInputObjectType2(type) || isWrappingType(type) && isInputType(type.ofType);
+      return isScalarType7(type) || isEnumType7(type) || isInputObjectType2(type) || isWrappingType(type) && isInputType(type.ofType);
     }
     function assertInputType(type) {
       if (!isInputType(type)) {
@@ -3513,7 +3513,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isOutputType(type) {
-      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType6(type) || isWrappingType(type) && isOutputType(type.ofType);
+      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType7(type) || isWrappingType(type) && isOutputType(type.ofType);
     }
     function assertOutputType(type) {
       if (!isOutputType(type)) {
@@ -3522,7 +3522,7 @@ var require_definition = __commonJS({
       return type;
     }
     function isLeafType(type) {
-      return isScalarType7(type) || isEnumType6(type);
+      return isScalarType7(type) || isEnumType7(type);
     }
     function assertLeafType(type) {
       if (!isLeafType(type)) {
@@ -3610,7 +3610,7 @@ var require_definition = __commonJS({
       }
     }
     function isNamedType(type) {
-      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType6(type) || isInputObjectType2(type);
+      return isScalarType7(type) || isObjectType3(type) || isInterfaceType6(type) || isUnionType7(type) || isEnumType7(type) || isInputObjectType2(type);
     }
     function assertNamedType(type) {
       if (!isNamedType(type)) {
@@ -57484,26 +57484,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(
@@ -57566,19 +57585,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: {
@@ -60915,7 +60924,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) {
     graphql24.visit(parsed, {
       [graphql24.Kind.FRAGMENT_DEFINITION](definition) {
         fragments[definition.name.value] = definition;
@@ -61113,7 +61122,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 graphql24.validate(config2.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError({
@@ -61349,24 +61358,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 === graphql24.Kind.VARIABLE || applied.value.kind === graphql24.Kind.LIST || applied.value.kind === graphql24.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 graphql24.GraphQLError(
-                  `Invalid argument type. Expected ${target}, found ${appliedType}`
+                  `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
             }
@@ -61376,6 +61376,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 (!graphql24.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;