@pylonsync/create-pylon 0.3.54 → 0.3.57

package/templates/mac/chat/apps/mac/Sources/__APP_NAME_PASCAL__/ChatRootView.swift

@@ -1,25 +1,35 @@
 import SwiftUI
 import PylonClient
+import PylonSync
+import PylonSwiftUI
 
 /// macOS chat: rooms in a sidebar, room view in the detail pane.
-/// Polls the active room every 1.5s. Replace with PylonQuery<Message>
-/// from PylonSwiftUI for realtime push.
+/// PylonQuery<Room> subscribes via the SyncEngine — new rooms from
+/// any client appear without polling. Same story inside RoomView for
+/// messages.
 struct ChatRootView: View {
 	@EnvironmentObject var session: AppSession
-	@State private var rooms: [Room] = []
+	let engine: SyncEngine
+	@StateObject private var rooms: PylonQuery<Room>
 	@State private var selected: Room.ID?
 	@State private var showingCreate = false
 	@State private var draftSlug = ""
 	@State private var draftName = ""
-	@State private var loading = true
 	@State private var errorMessage: String?
 
+	init(engine: SyncEngine) {
+		self.engine = engine
+		_rooms = StateObject(
+			wrappedValue: PylonQuery<Room>(engine: engine, entity: "Room"),
+		)
+	}
+
 	var body: some View {
 		NavigationSplitView {
 			VStack(spacing: 0) {
 				List(selection: $selected) {
 					Section("Rooms") {
-						ForEach(rooms) { r in
+						ForEach(sortedRooms) { r in
 							VStack(alignment: .leading, spacing: 2) {
 								Text(r.name)
 								Text("#\(r.slug)")
@@ -54,19 +64,27 @@ struct ChatRootView: View {
 				createSheet
 			}
 		} detail: {
-			if let id = selected, let room = rooms.first(where: { $0.id == id }) {
-				RoomView(room: room)
+			if let id = selected, let room = sortedRooms.first(where: { $0.id == id }) {
+				RoomView(room: room, engine: engine)
 			} else {
 				placeholder
 			}
 		}
-		.task { await load() }
+		.onAppear {
+			if selected == nil { selected = sortedRooms.first?.id }
+		}
+		.onChange(of: rooms.rows.count) { _, _ in
+			if selected == nil { selected = sortedRooms.first?.id }
+		}
+	}
+
+	private var sortedRooms: [Room] {
+		rooms.rows.sorted { $0.createdAt < $1.createdAt }
 	}
 
 	private var createSheet: some View {
 		VStack(alignment: .leading, spacing: 12) {
-			Text("Create a room")
-				.font(.headline)
+			Text("Create a room").font(.headline)
 			TextField("Name", text: $draftName)
 				.textFieldStyle(.roundedBorder)
 			TextField("Slug (e.g. general)", text: $draftSlug)
@@ -91,9 +109,7 @@ struct ChatRootView: View {
 
 	private var placeholder: some View {
 		VStack(spacing: 8) {
-			if loading {
-				ProgressView()
-			} else if rooms.isEmpty {
+			if rooms.rows.isEmpty {
 				Text("No rooms yet.")
 					.foregroundStyle(.secondary)
 				Button("Create your first room") { showingCreate = true }
@@ -106,28 +122,15 @@ struct ChatRootView: View {
 		.frame(maxWidth: .infinity, maxHeight: .infinity)
 	}
 
-	private func load() async {
-		loading = true
-		defer { loading = false }
-		do {
-			rooms = try await session.pylon.callFn("listRooms", args: EmptyArgs())
-			if selected == nil { selected = rooms.first?.id }
-			errorMessage = nil
-		} catch {
-			errorMessage = "Load failed: \(error.localizedDescription)"
-		}
-	}
-
 	private func create() async {
 		let name = draftName.trimmingCharacters(in: .whitespaces)
 		let slug = draftSlug.trimmingCharacters(in: .whitespaces).lowercased()
 		guard !name.isEmpty, !slug.isEmpty else { return }
 		do {
-			let room: Room = try await session.pylon.callFn(
+			let room: Room = try await session.client.callFn(
 				"createRoom",
 				args: CreateRoomArgs(slug: slug, name: name),
 			)
-			rooms.append(room)
 			selected = room.id
 			showingCreate = false
 			draftName = ""

package/templates/mac/chat/apps/mac/Sources/__APP_NAME_PASCAL__/RoomView.swift

@@ -1,24 +1,45 @@
 import SwiftUI
 import PylonClient
+import PylonSync
+import PylonSwiftUI
 
+/// Live room view. PylonQuery<Message> with a `where` predicate that
+/// matches `roomId` to the active room. The sync engine pushes diffs
+/// over WebSocket; new messages from any client land in `messages.rows`
+/// without us polling.
 struct RoomView: View {
 	@EnvironmentObject var session: AppSession
 	let room: Room
-	@State private var messages: [Message] = []
+	let engine: SyncEngine
+	@StateObject private var messages: PylonQuery<Message>
 	@State private var draft = ""
 	@State private var sending = false
 	@State private var errorMessage: String?
-	@State private var pollTimer: Task<Void, Never>?
+
+	init(room: Room, engine: SyncEngine) {
+		self.room = room
+		self.engine = engine
+		let roomId = room.id
+		_messages = StateObject(
+			wrappedValue: PylonQuery<Message>(
+				engine: engine,
+				entity: "Message",
+				where: { row in
+					row["roomId"]?.stringValue == roomId
+				},
+			),
+		)
+	}
 
 	var body: some View {
 		VStack(spacing: 0) {
 			ScrollViewReader { proxy in
 				ScrollView {
 					LazyVStack(alignment: .leading, spacing: 12) {
-						ForEach(messages) { msg in
+						ForEach(sortedMessages) { msg in
 							messageRow(msg).id(msg.id)
 						}
-						if messages.isEmpty {
+						if messages.rows.isEmpty {
 							Text("No messages yet. Say hi.")
 								.foregroundStyle(.secondary)
 								.padding(.top, 32)
@@ -27,8 +48,8 @@ struct RoomView: View {
 					}
 					.padding(16)
 				}
-				.onChange(of: messages.count) { _, _ in
-					if let last = messages.last {
+				.onChange(of: messages.rows.count) { _, _ in
+					if let last = sortedMessages.last {
 						withAnimation { proxy.scrollTo(last.id, anchor: .bottom) }
 					}
 				}
@@ -57,11 +78,10 @@ struct RoomView: View {
 		#if os(iOS)
 		.navigationBarTitleDisplayMode(.inline)
 		#endif
-		.task {
-			await loadMessages()
-			startPolling()
-		}
-		.onDisappear { pollTimer?.cancel() }
+	}
+
+	private var sortedMessages: [Message] {
+		messages.rows.sorted { $0.createdAt < $1.createdAt }
 	}
 
 	@ViewBuilder
@@ -90,36 +110,16 @@ struct RoomView: View {
 		return display.string(from: date)
 	}
 
-	private func loadMessages() async {
-		do {
-			messages = try await session.pylon.callFn(
-				"roomMessages",
-				args: RoomMessagesArgs(roomId: room.id),
-			)
-			errorMessage = nil
-		} catch {
-			errorMessage = "Load failed: \(error.localizedDescription)"
-		}
-	}
-
-	private func startPolling() {
-		pollTimer?.cancel()
-		pollTimer = Task {
-			while !Task.isCancelled {
-				try? await Task.sleep(nanoseconds: 1_500_000_000)
-				if Task.isCancelled { break }
-				await loadMessages()
-			}
-		}
-	}
-
 	private func send() async {
 		let body = draft.trimmingCharacters(in: .whitespaces)
 		guard !body.isEmpty else { return }
 		sending = true
 		defer { sending = false }
 		do {
-			let msg: Message = try await session.pylon.callFn(
+			// Server inserts via ctx.db.insert; the change_event flows
+			// back through the SyncEngine and our PylonQuery picks up
+			// the new row. We only clear the draft here.
+			let _: Message = try await session.client.callFn(
 				"sendMessage",
 				args: SendMessageArgs(
 					roomId: room.id,
@@ -127,7 +127,6 @@ struct RoomView: View {
 					authorName: session.authorName,
 				),
 			)
-			messages.append(msg)
 			draft = ""
 			errorMessage = nil
 		} catch {

package/templates/mac/chat/apps/mac/Sources/__APP_NAME_PASCAL__/__APP_NAME_PASCAL__App.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 import PylonClient
+import PylonSync
 
 @main
 struct __APP_NAME_PASCAL__App: App {
@@ -7,9 +8,17 @@ struct __APP_NAME_PASCAL__App: App {
 
 	var body: some Scene {
 		Window("__APP_NAME__", id: "main") {
-			ChatRootView()
-				.environmentObject(session)
-				.frame(minWidth: 700, minHeight: 500)
+			Group {
+				if let engine = session.engine {
+					ChatRootView(engine: engine)
+						.environmentObject(session)
+				} else {
+					ProgressView()
+						.frame(maxWidth: .infinity, maxHeight: .infinity)
+				}
+			}
+			.task { await session.bootIfNeeded() }
+			.frame(minWidth: 700, minHeight: 500)
 		}
 		.windowResizability(.contentMinSize)
 	}
@@ -17,7 +26,8 @@ struct __APP_NAME_PASCAL__App: App {
 
 @MainActor
 final class AppSession: ObservableObject {
-	let pylon: PylonClient
+	let client: PylonClient
+	@Published private(set) var engine: SyncEngine?
 	@Published var authorName: String
 
 	init() {
@@ -26,10 +36,21 @@ final class AppSession: ObservableObject {
 		guard let url = URL(string: baseURLString) else {
 			fatalError("Invalid PYLON_BASE_URL: \(baseURLString)")
 		}
-		self.pylon = PylonClient(baseURL: url, appName: "__APP_NAME_SNAKE__")
+		self.client = PylonClient(baseURL: url, appName: "__APP_NAME_SNAKE__")
 		self.authorName = UserDefaults.standard.string(forKey: "authorName") ?? "anonymous"
 	}
 
+	func bootIfNeeded() async {
+		guard engine == nil else { return }
+		let baseURLString = ProcessInfo.processInfo.environment["PYLON_BASE_URL"]
+			?? "http://localhost:4321"
+		guard let url = URL(string: baseURLString) else { return }
+		let config = SyncEngineConfig(baseURL: url, appName: "__APP_NAME_SNAKE__")
+		let engine = await SyncEngine(config: config, client: client)
+		await engine.start()
+		self.engine = engine
+	}
+
 	func setAuthorName(_ name: String) {
 		authorName = name
 		UserDefaults.standard.set(name, forKey: "authorName")

package/templates/mac/chat/apps/mac/project.yml

@@ -30,5 +30,7 @@ targets:
     dependencies:
       - package: pylon
         product: PylonClient
+      - package: pylon
+        product: PylonSync
       - package: pylon
         product: PylonSwiftUI

package/templates/mac/consumer/apps/mac/Package.swift

@@ -25,6 +25,7 @@ let package = Package(
 			name: "__APP_NAME_PASCAL__",
 			dependencies: [
 				.product(name: "PylonClient", package: "pylon"),
+				.product(name: "PylonSync", package: "pylon"),
 				.product(name: "PylonSwiftUI", package: "pylon"),
 			],
 			path: "Sources/__APP_NAME_PASCAL__"

package/templates/mac/consumer/apps/mac/Sources/__APP_NAME_PASCAL__/FeedView.swift

@@ -1,14 +1,35 @@
 import SwiftUI
 import PylonClient
+import PylonSync
+import PylonSwiftUI
 
+/// Live feed. Three subscriptions (Post / Like / Profile) joined
+/// in-memory. Every new post + every like from any client renders
+/// here without polling.
 struct FeedView: View {
 	@EnvironmentObject var session: AppSession
-	@State private var feed: [FeedItem] = []
-	@State private var loading = true
-	@State private var posting = false
+	let engine: SyncEngine
+	let me: Profile
+	let profiles: [Profile]
+
+	@StateObject private var posts: PylonQuery<Post>
+	@StateObject private var likes: PylonQuery<Like>
 	@State private var draft = ""
+	@State private var posting = false
 	@State private var errorMessage: String?
 
+	init(engine: SyncEngine, me: Profile, profiles: [Profile]) {
+		self.engine = engine
+		self.me = me
+		self.profiles = profiles
+		_posts = StateObject(
+			wrappedValue: PylonQuery<Post>(engine: engine, entity: "Post"),
+		)
+		_likes = StateObject(
+			wrappedValue: PylonQuery<Like>(engine: engine, entity: "Like"),
+		)
+	}
+
 	var body: some View {
 		NavigationStack {
 			List {
@@ -31,13 +52,11 @@ struct FeedView: View {
 				}
 
 				Section("Feed") {
-					if loading {
-						ProgressView()
-					} else if feed.isEmpty {
+					if items.isEmpty {
 						Text("No posts yet.")
 							.foregroundStyle(.secondary)
 					} else {
-						ForEach(feed) { item in
+						ForEach(items, id: \.post.id) { item in
 							row(item)
 						}
 					}
@@ -52,13 +71,37 @@ struct FeedView: View {
 				}
 			}
 			.navigationTitle("__APP_NAME__")
-			.task { await load() }
-			.refreshable { await load() }
 		}
 	}
 
+	private struct FeedRow: Hashable {
+		let post: Post
+		let author: Profile?
+		let likeCount: Int
+		let likedByMe: Bool
+	}
+
+	private var profilesById: [String: Profile] {
+		Dictionary(uniqueKeysWithValues: profiles.map { ($0.id, $0) })
+	}
+
+	private var items: [FeedRow] {
+		posts.rows
+			.sorted { $0.createdAt > $1.createdAt }
+			.prefix(100)
+			.map { post in
+				let postLikes = likes.rows.filter { $0.postId == post.id }
+				return FeedRow(
+					post: post,
+					author: profilesById[post.authorId],
+					likeCount: postLikes.count,
+					likedByMe: postLikes.contains { $0.profileId == me.id },
+				)
+			}
+	}
+
 	@ViewBuilder
-	private func row(_ item: FeedItem) -> some View {
+	private func row(_ item: FeedRow) -> some View {
 		VStack(alignment: .leading, spacing: 6) {
 			HStack(alignment: .firstTextBaseline) {
 				Text(item.author?.displayName ?? "Unknown")
@@ -67,16 +110,16 @@ struct FeedView: View {
 					.font(.system(.caption, design: .monospaced))
 					.foregroundStyle(.secondary)
 				Spacer()
-				Text(item.createdAt)
+				Text(item.post.createdAt)
 					.font(.caption2)
 					.foregroundStyle(.tertiary)
 			}
-			Text(item.body)
+			Text(item.post.body)
 				.font(.body)
 				.fixedSize(horizontal: false, vertical: true)
 			HStack {
 				Button {
-					Task { await toggleLike(item) }
+					Task { await toggleLike(item.post.id) }
 				} label: {
 					HStack(spacing: 4) {
 						Image(systemName: item.likedByMe ? "heart.fill" : "heart")
@@ -87,10 +130,10 @@ struct FeedView: View {
 				}
 				.buttonStyle(.plain)
 
-				if item.author?.id == session.me?.id {
+				if item.author?.id == me.id {
 					Spacer()
 					Button("Delete", role: .destructive) {
-						Task { await delete(item) }
+						Task { await delete(item.post.id) }
 					}
 					.font(.caption)
 				}
@@ -99,18 +142,9 @@ struct FeedView: View {
 		.padding(.vertical, 4)
 	}
 
-	// MARK: - Network
-
-	private func load() async {
-		loading = true
-		defer { loading = false }
-		do {
-			feed = try await session.pylon.callFn("feed", args: EmptyArgs())
-			errorMessage = nil
-		} catch {
-			errorMessage = "Load failed: \(error.localizedDescription)"
-		}
-	}
+	// MARK: - Mutations (writes flow through callFn; the engine receives
+	// the change_event and updates the local store, which re-renders the
+	// PylonQuery rows above).
 
 	private func post() async {
 		let body = draft.trimmingCharacters(in: .whitespaces)
@@ -118,53 +152,48 @@ struct FeedView: View {
 		posting = true
 		defer { posting = false }
 		do {
-			let item: FeedItem = try await session.pylon.callFn(
+			// `createPost` returns the joined shape (Post + author),
+			// but we don't use the return value — the engine will
+			// surface the new Post row via the live subscription.
+			let _: PostCreatedResponse = try await session.client.callFn(
 				"createPost",
 				args: CreatePostArgs(body: body),
 			)
-			feed.insert(item, at: 0)
 			draft = ""
+			errorMessage = nil
 		} catch {
 			errorMessage = "Post failed: \(error.localizedDescription)"
 		}
 	}
 
-	private func toggleLike(_ item: FeedItem) async {
-		// Optimistic
-		if let i = feed.firstIndex(where: { $0.id == item.id }) {
-			feed[i].likedByMe.toggle()
-			feed[i].likeCount += feed[i].likedByMe ? 1 : -1
-		}
+	private func toggleLike(_ postId: String) async {
 		do {
-			let result: ToggleLikeResult = try await session.pylon.callFn(
+			let _: ToggleLikeResponse = try await session.client.callFn(
 				"toggleLike",
-				args: ToggleLikeArgs(postId: item.id),
+				args: ToggleLikeArgs(postId: postId),
 			)
-			if let i = feed.firstIndex(where: { $0.id == item.id }) {
-				feed[i].likedByMe = result.liked
-				feed[i].likeCount = result.likeCount
-			}
 		} catch {
-			// Revert
-			if let i = feed.firstIndex(where: { $0.id == item.id }) {
-				feed[i].likedByMe = item.likedByMe
-				feed[i].likeCount = item.likeCount
-			}
 			errorMessage = "Like failed: \(error.localizedDescription)"
 		}
 	}
 
-	private func delete(_ item: FeedItem) async {
-		let snapshot = feed
-		feed.removeAll { $0.id == item.id }
+	private func delete(_ postId: String) async {
 		do {
-			let _: FeedItem = try await session.pylon.callFn(
+			let _: Post = try await session.client.callFn(
 				"deletePost",
-				args: DeletePostArgs(id: item.id),
+				args: DeletePostArgs(id: postId),
 			)
 		} catch {
-			feed = snapshot
 			errorMessage = "Delete failed: \(error.localizedDescription)"
 		}
 	}
 }
+
+private struct PostCreatedResponse: Decodable {
+	let id: String
+}
+
+private struct ToggleLikeResponse: Decodable {
+	let liked: Bool
+	let likeCount: Int
+}

package/templates/mac/consumer/apps/mac/Sources/__APP_NAME_PASCAL__/Models.swift

@@ -9,19 +9,18 @@ struct Profile: Codable, Identifiable, Hashable {
 	let createdAt: String
 }
 
-struct FeedItem: Codable, Identifiable, Hashable {
+struct Post: Codable, Identifiable, Hashable {
 	let id: String
+	let authorId: String
 	let body: String
 	let createdAt: String
-	let author: AuthorCard?
-	var likeCount: Int
-	var likedByMe: Bool
 }
 
-struct AuthorCard: Codable, Hashable {
+struct Like: Codable, Identifiable, Hashable {
 	let id: String
-	let handle: String
-	let displayName: String
+	let postId: String
+	let profileId: String
+	let createdAt: String
 }
 
 struct UpsertProfileArgs: Encodable {
@@ -29,14 +28,7 @@ struct UpsertProfileArgs: Encodable {
 	let displayName: String
 	let bio: String
 }
-
 struct CreatePostArgs: Encodable { let body: String }
 struct DeletePostArgs: Encodable { let id: String }
 struct ToggleLikeArgs: Encodable { let postId: String }
-
-struct ToggleLikeResult: Codable {
-	let liked: Bool
-	let likeCount: Int
-}
-
 struct EmptyArgs: Encodable {}

package/templates/mac/consumer/apps/mac/Sources/__APP_NAME_PASCAL__/ProfileSetupView.swift

@@ -1,8 +1,12 @@
 import SwiftUI
 import PylonClient
+import PylonSync
 
 struct ProfileSetupView: View {
 	@EnvironmentObject var session: AppSession
+	let engine: SyncEngine
+	let existingHandles: [String]
+
 	@State private var handle = ""
 	@State private var displayName = ""
 	@State private var bio = ""
@@ -19,7 +23,6 @@ struct ProfileSetupView: View {
 					TextField("Display name", text: $displayName)
 					TextField("Bio (optional)", text: $bio)
 				}
-
 				if let errorMessage {
 					Section {
 						Text(errorMessage)
@@ -27,12 +30,12 @@ struct ProfileSetupView: View {
 							.font(.caption)
 					}
 				}
-
 				Section {
 					Button(saving ? "Saving…" : "Save") {
 						Task { await save() }
 					}
-					.disabled(saving || handle.trimmingCharacters(in: .whitespaces).isEmpty
+					.disabled(saving
+						|| handle.trimmingCharacters(in: .whitespaces).isEmpty
 						|| displayName.trimmingCharacters(in: .whitespaces).isEmpty)
 				}
 			}
@@ -43,16 +46,21 @@ struct ProfileSetupView: View {
 	private func save() async {
 		saving = true
 		defer { saving = false }
+		let lower = handle.trimmingCharacters(in: .whitespaces).lowercased()
+		if existingHandles.contains(lower) {
+			errorMessage = "@\(lower) is taken"
+			return
+		}
 		do {
-			let profile: Profile = try await session.pylon.callFn(
+			let profile: Profile = try await session.client.callFn(
 				"upsertProfile",
 				args: UpsertProfileArgs(
-					handle: handle.trimmingCharacters(in: .whitespaces).lowercased(),
+					handle: lower,
 					displayName: displayName.trimmingCharacters(in: .whitespaces),
 					bio: bio.trimmingCharacters(in: .whitespaces),
 				),
 			)
-			session.me = profile
+			session.setMyProfileId(profile.id)
 		} catch {
 			errorMessage = "Save failed: \(error.localizedDescription)"
 		}

package/templates/mac/consumer/apps/mac/Sources/__APP_NAME_PASCAL__/RootView.swift

@@ -1,30 +1,40 @@
 import SwiftUI
 import PylonClient
+import PylonSync
+import PylonSwiftUI
 
+/// Watches the live Profile collection. If we have a saved profileId
+/// AND a Profile row in the local store with that id, render the
+/// feed; otherwise, profile setup. The profile row appears in the
+/// store via the SyncEngine, so a fresh device sees its own profile
+/// pop in moments after `upsertProfile` returns.
 struct RootView: View {
 	@EnvironmentObject var session: AppSession
-	@State private var loading = true
+	let engine: SyncEngine
+	@StateObject private var profiles: PylonQuery<Profile>
+
+	init(engine: SyncEngine) {
+		self.engine = engine
+		_profiles = StateObject(
+			wrappedValue: PylonQuery<Profile>(engine: engine, entity: "Profile"),
+		)
+	}
 
 	var body: some View {
 		Group {
-			if loading {
-				ProgressView()
-					.frame(maxWidth: .infinity, maxHeight: .infinity)
-			} else if session.me == nil {
-				ProfileSetupView()
+			if let me = currentProfile {
+				FeedView(engine: engine, me: me, profiles: profiles.rows)
 			} else {
-				FeedView()
+				ProfileSetupView(
+					engine: engine,
+					existingHandles: profiles.rows.map { $0.handle },
+				)
 			}
 		}
-		.task { await load() }
 	}
 
-	private func load() async {
-		do {
-			session.me = try await session.pylon.callFn("myProfile", args: EmptyArgs())
-		} catch {
-			session.me = nil
-		}
-		loading = false
+	private var currentProfile: Profile? {
+		guard let id = session.myProfileId else { return nil }
+		return profiles.rows.first { $0.id == id }
 	}
 }