Bump version

* Update INSTALL_PATH
* Update run path
* Add FLEXFirebaseTransaction.mm into project which break in commit: d2e0db8773
* Fix header imports
* Rollback LD_RUNPATH_SEARCH_PATHS

.gitignore

@@ -20,3 +20,4 @@ DerivedData
 /Example/Pods
 Podfile.lock
 IDEWorkspaceChecks.plist
+*.xcworkspace

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "search.exclude": {
+        "Classes/Headers": true
+    }
+}

Classes/Core/Controllers/FLEXFilteringTableViewController.m

@@ -74,7 +74,7 @@
 #pragma mark - Search
 
 - (void)updateSearchResults:(NSString *)newText {
-    NSArray *(^filter)() = ^NSArray *{
+    NSArray *(^filter)(void) = ^NSArray *{
         self.filterText = newText;
 
         // Sections will adjust data based on this property

Classes/Core/Controllers/FLEXNavigationController.m

@@ -96,12 +96,15 @@
 - (void)dismissAnimated {
     // Tabs are only closed if the done button is pressed; this
     // allows you to leave a tab open by dragging down to dismiss
-    [FLEXTabList.sharedList closeTab:self];
+    if ([self.presentingViewController isKindOfClass:[FLEXExplorerViewController class]]) {
+        [FLEXTabList.sharedList closeTab:self];        
+    }
+    
     [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (BOOL)canShowToolbar {
-    return self.topViewController.toolbarItems.count;
+    return self.topViewController.toolbarItems.count > 0;
 }
 
 - (void)addNavigationBarItemsToViewController:(UINavigationItem *)navigationItem {

Classes/Core/Controllers/FLEXTableViewController.m

@@ -66,9 +66,9 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
         _searchBarDebounceInterval = kFLEXDebounceFast;
         _showSearchBarInitially = YES;
         _style = style;
-        _manuallyDeactivateSearchOnDisappear = ({
-            NSProcessInfo.processInfo.operatingSystemVersion.majorVersion < 11;
-        });
+        _manuallyDeactivateSearchOnDisappear = (
+            NSProcessInfo.processInfo.operatingSystemVersion.majorVersion < 11
+        );
         
         // We will be our own search delegate if we implement this method
         if ([self respondsToSelector:@selector(updateSearchResults:)]) {
@@ -559,7 +559,7 @@ static UITextField *kDummyTextField = nil;
     [self.debounceTimer invalidate];
     NSString *text = searchController.searchBar.text;
     
-    void (^updateSearchResults)() = ^{
+    void (^updateSearchResults)(void) = ^{
         if (self.searchResultsUpdater) {
             [self.searchResultsUpdater updateSearchResults:text];
         } else {

Classes/Editing/FLEXDefaultEditorViewController.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FLEXDefaultEditorViewController : FLEXVariableEditorViewController
 
-+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)())onCommit;
++ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)(void))onCommit;
 
 + (BOOL)canEditDefaultWithValue:(nullable id)currentValue;
 

Classes/Editing/FLEXDefaultEditorViewController.m

@@ -21,7 +21,7 @@
 
 @implementation FLEXDefaultEditorViewController
 
-+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)())onCommit {
++ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)(void))onCommit {
     FLEXDefaultEditorViewController *editor = [self target:defaults data:key commitHandler:onCommit];
     editor.title = @"Edit Default";
     return editor;

Classes/Editing/FLEXFieldEditorView.m

@@ -9,6 +9,7 @@
 #import "FLEXFieldEditorView.h"
 #import "FLEXArgumentInputView.h"
 #import "FLEXUtility.h"
+#import "FLEXColor.h"
 
 @interface FLEXFieldEditorView ()
 
@@ -122,7 +123,7 @@
 }
 
 + (UIColor *)dividerColor {
-    return UIColor.lightGrayColor;
+    return FLEXColor.tertiaryBackgroundColor;
 }
 
 + (CGFloat)horizontalPadding {

Classes/Editing/FLEXFieldEditorViewController.h

@@ -15,9 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FLEXFieldEditorViewController : FLEXVariableEditorViewController
 
 /// @return nil if the property is readonly or if the type is unsupported
-+ (nullable instancetype)target:(id)target property:(FLEXProperty *)property commitHandler:(void(^_Nullable)())onCommit;
++ (nullable instancetype)target:(id)target property:(FLEXProperty *)property commitHandler:(void(^_Nullable)(void))onCommit;
 /// @return nil if the ivar type is unsupported
-+ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar commitHandler:(void(^_Nullable)())onCommit;
++ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar commitHandler:(void(^_Nullable)(void))onCommit;
 
 /// Subclasses can change the button title via the \c title property
 @property (nonatomic, readonly) UIBarButtonItem *getterButton;

Classes/Editing/FLEXFieldEditorViewController.m

@@ -30,19 +30,14 @@
 
 #pragma mark - Initialization
 
-+ (instancetype)target:(id)target property:(nonnull FLEXProperty *)property commitHandler:(void(^_Nullable)())onCommit {
-    id value = [property getValue:target];
-    if (![self canEditProperty:property onObject:target currentValue:value]) {
-        return nil;
-    }
-
++ (instancetype)target:(id)target property:(nonnull FLEXProperty *)property commitHandler:(void(^_Nullable)(void))onCommit {
     FLEXFieldEditorViewController *editor = [self target:target data:property commitHandler:onCommit];
     editor.title = [@"Property: " stringByAppendingString:property.name];
     editor.property = property;
     return editor;
 }
 
-+ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar commitHandler:(void(^_Nullable)())onCommit {
++ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar commitHandler:(void(^_Nullable)(void))onCommit {
     FLEXFieldEditorViewController *editor = [self target:target data:ivar commitHandler:onCommit];
     editor.title = [@"Ivar: " stringByAppendingString:ivar.name];
     editor.ivar = ivar;
@@ -151,14 +146,4 @@
     }
 }
 
-+ (BOOL)canEditProperty:(FLEXProperty *)property onObject:(id)object currentValue:(id)value {
-    const FLEXTypeEncoding *typeEncoding = property.attributes.typeEncoding.UTF8String;
-    BOOL canEditType = [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:typeEncoding currentValue:value];
-    return canEditType && [object respondsToSelector:property.likelySetter];
-}
-
-+ (BOOL)canEditIvar:(Ivar)ivar currentValue:(id)value {
-    return [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:ivar_getTypeEncoding(ivar) currentValue:value];
-}
-
 @end

Classes/Editing/FLEXVariableEditorViewController.h

@@ -21,17 +21,17 @@ NS_ASSUME_NONNULL_BEGIN
     @protected
     id _target;
     _Nullable id _data;
-    void (^_Nullable _commitHandler)();
+    void (^_Nullable _commitHandler)(void);
 }
 
 /// @param target The target of the operation
 /// @param data The data associated with the operation
 /// @param onCommit An action to perform when the data changes 
-+ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit;
++ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit;
 /// @param target The target of the operation
 /// @param data The data associated with the operation
 /// @param onCommit An action to perform when the data changes 
-- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit;
+- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit;
 
 @property (nonatomic, readonly) id target;
 

Classes/Editing/FLEXVariableEditorViewController.m

@@ -25,11 +25,11 @@
 
 #pragma mark - Initialization
 
-+ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit {
++ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit {
     return [[self alloc] initWithTarget:target data:data commitHandler:onCommit];
 }
 
-- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit {
+- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit {
     self = [super init];
     if (self) {
         _target = target;

Classes/ExplorerInterface/FLEXExplorerViewController.m

@@ -460,17 +460,12 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
         initWithTarget:self action:@selector(handleToolbarDetailsTapGesture:)
     ];
     [toolbar.selectedViewDescriptionContainer addGestureRecognizer:self.detailsTapGR];
+    
     // Swipe gestures for selecting deeper / higher views at a point
-    UIPanGestureRecognizer *leftSwipe = [[UIPanGestureRecognizer alloc]
+    UIPanGestureRecognizer *panGesture = [[UIPanGestureRecognizer alloc]
         initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
     ];
-//    UIPanGestureRecognizer *rightSwipe = [[UIPanGestureRecognizer alloc]
-//        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
-//    ];
-//    leftSwipe.direction = UISwipeGestureRecognizerDirectionLeft;
-//    rightSwipe.direction = UISwipeGestureRecognizerDirectionRight;
-    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:leftSwipe];
-//    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:rightSwipe];
+    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:panGesture];
     
     // Long press gesture to present tabs manager
     [toolbar.globalsItem addGestureRecognizer:[[UILongPressGestureRecognizer alloc]

Classes/ExplorerInterface/FLEXWindowManagerController.m

@@ -72,7 +72,7 @@
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
-- (void)showRevertOrDismissAlert:(void(^)())revertBlock {
+- (void)showRevertOrDismissAlert:(void(^)(void))revertBlock {
     [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
     [self reloadData];
     [self.tableView reloadData];

Classes/ExplorerInterface/Tabs/FLEXTabList.m

@@ -80,10 +80,10 @@
 
 - (void)closeTab:(UINavigationController *)tab {
     NSParameterAssert(tab);
-    NSParameterAssert([self.openTabs containsObject:tab]);
     NSInteger idx = [self.openTabs indexOfObject:tab];
-    
-    [self closeTabAtIndex:idx];
+    if (idx != NSNotFound) {
+        [self closeTabAtIndex:idx];
+    }
 }
 
 - (void)closeTabAtIndex:(NSInteger)idx {

Classes/FLEX-Categories.h

@@ -6,17 +6,15 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
+#import "UIBarButtonItem+FLEX.h"
+#import "CALayer+FLEX.h"
+#import "UIFont+FLEX.h"
+#import "UIGestureRecognizer+Blocks.h"
+#import "UIPasteboard+FLEX.h"
+#import "UIMenu+FLEX.h"
+#import "UITextField+Range.h"
 
-
-#import <FLEX/UIBarButtonItem+FLEX.h>
-#import <FLEX/CALayer+FLEX.h>
-#import <FLEX/UIFont+FLEX.h>
-#import <FLEX/UIGestureRecognizer+Blocks.h>
-#import <FLEX/UIPasteboard+FLEX.h>
-#import <FLEX/UIMenu+FLEX.h>
-#import <FLEX/UITextField+Range.h>
-
-#import <FLEX/NSObject+FLEX_Reflection.h>
-#import <FLEX/NSArray+FLEX.h>
-#import <FLEX/NSUserDefaults+FLEX.h>
-#import <FLEX/NSTimer+FLEX.h>
+#import "NSObject+FLEX_Reflection.h"
+#import "NSArray+FLEX.h"
+#import "NSUserDefaults+FLEX.h"
+#import "NSTimer+FLEX.h"

Classes/FLEX-Core.h

@@ -6,18 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import <FLEX/FLEXFilteringTableViewController.h>
-#import <FLEX/FLEXNavigationController.h>
-#import <FLEX/FLEXTableViewController.h>
-#import <FLEX/FLEXTableView.h>
+#import "FLEXFilteringTableViewController.h"
+#import "FLEXNavigationController.h"
+#import "FLEXTableViewController.h"
+#import "FLEXTableView.h"
 
-#import <FLEX/FLEXSingleRowSection.h>
-#import <FLEX/FLEXTableViewSection.h>
+#import "FLEXSingleRowSection.h"
+#import "FLEXTableViewSection.h"
 
-#import <FLEX/FLEXCodeFontCell.h>
-#import <FLEX/FLEXSubtitleTableViewCell.h>
-#import <FLEX/FLEXTableViewCell.h>
-#import <FLEX/FLEXMultilineTableViewCell.h>
-#import <FLEX/FLEXKeyValueTableViewCell.h>
+#import "FLEXCodeFontCell.h"
+#import "FLEXSubtitleTableViewCell.h"
+#import "FLEXTableViewCell.h"
+#import "FLEXMultilineTableViewCell.h"
+#import "FLEXKeyValueTableViewCell.h"
 
-#import <FLEX/FLEXScopeCarousel.h>

Classes/FLEX-ObjectExploring.h

@@ -6,25 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import <FLEX/FLEXObjectExplorerFactory.h>
-#import <FLEX/FLEXObjectExplorerViewController.h>
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXObjectExplorerViewController.h"
 
-#import <FLEX/FLEXObjectExplorer.h>
+#import "FLEXObjectExplorer.h"
 
-#import <FLEX/FLEXShortcut.h>
-#import <FLEX/FLEXShortcutsFactory+Defaults.h>
-#import <FLEX/FLEXShortcutsSection.h>
-#import <FLEX/FLEXBlockShortcuts.h>
-#import <FLEX/FLEXBundleShortcuts.h>
-#import <FLEX/FLEXClassShortcuts.h>
-#import <FLEX/FLEXImageShortcuts.h>
-#import <FLEX/FLEXLayerShortcuts.h>
-#import <FLEX/FLEXViewControllerShortcuts.h>
-#import <FLEX/FLEXViewShortcuts.h>
+#import "FLEXShortcut.h"
+#import "FLEXShortcutsSection.h"
 
-#import <FLEX/FLEXCollectionContentSection.h>
-#import <FLEX/FLEXColorPreviewSection.h>
-#import <FLEX/FLEXDefaultsContentSection.h>
-#import <FLEX/FLEXMetadataSection.h>
-#import <FLEX/FLEXMutableListSection.h>
-#import <FLEX/FLEXObjectInfoSection.h>
+#import "FLEXCollectionContentSection.h"
+#import "FLEXColorPreviewSection.h"
+#import "FLEXDefaultsContentSection.h"
+#import "FLEXMetadataSection.h"
+#import "FLEXMutableListSection.h"
+#import "FLEXObjectInfoSection.h"

Classes/FLEX-Runtime.h

@@ -6,20 +6,20 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import <FLEX/FLEXObjcInternal.h>
-#import <FLEX/FLEXRuntimeSafety.h>
-#import <FLEX/FLEXBlockDescription.h>
-#import <FLEX/FLEXTypeEncodingParser.h>
+#import "FLEXObjcInternal.h"
+#import "FLEXRuntimeSafety.h"
+#import "FLEXBlockDescription.h"
+#import "FLEXTypeEncodingParser.h"
 
-#import <FLEX/FLEXMirror.h>
-#import <FLEX/FLEXProtocol.h>
-#import <FLEX/FLEXProperty.h>
-#import <FLEX/FLEXIvar.h>
-#import <FLEX/FLEXMethodBase.h>
-#import <FLEX/FLEXMethod.h>
-#import <FLEX/FLEXPropertyAttributes.h>
-#import <FLEX/FLEXRuntime+Compare.h>
-#import <FLEX/FLEXRuntime+UIKitHelpers.h>
+#import "FLEXMirror.h"
+#import "FLEXProtocol.h"
+#import "FLEXProperty.h"
+#import "FLEXIvar.h"
+#import "FLEXMethodBase.h"
+#import "FLEXMethod.h"
+#import "FLEXPropertyAttributes.h"
+#import "FLEXRuntime+Compare.h"
+#import "FLEXRuntime+UIKitHelpers.h"
 
-#import <FLEX/FLEXProtocolBuilder.h>
-#import <FLEX/FLEXClassBuilder.h>
+#import "FLEXProtocolBuilder.h"
+#import "FLEXClassBuilder.h"

Classes/FLEX.h

@@ -7,18 +7,19 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import <FLEX/FLEXManager.h>
-#import <FLEX/FLEXManager+Extensibility.h>
-#import <FLEX/FLEXManager+Networking.h>
+#import "FLEXManager.h"
+#import "FLEXManager+Extensibility.h"
+#import "FLEXManager+Networking.h"
 
-#import <FLEX/FLEXExplorerToolbar.h>
-#import <FLEX/FLEXExplorerToolbarItem.h>
-#import <FLEX/FLEXGlobalsEntry.h>
+#import "FLEXExplorerToolbar.h"
+#import "FLEXExplorerToolbarItem.h"
+#import "FLEXGlobalsEntry.h"
 
-#import <FLEX/FLEX-Core.h>
-#import <FLEX/FLEX-Runtime.h>
-#import <FLEX/FLEX-Categories.h>
-#import <FLEX/FLEX-ObjectExploring.h>
+#import "FLEX-Core.h"
+#import "FLEX-Runtime.h"
+#import "FLEX-Categories.h"
+#import "FLEX-ObjectExploring.h"
 
-#import <FLEX/FLEXAlert.h>
-#import <FLEX/FLEXResources.h>
+#import "FLEXMacros.h"
+#import "FLEXAlert.h"
+#import "FLEXResources.h"

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.m

@@ -13,7 +13,7 @@
 @synthesize keyedRows = _keyedRows;
 
 + (instancetype)message:(NSString *)message {
-    return [[self alloc] initWithmessage:message columns:nil rows:nil];
+    return [[self alloc] initWithMessage:message columns:nil rows:nil];
 }
 
 + (instancetype)error:(NSString *)message {
@@ -23,12 +23,12 @@
 }
 
 + (instancetype)columns:(NSArray<NSString *> *)columnNames rows:(NSArray<NSArray<NSString *> *> *)rowData {
-    return [[self alloc] initWithmessage:nil columns:columnNames rows:rowData];
+    return [[self alloc] initWithMessage:nil columns:columnNames rows:rowData];
 }
 
-- (id)initWithmessage:(NSString *)message columns:(NSArray *)columns rows:(NSArray<NSArray *> *)rows {
+- (instancetype)initWithMessage:(NSString *)message columns:(NSArray<NSString *> *)columns rows:(NSArray<NSArray<NSString *> *> *)rows {
     NSParameterAssert(message || (columns && rows));
-    NSParameterAssert(columns.count == rows.firstObject.count);
+    NSParameterAssert(rows.count == 0 || columns.count == rows.firstObject.count);
     
     self = [super init];
     if (self) {

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m

@@ -12,7 +12,10 @@
 #import "FLEXRuntimeConstants.h"
 #import <sqlite3.h>
 
-static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
+#define kQuery(name, str) static NSString * const QUERY_##name = str
+
+kQuery(TABLENAMES, @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name");
+kQuery(ROWIDS, @"SELECT rowid FROM \"%@\" ORDER BY rowid ASC");
 
 @interface FLEXSQLiteDatabaseManager ()
 @property (nonatomic) sqlite3 *db;
@@ -107,7 +110,19 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
 - (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName {
     NSString *sql = [NSString stringWithFormat:@"PRAGMA table_info('%@')",tableName];
     FLEXSQLResult *results = [self executeStatement:sql];
-
+    
+    // https://github.com/FLEXTool/FLEX/issues/554
+    if (!results.keyedRows.count) {
+        sql = [NSString stringWithFormat:@"SELECT * FROM pragma_table_info('%@')", tableName];
+        results = [self executeStatement:sql];
+        
+        // Fallback to empty query
+        if (!results.keyedRows.count) {
+            sql = [NSString stringWithFormat:@"SELECT * FROM \"%@\" where 0=1", tableName];
+            return [self executeStatement:sql].columns ?: @[];
+        }
+    }
+    
     return [results.keyedRows flex_mapped:^id(NSDictionary *column, NSUInteger idx) {
         return column[@"name"];
     }] ?: @[];
@@ -119,7 +134,7 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
 }
 
 - (NSArray<NSString *> *)queryRowIDsInTable:(NSString *)tableName {
-    NSString *command = [NSString stringWithFormat:@"SELECT rowid FROM \"%@\"", tableName];
+    NSString *command = [NSString stringWithFormat:QUERY_ROWIDS, tableName];
     NSArray<NSArray<NSString *> *> *data = [self executeStatement:command].rows ?: @[];
     
     return [data flex_mapped:^id(NSArray<NSString *> *obj, NSUInteger idx) {
@@ -146,7 +161,7 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
             return self.lastResult;
         }
         
-        // Grab columns
+        // Grab columns (columnCount will be 0 for insert/update/delete) 
         int columnCount = sqlite3_column_count(pstmt);
         NSArray<NSString *> *columns = [NSArray flex_forEachUpTo:columnCount map:^id(NSUInteger i) {
             return @(sqlite3_column_name(pstmt, (int)i));
@@ -164,8 +179,9 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
         }
         
         if (status == SQLITE_DONE) {
-            if (rows.count) {
-                // We selected some rows
+            // columnCount will be 0 for insert/update/delete
+            if (rows.count || columnCount > 0) {
+                // We executed a SELECT query
                 result = _lastResult = [FLEXSQLResult columns:columns rows:rows];
             } else {
                 // We executed a query like INSERT, UDPATE, or DELETE

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.h

@@ -13,13 +13,23 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FLEXTableContentViewController : UIViewController
 
-/// Display a table with the given columns, rows, and name.
+/// Display a mutable table with the given columns, rows, and name.
+///
+/// @param columnNames self explanatory.
+/// @param rowData an array of rows, where each row is an array of column data.
+/// @param rowIDs an array of stringy row IDs. Required for deleting rows.
+/// @param tableName an optional name of the table being viewed, if any. Enables adding rows.
 /// @param databaseManager an optional manager to allow modifying the table.
+///        Required for deleting rows. Required for adding rows if \c tableName is supplied.
 + (instancetype)columns:(NSArray<NSString *> *)columnNames
                    rows:(NSArray<NSArray<NSString *> *> *)rowData
-                 rowIDs:(nullable NSArray<NSString *> *)rowIds
+                 rowIDs:(NSArray<NSString *> *)rowIDs
               tableName:(NSString *)tableName
-               database:(nullable id<FLEXDatabaseManager>)databaseManager;
+               database:(id<FLEXDatabaseManager>)databaseManager;
+
+/// Display an immutable table with the given columns and rows.
++ (instancetype)columns:(NSArray<NSString *> *)columnNames
+                   rows:(NSArray<NSArray<NSString *> *> *)rowData;
 
 @end
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.m

@@ -7,6 +7,7 @@
 //
 
 #import "FLEXTableContentViewController.h"
+#import "FLEXTableRowDataViewController.h"
 #import "FLEXMultiColumnTableView.h"
 #import "FLEXWebViewController.h"
 #import "FLEXUtility.h"
@@ -21,6 +22,8 @@
 @property (nonatomic, nullable) NSMutableArray<NSString *> *rowIDs;
 @property (nonatomic, readonly, nullable) id<FLEXDatabaseManager> databaseManager;
 
+@property (nonatomic, readonly) BOOL canRefresh;
+
 @property (nonatomic) FLEXMultiColumnTableView *multiColumnView;
 @end
 
@@ -28,16 +31,43 @@
 
 + (instancetype)columns:(NSArray<NSString *> *)columnNames
                    rows:(NSArray<NSArray<NSString *> *> *)rowData
-                 rowIDs:(nullable NSArray<NSString *> *)rowIDs
+                 rowIDs:(NSArray<NSString *> *)rowIDs
               tableName:(NSString *)tableName
-               database:(nullable id<FLEXDatabaseManager>)databaseManager {
-    FLEXTableContentViewController *controller = [self new];
-    controller->_columns = columnNames.copy;
-    controller->_rows = rowData.mutableCopy;
-    controller->_rowIDs = rowIDs.mutableCopy;
-    controller->_tableName = tableName.copy;
-    controller->_databaseManager = databaseManager;
-    return controller;
+               database:(id<FLEXDatabaseManager>)databaseManager {
+    return [[self alloc]
+        initWithColumns:columnNames
+        rows:rowData
+        rowIDs:rowIDs
+        tableName:tableName
+        database:databaseManager
+    ];
+}
+
++ (instancetype)columns:(NSArray<NSString *> *)cols
+                   rows:(NSArray<NSArray<NSString *> *> *)rowData {
+    return [[self alloc] initWithColumns:cols rows:rowData rowIDs:nil tableName:nil database:nil];
+}
+
+- (instancetype)initWithColumns:(NSArray<NSString *> *)columnNames
+                           rows:(NSArray<NSArray<NSString *> *> *)rowData
+                         rowIDs:(nullable NSArray<NSString *> *)rowIDs
+                      tableName:(nullable NSString *)tableName
+                       database:(nullable id<FLEXDatabaseManager>)databaseManager {
+    // Must supply all optional parameters as one, or none
+    BOOL all = rowIDs && tableName && databaseManager;
+    BOOL none = !rowIDs && !tableName && !databaseManager;
+    NSParameterAssert(all || none);
+
+    self = [super init];
+    if (self) {
+        self->_columns = columnNames.copy;
+        self->_rows = rowData.mutableCopy;
+        self->_rowIDs = rowIDs.mutableCopy;
+        self->_tableName = tableName.copy;
+        self->_databaseManager = databaseManager;
+    }
+
+    return self;
 }
 
 - (void)loadView {
@@ -49,7 +79,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = self.tableName;
-    self.edgesForExtendedLayout = UIRectEdgeNone;
     [self.multiColumnView reloadData];
     [self setupToolbarItems];
 }
@@ -67,6 +96,10 @@
     return _multiColumnView;
 }
 
+- (BOOL)canRefresh {
+    return self.databaseManager && self.tableName;
+}
+
 #pragma mark MultiColumnTableView DataSource
 
 - (NSInteger)numberOfColumnsInTableView:(FLEXMultiColumnTableView *)tableView {
@@ -122,6 +155,10 @@
         return [NSString stringWithFormat:@"%@:\n%@", self.columns[idx], field];
     }];
     
+    NSArray<NSString *> *values = [self.rows[row] flex_mapped:^id(NSString *value, NSUInteger idx) {
+        return [NSString stringWithFormat:@"'%@'", value];
+    }];
+    
     [FLEXAlert makeAlert:^(FLEXAlert *make) {
         make.title([@"Row " stringByAppendingString:@(row).stringValue]);
         NSString *message = [fields componentsJoinedByString:@"\n\n"];
@@ -129,10 +166,19 @@
         make.button(@"Copy").handler(^(NSArray<NSString *> *strings) {
             UIPasteboard.generalPasteboard.string = message;
         });
+        make.button(@"Copy as CSV").handler(^(NSArray<NSString *> *strings) {
+            UIPasteboard.generalPasteboard.string = [values componentsJoinedByString:@", "];
+        });
+        make.button(@"Focus on Row").handler(^(NSArray<NSString *> *strings) {
+            UIViewController *focusedRow = [FLEXTableRowDataViewController
+                rows:[NSDictionary dictionaryWithObjects:self.rows[row] forKeys:self.columns]
+            ];
+            [self.navigationController pushViewController:focusedRow animated:YES];
+        });
         
         // Option to delete row
         BOOL hasRowID = self.rows.count && row < self.rows.count;
-        if (hasRowID) {
+        if (hasRowID && self.canRefresh) {
             make.button(@"Delete").destructiveStyle().handler(^(NSArray<NSString *> *strings) {
                 NSString *deleteRow = [NSString stringWithFormat:
                     @"DELETE FROM %@ WHERE rowid = %@",
@@ -142,9 +188,7 @@
                 [self executeStatementAndShowResult:deleteRow completion:^(BOOL success) {
                     // Remove deleted row and reload view
                     if (success) {
-                        [self.rowIDs removeObjectAtIndex:row];
-                        [self.rows removeObjectAtIndex:row];
-                        [self.multiColumnView reloadData];
+                        [self reloadTableDataFromDB];
                     }
                 }];
             });
@@ -216,14 +260,24 @@
         return;
     }
     
-    UIBarButtonItem *trashButton = [FLEXBarButtonItemSystem(Trash, self, @selector(trashPressed))
-        flex_withTintColor:UIColor.redColor
+    UIBarButtonItem *trashButton = FLEXBarButtonItemSystem(Trash, self, @selector(trashPressed));
+    UIBarButtonItem *addButton = FLEXBarButtonItemSystem(Add, self, @selector(addPressed));
+
+    // Only allow adding rows or deleting rows if we have a table name
+    trashButton.enabled = self.canRefresh;
+    addButton.enabled = self.canRefresh;
+    
+    self.toolbarItems = @[
+        UIBarButtonItem.flex_flexibleSpace,
+        addButton,
+        UIBarButtonItem.flex_flexibleSpace,
+        [trashButton flex_withTintColor:UIColor.redColor],
     ];
-    trashButton.enabled = self.databaseManager && self.rows.count;
-    self.toolbarItems = @[UIBarButtonItem.flex_flexibleSpace, trashButton];
 }
 
 - (void)trashPressed {
+    NSParameterAssert(self.tableName);
+
     [FLEXAlert makeAlert:^(FLEXAlert *make) {
         make.title(@"Delete All Rows");
         make.message(@"All rows in this table will be permanently deleted.\nDo you want to proceed?");
@@ -241,9 +295,35 @@
     } showFrom:self];
 }
 
+- (void)addPressed {
+    NSParameterAssert(self.tableName);
+
+    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        make.title(@"Add a New Row");
+        make.message(@"Comma separate values to use in an INSERT statement.\n\n");
+        make.message(@"INSERT INTO [table] VALUES (your_input)");
+        make.textField(@"5, 'John Smith', 14,...");
+        make.button(@"Insert").handler(^(NSArray<NSString *> *strings) {
+            NSString *statement = [NSString stringWithFormat:
+                @"INSERT INTO %@ VALUES (%@)", self.tableName, strings[0]
+            ];
+
+            [self executeStatementAndShowResult:statement completion:^(BOOL success) {
+                if (success) {
+                    [self reloadTableDataFromDB];
+                }
+            }];
+        });
+        make.button(@"Cancel").cancelStyle();
+    } showFrom:self];
+}
+
 #pragma mark - Helpers
 
-- (void)executeStatementAndShowResult:(NSString *)statement completion:(void (^_Nullable)(BOOL success))completion {
+- (void)executeStatementAndShowResult:(NSString *)statement
+                           completion:(void (^_Nullable)(BOOL success))completion {
+    NSParameterAssert(self.databaseManager);
+
     FLEXSQLResult *result = [self.databaseManager executeStatement:statement];
     
     [FLEXAlert makeAlert:^(FLEXAlert *make) {
@@ -260,5 +340,20 @@
     } showFrom:self];
 }
 
+- (void)reloadTableDataFromDB {
+    if (!self.canRefresh) {
+        return;
+    }
+
+    NSArray<NSArray *> *rows = [self.databaseManager queryAllDataInTable:self.tableName];
+    NSArray<NSString *> *rowIDs = nil;
+    if ([self.databaseManager respondsToSelector:@selector(queryRowIDsInTable:)]) {
+        rowIDs = [self.databaseManager queryRowIDsInTable:self.tableName];
+    }
+
+    self.rows = rows.mutableCopy;
+    self.rowIDs = rowIDs.mutableCopy;
+    [self.multiColumnView reloadData];
+}
 
 @end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m

@@ -71,7 +71,10 @@
     self.tables.selectionHandler = ^(FLEXTableListViewController *host, NSString *tableName) {
         NSArray *rows = [host.dbm queryAllDataInTable:tableName];
         NSArray *columns = [host.dbm queryAllColumnsOfTable:tableName];
-        NSArray *rowIDs = [host.dbm queryRowIDsInTable:tableName];
+        NSArray *rowIDs = nil;
+        if ([host.dbm respondsToSelector:@selector(queryRowIDsInTable:)]) {        
+            rowIDs = [host.dbm queryRowIDsInTable:tableName];
+        }
         UIViewController *resultsScreen = [FLEXTableContentViewController
             columns:columns rows:rows rowIDs:rowIDs tableName:tableName database:host.dbm
         ];
@@ -102,7 +105,7 @@
                 [FLEXAlert showAlert:@"Message" message:result.message from:self];
             } else {
                 UIViewController *resultsScreen = [FLEXTableContentViewController
-                    columns:result.columns rows:result.rows rowIDs:nil tableName:@"" database:nil
+                    columns:result.columns rows:result.rows
                 ];
                 
                 [self.navigationController pushViewController:resultsScreen animated:YES];

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.h

@@ -0,0 +1,14 @@
+//
+//  FLEXTableRowDataViewController.h
+//  FLEX
+//
+//  Created by Chaoshuai Lu on 7/8/20.
+//
+
+#import "FLEXFilteringTableViewController.h"
+
+@interface FLEXTableRowDataViewController : FLEXFilteringTableViewController
+
++ (instancetype)rows:(NSDictionary<NSString *, id> *)rowData;
+
+@end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.m

@@ -0,0 +1,54 @@
+//
+//  FLEXTableRowDataViewController.m
+//  FLEX
+//
+//  Created by Chaoshuai Lu on 7/8/20.
+//
+
+#import "FLEXTableRowDataViewController.h"
+#import "FLEXMutableListSection.h"
+#import "FLEXAlert.h"
+
+@interface FLEXTableRowDataViewController ()
+@property (nonatomic) NSDictionary<NSString *, NSString *> *rowsByColumn;
+@end
+
+@implementation FLEXTableRowDataViewController
+
+#pragma mark - Initialization
+
++ (instancetype)rows:(NSDictionary<NSString *, id> *)rowData {
+    FLEXTableRowDataViewController *controller = [self new];
+    controller.rowsByColumn = rowData;
+    return controller;
+}
+
+#pragma mark - Overrides
+
+- (NSArray<FLEXTableViewSection *> *)makeSections {
+    NSDictionary<NSString *, NSString *> *rowsByColumn = self.rowsByColumn;
+    
+    FLEXMutableListSection<NSString *> *section = [FLEXMutableListSection list:self.rowsByColumn.allKeys
+        cellConfiguration:^(UITableViewCell *cell, NSString *column, NSInteger row) {
+            cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+            cell.textLabel.text = column;
+            cell.detailTextLabel.text = rowsByColumn[column].description;
+        } filterMatcher:^BOOL(NSString *filterText, NSString *column) {
+            return [column localizedCaseInsensitiveContainsString:filterText] ||
+                [rowsByColumn[column] localizedCaseInsensitiveContainsString:filterText];
+        }
+    ];
+    
+    section.selectionHandler = ^(UIViewController *host, NSString *column) {
+        UIPasteboard.generalPasteboard.string = rowsByColumn[column].description;
+        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+            make.title(@"Column Copied to Clipboard");
+            make.message(rowsByColumn[column].description);
+            make.button(@"Dismiss").cancelStyle();
+        } showFrom:host];
+    };
+
+    return @[section];
+}
+
+@end

Classes/GlobalStateExplorers/FLEXLiveObjectsController.m

@@ -226,7 +226,10 @@ static const NSInteger kFLEXLiveObjectsSortBySizeIndex = 2;
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     NSString *className = self.filteredClassNames[indexPath.row];
-    UIViewController *instances = [FLEXObjectListViewController instancesOfClassWithName:className];
+    UIViewController *instances = [FLEXObjectListViewController
+        instancesOfClassWithName:className
+        retained:YES
+    ];
     [self.navigationController pushViewController:instances animated:YES];
 }
 

Classes/GlobalStateExplorers/FLEXObjectListViewController.h

@@ -12,8 +12,8 @@
 
 /// This will either return a list of the instances, or take you straight
 /// to the explorer itself if there is only one instance.
-+ (UIViewController *)instancesOfClassWithName:(NSString *)className;
++ (UIViewController *)instancesOfClassWithName:(NSString *)className retained:(BOOL)retain;
 + (instancetype)subclassesOfClassWithName:(NSString *)className;
-+ (instancetype)objectsWithReferencesToObject:(id)object;
++ (instancetype)objectsWithReferencesToObject:(id)object retained:(BOOL)retain;
 
 @end

Classes/GlobalStateExplorers/FLEXObjectListViewController.m

@@ -141,45 +141,33 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
     return self;
 }
 
-+ (UIViewController *)instancesOfClassWithName:(NSString *)className {
-    const char *classNameCString = className.UTF8String;
-    NSMutableArray *instances = [NSMutableArray new];
-    [FLEXHeapEnumerator enumerateLiveObjectsUsingBlock:^(__unsafe_unretained id object, __unsafe_unretained Class actualClass) {
-        if (strcmp(classNameCString, class_getName(actualClass)) == 0) {
-            // Note: objects of certain classes crash when retain is called.
-            // It is up to the user to avoid tapping into instance lists for these classes.
-            // Ex. OS_dispatch_queue_specific_queue
-            // In the future, we could provide some kind of warning for classes that are known to be problematic.
-            if (malloc_size((__bridge const void *)(object)) > 0) {
-                [instances addObject:object];
-            }
-        }
-    }];
-
-    NSArray<FLEXObjectRef *> *references = [FLEXObjectRef referencingAll:instances];
++ (UIViewController *)instancesOfClassWithName:(NSString *)className retained:(BOOL)retain {
+    NSArray<FLEXObjectRef *> *references = [FLEXHeapEnumerator
+        instancesOfClassWithName:className retained:retain
+    ];
+    
     if (references.count == 1) {
         return [FLEXObjectExplorerFactory
-                explorerViewControllerForObject:references.firstObject.object
+            explorerViewControllerForObject:references.firstObject.object
         ];
     }
 
     FLEXObjectListViewController *controller = [[self alloc] initWithReferences:references];
-    controller.title = [NSString stringWithFormat:@"%@ (%lu)", className, (unsigned long)instances.count];
+    controller.title = [NSString stringWithFormat:@"%@ (%@)", className, @(references.count)];
     return controller;
 }
 
 + (instancetype)subclassesOfClassWithName:(NSString *)className {
-    NSArray<Class> *classes = FLEXGetAllSubclasses(NSClassFromString(className), NO);
-    NSArray<FLEXObjectRef *> *references = [FLEXObjectRef referencingClasses:classes];
+    NSArray<FLEXObjectRef *> *references = [FLEXHeapEnumerator subclassesOfClassWithName:className];
     FLEXObjectListViewController *controller = [[self alloc] initWithReferences:references];
-    controller.title = [NSString stringWithFormat:@"Subclasses of %@ (%lu)",
-        className, (unsigned long)classes.count
+    controller.title = [NSString stringWithFormat:@"Subclasses of %@ (%@)",
+        className, @(references.count)
     ];
 
     return controller;
 }
 
-+ (instancetype)objectsWithReferencesToObject:(id)object {
++ (instancetype)objectsWithReferencesToObject:(id)object retained:(BOOL)retain {
     static Class SwiftObjectClass = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
@@ -189,35 +177,9 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
         }
     });
 
-    NSMutableArray<FLEXObjectRef *> *instances = [NSMutableArray new];
-    [FLEXHeapEnumerator enumerateLiveObjectsUsingBlock:^(__unsafe_unretained id tryObject, __unsafe_unretained Class actualClass) {
-        // Get all the ivars on the object. Start with the class and and travel up the inheritance chain.
-        // Once we find a match, record it and move on to the next object. There's no reason to find multiple matches within the same object.
-        Class tryClass = actualClass;
-        while (tryClass) {
-            unsigned int ivarCount = 0;
-            Ivar *ivars = class_copyIvarList(tryClass, &ivarCount);
-
-            for (unsigned int ivarIndex = 0; ivarIndex < ivarCount; ivarIndex++) {
-                Ivar ivar = ivars[ivarIndex];
-                NSString *typeEncoding = @(ivar_getTypeEncoding(ivar) ?: "");
-
-                if (typeEncoding.flex_typeIsObjectOrClass) {
-                    ptrdiff_t offset = ivar_getOffset(ivar);
-                    uintptr_t *fieldPointer = (__bridge void *)tryObject + offset;
-
-                    if (*fieldPointer == (uintptr_t)(__bridge void *)object) {
-                        NSString *ivarName = @(ivar_getName(ivar) ?: "???");
-                        [instances addObject:[FLEXObjectRef referencing:tryObject ivar:ivarName]];
-                        return;
-                    }
-                }
-            }
-
-            free(ivars);
-            tryClass = class_getSuperclass(tryClass);
-        }
-    }];
+    NSArray<FLEXObjectRef *> *instances = [FLEXHeapEnumerator
+        objectsWithReferencesToObject:object retained:retain
+    ];
 
     FLEXObjectListViewController *viewController = [[self alloc]
         initWithReferences:instances
@@ -260,7 +222,7 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
     }];
 }
 
-- (FLEXMutableListSection *)makeSection:(NSArray *)rows title:(NSString *)title { weakify(self)
+- (FLEXMutableListSection *)makeSection:(NSArray *)rows title:(NSString *)title {
     FLEXMutableListSection *section = [FLEXMutableListSection list:rows
         cellConfiguration:^(FLEXTableViewCell *cell, FLEXObjectRef *ref, NSInteger row) {
             cell.textLabel.text = ref.reference;
@@ -275,8 +237,8 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
         }
     ];
 
-    section.selectionHandler = ^(UIViewController *host, FLEXObjectRef *ref) { strongify(self)
-        [self.navigationController pushViewController:[
+    section.selectionHandler = ^(UIViewController *host, FLEXObjectRef *ref) {
+        [host.navigationController pushViewController:[
             FLEXObjectExplorerFactory explorerViewControllerForObject:ref.object
         ] animated:YES];
     };

Classes/GlobalStateExplorers/FLEXObjectRef.h

@@ -10,10 +10,19 @@
 
 @interface FLEXObjectRef : NSObject
 
-+ (instancetype)referencing:(id)object;
-+ (instancetype)referencing:(id)object ivar:(NSString *)ivarName;
+/// Reference an object without affecting its lifespan or or emitting reference-counting operations.
++ (instancetype)unretained:(__unsafe_unretained id)object;
++ (instancetype)unretained:(__unsafe_unretained id)object ivar:(NSString *)ivarName;
 
-+ (NSArray<FLEXObjectRef *> *)referencingAll:(NSArray *)objects;
+/// Reference an object and control its lifespan.
++ (instancetype)retained:(id)object;
++ (instancetype)retained:(id)object ivar:(NSString *)ivarName;
+
+/// Reference an object and conditionally choose to retain it or not.
++ (instancetype)referencing:(__unsafe_unretained id)object retained:(BOOL)retain;
++ (instancetype)referencing:(__unsafe_unretained id)object ivar:(NSString *)ivarName retained:(BOOL)retain;
+
++ (NSArray<FLEXObjectRef *> *)referencingAll:(NSArray *)objects retained:(BOOL)retain;
 /// Classes do not have a summary, and the reference is just the class name.
 + (NSArray<FLEXObjectRef *> *)referencingClasses:(NSArray<Class> *)classes;
 
@@ -22,6 +31,11 @@
 /// For instances, this is the result of -[FLEXRuntimeUtility summaryForObject:]
 /// For classes, there is no summary.
 @property (nonatomic, readonly) NSString *summary;
-@property (nonatomic, readonly) id object;
+@property (nonatomic, readonly, unsafe_unretained) id object;
+
+/// Retains the referenced object if it is not already retained
+- (void)retainObject;
+/// Releases the referenced object if it is already retained
+- (void)releaseObject;
 
 @end

Classes/GlobalStateExplorers/FLEXObjectRef.m

@@ -10,42 +10,68 @@
 #import "FLEXRuntimeUtility.h"
 #import "NSArray+FLEX.h"
 
-@interface FLEXObjectRef ()
+@interface FLEXObjectRef () {
+    /// Used to retain the object if desired
+    id _retainer;
+}
 @property (nonatomic, readonly) BOOL wantsSummary;
 @end
 
 @implementation FLEXObjectRef
 @synthesize summary = _summary;
 
-+ (instancetype)referencing:(id)object {
-    return [self referencing:object showSummary:YES];
++ (instancetype)unretained:(__unsafe_unretained id)object {
+    return [self referencing:object showSummary:YES retained:NO];
 }
 
-+ (instancetype)referencing:(id)object showSummary:(BOOL)showSummary {
-    return [[self alloc] initWithObject:object ivarName:nil showSummary:showSummary];
++ (instancetype)unretained:(__unsafe_unretained id)object ivar:(NSString *)ivarName {
+    return [[self alloc] initWithObject:object ivarName:ivarName showSummary:YES retained:NO];
 }
 
-+ (instancetype)referencing:(id)object ivar:(NSString *)ivarName {
-    return [[self alloc] initWithObject:object ivarName:ivarName showSummary:YES];
++ (instancetype)retained:(id)object {
+    return [self referencing:object showSummary:YES retained:YES];
 }
 
-+ (NSArray<FLEXObjectRef *> *)referencingAll:(NSArray *)objects {
++ (instancetype)retained:(id)object ivar:(NSString *)ivarName {
+    return [[self alloc] initWithObject:object ivarName:ivarName showSummary:YES retained:YES];
+}
+
++ (instancetype)referencing:(__unsafe_unretained id)object retained:(BOOL)retain {
+    return retain ? [self retained:object] : [self unretained:object];
+}
+
++ (instancetype)referencing:(__unsafe_unretained id)object ivar:(NSString *)ivarName retained:(BOOL)retain {
+    return retain ? [self retained:object ivar:ivarName] : [self unretained:object ivar:ivarName];
+}
+
++ (instancetype)referencing:(__unsafe_unretained id)object showSummary:(BOOL)showSummary retained:(BOOL)retain {
+    return [[self alloc] initWithObject:object ivarName:nil showSummary:showSummary retained:retain];
+}
+
++ (NSArray<FLEXObjectRef *> *)referencingAll:(NSArray *)objects retained:(BOOL)retain {
     return [objects flex_mapped:^id(id obj, NSUInteger idx) {
-        return [self referencing:obj showSummary:YES];
+        return [self referencing:obj showSummary:YES retained:retain];
     }];
 }
 
 + (NSArray<FLEXObjectRef *> *)referencingClasses:(NSArray<Class> *)classes {
     return [classes flex_mapped:^id(id obj, NSUInteger idx) {
-        return [self referencing:obj showSummary:NO];
+        return [self referencing:obj showSummary:NO retained:NO];
     }];
 }
 
-- (id)initWithObject:(id)object ivarName:(NSString *)ivar showSummary:(BOOL)showSummary {
+- (id)initWithObject:(__unsafe_unretained id)object
+            ivarName:(NSString *)ivar
+         showSummary:(BOOL)showSummary
+            retained:(BOOL)retain {
     self = [super init];
     if (self) {
         _object = object;
         _wantsSummary = showSummary;
+        
+        if (retain) {
+            _retainer = object;
+        }
 
         NSString *class = [FLEXRuntimeUtility safeClassNameForObject:object];
         if (ivar) {
@@ -73,4 +99,14 @@
     }
 }
 
+- (void)retainObject {
+    if (!_retainer) {
+        _retainer = _object;
+    }
+}
+
+- (void)releaseObject {
+    _retainer = nil;
+}
+
 @end

Classes/GlobalStateExplorers/FLEXWebViewController.m

@@ -38,9 +38,26 @@
     self = [self initWithNibName:nil bundle:nil];
     if (self) {
         self.originalText = text;
-        NSString *htmlString = [NSString stringWithFormat:@"<head><meta name='viewport' content='initial-scale=1.0'></head><body><pre>%@</pre></body>", [FLEXUtility stringByEscapingHTMLEntitiesInString:text]];
-        [self.webView loadHTMLString:htmlString baseURL:nil];
+
+        NSString *html = @"<head><style>:root{ color-scheme: light dark; }</style>"
+            "<meta name='viewport' content='initial-scale=1.0'></head><body><pre>%@</pre></body>";
+
+        // Loading message for when input text takes a long time to escape
+        NSString *loadingMessage = [NSString stringWithFormat:html, @"Loading..."];
+        [self.webView loadHTMLString:loadingMessage baseURL:nil];
+
+        // Escape HTML on a background thread
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            NSString *escapedText = [FLEXUtility stringByEscapingHTMLEntitiesInString:text];
+            NSString *htmlString = [NSString stringWithFormat:html, escapedText];
+
+            // Update webview on the main thread
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self.webView loadHTMLString:htmlString baseURL:nil];
+            });
+        });
     }
+
     return self;
 }
 
@@ -50,14 +67,8 @@
         NSURLRequest *request = [NSURLRequest requestWithURL:url];
         [self.webView loadRequest:request];
     }
-    return self;
-}
 
-- (void)dealloc {
-    // WKWebView's delegate is assigned so we need to clear it manually.
-    if (_webView.navigationDelegate == self) {
-        _webView.navigationDelegate = nil;
-    }
+    return self;
 }
 
 - (void)viewDidLoad {
@@ -68,7 +79,9 @@
     self.webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     
     if (self.originalText.length > 0) {
-        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Copy" style:UIBarButtonItemStylePlain target:self action:@selector(copyButtonTapped:)];
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
+            initWithTitle:@"Copy" style:UIBarButtonItemStylePlain target:self action:@selector(copyButtonTapped:)
+        ];
     }
 }
 
@@ -79,20 +92,23 @@
 
 #pragma mark - WKWebView Delegate
 
-- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
+                                                     decisionHandler:(void (^)(WKNavigationActionPolicy))handler {
     WKNavigationActionPolicy policy = WKNavigationActionPolicyCancel;
     if (navigationAction.navigationType == WKNavigationTypeOther) {
         // Allow the initial load
         policy = WKNavigationActionPolicyAllow;
     } else {
-        // For clicked links, push another web view controller onto the navigation stack so that hitting the back button works as expected.
+        // For clicked links, push another web view controller onto the navigation stack
+        // so that hitting the back button works as expected.
         // Don't allow the current web view to handle the navigation.
         NSURLRequest *request = navigationAction.request;
-        FLEXWebViewController *webVC = [[[self class] alloc] initWithURL:[request URL]];
-        webVC.title = [[request URL] absoluteString];
+        FLEXWebViewController *webVC = [[[self class] alloc] initWithURL:request.URL];
+        webVC.title = request.URL.absoluteString;
         [self.navigationController pushViewController:webVC animated:YES];
     }
-    decisionHandler(policy);
+
+    handler(policy);
 }
 
 
@@ -101,7 +117,7 @@
 + (BOOL)supportsPathExtension:(NSString *)extension {
     BOOL supported = NO;
     NSSet<NSString *> *supportedExtensions = [self webViewSupportedPathExtensions];
-    if ([supportedExtensions containsObject:[extension lowercaseString]]) {
+    if ([supportedExtensions containsObject:extension.lowercaseString]) {
         supported = YES;
     }
     return supported;
@@ -113,11 +129,14 @@
     dispatch_once(&onceToken, ^{
         // Note that this is not exhaustive, but all these extensions should work well in the web view.
         // See https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/CreatingContentforSafarioniPhone/CreatingContentforSafarioniPhone.html#//apple_ref/doc/uid/TP40006482-SW7
-        pathExtensions = [NSSet<NSString *> setWithArray:@[@"jpg", @"jpeg", @"png", @"gif", @"pdf", @"svg", @"tiff", @"3gp", @"3gpp", @"3g2",
-                                                           @"3gp2", @"aiff", @"aif", @"aifc", @"cdda", @"amr", @"mp3", @"swa", @"mp4", @"mpeg",
-                                                           @"mpg", @"mp3", @"wav", @"bwf", @"m4a", @"m4b", @"m4p", @"mov", @"qt", @"mqv", @"m4v"]];
+        pathExtensions = [NSSet<NSString *> setWithArray:@[
+            @"jpg", @"jpeg", @"png", @"gif", @"pdf", @"svg", @"tiff", @"3gp", @"3gpp", @"3g2",
+            @"3gp2", @"aiff", @"aif", @"aifc", @"cdda", @"amr", @"mp3", @"swa", @"mp4", @"mpeg",
+            @"mpg", @"mp3", @"wav", @"bwf", @"m4a", @"m4b", @"m4p", @"mov", @"qt", @"mqv", @"m4v"
+        ]];
         
     });
+
     return pathExtensions;
 }
 

Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeClient.m

@@ -195,7 +195,7 @@ static inline NSString * TBWildcardMap(NSString *token, NSString *candidate, TBW
             "/System/Library/PrivateFrameworks/WebKitLegacy.framework/WebKitLegacy",
             RTLD_LAZY
         );
-        void (*WebKitInitialize)() = dlsym(handle, "WebKitInitialize");
+        void (*WebKitInitialize)(void) = dlsym(handle, "WebKitInitialize");
         if (WebKitInitialize) {
             NSAssert(NSThread.isMainThread,
                 @"WebKitInitialize can only be called on the main thread"

Classes/GlobalStateExplorers/SystemLog/FLEXOSLogController.m

@@ -168,11 +168,10 @@ static uint8_t (*OSLogGetType)(void *);
             NSDate *date = [NSDate dateWithTimeIntervalSince1970:log_message->tv_gmt.tv_sec];
             
             // Get log message text
-            const char *messageText = OSLogCopyFormattedMessage(log_message);
             // https://github.com/limneos/oslog/issues/1
-            if (entry->log_message.format && !(strcmp(entry->log_message.format, messageText))) {
-                messageText = (char *)entry->log_message.format;
-            }
+            // https://github.com/FLEXTool/FLEX/issues/564
+            const char *messageText = OSLogCopyFormattedMessage(log_message) ?: "";
+
             // move messageText from stack to heap
             NSString *msg = [NSString stringWithUTF8String:messageText];
 

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogViewController.m

@@ -98,7 +98,7 @@ static BOOL my_os_log_shim_enabled(void *addr) {
     [super viewDidLoad];
 
     self.showsSearchBar = YES;
-    self.showSearchBarInitially = NO;
+    self.pinSearchBar = YES;
 
     weakify(self)
     id logHandler = ^(NSArray<FLEXSystemLogMessage *> *newMessages) { strongify(self)
@@ -175,9 +175,15 @@ static BOOL my_os_log_shim_enabled(void *addr) {
     [self.logMessages mutate:^(NSMutableArray *list) {
         [list addObjectsFromArray:newMessages];
     }];
+    
+    // Re-filter messages to filter against new messages
+    if (self.filterText.length) {
+        [self updateSearchResults:self.filterText];
+    }
 
     // "Follow" the log as new messages stream in if we were previously near the bottom.
-    BOOL wasNearBottom = self.tableView.contentOffset.y >= self.tableView.contentSize.height - self.tableView.frame.size.height - 100.0;
+    UITableView *tv = self.tableView;
+    BOOL wasNearBottom = tv.contentOffset.y >= tv.contentSize.height - tv.frame.size.height - 100.0;
     [self reloadData];
     if (wasNearBottom) {
         [self scrollToLastRow];
@@ -187,8 +193,8 @@ static BOOL my_os_log_shim_enabled(void *addr) {
 - (void)scrollToLastRow {
     NSInteger numberOfRows = [self.tableView numberOfRowsInSection:0];
     if (numberOfRows > 0) {
-        NSIndexPath *lastIndexPath = [NSIndexPath indexPathForRow:numberOfRows - 1 inSection:0];
-        [self.tableView scrollToRowAtIndexPath:lastIndexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+        NSIndexPath *last = [NSIndexPath indexPathForRow:numberOfRows - 1 inSection:0];
+        [self.tableView scrollToRowAtIndexPath:last atScrollPosition:UITableViewScrollPositionBottom animated:YES];
     }
 }
 

Classes/Headers/CALayer+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/CALayer+FLEX.h

Classes/Headers/FLEX-Categories.h

@@ -0,0 +1 @@
+../../Classes/FLEX-Categories.h

Classes/Headers/FLEX-Core.h

@@ -0,0 +1 @@
+../../Classes/FLEX-Core.h

Classes/Headers/FLEX-ObjectExploring.h

@@ -0,0 +1 @@
+../../Classes/FLEX-ObjectExploring.h

Classes/Headers/FLEX-Runtime.h

@@ -0,0 +1 @@
+../../Classes/FLEX-Runtime.h

Classes/Headers/FLEX.h

@@ -0,0 +1 @@
+../../Classes/FLEX.h

Classes/Headers/FLEXAlert.h

@@ -0,0 +1 @@
+../../Classes/Utility/FLEXAlert.h

Classes/Headers/FLEXBlockDescription.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXBlockDescription.h

Classes/Headers/FLEXClassBuilder.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXClassBuilder.h

Classes/Headers/FLEXCodeFontCell.h

@@ -0,0 +1 @@
+../../Classes/Core/Views/Cells/FLEXCodeFontCell.h

Classes/Headers/FLEXCollectionContentSection.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/FLEXCollectionContentSection.h

Classes/Headers/FLEXColorPreviewSection.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/FLEXColorPreviewSection.h

Classes/Headers/FLEXDefaultsContentSection.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/FLEXDefaultsContentSection.h

Classes/Headers/FLEXExplorerToolbar.h

@@ -0,0 +1 @@
+../../Classes/Toolbar/FLEXExplorerToolbar.h

Classes/Headers/FLEXExplorerToolbarItem.h

@@ -0,0 +1 @@
+../../Classes/Toolbar/FLEXExplorerToolbarItem.h

Classes/Headers/FLEXFilteringTableViewController.h

@@ -0,0 +1 @@
+../../Classes/Core/Controllers/FLEXFilteringTableViewController.h

Classes/Headers/FLEXGlobalsEntry.h

@@ -0,0 +1 @@
+../../Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h

Classes/Headers/FLEXIvar.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXIvar.h

Classes/Headers/FLEXKeyValueTableViewCell.h

@@ -0,0 +1 @@
+../../Classes/Core/Views/Cells/FLEXKeyValueTableViewCell.h

Classes/Headers/FLEXMacros.h

@@ -0,0 +1 @@
+../../Classes/Utility/FLEXMacros.h

Classes/Headers/FLEXManager+Extensibility.h

@@ -0,0 +1 @@
+../../Classes/Manager/FLEXManager+Extensibility.h

Classes/Headers/FLEXManager+Networking.h

@@ -0,0 +1 @@
+../../Classes/Manager/FLEXManager+Networking.h

Classes/Headers/FLEXManager.h

@@ -0,0 +1 @@
+../../Classes/Manager/FLEXManager.h

Classes/Headers/FLEXMetadataSection.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/FLEXMetadataSection.h

Classes/Headers/FLEXMethod.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXMethod.h

Classes/Headers/FLEXMethodBase.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXMethodBase.h

Classes/Headers/FLEXMirror.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXMirror.h

Classes/Headers/FLEXMultilineTableViewCell.h

@@ -0,0 +1 @@
+../../Classes/Core/Views/Cells/FLEXMultilineTableViewCell.h

Classes/Headers/FLEXMutableListSection.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/FLEXMutableListSection.h

Classes/Headers/FLEXNavigationController.h

@@ -0,0 +1 @@
+../../Classes/Core/Controllers/FLEXNavigationController.h

Classes/Headers/FLEXObjcInternal.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/FLEXObjcInternal.h

Classes/Headers/FLEXObjectExplorer.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/FLEXObjectExplorer.h

Classes/Headers/FLEXObjectExplorerFactory.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/FLEXObjectExplorerFactory.h

Classes/Headers/FLEXObjectExplorerViewController.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/FLEXObjectExplorerViewController.h

Classes/Headers/FLEXObjectInfoSection.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/FLEXObjectInfoSection.h

Classes/Headers/FLEXProperty.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXProperty.h

Classes/Headers/FLEXPropertyAttributes.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXPropertyAttributes.h

Classes/Headers/FLEXProtocol.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXProtocol.h

Classes/Headers/FLEXProtocolBuilder.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/Reflection/FLEXProtocolBuilder.h

Classes/Headers/FLEXResources.h

@@ -0,0 +1 @@
+../../Classes/Utility/FLEXResources.h

Classes/Headers/FLEXRuntime+Compare.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/FLEXRuntime+Compare.h

Classes/Headers/FLEXRuntime+UIKitHelpers.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.h

Classes/Headers/FLEXRuntimeConstants.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/FLEXRuntimeConstants.h

Classes/Headers/FLEXRuntimeSafety.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/FLEXRuntimeSafety.h

Classes/Headers/FLEXShortcut.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.h

Classes/Headers/FLEXShortcutsSection.h

@@ -0,0 +1 @@
+../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.h

Classes/Headers/FLEXSingleRowSection.h

@@ -0,0 +1 @@
+../../Classes/Core/FLEXSingleRowSection.h

Classes/Headers/FLEXSubtitleTableViewCell.h

@@ -0,0 +1 @@
+../../Classes/Core/Views/Cells/FLEXSubtitleTableViewCell.h

Classes/Headers/FLEXTableView.h

@@ -0,0 +1 @@
+../../Classes/Core/Views/FLEXTableView.h

Classes/Headers/FLEXTableViewCell.h

@@ -0,0 +1 @@
+../../Classes/Core/Views/Cells/FLEXTableViewCell.h

Classes/Headers/FLEXTableViewController.h

@@ -0,0 +1 @@
+../../Classes/Core/Controllers/FLEXTableViewController.h

Classes/Headers/FLEXTableViewSection.h

@@ -0,0 +1 @@
+../../Classes/Core/FLEXTableViewSection.h

Classes/Headers/FLEXTypeEncodingParser.h

@@ -0,0 +1 @@
+../../Classes/Utility/Runtime/Objc/FLEXTypeEncodingParser.h

Classes/Headers/NSArray+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/NSArray+FLEX.h

Classes/Headers/NSObject+FLEX_Reflection.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/NSObject+FLEX_Reflection.h

Classes/Headers/NSTimer+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/NSTimer+FLEX.h

Classes/Headers/NSUserDefaults+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/NSUserDefaults+FLEX.h

Classes/Headers/UIBarButtonItem+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/UIBarButtonItem+FLEX.h

Classes/Headers/UIFont+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/UIFont+FLEX.h

Classes/Headers/UIGestureRecognizer+Blocks.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/UIGestureRecognizer+Blocks.h

Classes/Headers/UIMenu+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/UIMenu+FLEX.h

Classes/Headers/UIPasteboard+FLEX.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/UIPasteboard+FLEX.h

Classes/Headers/UITextField+Range.h

@@ -0,0 +1 @@
+../../Classes/Utility/Categories/UITextField+Range.h

Classes/Network/FLEXFirebaseTransaction.mm

@@ -0,0 +1,303 @@
+//
+//  FLEXFirebaseTransaction.m
+//  FLEX
+//
+//  Created by Tanner Bennett on 12/24/21.
+//
+
+#import "FLEXNetworkTransaction.h"
+#import "FLEXUtility.h"
+#import <dlfcn.h>
+#include <string>
+
+typedef std::string (*ReturnsString)(void *);
+
+@implementation FLEXFirebaseSetDataInfo
+
++ (instancetype)data:(NSDictionary *)data merge:(NSNumber *)merge mergeFields:(NSArray *)mergeFields {
+    NSParameterAssert(data);
+    NSParameterAssert(merge || mergeFields);
+
+    FLEXFirebaseSetDataInfo *info = [self new];
+    info->_documentData = data;
+    info->_merge = merge;
+    info->_mergeFields = mergeFields;
+
+    return info;
+}
+
+@end
+
+static NSString *FLEXStringFromFIRRequestType(FLEXFIRRequestType type) {
+    switch (type) {
+        case FLEXFIRRequestTypeNotFirebase:
+            return @"not firebase";
+        case FLEXFIRRequestTypeFetchQuery:
+            return @"query fetch";
+        case FLEXFIRRequestTypeFetchDocument:
+            return @"document fetch";
+        case FLEXFIRRequestTypeSetData:
+            return @"set data";
+        case FLEXFIRRequestTypeUpdateData:
+            return @"update data";
+        case FLEXFIRRequestTypeAddDocument:
+            return @"create";
+        case FLEXFIRRequestTypeDeleteDocument:
+            return @"delete";
+    }
+
+    return nil;
+}
+
+static FLEXFIRTransactionDirection FIRDirectionFromRequestType(FLEXFIRRequestType type) {
+    switch (type) {
+        case FLEXFIRRequestTypeNotFirebase:
+            return FLEXFIRTransactionDirectionNone;
+        case FLEXFIRRequestTypeFetchQuery:
+        case FLEXFIRRequestTypeFetchDocument:
+            return FLEXFIRTransactionDirectionPull;
+        case FLEXFIRRequestTypeSetData:
+        case FLEXFIRRequestTypeUpdateData:
+        case FLEXFIRRequestTypeAddDocument:
+        case FLEXFIRRequestTypeDeleteDocument:
+            return FLEXFIRTransactionDirectionPush;
+    }
+
+    return FLEXFIRTransactionDirectionNone;
+}
+
+@interface FLEXFirebaseTransaction ()
+@property (nonatomic) id extraData;
+@property (nonatomic, readonly) NSString *queryDescription;
+@end
+
+@implementation FLEXFirebaseTransaction
+@synthesize queryDescription = _queryDescription;
+
++ (instancetype)initiator:(id)initiator requestType:(FLEXFIRRequestType)type extraData:(id)data {
+    FLEXFirebaseTransaction *fire = [FLEXFirebaseTransaction withStartTime:NSDate.date];
+    fire->_direction = FIRDirectionFromRequestType(type);
+    fire->_initiator = initiator;
+    fire->_requestType = type;
+    fire->_extraData = data;
+    return fire;
+}
+
++ (instancetype)queryFetch:(FIRQuery *)initiator {
+    return [self initiator:initiator requestType:FLEXFIRRequestTypeFetchQuery extraData:nil];
+}
+
++ (instancetype)documentFetch:(FIRDocumentReference *)initiator {
+    return [self initiator:initiator requestType:FLEXFIRRequestTypeFetchDocument extraData:nil];
+}
+
++ (instancetype)setData:(FIRDocumentReference *)initiator data:(NSDictionary *)data
+                  merge:(NSNumber *)merge mergeFields:(NSArray *)mergeFields {
+
+    FLEXFirebaseSetDataInfo *info = [FLEXFirebaseSetDataInfo data:data merge:merge mergeFields:mergeFields];
+    return [self initiator:initiator requestType:FLEXFIRRequestTypeSetData extraData:info];
+}
+
++ (instancetype)updateData:(FIRDocumentReference *)initiator data:(NSDictionary *)data {
+    return [self initiator:initiator requestType:FLEXFIRRequestTypeUpdateData extraData:data];
+}
+
++ (instancetype)addDocument:(FIRCollectionReference *)initiator document:(FIRDocumentReference *)doc {
+    return [self initiator:initiator requestType:FLEXFIRRequestTypeAddDocument extraData:doc];
+}
+
++ (instancetype)deleteDocument:(FIRDocumentReference *)initiator {
+    return [self initiator:initiator requestType:FLEXFIRRequestTypeDeleteDocument extraData:nil];
+}
+
+- (NSString *)queryDescription {
+    if (_queryDescription) {
+        return _queryDescription;
+    }
+
+    // Grab C++ symbol to describe FIRQuery.query
+    static ReturnsString firebase_firestore_core_query_tostring = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        // Is Firebase available?
+        if (NSClassFromString(@"FIRDocumentReference")) {
+            firebase_firestore_core_query_tostring = (ReturnsString)dlsym(
+                RTLD_DEFAULT, "_ZNK8firebase9firestore4core5Query8ToStringEv"
+            );
+        }
+    });
+
+    if (!firebase_firestore_core_query_tostring) {
+        return @"nil";
+    }
+
+    FIRQuery *query = self.initiator_query;
+    if (!query) return nil;
+
+    void *core_query = query.query;
+    std::string description = firebase_firestore_core_query_tostring(core_query);
+
+    // Query strings are like 'Query(canonical_id=...)' so I remove the leading part, and the ()
+    NSString *prefix = @"Query(canonical_id=";
+    NSString *desc = @(description.c_str());
+    desc = [desc stringByReplacingOccurrencesOfString:prefix withString:@""];
+    desc = [desc stringByReplacingCharactersInRange:NSMakeRange(desc.length-1, 1) withString:@""];
+
+    _queryDescription = desc;
+    return _queryDescription;
+}
+
+- (FIRDocumentReference *)initiator_doc {
+    if ([_initiator isKindOfClass:cFIRDocumentReference]) {
+        return _initiator;
+    }
+
+    return nil;
+}
+- (FIRQuery *)initiator_query {
+    if ([_initiator isKindOfClass:cFIRQuery]) {
+        return _initiator;
+    }
+
+    return nil;
+}
+
+- (FIRCollectionReference *)initiator_collection {
+    if ([_initiator isKindOfClass:cFIRCollectionReference]) {
+        return _initiator;
+    }
+
+    return nil;
+}
+
+- (FLEXFirebaseSetDataInfo *)setDataInfo {
+    if (self.requestType == FLEXFIRRequestTypeSetData) {
+        return self.extraData;
+    }
+
+    return nil;
+}
+
+- (NSDictionary *)updateData {
+    if (self.requestType == FLEXFIRRequestTypeUpdateData) {
+        return self.extraData;
+    }
+
+    return nil;
+}
+
+- (NSString *)path {
+    switch (self.direction) {
+        case FLEXFIRTransactionDirectionNone:
+            return nil;
+        case FLEXFIRTransactionDirectionPush:
+        case FLEXFIRTransactionDirectionPull: {
+            switch (self.requestType) {
+                case FLEXFIRRequestTypeNotFirebase:
+                    @throw NSInternalInconsistencyException;
+
+                case FLEXFIRRequestTypeFetchQuery:
+                case FLEXFIRRequestTypeAddDocument:
+                    return self.initiator_collection.path ?: self.queryDescription;
+                case FLEXFIRRequestTypeFetchDocument:
+                case FLEXFIRRequestTypeSetData:
+                case FLEXFIRRequestTypeUpdateData:
+                case FLEXFIRRequestTypeDeleteDocument:
+                    return self.initiator_doc.path;
+            }
+        }
+    }
+
+    return nil;
+}
+
+- (NSString *)primaryDescription {
+    if (!_primaryDescription) {
+        _primaryDescription = self.path.lastPathComponent;
+    }
+
+    return _primaryDescription;
+}
+
+- (NSString *)secondaryDescription {
+    if (!_secondaryDescription) {
+        _secondaryDescription = self.path.stringByDeletingLastPathComponent;
+    }
+
+    return _secondaryDescription;
+}
+
+- (NSString *)tertiaryDescription {
+    if (!_tertiaryDescription) {
+        NSMutableArray<NSString *> *detailComponents = [NSMutableArray new];
+
+        NSString *timestamp = [self timestampStringFromRequestDate:self.startTime];
+        if (timestamp.length > 0) {
+            [detailComponents addObject:timestamp];
+        }
+
+        [detailComponents addObject:self.direction == FLEXFIRTransactionDirectionPush ?
+            @"Push ↑" : @"Pull ↓"
+        ];
+
+        if (self.direction == FLEXFIRTransactionDirectionPush) {
+            [detailComponents addObjectsFromArray:@[FLEXStringFromFIRRequestType(self.requestType)]];
+        }
+
+        if (self.state == FLEXNetworkTransactionStateFinished || self.state == FLEXNetworkTransactionStateFailed) {
+            if (self.direction == FLEXFIRTransactionDirectionPull) {
+                NSString *docCount = [NSString stringWithFormat:@"%@ document(s)", @(self.documents.count)];
+                [detailComponents addObjectsFromArray:@[docCount]];
+            }
+        } else {
+            // Unstarted, Awaiting Response, Receiving Data, etc.
+            NSString *state = [self.class readableStringFromTransactionState:self.state];
+            [detailComponents addObject:state];
+        }
+
+        _tertiaryDescription = [detailComponents componentsJoinedByString:@" ・ "];
+    }
+
+    return _tertiaryDescription;
+}
+
+- (NSString *)copyString {
+    return self.path;
+}
+
+- (BOOL)matchesQuery:(NSString *)filterString {
+    if ([self.path localizedCaseInsensitiveContainsString:filterString]) {
+        return YES;
+    }
+
+    BOOL isPull = self.direction == FLEXFIRTransactionDirectionPull;
+    BOOL isPush = self.direction == FLEXFIRTransactionDirectionPush;
+
+    // Allow filtering for push or pull directly
+    if (isPull && [filterString localizedCaseInsensitiveCompare:@"pull"] == NSOrderedSame) {
+        return YES;
+    }
+    if (isPush && [filterString localizedCaseInsensitiveCompare:@"push"] == NSOrderedSame) {
+        return YES;
+    }
+
+    return NO;
+}
+
+//- (NSString *)responseString {
+//    if (!_responseString) {
+//        _responseString = [NSString stringWithUTF8String:(char *)self.response.bytes];
+//    }
+//
+//    return _responseString;
+//}
+//
+//- (NSDictionary *)responseObject {
+//    if (!_responseObject) {
+//        _responseObject = [NSJSONSerialization JSONObjectWithData:self.response options:0 error:nil];
+//    }
+//
+//    return _responseObject;
+//}
+
+@end