houdini 1.2.6-next.0 → 1.2.7

package/build/vite-cjs/index.js

@@ -68562,12 +68562,9 @@ var CacheInternal = class {
             );
           }
         }
-        const embedded = this.idFields(linkedType)?.filter(
-          (field2) => typeof value[field2] === "undefined"
-        ).length > 0;
         let linkedID = null;
         if (value !== null) {
-          linkedID = !embedded ? this.id(linkedType, value) : `${parent2}.${key}`;
+          linkedID = !this.isEmbedded(linkedType, value) ? this.id(linkedType, value) : `${parent2}.${key}`;
         }
         let linkChange = linkedID !== previousValue;
         layer.writeLink(parent2, key, linkedID);
@@ -68939,6 +68936,10 @@ var CacheInternal = class {
   computeID(type, data) {
     return computeID(this.config, type, data);
   }
+  isEmbedded(linkedType, value) {
+    const idFields = this.idFields(linkedType);
+    return idFields.length === 0 || idFields.filter((field) => typeof value[field] === "undefined").length > 0;
+  }
   hydrateNestedList({
     fields,
     variables,
@@ -69046,9 +69047,6 @@ var CacheInternal = class {
       }
       const entryObj = entry;
       let linkedID = `${recordID}.${key}[${this.storage.nextRank}]`;
-      const embedded = this.idFields(linkedType)?.filter(
-        (field) => typeof entry[field] === "undefined"
-      ).length > 0;
       let innerType = linkedType;
       const typename = entryObj.__typename;
       if (typename) {
@@ -69056,7 +69054,7 @@ var CacheInternal = class {
       } else if (abstract) {
         throw new Error("Encountered interface type without __typename in the payload");
       }
-      if (!embedded) {
+      if (!this.isEmbedded(linkedType, entry)) {
         const id = this.id(innerType, entry);
         if (id) {
           linkedID = id;
@@ -69340,7 +69338,7 @@ var Config = class {
   projectRoot;
   schema;
   schemaPath;
-  persistedQueryPath;
+  persistedQueriesPath = "./$houdini/persisted_queries.json";
   exclude;
   scalars;
   module = "esm";
@@ -69392,7 +69390,8 @@ var Config = class {
       logLevel,
       defaultFragmentMasking = "enable",
       watchSchema,
-      projectDir
+      projectDir,
+      persistedQueriesPath
     } = this.configFile;
     if (typeof schema === "string") {
       this.schema = graphql2.buildSchema(schema);
@@ -69429,6 +69428,9 @@ var Config = class {
     this.schemaPollHeaders = watchSchema?.headers ?? {};
     this.rootDir = join2(this.projectRoot, "$houdini");
     this.#fragmentVariableMaps = {};
+    if (persistedQueriesPath) {
+      this.persistedQueriesPath = persistedQueriesPath;
+    }
     if (defaultKeys) {
       this.defaultKeys = defaultKeys;
     }
@@ -70143,11 +70145,14 @@ function getRootType(type) {
   }
   return type;
 }
-function hashDocument({
-  document
-}) {
-  const docString = typeof document === "string" ? document : document.originalString;
-  return import_node_crypto.default.createHash("sha256").update(docString ?? "").digest("hex");
+function hashOriginal({ document }) {
+  return hashDocument(document.originalString);
+}
+function hashRaw({ document }) {
+  return hashDocument(document.artifact?.raw);
+}
+function hashDocument(str) {
+  return import_node_crypto.default.createHash("sha256").update(str || "").digest("hex");
 }
 function parentField(ancestors) {
   return walkParentField([...ancestors].sort(() => -1));
@@ -71233,6 +71238,42 @@ function inlineFragmentArgs({
     filepath,
     document
   ).reduce((acc, arg) => ({ ...acc, [arg.name]: arg }), {});
+  const modifyValue = (node) => {
+    if (node.kind == "ObjectValue") {
+      return {
+        ...node,
+        fields: node.fields.map((field) => {
+          const modifiedValue = modifyValue(field.value);
+          if (!modifiedValue)
+            return null;
+          return {
+            ...field,
+            value: modifyValue(field.value)
+          };
+        })
+      };
+    }
+    if (node.kind !== "Variable") {
+      return node;
+    }
+    if (!scope) {
+      throw new HoudiniError({
+        filepath,
+        message: node.name.value + " is not defined in the current scope: " + JSON.stringify(scope)
+      });
+    }
+    const newValue = scope[node.name.value];
+    if (newValue) {
+      return newValue;
+    }
+    if (definitionArgs[node.name.value] && definitionArgs[node.name.value].required) {
+      throw new HoudiniError({
+        filepath,
+        message: "Missing value for required arg: " + node.name.value
+      });
+    }
+    return null;
+  };
   const result = esm_default(
     graphql5.visit(document, {
       FragmentSpread(node) {
@@ -71306,29 +71347,14 @@ function inlineFragmentArgs({
         }
       },
       Argument(node) {
-        const value = node.value;
-        if (value.kind !== "Variable") {
-          return;
-        }
-        if (!scope) {
-          throw new HoudiniError({
-            filepath,
-            message: node.name.value + " is not defined in the current scope: " + JSON.stringify(scope)
-          });
-        }
-        const newValue = scope[value.name.value];
+        let value = node.value;
+        const newValue = modifyValue(value);
         if (newValue) {
           return {
             ...node,
             value: newValue
           };
         }
-        if (definitionArgs[value.name.value] && definitionArgs[value.name.value].required) {
-          throw new HoudiniError({
-            filepath,
-            message: "Missing value for required arg: " + value.name.value
-          });
-        }
         return null;
       }
     })
@@ -73158,13 +73184,13 @@ function artifactGenerator(stats) {
       });
     }
     const listOfArtifacts = [];
-    const hash = config4.plugins?.find((plugin2) => plugin2.hash)?.hash ?? hashDocument;
+    const hashPluginBaseRaw = config4.plugins?.find((plugin2) => plugin2.hash)?.hash ?? hashRaw;
     await Promise.all(
       [
         writeIndexFile(config4, docs)
       ].concat(
         docs.map(async (doc) => {
-          const { document, name, generateArtifact, originalParsed, originalString } = doc;
+          const { document, name, generateArtifact, originalParsed } = doc;
           if (!generateArtifact) {
             return;
           }
@@ -73271,7 +73297,7 @@ function artifactGenerator(stats) {
           let artifact = {
             name,
             kind: docKind,
-            hash: hash({ config: config4, document: doc }),
+            hash: "NOT_YET",
             refetch: doc.refetch,
             raw: rawString,
             rootType,
@@ -73298,6 +73324,8 @@ function artifactGenerator(stats) {
             }),
             pluginData: {}
           };
+          const hash_value = hashPluginBaseRaw({ config: config4, document: { ...doc, artifact } });
+          artifact.hash = hash_value;
           applyMask(
             config4,
             artifact.selection,
@@ -73372,11 +73400,10 @@ function artifactGenerator(stats) {
             }
             plugin2.artifactEnd({ config: config4, document: doc });
           }
+          const _houdiniHash = hashOriginal({ document: doc });
           const file = AST5.program([
             moduleExport(config4, "default", serializeValue(artifact)),
-            AST5.expressionStatement(
-              AST5.stringLiteral(`HoudiniHash=${hash({ config: config4, document: doc })}`)
-            )
+            AST5.expressionStatement(AST5.stringLiteral(`HoudiniHash=${_houdiniHash}`))
           ]);
           const artifactPath = config4.artifactPath(document);
           const countDocument = doc.generateStore;
@@ -73393,10 +73420,12 @@ function artifactGenerator(stats) {
             return;
           }
           const match = existingArtifact && existingArtifact.match(/"HoudiniHash=(\w+)"/);
-          if (match && match[1] !== artifact.hash) {
+          if (match && match[1] !== _houdiniHash) {
             stats.changed.push(artifact.name);
           }
           stats.total.push(artifact.name);
+          stats.hashSize.push(artifact.hash.length);
+          stats.querySize.push(artifact.raw.length);
         })
       )
     );
@@ -75001,39 +75030,36 @@ async function typescriptGenerator(config4, docs) {
 // src/codegen/generators/persistedQueries/index.ts
 var graphql20 = __toESM(require_graphql2(), 1);
 async function persistOutputGenerator(config4, docs) {
-  if (typeof config4.persistedQueryPath !== "string" || config4.persistedQueryPath.length === 0)
-    return;
-  if (!config4.persistedQueryPath.endsWith(".json")) {
-    console.log("Can only write the queryMap to a json file");
-    return;
+  if (!config4.persistedQueriesPath.endsWith(".json")) {
+    throw new Error('Can write Persisted Queries only in a ".json" file.');
   }
-  const queryMap = docs.reduce(
-    (acc, { document, generateArtifact }) => {
-      if (!generateArtifact) {
-        return acc;
-      }
-      let rawString = graphql20.print(
-        graphql20.visit(document, {
-          Directive(node) {
-            if (config4.isInternalDirective(node.name.value)) {
-              return null;
-            }
+  const queryMap = docs.reduce((acc, doc) => {
+    const { document, generateArtifact, artifact } = doc;
+    if (!generateArtifact) {
+      return acc;
+    }
+    let rawString = graphql20.print(
+      graphql20.visit(document, {
+        Directive(node) {
+          if (config4.isInternalDirective(node.name.value)) {
+            return null;
           }
-        })
-      );
-      const operations = document.definitions.filter(
-        ({ kind }) => kind === graphql20.Kind.OPERATION_DEFINITION
-      );
-      if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
-        acc[hashDocument({ config: config4, document: rawString })] = rawString;
+        }
+      })
+    );
+    const operations = document.definitions.filter(
+      ({ kind }) => kind === graphql20.Kind.OPERATION_DEFINITION
+    );
+    if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
+      if (artifact) {
+        acc[artifact.hash] = rawString;
       }
-      return acc;
-    },
-    {}
-  );
+    }
+    return acc;
+  }, {});
   if (Object.keys(queryMap).length === 0)
     return;
-  await fs_exports.writeFile(config4.persistedQueryPath, JSON.stringify(queryMap, null, 4));
+  await fs_exports.writeFile(config4.persistedQueriesPath, JSON.stringify(queryMap, null, 4));
 }
 
 // src/codegen/generators/definitions/enums.ts
@@ -76355,7 +76381,9 @@ async function runPipeline2(config4, docs) {
     total: [],
     changed: [],
     new: [],
-    deleted: []
+    deleted: [],
+    hashSize: [],
+    querySize: []
   };
   const generatePlugins = config4.plugins.filter((plugin2) => plugin2.generate);
   const afterValidate = config4.plugins.filter((plugin2) => plugin2.afterValidate).map((plugin2) => plugin2.afterValidate);
@@ -76368,6 +76396,9 @@ async function runPipeline2(config4, docs) {
       documents: docs2
     })
   );
+  if (!config4.pluginMode && process.env.HOUDINI_TEST !== "true") {
+    console.log("\u{1F3A9} Generating runtime...");
+  }
   let error = null;
   try {
     await runPipeline(
@@ -76414,9 +76445,6 @@ async function runPipeline2(config4, docs) {
     }
     return;
   }
-  if (!config4.pluginMode) {
-    console.log("\u{1F3A9} Generating runtime...");
-  }
   if (error) {
     throw error;
   }
@@ -76441,6 +76469,14 @@ async function runPipeline2(config4, docs) {
       }
       console.log(`${emoji} ${artifact}`);
     }
+    console.log(``);
+    console.log(`\u{1FA84}  Total: ${artifactStats.total.length}`);
+    const format = (val) => {
+      return `${(val / 1024).toFixed(1)} kb`;
+    };
+    const hashSize = format(artifactStats.hashSize.reduce((acc, val) => acc + val, 0));
+    const querySize = format(artifactStats.querySize.reduce((acc, val) => acc + val, 0));
+    console.log(`\u{1FAB6}  Network request size: ${querySize} (pesisted: ${hashSize})`);
   }
 }
 async function collectDocuments(config4) {

package/build/vite-esm/index.js

@@ -68557,12 +68557,9 @@ var CacheInternal = class {
             );
           }
         }
-        const embedded = this.idFields(linkedType)?.filter(
-          (field2) => typeof value[field2] === "undefined"
-        ).length > 0;
         let linkedID = null;
         if (value !== null) {
-          linkedID = !embedded ? this.id(linkedType, value) : `${parent2}.${key}`;
+          linkedID = !this.isEmbedded(linkedType, value) ? this.id(linkedType, value) : `${parent2}.${key}`;
         }
         let linkChange = linkedID !== previousValue;
         layer.writeLink(parent2, key, linkedID);
@@ -68934,6 +68931,10 @@ var CacheInternal = class {
   computeID(type, data) {
     return computeID(this.config, type, data);
   }
+  isEmbedded(linkedType, value) {
+    const idFields = this.idFields(linkedType);
+    return idFields.length === 0 || idFields.filter((field) => typeof value[field] === "undefined").length > 0;
+  }
   hydrateNestedList({
     fields,
     variables,
@@ -69041,9 +69042,6 @@ var CacheInternal = class {
       }
       const entryObj = entry;
       let linkedID = `${recordID}.${key}[${this.storage.nextRank}]`;
-      const embedded = this.idFields(linkedType)?.filter(
-        (field) => typeof entry[field] === "undefined"
-      ).length > 0;
       let innerType = linkedType;
       const typename = entryObj.__typename;
       if (typename) {
@@ -69051,7 +69049,7 @@ var CacheInternal = class {
       } else if (abstract) {
         throw new Error("Encountered interface type without __typename in the payload");
       }
-      if (!embedded) {
+      if (!this.isEmbedded(linkedType, entry)) {
         const id = this.id(innerType, entry);
         if (id) {
           linkedID = id;
@@ -69334,7 +69332,7 @@ var Config = class {
   projectRoot;
   schema;
   schemaPath;
-  persistedQueryPath;
+  persistedQueriesPath = "./$houdini/persisted_queries.json";
   exclude;
   scalars;
   module = "esm";
@@ -69386,7 +69384,8 @@ var Config = class {
       logLevel,
       defaultFragmentMasking = "enable",
       watchSchema,
-      projectDir
+      projectDir,
+      persistedQueriesPath
     } = this.configFile;
     if (typeof schema === "string") {
       this.schema = graphql2.buildSchema(schema);
@@ -69423,6 +69422,9 @@ var Config = class {
     this.schemaPollHeaders = watchSchema?.headers ?? {};
     this.rootDir = join2(this.projectRoot, "$houdini");
     this.#fragmentVariableMaps = {};
+    if (persistedQueriesPath) {
+      this.persistedQueriesPath = persistedQueriesPath;
+    }
     if (defaultKeys) {
       this.defaultKeys = defaultKeys;
     }
@@ -70137,11 +70139,14 @@ function getRootType(type) {
   }
   return type;
 }
-function hashDocument({
-  document
-}) {
-  const docString = typeof document === "string" ? document : document.originalString;
-  return crypto.createHash("sha256").update(docString ?? "").digest("hex");
+function hashOriginal({ document }) {
+  return hashDocument(document.originalString);
+}
+function hashRaw({ document }) {
+  return hashDocument(document.artifact?.raw);
+}
+function hashDocument(str) {
+  return crypto.createHash("sha256").update(str || "").digest("hex");
 }
 function parentField(ancestors) {
   return walkParentField([...ancestors].sort(() => -1));
@@ -71227,6 +71232,42 @@ function inlineFragmentArgs({
     filepath,
     document
   ).reduce((acc, arg) => ({ ...acc, [arg.name]: arg }), {});
+  const modifyValue = (node) => {
+    if (node.kind == "ObjectValue") {
+      return {
+        ...node,
+        fields: node.fields.map((field) => {
+          const modifiedValue = modifyValue(field.value);
+          if (!modifiedValue)
+            return null;
+          return {
+            ...field,
+            value: modifyValue(field.value)
+          };
+        })
+      };
+    }
+    if (node.kind !== "Variable") {
+      return node;
+    }
+    if (!scope) {
+      throw new HoudiniError({
+        filepath,
+        message: node.name.value + " is not defined in the current scope: " + JSON.stringify(scope)
+      });
+    }
+    const newValue = scope[node.name.value];
+    if (newValue) {
+      return newValue;
+    }
+    if (definitionArgs[node.name.value] && definitionArgs[node.name.value].required) {
+      throw new HoudiniError({
+        filepath,
+        message: "Missing value for required arg: " + node.name.value
+      });
+    }
+    return null;
+  };
   const result = esm_default(
     graphql5.visit(document, {
       FragmentSpread(node) {
@@ -71300,29 +71341,14 @@ function inlineFragmentArgs({
         }
       },
       Argument(node) {
-        const value = node.value;
-        if (value.kind !== "Variable") {
-          return;
-        }
-        if (!scope) {
-          throw new HoudiniError({
-            filepath,
-            message: node.name.value + " is not defined in the current scope: " + JSON.stringify(scope)
-          });
-        }
-        const newValue = scope[value.name.value];
+        let value = node.value;
+        const newValue = modifyValue(value);
         if (newValue) {
           return {
             ...node,
             value: newValue
           };
         }
-        if (definitionArgs[value.name.value] && definitionArgs[value.name.value].required) {
-          throw new HoudiniError({
-            filepath,
-            message: "Missing value for required arg: " + value.name.value
-          });
-        }
         return null;
       }
     })
@@ -73152,13 +73178,13 @@ function artifactGenerator(stats) {
       });
     }
     const listOfArtifacts = [];
-    const hash = config4.plugins?.find((plugin2) => plugin2.hash)?.hash ?? hashDocument;
+    const hashPluginBaseRaw = config4.plugins?.find((plugin2) => plugin2.hash)?.hash ?? hashRaw;
     await Promise.all(
       [
         writeIndexFile(config4, docs)
       ].concat(
         docs.map(async (doc) => {
-          const { document, name, generateArtifact, originalParsed, originalString } = doc;
+          const { document, name, generateArtifact, originalParsed } = doc;
           if (!generateArtifact) {
             return;
           }
@@ -73265,7 +73291,7 @@ function artifactGenerator(stats) {
           let artifact = {
             name,
             kind: docKind,
-            hash: hash({ config: config4, document: doc }),
+            hash: "NOT_YET",
             refetch: doc.refetch,
             raw: rawString,
             rootType,
@@ -73292,6 +73318,8 @@ function artifactGenerator(stats) {
             }),
             pluginData: {}
           };
+          const hash_value = hashPluginBaseRaw({ config: config4, document: { ...doc, artifact } });
+          artifact.hash = hash_value;
           applyMask(
             config4,
             artifact.selection,
@@ -73366,11 +73394,10 @@ function artifactGenerator(stats) {
             }
             plugin2.artifactEnd({ config: config4, document: doc });
           }
+          const _houdiniHash = hashOriginal({ document: doc });
           const file = AST5.program([
             moduleExport(config4, "default", serializeValue(artifact)),
-            AST5.expressionStatement(
-              AST5.stringLiteral(`HoudiniHash=${hash({ config: config4, document: doc })}`)
-            )
+            AST5.expressionStatement(AST5.stringLiteral(`HoudiniHash=${_houdiniHash}`))
           ]);
           const artifactPath = config4.artifactPath(document);
           const countDocument = doc.generateStore;
@@ -73387,10 +73414,12 @@ function artifactGenerator(stats) {
             return;
           }
           const match = existingArtifact && existingArtifact.match(/"HoudiniHash=(\w+)"/);
-          if (match && match[1] !== artifact.hash) {
+          if (match && match[1] !== _houdiniHash) {
             stats.changed.push(artifact.name);
           }
           stats.total.push(artifact.name);
+          stats.hashSize.push(artifact.hash.length);
+          stats.querySize.push(artifact.raw.length);
         })
       )
     );
@@ -74995,39 +75024,36 @@ async function typescriptGenerator(config4, docs) {
 // src/codegen/generators/persistedQueries/index.ts
 var graphql20 = __toESM(require_graphql2(), 1);
 async function persistOutputGenerator(config4, docs) {
-  if (typeof config4.persistedQueryPath !== "string" || config4.persistedQueryPath.length === 0)
-    return;
-  if (!config4.persistedQueryPath.endsWith(".json")) {
-    console.log("Can only write the queryMap to a json file");
-    return;
+  if (!config4.persistedQueriesPath.endsWith(".json")) {
+    throw new Error('Can write Persisted Queries only in a ".json" file.');
   }
-  const queryMap = docs.reduce(
-    (acc, { document, generateArtifact }) => {
-      if (!generateArtifact) {
-        return acc;
-      }
-      let rawString = graphql20.print(
-        graphql20.visit(document, {
-          Directive(node) {
-            if (config4.isInternalDirective(node.name.value)) {
-              return null;
-            }
+  const queryMap = docs.reduce((acc, doc) => {
+    const { document, generateArtifact, artifact } = doc;
+    if (!generateArtifact) {
+      return acc;
+    }
+    let rawString = graphql20.print(
+      graphql20.visit(document, {
+        Directive(node) {
+          if (config4.isInternalDirective(node.name.value)) {
+            return null;
           }
-        })
-      );
-      const operations = document.definitions.filter(
-        ({ kind }) => kind === graphql20.Kind.OPERATION_DEFINITION
-      );
-      if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
-        acc[hashDocument({ config: config4, document: rawString })] = rawString;
+        }
+      })
+    );
+    const operations = document.definitions.filter(
+      ({ kind }) => kind === graphql20.Kind.OPERATION_DEFINITION
+    );
+    if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
+      if (artifact) {
+        acc[artifact.hash] = rawString;
       }
-      return acc;
-    },
-    {}
-  );
+    }
+    return acc;
+  }, {});
   if (Object.keys(queryMap).length === 0)
     return;
-  await fs_exports.writeFile(config4.persistedQueryPath, JSON.stringify(queryMap, null, 4));
+  await fs_exports.writeFile(config4.persistedQueriesPath, JSON.stringify(queryMap, null, 4));
 }
 
 // src/codegen/generators/definitions/enums.ts
@@ -76349,7 +76375,9 @@ async function runPipeline2(config4, docs) {
     total: [],
     changed: [],
     new: [],
-    deleted: []
+    deleted: [],
+    hashSize: [],
+    querySize: []
   };
   const generatePlugins = config4.plugins.filter((plugin2) => plugin2.generate);
   const afterValidate = config4.plugins.filter((plugin2) => plugin2.afterValidate).map((plugin2) => plugin2.afterValidate);
@@ -76362,6 +76390,9 @@ async function runPipeline2(config4, docs) {
       documents: docs2
     })
   );
+  if (!config4.pluginMode && process.env.HOUDINI_TEST !== "true") {
+    console.log("\u{1F3A9} Generating runtime...");
+  }
   let error = null;
   try {
     await runPipeline(
@@ -76408,9 +76439,6 @@ async function runPipeline2(config4, docs) {
     }
     return;
   }
-  if (!config4.pluginMode) {
-    console.log("\u{1F3A9} Generating runtime...");
-  }
   if (error) {
     throw error;
   }
@@ -76435,6 +76463,14 @@ async function runPipeline2(config4, docs) {
       }
       console.log(`${emoji} ${artifact}`);
     }
+    console.log(``);
+    console.log(`\u{1FA84}  Total: ${artifactStats.total.length}`);
+    const format = (val) => {
+      return `${(val / 1024).toFixed(1)} kb`;
+    };
+    const hashSize = format(artifactStats.hashSize.reduce((acc, val) => acc + val, 0));
+    const querySize = format(artifactStats.querySize.reduce((acc, val) => acc + val, 0));
+    console.log(`\u{1FAB6}  Network request size: ${querySize} (pesisted: ${hashSize})`);
   }
 }
 async function collectDocuments(config4) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "1.2.6-next.0",
+  "version": "1.2.7",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",