MongoView/MongoEvaluator.swift

@@ -7,37 +7,63 @@
 //
 
 import Foundation
+import JavaScriptCore
 import MongoSwift
 
 struct MongoEvaluator {
     
-    static let decoder = BSONDecoder()
+    static let context: JSContext = {
+        let context = JSContext()!
+        let date: @convention(block) (JSValue) -> Dictionary<String, Any> = { (input) in
+            ["$date": input]
+        }
+        let functions: [NSString: @convention(block) (JSValue) -> Dictionary<String, Any>] = [
+            "ObjectId": { (input) in
+                ["$oid": input]
+            },
+            "NumberLong": { (input) in
+                ["$numberLong": input]
+            },
+            "NumberInt": { (input) in
+                ["$numberInt": input]
+            },
+            "NumberDecimal": { (input) in
+                ["$numberDecimal": input]
+            },
+            "Date": date,
+            "ISODate": date,
+        ]
+        functions.forEach { (key, value) in
+            context.setObject(value, forKeyedSubscript: key)
+        }
+        let dbRef: @convention(block) (String, String) -> Dictionary<String, Any> = { (ref, id) in
+            ["$ref": ref, "$id": ["$oid": id]]
+        }
+        context.setObject(dbRef, forKeyedSubscript: "DBRef" as NSString)
+        return context
+    }()
 
-    static func parse(extendedJSON: String) -> BSON? {
+    static func parse(shellJSON: String) -> Document? {
-        guard !extendedJSON.isEmpty else {
+        guard !shellJSON.isEmpty,
-            return nil
+            let result = context.evaluateScript("JSON.stringify(\(shellJSON))") else {
+                return nil
         }
         do {
-            return try decoder.decode(BSON.self, from: extendedJSON)
+            return try Document(fromJSON: result.toString())
         } catch {
-            print("Unable to parse BSON: \(error)")
+            print("Unable to parse Document: \(error)")
             return nil
         }
     }
     
-    static func eval(command: String, connectingTo connStr: String) -> [BSON] {
+    static func eval(command: String, connectingTo connStr: String) -> [Document] {
-        let realCommand = """
-Object.prototype.printExtJSON = function() { print(JSON.stringify(this)); };
-Array.prototype.printExtJSON = function() { this.map(JSON.stringify).forEach(it => print(it)); };
-\(command).printExtJSON()
-"""
         print("Running command \"\(command)\" against \(connStr)")
         
         let mongoOutputPipe = Pipe()
 
         let mongoProcess = Process()
         mongoProcess.launchPath = "/usr/local/bin/mongo"
-        mongoProcess.arguments = [connStr, "--quiet", "--norc", "--eval", realCommand]
+        mongoProcess.arguments = [connStr, "--quiet", "--norc", "--eval", command]
         mongoProcess.standardOutput = mongoOutputPipe
         mongoProcess.launch()
         
@@ -52,7 +78,7 @@ Array.prototype.printExtJSON = function() { this.map(JSON.stringify).forEach(it
         mongoOutputHandle.closeFile()
         
         let lines = strs.joined(separator: "").components(separatedBy: "\n")
-        return lines.compactMap(parse(extendedJSON:))
+        return lines.compactMap(parse(shellJSON:))
     }
     
 }

MongoView/Node.swift

@@ -37,15 +37,8 @@ class Node {
     }
 
     init(key: Key? = nil, value: BSON) {
+        self.key = key
         self.value = value
-        
-        if key == nil,
-            case let .document(doc) = value,
-            case let .objectId(id) = doc["_id"] {
-            self.key = .objectId(id)
-        } else {
-            self.key = key
-        }
     }
     
     convenience init(document: Document) {

MongoView/View Controllers/DatabaseViewController.swift

@@ -47,11 +47,9 @@ class DatabaseViewController: NSViewController {
         super.viewDidLoad()
         
         mongoController.client.listDatabaseNames().flatMap { (databaseNames) -> EventLoopFuture<[DatabaseCollections]> in
-            let futures = databaseNames.map { (name: String) -> EventLoopFuture<DatabaseCollections> in
+            let futures = databaseNames.map { (name) in
-                let db = self.mongoController.client.db(name)
+                self.mongoController.client.db(name).listCollectionNames().map { (collectionNames) in
-                return db.listCollectionNames().map { (collectionNames: [String]) -> DatabaseCollections in
+                    DatabaseCollections(database: name, collections: collectionNames)
-                    let sortedNames = collectionNames.sorted()
-                    return DatabaseCollections(database: name, collections: sortedNames)
                 }
             }
             return EventLoopFuture.whenAllSucceed(futures, on: futures.first!.eventLoop)
@@ -60,8 +58,7 @@ class DatabaseViewController: NSViewController {
             
             switch res {
             case let .success(databaseCollections):
-                let sortedCollections = databaseCollections.sorted(by: { $0.database < $1.database })
+                self.databaseCollections = databaseCollections
-                self.databaseCollections = sortedCollections
                 DispatchQueue.main.async {
                     self.collectionsOutlineView.reloadData()
                 }

MongoView/View Controllers/QueryViewController.swift

@@ -20,7 +20,7 @@ class QueryViewController: NSViewController {
     let collection: DatabaseCollection
     
     var defaultQuery: String {
-        "db.getCollection('\(collection.name)').find({}).toArray()"
+        "db.getCollection('\(collection.name)').find({})"
     }
     
     var hasQueryChanged: Bool {

MongoView/View Controllers/QueryViewController.xib

@@ -990,7 +990,7 @@
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
                         </scrollView>
-                        <scrollView fixedFrame="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="tUs-K7-aZX">
+                        <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="tUs-K7-aZX">
                             <rect key="frame" x="0.0" y="96" width="741" height="371"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <clipView key="contentView" id="eia-Pq-LIB">