houdini-svelte 2.1.10 → 2.1.12

package/build/plugin-cjs/index.js

@@ -151559,7 +151559,7 @@ function ensure_imports({
       script.body.unshift({
         type: "ImportDeclaration",
         source: AST16.stringLiteral(sourceModule),
-        importKind
+        importKind: importKind === "type" ? "type" : "value"
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
@@ -151573,13 +151573,12 @@ function ensure_imports({
     )
   );
   if (toImport.length > 0) {
+    const specifier = (identifier, i22) => importKind !== "module" ? !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier) : AST16.importNamespaceSpecifier(identifier);
     script.body.unshift({
       type: "ImportDeclaration",
       source: AST16.stringLiteral(sourceModule),
-      specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier)
-      ),
-      importKind
+      specifiers: toImport.map(specifier),
+      importKind: importKind === "type" ? "type" : "value"
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
@@ -152853,6 +152852,7 @@ async function queryStore({ config, pluginRoot }, doc) {
   const { store_class, statement } = store_import2(config, which);
   const storeData = `${statement}
 import artifact from '$houdini/artifacts/${artifactName}'
+import { initClient } from '$houdini/plugins/houdini-svelte/runtime/client'
 
 export class ${storeName} extends ${store_class} {
 	constructor() {
@@ -152865,6 +152865,7 @@ export class ${storeName} extends ${store_class} {
 }
 
 export async function load_${artifactName}(params) {
+  await initClient()
 
 	const store = new ${storeName}()
 
@@ -153468,27 +153469,34 @@ async function kit_init(page) {
     script: page.script,
     config: page.config,
     sourceModule: "$app/stores",
-    import: ["page"]
-  }).ids[0];
+    importKind: "module",
+    import: "__houdini__pageStores"
+  }).ids;
   page.script.body.push(
     AST18.expressionStatement(
-      AST18.callExpression(AST18.memberExpression(store_id, AST18.identifier("subscribe")), [
-        AST18.arrowFunctionExpression(
-          [AST18.identifier("val")],
-          AST18.blockStatement([
-            AST18.expressionStatement(
-              AST18.callExpression(set_session, [
-                AST18.callExpression(extract_session, [
-                  AST18.memberExpression(
-                    AST18.identifier("val"),
-                    AST18.identifier("data")
-                  )
+      AST18.callExpression(
+        AST18.memberExpression(
+          AST18.memberExpression(store_id, AST18.identifier("page")),
+          AST18.identifier("subscribe")
+        ),
+        [
+          AST18.arrowFunctionExpression(
+            [AST18.identifier("val")],
+            AST18.blockStatement([
+              AST18.expressionStatement(
+                AST18.callExpression(set_session, [
+                  AST18.callExpression(extract_session, [
+                    AST18.memberExpression(
+                      AST18.identifier("val"),
+                      AST18.identifier("data")
+                    )
+                  ])
                 ])
-              ])
-            )
-          ])
-        )
-      ])
+              )
+            ])
+          )
+        ]
+      )
     )
   );
 }
@@ -154238,7 +154246,7 @@ export const redirect = svelteKitRedirect
         path_exports.dirname(networkFilePath),
         path_exports.join(config.projectRoot, plugin_config(config).client)
       );
-      return content.replace("HOUDINI_CLIENT_PATH", relativePath);
+      return content.replaceAll("HOUDINI_CLIENT_PATH", relativePath);
     }
   },
   artifactData,

package/build/plugin-esm/index.js

@@ -151554,7 +151554,7 @@ function ensure_imports({
       script.body.unshift({
         type: "ImportDeclaration",
         source: AST16.stringLiteral(sourceModule),
-        importKind
+        importKind: importKind === "type" ? "type" : "value"
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
@@ -151568,13 +151568,12 @@ function ensure_imports({
     )
   );
   if (toImport.length > 0) {
+    const specifier = (identifier, i22) => importKind !== "module" ? !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier) : AST16.importNamespaceSpecifier(identifier);
     script.body.unshift({
       type: "ImportDeclaration",
       source: AST16.stringLiteral(sourceModule),
-      specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier)
-      ),
-      importKind
+      specifiers: toImport.map(specifier),
+      importKind: importKind === "type" ? "type" : "value"
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
@@ -152848,6 +152847,7 @@ async function queryStore({ config, pluginRoot }, doc) {
   const { store_class, statement } = store_import2(config, which);
   const storeData = `${statement}
 import artifact from '$houdini/artifacts/${artifactName}'
+import { initClient } from '$houdini/plugins/houdini-svelte/runtime/client'
 
 export class ${storeName} extends ${store_class} {
 	constructor() {
@@ -152860,6 +152860,7 @@ export class ${storeName} extends ${store_class} {
 }
 
 export async function load_${artifactName}(params) {
+  await initClient()
 
 	const store = new ${storeName}()
 
@@ -153463,27 +153464,34 @@ async function kit_init(page) {
     script: page.script,
     config: page.config,
     sourceModule: "$app/stores",
-    import: ["page"]
-  }).ids[0];
+    importKind: "module",
+    import: "__houdini__pageStores"
+  }).ids;
   page.script.body.push(
     AST18.expressionStatement(
-      AST18.callExpression(AST18.memberExpression(store_id, AST18.identifier("subscribe")), [
-        AST18.arrowFunctionExpression(
-          [AST18.identifier("val")],
-          AST18.blockStatement([
-            AST18.expressionStatement(
-              AST18.callExpression(set_session, [
-                AST18.callExpression(extract_session, [
-                  AST18.memberExpression(
-                    AST18.identifier("val"),
-                    AST18.identifier("data")
-                  )
+      AST18.callExpression(
+        AST18.memberExpression(
+          AST18.memberExpression(store_id, AST18.identifier("page")),
+          AST18.identifier("subscribe")
+        ),
+        [
+          AST18.arrowFunctionExpression(
+            [AST18.identifier("val")],
+            AST18.blockStatement([
+              AST18.expressionStatement(
+                AST18.callExpression(set_session, [
+                  AST18.callExpression(extract_session, [
+                    AST18.memberExpression(
+                      AST18.identifier("val"),
+                      AST18.identifier("data")
+                    )
+                  ])
                 ])
-              ])
-            )
-          ])
-        )
-      ])
+              )
+            ])
+          )
+        ]
+      )
     )
   );
 }
@@ -154233,7 +154241,7 @@ export const redirect = svelteKitRedirect
         path_exports.dirname(networkFilePath),
         path_exports.join(config.projectRoot, plugin_config(config).client)
       );
-      return content.replace("HOUDINI_CLIENT_PATH", relativePath);
+      return content.replaceAll("HOUDINI_CLIENT_PATH", relativePath);
     }
   },
   artifactData,

package/build/preprocess-cjs/index.js

@@ -155824,7 +155824,7 @@ function ensure_imports({
       script.body.unshift({
         type: "ImportDeclaration",
         source: AST16.stringLiteral(sourceModule),
-        importKind
+        importKind: importKind === "type" ? "type" : "value"
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
@@ -155838,13 +155838,12 @@ function ensure_imports({
     )
   );
   if (toImport.length > 0) {
+    const specifier = (identifier, i22) => importKind !== "module" ? !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier) : AST16.importNamespaceSpecifier(identifier);
     script.body.unshift({
       type: "ImportDeclaration",
       source: AST16.stringLiteral(sourceModule),
-      specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier)
-      ),
-      importKind
+      specifiers: toImport.map(specifier),
+      importKind: importKind === "type" ? "type" : "value"
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
@@ -156400,27 +156399,34 @@ async function kit_init(page) {
     script: page.script,
     config: page.config,
     sourceModule: "$app/stores",
-    import: ["page"]
-  }).ids[0];
+    importKind: "module",
+    import: "__houdini__pageStores"
+  }).ids;
   page.script.body.push(
     AST18.expressionStatement(
-      AST18.callExpression(AST18.memberExpression(store_id, AST18.identifier("subscribe")), [
-        AST18.arrowFunctionExpression(
-          [AST18.identifier("val")],
-          AST18.blockStatement([
-            AST18.expressionStatement(
-              AST18.callExpression(set_session, [
-                AST18.callExpression(extract_session, [
-                  AST18.memberExpression(
-                    AST18.identifier("val"),
-                    AST18.identifier("data")
-                  )
+      AST18.callExpression(
+        AST18.memberExpression(
+          AST18.memberExpression(store_id, AST18.identifier("page")),
+          AST18.identifier("subscribe")
+        ),
+        [
+          AST18.arrowFunctionExpression(
+            [AST18.identifier("val")],
+            AST18.blockStatement([
+              AST18.expressionStatement(
+                AST18.callExpression(set_session, [
+                  AST18.callExpression(extract_session, [
+                    AST18.memberExpression(
+                      AST18.identifier("val"),
+                      AST18.identifier("data")
+                    )
+                  ])
                 ])
-              ])
-            )
-          ])
-        )
-      ])
+              )
+            ])
+          )
+        ]
+      )
     )
   );
 }

package/build/preprocess-esm/index.js

@@ -155820,7 +155820,7 @@ function ensure_imports({
       script.body.unshift({
         type: "ImportDeclaration",
         source: AST16.stringLiteral(sourceModule),
-        importKind
+        importKind: importKind === "type" ? "type" : "value"
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
@@ -155834,13 +155834,12 @@ function ensure_imports({
     )
   );
   if (toImport.length > 0) {
+    const specifier = (identifier, i22) => importKind !== "module" ? !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier) : AST16.importNamespaceSpecifier(identifier);
     script.body.unshift({
       type: "ImportDeclaration",
       source: AST16.stringLiteral(sourceModule),
-      specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST16.importDefaultSpecifier(identifier) : AST16.importSpecifier(identifier, as?.[i22] ? AST16.identifier(as[i22]) : identifier)
-      ),
-      importKind
+      specifiers: toImport.map(specifier),
+      importKind: importKind === "type" ? "type" : "value"
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
@@ -156396,27 +156395,34 @@ async function kit_init(page) {
     script: page.script,
     config: page.config,
     sourceModule: "$app/stores",
-    import: ["page"]
-  }).ids[0];
+    importKind: "module",
+    import: "__houdini__pageStores"
+  }).ids;
   page.script.body.push(
     AST18.expressionStatement(
-      AST18.callExpression(AST18.memberExpression(store_id, AST18.identifier("subscribe")), [
-        AST18.arrowFunctionExpression(
-          [AST18.identifier("val")],
-          AST18.blockStatement([
-            AST18.expressionStatement(
-              AST18.callExpression(set_session, [
-                AST18.callExpression(extract_session, [
-                  AST18.memberExpression(
-                    AST18.identifier("val"),
-                    AST18.identifier("data")
-                  )
+      AST18.callExpression(
+        AST18.memberExpression(
+          AST18.memberExpression(store_id, AST18.identifier("page")),
+          AST18.identifier("subscribe")
+        ),
+        [
+          AST18.arrowFunctionExpression(
+            [AST18.identifier("val")],
+            AST18.blockStatement([
+              AST18.expressionStatement(
+                AST18.callExpression(set_session, [
+                  AST18.callExpression(extract_session, [
+                    AST18.memberExpression(
+                      AST18.identifier("val"),
+                      AST18.identifier("data")
+                    )
+                  ])
                 ])
-              ])
-            )
-          ])
-        )
-      ])
+              )
+            ])
+          )
+        ]
+      )
     )
   );
 }

package/build/runtime/client.d.ts

@@ -1,2 +1,3 @@
 import type { HoudiniClient } from '$houdini/runtime/client';
+export declare function initClient(): Promise<HoudiniClient>;
 export declare function getClient(): HoudiniClient;

package/build/runtime/stores/index.d.ts

@@ -1,4 +1,4 @@
+export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';
 export { FragmentStore, FragmentStoreCursor, FragmentStoreOffset } from './fragment';
 export { SubscriptionStore } from './subscription';
 export { MutationStore, type MutationConfig } from './mutation';
-export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';

package/build/runtime-cjs/client.d.ts

@@ -1,2 +1,3 @@
 import type { HoudiniClient } from '$houdini/runtime/client';
+export declare function initClient(): Promise<HoudiniClient>;
 export declare function getClient(): HoudiniClient;

package/build/runtime-cjs/client.js

@@ -24,17 +24,34 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var client_exports = {};
 __export(client_exports, {
-  getClient: () => getClient
+  getClient: () => getClient,
+  initClient: () => initClient
 });
 module.exports = __toCommonJS(client_exports);
-var import_HOUDINI_CLIENT_PATH = __toESM(require("HOUDINI_CLIENT_PATH"), 1);
+let client = null;
+async function initClient() {
+  if (client) {
+    return client;
+  }
+  client = (await import("HOUDINI_CLIENT_PATH")).default;
+  const delay = (ms) => new Promise((res) => setTimeout(res, ms));
+  for (let retry = 0; retry < 10; retry++) {
+    if (client) {
+      break;
+    }
+    await delay(100);
+    client = (await import("HOUDINI_CLIENT_PATH")).default;
+  }
+  return client;
+}
 function getClient() {
-  if (!import_HOUDINI_CLIENT_PATH.default) {
+  if (!client) {
     throw new Error("client hasn't been initialized");
   }
-  return import_HOUDINI_CLIENT_PATH.default;
+  return client;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getClient
+  getClient,
+  initClient
 });

package/build/runtime-cjs/stores/base.js

@@ -73,6 +73,11 @@ class BaseStore {
   #subscriberCount = 0;
   setup(init = true) {
     let initPromise = Promise.resolve();
+    try {
+      (0, import_client2.getClient)();
+    } catch {
+      initPromise = (0, import_client2.initClient)();
+    }
     initPromise.then(() => {
       if (this.#unsubscribe) {
         return;

package/build/runtime-cjs/stores/fragment.js

@@ -162,6 +162,7 @@ class FragmentStoreCursor extends BasePaginatedFragmentStore {
       getVariables,
       artifact: this.paginationArtifact,
       fetchUpdate: async (args, updates) => {
+        await (0, import_client.initClient)();
         return observer.send({
           session: await (0, import_session.getSession)(),
           ...args,
@@ -176,6 +177,7 @@ class FragmentStoreCursor extends BasePaginatedFragmentStore {
         });
       },
       fetch: async (args) => {
+        await (0, import_client.initClient)();
         return await observer.send({
           session: await (0, import_session.getSession)(),
           ...args,
@@ -209,6 +211,7 @@ class FragmentStoreOffset extends BasePaginatedFragmentStore {
       getVariables: () => store.variables,
       artifact: this.paginationArtifact,
       fetch: async (args) => {
+        await (0, import_client.initClient)();
         return paginationStore.send({
           ...args,
           session: await (0, import_session.getSession)(),
@@ -222,6 +225,7 @@ class FragmentStoreOffset extends BasePaginatedFragmentStore {
         });
       },
       fetchUpdate: async (args) => {
+        await (0, import_client.initClient)();
         return paginationStore.send({
           session: await (0, import_session.getSession)(),
           ...args,

package/build/runtime-cjs/stores/index.d.ts

@@ -1,4 +1,4 @@
+export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';
 export { FragmentStore, FragmentStoreCursor, FragmentStoreOffset } from './fragment';
 export { SubscriptionStore } from './subscription';
 export { MutationStore, type MutationConfig } from './mutation';
-export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';

package/build/runtime-cjs/stores/index.js

@@ -28,10 +28,10 @@ __export(stores_exports, {
   SubscriptionStore: () => import_subscription.SubscriptionStore
 });
 module.exports = __toCommonJS(stores_exports);
+var import_query = require("./query");
 var import_fragment = require("./fragment");
 var import_subscription = require("./subscription");
 var import_mutation = require("./mutation");
-var import_query = require("./query");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FragmentStore,

package/build/runtime-cjs/stores/mutation.js

@@ -21,6 +21,7 @@ __export(mutation_exports, {
   MutationStore: () => MutationStore
 });
 module.exports = __toCommonJS(mutation_exports);
+var import_client = require("../client");
 var import_base = require("./base");
 var import_query = require("./query");
 class MutationStore extends import_base.BaseStore {
@@ -32,6 +33,7 @@ class MutationStore extends import_base.BaseStore {
     abortController,
     ...mutationConfig
   } = {}) {
+    await (0, import_client.initClient)();
     const { context } = await (0, import_query.fetchParams)(this.artifact, this.artifact.name, {
       fetch,
       metadata,

package/build/runtime-cjs/stores/query.js

@@ -56,7 +56,7 @@ class QueryStore extends import_base.BaseStore {
     this.variables = variables;
   }
   async fetch(args) {
-    const client = (0, import_client.getClient)();
+    const client = await (0, import_client.initClient)();
     this.setup(false);
     const { policy, params, context } = await fetchParams(this.artifact, this.storeName, args);
     if (!import_adapter.isBrowser && !(params && "fetch" in params) && (!params || !("event" in params))) {
@@ -204,6 +204,7 @@ class QueryStoreCursor extends QueryStore {
     if (this.#_handlers) {
       return this.#_handlers;
     }
+    await (0, import_client.initClient)();
     const paginationObserver = (0, import_client.getClient)().observe({
       artifact: this.artifact
     });
@@ -214,6 +215,7 @@ class QueryStoreCursor extends QueryStore {
       fetch: super.fetch.bind(this),
       getSession: import_session.getSession,
       fetchUpdate: async (args, updates) => {
+        await (0, import_client.initClient)();
         return paginationObserver.send({
           ...args,
           cacheParams: {
@@ -281,6 +283,7 @@ class QueryStoreOffset extends QueryStore {
     if (this.#_handlers) {
       return this.#_handlers;
     }
+    await (0, import_client.initClient)();
     const paginationObserver = (0, import_client.getClient)().observe({
       artifact: this.artifact
     });
@@ -292,6 +295,7 @@ class QueryStoreOffset extends QueryStore {
       getVariables: () => (0, import_store.get)(this.observer).variables,
       getSession: import_session.getSession,
       fetchUpdate: async (args) => {
+        await (0, import_client.initClient)();
         return paginationObserver.send({
           ...args,
           variables: {

package/build/runtime-cjs/stores/subscription.js

@@ -23,6 +23,7 @@ __export(subscription_exports, {
 module.exports = __toCommonJS(subscription_exports);
 var import_types = require("$houdini/runtime/lib/types");
 var import_store = require("svelte/store");
+var import_client = require("../client");
 var import_session = require("../session");
 var import_base = require("./base");
 class SubscriptionStore extends import_base.BaseStore {
@@ -33,6 +34,7 @@ class SubscriptionStore extends import_base.BaseStore {
     this.fetchingStore = (0, import_store.writable)(false);
   }
   async listen(variables, args) {
+    await (0, import_client.initClient)();
     this.fetchingStore.set(true);
     this.observer.send({
       variables,
@@ -41,6 +43,7 @@ class SubscriptionStore extends import_base.BaseStore {
     });
   }
   async unlisten() {
+    await (0, import_client.initClient)();
     this.fetchingStore.set(false);
     await this.observer.cleanup();
   }

package/build/runtime-esm/client.d.ts

@@ -1,2 +1,3 @@
 import type { HoudiniClient } from '$houdini/runtime/client';
+export declare function initClient(): Promise<HoudiniClient>;
 export declare function getClient(): HoudiniClient;

package/build/runtime-esm/client.js

@@ -1,4 +1,19 @@
-import client from "HOUDINI_CLIENT_PATH";
+let client = null;
+async function initClient() {
+  if (client) {
+    return client;
+  }
+  client = (await import("HOUDINI_CLIENT_PATH")).default;
+  const delay = (ms) => new Promise((res) => setTimeout(res, ms));
+  for (let retry = 0; retry < 10; retry++) {
+    if (client) {
+      break;
+    }
+    await delay(100);
+    client = (await import("HOUDINI_CLIENT_PATH")).default;
+  }
+  return client;
+}
 function getClient() {
   if (!client) {
     throw new Error("client hasn't been initialized");
@@ -6,5 +21,6 @@ function getClient() {
   return client;
 }
 export {
-  getClient
+  getClient,
+  initClient
 };

package/build/runtime-esm/stores/base.js

@@ -1,7 +1,7 @@
 import { DocumentStore } from "$houdini/runtime/client";
 import { get } from "svelte/store";
 import { isBrowser } from "../adapter";
-import { getClient } from "../client";
+import { getClient, initClient } from "../client";
 class BaseStore {
   #params;
   get artifact() {
@@ -50,6 +50,11 @@ class BaseStore {
   #subscriberCount = 0;
   setup(init = true) {
     let initPromise = Promise.resolve();
+    try {
+      getClient();
+    } catch {
+      initPromise = initClient();
+    }
     initPromise.then(() => {
       if (this.#unsubscribe) {
         return;

package/build/runtime-esm/stores/fragment.js

@@ -7,7 +7,7 @@ import { marshalInputs } from "$houdini/runtime/lib/scalars";
 import { CompiledFragmentKind, fragmentKey } from "$houdini/runtime/lib/types";
 import { get, derived } from "svelte/store";
 import { isBrowser } from "../adapter";
-import { getClient } from "../client";
+import { getClient, initClient } from "../client";
 import { getSession } from "../session";
 import { BaseStore } from "./base";
 class FragmentStore {
@@ -131,6 +131,7 @@ class FragmentStoreCursor extends BasePaginatedFragmentStore {
       getVariables,
       artifact: this.paginationArtifact,
       fetchUpdate: async (args, updates) => {
+        await initClient();
         return observer.send({
           session: await getSession(),
           ...args,
@@ -145,6 +146,7 @@ class FragmentStoreCursor extends BasePaginatedFragmentStore {
         });
       },
       fetch: async (args) => {
+        await initClient();
         return await observer.send({
           session: await getSession(),
           ...args,
@@ -178,6 +180,7 @@ class FragmentStoreOffset extends BasePaginatedFragmentStore {
       getVariables: () => store.variables,
       artifact: this.paginationArtifact,
       fetch: async (args) => {
+        await initClient();
         return paginationStore.send({
           ...args,
           session: await getSession(),
@@ -191,6 +194,7 @@ class FragmentStoreOffset extends BasePaginatedFragmentStore {
         });
       },
       fetchUpdate: async (args) => {
+        await initClient();
         return paginationStore.send({
           session: await getSession(),
           ...args,

package/build/runtime-esm/stores/index.d.ts

@@ -1,4 +1,4 @@
+export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';
 export { FragmentStore, FragmentStoreCursor, FragmentStoreOffset } from './fragment';
 export { SubscriptionStore } from './subscription';
 export { MutationStore, type MutationConfig } from './mutation';
-export { QueryStore, QueryStoreCursor, QueryStoreOffset } from './query';

package/build/runtime-esm/stores/index.js

@@ -1,7 +1,7 @@
+import { QueryStore, QueryStoreCursor, QueryStoreOffset } from "./query";
 import { FragmentStore, FragmentStoreCursor, FragmentStoreOffset } from "./fragment";
 import { SubscriptionStore } from "./subscription";
 import { MutationStore } from "./mutation";
-import { QueryStore, QueryStoreCursor, QueryStoreOffset } from "./query";
 export {
   FragmentStore,
   FragmentStoreCursor,

package/build/runtime-esm/stores/mutation.js

@@ -1,3 +1,4 @@
+import { initClient } from "../client";
 import { BaseStore } from "./base";
 import { fetchParams } from "./query";
 class MutationStore extends BaseStore {
@@ -9,6 +10,7 @@ class MutationStore extends BaseStore {
     abortController,
     ...mutationConfig
   } = {}) {
+    await initClient();
     const { context } = await fetchParams(this.artifact, this.artifact.name, {
       fetch,
       metadata,

package/build/runtime-esm/stores/query.js

@@ -5,7 +5,7 @@ import { cursorHandlers, offsetHandlers } from "$houdini/runtime/lib/pagination"
 import { CompiledQueryKind, CachePolicy, ArtifactKind } from "$houdini/runtime/lib/types";
 import { get, derived } from "svelte/store";
 import { clientStarted, isBrowser } from "../adapter";
-import { getClient } from "../client";
+import { getClient, initClient } from "../client";
 import { getSession } from "../session";
 import { BaseStore } from "./base";
 class QueryStore extends BaseStore {
@@ -24,7 +24,7 @@ class QueryStore extends BaseStore {
     this.variables = variables;
   }
   async fetch(args) {
-    const client = getClient();
+    const client = await initClient();
     this.setup(false);
     const { policy, params, context } = await fetchParams(this.artifact, this.storeName, args);
     if (!isBrowser && !(params && "fetch" in params) && (!params || !("event" in params))) {
@@ -172,6 +172,7 @@ class QueryStoreCursor extends QueryStore {
     if (this.#_handlers) {
       return this.#_handlers;
     }
+    await initClient();
     const paginationObserver = getClient().observe({
       artifact: this.artifact
     });
@@ -182,6 +183,7 @@ class QueryStoreCursor extends QueryStore {
       fetch: super.fetch.bind(this),
       getSession,
       fetchUpdate: async (args, updates) => {
+        await initClient();
         return paginationObserver.send({
           ...args,
           cacheParams: {
@@ -249,6 +251,7 @@ class QueryStoreOffset extends QueryStore {
     if (this.#_handlers) {
       return this.#_handlers;
     }
+    await initClient();
     const paginationObserver = getClient().observe({
       artifact: this.artifact
     });
@@ -260,6 +263,7 @@ class QueryStoreOffset extends QueryStore {
       getVariables: () => get(this.observer).variables,
       getSession,
       fetchUpdate: async (args) => {
+        await initClient();
         return paginationObserver.send({
           ...args,
           variables: {

package/build/runtime-esm/stores/subscription.js

@@ -1,5 +1,6 @@
 import { CompiledSubscriptionKind } from "$houdini/runtime/lib/types";
 import { derived, writable } from "svelte/store";
+import { initClient } from "../client";
 import { getSession } from "../session";
 import { BaseStore } from "./base";
 class SubscriptionStore extends BaseStore {
@@ -10,6 +11,7 @@ class SubscriptionStore extends BaseStore {
     this.fetchingStore = writable(false);
   }
   async listen(variables, args) {
+    await initClient();
     this.fetchingStore.set(true);
     this.observer.send({
       variables,
@@ -18,6 +20,7 @@ class SubscriptionStore extends BaseStore {
     });
   }
   async unlisten() {
+    await initClient();
     this.fetchingStore.set(false);
     await this.observer.cleanup();
   }

package/build/test-cjs/index.js

@@ -281416,7 +281416,7 @@ function ensure_imports({
       script.body.unshift({
         type: "ImportDeclaration",
         source: AST162.stringLiteral(sourceModule),
-        importKind
+        importKind: importKind === "type" ? "type" : "value"
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
@@ -281430,13 +281430,12 @@ function ensure_imports({
     )
   );
   if (toImport.length > 0) {
+    const specifier = (identifier, i22) => importKind !== "module" ? !Array.isArray(importID) ? AST162.importDefaultSpecifier(identifier) : AST162.importSpecifier(identifier, as?.[i22] ? AST162.identifier(as[i22]) : identifier) : AST162.importNamespaceSpecifier(identifier);
     script.body.unshift({
       type: "ImportDeclaration",
       source: AST162.stringLiteral(sourceModule),
-      specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST162.importDefaultSpecifier(identifier) : AST162.importSpecifier(identifier, as?.[i22] ? AST162.identifier(as[i22]) : identifier)
-      ),
-      importKind
+      specifiers: toImport.map(specifier),
+      importKind: importKind === "type" ? "type" : "value"
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
@@ -282710,6 +282709,7 @@ async function queryStore({ config, pluginRoot }, doc) {
   const { store_class, statement } = store_import2(config, which);
   const storeData = `${statement}
 import artifact from '$houdini/artifacts/${artifactName}'
+import { initClient } from '$houdini/plugins/houdini-svelte/runtime/client'
 
 export class ${storeName} extends ${store_class} {
 	constructor() {
@@ -282722,6 +282722,7 @@ export class ${storeName} extends ${store_class} {
 }
 
 export async function load_${artifactName}(params) {
+  await initClient()
 
 	const store = new ${storeName}()
 
@@ -283325,27 +283326,34 @@ async function kit_init(page) {
     script: page.script,
     config: page.config,
     sourceModule: "$app/stores",
-    import: ["page"]
-  }).ids[0];
+    importKind: "module",
+    import: "__houdini__pageStores"
+  }).ids;
   page.script.body.push(
     AST19.expressionStatement(
-      AST19.callExpression(AST19.memberExpression(store_id, AST19.identifier("subscribe")), [
-        AST19.arrowFunctionExpression(
-          [AST19.identifier("val")],
-          AST19.blockStatement([
-            AST19.expressionStatement(
-              AST19.callExpression(set_session, [
-                AST19.callExpression(extract_session, [
-                  AST19.memberExpression(
-                    AST19.identifier("val"),
-                    AST19.identifier("data")
-                  )
+      AST19.callExpression(
+        AST19.memberExpression(
+          AST19.memberExpression(store_id, AST19.identifier("page")),
+          AST19.identifier("subscribe")
+        ),
+        [
+          AST19.arrowFunctionExpression(
+            [AST19.identifier("val")],
+            AST19.blockStatement([
+              AST19.expressionStatement(
+                AST19.callExpression(set_session, [
+                  AST19.callExpression(extract_session, [
+                    AST19.memberExpression(
+                      AST19.identifier("val"),
+                      AST19.identifier("data")
+                    )
+                  ])
                 ])
-              ])
-            )
-          ])
-        )
-      ])
+              )
+            ])
+          )
+        ]
+      )
     )
   );
 }
@@ -284095,7 +284103,7 @@ export const redirect = svelteKitRedirect
         path_exports.dirname(networkFilePath),
         path_exports.join(config.projectRoot, plugin_config(config).client)
       );
-      return content.replace("HOUDINI_CLIENT_PATH", relativePath);
+      return content.replaceAll("HOUDINI_CLIENT_PATH", relativePath);
     }
   },
   artifactData,

package/build/test-esm/index.js

@@ -281405,7 +281405,7 @@ function ensure_imports({
       script.body.unshift({
         type: "ImportDeclaration",
         source: AST162.stringLiteral(sourceModule),
-        importKind
+        importKind: importKind === "type" ? "type" : "value"
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
@@ -281419,13 +281419,12 @@ function ensure_imports({
     )
   );
   if (toImport.length > 0) {
+    const specifier = (identifier, i22) => importKind !== "module" ? !Array.isArray(importID) ? AST162.importDefaultSpecifier(identifier) : AST162.importSpecifier(identifier, as?.[i22] ? AST162.identifier(as[i22]) : identifier) : AST162.importNamespaceSpecifier(identifier);
     script.body.unshift({
       type: "ImportDeclaration",
       source: AST162.stringLiteral(sourceModule),
-      specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST162.importDefaultSpecifier(identifier) : AST162.importSpecifier(identifier, as?.[i22] ? AST162.identifier(as[i22]) : identifier)
-      ),
-      importKind
+      specifiers: toImport.map(specifier),
+      importKind: importKind === "type" ? "type" : "value"
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
@@ -282699,6 +282698,7 @@ async function queryStore({ config, pluginRoot }, doc) {
   const { store_class, statement } = store_import2(config, which);
   const storeData = `${statement}
 import artifact from '$houdini/artifacts/${artifactName}'
+import { initClient } from '$houdini/plugins/houdini-svelte/runtime/client'
 
 export class ${storeName} extends ${store_class} {
 	constructor() {
@@ -282711,6 +282711,7 @@ export class ${storeName} extends ${store_class} {
 }
 
 export async function load_${artifactName}(params) {
+  await initClient()
 
 	const store = new ${storeName}()
 
@@ -283314,27 +283315,34 @@ async function kit_init(page) {
     script: page.script,
     config: page.config,
     sourceModule: "$app/stores",
-    import: ["page"]
-  }).ids[0];
+    importKind: "module",
+    import: "__houdini__pageStores"
+  }).ids;
   page.script.body.push(
     AST19.expressionStatement(
-      AST19.callExpression(AST19.memberExpression(store_id, AST19.identifier("subscribe")), [
-        AST19.arrowFunctionExpression(
-          [AST19.identifier("val")],
-          AST19.blockStatement([
-            AST19.expressionStatement(
-              AST19.callExpression(set_session, [
-                AST19.callExpression(extract_session, [
-                  AST19.memberExpression(
-                    AST19.identifier("val"),
-                    AST19.identifier("data")
-                  )
+      AST19.callExpression(
+        AST19.memberExpression(
+          AST19.memberExpression(store_id, AST19.identifier("page")),
+          AST19.identifier("subscribe")
+        ),
+        [
+          AST19.arrowFunctionExpression(
+            [AST19.identifier("val")],
+            AST19.blockStatement([
+              AST19.expressionStatement(
+                AST19.callExpression(set_session, [
+                  AST19.callExpression(extract_session, [
+                    AST19.memberExpression(
+                      AST19.identifier("val"),
+                      AST19.identifier("data")
+                    )
+                  ])
                 ])
-              ])
-            )
-          ])
-        )
-      ])
+              )
+            ])
+          )
+        ]
+      )
     )
   );
 }
@@ -284084,7 +284092,7 @@ export const redirect = svelteKitRedirect
         path_exports.dirname(networkFilePath),
         path_exports.join(config.projectRoot, plugin_config(config).client)
       );
-      return content.replace("HOUDINI_CLIENT_PATH", relativePath);
+      return content.replaceAll("HOUDINI_CLIENT_PATH", relativePath);
     }
   },
   artifactData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "description": "The svelte plugin for houdini",
   "keywords": [
     "typescript",