houdini 1.0.0 → 1.0.2

package/build/vite-cjs/index.js

@@ -7495,7 +7495,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;
@@ -7566,7 +7566,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)) {
@@ -7610,11 +7610,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;
@@ -7647,7 +7647,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)) {
@@ -7656,7 +7656,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)) {
@@ -7665,7 +7665,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)) {
@@ -7753,7 +7753,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)) {
@@ -70590,26 +70590,45 @@ function fragmentArguments(config4, 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(config4, filepath, definition) {
   let result = {};
   for (const { name, required, defaultValue } of fragmentArguments(
@@ -70672,19 +70691,9 @@ function fragmentArgumentsDefinitions(config4, 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: {
@@ -74027,7 +74036,7 @@ async function typeCheck(config4, 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;
@@ -74225,7 +74234,7 @@ async function typeCheck(config4, docs) {
     paginateArgs(config4, filepath),
     noUnusedFragmentArguments(config4)
   );
-  for (const { filename, document: parsed } of docs) {
+  for (const { filename, document: parsed, originalString } of docs) {
     for (const error of graphql25.validate(config4.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError({
@@ -74461,24 +74470,15 @@ function validateFragmentArguments(config4, 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(config4, applied.value, target)) {
               ctx.reportError(
                 new graphql25.GraphQLError(
-                  `Invalid argument type. Expected ${target}, found ${appliedType}`
+                  `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
             }
@@ -74488,6 +74488,47 @@ function validateFragmentArguments(config4, filepath, fragments) {
     };
   };
 }
+function valueIsType(config4, 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(config4, 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 = config4.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(config4, filepath) {
   return function(ctx) {
     let alreadyPaginated = false;

package/build/vite-esm/index.js

@@ -7500,7 +7500,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;
@@ -7571,7 +7571,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)) {
@@ -7615,11 +7615,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;
@@ -7652,7 +7652,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)) {
@@ -7661,7 +7661,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)) {
@@ -7670,7 +7670,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)) {
@@ -7758,7 +7758,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)) {
@@ -70584,26 +70584,45 @@ function fragmentArguments(config4, 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(config4, filepath, definition) {
   let result = {};
   for (const { name, required, defaultValue } of fragmentArguments(
@@ -70666,19 +70685,9 @@ function fragmentArgumentsDefinitions(config4, 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: {
@@ -74021,7 +74030,7 @@ async function typeCheck(config4, 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;
@@ -74219,7 +74228,7 @@ async function typeCheck(config4, docs) {
     paginateArgs(config4, filepath),
     noUnusedFragmentArguments(config4)
   );
-  for (const { filename, document: parsed } of docs) {
+  for (const { filename, document: parsed, originalString } of docs) {
     for (const error of graphql25.validate(config4.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError({
@@ -74455,24 +74464,15 @@ function validateFragmentArguments(config4, 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(config4, applied.value, target)) {
               ctx.reportError(
                 new graphql25.GraphQLError(
-                  `Invalid argument type. Expected ${target}, found ${appliedType}`
+                  `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
             }
@@ -74482,6 +74482,47 @@ function validateFragmentArguments(config4, filepath, fragments) {
     };
   };
 }
+function valueIsType(config4, 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(config4, 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 = config4.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(config4, filepath) {
   return function(ctx) {
     let alreadyPaginated = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",