houdini 1.2.6-next.0 → 1.2.7

package/build/codegen-esm/index.js

@@ -56174,12 +56174,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);
@@ -56551,6 +56548,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,
@@ -56658,9 +56659,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) {
@@ -56668,7 +56666,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;
@@ -56961,11 +56959,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));
@@ -58033,6 +58034,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(
     graphql4.visit(document, {
       FragmentSpread(node) {
@@ -58106,29 +58143,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;
       }
     })
@@ -59952,13 +59974,13 @@ function artifactGenerator(stats) {
       });
     }
     const listOfArtifacts = [];
-    const hash = config2.plugins?.find((plugin2) => plugin2.hash)?.hash ?? hashDocument;
+    const hashPluginBaseRaw = config2.plugins?.find((plugin2) => plugin2.hash)?.hash ?? hashRaw;
     await Promise.all(
       [
         writeIndexFile(config2, docs)
       ].concat(
         docs.map(async (doc) => {
-          const { document, name, generateArtifact, originalParsed, originalString } = doc;
+          const { document, name, generateArtifact, originalParsed } = doc;
           if (!generateArtifact) {
             return;
           }
@@ -60065,7 +60087,7 @@ function artifactGenerator(stats) {
           let artifact = {
             name,
             kind: docKind,
-            hash: hash({ config: config2, document: doc }),
+            hash: "NOT_YET",
             refetch: doc.refetch,
             raw: rawString,
             rootType,
@@ -60092,6 +60114,8 @@ function artifactGenerator(stats) {
             }),
             pluginData: {}
           };
+          const hash_value = hashPluginBaseRaw({ config: config2, document: { ...doc, artifact } });
+          artifact.hash = hash_value;
           applyMask(
             config2,
             artifact.selection,
@@ -60166,11 +60190,10 @@ function artifactGenerator(stats) {
             }
             plugin2.artifactEnd({ config: config2, document: doc });
           }
+          const _houdiniHash = hashOriginal({ document: doc });
           const file = AST5.program([
             moduleExport(config2, "default", serializeValue(artifact)),
-            AST5.expressionStatement(
-              AST5.stringLiteral(`HoudiniHash=${hash({ config: config2, document: doc })}`)
-            )
+            AST5.expressionStatement(AST5.stringLiteral(`HoudiniHash=${_houdiniHash}`))
           ]);
           const artifactPath = config2.artifactPath(document);
           const countDocument = doc.generateStore;
@@ -60187,10 +60210,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);
         })
       )
     );
