From 0afcd1f905533ab4d756782c6bfd95736bfe9eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 13 Sep 2023 15:36:03 +0200
Subject: [PATCH 1/4] Add Bun detector

---
 README.md                       |  1 +
 src/Detector/Adapter/Bun.php    | 52 +++++++++++++++++++++++++++++++++
 tests/Detector/DetectorTest.php |  3 ++
 3 files changed, 56 insertions(+)
 create mode 100644 src/Detector/Adapter/Bun.php

diff --git a/README.md b/README.md
index bda54586..5790f542 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ Detector Adapters:
 | Python | ✅ |
 | Ruby | ✅ |
 | Swift | ✅ |
+| Bun | ✅ |
 
 `✅  - supported, 🛠  - work in progress`
 
diff --git a/src/Detector/Adapter/Bun.php b/src/Detector/Adapter/Bun.php
new file mode 100644
index 00000000..6e9adcbd
--- /dev/null
+++ b/src/Detector/Adapter/Bun.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Utopia\Detector\Adapter;
+
+use Utopia\Detector\Adapter;
+
+class Bun extends Adapter
+{
+    /**
+     * @return string[]
+     */
+    public function getLanguages(): array
+    {
+        return ['JavaScript', 'TypeScript'];
+    }
+
+    public function getRuntime(): string
+    {
+        return 'bun';
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getFileExtensions(): array
+    {
+        return ['ts', 'tsx', 'js', 'jsx'];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getFiles(): array
+    {
+        return ['bun.lockb'];
+    }
+
+    public function getInstallCommand(): string
+    {
+        return 'bun install';
+    }
+
+    public function getBuildCommand(): string
+    {
+        return '';
+    }
+
+    public function getEntryPoint(): string
+    {
+        return 'main.ts';
+    }
+}
diff --git a/tests/Detector/DetectorTest.php b/tests/Detector/DetectorTest.php
index fd229bcd..a0085c6b 100644
--- a/tests/Detector/DetectorTest.php
+++ b/tests/Detector/DetectorTest.php
@@ -6,6 +6,7 @@
 use Utopia\App;
 use Utopia\Cache\Adapter\None;
 use Utopia\Cache\Cache;
+use Utopia\Detector\Adapter\Bun;
 use Utopia\Detector\Adapter\CPP;
 use Utopia\Detector\Adapter\Dart;
 use Utopia\Detector\Adapter\Deno;
@@ -40,6 +41,7 @@ public function detect($files, $languages): ?string
             ->addDetector(new Ruby())
             ->addDetector(new Java())
             ->addDetector(new CPP())
+            ->addDetector(new Bun())
             ->addDetector(new Deno())
             ->addDetector(new Dotnet());
 
@@ -70,6 +72,7 @@ public function testLanguageDetection(): void
             ['Dobiasd', 'FunctionalPlus', 'cpp'],
             ['anthonychu', 'azure-functions-deno-worker', 'deno'],
             ['mono', 'mono-basic', 'dotnet'],
+            ['X', 'X', 'bun'],
         ];
 
         foreach ($languageMap as [$owner, $repositoryName, $expectedRuntime]) {

From 81a8a2b8adee16e26b021a54f84884e0db1be058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 13 Sep 2023 16:23:30 +0200
Subject: [PATCH 2/4] Fix test

---
 tests/Detector/DetectorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Detector/DetectorTest.php b/tests/Detector/DetectorTest.php
index a0085c6b..43c62c01 100644
--- a/tests/Detector/DetectorTest.php
+++ b/tests/Detector/DetectorTest.php
@@ -72,7 +72,7 @@ public function testLanguageDetection(): void
             ['Dobiasd', 'FunctionalPlus', 'cpp'],
             ['anthonychu', 'azure-functions-deno-worker', 'deno'],
             ['mono', 'mono-basic', 'dotnet'],
-            ['X', 'X', 'bun'],
+            ['Meldiron', 'bun-function', 'bun'],
         ];
 
         foreach ($languageMap as [$owner, $repositoryName, $expectedRuntime]) {

From 139e267001a438f84a93124221343d8acae697c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 13 Sep 2023 17:02:02 +0200
Subject: [PATCH 3/4] Update DetectorTest.php

---
 tests/Detector/DetectorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Detector/DetectorTest.php b/tests/Detector/DetectorTest.php
index 43c62c01..bd387d41 100644
--- a/tests/Detector/DetectorTest.php
+++ b/tests/Detector/DetectorTest.php
@@ -33,6 +33,7 @@ public function detect($files, $languages): ?string
         $detectorFactory = new Detector($files, $languages);
 
         $detectorFactory
+            ->addDetector(new Bun())
             ->addDetector(new JavaScript())
             ->addDetector(new PHP())
             ->addDetector(new Python())
@@ -41,7 +42,6 @@ public function detect($files, $languages): ?string
             ->addDetector(new Ruby())
             ->addDetector(new Java())
             ->addDetector(new CPP())
-            ->addDetector(new Bun())
             ->addDetector(new Deno())
             ->addDetector(new Dotnet());
 

From 039c5803f0dab5271c0a6ed85af4fbdeed4c2a7e Mon Sep 17 00:00:00 2001
From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com>
Date: Wed, 13 Sep 2023 23:40:16 +0530
Subject: [PATCH 4/4] Changed order of runtime detection

---
 src/Detector/Adapter/JavaScript.php | 2 +-
 tests/Detector/DetectorTest.php     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Detector/Adapter/JavaScript.php b/src/Detector/Adapter/JavaScript.php
index f33b099a..2a5019b7 100644
--- a/src/Detector/Adapter/JavaScript.php
+++ b/src/Detector/Adapter/JavaScript.php
@@ -32,7 +32,7 @@ public function getFileExtensions(): array
      */
     public function getFiles(): array
     {
-        return ['package.json', 'package-lock.json', 'yarn.lock', 'tsconfig.json'];
+        return ['package-lock.json', 'yarn.lock', 'tsconfig.json'];
     }
 
     public function getInstallCommand(): string
diff --git a/tests/Detector/DetectorTest.php b/tests/Detector/DetectorTest.php
index bd387d41..e54be498 100644
--- a/tests/Detector/DetectorTest.php
+++ b/tests/Detector/DetectorTest.php
@@ -33,8 +33,8 @@ public function detect($files, $languages): ?string
         $detectorFactory = new Detector($files, $languages);
 
         $detectorFactory
-            ->addDetector(new Bun())
             ->addDetector(new JavaScript())
+            ->addDetector(new Bun())
             ->addDetector(new PHP())
             ->addDetector(new Python())
             ->addDetector(new Dart())
@@ -73,6 +73,7 @@ public function testLanguageDetection(): void
             ['anthonychu', 'azure-functions-deno-worker', 'deno'],
             ['mono', 'mono-basic', 'dotnet'],
             ['Meldiron', 'bun-function', 'bun'],
+            ['cytoscape', 'cytoscape.js', 'node']
         ];
 
         foreach ($languageMap as [$owner, $repositoryName, $expectedRuntime]) {