houdini-svelte 1.0.0 → 1.0.2

package/build/test-esm/index.js

@@ -95919,7 +95919,7 @@ var require_definition2 = __commonJS3({
     exports.assertInterfaceType = assertInterfaceType;
     exports.isUnionType = isUnionType7;
     exports.assertUnionType = assertUnionType;
-    exports.isEnumType = isEnumType6;
+    exports.isEnumType = isEnumType7;
     exports.assertEnumType = assertEnumType;
     exports.isInputObjectType = isInputObjectType2;
     exports.assertInputObjectType = assertInputObjectType;
@@ -95990,7 +95990,7 @@ var require_definition2 = __commonJS3({
       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)) {
@@ -96034,11 +96034,11 @@ var require_definition2 = __commonJS3({
       }
       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;
@@ -96071,7 +96071,7 @@ var require_definition2 = __commonJS3({
       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)) {
@@ -96080,7 +96080,7 @@ var require_definition2 = __commonJS3({
       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)) {
@@ -96089,7 +96089,7 @@ var require_definition2 = __commonJS3({
       return type;
     }
     function isLeafType(type) {
-      return isScalarType7(type) || isEnumType6(type);
+      return isScalarType7(type) || isEnumType7(type);
     }
     function assertLeafType(type) {
       if (!isLeafType(type)) {
@@ -96177,7 +96177,7 @@ var require_definition2 = __commonJS3({
       }
     }
     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)) {
@@ -149352,26 +149352,45 @@ function fragmentArguments(config22, 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(config22, filepath, definition) {
   let result = {};
   for (const { name, required, defaultValue } of fragmentArguments(
@@ -149434,19 +149453,9 @@ function fragmentArgumentsDefinitions(config22, 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: {
@@ -152709,7 +152718,7 @@ async function typeCheck(config22, 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;
@@ -152907,7 +152916,7 @@ async function typeCheck(config22, docs) {
     paginateArgs(config22, filepath),
     noUnusedFragmentArguments(config22)
   );
-  for (const { filename, document: parsed } of docs) {
+  for (const { filename, document: parsed, originalString } of docs) {
     for (const error3 of graphql24.validate(config22.schema, parsed, rules(filename))) {
       errors.push(
         new HoudiniError2({
@@ -153143,24 +153152,15 @@ function validateFragmentArguments(config22, 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(config22, applied.value, target)) {
               ctx.reportError(
                 new graphql24.GraphQLError(
-                  `Invalid argument type. Expected ${target}, found ${appliedType}`
+                  `Invalid argument type. Expected ${target}, found ${applied.value.kind}`
                 )
               );
             }
@@ -153170,6 +153170,47 @@ function validateFragmentArguments(config22, filepath, fragments) {
     };
   };
 }
+function valueIsType(config22, value2, targetType) {
+  if (value2.kind === "NullValue") {
+    return targetType.kind !== "NonNullType";
+  }
+  if (targetType.kind === "NonNullType") {
+    targetType = targetType.type;
+  }
+  if (value2.kind === "ListValue") {
+    if (targetType.kind !== "ListType") {
+      return false;
+    }
+    const listType = targetType.type;
+    return value2.values.every((value22) => valueIsType(config22, value22, listType));
+  }
+  if (value2.kind === "BooleanValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Boolean";
+  }
+  if (value2.kind === "StringValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "String";
+  }
+  if (value2.kind === "IntValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Int";
+  }
+  if (value2.kind === "FloatValue") {
+    return targetType.kind === "NamedType" && targetType.name.value === "Float";
+  }
+  if (value2.kind === "ObjectValue" && targetType.kind === "NamedType") {
+    return true;
+  }
+  if (value2.kind === "EnumValue" && targetType.kind === "NamedType") {
+    const enumType = config22.schema.getType(targetType.name.value);
+    if (!graphql24.isEnumType(enumType)) {
+      return false;
+    }
+    return enumType.getValues().some((enumValue) => enumValue.value === value2.value);
+  }
+  if (value2.kind === "Variable") {
+    return true;
+  }
+  return false;
+}
 function paginateArgs(config22, filepath) {
   return function(ctx) {
     let alreadyPaginated = false;
@@ -156950,7 +156991,7 @@ var require_definition3 = __commonJS4({
     exports.assertInterfaceType = assertInterfaceType;
     exports.isUnionType = isUnionType7;
     exports.assertUnionType = assertUnionType;
-    exports.isEnumType = isEnumType6;
+    exports.isEnumType = isEnumType7;
     exports.assertEnumType = assertEnumType;
     exports.isInputObjectType = isInputObjectType2;
     exports.assertInputObjectType = assertInputObjectType;
@@ -157021,7 +157062,7 @@ var require_definition3 = __commonJS4({
       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)) {
@@ -157065,11 +157106,11 @@ var require_definition3 = __commonJS4({
       }
       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;
@@ -157102,7 +157143,7 @@ var require_definition3 = __commonJS4({
       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)) {
@@ -157111,7 +157152,7 @@ var require_definition3 = __commonJS4({
       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)) {
@@ -157120,7 +157161,7 @@ var require_definition3 = __commonJS4({
       return type;
     }
     function isLeafType(type) {
-      return isScalarType7(type) || isEnumType6(type);
+      return isScalarType7(type) || isEnumType7(type);
     }
     function assertLeafType(type) {
       if (!isLeafType(type)) {
@@ -157208,7 +157249,7 @@ var require_definition3 = __commonJS4({
       }
     }
     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)) {
@@ -210361,6 +210402,7 @@ function testConfigFile({ plugins, ...config22 } = {}) {
 				entitiesByCursor(first: Int, after: String, last: Int, before: String): EntityConnection!
 				node(id: ID!): Node
 				customIdList: [CustomIdType]!
+				nodes(ids: [ID!]!): [Node!]!
 			}
 
 			type PageInfo {
@@ -210543,7 +210585,7 @@ function testConfig(config22 = {}) {
     ...testConfigFile(config22)
   });
 }
-function mockCollectedDoc(query22) {
+function mockCollectedDoc(query22, data2) {
   const parsed = graphql252.parse(query22);
   const name = parsed.definitions[0].name.value;
   const operations = parsed.definitions;
@@ -210566,7 +210608,8 @@ function mockCollectedDoc(query22) {
     generateArtifact: true,
     generateStore: true,
     originalString: query22,
-    artifact: null
+    artifact: null,
+    ...data2
   };
 }
 
@@ -217995,7 +218038,7 @@ var require_definition5 = __commonJS5({
     exports.assertInterfaceType = assertInterfaceType;
     exports.isUnionType = isUnionType13;
     exports.assertUnionType = assertUnionType;
-    exports.isEnumType = isEnumType11;
+    exports.isEnumType = isEnumType12;
     exports.assertEnumType = assertEnumType;
     exports.isInputObjectType = isInputObjectType8;
     exports.assertInputObjectType = assertInputObjectType;
@@ -218066,7 +218109,7 @@ var require_definition5 = __commonJS5({
       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)) {
@@ -218110,11 +218153,11 @@ var require_definition5 = __commonJS5({
       }
       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;
@@ -218147,7 +218190,7 @@ var require_definition5 = __commonJS5({
       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)) {
@@ -218156,7 +218199,7 @@ var require_definition5 = __commonJS5({
       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)) {
@@ -218165,7 +218208,7 @@ var require_definition5 = __commonJS5({
       return type;
     }
     function isLeafType4(type) {
-      return isScalarType13(type) || isEnumType11(type);
+      return isScalarType13(type) || isEnumType12(type);
     }
     function assertLeafType(type) {
       if (!isLeafType4(type)) {
@@ -218253,7 +218296,7 @@ var require_definition5 = __commonJS5({
       }
     }
     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)) {
@@ -304204,21 +304247,56 @@ async function fragmentTypedefs(input) {
         document_input.typeAnnotation = AST16.tsTypeAnnotation(
           AST16.tsTypeReference(AST16.identifier(store))
         );
-        const return_value = AST16.tsTypeReference(
-          AST16.identifier("ReturnType"),
-          AST16.tsTypeParameterInstantiation([
-            AST16.tsIndexedAccessType(
-              AST16.tsTypeReference(AST16.identifier(store)),
-              AST16.tsLiteralType(AST16.stringLiteral("get"))
-            )
-          ])
-        );
+        let store_type = "FragmentStoreInstance";
+        if (doc.refetch?.paginated) {
+          if (doc.refetch.method === "cursor") {
+            store_type = "CursorFragmentStoreInstance";
+          } else {
+            store_type = "OffsetFragmentStoreInstance";
+          }
+        }
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "./types",
+          import: [store_type],
+          importKind: "type"
+        });
         ensureImports({
           config: input.config,
           body: contents.script.body,
           sourceModule: import_path,
           import: [store]
         });
+        const shapeID = `${doc.name}$data`;
+        const inputID = `${doc.name}$input`;
+        ensureImports({
+          config: input.config,
+          body: contents.script.body,
+          sourceModule: "../../../artifacts/" + doc.name,
+          import: [inputID, shapeID]
+        });
+        const typeParams = [];
+        if (doc.refetch?.paginated) {
+          typeParams.push(AST16.tsTypeReference(AST16.identifier(inputID)));
+        }
+        const return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsTypeReference(AST16.identifier(shapeID)),
+            ...typeParams
+          ])
+        );
+        const null_return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsUnionType([
+              AST16.tsTypeReference(AST16.identifier(shapeID)),
+              AST16.tsNullKeyword()
+            ]),
+            ...typeParams
+          ])
+        );
         return [
           AST16.exportNamedDeclaration(
             AST16.tsDeclareFunction(
@@ -304231,9 +304309,7 @@ async function fragmentTypedefs(input) {
             AST16.tsDeclareFunction(
               AST16.identifier(which),
               [initial_value_or_null_input, document_input],
-              AST16.tsTypeAnnotation(
-                AST16.tsUnionType([return_value, AST16.tsNullKeyword()])
-              )
+              AST16.tsTypeAnnotation(null_return_value)
             )
           )
         ];
@@ -306064,7 +306140,7 @@ async function test_config(extraConfig = {}) {
 }
 async function pipeline_test(documents, extra_config) {
   const config5 = await test_config(extra_config);
-  const docs = documents.map(mockCollectedDoc);
+  const docs = documents.map((doc) => mockCollectedDoc(doc));
   await runPipeline22(config5, docs);
   return {
     pluginRoot: config5.pluginDirectory("houdini-svelte"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "The svelte plugin for houdini",
   "keywords": [
     "typescript",
@@ -32,7 +32,7 @@
     "rollup": "^3.7.4",
     "svelte": "^3.55.1",
     "vite": "^4.1.1",
-    "houdini": "^1.0.0"
+    "houdini": "^1.0.2"
   },
   "files": [
     "build"