@@ -61795,39 +61820,36 @@ async function typescriptGenerator(config2, docs) {
 // src/codegen/generators/persistedQueries/index.ts
 var graphql19 = __toESM(require_graphql2(), 1);
 async function persistOutputGenerator(config2, docs) {
-  if (typeof config2.persistedQueryPath !== "string" || config2.persistedQueryPath.length === 0)
-    return;
-  if (!config2.persistedQueryPath.endsWith(".json")) {
-    console.log("Can only write the queryMap to a json file");
-    return;
+  if (!config2.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 = graphql19.print(
-        graphql19.visit(document, {
-          Directive(node) {
-            if (config2.isInternalDirective(node.name.value)) {
-              return null;
-            }
+  const queryMap = docs.reduce((acc, doc) => {
+    const { document, generateArtifact, artifact } = doc;
+    if (!generateArtifact) {
+      return acc;
+    }
+    let rawString = graphql19.print(
+      graphql19.visit(document, {
+        Directive(node) {
+          if (config2.isInternalDirective(node.name.value)) {
+            return null;
           }
-        })
-      );
-      const operations = document.definitions.filter(
-        ({ kind }) => kind === graphql19.Kind.OPERATION_DEFINITION
-      );
-      if (operations.length > 0 && operations[0].kind === "OperationDefinition") {
-        acc[hashDocument({ config: config2, document: rawString })] = rawString;
+        }
+      })
+    );
+    const operations = document.definitions.filter(
+      ({ kind }) => kind === graphql19.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(config2.persistedQueryPath, JSON.stringify(queryMap, null, 4));
+  await fs_exports.writeFile(config2.persistedQueriesPath, JSON.stringify(queryMap, null, 4));
 }
 
 // src/codegen/generators/definitions/enums.ts
@@ -63149,7 +63171,9 @@ async function runPipeline2(config2, docs) {
     total: [],
     changed: [],
     new: [],
-    deleted: []
+    deleted: [],
+    hashSize: [],
+    querySize: []
   };
   const generatePlugins = config2.plugins.filter((plugin2) => plugin2.generate);
   const afterValidate = config2.plugins.filter((plugin2) => plugin2.afterValidate).map((plugin2) => plugin2.afterValidate);
@@ -63162,6 +63186,9 @@ async function runPipeline2(config2, docs) {
       documents: docs2
     })
   );
+  if (!config2.pluginMode && process.env.HOUDINI_TEST !== "true") {
+    console.log("\u{1F3A9} Generating runtime...");
+  }
   let error = null;
   try {
     await runPipeline(
@@ -63208,9 +63235,6 @@ async function runPipeline2(config2, docs) {
     }
     return;
   }
-  if (!config2.pluginMode) {
-    console.log("\u{1F3A9} Generating runtime...");
-  }
   if (error) {
     throw error;
   }
@@ -63235,6 +63259,14 @@ async function runPipeline2(config2, 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(config2) {

package/build/lib/config.d.ts

@@ -12,7 +12,7 @@ export declare class Config {
     projectRoot: string;
     schema: graphql.GraphQLSchema;
     schemaPath?: string;
-    persistedQueryPath?: string;
+    persistedQueriesPath: string;
     exclude: string[];
     scalars?: ConfigFile['scalars'];
     module: 'commonjs' | 'esm';

package/build/lib/graphql.d.ts

@@ -1,9 +1,11 @@
 import * as graphql from 'graphql';
 import type { Document, Config } from '.';
 export declare function getRootType(type: graphql.GraphQLType): graphql.GraphQLType;
-export declare function hashDocument({ document, }: {
-    config: Config;
-    document: string | Document;
+export declare function hashOriginal({ document }: {
+    document: Document;
+}): string;
+export declare function hashRaw({ document }: {
+    document: Document;
 }): string;
 type GraphQLParentType = graphql.GraphQLObjectType | graphql.GraphQLInputObjectType | graphql.GraphQLInterfaceType;
 export declare function parentField(ancestors: readonly any[]): graphql.FieldNode | graphql.InlineFragmentNode | graphql.OperationDefinitionNode | graphql.FragmentDefinitionNode | null;

package/build/lib-cjs/index.js

@@ -53964,11 +53964,11 @@ var require_esprima2 = __commonJS({
                 case "}":
                   regex = false;
                   if (this.values[this.curly - 3] === "function") {
-                    var check2 = this.values[this.curly - 4];
-                    regex = check2 ? !this.beforeFunctionExpression(check2) : false;
+                    var check = this.values[this.curly - 4];
+                    regex = check ? !this.beforeFunctionExpression(check) : false;
                   } else if (this.values[this.curly - 4] === "function") {
-                    var check2 = this.values[this.curly - 5];
-                    regex = check2 ? !this.beforeFunctionExpression(check2) : true;
+                    var check = this.values[this.curly - 5];
+                    regex = check ? !this.beforeFunctionExpression(check) : true;
                   }
                   break;
                 default:
@@ -58493,7 +58493,8 @@ __export(lib_exports, {
   getCurrentConfig: () => getCurrentConfig,
   getMockConfig: () => getMockConfig,
   getRootType: () => getRootType,
-  hashDocument: () => hashDocument,
+  hashOriginal: () => hashOriginal,
+  hashRaw: () => hashRaw,
   houdini_mode: () => houdini_mode,
   isPending: () => isPending,
   keyFieldsForType: () => keyFieldsForType,
@@ -63559,7 +63560,7 @@ var fetch2 = (target) => {
         }
         const fetch3 = ctx.fetch ?? globalThis.fetch;
         const fetchParams2 = {
-          name: ctx.artifact.name,
+          name: ctx.name,
           text: ctx.text,
           hash: ctx.hash,
           variables: marshalVariables2(ctx)
@@ -63615,8 +63616,7 @@ var defaultFetch = (url, params) => {
   };
 };
 function handleMultipart(params, args) {
-  const { clone: clone2, files } = extractFiles({
-    query: params.text,
+  const { files } = extractFiles({
     variables: params.variables
   });
   if (files.size) {
@@ -63629,8 +63629,18 @@ function handleMultipart(params, args) {
       headers = Object.fromEntries(filtered);
     }
     const form = new FormData();
-    const operationJSON = JSON.stringify(clone2);
-    form.set("operations", operationJSON);
+    if (args && args?.body) {
+      form.set("operations", args?.body);
+    } else {
+      form.set(
+        "operations",
+        JSON.stringify({
+          operationName: params.name,
+          query: params.text,
+          variables: params.variables
+        })
+      );
+    }
     const map = {};
     let i2 = 0;
     files.forEach((paths) => {
@@ -65208,12 +65218,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) : `${parent}.${key}`;
+          linkedID = !this.isEmbedded(linkedType, value) ? this.id(linkedType, value) : `${parent}.${key}`;
         }
         let linkChange = linkedID !== previousValue;
         layer.writeLink(parent, key, linkedID);
@@ -65585,6 +65592,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,
@@ -65692,9 +65703,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) {
@@ -65702,7 +65710,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;
@@ -66064,10 +66072,10 @@ var mutation = documentPlugin(ArtifactKind.Mutation, () => {
 });
 
 // src/runtime/client/plugins/subscription.ts
-var check = null;
 function subscription(factory) {
   return documentPlugin(ArtifactKind.Subscription, () => {
     let clearSubscription = null;
+    let check = null;
     return {
       start(ctx, { resolve: resolve2, next, initialValue }) {
         if (typeof globalThis.window === "undefined") {
@@ -66095,8 +66103,8 @@ function subscription(factory) {
         clearSubscription?.();
         clearSubscription = client.subscribe(
           {
-            operationName: ctx.artifact.name,
-            query: ctx.artifact.raw,
+            operationName: ctx.name,
+            query: ctx.text,
             variables: marshalVariables2(ctx)
           },
           {
@@ -66183,8 +66191,8 @@ var fetchParams = (fn = () => ({})) => () => ({
         stuff: ctx.stuff,
         document: ctx.artifact,
         variables: marshalVariables2(ctx),
-        text: ctx.artifact.raw,
-        hash: ctx.artifact.hash
+        text: ctx.text,
+        hash: ctx.hash
       })
     });
   }
@@ -66265,6 +66273,7 @@ var DocumentStore = class extends Writable {
   } = {}) {
     let context = new ClientPluginContextWrapper({
       config: this.#configFile,
+      name: this.artifact.name,
       text: this.artifact.raw,
       hash: this.artifact.hash,
       policy: policy ?? this.artifact.policy,
@@ -66629,7 +66638,7 @@ var Config = class {
   projectRoot;
   schema;
   schemaPath;
-  persistedQueryPath;
+  persistedQueriesPath = "./$houdini/persisted_queries.json";
   exclude;
   scalars;
   module = "esm";
@@ -66681,7 +66690,8 @@ var Config = class {
       logLevel,
       defaultFragmentMasking = "enable",
       watchSchema,
-      projectDir
+      projectDir,
+      persistedQueriesPath
     } = this.configFile;
     if (typeof schema === "string") {
       this.schema = graphql2.buildSchema(schema);
@@ -66718,6 +66728,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;
     }
@@ -67432,11 +67445,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));
@@ -67976,7 +67992,8 @@ async function find_graphql(config, parsedScript, walker) {
   getCurrentConfig,
   getMockConfig,
   getRootType,
-  hashDocument,
+  hashOriginal,
+  hashRaw,
   houdini_mode,
   isPending,
   keyFieldsForType,