houdini-svelte 0.17.11 → 0.17.12

package/build/plugin-cjs/index.js

@@ -179846,6 +179846,24 @@ async function svelteKitGenerator(framework2, { config: config2 }) {
           config2,
           uniquePageQueries
         );
+        const layout_append_beforeLoad = append_beforeLoad(beforeLayoutLoad, "Layout");
+        const page_append_beforeLoad = append_beforeLoad(beforePageLoad, "Page");
+        const layout_append_afterLoad = append_afterLoad(
+          afterLayoutLoad,
+          "Layout",
+          layoutQueries
+        );
+        const page_append_afterLoad = append_afterLoad(afterPageLoad, "Page", pageQueries);
+        const layout_append_onError = append_onError(
+          onLayoutError,
+          "Layout",
+          layoutQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
+        const page_append_onError = append_onError(
+          onPageError,
+          "Page",
+          pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
         const splitString = skTypeString.split("\n\n");
         let typeImports = splitString[0];
         let utilityTypes = splitString[1];
@@ -179868,17 +179886,7 @@ import type { ${functionImportsToBring.join(
         const layoutParams = `${layoutQueries.length > 0 && !utilityTypes.includes("LayoutParams") ? "\ntype LayoutParams = LayoutLoadEvent['params'];" : ""}`;
         const pageParams = `${pageQueries.length > 0 && !utilityTypes.includes("PageParams") ? "\ntype PageParams = PageLoadEvent['params'];" : ""}`;
         utilityTypes = utilityTypes.concat(layoutParams).concat(pageParams).replaceAll(/\$types\.js/gm, "$houdini");
-        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(append_beforeLoad(beforeLayoutLoad)).concat(append_beforeLoad(beforePageLoad)).concat(append_afterLoad("Layout", afterLayoutLoad, layoutQueries)).concat(append_afterLoad("Page", afterPageLoad, pageQueries)).concat(
-          append_onError(
-            onPageError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(
-          append_onError(
-            onLayoutError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
+        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(layout_append_beforeLoad).concat(page_append_beforeLoad).concat(layout_append_afterLoad).concat(page_append_afterLoad).concat(layout_append_onError).concat(page_append_onError).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
           /(?<=LayoutData = )([\s\S]*?)(?=;)/,
           `Expand<$1 & { ${layoutQueries.map((query) => {
             const name2 = query.name.value;
@@ -179942,9 +179950,9 @@ type LoadInput = { ${queries.filter((query) => query.variableDefinitions?.length
     return [name2, name2 + "$input"].join(": ");
   }).join("; ")} };` : ""}`;
 }
-function append_afterLoad(type, afterLoad, queries) {
+function append_afterLoad(afterLoad, type, queries) {
   return afterLoad ? `
-type AfterLoadReturn = ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>;
+type AfterLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>>;
 type AfterLoadData = {
 	${internal_append_afterLoad(queries)}
 };
@@ -179962,15 +179970,15 @@ function internal_append_afterLoad(queries) {
     return [name2, name2 + "$result"].join(": ");
   }).join(";\n	")}`;
 }
-function append_beforeLoad(beforeLoad) {
+function append_beforeLoad(beforeLoad, type) {
   return beforeLoad ? `
 export type BeforeLoadEvent = PageLoadEvent;
-type BeforeLoadReturn = ReturnType<typeof import('./+page').beforeLoad>;
+type BeforeLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').beforeLoad>>;
 ` : "";
 }
-function append_onError(onError, hasLoadInput) {
+function append_onError(onError, type, hasLoadInput) {
   return onError ? `
-type OnErrorReturn = ReturnType<typeof import('./+page').onError>;
+type OnErrorReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').onError>>;
 export type OnErrorEvent =  { event: Kit.LoadEvent, input: ${hasLoadInput ? "LoadInput" : "{}"}, error: Error | Error[] };
 ` : "";
 }

package/build/plugin-esm/index.js

@@ -179842,6 +179842,24 @@ async function svelteKitGenerator(framework2, { config: config2 }) {
           config2,
           uniquePageQueries
         );
+        const layout_append_beforeLoad = append_beforeLoad(beforeLayoutLoad, "Layout");
+        const page_append_beforeLoad = append_beforeLoad(beforePageLoad, "Page");
+        const layout_append_afterLoad = append_afterLoad(
+          afterLayoutLoad,
+          "Layout",
+          layoutQueries
+        );
+        const page_append_afterLoad = append_afterLoad(afterPageLoad, "Page", pageQueries);
+        const layout_append_onError = append_onError(
+          onLayoutError,
+          "Layout",
+          layoutQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
+        const page_append_onError = append_onError(
+          onPageError,
+          "Page",
+          pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
         const splitString = skTypeString.split("\n\n");
         let typeImports = splitString[0];
         let utilityTypes = splitString[1];
@@ -179864,17 +179882,7 @@ import type { ${functionImportsToBring.join(
         const layoutParams = `${layoutQueries.length > 0 && !utilityTypes.includes("LayoutParams") ? "\ntype LayoutParams = LayoutLoadEvent['params'];" : ""}`;
         const pageParams = `${pageQueries.length > 0 && !utilityTypes.includes("PageParams") ? "\ntype PageParams = PageLoadEvent['params'];" : ""}`;
         utilityTypes = utilityTypes.concat(layoutParams).concat(pageParams).replaceAll(/\$types\.js/gm, "$houdini");
-        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(append_beforeLoad(beforeLayoutLoad)).concat(append_beforeLoad(beforePageLoad)).concat(append_afterLoad("Layout", afterLayoutLoad, layoutQueries)).concat(append_afterLoad("Page", afterPageLoad, pageQueries)).concat(
-          append_onError(
-            onPageError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(
-          append_onError(
-            onLayoutError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
+        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(layout_append_beforeLoad).concat(page_append_beforeLoad).concat(layout_append_afterLoad).concat(page_append_afterLoad).concat(layout_append_onError).concat(page_append_onError).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
           /(?<=LayoutData = )([\s\S]*?)(?=;)/,
           `Expand<$1 & { ${layoutQueries.map((query) => {
             const name2 = query.name.value;
@@ -179938,9 +179946,9 @@ type LoadInput = { ${queries.filter((query) => query.variableDefinitions?.length
     return [name2, name2 + "$input"].join(": ");
   }).join("; ")} };` : ""}`;
 }
-function append_afterLoad(type, afterLoad, queries) {
+function append_afterLoad(afterLoad, type, queries) {
   return afterLoad ? `
-type AfterLoadReturn = ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>;
+type AfterLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>>;
 type AfterLoadData = {
 	${internal_append_afterLoad(queries)}
 };
@@ -179958,15 +179966,15 @@ function internal_append_afterLoad(queries) {
     return [name2, name2 + "$result"].join(": ");
   }).join(";\n	")}`;
 }
-function append_beforeLoad(beforeLoad) {
+function append_beforeLoad(beforeLoad, type) {
   return beforeLoad ? `
 export type BeforeLoadEvent = PageLoadEvent;
-type BeforeLoadReturn = ReturnType<typeof import('./+page').beforeLoad>;
+type BeforeLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').beforeLoad>>;
 ` : "";
 }
-function append_onError(onError, hasLoadInput) {
+function append_onError(onError, type, hasLoadInput) {
   return onError ? `
-type OnErrorReturn = ReturnType<typeof import('./+page').onError>;
+type OnErrorReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').onError>>;
 export type OnErrorEvent =  { event: Kit.LoadEvent, input: ${hasLoadInput ? "LoadInput" : "{}"}, error: Error | Error[] };
 ` : "";
 }

package/build/test-cjs/index.js

@@ -294501,6 +294501,24 @@ async function svelteKitGenerator(framework2, { config: config3 }) {
           config3,
           uniquePageQueries
         );
+        const layout_append_beforeLoad = append_beforeLoad(beforeLayoutLoad, "Layout");
+        const page_append_beforeLoad = append_beforeLoad(beforePageLoad, "Page");
+        const layout_append_afterLoad = append_afterLoad(
+          afterLayoutLoad,
+          "Layout",
+          layoutQueries
+        );
+        const page_append_afterLoad = append_afterLoad(afterPageLoad, "Page", pageQueries);
+        const layout_append_onError = append_onError(
+          onLayoutError,
+          "Layout",
+          layoutQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
+        const page_append_onError = append_onError(
+          onPageError,
+          "Page",
+          pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
         const splitString = skTypeString.split("\n\n");
         let typeImports = splitString[0];
         let utilityTypes = splitString[1];
@@ -294523,17 +294541,7 @@ import type { ${functionImportsToBring.join(
         const layoutParams = `${layoutQueries.length > 0 && !utilityTypes.includes("LayoutParams") ? "\ntype LayoutParams = LayoutLoadEvent['params'];" : ""}`;
         const pageParams = `${pageQueries.length > 0 && !utilityTypes.includes("PageParams") ? "\ntype PageParams = PageLoadEvent['params'];" : ""}`;
         utilityTypes = utilityTypes.concat(layoutParams).concat(pageParams).replaceAll(/\$types\.js/gm, "$houdini");
-        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(append_beforeLoad(beforeLayoutLoad)).concat(append_beforeLoad(beforePageLoad)).concat(append_afterLoad("Layout", afterLayoutLoad, layoutQueries)).concat(append_afterLoad("Page", afterPageLoad, pageQueries)).concat(
-          append_onError(
-            onPageError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(
-          append_onError(
-            onLayoutError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
+        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(layout_append_beforeLoad).concat(page_append_beforeLoad).concat(layout_append_afterLoad).concat(page_append_afterLoad).concat(layout_append_onError).concat(page_append_onError).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
           /(?<=LayoutData = )([\s\S]*?)(?=;)/,
           `Expand<$1 & { ${layoutQueries.map((query) => {
             const name2 = query.name.value;
@@ -294597,9 +294605,9 @@ type LoadInput = { ${queries.filter((query) => query.variableDefinitions?.length
     return [name2, name2 + "$input"].join(": ");
   }).join("; ")} };` : ""}`;
 }
-function append_afterLoad(type, afterLoad, queries) {
+function append_afterLoad(afterLoad, type, queries) {
   return afterLoad ? `
-type AfterLoadReturn = ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>;
+type AfterLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>>;
 type AfterLoadData = {
 	${internal_append_afterLoad(queries)}
 };
@@ -294617,15 +294625,15 @@ function internal_append_afterLoad(queries) {
     return [name2, name2 + "$result"].join(": ");
   }).join(";\n	")}`;
 }
-function append_beforeLoad(beforeLoad) {
+function append_beforeLoad(beforeLoad, type) {
   return beforeLoad ? `
 export type BeforeLoadEvent = PageLoadEvent;
-type BeforeLoadReturn = ReturnType<typeof import('./+page').beforeLoad>;
+type BeforeLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').beforeLoad>>;
 ` : "";
 }
-function append_onError(onError, hasLoadInput) {
+function append_onError(onError, type, hasLoadInput) {
   return onError ? `
-type OnErrorReturn = ReturnType<typeof import('./+page').onError>;
+type OnErrorReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').onError>>;
 export type OnErrorEvent =  { event: Kit.LoadEvent, input: ${hasLoadInput ? "LoadInput" : "{}"}, error: Error | Error[] };
 ` : "";
 }

package/build/test-esm/index.js

@@ -294490,6 +294490,24 @@ async function svelteKitGenerator(framework2, { config: config3 }) {
           config3,
           uniquePageQueries
         );
+        const layout_append_beforeLoad = append_beforeLoad(beforeLayoutLoad, "Layout");
+        const page_append_beforeLoad = append_beforeLoad(beforePageLoad, "Page");
+        const layout_append_afterLoad = append_afterLoad(
+          afterLayoutLoad,
+          "Layout",
+          layoutQueries
+        );
+        const page_append_afterLoad = append_afterLoad(afterPageLoad, "Page", pageQueries);
+        const layout_append_onError = append_onError(
+          onLayoutError,
+          "Layout",
+          layoutQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
+        const page_append_onError = append_onError(
+          onPageError,
+          "Page",
+          pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
+        );
         const splitString = skTypeString.split("\n\n");
         let typeImports = splitString[0];
         let utilityTypes = splitString[1];
@@ -294512,17 +294530,7 @@ import type { ${functionImportsToBring.join(
         const layoutParams = `${layoutQueries.length > 0 && !utilityTypes.includes("LayoutParams") ? "\ntype LayoutParams = LayoutLoadEvent['params'];" : ""}`;
         const pageParams = `${pageQueries.length > 0 && !utilityTypes.includes("PageParams") ? "\ntype PageParams = PageLoadEvent['params'];" : ""}`;
         utilityTypes = utilityTypes.concat(layoutParams).concat(pageParams).replaceAll(/\$types\.js/gm, "$houdini");
-        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(append_beforeLoad(beforeLayoutLoad)).concat(append_beforeLoad(beforePageLoad)).concat(append_afterLoad("Layout", afterLayoutLoad, layoutQueries)).concat(append_afterLoad("Page", afterPageLoad, pageQueries)).concat(
-          append_onError(
-            onPageError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(
-          append_onError(
-            onLayoutError,
-            pageQueries.filter((x4) => x4.variableDefinitions?.length).length > 0
-          )
-        ).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
+        typeExports = typeExports.concat(append_loadInput(layoutQueries)).concat(append_loadInput(pageQueries)).concat(layout_append_beforeLoad).concat(page_append_beforeLoad).concat(layout_append_afterLoad).concat(page_append_afterLoad).concat(layout_append_onError).concat(page_append_onError).concat(layout_append_VariablesFunction).concat(page_append_VariablesFunction).replace(
           /(?<=LayoutData = )([\s\S]*?)(?=;)/,
           `Expand<$1 & { ${layoutQueries.map((query) => {
             const name2 = query.name.value;
@@ -294586,9 +294594,9 @@ type LoadInput = { ${queries.filter((query) => query.variableDefinitions?.length
     return [name2, name2 + "$input"].join(": ");
   }).join("; ")} };` : ""}`;
 }
-function append_afterLoad(type, afterLoad, queries) {
+function append_afterLoad(afterLoad, type, queries) {
   return afterLoad ? `
-type AfterLoadReturn = ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>;
+type AfterLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').afterLoad>>;
 type AfterLoadData = {
 	${internal_append_afterLoad(queries)}
 };
@@ -294606,15 +294614,15 @@ function internal_append_afterLoad(queries) {
     return [name2, name2 + "$result"].join(": ");
   }).join(";\n	")}`;
 }
-function append_beforeLoad(beforeLoad) {
+function append_beforeLoad(beforeLoad, type) {
   return beforeLoad ? `
 export type BeforeLoadEvent = PageLoadEvent;
-type BeforeLoadReturn = ReturnType<typeof import('./+page').beforeLoad>;
+type BeforeLoadReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').beforeLoad>>;
 ` : "";
 }
-function append_onError(onError, hasLoadInput) {
+function append_onError(onError, type, hasLoadInput) {
   return onError ? `
-type OnErrorReturn = ReturnType<typeof import('./+page').onError>;
+type OnErrorReturn = Awaited<ReturnType<typeof import('./+${type.toLowerCase()}').onError>>;
 export type OnErrorEvent =  { event: Kit.LoadEvent, input: ${hasLoadInput ? "LoadInput" : "{}"}, error: Error | Error[] };
 ` : "";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini-svelte",
-  "version": "0.17.11",
+  "version": "0.17.12",
   "description": "The svelte plugin for houdini",
   "keywords": [
     "typescript",
@@ -23,7 +23,7 @@
     "ast-types": "^0.15.1",
     "estree-walker": "^3.0.1",
     "graphql": "^15.8.0",
-    "houdini": "^0.17.11",
+    "houdini": "^0.17.12",
     "minimatch": "^5.1.0",
     "recast": "^0.21.5",
     "svelte": "^3.52.0"