Add caching for imported fonts

nicklockwood · nicklockwood · commit ccca0c1abbd4 · 2025-10-12T17:54:06.000+01:00
diff --git a/ShapeScript/EvaluationContext.swift b/ShapeScript/EvaluationContext.swift
@@ -45,6 +45,15 @@ final class EvaluationContext {
             case value(Value)
         }
 
+        var fonts: [String] {
+            store.values.compactMap {
+                switch $0 {
+                case let .value(.font(name)): name
+                default: nil
+                }
+            }
+        }
+
         var store = [URL: Import]()
     }
 
@@ -312,6 +321,9 @@ extension EvaluationContext {
         guard [".otf", ".ttf", ".ttc"].contains(where: {
             name.lowercased().hasSuffix($0)
         }) else {
+            if importCache.fonts.contains(name) {
+                return name
+            }
             guard let font = CGFont(name as CFString) else {
                 var options = [String]()
                 options += CTFontManagerCopyAvailablePostScriptNames() as? [String] ?? []
@@ -323,6 +335,9 @@ extension EvaluationContext {
             return font.fullName as String? ?? name
         }
         let url = try resolveURL(for: name)
+        if case let .value(.font(fullName)) = importCache.store[url] {
+            return fullName
+        }
         guard let dataProvider = CGDataProvider(url: url as CFURL) else {
             throw RuntimeErrorType.fileNotFound(for: name, at: url)
         }
@@ -331,7 +346,9 @@ extension EvaluationContext {
         else {
             throw RuntimeErrorType.fileParsingError(for: name, at: url, message: "")
         }
-        return cgFont.fullName as String? ?? ""
+        let fullName = cgFont.fullName as String? ?? ""
+        importCache.store[url] = .value(.font(fullName))
+        return fullName
         #else
         return name
         #endif
diff --git a/ShapeScriptTests/StandardLibraryTests.swift b/ShapeScriptTests/StandardLibraryTests.swift
@@ -719,6 +719,42 @@ final class StandardLibraryTests: XCTestCase {
         XCTAssertEqual(delegate.log, ["Arial"])
     }
 
+    func testLoadSameFontFileTwice() throws {
+        #if canImport(CoreGraphics)
+        let program = try parse("""
+        font "EdgeOfTheGalaxyRegular-OVEa6.otf"
+        print font
+        font "Arial"
+        print font
+        font "EdgeOfTheGalaxyRegular-OVEa6.otf"
+        print font
+        """)
+        let delegate = TestDelegate()
+        let context = EvaluationContext(source: program.source, delegate: delegate)
+        XCTAssertNoThrow(try program.evaluate(in: context))
+        XCTAssertEqual(context.font, "Edge of the Galaxy Regular")
+        XCTAssertEqual(delegate.log, ["Edge of the Galaxy Regular", "Arial", "Edge of the Galaxy Regular"])
+        #endif
+    }
+
+    func testSetFontWithNameAfterLoadingFromFile() throws {
+        #if canImport(CoreGraphics)
+        let program = try parse("""
+        font "EdgeOfTheGalaxyRegular-OVEa6.otf"
+        print font
+        font "Arial"
+        print font
+        font "Edge of the Galaxy Regular"
+        print font
+        """)
+        let delegate = TestDelegate()
+        let context = EvaluationContext(source: program.source, delegate: delegate)
+        XCTAssertNoThrow(try program.evaluate(in: context))
+        XCTAssertEqual(context.font, "Edge of the Galaxy Regular")
+        XCTAssertEqual(delegate.log, ["Edge of the Galaxy Regular", "Arial", "Edge of the Galaxy Regular"])
+        #endif
+    }
+
     func testFontInBlock() throws {
         let program = try parse("""
         define foo {
