Use SwiftSoup parser in the demo app

Author: jkmassel

Package.resolved

@@ -7,7 +7,8 @@ let package = Package(
     name: "GutenbergKit",
     platforms: [.iOS(.v15), .macOS(.v14)],
     products: [
-        .library(name: "GutenbergKit", targets: ["GutenbergKit"])
+        .library(name: "GutenbergKit", targets: ["GutenbergKit"]),
+        .library(name: "AssetManifestParser", targets: ["SwiftSoupAssetManifestParser"])
     ],
     dependencies: [
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.7.5"),

Package.swift

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -12,7 +12,8 @@
 		0CE8E78D2C339B0600B9DC67 /* EditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE8E7862C339B0600B9DC67 /* EditorView.swift */; };
 		0CE8E78E2C339B0600B9DC67 /* GutenbergApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE8E7872C339B0600B9DC67 /* GutenbergApp.swift */; };
 		0CE8E78F2C339B0600B9DC67 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CE8E7892C339B0600B9DC67 /* Preview Assets.xcassets */; };
-		0CF6E04C2BEFF60E00EDEE8A /* GutenbergKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0CF6E04B2BEFF60E00EDEE8A /* GutenbergKit */; };
+		24DF8BDF2E723BB8003B3355 /* GutenbergKit in Frameworks */ = {isa = PBXBuildFile; productRef = 24DF8BDE2E723BB8003B3355 /* GutenbergKit */; };
+		24DF8BE12E723BE5003B3355 /* AssetManifestParser in Frameworks */ = {isa = PBXBuildFile; productRef = 24DF8BE02E723BE5003B3355 /* AssetManifestParser */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -22,15 +23,15 @@
 		0CE8E7862C339B0600B9DC67 /* EditorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorView.swift; sourceTree = "<group>"; };
 		0CE8E7872C339B0600B9DC67 /* GutenbergApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GutenbergApp.swift; sourceTree = "<group>"; };
 		0CE8E7892C339B0600B9DC67 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-		0CE8E7922C339B1B00B9DC67 /* GutenbergKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = GutenbergKit; path = ../..; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		0C4F59882BEFF4970028BD96 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0CF6E04C2BEFF60E00EDEE8A /* GutenbergKit in Frameworks */,
+				24DF8BDF2E723BB8003B3355 /* GutenbergKit in Frameworks */,
+				24DF8BE12E723BE5003B3355 /* AssetManifestParser in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -40,7 +41,6 @@
 		0C4F59822BEFF4970028BD96 = {
 			isa = PBXGroup;
 			children = (
-				0CE8E7922C339B1B00B9DC67 /* GutenbergKit */,
 				0CE8E7882C339B0600B9DC67 /* Sources */,
 				0C83424D2C339B7F00CAA762 /* Resources */,
 				0CE8E78A2C339B0600B9DC67 /* PreviewContent */,
@@ -107,7 +107,8 @@
 			);
 			name = Gutenberg;
 			packageProductDependencies = (
-				0CF6E04B2BEFF60E00EDEE8A /* GutenbergKit */,
+				24DF8BDE2E723BB8003B3355 /* GutenbergKit */,
+				24DF8BE02E723BE5003B3355 /* AssetManifestParser */,
 			);
 			productName = Gutenberg;
 			productReference = 0C4F598B2BEFF4970028BD96 /* Gutenberg.app */;
@@ -137,6 +138,9 @@
 				Base,
 			);
 			mainGroup = 0C4F59822BEFF4970028BD96;
