fix: ... (spread vs. rest property) variable assignment

backend/src/activitypub/activities/handle.ts

@@ -143,6 +143,9 @@ export async function handle(
 			let target = PUBLIC_GROUP
 
 			if (Array.isArray(activity.to) && activity.to.length > 0) {
+				// TODO: Double-check that this is working as intended
+				// because this syntax will silently fail if `recipients` or `activity.to` are multi-dimensional arrays
+				// ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax#sect1
 				recipients = [...recipients, ...activity.to]
 
 				if (activity.to.length !== 1) {
@@ -151,6 +154,9 @@ export async function handle(
 				target = activity.to[0]
 			}
 			if (Array.isArray(activity.cc) && activity.cc.length > 0) {
+				// TODO: Double-check that this is working as intended
+				// because this syntax will silently fail if `recipients` or `activity.cc` are multi-dimensional arrays
+				// ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax#sect1
 				recipients = [...recipients, ...activity.cc]
 			}
 

backend/src/activitypub/actors/index.ts

@@ -295,11 +295,11 @@ export function personFromRow(row: any): Person {
 		}
 	}
 
+	// prettier-ignore
 	return {
 		// Hidden values
 		[emailSymbol]: row.email,
 
-		...properties,
 		name,
 		icon,
 		image,
@@ -311,5 +311,6 @@ export function personFromRow(row: any): Person {
 		published: new Date(row.cdate).toISOString(),
 
 		url: new URL('@' + preferredUsername, 'https://' + domain),
+		...properties
 	} as unknown as Person
 }

backend/src/activitypub/objects/index.ts

@@ -57,14 +57,15 @@ export async function createObject<Type extends APObject>(
 		.bind(apId, type, JSON.stringify(sanitizedProperties), originalActorId.toString(), local ? 1 : 0, uuid)
 		.first()
 
+	// prettier-ignore
 	return {
-		...sanitizedProperties,
 		type,
 		id: new URL(row.id),
 		published: new Date(row.cdate).toISOString(),
 
 		[mastodonIdSymbol]: row.mastodon_id,
 		[originalActorIdSymbol]: row.original_actor_id,
+		...sanitizedProperties
 	} as Type
 }
 
@@ -129,16 +130,19 @@ export async function cacheObject(
 
 	{
 		const properties = JSON.parse(row.properties)
+
+		// prettier-ignore
 		const object = {
 			published: new Date(row.cdate).toISOString(),
-			...properties,
 
 			type: row.type,
 			id: new URL(row.id),
 
 			[mastodonIdSymbol]: row.mastodon_id,
 			[originalActorIdSymbol]: row.original_actor_id,
 			[originalObjectIdSymbol]: row.original_object_id,
+
+			...properties
 		} as APObject
 
 		return { object, created: true }
@@ -208,16 +212,17 @@ export async function getObjectBy(db: Database, key: ObjectByKey, value: string)
 	const result: any = results[0]
 	const properties = JSON.parse(result.properties)
 
+	// prettier-ignore
 	return {
 		published: new Date(result.cdate).toISOString(),
-		...properties,
 
 		type: result.type,
 		id: new URL(result.id),
 
 		[mastodonIdSymbol]: result.mastodon_id,
 		[originalActorIdSymbol]: result.original_actor_id,
 		[originalObjectIdSymbol]: result.original_object_id,
+		...properties
 	} as APObject
 }
 
@@ -231,9 +236,12 @@ export async function sanitizeObjectProperties(properties: unknown): Promise<APO
 	if (!isAPObject(properties)) {
 		throw new Error('Invalid object properties. Expected an object but got ' + JSON.stringify(properties))
 	}
+
+	// prettier-ignore
 	const sanitized: APObject = {
-		...properties,
+		...properties
 	}
+
 	if ('content' in properties) {
 		sanitized.content = await sanitizeContent(properties.content as string)
 	}

backend/src/activitypub/objects/note.ts

@@ -32,6 +32,7 @@ export async function createPublicNote(
 ): Promise<Note> {
 	const actorId = new URL(actor.id)
 
+	// prettier-ignore
 	const properties = {
 		attributedTo: actorId,
 		content,
@@ -46,7 +47,7 @@ export async function createPublicNote(
 
 		attachment: attachments,
 		inReplyTo: null,
-		...extraProperties,
+		...extraProperties
 	}
 
 	return (await objects.createObject(domain, db, NOTE, properties, actorId, true)) as Note
@@ -63,6 +64,7 @@ export async function createDirectNote(
 ): Promise<Note> {
 	const actorId = new URL(actor.id)
 
+	// prettier-ignore
 	const properties = {
 		attributedTo: actorId,
 		content,
@@ -77,7 +79,7 @@ export async function createDirectNote(
 		tag: [],
 		attachment,
 
-		...extraProperties,
+		...extraProperties
 	}
 
 	return (await objects.createObject(domain, db, NOTE, properties, actorId, true)) as Note

backend/src/database/neon.ts

@@ -90,6 +90,9 @@ export class PreparedStatement {
 	}
 
 	bind(...values: any[]): PreparedStatement {
+		// TODO: Double-check that this is working as intended
+		// because this syntax will silently fail if `this.values` or `values` are multi-dimensional arrays
+		// ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax#sect1
 		return new PreparedStatement(this.env, this.query, [...this.values, ...values], this.client)
 	}
 

backend/src/errors/index.ts

@@ -5,16 +5,19 @@ type ErrorResponse = {
 	error_description?: string
 }
 
+// prettier-ignore
 const headers = {
-	...cors(),
 	'content-type': 'application/json; charset=utf-8',
+	...cors()
 } as const
 
 function generateErrorResponse(error: string, status: number, errorDescription?: string): Response {
+	// prettier-ignore
 	const res: ErrorResponse = {
 		error: `${error}. If the problem persists please contact your instance administrator.`,
-		...(errorDescription ? { error_description: errorDescription } : {}),
+		...(errorDescription ? { error_description: errorDescription } : {})
 	}
+
 	return new Response(JSON.stringify(res), { headers, status })
 }
 

backend/src/mastodon/idempotency.ts

@@ -38,15 +38,14 @@ export async function hasKey(db: Database, key: string): Promise<APObject | null
 	const result = results[0]
 	const properties = JSON.parse(result.properties)
 
+	// prettier-ignore
 	return {
 		published: new Date(result.cdate).toISOString(),
-		...properties,
-
 		type: result.type,
 		id: new URL(result.id),
-
 		[mastodonIdSymbol]: result.mastodon_id,
 		[originalActorIdSymbol]: result.original_actor_id,
 		[originalObjectIdSymbol]: result.original_object_id,
+		...properties
 	} as APObject
 }

backend/src/mastodon/status.ts

@@ -168,9 +168,10 @@ export async function toMastodonStatusFromRow(domain: string, db: Database, row:
 		const account = await loadExternalMastodonAccount(acct, author)
 
 		// Restore reblogged status
+		// prettier-ignore
 		status.reblog = {
-			...status,
 			account,
+			...status
 		}
 	}
 

backend/src/middleware/main.ts

@@ -39,9 +39,10 @@ async function loadContextData(db: Database, clientId: string, email: string, ct
 
 export async function main(context: EventContext<Env, any, any>) {
 	if (context.request.method === 'OPTIONS') {
+		// prettier-ignore
 		const headers = {
-			...cors(),
 			'content-type': 'application/json',
+			...cors()
 		}
 		return new Response('', { headers })
 	}

backend/src/utils/http-signing-cavage.ts

@@ -157,11 +157,14 @@ export async function generateDigestHeader(body: string): Promise<string> {
 
 export async function sign(request: Request, opts: SignOptions): Promise<void> {
 	const signingComponents: Component[] = opts.components ?? defaultSigningComponents
+
+	// prettier-ignore
 	const signingParams: Parameters = {
-		...opts.parameters,
 		keyid: opts.keyId,
 		alg: opts.signer.alg,
+		...opts.parameters
 	}
+
 	const signatureInputString = buildSignatureInputString(signingComponents, signingParams)
 	const dataToSign = buildSignedData(request, signingComponents, signingParams)
 	const signature = await opts.signer(dataToSign)

frontend/mock-db/run.mjs

@@ -22,7 +22,7 @@ async function main() {
 		define: ['jest:{}'],
 	}
 	const workerPath = resolve(__dirname, './worker.ts')
-	const worker = await unstable_dev(workerPath, { ...options, experimental: { disableExperimentalWarning: true } })
+	const worker = await unstable_dev(workerPath, { experimental: { disableExperimentalWarning: true }, ...options })
 	await worker.fetch()
 	await worker.stop()
 }

frontend/src/components/MediaGallery.tsx/Image.tsx

@@ -32,7 +32,7 @@ export default component$<Props>(({ mediaAttachment, onOpenImagesModal$ }) => {
 				<img
 					class="object-cover w-full h-full rounded cursor-pointer"
 					style={{
-						...(objectFit && { 'object-position': `${objectFit.x}% ${objectFit.y}%` }),
+						...(objectFit && { 'object-position': `${objectFit.x}% ${objectFit.y}%` })
 					}}
 					src={mediaAttachment.preview_url || mediaAttachment.url}
 					onClick$={() => onOpenImagesModal$(mediaAttachment.id)}

frontend/src/components/StatusesPanel/StatusesPanel.tsx

@@ -21,6 +21,9 @@ export const StatusesPanel = component$(({ initialStatuses, fetchMoreStatuses: f
 		const newStatuses = await fetchMoreStatusesFn(statuses.value.length)
 		fetchingMoreStatuses.value = false
 		noMoreStatusesAvailable.value = newStatuses.length === 0
+		// TODO: Double-check that this is working as intended
+		// because this syntax will silently fail with multi-dimensional arrays
+		// ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax#sect1
 		statuses.value = [...statuses.value, ...newStatuses]
 	})
 

frontend/src/dummyData/accounts.ts

@@ -41,11 +41,11 @@ export const rafael = generateDummyAccount({
 	avatar_static: getAvatarUrl(309),
 })
 
+// prettier-ignore
 function generateDummyAccount(
 	details: Pick<Account, 'username' | 'acct' | 'display_name' | 'avatar' | 'avatar_static'>
 ): Account {
 	return {
-		...details,
 		id: `${Math.round(Math.random() * 9999999)}`.padStart(7, '0'),
 		locked: false,
 		bot: false,
@@ -88,6 +88,7 @@ function generateDummyAccount(
 				verified_at: null,
 			},
 		],
+		...details
 	}
 }
 

frontend/src/dummyData/statuses.ts

@@ -54,12 +54,13 @@ const mastodonRawStatuses: MastodonStatus[] = [
 	}),
 ]
 
+// prettier-ignore
 export const statuses: MastodonStatus[] = mastodonRawStatuses.map((rawStatus) => ({
-	...rawStatus,
 	media_attachments: rawStatus.media_attachments.map((mediaAttachment) => ({
-		...mediaAttachment,
 		type: getStandardMediaType(mediaAttachment.type),
+		...mediaAttachment
 	})),
+	...rawStatus
 }))
 
 export const replies: MastodonStatus[] = [

frontend/src/entry.ssr.tsx

@@ -11,11 +11,11 @@ import Root from './root'
 export default function (opts: RenderToStreamOptions) {
 	return renderToStream(<Root />, {
 		manifest,
-		...opts,
 		// Use container attributes to set attributes on the html tag.
 		containerAttributes: {
 			lang: 'en-us',
-			...opts.containerAttributes,
+			...opts.containerAttributes
 		},
+		...opts
 	})
 }

frontend/src/routes/(frontend)/[accountId]/layout.tsx

@@ -65,12 +65,13 @@ export default component$(() => {
 	const location = useLocation()
 	const currentPath = location.pathname.replace(/\/$/, '')
 
+	// prettier-ignore
 	const fields = [
 		{
 			name: 'Joined',
 			value: formatDateTime(pageDetails.account.created_at, false),
 		},
-		...pageDetails.account.fields,
+		...pageDetails.account.fields
 	]
 
 	const stats = [

functions/.well-known/nodeinfo.ts

@@ -1,10 +1,11 @@
 import type { Env } from 'wildebeest/backend/src/types/env'
 import { cors } from 'wildebeest/backend/src/utils/cors'
 
+// prettier-ignore
 const headers = {
-	...cors(),
 	'content-type': 'application/json',
 	'cache-control': 'max-age=259200, public',
+	...cors()
 }
 
 export const onRequest: PagesFunction<Env, any> = async ({ env }) => {

functions/ap/o/[id].ts

@@ -8,9 +8,10 @@ export const onRequest: PagesFunction<Env, any> = async ({ params, request, env
 	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
+// prettier-ignore
 const headers = {
-	...cors(),
 	'content-type': 'application/activity+json; charset=utf-8',
+	...cors()
 }
 
 export async function handleRequest(domain: string, db: Database, id: string): Promise<Response> {
@@ -19,6 +20,7 @@ export async function handleRequest(domain: string, db: Database, id: string): P
 		return new Response('', { status: 404 })
 	}
 
+	// prettier-ignore
 	const res = {
 		// TODO: should this be part of the object?
 		'@context': [
@@ -33,8 +35,7 @@ export async function handleRequest(domain: string, db: Database, id: string): P
 				votersCount: 'toot:votersCount',
 			},
 		],
-
-		...obj,
+		...obj
 	}
 
 	return new Response(JSON.stringify(res), { status: 200, headers })