From 018e4588da2f0b764ce5e0714280b5341ffbd5a6 Mon Sep 17 00:00:00 2001
From: Ewan Croft <contact@ewancroft.uk>
Date: Sat, 15 Aug 2026 04:09:15 +0100
Subject: [PATCH] fix(svelte-standard-site): complete @bsky/sdk + @atproto/lex
 migration

- Use agent.call(com.*.main) instead of property access; adapt to body-only responses
- Update Client constructor to options object
- Fix shiki bundledLanguages Record check
- Move exported interfaces to <script module> to fix private-name .d.ts errors
- Prune index.ts exports whose names collide with component values
---
 packages/svelte-standard-site/package.json    |  1 +
 .../svelte-standard-site/src/lib/client.ts    | 29 ++++----
 .../src/lib/components/CommentsSection.svelte | 10 +--
 .../document/blocks/CodeBlock.svelte          |  4 +-
 .../document/blocks/OrderedListBlock.svelte   | 26 +++----
 .../document/blocks/UnorderedListBlock.svelte | 10 +--
 .../svelte-standard-site/src/lib/index.ts     | 27 ++------
 .../svelte-standard-site/src/lib/publisher.ts | 67 ++++++++++---------
 .../src/lib/utils/agents.ts                   |  2 +-
 .../src/lib/utils/comments.ts                 |  4 +-
 pnpm-lock.yaml                                |  3 +
 11 files changed, 91 insertions(+), 92 deletions(-)

