master..c043310 · parseable-macos

git.iko.soy/parseable-macos

on c043310 help sign in

ParseableViewer/App/AppState.swift+5−81

since splitsnapshots

unifiedsplit

@@ -15,10 +15,6 @@ final class AppState {

15 private let networkMonitor = NWPathMonitor()

16 private let networkMonitorQueue = DispatchQueue(label: "com.parseableviewer.network-monitor")

17 private var connectTask: Task<Bool, Never>?

18− /// The connection `connectTask` is connecting to. `activeConnection` only

19− /// switches once the new server answers, so this is what identifies an

20− /// in-flight connect whose target the user deletes (see `removeConnection`).

21− private var connectingConnectionID: UUID?

23 // MARK: - Stream State

19 // MARK: - Stream State

24 var streams: [LogStream] = []

20 var streams: [LogStream] = []

@@ -100,7 +96,6 @@ final class AppState {

100

101 if let activeID = ConnectionStore.loadActiveConnectionID(),

97 if let activeID = ConnectionStore.loadActiveConnectionID(),

102 let connection = connections.first(where: { $0.id == activeID }) {

98 let connection = connections.first(where: { $0.id == activeID }) {

103− connectingConnectionID = connection.id

104 connectTask = Task { @MainActor [weak self] in

99 connectTask = Task { @MainActor [weak self] in

105 await self?.performConnect(to: connection) ?? false

100 await self?.performConnect(to: connection) ?? false

106 }

101 }

@@ -120,7 +115,6 @@ final class AppState {

120 existing.cancel()

115 existing.cancel()

121 _ = await existing.value

116 _ = await existing.value

122 }

117 }

123− connectingConnectionID = connection.id

124 let task = Task { @MainActor [weak self] in

118 let task = Task { @MainActor [weak self] in

125 await self?.performConnect(to: connection) ?? false

119 await self?.performConnect(to: connection) ?? false

126 }

120 }

@@ -130,16 +124,9 @@ final class AppState {

130

124

131 @MainActor

125 @MainActor

132 private func performConnect(to connection: ServerConnection) async -> Bool {

126 private func performConnect(to connection: ServerConnection) async -> Bool {

133− defer {

134− if connectingConnectionID == connection.id { connectingConnectionID = nil }

135− }

136 guard !isConnecting else { return false }

127 guard !isConnecting else { return false }

137

128

138− // NWPathMonitor ignores loopback, so with no active network interface it

139− // reports "unsatisfied" even though a local server (the common docker /

140− // dev setup) is reachable. Don't block those; a genuinely unreachable

141− // host still fails below with the same offline message.

142− if !isNetworkAvailable && !Self.isLoopback(connection.baseURL) {

129+ if !isNetworkAvailable {

143 self.errorMessage = "No internet connection. Check your network and try again."

130 self.errorMessage = "No internet connection. Check your network and try again."

144 self.showError = true

131 self.showError = true

145 return false

132 return false

@@ -147,12 +134,7 @@ final class AppState {

147

134

148 isConnecting = true

135 isConnecting = true

149 defer { isConnecting = false }

136 defer { isConnecting = false }

150− // Reset the flag with the message: a previous failed connect left

151− // `showError` set, and if its alert couldn't present (e.g. behind the

152− // connection sheet), it would pop up later — after a successful retry —

153− // reading "An unknown error occurred".

154 errorMessage = nil

137 errorMessage = nil

155− showError = false

156

138

157 // When switching to a different server, clear stream-specific state

139 // When switching to a different server, clear stream-specific state

158 // so stale selections don't reference streams that don't exist.

140 // so stale selections don't reference streams that don't exist.

@@ -182,7 +164,6 @@ final class AppState {

182

164

183 // Test connection — throws on non-200 or network failure

165 // Test connection — throws on non-200 or network failure

184 try await newClient.checkHealth()

166 try await newClient.checkHealth()

185− try await Self.verifyCredentials(with: newClient)

186

167

187 // If the task was cancelled while awaiting (e.g. user clicked

168 // If the task was cancelled while awaiting (e.g. user clicked

188 // Disconnect during auto-reconnect), bail before installing the

169 // Disconnect during auto-reconnect), bail before installing the

@@ -219,12 +200,6 @@ final class AppState {

219 case .success(let list):

200 case .success(let list):

220 self.streams = list

201 self.streams = list

221 self.streamLoadError = nil

202 self.streamLoadError = nil

222− // Like refreshStreams: a selection that doesn't exist on this server

223− // (e.g. one picked from a stale list while the connect was pending)

224− // would keep every stream tab querying a missing stream.

225− if let selected = selectedStream, !list.contains(where: { $0.name == selected }) {

226− selectedStream = nil

227− }

228 case .failure(let error):

203 case .failure(let error):

229 self.streams = []

204 self.streams = []

230 self.streamLoadError = ParseableError.userFriendlyMessage(for: error)

205 self.streamLoadError = ParseableError.userFriendlyMessage(for: error)

@@ -290,13 +265,8 @@ final class AppState {

290 let loaded = try await client.listStreams()

265 let loaded = try await client.listStreams()

291 // Drop results if the active connection changed while awaiting. Still

266 // Drop results if the active connection changed while awaiting. Still

292 // clear isLoadingStreams: this task set the spinner, so leaving it true

267 // clear isLoadingStreams: this task set the spinner, so leaving it true

293− // wedges the indicator and disables Refresh. Compare the client too:

268+ // wedges the indicator and disables Refresh.

294− // editing the active connection's URL/credentials keeps its id but

295− // installs a new client for a possibly different server.

296− guard connID == activeConnection?.id, client === self.client else {

269+ guard connID == activeConnection?.id else { isLoadingStreams = false; return }

297− isLoadingStreams = false

298− return

299− }

300 streams = loaded

270 streams = loaded

301 // Drop a selection that no longer exists server-side (e.g. the stream

271 // Drop a selection that no longer exists server-side (e.g. the stream

302 // was deleted from another client); otherwise the detail tabs keep

272 // was deleted from another client); otherwise the detail tabs keep

@@ -305,10 +275,7 @@ final class AppState {

305 selectedStream = nil

275 selectedStream = nil

306 }

276 }

307 } catch {

277 } catch {

308− guard connID == activeConnection?.id, client === self.client else {

278+ guard connID == activeConnection?.id else { isLoadingStreams = false; return }

309− isLoadingStreams = false

310− return

311− }

312 let message = ParseableError.userFriendlyMessage(for: error)

279 let message = ParseableError.userFriendlyMessage(for: error)

313 streamLoadError = message

280 streamLoadError = message

314 self.errorMessage = "Failed to load streams: \(message)"

281 self.errorMessage = "Failed to load streams: \(message)"

@@ -375,49 +342,9 @@ final class AppState {

375 ConnectionStore.saveConnections(connections)

342 ConnectionStore.saveConnections(connections)

376 if activeConnection?.id == connection.id {

343 if activeConnection?.id == connection.id {

377 disconnect()

344 disconnect()

378− } else if connectingConnectionID == connection.id {

379− // The removed connection is still being connected to (e.g. Cancel in the

380− // connection sheet, or deleting it in Settings during the launch

381− // reconnect). `activeConnection` doesn't point at it yet, so without

382− // this the connect would carry on and install a client for a

383− // connection that no longer exists (or tear down the current session

384− // when it fails) after the user abandoned it.

385− connectTask?.cancel()

386− connectTask = nil

387− connectingConnectionID = nil

388− // Starting that connect already cleared the current server's stream

389− // list and filters; reload them if we're still connected to it.

390− if client != nil {

391− Task { @MainActor [weak self] in

392− await self?.refreshStreams()

393− await self?.refreshFilters()

394− }

395− }

396− }

397− }

398−

399− /// `/api/v1/liveness` is unauthenticated on Parseable (it answers 200 to

400− /// anyone, for load-balancer / k8s probes), so a health check alone accepts

401− /// any username and password. Probe an authenticated endpoint and fail on

402− /// 401. Other failures — e.g. a 403 for a role without the about permission —

403− /// don't show the credentials are wrong, so they're ignored here. The client

404− /// caches the response, so the follow-up `getAbout()` load reuses it.

405− static func verifyCredentials(with client: ParseableClient) async throws {

406− do {

407− _ = try await client.getAbout()

408− } catch ParseableError.unauthorized {

409− throw ParseableError.unauthorized

410− } catch {

411− // Not an authentication failure; leave it to the best-effort loads.

412 }

345 }

413 }

346 }

414

347

415− private static func isLoopback(_ url: URL?) -> Bool {

416− guard let host = url?.host?.lowercased() else { return false }

417− return host == "localhost" || host.hasSuffix(".localhost")

418− || host == "::1" || host.hasPrefix("127.")

419− }

420−

421 // MARK: - Stream Management

348 // MARK: - Stream Management

422

349

423 @MainActor

350 @MainActor

@@ -450,10 +377,7 @@ final class AppState {

450 let connID = activeConnection?.id

377 let connID = activeConnection?.id

451 isLoadingFilters = true

378 isLoadingFilters = true

452 let loaded = (try? await client.listFilters()) ?? []

379 let loaded = (try? await client.listFilters()) ?? []

453− guard connID == activeConnection?.id, client === self.client else {

380+ guard connID == activeConnection?.id else { isLoadingFilters = false; return }

454− isLoadingFilters = false

455− return

456− }

457 filters = loaded

381 filters = loaded

458 isLoadingFilters = false

382 isLoadingFilters = false

459 }

383 }

ParseableViewer/App/ParseableViewerApp.swift+1−13

@@ -4,13 +4,6 @@ import SwiftUI

4struct ParseableViewerApp: App {

5 @State private var appState = AppState()

7− init() {

8− // All window content shares one AppState (see the File > New group below),

9− // so don't offer window tabs either: the tab bar's "+" would open a second

10− // window just like File > New Window.

11− NSWindow.allowsAutomaticWindowTabbing = false

12− }

13−

14 var body: some Scene {

7 var body: some Scene {

15 WindowGroup {

8 WindowGroup {

16 ContentView()

9 ContentView()

@@ -24,12 +17,7 @@ struct ParseableViewerApp: App {

24 AboutCommand()

17 AboutCommand()

25 }

18 }

27− // Replace (rather than extend) the File > New group to drop "New Window":

28− // connection, sheet, alert, selection and pending-filter state all live

29− // in the single shared AppState, so a second window would present every

30− // sheet and alert twice and race the first window's QueryView for

31− // saved-filter SQL.

32− CommandGroup(replacing: .newItem) {

20+ CommandGroup(after: .newItem) {

33 Button("New Connection...") {

21 Button("New Connection...") {

34 appState.editingConnection = nil

22 appState.editingConnection = nil

35 appState.showConnectionSheet = true

23 appState.showConnectionSheet = true

ParseableViewer/Info.plist−5

@@ -24,11 +24,6 @@

24 <string>public.app-category.developer-tools</string>

25 <key>LSMinimumSystemVersion</key>

26 <string>$(MACOSX_DEPLOYMENT_TARGET)</string>

27− <key>NSAppTransportSecurity</key>

28− <dict>

29− <key>NSAllowsArbitraryLoads</key>

30− <true/>

31− </dict>

32 <key>NSMainNibFile</key>

27 <key>NSMainNibFile</key>

33 <string></string>

28 <string></string>

34 <key>NSPrincipalClass</key>

29 <key>NSPrincipalClass</key>

ParseableViewer/Models/AlertModels.swift−21

@@ -85,27 +85,6 @@ struct AlertRule: Identifiable, Codable, Sendable {

85struct AlertRuleSpec: Codable, Sendable {

86 let type: String?

87 let config: String?

88−

89− private enum CodingKeys: String, CodingKey {

90− case type, config

91− }

92−

93− init(from decoder: Decoder) throws {

94− let container = try decoder.container(keyedBy: CodingKeys.self)

95− self.type = try? container.decode(String.self, forKey: .type)

96− // The legacy per-stream rule is serialized as `{"type": …, "config": …}`

97− // where only composite rules carry a string config; column rules carry an

98− // object (`{"column": …, "operator": …, "value": …}`). Decoding that as a

99− // String threw, which made the whole spec — and its type badge — vanish.

100− // Keep non-string configs as compact JSON instead.

101− if let string = try? container.decode(String.self, forKey: .config) {

102− self.config = string

103− } else if let value = try? container.decode(JSONValue.self, forKey: .config), value != .null {

104− self.config = value.compactJSON

105− } else {

106− self.config = nil

107− }

108− }

109}

88}

110

111struct AlertTarget: Codable, Sendable {

90struct AlertTarget: Codable, Sendable {

ParseableViewer/Models/LogStream.swift+11−97

@@ -80,39 +80,11 @@ struct SchemaField: Identifiable, Codable, Hashable, Sendable {

80 if let typeStr = try? container.decode(String.self, forKey: .dataType) {

81 self.dataType = typeStr

82 } else if let typeObj = try? container.decode(JSONValue.self, forKey: .dataType) {

83− self.dataType = Self.describeArrowType(typeObj)

83+ self.dataType = typeObj.displayString

84 } else {

85 self.dataType = "Unknown"

86 }

87 }

88−

89− /// Renders a serde-serialized Arrow `DataType`. Parameterized types are

90− /// externally tagged objects — `p_timestamp`, present in every Parseable

91− /// stream, arrives as `{"Timestamp": ["Millisecond", null]}` and a list as

92− /// `{"List": {<field>}}` — which `displayString` collapsed to the placeholder

93− /// "{1 fields}". Produce Arrow's own notation instead, e.g.

94− /// `Timestamp(Millisecond, None)` / `List(Utf8)`.

95− static func describeArrowType(_ value: JSONValue) -> String {

96− switch value {

97− case .null:

98− return "None"

99− case .string(let s):

100− return s

101− case .array(let items):

102− return items.map { describeArrowType($0) }.joined(separator: ", ")

103− case .object(let dict):

104− // A nested `Field` (list/map element, struct member): show its type.

105− if let fieldType = dict["data_type"] {

106− return describeArrowType(fieldType)

107− }

108− if dict.count == 1, let entry = dict.first {

109− return "\(entry.key)(\(describeArrowType(entry.value)))"

110− }

111− return value.compactJSON

112− default:

113− return value.displayString

114− }

115− }

116}

88}

117

118/// Formats a byte count that may arrive from the server as a fractional or

90/// Formats a byte count that may arrive from the server as a fractional or

@@ -134,59 +106,14 @@ private func formatByteSize(_ value: Int) -> String? {

134/// Normalizes a byte count that arrived as a JSON *string*. A bare numeric string

106/// Normalizes a byte count that arrived as a JSON *string*. A bare numeric string

135/// (e.g. "1048576") is a raw byte count and is formatted like the numeric branches

107/// (e.g. "1048576") is a raw byte count and is formatted like the numeric branches

136/// so identical sizes render consistently ("1 MB") regardless of whether the server

108/// so identical sizes render consistently ("1 MB") regardless of whether the server

137−/// quoted the value. Parseable 1.x — the versions that quote sizes — sends them as

138−/// "<n> Bytes" (e.g. "1048576 Bytes"), so that unit suffix is accepted too. Any

139−/// other already-formatted string (e.g. "1.2 GB") is passed through unchanged.

109+/// quoted the value; an already-formatted string (e.g. "1.2 GB") is passed through

110+/// unchanged.

140private func formatByteSize(_ value: String) -> String {

111private func formatByteSize(_ value: String) -> String {

141− var trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)

112+ let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)

142− if trimmed.lowercased().hasSuffix(" bytes") {

143− trimmed = String(trimmed.dropLast(" bytes".count))

144− }

145 if let n = Int(trimmed) { return formatByteSize(n) ?? value }

113 if let n = Int(trimmed) { return formatByteSize(n) ?? value }

146 return value

114 return value

147}

115}

148

116

149−/// A string-backed coding key for fields whose name differs across Parseable

150−/// versions (kebab-case, snake_case, and camelCase spellings of the same field).

151−private struct FlexibleCodingKey: CodingKey {

152− let stringValue: String

153− var intValue: Int? { nil }

154− init(stringValue: String) { self.stringValue = stringValue }

155− init?(intValue: Int) { nil }

156−}

157−

158−private extension KeyedDecodingContainer where Key == FlexibleCodingKey {

159− /// The first of `keys` that decodes as a string.

160− func firstString(_ keys: String...) -> String? {

161− for key in keys {

162− if let value = try? decode(String.self, forKey: FlexibleCodingKey(stringValue: key)) {

163− return value

164− }

165− }

166− return nil

167− }

168−

169− /// The first of `keys` that decodes as a boolean — either a JSON bool or the

170− /// strings "true"/"false" (Parseable serializes `static_schema_flag` as the

171− /// string "true").

172− func firstBool(_ keys: String...) -> Bool? {

173− for key in keys {

174− let codingKey = FlexibleCodingKey(stringValue: key)

175− if let value = try? decode(Bool.self, forKey: codingKey) {

176− return value

177− }

178− if let string = try? decode(String.self, forKey: codingKey) {

179− switch string.lowercased() {

180− case "true": return true

181− case "false": return false

182− default: continue

183− }

184− }

185− }

186− return nil

187− }

188−}

189−

190struct StreamStats: Codable, Sendable {

117struct StreamStats: Codable, Sendable {

191 let ingestion: IngestionStats?

118 let ingestion: IngestionStats?

192 let storage: StorageStats?

119 let storage: StorageStats?

@@ -238,11 +165,7 @@ struct StreamStats: Codable, Sendable {

238

165

239 init(from decoder: Decoder) throws {

166 init(from decoder: Decoder) throws {

240 let container = try decoder.container(keyedBy: CodingKeys.self)

167 let container = try decoder.container(keyedBy: CodingKeys.self)

241− // Parseable names this field `format` (e.g. "parquet") in every

168+ self.type = try? container.decode(String.self, forKey: .type)

242− // version; `type` never appears, so "Storage Type" always read N/A.

243− // Keep `type` as a fallback.

244− self.type = (try? decoder.container(keyedBy: FlexibleCodingKey.self))?

245− .firstString("format", "type")

246 if let s = try? container.decode(String.self, forKey: .size) {

169 if let s = try? container.decode(String.self, forKey: .size) {

247 self.size = formatByteSize(s)

170 self.size = formatByteSize(s)

248 } else if let n = try? container.decode(Int.self, forKey: .size) {

171 } else if let n = try? container.decode(Int.self, forKey: .size) {

@@ -285,20 +208,11 @@ struct StreamInfo: Codable, Sendable {

285 }

208 }

286

209

287 init(from decoder: Decoder) throws {

210 init(from decoder: Decoder) throws {

288− // The /info key spellings vary by Parseable version: 1.x–2.x send

289− // `created-at`/`first-event-at` with the other fields in snake_case

290− // (`cache_enabled`, `time_partition`, `static_schema_flag`), while newer

291− // servers send camelCase throughout (`createdAt`, `timePartition`, …).

292− // The kebab-case `cache-enabled`/`time-partition`/`static-schema-flag`

293− // decoded previously were never sent by any version, so those rows always

294− // showed "N/A". The schema flag also arrives as the string "true".

295− let container = try decoder.container(keyedBy: FlexibleCodingKey.self)

211+ let container = try decoder.container(keyedBy: CodingKeys.self)

296− self.createdAt = container.firstString("created-at", "createdAt", "created_at")

212+ self.createdAt = try? container.decode(String.self, forKey: .createdAt)

297− self.firstEventAt = container.firstString("first-event-at", "firstEventAt", "first_event_at")

213+ self.firstEventAt = try? container.decode(String.self, forKey: .firstEventAt)

298− self.cacheEnabled = container.firstBool("cache_enabled", "cacheEnabled", "cache-enabled")

214+ self.cacheEnabled = try? container.decode(Bool.self, forKey: .cacheEnabled)

299− self.timePartition = container.firstString("time_partition", "timePartition", "time-partition")

215+ self.timePartition = try? container.decode(String.self, forKey: .timePartition)

300− self.staticSchemaFlag = container.firstBool(

216+ self.staticSchemaFlag = try? container.decode(Bool.self, forKey: .staticSchemaFlag)

301− "static_schema_flag", "staticSchemaFlag", "static-schema-flag"

302− )

303 }

217 }

304}

218}

ParseableViewer/Models/SQLTokenizer.swift+4−18

@@ -80,8 +80,8 @@ struct SQLTokenizer: Sendable {

81 switch c {

82 // Whitespace

83− case _ where isWhitespace(c):

83+ case " ", "\t", "\n", "\r":

84− advance(&i, in: sql, while: isWhitespace)

84+ advance(&i, in: sql, while: { $0 == " " || $0 == "\t" || $0 == "\n" || $0 == "\r" })

85 tokens.append(Token(kind: .whitespace, range: start..<i))

87 // Line comment

@@ -89,11 +89,8 @@ struct SQLTokenizer: Sendable {

89 // Stop at CR as well as LF: with CRLF (`\r\n`) line endings, consuming

90 // the trailing `\r` into the comment token would push its boundary past

91 // where `characterOffset`/DataFusion treat the line as ending, shifting

92− // the server-error highlight range. The line break is then tokenized as

92+ // the server-error highlight range. `\r` is then tokenized as whitespace.

93− // whitespace. `isLineBreak` also matches the single `"\r\n"` Character

94− // Swift forms from a CRLF pair — comparing against "\n"/"\r" alone never

95− // matches it, so the comment would swallow every following line.

96− advance(&i, in: sql, while: { !isLineBreak($0) })

93+ advance(&i, in: sql, while: { $0 != "\n" && $0 != "\r" })

97 tokens.append(Token(kind: .lineComment, range: start..<i))

94 tokens.append(Token(kind: .lineComment, range: start..<i))

99 // Block comment

96 // Block comment

@@ -262,17 +259,6 @@ struct SQLTokenizer: Sendable {

262 return value // unterminated

259 return value // unterminated

263 }

260 }

264

261

265− /// Swift iterates grapheme clusters, and a CRLF pair is the single Character

266− /// `"\r\n"`, which is equal to neither `"\r"` nor `"\n"`. Match it explicitly

267− /// so Windows line endings (e.g. pasted text) tokenize like LF/CR ones.

268− private static func isLineBreak(_ c: Character) -> Bool {

269− c == "\n" || c == "\r" || c == "\r\n"

270− }

271−

272− private static func isWhitespace(_ c: Character) -> Bool {

273− c == " " || c == "\t" || isLineBreak(c)

274− }

275−

276 /// SQL number literals use only ASCII digits. `Character.isNumber` also

262 /// SQL number literals use only ASCII digits. `Character.isNumber` also

277 /// matches Unicode numerics (`²`, `½`, Arabic-Indic digits, etc.), which

263 /// matches Unicode numerics (`²`, `½`, Arabic-Indic digits, etc.), which

278 /// DataFusion's lexer rejects — accepting them here would tokenize those

264 /// DataFusion's lexer rejects — accepting them here would tokenize those

ParseableViewer/Models/ServerConnection.swift+2−19

@@ -56,32 +56,15 @@ struct ServerConnection: Identifiable, Codable, Hashable, Sendable {

56 var baseURL: URL? {

57 var urlString = url.trimmingCharacters(in: .whitespacesAndNewlines)

58 if urlString.isEmpty { return nil }

59− if let schemeRange = Self.urlSchemeRange(in: urlString) {

59+ if !urlString.hasPrefix("http://") && !urlString.hasPrefix("https://") {

60− // Normalize the (case-insensitive) scheme so `HTTP://host` behaves

61− // exactly like `http://host` everywhere downstream.

62− urlString.replaceSubrange(schemeRange, with: urlString[schemeRange].lowercased())

63− } else {

64 urlString = "https://\(urlString)"

60 urlString = "https://\(urlString)"

65 }

61 }

66 while urlString.hasSuffix("/") {

62 while urlString.hasSuffix("/") {

67 urlString.removeLast()

63 urlString.removeLast()

68 }

64 }

69− guard let parsed = URL(string: urlString), parsed.host != nil,

65+ guard let parsed = URL(string: urlString), parsed.host != nil else {

70− parsed.scheme == "http" || parsed.scheme == "https" else {

71 return nil

66 return nil

72 }

67 }

73 return parsed

68 return parsed

74 }

69 }

75−

76− /// Whether `string` already starts with a URL scheme (`http://`, `HTTPS://`,

77− /// `ftp://`, …). Schemes are case-insensitive, so a case-sensitive

78− /// `hasPrefix("http://")` check turned `HTTP://host` into

79− /// `https://HTTP://host` — a URL whose host is "HTTP".

80− static func hasURLScheme(_ string: String) -> Bool {

81− urlSchemeRange(in: string) != nil

82− }

83−

84− private static func urlSchemeRange(in string: String) -> Range<String.Index>? {

85− string.range(of: "^[A-Za-z][A-Za-z0-9+.-]*://", options: .regularExpression)

86− }

87}

70}

ParseableViewer/Models/ServerInfo.swift+7−33

@@ -15,59 +15,33 @@ struct ServerAbout: Codable, Sendable {

15 let llmActive: Bool?

16 let oidcActive: Bool?

18− // Parseable's /about handler has always sent camelCase keys (`uiVersion`,

19− // `deploymentId`, `grpcPort`), like the other fields here. Decoding only the

20− // snake_case spellings — which the server never sends — left UI Version and

21− // Deployment ID permanently "N/A" and hid the gRPC Port row. The snake_case

22− // forms are kept as a fallback.

23 private enum CodingKeys: String, CodingKey {

18 private enum CodingKeys: String, CodingKey {

24 case version, commit, mode, staging, store, license

19 case version, commit, mode, staging, store, license

25− case uiVersion

20+ case uiVersion = "ui_version"

26− case deploymentId

21+ case deploymentId = "deployment_id"

27− case grpcPort

22+ case grpcPort = "grpc_port"

28 case updateAvailable

23 case updateAvailable

29 case latestVersion

24 case latestVersion

30 case llmActive

25 case llmActive

31 case oidcActive

26 case oidcActive

32 }

27 }

34− private enum SnakeCaseKeys: String, CodingKey {

35− case uiVersion = "ui_version"

36− case deploymentId = "deployment_id"

37− case grpcPort = "grpc_port"

38− }

39−

40 init(from decoder: Decoder) throws {

29 init(from decoder: Decoder) throws {

41 let container = try decoder.container(keyedBy: CodingKeys.self)

30 let container = try decoder.container(keyedBy: CodingKeys.self)

42− let snakeCase = try? decoder.container(keyedBy: SnakeCaseKeys.self)

43 self.version = try? container.decode(String.self, forKey: .version)

31 self.version = try? container.decode(String.self, forKey: .version)

44− self.uiVersion = (try? container.decode(String.self, forKey: .uiVersion))

32+ self.uiVersion = try? container.decode(String.self, forKey: .uiVersion)

45− ?? (try? snakeCase?.decode(String.self, forKey: .uiVersion))

46 self.commit = try? container.decode(String.self, forKey: .commit)

33 self.commit = try? container.decode(String.self, forKey: .commit)

47− self.deploymentId = (try? container.decode(String.self, forKey: .deploymentId))

34+ self.deploymentId = try? container.decode(String.self, forKey: .deploymentId)

48− ?? (try? snakeCase?.decode(String.self, forKey: .deploymentId))

49 self.mode = try? container.decode(String.self, forKey: .mode)

35 self.mode = try? container.decode(String.self, forKey: .mode)

50 self.staging = try? container.decode(String.self, forKey: .staging)

36 self.staging = try? container.decode(String.self, forKey: .staging)

51 self.store = try? container.decode(StoreInfo.self, forKey: .store)

37 self.store = try? container.decode(StoreInfo.self, forKey: .store)

52− self.license = (try? container.decode(String.self, forKey: .license))

38+ self.license = try? container.decode(String.self, forKey: .license)

53− ?? (try? container.decode(JSONValue.self, forKey: .license)).flatMap(Self.describeLicense)

54− self.grpcPort = (try? container.decode(Int.self, forKey: .grpcPort))

39+ self.grpcPort = try? container.decode(Int.self, forKey: .grpcPort)

55− ?? (try? snakeCase?.decode(Int.self, forKey: .grpcPort))

56 self.updateAvailable = try? container.decode(Bool.self, forKey: .updateAvailable)

40 self.updateAvailable = try? container.decode(Bool.self, forKey: .updateAvailable)

57 self.latestVersion = try? container.decode(String.self, forKey: .latestVersion)

41 self.latestVersion = try? container.decode(String.self, forKey: .latestVersion)

58 self.llmActive = try? container.decode(Bool.self, forKey: .llmActive)

42 self.llmActive = try? container.decode(Bool.self, forKey: .llmActive)

59 self.oidcActive = try? container.decode(Bool.self, forKey: .oidcActive)

43 self.oidcActive = try? container.decode(Bool.self, forKey: .oidcActive)

60 }

44 }

61−

62− /// Current servers send `license` as an object (`{"name": "AGPL-3.0-only",

63− /// "plan": "OSS", …}`) rather than a string, which decoded to nil ("N/A").

64− private static func describeLicense(_ value: JSONValue) -> String? {

65− guard case .object(let fields) = value, let name = fields["name"]?.stringValue else { return nil }

66− if let plan = fields["plan"]?.stringValue, !plan.isEmpty {

67− return "\(name) (\(plan))"

68− }

69− return name

70− }

71}

45}

73struct StoreInfo: Codable, Sendable {

47struct StoreInfo: Codable, Sendable {

ParseableViewer/Services/ParseableClient.swift+2−44

@@ -409,51 +409,9 @@ final class ParseableClient: Sendable {

409 return try Self.jsonDecoder.decode(AlertConfig.self, from: data)

410 }

411

412− // `/api/v1/alerts` paginates (default page size 100, max 1000) over ALL

413− // alerts server-wide, ordered by state/severity/title. Filtering only the

414− // first page by stream (below) silently missed any stream whose alerts sort

415− // past it. Request full pages until a short one. Servers that predate

416− // pagination ignore the parameters and return everything each time, so a

417− // page that adds nothing new also ends the loop.

418− func modernAlerts() async throws -> (data: Data, config: AlertConfig) {

419− let pageSize = 1000

420− var firstData: Data?

421− var version: String?

422− var collected: [AlertRule] = []

423− var seenIDs = Set<String>()

424− var offset = 0

425− for _ in 0..<50 {

426− let data: Data

427− do {

428− data = try await performRequest(

429− method: "GET",

430− path: "/api/v1/alerts",

431− queryItems: [

432− URLQueryItem(name: "limit", value: String(pageSize)),

433− URLQueryItem(name: "offset", value: String(offset)),

434− ]

435− )

436− } catch ParseableError.serverError(let code, _) where code == 400 && offset == 0 {

437− // A server that rejects the paging parameters: one plain request.

438− let data = try await performRequest(method: "GET", path: "/api/v1/alerts")

439− return (data, try Self.jsonDecoder.decode(AlertConfig.self, from: data))

440− }

441− let page = try Self.jsonDecoder.decode(AlertConfig.self, from: data)

442− if firstData == nil {

443− firstData = data

444− version = page.version

445− }

446− let alerts = page.alerts ?? []

447− let fresh = alerts.filter { seenIDs.insert($0.id).inserted }

448− collected.append(contentsOf: fresh)

449− if alerts.count < pageSize || fresh.isEmpty { break }

450− offset += alerts.count

451− }

452− return (firstData ?? Data(), AlertConfig(alerts: collected, version: version))

453− }

454−

455 do {

412 do {

456− let (data, config) = try await modernAlerts()

413+ let data = try await performRequest(method: "GET", path: "/api/v1/alerts")

414+ let config = try Self.jsonDecoder.decode(AlertConfig.self, from: data)

457 // AlertConfig decodes leniently (every field via try?), so a 200 with

415 // AlertConfig decodes leniently (every field via try?), so a 200 with

458 // an unexpected body yields an empty, non-throwing config rather than

416 // an unexpected body yields an empty, non-throwing config rather than

459 // a DecodingError — indistinguishable from a server that genuinely has

417 // a DecodingError — indistinguishable from a server that genuinely has

ParseableViewer/ViewModels/LiveTailViewModel.swift+43−87

@@ -27,26 +27,14 @@ final class LiveTailViewModel {

27 /// column hidden last session would reappear visible when it shows up in a

28 /// later poll. This retains the intent so it stays hidden when it appears.

29 private var savedHiddenColumns: Set<String> = []

30− /// The full persisted column order, including columns not yet seen this

31− /// session — the order counterpart of `savedHiddenColumns`. A column that

32− /// first shows up in a later poll is slotted back into its saved position

33− /// (instead of being appended), and saving keeps unseen columns' positions

34− /// rather than dropping them from the stored order.

35− private var savedColumnOrder: [String] = []

36 private var currentStream: String?

30 private var currentStream: String?

38 // nonisolated(unsafe) so deinit can invalidate the timer.

32 // nonisolated(unsafe) so deinit can invalidate the timer.

39 // Only mutated from @MainActor methods (start/stop).

33 // Only mutated from @MainActor methods (start/stop).

40 nonisolated(unsafe) private var timer: Timer?

34 nonisolated(unsafe) private var timer: Timer?

41 private var lastTimestamp: Date?

35 private var lastTimestamp: Date?

42− /// How many records with each content fingerprint have been delivered. A

43− /// count rather than a set: Parseable stamps every event of one ingest request

44− /// with the same millisecond `p_timestamp`, so genuinely repeated events (the

45− /// same log line emitted three times) fingerprint identically. A set collapsed

46− /// them into one row; counting keeps each occurrence while still suppressing

47− /// the re-fetch of the same rows by the next overlapping poll window.

48− private var seenFingerprints: [String: Int] = [:]

36+ private var seenFingerprints: Set<String> = []

49− /// Insertion-ordered mirror of `seenFingerprints` keys (oldest first), used to

37+ /// Insertion-ordered mirror of `seenFingerprints` (oldest first), used to

50 /// evict the least-recently-seen fingerprints when the set is trimmed.

38 /// evict the least-recently-seen fingerprints when the set is trimmed.

51 private var seenFingerprintOrder: [String] = []

39 private var seenFingerprintOrder: [String] = []

52 /// Upper bound on the dedup fingerprint set. Kept well above `maxEntries` so

40 /// Upper bound on the dedup fingerprint set. Kept well above `maxEntries` so

@@ -221,7 +209,7 @@ final class LiveTailViewModel {

221 isPolling = false

209 isPolling = false

222 errorMessage = nil

210 errorMessage = nil

223 entries = []

211 entries = []

224− seenFingerprints = [:]

212+ seenFingerprints = []

225 seenFingerprintOrder = []

213 seenFingerprintOrder = []

226 allKnownKeys = []

214 allKnownKeys = []

227 droppedCount = 0

215 droppedCount = 0

@@ -232,7 +220,6 @@ final class LiveTailViewModel {

232 columnOrder = []

220 columnOrder = []

233 hiddenColumns = []

221 hiddenColumns = []

234 savedHiddenColumns = []

222 savedHiddenColumns = []

235− savedColumnOrder = []

236 columnFilters = []

223 columnFilters = []

237 // Clear the text filter too. Leaving it set while clearing the column-filter

224 // Clear the text filter too. Leaving it set while clearing the column-filter

238 // chips is inconsistent and would let a stale search from a previous stream

225 // chips is inconsistent and would let a stale search from a previous stream

@@ -275,12 +262,12 @@ final class LiveTailViewModel {

275 // next timer tick skip itself via `guard !isPolling`.

262 // next timer tick skip itself via `guard !isPolling`.

276 isPolling = false

263 isPolling = false

277 entries = []

264 entries = []

278− // Keep the dedup fingerprints (unlike start(), which begins a new session):

265+ seenFingerprints = []

279− // every poll looks back at least 90 s regardless of `lastTimestamp` (see

266+ seenFingerprintOrder = []

280− // `safeStart` in poll()), so the records just cleared are re-fetched by the

267+ // Advance the look-back floor to now: without this, the next poll queries

281− // next poll. With an emptied fingerprint set they all passed dedup again and

268+ // from the old `lastTimestamp` with an empty fingerprint set and re-inserts

282− // the tail refilled with exactly what the user cleared. The set stays

269+ // every just-cleared record still inside the ~90 s window, repopulating the

283− // bounded by the eviction in poll().

270+ // view the user just emptied. Matches start()'s reset.

284 lastTimestamp = Date()

271 lastTimestamp = Date()

285 allKnownKeys = []

272 allKnownKeys = []

286 droppedCount = 0

273 droppedCount = 0

@@ -295,7 +282,6 @@ final class LiveTailViewModel {

295 columnOrder = []

282 columnOrder = []

296 hiddenColumns = []

283 hiddenColumns = []

297 savedHiddenColumns = []

284 savedHiddenColumns = []

298− savedColumnOrder = []

299 columnFilters = []

285 columnFilters = []

300 // Match start(): clear the text filter alongside the column-filter chips so

286 // Match start(): clear the text filter alongside the column-filter chips so

301 // a clear()ed tail isn't immediately re-hidden by a lingering search string.

287 // a clear()ed tail isn't immediately re-hidden by a lingering search string.

@@ -351,7 +337,6 @@ final class LiveTailViewModel {

351

337

352 func resetColumnConfig() {

338 func resetColumnConfig() {

353 columnOrder = columns

339 columnOrder = columns

354− savedColumnOrder = []

355 hiddenColumns.removeAll()

340 hiddenColumns.removeAll()

356 savedHiddenColumns.removeAll()

341 savedHiddenColumns.removeAll()

357 saveColumnConfig()

342 saveColumnConfig()

@@ -365,16 +350,9 @@ final class LiveTailViewModel {

365

350

366 private func saveColumnConfig() {

351 private func saveColumnConfig() {

367 guard let stream = currentStream else { return }

352 guard let stream = currentStream else { return }

368− // Persist the full intended hidden set and order (including columns not

353+ // Persist the full intended hidden set (including columns not yet seen

369− // yet seen this session) so they survive restarts and incremental discovery.

354+ // this session) so it survives across restarts and incremental discovery.

370− let seen = Set(columnOrder)

371− let order = QueryViewModel.mergedColumnOrder(

372− columnOrder,

373− inserting: savedColumnOrder.filter { !seen.contains($0) },

374− reference: savedColumnOrder

375− )

376− savedColumnOrder = order

377− let config = QueryViewModel.ColumnConfiguration(order: order, hidden: savedHiddenColumns)

355+ let config = QueryViewModel.ColumnConfiguration(order: columnOrder, hidden: savedHiddenColumns)

378 if let data = try? JSONEncoder().encode(config) {

356 if let data = try? JSONEncoder().encode(config) {

379 UserDefaults.standard.set(data, forKey: Self.columnConfigKey(for: stream))

357 UserDefaults.standard.set(data, forKey: Self.columnConfigKey(for: stream))

380 }

358 }

@@ -416,12 +394,10 @@ final class LiveTailViewModel {

416 merged.append(col)

394 merged.append(col)

417 }

395 }

418 columnOrder = merged

396 columnOrder = merged

419− savedColumnOrder = config.order

420 savedHiddenColumns = config.hidden

397 savedHiddenColumns = config.hidden

421 hiddenColumns = config.hidden.intersection(extractedSet)

398 hiddenColumns = config.hidden.intersection(extractedSet)

422 } else {

399 } else {

423 columnOrder = extracted

400 columnOrder = extracted

424− savedColumnOrder = []

425 savedHiddenColumns = []

401 savedHiddenColumns = []

426 hiddenColumns = []

402 hiddenColumns = []

427 }

403 }

@@ -434,7 +410,7 @@ final class LiveTailViewModel {

434 }

410 }

435 if !newCols.isEmpty {

411 if !newCols.isEmpty {

436 columns.append(contentsOf: newCols)

412 columns.append(contentsOf: newCols)

437− columnOrder = QueryViewModel.mergedColumnOrder(columnOrder, inserting: newCols, reference: savedColumnOrder)

413+ columnOrder.append(contentsOf: newCols)

438 // Re-hide any newly appearing column that was hidden in a prior

414 // Re-hide any newly appearing column that was hidden in a prior

439 // session but hadn't been seen yet this run.

415 // session but hadn't been seen yet this run.

440 hiddenColumns.formUnion(newCols.filter { savedHiddenColumns.contains($0) })

416 hiddenColumns.formUnion(newCols.filter { savedHiddenColumns.contains($0) })

@@ -492,27 +468,22 @@ final class LiveTailViewModel {

492 // Process records off the main actor using a snapshot of seen fingerprints

468 // Process records off the main actor using a snapshot of seen fingerprints

493 let seenSnapshot = seenFingerprints

469 let seenSnapshot = seenFingerprints

494 let pollTime = now

470 let pollTime = now

495− let (candidateEntries, batchCounts) = await Task.detached(priority: .userInitiated) {

471+ let candidateEntries = await Task.detached(priority: .userInitiated) {

496− var results: [(entry: LiveTailEntry, occurrence: Int)] = []

472+ var results: [LiveTailEntry] = []

497− var counts: [String: Int] = [:]

498 for record in records {

473 for record in records {

499 let fp = Self.fingerprint(for: record)

474 let fp = Self.fingerprint(for: record)

500− let occurrence = (counts[fp] ?? 0) + 1

501− counts[fp] = occurrence

502− // The first `seen` occurrences of this content were delivered

503− // by earlier polls; only later ones are new.

504− guard occurrence > (seenSnapshot[fp] ?? 0) else { continue }

475+ guard !seenSnapshot.contains(fp) else { continue }

505 let timestamp = Self.parseTimestamp(from: record) ?? pollTime

476 let timestamp = Self.parseTimestamp(from: record) ?? pollTime

506 let summary = Self.buildSummary(from: record)

477 let summary = Self.buildSummary(from: record)

507− results.append((LiveTailEntry(

478+ results.append(LiveTailEntry(

508 timestamp: timestamp,

479 timestamp: timestamp,

509 record: record,

480 record: record,

510 displayTimestamp: Self.displayFormatter.string(from: timestamp),

481 displayTimestamp: Self.displayFormatter.string(from: timestamp),

511 summary: summary,

482 summary: summary,

512 fingerprint: fp

483 fingerprint: fp

513− ), occurrence))

484+ ))

514 }

485 }

515− return (results, counts)

486+ return results

516 }.value

487 }.value

517

488

518 // Re-check after the detached processing hop: a stop/clear could have

489 // Re-check after the detached processing hop: a stop/clear could have

@@ -521,13 +492,11 @@ final class LiveTailViewModel {

521

492

522 // Authoritative dedup on main actor

493 // Authoritative dedup on main actor

523 var newEntries: [LiveTailEntry] = []

494 var newEntries: [LiveTailEntry] = []

524− for candidate in candidateEntries

495+ for entry in candidateEntries {

525− where candidate.occurrence > (seenFingerprints[candidate.entry.fingerprint] ?? 0) {

496+ if seenFingerprints.insert(entry.fingerprint).inserted {

526− newEntries.append(candidate.entry)

527− }

528− for (fp, count) in batchCounts where count > (seenFingerprints[fp] ?? 0) {

529− if seenFingerprints[fp] == nil { seenFingerprintOrder.append(fp) }

497+ seenFingerprintOrder.append(entry.fingerprint)

530− seenFingerprints[fp] = count

498+ newEntries.append(entry)

499+ }

531 }

500 }

532

501

533 if !newEntries.isEmpty {

502 if !newEntries.isEmpty {

@@ -549,27 +518,23 @@ final class LiveTailViewModel {

549 // would let it pass the dedup check and be re-appended as a

518 // would let it pass the dedup check and be re-appended as a

550 // duplicate. Keep the full seen-set so dedup stays correct;

519 // duplicate. Keep the full seen-set so dedup stays correct;

551 // it is bounded below to avoid unbounded growth.

520 // it is bounded below to avoid unbounded growth.

552− }

553−

554− // Bound the seen-set on every poll, not only when the buffer

555− // overflows: clear() keeps fingerprints while emptying `entries`,

556− // so the set can outgrow the cap without the buffer ever filling.

557− if seenFingerprints.count > maxSeenFingerprints {

521+ if seenFingerprints.count > maxSeenFingerprints {

558− // Evict the OLDEST surplus fingerprints by insertion order,

522+ // Evict the OLDEST surplus fingerprints by insertion order,

559− // not by what's currently buffered. Collapsing to only the

523+ // not by what's currently buffered. Collapsing to only the

560− // buffered set would drop recently-evicted fingerprints that

524+ // buffered set would drop recently-evicted fingerprints that

561− // still fall inside the next poll's ~90 s look-back window,

525+ // still fall inside the next poll's ~90 s look-back window,

562− // re-admitting those records as duplicates. Keeping the

526+ // re-admitting those records as duplicates. Keeping the

563− // most-recently-seen tail preserves a full window of evicted

527+ // most-recently-seen tail preserves a full window of evicted

564− // fingerprints. Buffered fingerprints are always retained so

528+ // fingerprints. Buffered fingerprints are always retained so

565− // a re-fetch of a buffered record stays deduplicated.

529+ // a re-fetch of a buffered record stays deduplicated.

566− let overflow = seenFingerprints.count - maxSeenFingerprints

530+ let overflow = seenFingerprints.count - maxSeenFingerprints

567− let buffered = Set(entries.map { $0.fingerprint })

531+ let buffered = Set(entries.map { $0.fingerprint })

568− let toDrop = Set(seenFingerprintOrder.prefix(overflow))

532+ let toDrop = Set(seenFingerprintOrder.prefix(overflow))

569− .subtracting(buffered)

533+ .subtracting(buffered)

570− if !toDrop.isEmpty {

534+ if !toDrop.isEmpty {

571− for fp in toDrop { seenFingerprints.removeValue(forKey: fp) }

535+ seenFingerprints.subtract(toDrop)

572− seenFingerprintOrder.removeAll { toDrop.contains($0) }

536+ seenFingerprintOrder.removeAll { toDrop.contains($0) }

537+ }

573 }

538 }

574 }

539 }

575

540

@@ -724,19 +689,10 @@ final class LiveTailViewModel {

724 return nil

689 return nil

725 }

690 }

726 if case .string(let str) = value {

691 if case .string(let str) = value {

727− if let date = isoFractional.date(from: str) ?? isoBasic.date(from: str) {

692+ if let date = isoFractional.date(from: str) {

728 return date

693 return date

729 }

694 }

730− // Parseable stores `p_timestamp` as an Arrow timestamp without a

731− // timezone, and the query API serializes it as a naive UTC string with

732− // no offset (e.g. "2024-01-11T09:08:34.290"). `.withInternetDateTime`

733− // requires a zone designator, so such values never parsed: every entry

734− // fell back to the poll time, which also scrambled the tail's order

735− // (each poll's DESC-ordered batch was appended newest-first). Retry as

736− // UTC; a string that already carries an offset won't parse with an

737− // extra "Z", so this can't reinterpret zoned timestamps.

738− let utc = str + "Z"

739− return isoFractional.date(from: utc) ?? isoBasic.date(from: utc)

695+ return isoBasic.date(from: str)

740 }

696 }

741 return nil

697 return nil

742 }

698 }

ParseableViewer/ViewModels/QueryViewModel.swift+49−248

@@ -59,29 +59,9 @@ final class QueryViewModel {

59 var columns: [String] = []

60 var columnOrder: [String] = []

61 var hiddenColumns: Set<String> = []

62− /// The full persisted set of hidden columns for the current stream, including

63− /// ones absent from the current result. Hiding a column drops it from the

64− /// SELECT list, so it's missing from the very next result and `hiddenColumns`

65− /// (only the columns present) forgets it — the next save would then erase the

66− /// preference. This keeps the intent, mirroring LiveTailViewModel.

67− private(set) var savedHiddenColumns: Set<String> = []

68− /// The persisted column order including columns absent from the current

69− /// result (the order counterpart of `savedHiddenColumns`), so saving doesn't

70− /// drop a hidden column's position and it returns to its place when shown.

71− private var savedColumnOrder: [String] = []

72 var autoHiddenColumns: Set<String> = []

62 var autoHiddenColumns: Set<String> = []

73 /// Column config from a saved query, applied on next query execution.

63 /// Column config from a saved query, applied on next query execution.

74 var pendingColumnConfig: ColumnConfiguration?

64 var pendingColumnConfig: ColumnConfiguration?

75−

76− /// The connection and stream the editor text and results belong to. The view

77− /// model outlives QueryView (switching tabs keeps the query), so the view

78− /// compares this on appear to catch a stream/server change made while another

79− /// tab was showing.

80− struct BoundContext: Equatable {

81− let connectionID: UUID?

82− let stream: String

83− }

84− var boundContext: BoundContext?

85 private var currentStream: String?

65 private var currentStream: String?

86 var isLoading = false

66 var isLoading = false

87 var errorMessage: String?

67 var errorMessage: String?

@@ -212,16 +192,9 @@ final class QueryViewModel {

212 return columnOrder.filter { !allHidden.contains($0) }

192 return columnOrder.filter { !allHidden.contains($0) }

213 }

193 }

214

194

215− /// Whether any column is hidden — including saved-hidden columns that aren't

216− /// in the current result, which "Show All" can bring back.

217− var hasHiddenColumns: Bool {

218− !hiddenColumns.isEmpty || !autoHiddenColumns.isEmpty || !savedHiddenColumns.isEmpty

219− }

220−

221 func toggleColumnVisibility(_ column: String) {

195 func toggleColumnVisibility(_ column: String) {

222 if hiddenColumns.contains(column) {

196 if hiddenColumns.contains(column) {

223 hiddenColumns.remove(column)

197 hiddenColumns.remove(column)

224− savedHiddenColumns.remove(column)

225 } else if autoHiddenColumns.contains(column) {

198 } else if autoHiddenColumns.contains(column) {

226 autoHiddenColumns.remove(column)

199 autoHiddenColumns.remove(column)

227 } else {

200 } else {

@@ -230,7 +203,6 @@ final class QueryViewModel {

230 let visibleCount = columnOrder.count - allHidden.count

203 let visibleCount = columnOrder.count - allHidden.count

231 if visibleCount > 1 {

204 if visibleCount > 1 {

232 hiddenColumns.insert(column)

205 hiddenColumns.insert(column)

233− savedHiddenColumns.insert(column)

234 }

206 }

235 }

207 }

236 saveColumnConfig()

208 saveColumnConfig()

@@ -239,7 +211,6 @@ final class QueryViewModel {

239

211

240 func showAllColumns() {

212 func showAllColumns() {

241 hiddenColumns.removeAll()

213 hiddenColumns.removeAll()

242− savedHiddenColumns.removeAll()

243 autoHiddenColumns.removeAll()

214 autoHiddenColumns.removeAll()

244 saveColumnConfig()

215 saveColumnConfig()

245 updateSQLColumns()

216 updateSQLColumns()

@@ -269,116 +240,32 @@ final class QueryViewModel {

269

240

270 func resetColumnConfig() {

241 func resetColumnConfig() {

271 columnOrder = columns

242 columnOrder = columns

272− savedColumnOrder = []

273 hiddenColumns.removeAll()

243 hiddenColumns.removeAll()

274− savedHiddenColumns.removeAll()

275 autoHiddenColumns.removeAll()

244 autoHiddenColumns.removeAll()

276 saveColumnConfig()

245 saveColumnConfig()

277 updateSQLColumns()

246 updateSQLColumns()

278 }

247 }

279

248

280− /// Rewrites the SELECT clause of `sqlQuery` to reflect the user's column

249+ /// Rewrites the SELECT clause of `sqlQuery` to reflect the current `visibleColumns`.

281− /// choices (order and hidden columns; auto-hidden columns stay display-only).

282 func updateSQLColumns() {

250 func updateSQLColumns() {

283− guard let range = SQLTokenizer.selectColumnListRange(in: sqlQuery),

251+ guard let range = SQLTokenizer.selectColumnListRange(in: sqlQuery) else { return }

284− let currentList = Self.parseColumnList(sqlQuery[range]) else { return }

285−

286− // Project the user's choices only. `autoHiddenColumns` is a display

287− // heuristic for the current rows (the field is empty in all of them);

288− // baking it into the SQL would stop the field from ever being fetched

289− // again, even for a time range where it has values.

290− let visible = columnOrder.filter { !hiddenColumns.contains($0) }

291− guard !visible.isEmpty else { return }

292

252

293− // Columns an explicit list names that aren't in the results: Parseable

253+ let visible = visibleColumns

294− // omits all-null fields from query JSON, so a sparse listed field can be

254+ guard !visible.isEmpty else { return }

295− // missing from `columns`. Keep it (unless the user hid it) rather than

296− // silently dropping it from the SELECT on the next rewrite.

297− var listedButAbsent: [String] = []

298− var excludesHiddenColumn = false

299− if case .identifiers(let names) = currentList {

300− let present = Set(columns)

301− listedButAbsent = names.filter { !present.contains($0) && !savedHiddenColumns.contains($0) }

302− // A column the user hid is absent from these results precisely

303− // because this list was narrowed to exclude it.

304− excludesHiddenColumn = !savedHiddenColumns.isSubset(of: present)

305− }

306

255

307 let newColumnList: String

256 let newColumnList: String

308 // Use `*` whenever every column is visible, regardless of display order —

257 // Use `*` whenever every column is visible, regardless of display order —

309 // reordering columns (a set-preserving permutation) must not pin the query

258 // reordering columns (a set-preserving permutation) must not pin the query

310− // to an explicit snapshot that hides newly-appearing fields on re-query —

259+ // to an explicit snapshot that hides newly-appearing fields on re-query.

311− // unless the list is explicit because it leaves out a hidden column, which

312− // `*` would fetch again.

313− if !excludesHiddenColumn && visible.count == columns.count && Set(visible) == Set(columns) {

260+ if visible.count == columns.count && Set(visible) == Set(columns) {

314 newColumnList = "*"

261 newColumnList = "*"

315 } else {

262 } else {

316− newColumnList = (visible + listedButAbsent).map { Self.escapeSQLIdentifier($0) }.joined(separator: ", ")

263+ newColumnList = visible.map { Self.escapeSQLIdentifier($0) }.joined(separator: ", ")

317 }

264 }

318

265

319 sqlQuery.replaceSubrange(range, with: newColumnList)

266 sqlQuery.replaceSubrange(range, with: newColumnList)

320 }

267 }

321

268

322− enum ColumnListShape: Equatable {

323− case star

324− /// Plain column references, as the column names they resolve to.

325− case identifiers([String])

326− }

327−

328− /// Parses a SELECT list the column manager can regenerate without changing

329− /// what the query computes: `*`, or a comma-separated list of plain column

330− /// references. Anything else — aggregates, expressions, aliases

331− /// (`count(*) AS n`), qualified names — returns nil: rewriting it with `*` or

332− /// bare result keys would break the query, so the column manager then only

333− /// hides/reorders client-side.

334− nonisolated static func parseColumnList(_ list: Substring) -> ColumnListShape? {

335− let tokens = SQLTokenizer.tokenize(String(list)).filter { !$0.kind.isTrivia }

336− if tokens.count == 1, tokens[0].kind == .star { return .star }

337− guard tokens.count % 2 == 1 else { return nil }

338− var names: [String] = []

339− for (index, token) in tokens.enumerated() {

340− if index % 2 == 1 {

341− guard token.kind == .comma else { return nil }

342− continue

343− }

344− switch token.kind {

345− // DataFusion folds unquoted identifiers to lowercase.

346− case .identifier(let name): names.append(name.lowercased())

347− case .quotedIdentifier(let name): names.append(name)

348− default: return nil

349− }

350− }

351− return .identifiers(names)

352− }

353−

354− /// Inserts `newColumns` into `order`, placing each one that appears in

355− /// `reference` (a saved order) right after its nearest saved predecessor

356− /// that's already placed — or first if none is — and appending the rest.

357− /// Used to keep the positions of columns that are absent for a while.

358− nonisolated static func mergedColumnOrder(

359− _ order: [String], inserting newColumns: [String], reference: [String]

360− ) -> [String] {

361− var result = order

362− let referenceIndex = Dictionary(reference.enumerated().map { ($1, $0) }, uniquingKeysWith: { first, _ in first })

363− let pending = newColumns.filter { referenceIndex[$0] == nil }

364− let positioned = newColumns

365− .filter { referenceIndex[$0] != nil }

366− .sorted { referenceIndex[$0]! < referenceIndex[$1]! }

367− for column in positioned where !result.contains(column) {

368− let savedIndex = referenceIndex[column]!

369− let predecessor = reference[..<savedIndex].reversed().first { result.contains($0) }

370− if let predecessor, let position = result.firstIndex(of: predecessor) {

371− result.insert(column, at: position + 1)

372− } else {

373− result.insert(column, at: 0)

374− }

375− }

376− for column in pending where !result.contains(column) {

377− result.append(column)

378− }

379− return result

380− }

381−

382 // MARK: - Column Configuration Persistence

269 // MARK: - Column Configuration Persistence

383

270

384 struct ColumnConfiguration: Codable {

271 struct ColumnConfiguration: Codable {

@@ -392,16 +279,7 @@ final class QueryViewModel {

392

279

393 private func saveColumnConfig() {

280 private func saveColumnConfig() {

394 guard let stream = currentStream else { return }

281 guard let stream = currentStream else { return }

395− // Persist the full intended hidden set and order, not just the currently

396− // present columns (see `savedHiddenColumns` / `savedColumnOrder`).

397− let present = Set(columnOrder)

398− let order = Self.mergedColumnOrder(

399− columnOrder,

400− inserting: savedColumnOrder.filter { !present.contains($0) },

401− reference: savedColumnOrder

402− )

403− savedColumnOrder = order

404− let config = ColumnConfiguration(order: order, hidden: savedHiddenColumns.union(hiddenColumns))

282+ let config = ColumnConfiguration(order: columnOrder, hidden: hiddenColumns)

405 if let data = try? JSONEncoder().encode(config) {

283 if let data = try? JSONEncoder().encode(config) {

406 UserDefaults.standard.set(data, forKey: Self.columnConfigKey(for: stream))

284 UserDefaults.standard.set(data, forKey: Self.columnConfigKey(for: stream))

407 }

285 }

@@ -430,9 +308,7 @@ final class QueryViewModel {

430

308

431 guard let config else {

309 guard let config else {

432 columnOrder = extractedColumns

310 columnOrder = extractedColumns

433− savedColumnOrder = []

434 hiddenColumns = []

311 hiddenColumns = []

435− savedHiddenColumns = []

436 return

312 return

437 }

313 }

438

314

@@ -445,8 +321,6 @@ final class QueryViewModel {

445 merged.append(col)

321 merged.append(col)

446 }

322 }

447 columnOrder = merged

323 columnOrder = merged

448− savedColumnOrder = config.order

449− savedHiddenColumns = config.hidden

450 hiddenColumns = config.hidden.intersection(extractedSet)

324 hiddenColumns = config.hidden.intersection(extractedSet)

451

325

452 // The `visibleCount > 1` guard in toggleColumnVisibility only covers

326 // The `visibleCount > 1` guard in toggleColumnVisibility only covers

@@ -645,8 +519,6 @@ final class QueryViewModel {

645 // report stale column names after the failure.

519 // report stale column names after the failure.

646 columnOrder = []

520 columnOrder = []

647 hiddenColumns = []

521 hiddenColumns = []

648− savedHiddenColumns = []

649− savedColumnOrder = []

650 autoHiddenColumns = []

522 autoHiddenColumns = []

651 }

523 }

652 }

524 }

@@ -813,8 +685,6 @@ final class QueryViewModel {

813 columns = []

685 columns = []

814 columnOrder = []

686 columnOrder = []

815 hiddenColumns = []

687 hiddenColumns = []

816− savedHiddenColumns = []

817− savedColumnOrder = []

818 autoHiddenColumns = []

688 autoHiddenColumns = []

819 currentStream = nil

689 currentStream = nil

820 resultCount = 0

690 resultCount = 0

@@ -828,7 +698,6 @@ final class QueryViewModel {

828 // a later reload guard never sees a non-nil stream paired with empty data.

698 // a later reload guard never sees a non-nil stream paired with empty data.

829 latestSchemaStream = nil

699 latestSchemaStream = nil

830 latestQueryStream = nil

700 latestQueryStream = nil

831− boundContext = nil

832 }

701 }

833

702

834 /// Modifies `sqlQuery` to add a column-value filter condition.

703 /// Modifies `sqlQuery` to add a column-value filter condition.

@@ -838,139 +707,75 @@ final class QueryViewModel {

838 let condition: String

707 let condition: String

839 if let value, value != .null {

708 if let value, value != .null {

840 let literal = value.sqlLiteral

709 let literal = value.sqlLiteral

841− // Exclude with `IS DISTINCT FROM`, not `<>`: under SQL's three-valued

842− // logic `NULL <> 'x'` is NULL, so `<>` also dropped every row where the

843− // column is missing/NULL — common for sparse fields — which "exclude

844− // this value" doesn't ask for (the live-tail exclude keeps them too).

845− condition = exclude

846− ? "\(escapedCol) IS DISTINCT FROM \(literal)"

847− : "\(escapedCol) = \(literal)"

710+ condition = exclude ? "\(escapedCol) <> \(literal)" : "\(escapedCol) = \(literal)"

848 } else {

711 } else {

849 condition = exclude ? "\(escapedCol) IS NOT NULL" : "\(escapedCol) IS NULL"

712 condition = exclude ? "\(escapedCol) IS NOT NULL" : "\(escapedCol) IS NULL"

850 }

713 }

851

714

852− let sql = sqlQuery.trimmingCharacters(in: .whitespacesAndNewlines)

715+ var sql = sqlQuery.trimmingCharacters(in: .whitespacesAndNewlines)

853 if sql.isEmpty { return }

716 if sql.isEmpty { return }

854

717

855 // Locate the top-level WHERE and the first trailing clause using the

718 // Locate the top-level WHERE and the first trailing clause using the

856 // tokenizer rather than a raw regex, so keywords inside quoted

719 // tokenizer rather than a raw regex, so keywords inside quoted

857 // identifiers, string literals, comments, or subqueries are ignored.

720 // identifiers, string literals, comments, or subqueries are ignored.

858− let tokens = SQLTokenizer.tokenize(sql)

721+ let tailKeywords: Set<String> = ["ORDER", "GROUP", "HAVING", "LIMIT", "OFFSET"]

859 var depth = 0

722 var depth = 0

860− // WHERE and the trailing clauses only follow the top-level FROM. Keywords

723+ var whereEnd: String.Index?

861− // before it belong to the SELECT list — e.g. a field named `offset` or

724+ var tailStart: String.Index?

862− // `limit` (which the tokenizer reports as keywords) — and must not be

863− // mistaken for clause starts.

864− var fromSeen = false

865− var whereIndex: Int?

866− var tailIndex: Int?

867 // Track whether the existing WHERE body has a top-level OR — only then does

725 // Track whether the existing WHERE body has a top-level OR — only then does

868 // AND-ing a new condition need parentheses to preserve precedence.

726 // AND-ing a new condition need parentheses to preserve precedence.

869 var bodyHasTopLevelOr = false

727 var bodyHasTopLevelOr = false

870− // The last token that is actual SQL — not whitespace, a comment, or a

728+ for token in SQLTokenizer.tokenize(sql) {

871− // statement-terminating `;`. New text is spliced in right after such

872− // tokens (never at the raw end of the string), so a trailing `;` or a

873− // trailing `-- comment` stays at the end instead of swallowing the

874− // appended condition: `... LIMIT 10;` must not become `... LIMIT 10; WHERE`,

875− // and `... -- note` must not become `... -- note WHERE <commented out>`.

876− func isSignificant(_ token: SQLTokenizer.Token) -> Bool {

877− !token.kind.isTrivia && token.kind != .other(";")

878− }

879− func nextSignificantKind(after index: Int) -> SQLTokenizer.TokenKind? {

880− tokens[(index + 1)...].first(where: { isSignificant($0) })?.kind

881− }

882− // Whether the keyword at `index` actually opens a trailing clause. ORDER and

883− // GROUP must be followed by BY (so `WITHIN GROUP (…)` or a column named

884− // `order` doesn't count), and LIMIT/OFFSET by their row count (so a column

885− // named `offset` in `WHERE offset > 5` doesn't cut the WHERE body short).

886− func startsTrailingClause(_ keyword: String, at index: Int) -> Bool {

887− switch keyword {

888− case "ORDER", "GROUP":

889− return nextSignificantKind(after: index) == .keyword("BY")

890− case "LIMIT", "OFFSET":

891− if case .number = nextSignificantKind(after: index) { return true }

892− return false

893− case "HAVING":

894− return true

895− default:

896− return false

897− }

898− }

899− var lastSignificant: Int?

900− for (idx, token) in tokens.enumerated() {

901− if isSignificant(token) { lastSignificant = idx }

902 switch token.kind {

729 switch token.kind {

903 case .leftParen:

730 case .leftParen:

904 depth += 1

731 depth += 1

905 case .rightParen:

732 case .rightParen:

906 depth = max(0, depth - 1)

733 depth = max(0, depth - 1)

907− case .keyword("FROM") where depth == 0:

908− fromSeen = true

909− case .keyword(let kw) where depth == 0 && fromSeen:

734+ case .keyword(let kw) where depth == 0:

910− if kw == "WHERE", whereIndex == nil {

735+ if kw == "WHERE", whereEnd == nil {

911− whereIndex = idx

736+ whereEnd = token.range.upperBound

912− // A trailing clause seen *before* the WHERE (e.g. the GROUP BY of

737+ } else if tailKeywords.contains(kw), tailStart == nil {

913− // the first SELECT in `... GROUP BY a UNION ALL SELECT ... WHERE`)

738+ tailStart = token.range.lowerBound

914− // doesn't end this WHERE's body. Keeping it would make the body

915− // range run backwards (a trapping `Range`), so look for the

916− // body's end afresh after the WHERE.

917− tailIndex = nil

918− } else if tailIndex == nil, startsTrailingClause(kw, at: idx) {

919− tailIndex = idx

920− } else if kw == "OR", whereIndex != nil, tailIndex == nil {

739+ } else if kw == "OR", whereEnd != nil, tailStart == nil {

921 bodyHasTopLevelOr = true

740 bodyHasTopLevelOr = true

922 }

741 }

923 default:

742 default:

924 break

743 break

925 }

744 }

926 }

745 }

927− // Nothing but comments/semicolons — there's no statement to filter.

746+

928− guard let lastSignificant else { return }

747+ if let whereEnd {

929−

930− // Each branch rebuilds the query from slices of the original text, keeping

931− // the user's line breaks: joining pieces with single spaces would pull the

932− // text after a `-- comment` onto the comment's line and comment it out.

933− // Text spliced directly in front of another token (`(a = 1)ORDER BY`) needs

934− // a space so the two don't fuse (`... IS NULLORDER BY`).

935− func separated(_ rest: Substring) -> String {

936− guard let next = rest.first, !next.isWhitespace, next != ";" else { return String(rest) }

937− return " " + rest

938− }

939− if let whereIndex {

940− // The WHERE body runs up to the first trailing clause, or to the end

941− // of the statement. Only its significant tokens bound the splice, so a

942− // comment between the body and ORDER BY stays after the new condition.

943− let bodyEndIndex = tailIndex ?? (lastSignificant + 1)

944− let bodyIndices = (whereIndex + 1)..<bodyEndIndex

945− if let first = bodyIndices.first(where: { isSignificant(tokens[$0]) }),

946− let last = bodyIndices.last(where: { isSignificant(tokens[$0]) }) {

947− // Parenthesize the existing WHERE body before AND-ing the new

748+ // Parenthesize the existing WHERE body before AND-ing the new

948− // condition only when it has a top-level OR, otherwise the OR

749+ // condition only when it has a top-level OR, otherwise the OR

949− // silently changes meaning: `WHERE a = 1 OR b = 2` would become

750+ // silently changes meaning: `WHERE a = 1 OR b = 2` would become

950− // `WHERE a = 1 OR b = 2 AND c = 3`, which SQL binds as

751+ // `WHERE a = 1 OR b = 2 AND c = 3`, which SQL binds as

951− // `a = 1 OR (b = 2 AND c = 3)` rather than the intended

752+ // `a = 1 OR (b = 2 AND c = 3)` rather than the intended

952− // `(a = 1 OR b = 2) AND c = 3`. A body without a top-level OR is

753+ // `(a = 1 OR b = 2) AND c = 3`. A body without a top-level OR is

953− // left un-parenthesized so simple filters stay readable.

754+ // left un-parenthesized so simple filters stay readable.

954− let bodyStart = tokens[first].range.lowerBound

755+ let bodyEnd = tailStart ?? sql.endIndex

955− let bodyEnd = tokens[last].range.upperBound

756+ let head = sql[..<whereEnd]

956− let body = sql[bodyStart..<bodyEnd]

757+ let body = sql[whereEnd..<bodyEnd].trimmingCharacters(in: .whitespacesAndNewlines)

957− let wrappedBody = bodyHasTopLevelOr ? "(\(body))" : String(body)

758+ let tail = sql[bodyEnd...].trimmingCharacters(in: .whitespacesAndNewlines)

958− sqlQuery = "\(sql[..<bodyStart])\(wrappedBody) AND \(condition)\(separated(sql[bodyEnd...]))"

759+ // An empty WHERE body (e.g. a half-written `... WHERE` with no

760+ // condition yet, or `WHERE` immediately followed by ORDER/GROUP/

761+ // LIMIT) would otherwise produce `WHERE AND <condition>` — a

762+ // dangling AND with no left operand. Drop the AND in that case.

763+ if body.isEmpty {

764+ sql = "\(head) \(condition)"

959 } else {

765 } else {

960− // An empty WHERE body (e.g. a half-written `... WHERE` with no

766+ let wrappedBody = bodyHasTopLevelOr ? "(\(body))" : body

961− // condition yet, or `WHERE` immediately followed by ORDER/GROUP/

767+ sql = "\(head) \(wrappedBody) AND \(condition)"

962− // LIMIT) would otherwise produce `WHERE AND <condition>` — a

963− // dangling AND with no left operand. Drop the AND in that case.

964− let whereEnd = tokens[whereIndex].range.upperBound

965− sqlQuery = "\(sql[..<whereEnd]) \(condition)\(separated(sql[whereEnd...]))"

966 }

768 }

769+ if !tail.isEmpty {

770+ sql += " \(tail)"

771+ }

967− } else if let tailIndex {

772+ } else if let tailStart {

968− let tailStart = tokens[tailIndex].range.lowerBound

969− sqlQuery = "\(sql[..<tailStart])WHERE \(condition) \(sql[tailStart...])"

773+ sql.insert(contentsOf: "WHERE \(condition) ", at: tailStart)

970 } else {

774 } else {

971− let statementEnd = tokens[lastSignificant].range.upperBound

775+ sql += " WHERE \(condition)"

972− sqlQuery = "\(sql[..<statementEnd]) WHERE \(condition)\(separated(sql[statementEnd...]))"

973 }

776 }

777+

778+ sqlQuery = sql

974 }

779 }

975

780

976 /// Sets the default query for the given stream, returning `true` if the

781 /// Sets the default query for the given stream, returning `true` if the

@@ -1014,10 +819,6 @@ final class QueryViewModel {

1014 // MARK: - Query History

819 // MARK: - Query History

1015

820

1016 private func addToHistory(_ entry: QueryHistoryEntry) {

821 private func addToHistory(_ entry: QueryHistoryEntry) {

1017− // Start from what's persisted, not this instance's copy: a model created

1018− // earlier (e.g. one whose query finished after a reconnect replaced it)

1019− // would otherwise overwrite newer entries saved by the current one.

1020− queryHistory = Self.loadHistory()

1021 // Deduplicate consecutive identical queries

822 // Deduplicate consecutive identical queries

1022 if queryHistory.first?.sql == entry.sql { return }

823 if queryHistory.first?.sql == entry.sql { return }

1023 queryHistory.insert(entry, at: 0)

824 queryHistory.insert(entry, at: 0)

ParseableViewer/Views/AlertsView.swift+1−12

@@ -5,10 +5,6 @@ struct AlertsView: View {

5 @State private var alertConfig: AlertConfig?

6 @State private var isLoading = false

7 @State private var errorMessage: String?

8− /// Bumped by every load. SwiftUI cancels the previous `.task(id:)` load on a

9− /// stream switch, but that load still resumes (with a cancellation error) —

10− /// and must not touch `isLoading`, which now belongs to the newer load.

11− @State private var loadGeneration = 0

13 var body: some View {

9 var body: some View {

14 Group {

10 Group {

@@ -81,16 +77,12 @@ struct AlertsView: View {

81 private func loadAlerts(stream: String) async {

77 private func loadAlerts(stream: String) async {

82 guard let client = appState.client else { return }

78 guard let client = appState.client else { return }

83 let connID = appState.activeConnection?.id

79 let connID = appState.activeConnection?.id

84− loadGeneration &+= 1

85− let generation = loadGeneration

86 isLoading = true

80 isLoading = true

87 errorMessage = nil

81 errorMessage = nil

88 alertConfig = nil

82 alertConfig = nil

90 do {

84 do {

91 let config = try await client.getAlerts(stream: stream)

85 let config = try await client.getAlerts(stream: stream)

92− // Superseded by a newer load: leave its spinner and state alone.

93− guard generation == loadGeneration else { return }

94 // The manual Refresh/Retry buttons spawn detached Tasks not tied to

86 // The manual Refresh/Retry buttons spawn detached Tasks not tied to

95 // `.task(id: stream)` cancellation, so a slow refresh for the old stream

87 // `.task(id: stream)` cancellation, so a slow refresh for the old stream

96 // can resolve after a switch. Drop stale results. Check the connection

88 // can resolve after a switch. Drop stale results. Check the connection

@@ -102,7 +94,6 @@ struct AlertsView: View {

102 connID == appState.activeConnection?.id else { isLoading = false; return }

94 connID == appState.activeConnection?.id else { isLoading = false; return }

103 alertConfig = config

95 alertConfig = config

104 } catch {

96 } catch {

105− guard generation == loadGeneration else { return }

106 guard stream == appState.selectedStream,

97 guard stream == appState.selectedStream,

107 connID == appState.activeConnection?.id else { isLoading = false; return }

98 connID == appState.activeConnection?.id else { isLoading = false; return }

108 errorMessage = ParseableError.userFriendlyMessage(for: error)

99 errorMessage = ParseableError.userFriendlyMessage(for: error)

@@ -212,9 +203,7 @@ struct AlertRowView: View {

212 private var stateColor: Color {

203 private var stateColor: Color {

213 switch alert.state?.lowercased() {

204 switch alert.state?.lowercased() {

214 case "triggered": return .red

205 case "triggered": return .red

215− case "disabled", "silenced": return .gray

206+ case "disabled": return .gray

216− // Parseable's default, healthy state (and 2.x's "resolved") — not a warning.

217− case "not-triggered", "resolved": return .green

218 // A reported-but-unrecognized state is a genuine "needs attention" signal,

207 // A reported-but-unrecognized state is a genuine "needs attention" signal,

219 // so tint it orange; a missing state is simply unknown and stays neutral so

208 // so tint it orange; a missing state is simply unknown and stays neutral so

220 // the bell icon isn't painted as a warning for every stateless alert.

209 // the bell icon isn't painted as a warning for every stateless alert.

ParseableViewer/Views/ConnectionSheet.swift+7−27

@@ -18,10 +18,6 @@ struct ConnectionSheet: View {

18 /// retry (after a failed connect) updates it in place rather than appending a

19 /// duplicate.

20 @State private var createdConnection: ServerConnection?

21− /// Bumped on every field edit and every test run, so an in-flight Test

22− /// Connection whose fields have since changed doesn't post its (now stale)

23− /// success/failure under values that were never tested.

24− @State private var testGeneration = 0

26 enum TestResult {

22 enum TestResult {

27 case success(String)

23 case success(String)

@@ -47,7 +43,7 @@ struct ConnectionSheet: View {

47 TextField("Name:", text: $name)

43 TextField("Name:", text: $name)

48 .textFieldStyle(.roundedBorder)

44 .textFieldStyle(.roundedBorder)

49 .accessibilityLabel("Connection name")

45 .accessibilityLabel("Connection name")

50− .onChange(of: name) { _, _ in invalidateTestResult() }

46+ .onChange(of: name) { _, _ in testResult = nil }

52 TextField("Server URL:", text: $url)

48 TextField("Server URL:", text: $url)

53 .textFieldStyle(.roundedBorder)

49 .textFieldStyle(.roundedBorder)

@@ -55,7 +51,7 @@ struct ConnectionSheet: View {

55 .onChange(of: url) { _, newValue in

51 .onChange(of: url) { _, newValue in

56 urlValidationError = Self.validateURL(newValue)

52 urlValidationError = Self.validateURL(newValue)

57 // A prior test result no longer reflects the edited fields.

53 // A prior test result no longer reflects the edited fields.

58− invalidateTestResult()

54+ testResult = nil

59 }

55 }

61 if let urlError = urlValidationError, !url.isEmpty {

57 if let urlError = urlValidationError, !url.isEmpty {

@@ -67,12 +63,12 @@ struct ConnectionSheet: View {

67 TextField("Username:", text: $username)

63 TextField("Username:", text: $username)

68 .textFieldStyle(.roundedBorder)

64 .textFieldStyle(.roundedBorder)

69 .accessibilityLabel("Username")

65 .accessibilityLabel("Username")

70− .onChange(of: username) { _, _ in invalidateTestResult() }

66+ .onChange(of: username) { _, _ in testResult = nil }

72 SecureField("Password:", text: $password)

68 SecureField("Password:", text: $password)

73 .textFieldStyle(.roundedBorder)

69 .textFieldStyle(.roundedBorder)

74 .accessibilityLabel("Password")

70 .accessibilityLabel("Password")

75− .onChange(of: password) { _, _ in invalidateTestResult() }

71+ .onChange(of: password) { _, _ in testResult = nil }

76 }

72 }

77 .formStyle(.grouped)

73 .formStyle(.grouped)

78 .padding()

74 .padding()

@@ -169,16 +165,9 @@ struct ConnectionSheet: View {

169 }

165 }

170 }

166 }

171

167

172− private func invalidateTestResult() {

173− testGeneration += 1

174− testResult = nil

175− }

176−

177 private func testConnection() {

168 private func testConnection() {

178 isTesting = true

169 isTesting = true

179 testResult = nil

170 testResult = nil

180− testGeneration += 1

181− let generation = testGeneration

182

171

183 Task {

172 Task {

184 do {

173 do {

@@ -190,19 +179,14 @@ struct ConnectionSheet: View {

190 )

179 )

191 let client = try ParseableClient(connection: conn)

180 let client = try ParseableClient(connection: conn)

192 try await client.checkHealth()

181 try await client.checkHealth()

193− // The health endpoint doesn't check credentials; see

194− // AppState.verifyCredentials.

195− try await AppState.verifyCredentials(with: client)

196 await MainActor.run {

182 await MainActor.run {

197− isTesting = false

198− guard generation == testGeneration else { return }

199 testResult = .success("Connection successful")

183 testResult = .success("Connection successful")

184+ isTesting = false

200 }

185 }

201 } catch {

186 } catch {

202 await MainActor.run {

187 await MainActor.run {

203− isTesting = false

204− guard generation == testGeneration else { return }

205 testResult = .failure(ParseableError.userFriendlyMessage(for: error))

188 testResult = .failure(ParseableError.userFriendlyMessage(for: error))

189+ isTesting = false

206 }

190 }

207 }

191 }

208 }

192 }

@@ -237,10 +221,6 @@ struct ConnectionSheet: View {

237 dismiss()

221 dismiss()

238 } else {

222 } else {

239 testResult = .failure(appState.errorMessage ?? "Connection failed")

223 testResult = .failure(appState.errorMessage ?? "Connection failed")

240− // The sheet reports the failure inline; drop the app-wide alert

241− // performConnect also raised, which would otherwise surface

242− // behind/after the sheet (or twice, from the Settings window).

243− appState.showError = false

244 }

224 }

245 }

225 }

246 }

226 }

@@ -251,7 +231,7 @@ struct ConnectionSheet: View {

251 guard !trimmed.isEmpty else { return nil }

231 guard !trimmed.isEmpty else { return nil }

252

232

253 var normalized = trimmed

233 var normalized = trimmed

254− if !ServerConnection.hasURLScheme(normalized) {

234+ if !normalized.hasPrefix("http://") && !normalized.hasPrefix("https://") {

255 normalized = "https://\(normalized)"

235 normalized = "https://\(normalized)"

256 }

236 }

257

237

ParseableViewer/Views/ContentView.swift+1−26

@@ -31,18 +31,6 @@ struct ContentView: View {

32struct MainContentView: View {

33 @Environment(AppState.self) private var appState

34− /// Kept here rather than inside QueryView so the Query tab's editor text,

35− /// results and time range survive switching to another tab and back (only

36− /// the active tab's view is instantiated). Dropped on disconnect, when this

37− /// view goes away.

38− @State private var queryViewModel = QueryViewModel()

39−

40− /// Which server the Query tab's state belongs to. Editing the active

41− /// connection's URL or user keeps its id (so QueryView's own stream/connection

42− /// check can't see it), and a rename shouldn't wipe the user's query.

43− private var serverIdentity: String? {

44− appState.activeConnection.map { "\($0.id.uuidString)|\($0.url)|\($0.username)" }

45− }

47 var body: some View {

35 var body: some View {

48 @Bindable var appState = appState

36 @Bindable var appState = appState

@@ -75,7 +63,7 @@ struct MainContentView: View {

75 } else {

63 } else {

76 switch appState.currentTab {

64 switch appState.currentTab {

77 case .query:

65 case .query:

78− QueryView(viewModel: queryViewModel)

66+ QueryView()

79 .id(AppState.AppTab.query)

67 .id(AppState.AppTab.query)

80 case .liveTail:

68 case .liveTail:

81 LiveTailView()

69 LiveTailView()

@@ -95,19 +83,6 @@ struct MainContentView: View {

95 }

83 }

96 }

84 }

97 }

85 }

98− .onChange(of: serverIdentity) { _, _ in

99− // The Query tab's model outlives stream and server changes made while

100− // it isn't on screen. On a new server, drop the old one's results and

101− // query (cancelling one still in flight) so the tab starts fresh.

102− queryViewModel.clearResults()

103− queryViewModel.sqlQuery = ""

104− queryViewModel.filterText = ""

105− }

106− .onDisappear {

107− // Disconnecting tears this view (and the model) down; don't leave an

108− // in-flight query running against the server the user just left.

109− queryViewModel.clearResults()

110− }

111 }

86 }

112}

87}

113

ParseableViewer/Views/LiveTailView.swift+2−12

@@ -123,10 +123,7 @@ struct LiveTailView: View {

123 Image(systemName: "trash")

124 }

125 .help("Clear entries")

126− // ⌘K, not ⌘⌫: command-key equivalents are dispatched before the

127− // focused text field sees the keystroke, so ⌘⌫ (delete to start

128− // of line) in the Filter field would wipe the whole buffer.

129− .keyboardShortcut("k", modifiers: .command)

126+ .keyboardShortcut(.delete, modifiers: .command)

130 .accessibilityLabel("Clear all entries")

127 .accessibilityLabel("Clear all entries")

131 }

128 }

132 .padding(8)

129 .padding(8)

@@ -287,14 +284,7 @@ struct LiveTailView: View {

287 columnWidths = [:]

284 columnWidths = [:]

288 cachedSorted = []

285 cachedSorted = []

289 }

286 }

290− .onChange(of: viewModel.visibleColumns) { _, newColumns in

287+ .onChange(of: viewModel.visibleColumns) { _, _ in

291− // Hiding the sort column leaves no header to show or change the sort,

292− // while rows stay ordered by the invisible value (and auto-scroll stays

293− // off). Drop it like LogTableView does; the sortColumn change rebuilds.

294− if let sortColumn, !newColumns.contains(sortColumn) {

295− self.sortColumn = nil

296− return

297− }

298 // Showing/hiding a column changes the severity column set, so rebuild

288 // Showing/hiding a column changes the severity column set, so rebuild

299 // (which also fills in widths for any newly visible columns). A

289 // (which also fills in widths for any newly visible columns). A

300 // width-only update would leave row severity tinting stale until the

290 // width-only update would leave row severity tinting stale until the

ParseableViewer/Views/LogTableView.swift+6−53

@@ -315,23 +315,7 @@ struct LogTableView: View {

315 }

316 .onChange(of: sortColumn) { _, _ in debouncedRebuildSort() }

317 .onChange(of: sortAscending) { _, _ in debouncedRebuildSort() }

318− .onChange(of: selectedRecord) { _, newValue in

319− // The owner can drop the selection on its own (QueryViewModel

320− // clears it after every query). When the new result set equals the

321− // old one, `onChange(of: records)` doesn't fire, so nothing would

322− // reconcile the row highlight: the row stayed highlighted with no

323− // detail pane, and the next click on it merely "deselected" it.

324− if newValue == nil { selectedIndex = nil }

325− }

326 .onAppear {

318 .onAppear {

327− // This branch is unmounted while results are empty (e.g. across a

328− // stream switch, which clears them first), so `onChange(of: columns)`

329− // never sees the switch. Drop a sort column the new columns don't

330− // have — or hide — before sorting, or rows would be ordered by an

331− // invisible column with no header showing the sort.

332− if let sortColumn, !columns.contains(sortColumn) {

333− self.sortColumn = nil

334− }

335 recomputeColumnWidths(columns: columns, records: records)

319 recomputeColumnWidths(columns: columns, records: records)

336 rebuildSort()

320 rebuildSort()

337 }

321 }

@@ -417,9 +401,6 @@ struct LogTableView: View {

417 }

401 }

418

402

419 private func rebuildSort() {

403 private func rebuildSort() {

420− // A debounced rebuild scheduled before the table unmounted must not land

421− // after (and overwrite) this synchronous one.

422− sortTask?.cancel()

423 let sevCols = buildSeverityColumnSet(columns: columns)

404 let sevCols = buildSeverityColumnSet(columns: columns)

424 let enumerated = Array(records.enumerated())

405 let enumerated = Array(records.enumerated())

425 let sorted: [(offset: Int, element: LogRecord)]

406 let sorted: [(offset: Int, element: LogRecord)]

@@ -495,28 +476,12 @@ struct LogHeaderView: View {

495

476

496 @State private var draggedColumn: String?

477 @State private var draggedColumn: String?

497 @State private var dropTargetColumn: String?

478 @State private var dropTargetColumn: String?

498− /// `.contextMenu`'s builder runs during body evaluation, so the filter menus

499− /// compute their values while the view is being rendered. Writing an `@State`

500− /// dictionary from there is "modifying state during view update" (undefined

501− /// behavior, and it re-invalidates the header). The cache is therefore a plain

502− /// reference that isn't observed; `recordsGeneration` — bumped outside body

503− /// evaluation — is what invalidates it and triggers the re-render.

504− @State private var uniqueValuesCache = UniqueValuesCache()

479+ @State private var uniqueValuesCache: [String: [JSONValue]] = [:]

505− @State private var recordsGeneration = 0

506−

507− private final class UniqueValuesCache {

508− var generation = -1

509− var values: [String: [JSONValue]] = [:]

510− }

511

480

512 private static let maxFilterValues = 20

481 private static let maxFilterValues = 20

513

482

514 private func uniqueValues(for column: String) -> [JSONValue] {

483 private func uniqueValues(for column: String) -> [JSONValue] {

515− if uniqueValuesCache.generation != recordsGeneration {

516− uniqueValuesCache.generation = recordsGeneration

517− uniqueValuesCache.values = [:]

518− }

519− if let cached = uniqueValuesCache.values[column] {

484+ if let cached = uniqueValuesCache[column] {

520 return cached

485 return cached

521 }

486 }

522 var seen = Set<JSONValue>()

487 var seen = Set<JSONValue>()

@@ -528,7 +493,7 @@ struct LogHeaderView: View {

528 }

493 }

529 }

494 }

530 let sorted = result.sorted()

495 let sorted = result.sorted()

531− uniqueValuesCache.values[column] = sorted

496+ uniqueValuesCache[column] = sorted

532 return sorted

497 return sorted

533 }

498 }

534

499

@@ -671,7 +636,7 @@ struct LogHeaderView: View {

671 .background(Color(nsColor: .controlBackgroundColor))

636 .background(Color(nsColor: .controlBackgroundColor))

672 .border(Color.secondary.opacity(0.2), width: 0.5)

637 .border(Color.secondary.opacity(0.2), width: 0.5)

673 .onChange(of: records) { _, _ in

638 .onChange(of: records) { _, _ in

674− recordsGeneration &+= 1

639+ uniqueValuesCache = [:]

675 }

640 }

676 }

641 }

677}

642}

@@ -704,26 +669,14 @@ private struct ColumnDropDelegate: DropDelegate {

704 }

669 }

705

670

706 func performDrop(info: DropInfo) -> Bool {

671 func performDrop(info: DropInfo) -> Bool {

707− guard let dragged = draggedColumn, dragged != column,

672+ guard let dragged = draggedColumn, dragged != column else {

708− let provider = info.itemProviders(for: [UTType.plainText]).first else {

709 draggedColumn = nil

673 draggedColumn = nil

710 dropTargetColumn = nil

674 dropTargetColumn = nil

711 return false

675 return false

712 }

676 }

677+ onMoveColumn?(dragged, column)

713 draggedColumn = nil

678 draggedColumn = nil

714 dropTargetColumn = nil

679 dropTargetColumn = nil

715− // `draggedColumn` is only cleared by a drop on a header, so a header drag

716− // that was cancelled (or dropped elsewhere) leaves it set, and any later

717− // plain-text drag onto a header would move that stale column. Only move

718− // when the dropped payload really is the column header being dragged.

719− let target = column

720− let move = onMoveColumn

721− _ = provider.loadObject(ofClass: NSString.self) { object, _ in

722− guard let payload = object as? NSString, payload as String == dragged else { return }

723− DispatchQueue.main.async {

724− move?(dragged, target)

725− }

726− }

727 return true

680 return true

728 }

681 }

729

682

ParseableViewer/Views/QueryView.swift+9−43

@@ -12,11 +12,7 @@ private struct QueryViewContext: Equatable {

13struct QueryView: View {

14 @Environment(AppState.self) private var appState

15− /// Owned by MainContentView, not by this view: only the active tab is

16− /// mounted, so a view-local @State model was rebuilt on every tab switch —

17− /// discarding the user's query, results, time range and filter and re-running

18− /// the default query when they came back.

19− let viewModel: QueryViewModel

15+ @State private var viewModel = QueryViewModel()

20 @State private var showSaveFilterSheet = false

16 @State private var showSaveFilterSheet = false

21 @State private var saveFilterName = ""

17 @State private var saveFilterName = ""

22 @State private var isSavingFilter = false

18 @State private var isSavingFilter = false

@@ -251,23 +247,6 @@ struct QueryView: View {

251 isLoading: viewModel.isLoading,

247 isLoading: viewModel.isLoading,

252 wrapText: wrapText,

248 wrapText: wrapText,

253 onCellFilter: { column, value, exclude in

249 onCellFilter: { column, value, exclude in

254− // Arrays/objects are List/Struct columns on the server; a

255− // `col = '<json>'` comparison fails to plan, and the failed

256− // run would clear the results the user is looking at.

257− if let value, !value.isScalar {

258− viewModel.errorMessage = "Filtering by an array or object value isn't supported in SQL queries."

259− return

260− }

261− // Results from a blank editor come from the auto-generated

262− // default query, which `addColumnFilter` can't see (it edits

263− // `sqlQuery`); put that query in the editor so the filter

264− // actually applies instead of silently re-running unfiltered.

265− if viewModel.sqlQuery.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,

266− let stream = appState.selectedStream {

267− // (Passing a previous stream forces the replacement even

268− // when the blank editor holds only whitespace.)

269− viewModel.setDefaultQuery(stream: stream, previousStream: stream)

270− }

271 viewModel.addColumnFilter(column: column, value: value, exclude: exclude)

250 viewModel.addColumnFilter(column: column, value: value, exclude: exclude)

272 Task {

251 Task {

273 await viewModel.executeQuery(

252 await viewModel.executeQuery(

@@ -290,9 +269,6 @@ struct QueryView: View {

290 let streamChanged = old.stream != new.stream

269 let streamChanged = old.stream != new.stream

291 if streamChanged {

270 if streamChanged {

292 viewModel.clearResults()

271 viewModel.clearResults()

293− viewModel.boundContext = QueryViewModel.BoundContext(

294− connectionID: appState.activeConnection?.id, stream: stream

295− )

296 Task {

272 Task {

297 await viewModel.loadSchema(client: appState.client, stream: stream)

273 await viewModel.loadSchema(client: appState.client, stream: stream)

298 }

274 }

@@ -327,21 +303,6 @@ struct QueryView: View {

327 }

303 }

328 .onAppear {

304 .onAppear {

329 if let stream = appState.selectedStream {

305 if let stream = appState.selectedStream {

330− // The view model outlives this view. If the stream (or server)

331− // changed while another tab was showing, the state it kept belongs

332− // to the old one — reset it exactly like a stream switch would.

333− let context = QueryViewModel.BoundContext(

334− connectionID: appState.activeConnection?.id, stream: stream

335− )

336− var previousStream: String?

337− if let bound = viewModel.boundContext, bound != context {

338− previousStream = bound.stream

339− viewModel.clearResults()

340− // A freshly built model (what this view used to get on every

341− // mount) had no results filter; don't let an old one hide rows.

342− viewModel.filterText = ""

343− }

344− viewModel.boundContext = context

345 // Reload the schema when it's missing OR when the loaded schema

306 // Reload the schema when it's missing OR when the loaded schema

346 // belongs to a different stream than the current one — otherwise a

307 // belongs to a different stream than the current one — otherwise a

347 // viewModel that survives with another stream's schema would keep

308 // viewModel that survives with another stream's schema would keep

@@ -367,7 +328,7 @@ struct QueryView: View {

367 )

328 )

368 }

329 }

369 } else {

330 } else {

370− let didSetDefault = viewModel.setDefaultQuery(stream: stream, previousStream: previousStream)

331+ let didSetDefault = viewModel.setDefaultQuery(stream: stream)

371 if didSetDefault && viewModel.results.isEmpty {

332 if didSetDefault && viewModel.results.isEmpty {

372 Task {

333 Task {

373 await viewModel.executeQuery(

334 await viewModel.executeQuery(

@@ -379,6 +340,11 @@ struct QueryView: View {

379 }

340 }

380 }

341 }

381 }

342 }

343+ .onDisappear {

344+ if viewModel.isLoading {

345+ viewModel.cancelQuery()

346+ }

347+ }

382 .onChange(of: appState.queryRefreshToken) { _, _ in

348 .onChange(of: appState.queryRefreshToken) { _, _ in

383 // Guard on a selected stream like every sibling query trigger in this

349 // Guard on a selected stream like every sibling query trigger in this

384 // view. Without it, a refresh (Cmd+R) with no stream selected and an

350 // view. Without it, a refresh (Cmd+R) with no stream selected and an

@@ -496,7 +462,7 @@ struct ColumnManagerView: View {

496 Text("Columns")

462 Text("Columns")

497 .font(.headline)

463 .font(.headline)

498 Spacer()

464 Spacer()

499− if viewModel.hasHiddenColumns || viewModel.columnOrder != viewModel.columns {

465+ if !viewModel.hiddenColumns.isEmpty || !viewModel.autoHiddenColumns.isEmpty || viewModel.columnOrder != viewModel.columns {

500 Button("Reset") {

466 Button("Reset") {

501 viewModel.resetColumnConfig()

467 viewModel.resetColumnConfig()

502 }

468 }

@@ -550,7 +516,7 @@ struct ColumnManagerView: View {

550 }

516 }

551 .listStyle(.plain)

517 .listStyle(.plain)

552

518

553− if viewModel.hasHiddenColumns {

519+ if !viewModel.hiddenColumns.isEmpty || !viewModel.autoHiddenColumns.isEmpty {

554 Divider()

520 Divider()

555 Button("Show All Columns") {

521 Button("Show All Columns") {

556 viewModel.showAllColumns()

522 viewModel.showAllColumns()

ParseableViewer/Views/SQLAutoComplete.swift+11−98

@@ -105,32 +105,23 @@ enum SQLCompletionProvider {

105 return ([], "", NSRange(location: wordStart, length: wordEnd - wordStart))

106 }

107

108− // Words typed inside a comment or a string literal aren't SQL, so offer

109− // nothing there. Otherwise the popup opens (e.g. `-- grouped by date`

110− // matches DATE) and the Return/Tab meant to end the line or keep typing is

111− // captured to accept a keyword, rewriting the comment or the literal value.

112− if isInsideCommentOrStringLiteral(text, offset: cursorPosition) {

113− return ([], prefix, NSRange(location: wordStart, length: wordEnd - wordStart))

114− }

115−

116 let context = determineContext(text: text, position: wordStart)

108 let context = determineContext(text: text, position: wordStart)

117

109

118− // Table (and column) completions supply their own quoting. If the user has

110+ // A table completion supplies its own surrounding quotes. If the user has

119 // already typed quotes directly around the word (common for stream names

111 // already typed quotes directly around the word (common for stream names

120 // with spaces, e.g. `FROM "my"`), absorb them into the replacement range so

112 // with spaces, e.g. `FROM "my"`), absorb them into the replacement range so

121 // the inserted `"name"` replaces the stray quotes instead of producing

113 // the inserted `"name"` replaces the stray quotes instead of producing

122 // `""name""`. Mirror `insertCompletion`, which absorbs leading and trailing

114 // `""name""`. Mirror `insertCompletion`, which absorbs leading and trailing

123− // quotes independently for any `.table`/`.column` item — so apply this

115+ // quotes independently for any `.table` item — so apply this wherever table

124− // wherever those completions are offered (`.tableRef`, `.columnRef` and

116+ // completions are offered (`.tableRef` and `.general`), not just `.tableRef`.

125− // `.general`).

126 var replaceStart = wordStart

117 var replaceStart = wordStart

127 var replaceEnd = wordEnd

118 var replaceEnd = wordEnd

128− let offersIdentifiers: Bool

119+ let offersTable: Bool

129 switch context {

120 switch context {

130− case .tableRef, .columnRef, .general: offersIdentifiers = true

121+ case .tableRef, .general: offersTable = true

131− case .afterOrder, .afterGroup: offersIdentifiers = false

122+ default: offersTable = false

132 }

123 }

133− if offersIdentifiers {

124+ if offersTable {

134 if wordStart > 0, nsText.character(at: wordStart - 1) == 0x22 {

125 if wordStart > 0, nsText.character(at: wordStart - 1) == 0x22 {

135 replaceStart -= 1

126 replaceStart -= 1

136 }

127 }

@@ -156,7 +147,7 @@ enum SQLCompletionProvider {

156 case .columnRef:

147 case .columnRef:

157 for field in schemaFields.sorted(by: { $0.name < $1.name })

148 for field in schemaFields.sorted(by: { $0.name < $1.name })

158 where field.name.uppercased().hasPrefix(uppercasePrefix) {

149 where field.name.uppercased().hasPrefix(uppercasePrefix) {

159− items.append(columnItem(for: field))

150+ items.append(SQLCompletionItem(text: field.name, kind: .column, detail: field.dataType))

160 }

151 }

161 for fn in SQLSyntaxHighlighter.sortedFunctions where fn.hasPrefix(uppercasePrefix) {

152 for fn in SQLSyntaxHighlighter.sortedFunctions where fn.hasPrefix(uppercasePrefix) {

162 items.append(SQLCompletionItem(text: fn, kind: .function))

153 items.append(SQLCompletionItem(text: fn, kind: .function))

@@ -186,87 +177,20 @@ enum SQLCompletionProvider {

186 }

177 }

187 for field in schemaFields.sorted(by: { $0.name < $1.name })

178 for field in schemaFields.sorted(by: { $0.name < $1.name })

188 where field.name.uppercased().hasPrefix(uppercasePrefix) {

179 where field.name.uppercased().hasPrefix(uppercasePrefix) {

189− items.append(columnItem(for: field))

180+ items.append(SQLCompletionItem(text: field.name, kind: .column, detail: field.dataType))

190 }

181 }

191 }

182 }

192

183

193 // Don't show the popup when the only match is an exact hit. Compare the

184 // Don't show the popup when the only match is an exact hit. Compare the

194 // match text (unquoted), not the display text — a table's display text is

185 // match text (unquoted), not the display text — a table's display text is

195 // wrapped in quotes (`"name"`) and would never match the bare prefix.

186 // wrapped in quotes (`"name"`) and would never match the bare prefix.

196− // Columns are the exception: one that needs quoting but was typed bare

197− // (`statusCode`, which DataFusion would lowercase) must still be offered,

198− // so a column only counts as an exact hit when accepting would leave the

199− // text unchanged (the range already spans any quotes the user typed).

200− if items.count == 1 {

201− let only = items[0]

202− let isExactHit = only.kind == .column

203− ? nsText.substring(with: range) == only.text

204− : only.matchText.uppercased() == uppercasePrefix

187+ if items.count == 1 && items[0].matchText.uppercased() == uppercasePrefix {

205− if isExactHit { return ([], prefix, range) }

188+ return ([], prefix, range)

206 }

189 }

207

190

208 return (items, prefix, range)

191 return (items, prefix, range)

209 }

192 }

210

193

211− /// Whether the UTF-16 `offset` falls inside a `--`/`/* */` comment or a

212− /// `'...'` string literal. The caret at the very end of an unterminated

213− /// literal/comment (or of a line comment) is still inside it.

214− static func isInsideCommentOrStringLiteral(_ text: String, offset: Int) -> Bool {

215− for token in SQLTokenizer.tokenize(text) {

216− let range = NSRange(token.range, in: text)

217− // Tokens are in order; one starting at or after the caret can't contain it.

218− if range.location >= offset { break }

219− let end = NSMaxRange(range)

220− let isClosed: Bool

221− switch token.kind {

222− case .lineComment:

223− isClosed = false

224− case .blockComment:

225− isClosed = range.length >= 4 && text[token.range].hasSuffix("*/")

226− case .stringLiteral:

227− // `''` escapes pair up, so a terminated literal has an even count.

228− let quotes = text[token.range].filter { $0 == "'" }.count

229− isClosed = range.length >= 2 && quotes % 2 == 0

230− default:

231− continue

232− }

233− if offset < end || (offset == end && !isClosed) { return true }

234− }

235− return false

236− }

237−

238− /// A column completion, double-quoted when the name wouldn't survive as a bare

239− /// identifier. DataFusion (Parseable's query engine) folds unquoted identifiers

240− /// to lowercase, so inserting a mixed-case field bare (`statusCode`) queries a

241− /// nonexistent `statuscode`; names with dots, spaces, or other punctuation

242− /// (e.g. OTel's `service.name`) wouldn't parse as one identifier at all. Plain

243− /// lowercase names stay bare so the common case reads naturally.

244− static func columnItem(for field: SchemaField) -> SQLCompletionItem {

245− SQLCompletionItem(

246− text: quotedIdentifierIfNeeded(field.name),

247− kind: .column,

248− detail: field.dataType,

249− matchText: field.name

250− )

251− }

252−

253− static func quotedIdentifierIfNeeded(_ name: String) -> String {

254− let isPlainLowercase = name.unicodeScalars.enumerated().allSatisfy { index, scalar in

255− switch scalar {

256− case "a"..."z", "_": return true

257− case "0"..."9": return index > 0

258− default: return false

259− }

260− }

261− // A bare keyword/function name (`order`, `user`, `limit`, `date`) would be

262− // parsed as SQL syntax rather than as the column, so quote those too.

263− let upper = name.uppercased()

264− let isReservedWord = SQLSyntaxHighlighter.keywords.contains(upper)

265− || SQLSyntaxHighlighter.functions.contains(upper)

266− if !name.isEmpty && isPlainLowercase && !isReservedWord { return name }

267− return QueryViewModel.escapeSQLIdentifier(name)

268− }

269−

270 // MARK: - Context Detection

194 // MARK: - Context Detection

271

195

272 static func determineContext(text: String, position: Int) -> SQLCompletionContext {

196 static func determineContext(text: String, position: Int) -> SQLCompletionContext {

@@ -529,17 +453,6 @@ final class SQLCompletionPopup: NSObject, NSTableViewDataSource, NSTableViewDele

529

453

530 // MARK: - NSTableViewDelegate

454 // MARK: - NSTableViewDelegate

531

455

532− func tableViewSelectionDidChange(_ notification: Notification) {

533− // A single click selects a row in the table directly. Keep `selectedIndex`

534− // — what Return/Tab accept and what the arrow keys move from — in sync,

535− // otherwise Return inserts the previously highlighted item instead of the

536− // one the user clicked.

537− let row = tableView.selectedRow

538− if row >= 0, row < items.count {

539− selectedIndex = row

540− }

541− }

542−

543 func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {

456 func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {

544 guard row < items.count else { return nil }

457 guard row < items.count else { return nil }

545 let item = items[row]

458 let item = items[row]

ParseableViewer/Views/SQLEditorView.swift+6−41

@@ -57,7 +57,7 @@ struct SQLEditorView: NSViewRepresentable {

57 // Only update when text changed externally (not from user typing)

58 if textView.string != text && !context.coordinator.isEditing {

59 let selectedRanges = textView.selectedRanges

60− context.coordinator.replaceText(with: text, in: textView)

60+ textView.string = text

61 context.coordinator.applyHighlighting(to: textView)

62 // NSRange is UTF-16 based; compare against the NSString length, not

63 // String.count (grapheme count), or wide characters drop the selection.

@@ -101,11 +101,6 @@ struct SQLEditorView: NSViewRepresentable {

101 /// Tracks whether we are inserting a completion so that `textDidChange`

102 /// doesn't re-trigger the popup for the replacement.

103 private var isInsertingCompletion = false

104− /// Set while `replaceText(with:in:)` pushes a model-side change (history

105− /// pick, saved filter, cell filter, column toggle…) into the text view, so

106− /// `textDidChange` doesn't echo it back into the binding or open the

107− /// completion popup for text the user didn't type.

108− private var isApplyingModelChange = false

109

104

110 init(text: Binding<String>, streamNames: [String], schemaFields: [SchemaField]) {

105 init(text: Binding<String>, streamNames: [String], schemaFields: [SchemaField]) {

111 self.text = text

106 self.text = text

@@ -121,8 +116,7 @@ struct SQLEditorView: NSViewRepresentable {

121 // MARK: - NSTextViewDelegate

116 // MARK: - NSTextViewDelegate

122

117

123 func textDidChange(_ notification: Notification) {

118 func textDidChange(_ notification: Notification) {

124− guard let textView = notification.object as? NSTextView,

119+ guard let textView = notification.object as? NSTextView else { return }

125− !isApplyingModelChange else { return }

126 isEditing = true

120 isEditing = true

127 clearErrorHighlight(in: textView)

121 clearErrorHighlight(in: textView)

128 text.wrappedValue = textView.string

122 text.wrappedValue = textView.string

@@ -134,34 +128,6 @@ struct SQLEditorView: NSViewRepresentable {

134 }

128 }

135 }

129 }

136

130

137− /// Replaces the editor's contents with text set from outside the editor.

138− /// Assigning `textView.string` directly bypasses the text system's undo

139− /// registration and leaves the user's earlier typing on the undo stack with

140− /// ranges that belong to the old text — Cmd+Z would then edit an arbitrary

141− /// span of the new query (or raise on an out-of-range undo). Routing the

142− /// change through `shouldChangeText`/`didChangeText` records it as one

143− /// undoable step, so Cmd+Z restores the previous query instead.

144− func replaceText(with newText: String, in textView: NSTextView) {

145− let fullRange = NSRange(location: 0, length: (textView.string as NSString).length)

146− isApplyingModelChange = true

147− defer { isApplyingModelChange = false }

148− textView.breakUndoCoalescing()

149− if textView.shouldChangeText(in: fullRange, replacementString: newText) {

150− textView.replaceCharacters(in: fullRange, with: newText)

151− textView.didChangeText()

152− } else {

153− textView.string = newText

154− }

155− textView.breakUndoCoalescing()

156− }

157−

158− func textDidEndEditing(_ notification: Notification) {

159− // The popup is a separate child panel; without this it keeps floating

160− // over the results (and accepting double-clicks) after focus moves to

161− // another control.

162− completionPopup.hide()

163− }

164−

165 func textView(_ textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {

131 func textView(_ textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {

166 guard completionPopup.isVisible else { return false }

132 guard completionPopup.isVisible else { return false }

167

133

@@ -257,13 +223,12 @@ struct SQLEditorView: NSViewRepresentable {

257 }

223 }

258 }

224 }

259

225

260− // Table and column completions carry their own quoting (a column is

261− // quoted only when it needs it); absorb any double-quote the user typed

226+ // A table completion carries its own quotes; absorb any double-quote the

262− // directly around the word so the inserted identifier replaces it

227+ // user typed directly around the word so the inserted `"name"` replaces

263− // instead of leaving a stray quote. Leading and trailing are handled

228+ // it instead of leaving a stray quote. Leading and trailing are handled

264 // independently: a closing quote can exist without an opening one (e.g.

229 // independently: a closing quote can exist without an opening one (e.g.

265 // `FROM my"`), which would otherwise produce a dangling `"name""`.

230 // `FROM my"`), which would otherwise produce a dangling `"name""`.

266− if item.kind == .table || item.kind == .column {

231+ if item.kind == .table {

267 if wordStart > 0, nsText.character(at: wordStart - 1) == 0x22 {

232 if wordStart > 0, nsText.character(at: wordStart - 1) == 0x22 {

268 wordStart -= 1

233 wordStart -= 1

269 }

234 }

ParseableViewer/Views/ServerInfoView.swift+2−12

@@ -9,9 +9,6 @@ struct ServerInfoView: View {

9 @State private var isLoading = true

10 @State private var isHealthy = false

11 @State private var errorMessage: String?

12− /// Bumped by every load so a superseded (cancelled) load can't clear the

13− /// newer load's spinner or overwrite its results.

14− @State private var loadGeneration = 0

16 var body: some View {

13 var body: some View {

17 ScrollView {

14 ScrollView {

@@ -22,7 +19,7 @@ struct ServerInfoView: View {

22 .fontWeight(.semibold)

19 .fontWeight(.semibold)

23 Spacer()

20 Spacer()

24 Button {

21 Button {

25− Task { await loadInfo(forceRefresh: true) }

22+ Task { await loadInfo() }

26 } label: {

23 } label: {

27 Image(systemName: "arrow.clockwise")

24 Image(systemName: "arrow.clockwise")

28 }

25 }

@@ -156,18 +153,12 @@ struct ServerInfoView: View {

156 }

153 }

157 }

154 }

158

155

159− private func loadInfo(forceRefresh: Bool = false) async {

156+ private func loadInfo() async {

160 // Clear isLoading on the no-client path: since isLoading now starts `true`

157 // Clear isLoading on the no-client path: since isLoading now starts `true`

161 // (to avoid a red "Unhealthy" flash before the first check), an early return

158 // (to avoid a red "Unhealthy" flash before the first check), an early return

162 // without resetting it would wedge the spinner permanently.

159 // without resetting it would wedge the spinner permanently.

163 guard let client = appState.client else { isLoading = false; return }

160 guard let client = appState.client else { isLoading = false; return }

164− // `getAbout()` is cached for 60 s; the Refresh button must bypass that.

165− if forceRefresh {

166− await client.invalidateCache()

167− }

168 let connID = appState.activeConnection?.id

161 let connID = appState.activeConnection?.id

169− loadGeneration &+= 1

170− let generation = loadGeneration

171 isLoading = true

162 isLoading = true

172 errorMessage = nil

163 errorMessage = nil

173 // Seed from the app-wide cache so first load isn't blank, but never fall

164 // Seed from the app-wide cache so first load isn't blank, but never fall

@@ -198,7 +189,6 @@ struct ServerInfoView: View {

198 // load for the previous server can't overwrite the current one's state.

189 // load for the previous server can't overwrite the current one's state.

199 // Still clear isLoading: this task owns the spinner it set, and leaving it

190 // Still clear isLoading: this task owns the spinner it set, and leaving it

200 // true on the stale path wedges the ProgressView and disables Refresh.

191 // true on the stale path wedges the ProgressView and disables Refresh.

201− guard generation == loadGeneration else { return }

202 guard connID == appState.activeConnection?.id else { isLoading = false; return }

192 guard connID == appState.activeConnection?.id else { isLoading = false; return }

203 isHealthy = healthy

193 isHealthy = healthy

204 about = aboutValue

194 about = aboutValue

ParseableViewer/Views/SidebarView.swift+1−19

@@ -6,14 +6,6 @@ struct SidebarView: View {

6 @State private var newStreamName = ""

7 @State private var showDeleteConfirm = false

8 @State private var streamToDelete: String?

9− /// The connection `streamToDelete` was picked on. Stream names aren't unique

10− /// across servers, and the delete runs against whatever client is current

11− /// when the user confirms — so a server switch while the stats lookup was in

12− /// flight could otherwise delete a same-named stream on the *new* server.

13− @State private var streamToDeleteConnectionID: UUID?

14− /// The client the stream was picked with. Editing the active connection's URL

15− /// keeps its id but installs a new client for a possibly different server.

16− @State private var streamToDeleteClient: ParseableClient?

17 @State private var deleteStreamDetail: String?

9 @State private var deleteStreamDetail: String?

19 /// Validates a stream name, returning an error message or nil if valid.

11 /// Validates a stream name, returning an error message or nil if valid.

@@ -73,10 +65,7 @@ struct SidebarView: View {

73 // would show the wrong stats on a destructive

65 // would show the wrong stats on a destructive

74 // confirmation.

66 // confirmation.

75 let target = stream.name

67 let target = stream.name

76− let targetConnectionID = appState.activeConnection?.id

77 streamToDelete = target

68 streamToDelete = target

78− streamToDeleteConnectionID = targetConnectionID

79− streamToDeleteClient = appState.client

80 deleteStreamDetail = nil

69 deleteStreamDetail = nil

81 Task {

70 Task {

82 if let client = appState.client,

71 if let client = appState.client,

@@ -92,9 +81,7 @@ struct SidebarView: View {

92 deleteStreamDetail = parts.joined(separator: ", ")

81 deleteStreamDetail = parts.joined(separator: ", ")

93 }

82 }

94 }

83 }

95− if streamToDelete == target,

84+ if streamToDelete == target {

96− appState.activeConnection?.id == targetConnectionID,

97− appState.client === streamToDeleteClient {

98 showDeleteConfirm = true

85 showDeleteConfirm = true

99 }

86 }

100 }

87 }

@@ -200,11 +187,6 @@ struct SidebarView: View {

200 .alert("Delete Stream", isPresented: $showDeleteConfirm) {

187 .alert("Delete Stream", isPresented: $showDeleteConfirm) {

201 Button("Delete", role: .destructive) {

188 Button("Delete", role: .destructive) {

202 if let name = streamToDelete {

189 if let name = streamToDelete {

203− guard appState.activeConnection?.id == streamToDeleteConnectionID,

204− appState.client === streamToDeleteClient else {

205− appState.showErrorMessage("The server changed since \"\(name)\" was selected, so it was not deleted.")

206− return

207− }

208 Task {

190 Task {

209 do {

191 do {

210 try await appState.deleteStream(name: name)

192 try await appState.deleteStream(name: name)

ParseableViewer/Views/StreamDetailView.swift+4−18

@@ -8,9 +8,6 @@ struct StreamDetailView: View {

8 @State private var retention: [RetentionConfig] = []

9 @State private var isLoading = false

10 @State private var errorMessage: String?

11− /// Bumped by every load. A superseded load (its `.task(id:)` cancelled by a

12− /// stream switch) still resumes, and must not clear the newer load's spinner.

13− @State private var loadGeneration = 0

15 var body: some View {

12 var body: some View {

16 Group {

13 Group {

@@ -28,7 +25,7 @@ struct StreamDetailView: View {

28 Spacer()

25 Spacer()

30 Button {

27 Button {

31− Task { await loadData(stream: stream, forceRefresh: true) }

28+ Task { await loadData(stream: stream) }

32 } label: {

29 } label: {

33 Image(systemName: "arrow.clockwise")

30 Image(systemName: "arrow.clockwise")

34 }

31 }

@@ -47,7 +44,7 @@ struct StreamDetailView: View {

47 Text(error)

44 Text(error)

48 Spacer()

45 Spacer()

49 Button("Retry") {

46 Button("Retry") {

50− Task { await loadData(stream: stream, forceRefresh: true) }

47+ Task { await loadData(stream: stream) }

51 }

48 }

52 .buttonStyle(.bordered)

49 .buttonStyle(.bordered)

53 .controlSize(.small)

50 .controlSize(.small)

@@ -177,22 +174,13 @@ struct StreamDetailView: View {

177 }

174 }

178 }

175 }

179

176

180− private func loadData(stream: String, forceRefresh: Bool = false) async {

177+ private func loadData(stream: String) async {

181 guard let client = appState.client else { return }

178 guard let client = appState.client else { return }

182− // The client caches schema/stats/info for 60 s. That's right for the

183− // automatic load on appear, but an explicit Refresh/Retry must hit the

184− // server — otherwise it repaints the same cached numbers and looks like a

185− // refresh that found nothing new.

186− if forceRefresh {

187− await client.invalidateCache()

188− }

189 // Capture the connection this fetch belongs to. Two servers can expose a

179 // Capture the connection this fetch belongs to. Two servers can expose a

190 // same-named stream, so guarding on the stream name alone would let a

180 // same-named stream, so guarding on the stream name alone would let a

191 // slow fetch write the previous server's data under the new server's

181 // slow fetch write the previous server's data under the new server's

192 // stream after a server switch.

182 // stream after a server switch.

193 let connID = appState.activeConnection?.id

183 let connID = appState.activeConnection?.id

194− loadGeneration &+= 1

195− let generation = loadGeneration

196 isLoading = true

184 isLoading = true

197 errorMessage = nil

185 errorMessage = nil

198 // Clear previous stream's data so it isn't shown under the new header

186 // Clear previous stream's data so it isn't shown under the new header

@@ -228,9 +216,7 @@ struct StreamDetailView: View {

228 // resolve after the user switched. Drop stale results instead of writing

216 // resolve after the user switched. Drop stale results instead of writing

229 // them under the new stream's header. Also check the connection so a

217 // them under the new stream's header. Also check the connection so a

230 // same-named stream on a different server doesn't accept the old server's

218 // same-named stream on a different server doesn't accept the old server's

231− // data. Reset `isLoading` on the stale path or the spinner wedges forever —

219+ // data. Reset `isLoading` on the stale path or the spinner wedges forever.

232− // unless a newer load has started, which owns the spinner now.

233− guard generation == loadGeneration else { return }

234 guard stream == appState.selectedStream, connID == appState.activeConnection?.id else {

220 guard stream == appState.selectedStream, connID == appState.activeConnection?.id else {

235 isLoading = false

221 isLoading = false

236 return

222 return

ParseableViewer/Views/SyntaxHighlighting.swift+57−27

@@ -49,18 +49,9 @@ enum SQLSyntaxHighlighter {

49 static let sortedFunctions: [String] = functions.sorted()

51 // Pre-compiled regexes (created once, reused every keystroke)

52− //

53− // String literals, quoted identifiers, and comments in ONE alternation, so a

54− // single left-to-right scan claims each span for whichever construct starts

55− // first — exactly how a SQL lexer reads it. Separate passes can't agree: an

56− // apostrophe inside a comment (`-- don't`) opened a bogus string that painted

57− // every following line red, and a `"` inside a string (or any quote inside a

58− // block comment) did the same. Capture groups: 1 = 'string', 2 = "identifier",

59− // 3 = `--` line comment or `/* */` block comment (unterminated runs to the end).

60− private static let literalOrCommentRegex = try! NSRegularExpression(

52+ private static let commentRegex = try! NSRegularExpression(pattern: "--[^\n]*", options: [.caseInsensitive])

61− pattern: "('[^']*(?:''[^']*)*')|(\"[^\"]*(?:\"\"[^\"]*)*\")|(--[^\\n]*|/\\*[\\s\\S]*?(?:\\*/|\\z))",

53+ private static let singleQuoteRegex = try! NSRegularExpression(pattern: "'[^']*(?:''[^']*)*'", options: [.caseInsensitive])

62− options: []

54+ private static let doubleQuoteRegex = try! NSRegularExpression(pattern: "\"[^\"]*(?:\"\"[^\"]*)*\"", options: [.caseInsensitive])

63− )

64 // Matches the same numeric forms as `SQLTokenizer.consumeNumber`: integers,

55 // Matches the same numeric forms as `SQLTokenizer.consumeNumber`: integers,

65 // decimals, leading-dot floats (`.5`), and exponents (`1e5`, `1.5e-3`). The

56 // decimals, leading-dot floats (`.5`), and exponents (`1e5`, `1.5e-3`). The

66 // lookbehind keeps digits that belong to an identifier (`col1`, `t.2`) from

57 // lookbehind keeps digits that belong to an identifier (`col1`, `t.2`) from

@@ -89,21 +80,20 @@ enum SQLSyntaxHighlighter {

89 let nsText = text as NSString

80 let nsText = text as NSString

90 var protectedRanges: [NSRange] = []

81 var protectedRanges: [NSRange] = []

92− // 1–3. Single-quoted strings, double-quoted identifiers, and comments, in

83+ // 1. Single-quoted strings

93− // one pass so none of them can start inside another (`'a--b'` stays a

84+ applyRegex(singleQuoteRegex, to: textStorage, text: nsText,

94− // string, `-- don't` stays a comment).

85+ color: .systemRed, protectedRanges: &protectedRanges)

95− let literalMatches = literalOrCommentRegex.matches(

86+

96− in: text, range: NSRange(location: 0, length: nsText.length)

87+ // 2. Double-quoted identifiers

97− )

88+ applyRegex(doubleQuoteRegex, to: textStorage, text: nsText,

98− for match in literalMatches {

89+ color: .systemRed, protectedRanges: &protectedRanges)

99− let isComment = match.range(at: 3).location != NSNotFound

90+

100− textStorage.addAttribute(

91+ // 3. Comments (-- to end of line). Highlighted AFTER strings, and a `--`

101− .foregroundColor,

92+ // that begins inside a string literal (protectedRanges currently holds

102− value: isComment ? NSColor.secondaryLabelColor : NSColor.systemRed,

93+ // only string ranges) is skipped — otherwise `'a--b' AND y = 5` would

103− range: match.range

94+ // bleed a gray comment over the trailing real SQL.

104− )

95+ applyCommentRegex(commentRegex, to: textStorage, text: nsText,

105− protectedRanges.append(match.range)

96+ color: .secondaryLabelColor, protectedRanges: &protectedRanges)

106− }

107

108 // 4. Numbers (outside protected ranges)

98 // 4. Numbers (outside protected ranges)

109 applyUnprotectedRegex(numberRegex, to: textStorage, text: nsText,

99 applyUnprotectedRegex(numberRegex, to: textStorage, text: nsText,

@@ -120,6 +110,46 @@ enum SQLSyntaxHighlighter {

120 protectedRanges: protectedRanges)

110 protectedRanges: protectedRanges)

121 }

111 }

122

112

113+ private static func applyRegex(

114+ _ regex: NSRegularExpression,

115+ to textStorage: NSTextStorage,

116+ text: NSString,

117+ color: NSColor,

118+ protectedRanges: inout [NSRange]

119+ ) {

120+ let matches = regex.matches(in: text as String, range: NSRange(location: 0, length: text.length))

121+ for match in matches {

122+ textStorage.addAttribute(.foregroundColor, value: color, range: match.range)

123+ protectedRanges.append(match.range)

124+ }

125+ }

126+

127+ /// Like `applyRegex`, but skips any match whose start falls inside an

128+ /// already-claimed range (used for comments so a `--` inside a string literal

129+ /// doesn't start a comment).

130+ private static func applyCommentRegex(

131+ _ regex: NSRegularExpression,

132+ to textStorage: NSTextStorage,

133+ text: NSString,

134+ color: NSColor,

135+ protectedRanges: inout [NSRange]

136+ ) {

137+ let matches = regex.matches(in: text as String, range: NSRange(location: 0, length: text.length))

138+ for match in matches where !isStartProtected(match.range.location, by: protectedRanges) {

139+ textStorage.addAttribute(.foregroundColor, value: color, range: match.range)

140+ protectedRanges.append(match.range)

141+ }

142+ }

143+

144+ private static func isStartProtected(_ location: Int, by protectedRanges: [NSRange]) -> Bool {

145+ for protected in protectedRanges {

146+ if location >= protected.location && location < NSMaxRange(protected) {

147+ return true

148+ }

149+ }

150+ return false

151+ }

152+

123 private static func applyUnprotectedRegex(

153 private static func applyUnprotectedRegex(

124 _ regex: NSRegularExpression,

154 _ regex: NSRegularExpression,

125 to textStorage: NSTextStorage,

155 to textStorage: NSTextStorage,

ParseableViewer/Views/UsersView.swift−6

@@ -5,9 +5,6 @@ struct UsersView: View {

5 @State private var users: [UserInfo] = []

6 @State private var isLoading = false

7 @State private var errorMessage: String?

8− /// Bumped by every load so a superseded (cancelled) load can't clear the

9− /// newer load's spinner.

10− @State private var loadGeneration = 0

12 var body: some View {

9 var body: some View {

13 VStack(spacing: 0) {

10 VStack(spacing: 0) {

@@ -85,8 +82,6 @@ struct UsersView: View {

85 private func loadUsers() async {

82 private func loadUsers() async {

86 guard let client = appState.client else { return }

83 guard let client = appState.client else { return }

87 let connID = appState.activeConnection?.id

84 let connID = appState.activeConnection?.id

88− loadGeneration &+= 1

89− let generation = loadGeneration

90 isLoading = true

85 isLoading = true

91 errorMessage = nil

86 errorMessage = nil

92 // Clear the previous server's list up front so it can't briefly show through

87 // Clear the previous server's list up front so it can't briefly show through

@@ -107,7 +102,6 @@ struct UsersView: View {

107 // Drop results if the active connection changed while awaiting. Still clear

102 // Drop results if the active connection changed while awaiting. Still clear

108 // isLoading: this task set the spinner, so leaving it true on the stale path

103 // isLoading: this task set the spinner, so leaving it true on the stale path

109 // wedges the ProgressView and disables Refresh.

104 // wedges the ProgressView and disables Refresh.

110− guard generation == loadGeneration else { return }

111 guard connID == appState.activeConnection?.id else { isLoading = false; return }

105 guard connID == appState.activeConnection?.id else { isLoading = false; return }

112 if let loaded { users = loaded }

106 if let loaded { users = loaded }

113 errorMessage = loadError

107 errorMessage = loadError

ParseableViewerTests/LiveTailViewModelTests.swift−25

@@ -461,29 +461,4 @@ final class LiveTailViewModelTests: XCTestCase {

461 let filter = LiveTailViewModel.ColumnFilter(column: "field", value: nil, exclude: false)

462 XCTAssertEqual(filter.displayLabel, "field = null")

463 }

464−

465− // MARK: - Zone-less timestamps / saved column order

466−

467− func testParseTimestampTreatsZonelessAsUTC() {

468− // Parseable serializes p_timestamp without a zone designator.

469− let naive = LiveTailViewModel.parseTimestamp(from: ["p_timestamp": .string("2024-06-15T10:30:45.123")])

470− let zoned = LiveTailViewModel.parseTimestamp(from: ["p_timestamp": .string("2024-06-15T10:30:45.123Z")])

471− XCTAssertNotNil(naive)

472− XCTAssertEqual(naive, zoned)

473− let naiveWhole = LiveTailViewModel.parseTimestamp(from: ["p_timestamp": .string("2024-06-15T10:30:45")])

474− XCTAssertEqual(naiveWhole, LiveTailViewModel.parseTimestamp(from: ["p_timestamp": .string("2024-06-15T10:30:45Z")]))

475− }

476−

477− func testMergedColumnOrderRestoresSavedPosition() {

478− let merged = QueryViewModel.mergedColumnOrder(

479− ["p_timestamp", "level", "message"],

480− inserting: ["trace_id"],

481− reference: ["p_timestamp", "trace_id", "level", "message"]

482− )

483− XCTAssertEqual(merged, ["p_timestamp", "trace_id", "level", "message"])

484− }

485−

486− func testMergedColumnOrderAppendsColumnsWithoutSavedPosition() {

487− XCTAssertEqual(QueryViewModel.mergedColumnOrder(["a"], inserting: ["b"], reference: []), ["a", "b"])

488− }

489}

464}

ParseableViewerTests/ParseableClientTests.swift−58

@@ -646,62 +646,4 @@ final class ParseableClientTests: XCTestCase {

646 // Carriage returns in values should be wrapped in quotes per RFC 4180

647 XCTAssertTrue(csv.contains("\"line1\r\nline2\""))

648 }

649−

650− // MARK: - Server response key spellings

651−

652− func testServerAboutDecodesCamelCaseKeys() throws {

653− let json = #"{"uiVersion": "v1.2", "deploymentId": "01H", "grpcPort": 8001}"#.data(using: .utf8)!

654− let about = try JSONDecoder().decode(ServerAbout.self, from: json)

655− XCTAssertEqual(about.uiVersion, "v1.2")

656− XCTAssertEqual(about.deploymentId, "01H")

657− XCTAssertEqual(about.grpcPort, 8001)

658− }

659−

660− func testStreamInfoDecodesSnakeCaseKeys() throws {

661− let json = #"{"created-at": "c", "first-event-at": "f", "time_partition": "ts", "static_schema_flag": "true", "cache_enabled": true}"#

662− .data(using: .utf8)!

663− let info = try JSONDecoder().decode(StreamInfo.self, from: json)

664− XCTAssertEqual(info.createdAt, "c")

665− XCTAssertEqual(info.firstEventAt, "f")

666− XCTAssertEqual(info.timePartition, "ts")

667− XCTAssertEqual(info.staticSchemaFlag, true)

668− XCTAssertEqual(info.cacheEnabled, true)

669− }

670−

671− func testStreamInfoDecodesCamelCaseKeys() throws {

672− let json = #"{"createdAt": "c", "firstEventAt": "f", "timePartition": "ts", "staticSchemaFlag": "true"}"#

673− .data(using: .utf8)!

674− let info = try JSONDecoder().decode(StreamInfo.self, from: json)

675− XCTAssertEqual(info.createdAt, "c")

676− XCTAssertEqual(info.firstEventAt, "f")

677− XCTAssertEqual(info.timePartition, "ts")

678− XCTAssertEqual(info.staticSchemaFlag, true)

679− }

680−

681− func testStorageStatsReadsFormatAndUnitSuffixedSizes() throws {

682− let json = #"{"storage": {"size": "2048 Bytes", "format": "parquet"}}"#.data(using: .utf8)!

683− let stats = try JSONDecoder().decode(StreamStats.self, from: json)

684− XCTAssertEqual(stats.storage?.type, "parquet")

685− XCTAssertEqual(stats.storage?.size, ByteCountFormatter.string(fromByteCount: 2048, countStyle: .file))

686− }

687−

688− func testSchemaFieldDescribesParameterizedArrowTypes() throws {

689− let json = #"{"name": "p_timestamp", "data_type": {"Timestamp": ["Millisecond", null]}}"#.data(using: .utf8)!

690− let field = try JSONDecoder().decode(SchemaField.self, from: json)

691− XCTAssertEqual(field.dataType, "Timestamp(Millisecond, None)")

692− }

693−

694− func testLegacyAlertRuleWithObjectConfigKeepsRuleType() throws {

695− let json = #"{"name": "a", "rule": {"type": "column", "config": {"column": "status", "operator": "=", "value": 500}}}"#

696− .data(using: .utf8)!

697− let rule = try JSONDecoder().decode(AlertRule.self, from: json)

698− XCTAssertEqual(rule.rule?.type, "column")

699− XCTAssertNotNil(rule.rule?.config)

700− }

701−

702− func testServerAboutDecodesObjectLicense() throws {

703− let json = #"{"license": {"name": "AGPL-3.0-only", "plan": "OSS"}}"#.data(using: .utf8)!

704− let about = try JSONDecoder().decode(ServerAbout.self, from: json)

705− XCTAssertEqual(about.license, "AGPL-3.0-only (OSS)")

706− }

707}

649}

ParseableViewerTests/QueryViewModelTests.swift+2−122

@@ -235,7 +235,7 @@ final class QueryViewModelTests: XCTestCase {

235 let vm = QueryViewModel()

236 vm.sqlQuery = "SELECT * FROM \"logs\" ORDER BY p_timestamp DESC LIMIT 1000"

237 vm.addColumnFilter(column: "level", value: .string("debug"), exclude: true)

238− XCTAssertTrue(vm.sqlQuery.contains("WHERE \"level\" IS DISTINCT FROM 'debug'"))

238+ XCTAssertTrue(vm.sqlQuery.contains("WHERE \"level\" <> 'debug'"))

239 XCTAssertTrue(vm.sqlQuery.contains("ORDER BY"))

240 }

241

@@ -288,7 +288,7 @@ final class QueryViewModelTests: XCTestCase {

288 let vm = QueryViewModel()

289 vm.sqlQuery = "SELECT * FROM \"logs\""

290 vm.addColumnFilter(column: "level", value: .string("warn"), exclude: true)

291− XCTAssertTrue(vm.sqlQuery.contains("WHERE \"level\" IS DISTINCT FROM 'warn'"))

291+ XCTAssertTrue(vm.sqlQuery.contains("WHERE \"level\" <> 'warn'"))

292 }

293

294 func testAddColumnFilterEscapesSingleQuotesInValue() {

@@ -671,125 +671,5 @@ final class QueryViewModelTests: XCTestCase {

671 let empty = vm.emptyColumns(in: records, columns: ["a"])

672 XCTAssertTrue(empty.isEmpty)

673 }

674−

675− // MARK: - Column filter edge cases

676−

677− func testAddColumnFilterKeepsTrailingSemicolonLast() {

678− let vm = QueryViewModel()

679− vm.sqlQuery = "SELECT * FROM \"logs\";"

680− vm.addColumnFilter(column: "level", value: .string("error"), exclude: false)

681− XCTAssertEqual(vm.sqlQuery, "SELECT * FROM \"logs\" WHERE \"level\" = 'error';")

682− }

683−

684− func testAddColumnFilterDoesNotLandInTrailingComment() {

685− let vm = QueryViewModel()

686− vm.sqlQuery = "SELECT * FROM \"logs\" -- recent"

687− vm.addColumnFilter(column: "level", value: .string("error"), exclude: false)

688− XCTAssertEqual(vm.sqlQuery, "SELECT * FROM \"logs\" WHERE \"level\" = 'error' -- recent")

689− }

690−

691− func testAddColumnFilterKeepsLineBreakAfterWhereBodyComment() {

692− let vm = QueryViewModel()

693− vm.sqlQuery = "SELECT * FROM \"logs\"\nWHERE a = 1 -- note\nORDER BY p_timestamp DESC"

694− vm.addColumnFilter(column: "host", value: .string("web-1"), exclude: false)

695− XCTAssertEqual(

696− vm.sqlQuery,

697− "SELECT * FROM \"logs\"\nWHERE a = 1 AND \"host\" = 'web-1' -- note\nORDER BY p_timestamp DESC"

698− )

699− }

700−

701− func testAddColumnFilterWithTrailingClauseBeforeWhereDoesNotCrash() {

702− let vm = QueryViewModel()

703− vm.sqlQuery = "SELECT a FROM t1 GROUP BY a UNION ALL SELECT a FROM t2 WHERE b = 1"

704− vm.addColumnFilter(column: "host", value: .string("web-1"), exclude: false)

705− XCTAssertEqual(

706− vm.sqlQuery,

707− "SELECT a FROM t1 GROUP BY a UNION ALL SELECT a FROM t2 WHERE b = 1 AND \"host\" = 'web-1'"

708− )

709− }

710−

711− func testAddColumnFilterIgnoresKeywordNamedColumnsInSelectList() {

712− let vm = QueryViewModel()

713− vm.sqlQuery = "SELECT offset, message FROM \"kafka\" WHERE partition = 3"

714− vm.addColumnFilter(column: "host", value: .string("web-1"), exclude: false)

715− XCTAssertEqual(

716− vm.sqlQuery,

717− "SELECT offset, message FROM \"kafka\" WHERE partition = 3 AND \"host\" = 'web-1'"

718− )

719− }

720−

721− // MARK: - SELECT list rewriting

722−

723− func testUpdateSQLColumnsLeavesExpressionListsAlone() {

724− let vm = QueryViewModel()

725− let sql = "SELECT count(*) AS n, level FROM \"logs\" GROUP BY level"

726− vm.sqlQuery = sql

727− vm.columns = ["n", "level"]

728− vm.columnOrder = ["n", "level"]

729− vm.toggleColumnVisibility("n")

730− XCTAssertEqual(vm.sqlQuery, sql)

731− XCTAssertEqual(vm.visibleColumns, ["level"])

732− }

733−

734− func testUpdateSQLColumnsDoesNotBakeInAutoHiddenColumns() {

735− let vm = QueryViewModel()

736− vm.sqlQuery = "SELECT * FROM \"logs\""

737− vm.columns = ["a", "b", "c"]

738− vm.columnOrder = ["a", "b", "c"]

739− vm.autoHiddenColumns = ["c"]

740− vm.moveColumn("b", to: "a")

741− XCTAssertEqual(vm.sqlQuery, "SELECT * FROM \"logs\"")

742− }

743−

744− func testUpdateSQLColumnsKeepsHiddenColumnOutAfterNarrowedRerun() {

745− // Hiding `c` narrowed the SELECT list, so the re-run's results lack it; a

746− // later reorder must not switch back to `*` and fetch it again.

747− let vm = QueryViewModel()

748− vm.sqlQuery = "SELECT \"a\", \"b\" FROM \"logs\""

749− vm.pendingColumnConfig = QueryViewModel.ColumnConfiguration(order: ["a", "b", "c"], hidden: ["c"])

750− vm.applyColumnConfig(extractedColumns: ["a", "b"], stream: nil)

751− vm.moveColumn("b", to: "a")

752− XCTAssertEqual(vm.sqlQuery, "SELECT \"b\", \"a\" FROM \"logs\"")

753− XCTAssertTrue(vm.hasHiddenColumns)

754− vm.showAllColumns()

755− XCTAssertEqual(vm.sqlQuery, "SELECT * FROM \"logs\"")

756− }

757−

758− func testExcludeFilterKeepsRowsWhereColumnIsNull() {

759− let vm = QueryViewModel()

760− vm.sqlQuery = "SELECT * FROM \"logs\""

761− vm.addColumnFilter(column: "level", value: .string("debug"), exclude: true)

762− XCTAssertFalse(vm.sqlQuery.contains("<>"), "`<>` would also drop rows where level is NULL")

763− XCTAssertTrue(vm.sqlQuery.contains("\"level\" IS DISTINCT FROM 'debug'"))

764− }

765−

766− func testUpdateSQLColumnsKeepsListedColumnsMissingFromResults() {

767− // Parseable omits all-null fields from query JSON, so a listed column can

768− // be absent from `columns`; rewriting must neither refuse nor drop it.

769− let vm = QueryViewModel()

770− vm.sqlQuery = "SELECT \"a\", \"b\", \"c\", \"sparse\" FROM \"logs\""

771− vm.columns = ["a", "b", "c"]

772− vm.columnOrder = ["a", "b", "c"]

773− vm.toggleColumnVisibility("c")

774− XCTAssertEqual(vm.sqlQuery, "SELECT \"a\", \"b\", \"sparse\" FROM \"logs\"")

775− }

776−

777− func testReorderKeepsStarWhenSavedHiddenColumnIsAbsentAnyway() {

778− // Under `SELECT *` a saved-hidden column that's missing is missing for

779− // other reasons (sparse/removed); a plain reorder must keep `*`.

780− let vm = QueryViewModel()

781− vm.sqlQuery = "SELECT * FROM \"logs\""

782− vm.pendingColumnConfig = QueryViewModel.ColumnConfiguration(order: ["a", "b", "gone"], hidden: ["gone"])

783− vm.applyColumnConfig(extractedColumns: ["a", "b"], stream: nil)

784− vm.moveColumn("b", to: "a")

785− XCTAssertEqual(vm.sqlQuery, "SELECT * FROM \"logs\"")

786− }

787−

788− func testMergedColumnOrderKeepsSavedPositionForAbsentColumn() {

789− XCTAssertEqual(

790− QueryViewModel.mergedColumnOrder(["b", "a"], inserting: ["x"], reference: ["a", "x", "b"]),

791− ["b", "a", "x"]

792− )

793− }

794}

674}

795

675

ParseableViewerTests/SQLAutoCompleteTests.swift−56

@@ -275,62 +275,6 @@ final class SQLAutoCompleteTests: XCTestCase {

275 let ctx = SQLCompletionProvider.determineContext(text: "SELECT * FROM a LEFT JOIN ", position: 26)

276 XCTAssertEqual(ctx, .tableRef)

277 }

278−

279− // MARK: - Identifier quoting / non-SQL regions

280−

281− func testColumnCompletionQuotesNamesThatNeedIt() {

282− let fields = [SchemaField(name: "statusCode", dataType: "Int64"), SchemaField(name: "status", dataType: "Utf8")]

283− let result = SQLCompletionProvider.completions(

284− for: "SELECT * FROM t WHERE stat", cursorPosition: 26,

285− streamNames: [], schemaFields: fields

286− )

287− let columns = result.items.filter { $0.kind == .column }.map(\.text)

288− XCTAssertEqual(columns, ["status", "\"statusCode\""])

289− }

290−

291− func testNoCompletionsInsideLineComment() {

292− let text = "-- grouped by date"

293− let result = SQLCompletionProvider.completions(

294− for: text, cursorPosition: (text as NSString).length,

295− streamNames: streams, schemaFields: fields

296− )

297− XCTAssertTrue(result.items.isEmpty)

298− }

299−

300− func testNoCompletionsInsideStringLiteral() {

301− let text = "SELECT * FROM t WHERE msg LIKE '%sel"

302− let result = SQLCompletionProvider.completions(

303− for: text, cursorPosition: (text as NSString).length,

304− streamNames: streams, schemaFields: fields

305− )

306− XCTAssertTrue(result.items.isEmpty)

307− }

308−

309− func testFullyTypedMixedCaseColumnStillOffersQuotedForm() {

310− let fields = [SchemaField(name: "statusCode", dataType: "Int64")]

311− let bare = "SELECT * FROM t WHERE statusCode"

312− let result = SQLCompletionProvider.completions(

313− for: bare, cursorPosition: (bare as NSString).length,

314− streamNames: [], schemaFields: fields

315− )

316− XCTAssertEqual(result.items.map(\.text), ["\"statusCode\""])

317−

318− // Already quoted: accepting would change nothing, so no popup.

319− let quoted = "SELECT * FROM t WHERE \"statusCode\""

320− let quotedResult = SQLCompletionProvider.completions(

321− for: quoted, cursorPosition: (quoted as NSString).length - 1,

322− streamNames: [], schemaFields: fields

323− )

324− XCTAssertTrue(quotedResult.items.isEmpty)

325− }

326−

327− func testReservedWordColumnIsQuoted() {

328− let fields = [SchemaField(name: "order", dataType: "Utf8")]

329− let result = SQLCompletionProvider.completions(

330− for: "SELECT ord", cursorPosition: 10, streamNames: [], schemaFields: fields

331− )

332− XCTAssertEqual(result.items.filter { $0.kind == .column }.map(\.text), ["\"order\""])

333− }

334}

278}

335

279

336// Make SQLCompletionContext Equatable for assertions

280// Make SQLCompletionContext Equatable for assertions

ParseableViewerTests/SQLTokenizerTests.swift−15

@@ -348,19 +348,4 @@ final class SQLTokenizerTests: XCTestCase {

348 let sql = "SELECT * FROM t"

349 XCTAssertNil(SQLTokenizer.errorHighlightRange(line: 99, column: 1, in: sql))

350 }

351−

352− // MARK: - CRLF line endings

353−

354− func testCRLFIsWhitespaceAndEndsLineComment() {

355− // Swift treats "\r\n" as a single Character, equal to neither "\r" nor "\n".

356− let sql = "SELECT * -- all\r\nFROM t"

357− let kinds = SQLTokenizer.tokenize(sql).map(\.kind).filter { !$0.isTrivia }

358− XCTAssertEqual(kinds, [.keyword("SELECT"), .star, .keyword("FROM"), .identifier("t")])

359− }

360−

361− func testSelectColumnListRangeExcludesCRLF() {

362− let sql = "SELECT *\r\nFROM t"

363− let range = SQLTokenizer.selectColumnListRange(in: sql)

364− XCTAssertEqual(range.map { String(sql[$0]) }, "*")

365− }

366}

351}

ParseableViewerTests/ServerConnectionTests.swift−10

@@ -77,14 +77,4 @@ final class ServerConnectionTests: XCTestCase {

77 let conn = ServerConnection(name: "test", url: "https://", username: "admin", password: "pass")

78 XCTAssertNil(conn.baseURL)

79 }

80−

81− func testBaseURLAcceptsUppercaseScheme() {

82− let conn = ServerConnection(name: "t", url: "HTTP://10.0.0.5:8000", username: "u", password: "p")

83− XCTAssertEqual(conn.baseURL?.absoluteString, "http://10.0.0.5:8000")

84− }

85−

86− func testBaseURLRejectsNonHTTPScheme() {

87− let conn = ServerConnection(name: "t", url: "ftp://example.com", username: "u", password: "p")

88− XCTAssertNil(conn.baseURL)

89− }

90}

80}

ParseableViewerTests/SyntaxHighlightingTests.swift−10

@@ -140,16 +140,6 @@ final class SyntaxHighlightingTests: XCTestCase {

140 "Double-quoted identifiers should differ from keywords")

141 }

142

143− func testSQLApostropheInCommentDoesNotStartString() {

144− // The later quoted literal gives the stray apostrophe a closing partner, so

145− // separate string/comment passes painted everything in between as a string.

146− let sql = "-- don't\nSELECT * FROM t WHERE a = 'b'"

147− let ts = sqlHighlight(sql)

148− let selectIdx = (sql as NSString).range(of: "SELECT").location

149− XCTAssertEqual(colorAt(ts, selectIdx), colorAt(sqlHighlight("SELECT x"), 0),

150− "An apostrophe inside a comment must not open a string literal")

151− }

152−

153 // MARK: - JSON Highlighting

143 // MARK: - JSON Highlighting

154

144

155 func testJSONHighlightProducesOutput() {

145 func testJSONHighlightProducesOutput() {

README.md+1−1

@@ -143,7 +143,7 @@ ParseableViewer/

143| `Cmd+R` | Refresh streams |

144| `Cmd+Enter` | Run query |

145| `Cmd+P` | Pause/resume live tail |

146−| `Cmd+K` | Clear live tail entries |

146+| `Cmd+Delete` | Clear live tail entries |

147| `Cmd+Ctrl+S` | Toggle sidebar |

148

149## License