houdini 1.0.2 → 1.0.4

package/build/lib-cjs/index.js

@@ -15475,109 +15475,6 @@ var require_minimatch = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/deepmerge@4.2.2/node_modules/deepmerge/dist/cjs.js
-var require_cjs = __commonJS({
-  "../../node_modules/.pnpm/deepmerge@4.2.2/node_modules/deepmerge/dist/cjs.js"(exports, module2) {
-    "use strict";
-    var isMergeableObject = function isMergeableObject2(value) {
-      return isNonNullObject(value) && !isSpecial(value);
-    };
-    function isNonNullObject(value) {
-      return !!value && typeof value === "object";
-    }
-    function isSpecial(value) {
-      var stringValue = Object.prototype.toString.call(value);
-      return stringValue === "[object RegExp]" || stringValue === "[object Date]" || isReactElement(value);
-    }
-    var canUseSymbol = typeof Symbol === "function" && Symbol.for;
-    var REACT_ELEMENT_TYPE = canUseSymbol ? Symbol.for("react.element") : 60103;
-    function isReactElement(value) {
-      return value.$$typeof === REACT_ELEMENT_TYPE;
-    }
-    function emptyTarget(val) {
-      return Array.isArray(val) ? [] : {};
-    }
-    function cloneUnlessOtherwiseSpecified(value, options) {
-      return options.clone !== false && options.isMergeableObject(value) ? deepmerge(emptyTarget(value), value, options) : value;
-    }
-    function defaultArrayMerge(target, source, options) {
-      return target.concat(source).map(function(element) {
-        return cloneUnlessOtherwiseSpecified(element, options);
-      });
-    }
-    function getMergeFunction(key, options) {
-      if (!options.customMerge) {
-        return deepmerge;
-      }
-      var customMerge = options.customMerge(key);
-      return typeof customMerge === "function" ? customMerge : deepmerge;
-    }
-    function getEnumerableOwnPropertySymbols(target) {
-      return Object.getOwnPropertySymbols ? Object.getOwnPropertySymbols(target).filter(function(symbol) {
-        return target.propertyIsEnumerable(symbol);
-      }) : [];
-    }
-    function getKeys(target) {
-      return Object.keys(target).concat(getEnumerableOwnPropertySymbols(target));
-    }
-    function propertyIsOnObject(object, property) {
-      try {
-        return property in object;
-      } catch (_) {
-        return false;
-      }
-    }
-    function propertyIsUnsafe(target, key) {
-      return propertyIsOnObject(target, key) && !(Object.hasOwnProperty.call(target, key) && Object.propertyIsEnumerable.call(target, key));
-    }
-    function mergeObject(target, source, options) {
-      var destination = {};
-      if (options.isMergeableObject(target)) {
-        getKeys(target).forEach(function(key) {
-          destination[key] = cloneUnlessOtherwiseSpecified(target[key], options);
-        });
-      }
-      getKeys(source).forEach(function(key) {
-        if (propertyIsUnsafe(target, key)) {
-          return;
-        }
-        if (propertyIsOnObject(target, key) && options.isMergeableObject(source[key])) {
-          destination[key] = getMergeFunction(key, options)(target[key], source[key], options);
-        } else {
-          destination[key] = cloneUnlessOtherwiseSpecified(source[key], options);
-        }
-      });
-      return destination;
-    }
-    function deepmerge(target, source, options) {
-      options = options || {};
-      options.arrayMerge = options.arrayMerge || defaultArrayMerge;
-      options.isMergeableObject = options.isMergeableObject || isMergeableObject;
-      options.cloneUnlessOtherwiseSpecified = cloneUnlessOtherwiseSpecified;
-      var sourceIsArray = Array.isArray(source);
-      var targetIsArray = Array.isArray(target);
-      var sourceAndTargetTypesMatch = sourceIsArray === targetIsArray;
-      if (!sourceAndTargetTypesMatch) {
-        return cloneUnlessOtherwiseSpecified(source, options);
-      } else if (sourceIsArray) {
-        return options.arrayMerge(target, source, options);
-      } else {
-        return mergeObject(target, source, options);
-      }
-    }
-    deepmerge.all = function deepmergeAll(array, options) {
-      if (!Array.isArray(array)) {
-        throw new Error("first argument should be an array");
-      }
-      return array.reduce(function(prev, next) {
-        return deepmerge(prev, next, options);
-      }, {});
-    };
-    var deepmerge_1 = deepmerge;
-    module2.exports = deepmerge_1;
-  }
-});
-
 // ../../node_modules/.pnpm/universalify@2.0.0/node_modules/universalify/index.js
 var require_universalify = __commonJS({
   "../../node_modules/.pnpm/universalify@2.0.0/node_modules/universalify/index.js"(exports) {
@@ -54000,11 +53897,11 @@ var require_esprima2 = __commonJS({
                 case "}":
                   regex = false;
                   if (this.values[this.curly - 3] === "function") {
-                    var check = this.values[this.curly - 4];
-                    regex = check ? !this.beforeFunctionExpression(check) : false;
+                    var check2 = this.values[this.curly - 4];
+                    regex = check2 ? !this.beforeFunctionExpression(check2) : false;
                   } else if (this.values[this.curly - 4] === "function") {
-                    var check = this.values[this.curly - 5];
-                    regex = check ? !this.beforeFunctionExpression(check) : true;
+                    var check2 = this.values[this.curly - 5];
+                    regex = check2 ? !this.beforeFunctionExpression(check2) : true;
                   }
                   break;
                 default:
@@ -58387,6 +58284,109 @@ var require_main2 = __commonJS({
   }
 });
 
+// ../../node_modules/.pnpm/deepmerge@4.2.2/node_modules/deepmerge/dist/cjs.js
+var require_cjs = __commonJS({
+  "../../node_modules/.pnpm/deepmerge@4.2.2/node_modules/deepmerge/dist/cjs.js"(exports, module2) {
+    "use strict";
+    var isMergeableObject = function isMergeableObject2(value) {
+      return isNonNullObject(value) && !isSpecial(value);
+    };
+    function isNonNullObject(value) {
+      return !!value && typeof value === "object";
+    }
+    function isSpecial(value) {
+      var stringValue = Object.prototype.toString.call(value);
+      return stringValue === "[object RegExp]" || stringValue === "[object Date]" || isReactElement(value);
+    }
+    var canUseSymbol = typeof Symbol === "function" && Symbol.for;
+    var REACT_ELEMENT_TYPE = canUseSymbol ? Symbol.for("react.element") : 60103;
+    function isReactElement(value) {
+      return value.$$typeof === REACT_ELEMENT_TYPE;
+    }
+    function emptyTarget(val) {
+      return Array.isArray(val) ? [] : {};
+    }
+    function cloneUnlessOtherwiseSpecified(value, options) {
+      return options.clone !== false && options.isMergeableObject(value) ? deepmerge(emptyTarget(value), value, options) : value;
+    }
+    function defaultArrayMerge(target, source, options) {
+      return target.concat(source).map(function(element) {
+        return cloneUnlessOtherwiseSpecified(element, options);
+      });
+    }
+    function getMergeFunction(key, options) {
+      if (!options.customMerge) {
+        return deepmerge;
+      }
+      var customMerge = options.customMerge(key);
+      return typeof customMerge === "function" ? customMerge : deepmerge;
+    }
+    function getEnumerableOwnPropertySymbols(target) {
+      return Object.getOwnPropertySymbols ? Object.getOwnPropertySymbols(target).filter(function(symbol) {
+        return target.propertyIsEnumerable(symbol);
+      }) : [];
+    }
+    function getKeys(target) {
+      return Object.keys(target).concat(getEnumerableOwnPropertySymbols(target));
+    }
+    function propertyIsOnObject(object, property) {
+      try {
+        return property in object;
+      } catch (_) {
+        return false;
+      }
+    }
+    function propertyIsUnsafe(target, key) {
+      return propertyIsOnObject(target, key) && !(Object.hasOwnProperty.call(target, key) && Object.propertyIsEnumerable.call(target, key));
+    }
+    function mergeObject(target, source, options) {
+      var destination = {};
+      if (options.isMergeableObject(target)) {
+        getKeys(target).forEach(function(key) {
+          destination[key] = cloneUnlessOtherwiseSpecified(target[key], options);
+        });
+      }
+      getKeys(source).forEach(function(key) {
+        if (propertyIsUnsafe(target, key)) {
+          return;
+        }
+        if (propertyIsOnObject(target, key) && options.isMergeableObject(source[key])) {
+          destination[key] = getMergeFunction(key, options)(target[key], source[key], options);
+        } else {
+          destination[key] = cloneUnlessOtherwiseSpecified(source[key], options);
+        }
+      });
+      return destination;
+    }
+    function deepmerge(target, source, options) {
+      options = options || {};
+      options.arrayMerge = options.arrayMerge || defaultArrayMerge;
+      options.isMergeableObject = options.isMergeableObject || isMergeableObject;
+      options.cloneUnlessOtherwiseSpecified = cloneUnlessOtherwiseSpecified;
+      var sourceIsArray = Array.isArray(source);
+      var targetIsArray = Array.isArray(target);
+      var sourceAndTargetTypesMatch = sourceIsArray === targetIsArray;
+      if (!sourceAndTargetTypesMatch) {
+        return cloneUnlessOtherwiseSpecified(source, options);
+      } else if (sourceIsArray) {
+        return options.arrayMerge(target, source, options);
+      } else {
+        return mergeObject(target, source, options);
+      }
+    }
+    deepmerge.all = function deepmergeAll(array, options) {
+      if (!Array.isArray(array)) {
+        throw new Error("first argument should be an array");
+      }
+      return array.reduce(function(prev, next) {
+        return deepmerge(prev, next, options);
+      }, {});
+    };
+    var deepmerge_1 = deepmerge;
+    module2.exports = deepmerge_1;
+  }
+});
+
 // src/lib/index.ts
 var lib_exports = {};
 __export(lib_exports, {
@@ -61900,9 +61900,6 @@ var houdini_mode = {
   }
 };
 
-// src/lib/deepMerge.ts
-var import_deepmerge = __toESM(require_cjs(), 1);
-
 // src/lib/error.ts
 var HoudiniError = class extends Error {
   filepath = null;
@@ -61922,20 +61919,6 @@ var HoudiniError = class extends Error {
   }
 };
 
-// src/lib/deepMerge.ts
-function deepMerge(filepath, ...targets) {
-  try {
-    if (targets.length === 1) {
-      return targets[0];
-    } else if (targets.length === 2) {
-      return (0, import_deepmerge.default)(targets[0], targets[1]);
-    }
-    return deepMerge(filepath, targets[0], deepMerge(filepath, ...targets.slice(1)));
-  } catch (e2) {
-    throw new HoudiniError({ filepath, message: "could not merge: " + targets });
-  }
-}
-
 // src/lib/fs.ts
 var fs_exports = {};
 __export(fs_exports, {
@@ -63489,14 +63472,14 @@ function flatten(source) {
 var fetch2 = (target) => {
   return () => {
     return {
-      async network(ctx, { client, resolve: resolve2, marshalVariables: marshalVariables2 }) {
+      async network(ctx, { client: client2, resolve: resolve2, marshalVariables: marshalVariables2 }) {
         const fetch3 = ctx.fetch ?? globalThis.fetch;
         const fetchParams2 = {
           text: ctx.text,
           hash: ctx.hash,
           variables: marshalVariables2(ctx)
         };
-        let fetchFn = defaultFetch(client.url, ctx.fetchParams);
+        let fetchFn = defaultFetch(client2.url, ctx.fetchParams);
         if (target) {
           if (typeof target === "string") {
             fetchFn = defaultFetch(target, ctx.fetchParams);
@@ -65675,11 +65658,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 socketClient = null;
-    let check = null;
     return {
       start(ctx, { resolve: resolve2, next, initialValue }) {
         if (typeof globalThis.window === "undefined") {
@@ -65688,7 +65670,7 @@ function subscription(factory) {
         }
         next(ctx);
       },
-      network(ctx, { resolve: resolve2, initialValue, variablesChanged: variablesChanged2, marshalVariables: marshalVariables2 }) {
+      async network(ctx, { resolve: resolve2, initialValue, variablesChanged: variablesChanged2, marshalVariables: marshalVariables2 }) {
         const checkValue = {
           fetchParams: ctx.fetchParams ?? {},
           session: ctx.session ?? {},
@@ -65701,11 +65683,11 @@ function subscription(factory) {
           return;
         }
         check = checkValue;
-        clearSubscription?.();
-        if (!socketClient || sessionChange) {
-          socketClient = factory(ctx);
+        if (sessionChange) {
+          await loadClient(ctx, factory);
         }
-        clearSubscription = socketClient.subscribe(
+        clearSubscription?.();
+        clearSubscription = client.subscribe(
           {
             query: ctx.artifact.raw,
             variables: marshalVariables2(ctx)
@@ -65745,6 +65727,19 @@ function subscription(factory) {
     };
   });
 }
+var pendingCreate = null;
+var client;
+function loadClient(ctx, factory) {
+  if (pendingCreate) {
+    return pendingCreate;
+  }
+  pendingCreate = new Promise((resolve2) => {
+    client = factory(ctx);
+    resolve2();
+    pendingCreate = null;
+  });
+  return pendingCreate;
+}
 
 // src/runtime/client/plugins/throwOnError.ts
 var throwOnError = ({ operations, error }) => () => {
@@ -65803,7 +65798,7 @@ var DocumentStore = class extends Writable {
     artifact,
     plugins: plugins2,
     pipeline: pipeline2,
-    client,
+    client: client2,
     cache = true,
     initialValue,
     fetching
@@ -65821,13 +65816,11 @@ var DocumentStore = class extends Writable {
     super(initialState, () => {
       return () => {
         this.#lastVariables = null;
-        for (const plugin2 of this.#plugins) {
-          plugin2.cleanup?.(this.#lastContext);
-        }
+        this.cleanup();
       };
     });
     this.#artifact = artifact;
-    this.#client = client;
+    this.#client = client2;
     this.#lastVariables = null;
     this.#configFile = getCurrentConfig();
     this.#plugins = pipeline2 ?? [
@@ -65889,6 +65882,11 @@ var DocumentStore = class extends Writable {
       this.#step("forward", state);
     });
   }
+  async cleanup() {
+    for (const plugin2 of this.#plugins) {
+      plugin2.cleanup?.(this.#lastContext);
+    }
+  }
   #step(direction, ctx, value) {
     const hook = direction === "error" ? "catch" : steps[direction][ctx.currentStep];
     let valid = (i2) => i2 <= this.#plugins.length;
@@ -66739,11 +66737,12 @@ async function getConfig({
     for (const plugin2 of plugins2) {
       if (plugin2.config) {
         try {
-          const configFactory = await import(plugin2.config);
-          const newValue = typeof configFactory === "function" ? configFactory(configFile) : configFactory;
-          configFile = deepMerge(configPath, configFile, newValue);
+          const configFactory = (await import(plugin2.config)).default;
+          if (configFactory) {
+            configFile = typeof configFactory === "function" ? configFactory(configFile) : configFactory;
+          }
         } catch {
-          console.log("could not load config file" + plugin2.config);
+          console.log("could not load config file " + plugin2.config);
         }
       }
     }
@@ -67151,6 +67150,21 @@ async function cleanupFiles(pathFolder, listOfObj) {
   return allFilesNotInList;
 }
 
+// src/lib/deepMerge.ts
+var import_deepmerge = __toESM(require_cjs(), 1);
+function deepMerge(filepath, ...targets) {
+  try {
+    if (targets.length === 1) {
+      return targets[0];
+    } else if (targets.length === 2) {
+      return (0, import_deepmerge.default)(targets[0], targets[1]);
+    }
+    return deepMerge(filepath, targets[0], deepMerge(filepath, ...targets.slice(1)));
+  } catch (e2) {
+    throw new HoudiniError({ filepath, message: "could not merge: " + targets });
+  }
+}
+
 // ../../node_modules/.pnpm/estree-walker@3.0.1/node_modules/estree-walker/src/walker.js
 var WalkerBase = class {
   constructor() {