diff --git a/packages/svelte-standard-site/package.json b/packages/svelte-standard-site/package.json
index 259d81b..f6ef3b6 100644
--- a/packages/svelte-standard-site/package.json
+++ b/packages/svelte-standard-site/package.json
@@ -98,6 +98,7 @@
   "dependencies": {
     "@bsky/sdk": "latest",
     "@atproto/lex": "^0.3.0",
+    "@atproto/lex-password-session": "^0.2.0",
     "@ewanc26/atproto": "workspace:*",
     "@ewanc26/tid": "workspace:*",
     "@ewanc26/utils": "workspace:*",
diff --git a/packages/svelte-standard-site/src/lib/client.ts b/packages/svelte-standard-site/src/lib/client.ts
index 6f05014..6057b2d 100644
--- a/packages/svelte-standard-site/src/lib/client.ts
+++ b/packages/svelte-standard-site/src/lib/client.ts
@@ -8,6 +8,7 @@ import type {
 import { cache } from './utils/cache.js';
 import { resolveIdentity, withFallback, buildPdsBlobUrl } from './utils/agents.js';
 import { parseAtUri, atUriToHttps } from './utils/at-uri.js';
+import { com } from '@bsky/sdk/lexicons';
 
 /**
  * Main client for interacting with site.standard.* records
@@ -77,12 +78,12 @@ export class SiteStandardClient {
 			const result = await withFallback(
 				this.config.did,
 				async (agent) => {
-					const response = await agent.com.atproto.repo.getRecord({
+					const response = (await agent.call(com.atproto.repo.getRecord.main as any, {
 						repo: this.config.did,
 						collection: 'site.standard.publication',
 						rkey
-					});
-					return response.data;
+					})) as any;
+					return response;
 				},
 				fetchFn
 			);
@@ -132,14 +133,14 @@ export class SiteStandardClient {
 				const records = await withFallback(
 					this.config.did,
 					async (agent) => {
-						const response = await agent.com.atproto.repo.listRecords({
+						const response = (await agent.call(com.atproto.repo.listRecords.main as any, {
 							repo: this.config.did,
 							collection: 'site.standard.publication',
 							limit: 100,
 							cursor
-						});
-						cursor = response.data.cursor;
-						return response.data.records;
+						})) as any;
+						cursor = response.cursor;
+						return response.records;
 					},
 					fetchFn
 				);
@@ -190,12 +191,12 @@ export class SiteStandardClient {
 			const result = await withFallback(
 				this.config.did,
 				async (agent) => {
-					const response = await agent.com.atproto.repo.getRecord({
+					const response = (await agent.call(com.atproto.repo.getRecord.main as any, {
 						repo: this.config.did,
 						collection: 'site.standard.document',
 						rkey
-					});
-					return response.data;
+					})) as any;
+					return response;
 				},
 				fetchFn
 			);
@@ -252,14 +253,14 @@ export class SiteStandardClient {
 				const records = await withFallback(
 					this.config.did,
 					async (agent) => {
-						const response = await agent.com.atproto.repo.listRecords({
+						const response = (await agent.call(com.atproto.repo.listRecords.main as any, {
 							repo: this.config.did,
 							collection: 'site.standard.document',
 							limit: 100,
 							cursor
-						});
-						cursor = response.data.cursor;
-						return response.data.records;
+						})) as any;
+						cursor = response.cursor;
+						return response.records;
 					},
 					fetchFn
 				);
diff --git a/packages/svelte-standard-site/src/lib/components/CommentsSection.svelte b/packages/svelte-standard-site/src/lib/components/CommentsSection.svelte
index 946a091..b76c026 100644
--- a/packages/svelte-standard-site/src/lib/components/CommentsSection.svelte
+++ b/packages/svelte-standard-site/src/lib/components/CommentsSection.svelte
@@ -1,7 +1,4 @@
-<script lang="ts">
-	import Comment from './Comment.svelte';
-	import { organizeCommentsIntoThreads } from '$lib/utils/native-comments.js';
-
+<script module lang="ts">
 	export interface CommentProps {
 		uri: string;
 		cid: string;
@@ -19,6 +16,11 @@
 		facets?: any[];
 		attachment?: any;
 	}
+</script>
+
+<script lang="ts">
+	import Comment from './Comment.svelte';
+	import { organizeCommentsIntoThreads } from '$lib/utils/native-comments.js';
 
 	interface Props {
 		/** AT-URI of the document */
diff --git a/packages/svelte-standard-site/src/lib/components/document/blocks/CodeBlock.svelte b/packages/svelte-standard-site/src/lib/components/document/blocks/CodeBlock.svelte
index 06493f5..400f190 100644
--- a/packages/svelte-standard-site/src/lib/components/document/blocks/CodeBlock.svelte
+++ b/packages/svelte-standard-site/src/lib/components/document/blocks/CodeBlock.svelte
@@ -25,8 +25,8 @@
 		try {
 			const { codeToHtml, bundledLanguages, bundledThemes } = await import('shiki');
 
-			// shiki 4: bundledLanguages is string[], bundledThemes is Record<string, Theme>
-			const lang = bundledLanguages.includes(block.language ?? '') ? block.language! : 'plaintext';
+			// shiki 4: bundledLanguages is a Record, bundledThemes is Record<string, Theme>
+			const lang = (block.language ?? '') in bundledLanguages ? block.language! : 'plaintext';
 			const theme = block.syntaxHighlightingTheme && block.syntaxHighlightingTheme in bundledThemes
 				? block.syntaxHighlightingTheme
 				: 'github-light';
diff --git a/packages/svelte-standard-site/src/lib/components/document/blocks/OrderedListBlock.svelte b/packages/svelte-standard-site/src/lib/components/document/blocks/OrderedListBlock.svelte
index 0acc93f..e0ddfb5 100644
--- a/packages/svelte-standard-site/src/lib/components/document/blocks/OrderedListBlock.svelte
+++ b/packages/svelte-standard-site/src/lib/components/document/blocks/OrderedListBlock.svelte
@@ -1,3 +1,17 @@
+<script module lang="ts">
+	export interface OrderedListItem {
+		content?: OrderedListContent;
+		checked?: boolean;
+		children?: OrderedListItem[];
+		unorderedListChildren?: {
+			children: Array<{
+				content?: { plaintext: string; facets?: any[] };
+				children?: OrderedListItem[];
+			}>;
+		};
+	}
+</script>
+
 <script lang="ts">
 	import RichText from '../RichText.svelte';
 	import OrderedListBlock from './OrderedListBlock.svelte';
@@ -20,18 +34,6 @@
 		aspectRatio?: { width: number; height: number };
 	}
 
-	export interface OrderedListItem {
-		content?: OrderedListContent;
-		checked?: boolean;
-		children?: OrderedListItem[];
-		unorderedListChildren?: {
-			children: Array<{
-				content?: { plaintext: string; facets?: any[] };
-				children?: OrderedListItem[];
-			}>;
-		};
-	}
-
 	interface Props {
 		block: {
 			children: OrderedListItem[];
diff --git a/packages/svelte-standard-site/src/lib/components/document/blocks/UnorderedListBlock.svelte b/packages/svelte-standard-site/src/lib/components/document/blocks/UnorderedListBlock.svelte
index fe44e01..6ec7d8e 100644
--- a/packages/svelte-standard-site/src/lib/components/document/blocks/UnorderedListBlock.svelte
+++ b/packages/svelte-standard-site/src/lib/components/document/blocks/UnorderedListBlock.svelte
@@ -1,7 +1,4 @@
-<script lang="ts">
-	import RichText from '../RichText.svelte';
-	import UnorderedListBlock from './UnorderedListBlock.svelte';
-
+<script module lang="ts">
 	export interface ListItem {
 		content?: {
 			plaintext: string;
@@ -9,6 +6,11 @@
 		};
 		children?: ListItem[];
 	}
+</script>
+
+<script lang="ts">
+	import RichText from '../RichText.svelte';
+	import UnorderedListBlock from './UnorderedListBlock.svelte';
 
 	interface Props {
 		block: {
diff --git a/packages/svelte-standard-site/src/lib/index.ts b/packages/svelte-standard-site/src/lib/index.ts
index 02a7db5..64208a6 100644
--- a/packages/svelte-standard-site/src/lib/index.ts
+++ b/packages/svelte-standard-site/src/lib/index.ts
@@ -82,24 +82,9 @@ export type {
 	FootnoteFeature,
 	FacetFeature,
 	Facet,
-	// Block types
-	TextBlock,
-	HeaderBlock,
-	BlockquoteBlock,
-	ImageBlock,
-	CodeBlock,
-	MathBlock,
+	// Block types (component-colliding data types are exported as `Block` union members)
 	OrderedListItem,
-	OrderedListBlock,
 	UnorderedListItem,
-	UnorderedListBlock,
-	HorizontalRuleBlock,
-	IframeBlock,
-	WebsiteBlock,
-	ButtonBlock,
-	BskyPostBlock,
-	PollBlock,
-	PageBlock,
 	Block,
 	// Content types
 	Position,
@@ -118,6 +103,10 @@ export type {
 	LeafletSubscriptionRecord
 } from './types.js';
 
+// Block data types (TextBlock, HeaderBlock, etc.) are not re-exported here:
+// their names are taken by the Svelte component values in ./components/index.js.
+// They remain available via './types.js' and the exported `Block` union type.
+
 // Schema exports
 export type {
 	PublisherConfig,
@@ -161,9 +150,7 @@ export {
 	getFontStyles,
 	getHeadingFontStyles,
 	getPageWidthStyles,
-	themeToCssVars,
-	extendedThemeToCssVars,
-	anyThemeToCssVars
+	themeToCssVars
 } from './utils/theme-helpers.js';
 
 export {
@@ -188,7 +175,7 @@ export type { TransformOptions, TransformResult } from './utils/content.js';
 // Comments exports (Bluesky replies)
 export { fetchComments, fetchMentionComments, formatRelativeTime } from './utils/comments.js';
 
-export type { Comment, CommentAuthor, FetchCommentsOptions } from './utils/comments.js';
+export type { CommentAuthor, FetchCommentsOptions } from './utils/comments.js';
 
 // Native comments exports
 export {
diff --git a/packages/svelte-standard-site/src/lib/publisher.ts b/packages/svelte-standard-site/src/lib/publisher.ts
index 38fa4ca..17826d8 100644
--- a/packages/svelte-standard-site/src/lib/publisher.ts
+++ b/packages/svelte-standard-site/src/lib/publisher.ts
@@ -29,7 +29,8 @@
 
 import { Client } from '@atproto/lex'
 import { PasswordSession } from '@atproto/lex-password-session'
-import { api, com } from '@bsky/sdk'
+import { api } from '@bsky/sdk'
+import { com } from '@bsky/sdk/lexicons'
 import type { PublisherConfig, Document, Publication } from './schemas.js'
 import { PublisherConfigSchema, COLLECTIONS } from './schemas.js'
 
@@ -277,12 +278,12 @@ export class StandardSitePublisher {
 
 		const rkey = generateTid();
 
-		const response = await client.call(com.atproto.repo.createRecord, {
+		const response = (await client.call(com.atproto.repo.createRecord.main as any, {
 			repo: did,
 			collection: COLLECTIONS.DOCUMENT,
 			rkey,
 			record: cleanRecord
-		});
+		})) as any;
 
 		return {
 			uri: response.uri,
@@ -317,12 +318,12 @@ export class StandardSitePublisher {
 			Object.entries(record).filter(([_, v]) => v !== undefined)
 		) as Document;
 
-		const response = await client.call(com.atproto.repo.putRecord, {
+		const response = (await client.call(com.atproto.repo.putRecord.main as any, {
 			repo: did,
 			collection: COLLECTIONS.DOCUMENT,
 			rkey,
 			record: cleanRecord
-		});
+		})) as any;
 
 		return {
 			uri: response.uri,
@@ -334,7 +335,7 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		await client.call(com.atproto.repo.deleteRecord, {
+		await client.call(com.atproto.repo.deleteRecord.main as any, {
 			repo: did,
 			collection: COLLECTIONS.DOCUMENT,
 			rkey
@@ -362,12 +363,12 @@ export class StandardSitePublisher {
 		// Generate TID for record key per lexicon spec (key: "tid")
 		const rkey = generateTid();
 
-		const response = await client.call(com.atproto.repo.createRecord, {
+		const response = (await client.call(com.atproto.repo.createRecord.main as any, {
 			repo: did,
 			collection: COLLECTIONS.PUBLICATION,
 			rkey,
 			record: cleanRecord
-		});
+		})) as any;
 
 		return {
 			uri: response.uri,
@@ -393,12 +394,12 @@ export class StandardSitePublisher {
 			Object.entries(record).filter(([_, v]) => v !== undefined)
 		) as Publication;
 
-		const response = await client.call(com.atproto.repo.putRecord, {
+		const response = (await client.call(com.atproto.repo.putRecord.main as any, {
 			repo: did,
 			collection: COLLECTIONS.PUBLICATION,
 			rkey,
 			record: cleanRecord
-		});
+		})) as any;
 
 		return {
 			uri: response.uri,
@@ -410,7 +411,7 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		await client.call(com.atproto.repo.deleteRecord, {
+		await client.call(com.atproto.repo.deleteRecord.main as any, {
 			repo: did,
 			collection: COLLECTIONS.PUBLICATION,
 			rkey
@@ -423,13 +424,13 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		const response = await client.call(com.atproto.repo.listRecords, {
+		const response = (await client.call(com.atproto.repo.listRecords.main as any, {
 			repo: did,
 			collection: COLLECTIONS.DOCUMENT,
 			limit
-		});
+		})) as any;
 
-		return response.records.map((r) => ({
+		return response.records.map((r: any) => ({
 			uri: r.uri,
 			cid: r.cid,
 			value: r.value as Document
@@ -442,13 +443,13 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		const response = await client.call(com.atproto.repo.listRecords, {
+		const response = (await client.call(com.atproto.repo.listRecords.main as any, {
 			repo: did,
 			collection: COLLECTIONS.PUBLICATION,
 			limit
-		});
+		})) as any;
 
-		return response.records.map((r) => ({
+		return response.records.map((r: any) => ({
 			uri: r.uri,
 			cid: r.cid,
 			value: r.value as Publication
@@ -520,12 +521,12 @@ export class StandardSitePublisher {
 
 		const rkey = generateTid();
 
-		const response = await client.call(com.atproto.repo.createRecord({
+		const response = (await client.call(com.atproto.repo.createRecord.main as any, {
 			repo: did,
 			collection: 'pub.leaflet.comment',
 			rkey,
 			record
-		});
+		})) as any;
 
 		return {
 			uri: response.uri,
@@ -540,7 +541,7 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		await client.call(com.atproto.repo.deleteRecord({
+		await client.call(com.atproto.repo.deleteRecord.main as any, {
 			repo: did,
 			collection: 'pub.leaflet.comment',
 			rkey
@@ -566,12 +567,12 @@ export class StandardSitePublisher {
 
 		const rkey = generateTid();
 
-		const response = await client.call(com.atproto.repo.createRecord({
+		const response = (await client.call(com.atproto.repo.createRecord.main as any, {
 			repo: did,
 			collection: 'pub.leaflet.interactions.recommend',
 			rkey,
 			record
-		});
+		})) as any;
 
 		return {
 			uri: response.uri,
@@ -586,7 +587,7 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		await client.call(com.atproto.repo.deleteRecord({
+		await client.call(com.atproto.repo.deleteRecord.main as any, {
 			repo: did,
 			collection: 'pub.leaflet.interactions.recommend',
 			rkey
@@ -600,11 +601,11 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		const response = await client.call(com.atproto.repo.listRecords({
+		const response = (await client.call(com.atproto.repo.listRecords.main as any, {
 			repo: did,
 			collection: 'pub.leaflet.interactions.recommend',
 			limit: 100
-		});
+		})) as any;
 
 		const record = response.records.find(
 			(r: any) => r.value?.subject === subject
@@ -636,12 +637,12 @@ export class StandardSitePublisher {
 
 		const rkey = generateTid();
 
-		const response = await client.call(com.atproto.repo.createRecord({
+		const response = (await client.call(com.atproto.repo.createRecord.main as any, {
 			repo: did,
 			collection: 'site.standard.graph.subscription',
 			rkey,
 			record
-		});
+		})) as any;
 
 		return {
 			uri: response.uri,
@@ -656,7 +657,7 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		await client.call(com.atproto.repo.deleteRecord({
+		await client.call(com.atproto.repo.deleteRecord.main as any, {
 			repo: did,
 			collection: 'site.standard.graph.subscription',
 			rkey
@@ -672,13 +673,13 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		const response = await client.call(com.atproto.repo.listRecords({
+		const response = (await client.call(com.atproto.repo.listRecords.main as any, {
 			repo: did,
 			collection: 'site.standard.graph.subscription',
 			limit
-		});
+		})) as any;
 
-		return response.records.map((r) => ({
+		return response.records.map((r: any) => ({
 			uri: r.uri,
 			cid: r.cid,
 			value: r.value as { publication: string }
@@ -692,11 +693,11 @@ export class StandardSitePublisher {
 		const did = this.getDid();
 		const client = this.getClient();
 
-		const response = await client.call(com.atproto.repo.listRecords({
+		const response = (await client.call(com.atproto.repo.listRecords.main as any, {
 			repo: did,
 			collection: 'site.standard.graph.subscription',
 			limit: 100
-		});
+		})) as any;
 
 		const record = response.records.find(
 			(r: any) => r.value?.publication === publication
diff --git a/packages/svelte-standard-site/src/lib/utils/agents.ts b/packages/svelte-standard-site/src/lib/utils/agents.ts
index 526dfe9..cf30b5c 100644
--- a/packages/svelte-standard-site/src/lib/utils/agents.ts
+++ b/packages/svelte-standard-site/src/lib/utils/agents.ts
@@ -21,7 +21,7 @@ export function createAgent(service: string, fetchFn?: typeof fetch): Client {
 			}
 		: undefined;
 
-	return new Client(service, { fetch: wrappedFetch });
+	return new Client({ service, fetch: wrappedFetch });
 }
 
 /**
diff --git a/packages/svelte-standard-site/src/lib/utils/comments.ts b/packages/svelte-standard-site/src/lib/utils/comments.ts
index 7c92922..3c981ec 100644
--- a/packages/svelte-standard-site/src/lib/utils/comments.ts
+++ b/packages/svelte-standard-site/src/lib/utils/comments.ts
@@ -71,11 +71,11 @@ async function fetchThread(
 	currentDepth = 0
 ): Promise<Comment | null> {
 	try {
-		const response = await client.call(app.bsky.feed.getPostThread, {
+		const response = (await client.call(app.bsky.feed.getPostThread.main as any, {
 			uri,
 			depth: maxDepth - currentDepth,
 			parentHeight: 0
-		});
+		})) as any;
 
 		const thread = response.thread;
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 53dd8a8..1d20fc6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -727,6 +727,9 @@ importers:
       '@atproto/lex':
         specifier: ^0.3.0
         version: 0.3.6
+      '@atproto/lex-password-session':
+        specifier: ^0.2.0
+        version: 0.2.0
       '@bsky/sdk':
         specifier: latest
         version: 1.0.0(@atproto/lex@0.3.6)
-- 
2.51.2