a36e08c · parseable-macos

ParseableViewer/Models/JSONValue.swift+4−1

compare with master

unifiedsplit

@@ -305,7 +305,10 @@ enum JSONValue: Codable, Hashable, Sendable, Comparable {

305 // Hash integers via their Double value so `.int(1)` and `.double(1.0)`

306 // — which are `==` — produce the same hash.

307 case .int(let v): hasher.combine(Double(v))

308+ // Canonicalize NaN: `==` treats all NaNs as equal, so every NaN must hash

309+ // identically to satisfy the Hashable contract (differing NaN bit patterns

310+ // would otherwise hash differently).

308− case .double(let v): hasher.combine(v)

311+ case .double(let v): hasher.combine(v.isNaN ? Double.nan : v)

309 case .string(let v): hasher.combine(v)

312 case .string(let v): hasher.combine(v)

310 case .array(let v): hasher.combine(v)

313 case .array(let v): hasher.combine(v)

311 case .object(let v): hasher.combine(v)

314 case .object(let v): hasher.combine(v)

ParseableViewer/ViewModels/LiveTailViewModel.swift+1

@@ -529,6 +529,7 @@ final class LiveTailViewModel {

529 for element in arr {

530 hashJSONValue(element, h0: &h0, h1: &h1)

531 h0 = (h0 ^ 0xFE) &* 1099511628211 // element separator

532+ h1 = (h1 ^ 0xFE) &* 6700417

532 }

533 }

533 case .object(let dict):

534 case .object(let dict):

534 h0 = (h0 ^ 0x06) &* 1099511628211

535 h0 = (h0 ^ 0x06) &* 1099511628211

ParseableViewer/ViewModels/QueryViewModel.swift+9

@@ -54,6 +54,9 @@ final class QueryViewModel {

54

55 // Schema fields for autocomplete

56 var schemaFields: [SchemaField] = []

57+ /// The stream of the most recent `loadSchema` call, used to drop a stale

58+ /// in-flight response when the user rapidly switches streams.

59+ private var latestSchemaStream: String?

57

60

58 // Query task for cancellation

61 // Query task for cancellation

59 private var queryTask: Task<Void, Never>?

62 private var queryTask: Task<Void, Never>?

@@ -436,14 +439,20 @@ final class QueryViewModel {

436

439

437 @MainActor

440 @MainActor

438 func loadSchema(client: ParseableClient?, stream: String?) async {

441 func loadSchema(client: ParseableClient?, stream: String?) async {

442+ latestSchemaStream = stream

439 guard let client, let stream else {

443 guard let client, let stream else {

440 schemaFields = []

444 schemaFields = []

441 return

445 return

442 }

446 }

443 do {

447 do {

444 let schema = try await client.getStreamSchema(stream: stream)

448 let schema = try await client.getStreamSchema(stream: stream)

449+ // A newer load (e.g. a rapid stream switch) may have superseded this

450+ // one; only commit if this is still the stream last requested,

451+ // otherwise we'd show the wrong stream's fields in autocomplete.

452+ guard latestSchemaStream == stream else { return }

445 schemaFields = schema.fields

453 schemaFields = schema.fields

446 } catch {

454 } catch {

455+ guard latestSchemaStream == stream else { return }

447 // Schema load is best-effort; don't surface errors

456 // Schema load is best-effort; don't surface errors

448 schemaFields = []

457 schemaFields = []

449 }

458 }

ParseableViewer/Views/LogDetailView.swift+6

@@ -50,6 +50,12 @@ struct LogDetailView: View {

50 }

51 }

52 .background(Color(nsColor: .controlBackgroundColor))

53+ .onChange(of: record) { _, _ in

54+ // Selecting a different row reuses this view with a new record; clear

55+ // any lingering checkmark/timer so the confirmation doesn't carry over.

56+ copyConfirmationTask?.cancel()

57+ showCopyConfirmation = false

58+ }

53 }

59 }

54

60

55 private func copyToClipboard() {

61 private func copyToClipboard() {

ParseableViewer/Views/LogTableView.swift+5−3

@@ -22,9 +22,11 @@ func idealColumnWidth(for column: String, records: [LogRecord]) -> CGFloat {

22 var widest = measureTextWidth(column, font: headerMeasureFont)

23 // Sample evenly across the whole result set, not just the first N rows —

24 // otherwise a wide value that sorts beyond row N is never measured and the

25− // column auto-fits too narrow after sorting.

25+ // column auto-fits too narrow after sorting. Map each of the `sampleCount`

26− let step = max(1, (records.count + sampleCount - 1) / max(sampleCount, 1))

26+ // samples to a spread-out index so we hit exactly `sampleCount` distinct rows

27+ // (a stride with an integer step would skip rows yet still undersample).

27− for i in stride(from: 0, to: records.count, by: step).prefix(sampleCount) {

28+ for s in 0..<sampleCount {

29+ let i = s * records.count / sampleCount

28 let text = records[i][column]?.displayString ?? ""

30 let text = records[i][column]?.displayString ?? ""

29 widest = max(widest, measureTextWidth(text, font: cellMeasureFont))

31 widest = max(widest, measureTextWidth(text, font: cellMeasureFont))

30 }

32 }

ParseableViewer/Views/QueryView.swift+18−2

@@ -284,14 +284,30 @@ struct QueryView: View {

284 await viewModel.loadSchema(client: appState.client, stream: stream)

285 }

286 }

287− let didSetDefault = viewModel.setDefaultQuery(stream: stream)

287+ // A saved filter may have set pendingFilterSQL before this view was

288− if didSetDefault && viewModel.results.isEmpty {

288+ // mounted (e.g. the filter was launched from another tab). .onChange

289+ // doesn't fire for a value that changed before the view entered the

290+ // hierarchy, so honor it here instead of overwriting the editor with

291+ // the default query.

292+ if let sql = appState.pendingFilterSQL {

293+ viewModel.sqlQuery = sql

294+ appState.pendingFilterSQL = nil

289 Task {

295 Task {

290 await viewModel.executeQuery(

296 await viewModel.executeQuery(

291 client: appState.client,

297 client: appState.client,

292 stream: stream

298 stream: stream

293 )

299 )

294 }

300 }

301+ } else {

302+ let didSetDefault = viewModel.setDefaultQuery(stream: stream)

303+ if didSetDefault && viewModel.results.isEmpty {

304+ Task {

305+ await viewModel.executeQuery(

306+ client: appState.client,

307+ stream: stream

308+ )

309+ }

310+ }

295 }

311 }

296 }

312 }

297 }

313 }

