fix: status commands and use of error function

adalessa · Dec 28, 2023 · 51f8a03 · 51f8a03
1 parent 174374a
commit 51f8a03
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 32 deletions.
diff --git a/lua/laravel/api/response.lua b/lua/laravel/api/response.lua
@@ -40,7 +40,7 @@ end
 
 ---@return string
 function ApiResponse:prettyContent()
-  return vim.inspect(self:content())
+  return table.concat(self:content(), "\r\n")
 end
 
 ---@return string|nil
@@ -54,7 +54,7 @@ end
 
 ---@return string[]|nil
 function ApiResponse:errors()
-  if self:failed() then
+  if self:successful() then
     return nil
   end
 
@@ -65,4 +65,13 @@ function ApiResponse:errors()
   return self:content()
 end
 
+function ApiResponse:prettyErrors()
+  local errors = self:errors()
+  if not errors then
+    return ""
+  end
+
+  return table.concat(errors, "\r\n")
+end
+
 return ApiResponse
diff --git a/lua/laravel/recipes/doctrine-dbal.lua b/lua/laravel/recipes/doctrine-dbal.lua
@@ -10,9 +10,10 @@ function M.run()
       ---@param response ApiResponse
       function(response)
         if response:failed() then
-          error({ "Cant install doctrine/dbal", response:errors() }, vim.log.levels.ERROR)
+          vim.notify("Cant install doctrine/dbal\n\r" .. response:prettyErrors(), vim.log.levels.ERROR)
+        else
+          vim.notify("Installation completed", vim.log.levels.INFO)
         end
-        vim.notify("Installation completed", vim.log.levels.INFO)
       end
     )
   else

diff --git a/lua/laravel/recipes/ide-helper.lua b/lua/laravel/recipes/ide-helper.lua
@@ -9,10 +9,10 @@ local function writeModels()
     ---@param response ApiResponse
     function(response)
       if response:failed() then
-        error(response:errors(), vim.log.levels.ERROR)
+        vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+      else
+        vim.notify("Ide Helper Models Complete", vim.log.levels.INFO)
       end
-
-      vim.notify("Ide Helper Models Complete", vim.log.levels.INFO)
     end
   )
 end
@@ -24,11 +24,11 @@ local function installIdeHelperAndWrite()
     ---@param response ApiResponse
     function(response)
       if response:failed() then
-        error({ "Cant install ide-helper", response:errors() }, vim.log.levels.ERROR)
+        vim.notify("Cant install ide-helper\n\r" .. response:prettyErrors(), vim.log.levels.ERROR)
+      else
+        require("laravel.commands").list = {}
+        writeModels()
       end
-
-      require("laravel.commands").list = {}
-      writeModels()
     end
   )
 end

diff --git a/lua/laravel/resources/create.lua b/lua/laravel/resources/create.lua
@@ -7,7 +7,9 @@ return function(command)
   local name = command[2]
 
   if not is_resource(resource) then
-    error(string.format("Command %s is not a resource creation suported", resource), vim.log.levels.ERROR)
+    vim.notify(string.format("Command %s is not a resource creation suported", resource), vim.log.levels.ERROR)
+
+    return
   end
 
   api.async(
@@ -16,9 +18,10 @@ return function(command)
     ---@param response ApiResponse
     function(response)
       if response:failed() then
-        error(response:errors(), vim.log.levels.ERROR)
+        vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+      else
+        open(resource, name)
       end
-      open(resource, name)
     end
   )
 end
diff --git a/lua/laravel/user_commands/docker_compose.lua b/lua/laravel/user_commands/docker_compose.lua
@@ -17,9 +17,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:errors(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify("Compose Up Completed", vim.log.levels.INFO)
           end
-          vim.notify("Compose Up Completed", vim.log.levels.INFO)
         end
       )
     end,
@@ -31,9 +32,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:errors(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify(response:prettyContent(), vim.log.levels.INFO)
           end
-          vim.notify(response:prettyContent(), vim.log.levels.INFO)
         end
       )
     end,
@@ -45,10 +47,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:errors(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify("Compose restart complete", vim.log.levels.INFO)
           end
-
-          vim.notify("Compose restart complete", vim.log.levels.INFO)
         end
       )
       vim.notify("Compose restart starting", vim.log.levels.INFO)
@@ -61,9 +63,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:errors(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify("Compose Down complete", vim.log.levels.INFO)
           end
-          vim.notify("Compose Down complete", vim.log.levels.INFO)
         end
       )
     end,

diff --git a/lua/laravel/user_commands/sail.lua b/lua/laravel/user_commands/sail.lua
@@ -18,10 +18,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:content(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify("Sail up completed", vim.log.levels.INFO)
           end
-
-          vim.notify("Sail up completed", vim.log.levels.INFO)
         end
       )
     end,
@@ -37,9 +37,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:errors(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify(response:prettyContent(), vim.log.levels.INFO)
           end
-          vim.notify(response:prettyContent(), vim.log.levels.INFO)
         end
       )
     end,
@@ -51,9 +52,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:errors(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify("Sail restart complete", vim.log.levels.INFO)
           end
-          vim.notify("Sail restart complete", vim.log.levels.INFO)
         end
       )
       vim.notify("Sail restart starting", vim.log.levels.INFO)
@@ -66,9 +68,10 @@ function M.setup()
         ---@param response ApiResponse
         function(response)
           if response:failed() then
-            error(response:errors(), vim.log.levels.ERROR)
+            vim.notify(response:prettyErrors(), vim.log.levels.ERROR)
+          else
+            vim.notify("Sail Down complete", vim.log.levels.INFO)
           end
-          vim.notify("Sail Down complete", vim.log.levels.INFO)
         end
       )
     end,