@sveltejs/kit 1.0.0-next.500 → 1.0.0-next.501

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.500",
+  "version": "1.0.0-next.501",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/runtime/client/ambient.d.ts

@@ -24,3 +24,7 @@ declare module '__GENERATED__/client-manifest.js' {
 
 	export const hooks: ClientHooks;
 }
+
+declare module '__GENERATED__/root.svelte' {
+	export { SvelteComponent as default } from 'svelte';
+}

package/src/runtime/client/client.js

@@ -9,6 +9,7 @@ import { nodes, server_loads, dictionary, matchers, hooks } from '__GENERATED__/
 import { HttpError, Redirect } from '../control.js';
 import { stores } from './singletons.js';
 import { DATA_SUFFIX } from '../../constants.js';
+import { unwrap_promises } from '../../utils/promises.js';
 
 const SCROLL_KEY = 'sveltekit:scroll';
 const INDEX_KEY = 'sveltekit:index';
@@ -608,6 +609,7 @@ export function create_client({ target, base, trailing_slash }) {
 			} else {
 				data = (await node.shared.load.call(null, load_input)) ?? null;
 			}
+			data = data ? await unwrap_promises(data) : null;
 		}
 
 		return {

package/src/runtime/server/page/load_data.js

@@ -1,5 +1,5 @@
 import { disable_search, make_trackable } from '../../../utils/url.js';
-
+import { unwrap_promises } from '../../../utils/promises.js';
 /**
  * Calls the user's `load` function.
  * @param {{
@@ -110,15 +110,3 @@ export async function load_data({ event, fetcher, node, parent, server_data_prom
 
 	return data ? unwrap_promises(data) : null;
 }
-
-/** @param {Record<string, any>} object */
-async function unwrap_promises(object) {
-	/** @type {Record<string, any>} */
-	const unwrapped = {};
-
-	for (const key in object) {
-		unwrapped[key] = await object[key];
-	}
-
-	return unwrapped;
-}

package/src/utils/promises.js

@@ -0,0 +1,17 @@
+/**
+ * Given an object, return a new object where all top level values are awaited
+ *
+ * @param {Record<string, any>} object
+ * @returns {Promise<Record<string, any>>}
+ */
+export async function unwrap_promises(object) {
+	for (const key in object) {
+		if (typeof object[key]?.then === 'function') {
+			return Object.fromEntries(
+				await Promise.all(Object.entries(object).map(async ([key, value]) => [key, await value]))
+			);
+		}
+	}
+
+	return object;
+}