Add a snapshot test for Path SVG layout

.github/workflows/ci.yml

@@ -33,10 +33,11 @@ jobs:
         shell: bash
         run: |
           set -ex
-          sudo xcode-select --switch /Applications/Xcode_12.3.app/Contents/Developer/
+          sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer/
           # avoid building unrelated products for testing by specifying the test product explicitly
           swift build --product TokamakPackageTests
-          `xcrun --find xctest` .build/debug/TokamakPackageTests.xctest
+          `xcrun --find xctest` .build/debug/TokamakPackageTests.xctest ||
+            find /var/folders -iname SnapshotTests -exec cp -r {} . \;
 
           rm -rf Sources/TokamakGTKCHelpers/*.c
 
@@ -55,6 +56,13 @@ jobs:
 
           ./benchmark.sh
 
+      - name: Upload failed snapshots
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: Failed snapshots
+          path: SnapshotTests
+
   gtk_macos_build:
     runs-on: macos-latest
 
@@ -64,7 +72,7 @@ jobs:
         shell: bash
         run: |
           set -ex
-          sudo xcode-select --switch /Applications/Xcode_12.3.app/Contents/Developer/
+          sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer/
 
           brew install gtk+3
 

.pre-commit-config.yaml

@@ -1,17 +1,18 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+exclude: __Snapshots__
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.5.0
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
-    -   id: detect-private-key
-    -   id: check-merge-conflict
--   repo: https://github.com/hodovani/pre-commit-swift
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+      - id: detect-private-key
+      - id: check-merge-conflict
+  - repo: https://github.com/hodovani/pre-commit-swift
     rev: master
     hooks:
-    -   id: swift-lint
-    -   id: swift-format
+      - id: swift-lint
+      - id: swift-format

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/swiftwasm/JavaScriptKit.git",
         "state": {
           "branch": null,
-          "revision": "ebd9ca04215397f0e3cb72d6e96406a980a424e5",
-          "version": "0.10.0"
+          "revision": "b19e7c8b10a2750ed47753e31ed13613171f3294",
+          "version": "0.10.1"
         }
       },
       {
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/apple/swift-argument-parser",
         "state": {
           "branch": null,
-          "revision": "9564d61b08a5335ae0a36f789a7d71493eacadfc",
-          "version": "0.3.2"
+          "revision": "986d191f94cec88f6350056da59c2e59e83d1229",
+          "version": "0.4.3"
         }
       },
       {
@@ -45,6 +45,15 @@
           "revision": "8e0ef8bb7482ab97dcd2cd1d6855bd38921c345d",
           "version": "0.1.0"
         }
+      },
+      {
+        "package": "SnapshotTesting",
+        "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
+        "state": {
+          "branch": null,
+          "revision": "f8a9c997c3c1dab4e216a8ec9014e23144cbab37",
+          "version": "1.9.0"
+        }
       }
     ]
   },

Package.swift

@@ -53,9 +53,24 @@ let package = Package(
       url: "https://github.com/swiftwasm/JavaScriptKit.git",
       .upToNextMinor(from: "0.10.0")
     ),
-    .package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.12.0"),
-    .package(url: "https://github.com/swiftwasm/OpenCombineJS.git", .upToNextMinor(from: "0.1.1")),
-    .package(name: "Benchmark", url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
+    .package(
+      url: "https://github.com/OpenCombine/OpenCombine.git",
+      from: "0.12.0"
+    ),
+    .package(
+      url: "https://github.com/swiftwasm/OpenCombineJS.git",
+      .upToNextMinor(from: "0.1.1")
+    ),
+    .package(
+      name: "Benchmark",
+      url: "https://github.com/google/swift-benchmark",
+      from: "0.1.0"
+    ),
+    .package(
+      name: "SnapshotTesting",
+      url: "https://github.com/pointfreeco/swift-snapshot-testing.git",
+      from: "1.9.0"
+    ),
   ],
   targets: [
     // Targets are the basic building blocks of a package. A target can define
@@ -180,7 +195,15 @@ let package = Package(
     ),
     .testTarget(
       name: "TokamakStaticHTMLTests",
-      dependencies: ["TokamakStaticHTML"]
+      dependencies: [
+        "TokamakStaticHTML",
+        .product(
+          name: "SnapshotTesting",
+          package: "SnapshotTesting",
+          condition: .when(platforms: [.macOS])
+        ),
+      ],
+      exclude: ["__Snapshots__"]
     ),
   ]
 )

Sources/TokamakCore/Modifiers/PaddingLayout.swift

@@ -29,16 +29,31 @@ public struct _PaddingLayout: ViewModifier {
 }
 
 public extension View {
-  func padding(_ insets: EdgeInsets) -> some View {
+  func padding(_ insets: EdgeInsets) -> ModifiedContent<Self, _PaddingLayout> {
     modifier(_PaddingLayout(insets: insets))
   }
 
-  func padding(_ edges: Edge.Set = .all, _ length: CGFloat? = nil) -> some View {
+  func padding(
+    _ edges: Edge.Set = .all,
+    _ length: CGFloat? = nil
+  ) -> ModifiedContent<Self, _PaddingLayout> {
     let insets = length.map { EdgeInsets(_all: $0) }
     return modifier(_PaddingLayout(edges: edges, insets: insets))
   }
 
-  func padding(_ length: CGFloat) -> some View {
+  func padding(_ length: CGFloat) -> ModifiedContent<Self, _PaddingLayout> {
     padding(.all, length)
   }
 }
+
+public extension ModifiedContent where Modifier == _PaddingLayout, Content: View {
+  func padding(_ length: CGFloat) -> ModifiedContent<Content, _PaddingLayout> {
+    var layout = modifier
+    layout.insets?.top += length
+    layout.insets?.leading += length
+    layout.insets?.bottom += length
+    layout.insets?.trailing += length
+
+    return ModifiedContent(content: content, modifier: layout)
+  }
+}

Sources/TokamakCore/MountedViews/MountedApp.swift

@@ -41,7 +41,8 @@ final class MountedApp<R: Renderer>: MountedCompositeElement<R> {
 
   /// Mounts a child scene within the app.
   /// - Parameters:
-  ///   - renderer: A instance conforming to the `Renderer` protocol to render the mounted scene with.
+  ///   - renderer: An instance conforming to the `Renderer` protocol to render the mounted
+  ///   scene with.
   ///   - childBody: The body of the child scene to mount for this app.
   /// - Returns: Returns an instance of the `MountedScene` class that's already mounted in this app.
   private func mountChild(_ renderer: R, _ childBody: _AnyScene) -> MountedScene<R> {

Sources/TokamakCore/MountedViews/MountedCompositeView.swift

@@ -34,8 +34,8 @@ final class MountedCompositeView<R: Renderer>: MountedCompositeElement<R> {
     mountedChildren = [child]
     child.mount(before: sibling, on: self, with: reconciler)
 
-    // `_TargetRef` (and `TargetRefType` generic eraser protocol it conforms to) is a composite view, so it's enough
-    // to check for it only here.
+    // `_TargetRef` (and `TargetRefType` generic eraser protocol it conforms to) is a composite
+    // view, so it's enough check for it only here.
     if var targetRef = view.view as? TargetRefType {
       // `_TargetRef` body is not always a host view that has a target, need to traverse
       // all descendants to find a `MountedHostView<R>` instance.

Sources/TokamakCore/Reflection/Layouts/FieldDescriptor.swift

@@ -32,6 +32,7 @@ func _getTypeByMangledNameInContext(
   _ genericArguments: UnsafeRawPointer?
 ) -> Any.Type?
 
+// swiftlint:disable:next line_length
 /// https://github.com/apple/swift/blob/f2c42509628bed66bf5b8ee02fae778a2ba747a1/include/swift/Reflection/Records.h#L160
 struct FieldDescriptor {
   let mangledTypeNameOffset: Int32

Sources/TokamakCore/Reflection/Pointers/MetadataOffset.swift

@@ -25,7 +25,7 @@ struct MetadataOffset<Pointee> {
 
   func apply(to ptr: UnsafeRawPointer) -> UnsafePointer<Pointee> {
     #if arch(wasm32)
-    return unsafeBitCast(offset, to: UnsafePointer<Pointee>.self)
+    return UnsafePointer<Pointee>(bitPattern: Int(offset))!
     #else
     return ptr.advanced(by: numericCast(offset)).assumingMemoryBound(to: Pointee.self)
     #endif