⚡ quicker khulan() helper

🔧 added uri and driver options

classes/Mongodb.php

@@ -30,13 +30,15 @@ public function __construct(array $options = [])
             'database' => option('bnomei.mongodb.database'),
             'username' => option('bnomei.mongodb.username'),
             'password' => option('bnomei.mongodb.password'),
+            'uriOptions' => option('bnomei.mongodb.uriOptions'),
+            'driverOptions' => option('bnomei.mongodb.driverOptions'),
             'collection-cache' => option('bnomei.mongodb.collections.cache'),
             'collection-content' => option('bnomei.mongodb.collections.content'),
         ], $options);
 
         foreach ($this->options as $key => $call) {
             if (! is_string($call) && is_callable($call) && in_array($key, [
-                'host', 'port', 'database', 'username', 'password',
+                'host', 'port', 'database', 'username', 'password', 'uriOptions', 'driverOptions',
             ])) {
                 $this->options[$key] = $call();
             }
@@ -196,7 +198,9 @@ public function client(): Client
             }
 
             $this->_client = new Client(
-                'mongodb://'.$auth.$this->options['host'].':'.$this->options['port']
+                'mongodb://'.$auth.$this->options['host'].':'.$this->options['port'],
+                $this->options['uriOptions'] ?? [],
+                $this->options['driverOptions'] ?? [],
             );
             $this->_client->selectDatabase($this->options['database']);
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby-mongodb",
     "type": "kirby-plugin",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "description": "Khulan is a cache driver and content cache with NoSQL interface for Kirby using MongoDB",
     "license": "MIT",
     "authors": [

index.php

@@ -28,12 +28,21 @@ function mongo(?string $collection = null): \Bnomei\Mongodb|Collection
 
 if (! function_exists('khulan')) {
 
-    function khulan(string|array|null $search = null): mixed
+    function khulan(string|array|null $search = null, ?array $options = null): mixed
     {
         $collection = \Bnomei\Mongodb::singleton()->contentCollection();
 
+        // only get these fields as it is faster and enough for kirby
+        $options ??= [
+            'projection' => [
+                'id' => 1,
+                'uuid' => 1,
+                'modelType' => 1,
+            ],
+        ];
+
         if (is_array($search)) {
-            return Khulan::documentsToModels($collection->find($search));
+            return Khulan::documentsToModels($collection->find($search, $options));
 
         } elseif (is_string($search)) {
             return Khulan::documentToModel($collection->findOne([
@@ -43,7 +52,7 @@ function khulan(string|array|null $search = null): mixed
                     ['uuid' => $search],
                     ['email' => $search], // user
                 ],
-            ]));
+            ], $options));
         }
 
         return $collection;
@@ -61,6 +70,8 @@ function khulan(string|array|null $search = null): mixed
         'database' => 'kirby',
         'username' => null,
         'password' => null,
+        'uriOptions' => [],
+        'driverOptions' => [],
 
         // collections
         'collections' => [

tests/MongodbTest.php

@@ -214,6 +214,22 @@
     expect($count)->toBe(1);
 });
 
+it('can use options on the khulan-find to limit selected fields', function () {
+    Khulan::index();
+
+    // these are the default options for khulan
+    // and optimized for speed
+    $page = khulan('betterharder', [
+        'projection' => [
+            'id' => 1,
+            'uuid' => 1,
+            'modelType' => 1,
+        ],
+    ]);
+
+    expect($page)->not()->toBeNull();
+});
+
 it('can run the benchmark', function () {
     mongo()->benchmark();
 })->skip();

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby-mongodb',
-        'pretty_version' => '1.4.1',
-        'version' => '1.4.1.0',
+        'pretty_version' => '1.4.2',
+        'version' => '1.4.2.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby-mongodb' => array(
-            'pretty_version' => '1.4.1',
-            'version' => '1.4.1.0',
+            'pretty_version' => '1.4.2',
+            'version' => '1.4.2.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',