make Payload a class

Ocean-OS · Ocean-OS · commit 6f64812ea14e · 2025-03-17T17:39:58.000-07:00
diff --git a/packages/svelte/src/internal/server/blocks/snippet.js b/packages/svelte/src/internal/server/blocks/snippet.js
@@ -1,5 +1,5 @@
 /** @import { Snippet } from 'svelte' */
-/** @import { Payload } from '#server' */
+/** @import { Payload } from '../index' */
 /** @import { Getters } from '#shared' */
 
 /**
diff --git a/packages/svelte/src/internal/server/dev.js b/packages/svelte/src/internal/server/dev.js
@@ -1,11 +1,12 @@
-/** @import { Component, Payload } from '#server' */
+/** @import { Component } from '#server' */
 import { FILENAME } from '../../constants.js';
 import {
 	is_tag_valid_with_ancestor,
 	is_tag_valid_with_parent
 } from '../../html-tree-validation.js';
 import { current_component } from './context.js';
 import { invalid_snippet_arguments } from '../shared/errors.js';
+import { Payload } from './index.js';
 
 /**
  * @typedef {{
@@ -104,7 +105,7 @@ export function pop_element() {
  * @param {Payload} payload
  */
 export function validate_snippet_args(payload) {
-	if (typeof payload !== 'object' || !('out' in payload)) {
+	if (typeof payload !== 'object' || !(payload instanceof Payload)) {
 		invalid_snippet_arguments();
 	}
 }
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
@@ -1,5 +1,5 @@
 /** @import { ComponentType, SvelteComponent } from 'svelte' */
-/** @import { Component, Payload, RenderOutput } from '#server' */
+/** @import { Component, RenderOutput } from '#server' */
 /** @import { Store } from '#shared' */
 export { FILENAME, HMR } from '../../constants.js';
 import { attr, clsx, to_class, to_style } from '../shared/attributes.js';
@@ -96,6 +96,24 @@ function props_id_generator(prefix) {
 	return () => `${prefix}s${uid++}`;
 }
 
+class Payload {
+	out = '';
+	/**@type {Set<{ hash: string; code: string }>} */
+	css = new Set();
+	uid = () => '';
+	head = {
+		/**@type {Set<{ hash: string; code: string }>} */
+		css: new Set(),
+		title: '',
+		out: '',
+		uid: () => ''
+	};
+	constructor(idPrefix = '') {
+		this.uid = props_id_generator(idPrefix);
+		this.head.uid = this.uid;
+	}
+}
+
 /**
  * Only available on the server and when compiling with the `server` option.
  * Takes a component and returns an object with `body` and `head` properties on it, which you can use to populate the HTML when server-rendering your app.
@@ -105,14 +123,7 @@ function props_id_generator(prefix) {
  * @returns {RenderOutput}
  */
 export function render(component, options = {}) {
-	const uid = props_id_generator(options.idPrefix ? options.idPrefix + '-' : '');
-	/** @type {Payload} */
-	const payload = {
-		out: '',
-		css: new Set(),
-		head: { title: '', out: '', css: new Set(), uid },
-		uid
-	};
+	const payload = new Payload(options.idPrefix ? options.idPrefix + '' : '');
 
 	const prev_on_destroy = on_destroy;
 	on_destroy = [];
@@ -535,7 +546,7 @@ export function props_id(payload) {
 	return uid;
 }
 
-export { attr, clsx };
+export { attr, clsx, Payload };
 
 export { html } from './blocks/html.js';
 
diff --git a/packages/svelte/src/internal/server/types.d.ts b/packages/svelte/src/internal/server/types.d.ts
@@ -11,19 +11,6 @@ export interface Component {
 	function?: any;
 }
 
-export interface Payload {
-	out: string;
-	css: Set<{ hash: string; code: string }>;
-	head: {
-		title: string;
-		out: string;
-		uid: () => string;
-		css: Set<{ hash: string; code: string }>;
-	};
-	/** Function that generates a unique ID */
-	uid: () => string;
-}
-
 export interface RenderOutput {
 	/** HTML that goes into the `<head>` */
 	head: string;
