let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: harden model catalog parsing

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-06 05:21:07 +01:00
parent 5e6af3d732
commit 46d55a8ada
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/macos/Sources/Clawdis/AppMain.swift
View File

@@ -1096,15 +1096,19 @@ enum ModelCatalogLoader {
}
private static func sanitize(source: String) -> String {
var text = source
text = text.replacingOccurrences(of: #"(?m)^import[^\n]*\n"#, with: "", options: .regularExpression)
text = text.replacingOccurrences(
of: #"export\s+const\s+MODELS"#,
with: "var MODELS",
guard let exportRange = source.range(of: "export const MODELS"),
let firstBrace = source[exportRange.upperBound...].firstIndex(of: "{"),
let lastBrace = source.lastIndex(of: "}")
else {
return "var MODELS = {}"
}
var body = String(source[firstBrace...lastBrace])
body = body.replacingOccurrences(
of: #"satisfies\s+[A-Za-z0-9_<>.,\-\s]+"#,
with: "",
options: .regularExpression)
text = text.replacingOccurrences(of: #"satisfies\s+Model<[^>]+>"#, with: "", options: .regularExpression)
text = text.replacingOccurrences(of: #"as\s+Model<[^>]+>"#, with: "", options: .regularExpression)
return text
body = body.replacingOccurrences(of: #"as\s+[A-Za-z0-9_<>.,\-\s]+"#, with: "", options: .regularExpression)
return "var MODELS = \(body);"
}
}