ParseableViewer/Views/SyntaxHighlighting.swift+35−6

@@ -76,18 +76,21 @@ enum SQLSyntaxHighlighter {

76 let nsText = text as NSString

77 var protectedRanges: [NSRange] = []

78

79− // 1. Comments (-- to end of line)

80− applyRegex(commentRegex, to: textStorage, text: nsText,

81− color: .secondaryLabelColor, protectedRanges: &protectedRanges)

82−

83− // 2. Single-quoted strings

79+ // 1. Single-quoted strings

84 applyRegex(singleQuoteRegex, to: textStorage, text: nsText,

80 applyRegex(singleQuoteRegex, to: textStorage, text: nsText,

85 color: .systemRed, protectedRanges: &protectedRanges)

81 color: .systemRed, protectedRanges: &protectedRanges)

86

82

87− // 3. Double-quoted identifiers

83+ // 2. Double-quoted identifiers

88 applyRegex(doubleQuoteRegex, to: textStorage, text: nsText,

84 applyRegex(doubleQuoteRegex, to: textStorage, text: nsText,

89 color: .systemRed, protectedRanges: &protectedRanges)

85 color: .systemRed, protectedRanges: &protectedRanges)

90

86

87+ // 3. Comments (-- to end of line). Highlighted AFTER strings, and a `--`

88+ // that begins inside a string literal (protectedRanges currently holds

89+ // only string ranges) is skipped — otherwise `'a--b' AND y = 5` would

90+ // bleed a gray comment over the trailing real SQL.

91+ applyCommentRegex(commentRegex, to: textStorage, text: nsText,

92+ color: .secondaryLabelColor, protectedRanges: &protectedRanges)

93+

91 // 4. Numbers (outside protected ranges)

94 // 4. Numbers (outside protected ranges)

92 applyUnprotectedRegex(numberRegex, to: textStorage, text: nsText,

95 applyUnprotectedRegex(numberRegex, to: textStorage, text: nsText,

93 color: .systemPurple, protectedRanges: protectedRanges)

96 color: .systemPurple, protectedRanges: protectedRanges)

@@ -117,6 +120,32 @@ enum SQLSyntaxHighlighter {

117 }

120 }

118 }

121 }

119

122

123+ /// Like `applyRegex`, but skips any match whose start falls inside an

124+ /// already-claimed range (used for comments so a `--` inside a string literal

125+ /// doesn't start a comment).

126+ private static func applyCommentRegex(

127+ _ regex: NSRegularExpression,

128+ to textStorage: NSTextStorage,

129+ text: NSString,

130+ color: NSColor,

131+ protectedRanges: inout [NSRange]

132+ ) {

133+ let matches = regex.matches(in: text as String, range: NSRange(location: 0, length: text.length))

134+ for match in matches where !isStartProtected(match.range.location, by: protectedRanges) {

135+ textStorage.addAttribute(.foregroundColor, value: color, range: match.range)

136+ protectedRanges.append(match.range)

137+ }

138+ }

139+

140+ private static func isStartProtected(_ location: Int, by protectedRanges: [NSRange]) -> Bool {

141+ for protected in protectedRanges {

142+ if location >= protected.location && location < NSMaxRange(protected) {

143+ return true

144+ }

145+ }

146+ return false

147+ }

148+

120 private static func applyUnprotectedRegex(

149 private static func applyUnprotectedRegex(

121 _ regex: NSRegularExpression,

150 _ regex: NSRegularExpression,

122 to textStorage: NSTextStorage,

151 to textStorage: NSTextStorage,