+			packageReferences = (
+				24DF8BDD2E723BB8003B3355 /* XCLocalSwiftPackageReference "../../../GutenbergKit" */,
+			);
 			productRefGroup = 0C4F598C2BEFF4970028BD96 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -377,11 +381,23 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		24DF8BDD2E723BB8003B3355 /* XCLocalSwiftPackageReference "../../../GutenbergKit" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ../../../GutenbergKit;
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
-		0CF6E04B2BEFF60E00EDEE8A /* GutenbergKit */ = {
+		24DF8BDE2E723BB8003B3355 /* GutenbergKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = GutenbergKit;
 		};
+		24DF8BE02E723BE5003B3355 /* AssetManifestParser */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 24DF8BDD2E723BB8003B3355 /* XCLocalSwiftPackageReference "../../../GutenbergKit" */;
+			productName = AssetManifestParser;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 0C4F59832BEFF4970028BD96 /* Project object */;

ios/Demo-iOS/Gutenberg.xcodeproj/project.pbxproj

@@ -45,7 +45,7 @@ public actor EditorAssetsLibrary {
     ///
     /// - SeeAlso: `CachedAssetSchemeHandler`
     /// - SeeAlso: `EditorAssetsLibrary.addAsset`
-    func manifestContentForEditor(using parser: EditorAssetManifestParser) async throws -> Data {
+    func manifestContentForEditor() async throws -> Data {
         // For scheme-less links (i.e. '//stats.wp.com/w.js'), use the scheme in `siteURL`.
         guard let siteURLScheme = URL(string: configuration.siteURL)?.scheme else {
             throw ManifestError.invalidSiteUrl
@@ -54,19 +54,19 @@ public actor EditorAssetsLibrary {
         let data = try await loadManifestContent()
         let manifest = try EditorAssetManifest(data: data)
 
-        return try JSONEncoder().encode(manifest.applyingUrlScheme(siteURLScheme, using: parser))
+        return try JSONEncoder().encode(manifest.applyingUrlScheme(siteURLScheme, using: configuration.manifestParser))
     }
 
     /// Fetches all assets in the `EditorConfiguration.editorAssetsEndpoint` manifest and stores them on the device.
     ///
     /// - SeeAlso: CachedAssetSchemeHandler
-    public func fetchAssets(using manifestParser: EditorAssetManifestParser) async throws {
+    public func fetchAssets() async throws {
         // For scheme-less links (i.e. '//stats.wp.com/w.js'), use the scheme in `siteURL`.
         let siteURLScheme = URL(string: configuration.siteURL)?.scheme
 
         let data = try await loadManifestContent()
-        let manifest = try EditorAssetManifest(data: data).applyingUrlScheme(siteURLScheme, using: manifestParser)
-        let assetUrls = try manifest.getAllAssetUrls(using: manifestParser)
+        let manifest = try EditorAssetManifest(data: data).applyingUrlScheme(siteURLScheme, using: configuration.manifestParser)
+        let assetUrls = try manifest.getAllAssetUrls(using: configuration.manifestParser)
 
         for url in assetUrls {
             guard url.scheme == "http" || url.scheme == "https" else {

ios/Demo-iOS/Gutenberg.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -3,11 +3,9 @@ import WebKit
 
 class EditorAssetsProvider: NSObject, WKScriptMessageHandlerWithReply {
     let library: EditorAssetsLibrary
-    let manifestParser: EditorAssetManifestParser
 
-    init(library: EditorAssetsLibrary, manifestParser: EditorAssetManifestParser) {
+    init(library: EditorAssetsLibrary) {
         self.library = library
-        self.manifestParser = manifestParser
     }
 
     func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage, replyHandler: @escaping @MainActor @Sendable (Any?, String?) -> Void) {
@@ -21,7 +19,7 @@ class EditorAssetsProvider: NSObject, WKScriptMessageHandlerWithReply {
 
         Task.detached { [library] in
             do {
-                let data = try await library.manifestContentForEditor(using: self.manifestParser)
+                let data = try await library.manifestContentForEditor()
                 let dict = try JSONSerialization.jsonObject(with: data)
                 await replyHandler(dict, nil)
             } catch {

ios/Sources/GutenbergKit/Sources/Cache/EditorAssetsLibrary.swift

@@ -22,14 +22,25 @@ public struct EditorConfiguration {
     public var locale = "en"
     public var editorAssetsEndpoint: URL?
 
+    public var manifestParser: EditorAssetManifestParser
+
+    @available(iOS 16.0, *)
     public init(title: String = "", content: String = "") {
         self.title = title
         self.content = content
+        self.manifestParser = DefaultEditorAssetManifestParser()
+    }
+
+    public init(title: String = "", content: String = "", manifestParser: EditorAssetManifestParser) {
+        self.title = title
+        self.content = content
+        self.manifestParser = manifestParser
     }
 
     public mutating func updateEditorSettings(_ settings: [String: Any]?) {
         self.editorSettings = settings
     }
 
+    @available(iOS 16.0, *)
     public static let `default` = EditorConfiguration()
 }

ios/Sources/GutenbergKit/Sources/Cache/EditorAssetsProvider.swift

@@ -27,8 +27,13 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
     ///
     private let isWarmupMode: Bool
 
+    @available(iOS 16.0, *)
+    public convenience init(isWarmupMode: Bool = false) {
+        self.init(configuration: .default, isWarmupMode: isWarmupMode)
+    }
+
     /// Initalizes the editor with the initial content (Gutenberg).
-    public init(configuration: EditorConfiguration = .default, isWarmupMode: Bool = false) {
+    public init(configuration: EditorConfiguration, isWarmupMode: Bool = false) {
         self.configuration = configuration
         self.assetsLibrary = EditorAssetsLibrary(configuration: configuration)
         self.controller = GutenbergEditorController(configuration: configuration)
@@ -125,7 +130,7 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
     private func loadEditor() {
         if configuration.plugins {
             webView.configuration.userContentController.addScriptMessageHandler(
-                EditorAssetsProvider(library: assetsLibrary, manifestParser: self.getAssetManifestParser()),
+                EditorAssetsProvider(library: assetsLibrary),
                 contentWorld: .page,
                 name: "loadFetchedEditorAssets"
             )
@@ -356,6 +361,7 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro
 
     /// Calls this at any moment before showing the actual editor. The warmup
     /// shaves a couple of hundred milliseconds off the first load.
+    @available(iOS 16.0, *)
     public static func warmup(configuration: EditorConfiguration = .default) {
         let editorViewController = EditorViewController(configuration: configuration, isWarmupMode: true)
         _ = editorViewController.view // Trigger viewDidLoad