Added evaluator identification; Updated substrata.

Author: bsneed

Package.resolved

@@ -21,7 +21,7 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/segmentio/analytics-swift.git", from: "1.6.2"),
         //.package(path: "../analytics-swift"),
-        .package(url: "https://github.com/segmentio/substrata-swift.git", from: "2.0.6")
+        .package(url: "https://github.com/segmentio/substrata-swift.git", from: "2.0.8")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

Package.swift

@@ -28,9 +28,14 @@ public class DestinationFilters: UtilityPlugin {
             }
 
             execute(event) {
+                if (event === null) return event;
                 const result = dest_filters.evaluateDestinationFilters(this.rules, event);
-                result.context.filterRan = true;
-                console.log("filter applied");
+                if (result === null) { 
+                    console.log("filter dropped event");
+                } else {
+                    result.context.filterRan = true;
+                    console.log("filter evaluated");
+                }
                 return result
             }
         }
@@ -54,6 +59,7 @@ public class DestinationFilters: UtilityPlugin {
             }
 
             execute(event) {
+                if (event === null) return event;
                 const result = dest_filters.evaluateDestinationFilters(this.rules, event);
                 return result
             }
@@ -104,8 +110,8 @@ extension DestinationFilters: LivePluginsDependent {
     public func prepare(engine: Substrata.JSEngine) {
         self.engine = engine
 
-        engine.evaluate(script: tsubScript)
-        engine.evaluate(script: destinationFilterEdgeFunctionTypes)
+        engine.evaluate(script: tsubScript, evaluator: "DestinationFilters.tsubScript")
+        engine.evaluate(script: destinationFilterEdgeFunctionTypes, evaluator: "DestinationFilters.destinationFilterEdgeFunctionTypes")
     }
 
     public func readyToStart() {

Sources/AnalyticsLive/Filters/DestinationFilters.swift

@@ -112,15 +112,14 @@ extension LivePlugins {
         analyticsJS = a
 
         // setup our embedded scripts ...
-        engine.evaluate(script: EmbeddedJS.enumSetupScript)
-        engine.evaluate(script: EmbeddedJS.edgeFnBaseSetupScript)
+        engine.evaluate(script: EmbeddedJS.enumSetupScript, evaluator: "EmbeddedJS.enumSetupScript")
+        engine.evaluate(script: EmbeddedJS.edgeFnBaseSetupScript, evaluator: "EmbeddedJS.edgeFnBaseSetupScript")
     }
 
     internal func loadEdgeFn(url: URL) {
         // setup error handler
         engine.exceptionHandler = { error in
-            // TODO: Make this useful
-            print(error)
+            print(error.string)
         }
 
         var localURL = url

Sources/AnalyticsLive/LivePlugins/LivePlugins.swift

@@ -13,7 +13,7 @@ import Foundation
 
 // Navigation
 typealias NavigationLink = SignalNavigationLink
-@available(iOS 16.0, *)
+@available(iOS 16.0, macOS 13.0, *)
 typealias NavigationStack = SignalNavigationStack
 
 // Selection & Input Controls

Sources/AnalyticsLive/Signals/AutoTracking/SwiftUI/Typealiases.swift

@@ -162,7 +162,7 @@ extension Signals {
     public func prepare(engine: JSEngine) {
         self.engine = engine
 
-        engine.evaluate(script: SignalsRuntime.embeddedJS)
+        engine.evaluate(script: SignalsRuntime.embeddedJS, evaluator: "Signals.prepare")
 
         #if os(iOS) || os(tvOS) || os(visionOS) || targetEnvironment(macCatalyst)
         if configuration.useUIKitAutoSignal {