Merge pull request #6 from jonathanmorris180/jm/component-generator

Update component-generator

Author: Ztrizzo

lua/salesforce/component_generator.lua

@@ -3,14 +3,19 @@ local Util = require("salesforce.util")
 
 local M = {}
 
-local executable = Util.get_sf_executable()
+local category = "Component generation"
+
 local prompt_for_name_and_dir = function(name_prompt, directory_prompt)
     local lwc_name = vim.fn.input(name_prompt)
     local directory = vim.fn.input(directory_prompt, vim.fn.expand("%:p:h"), "dir")
     if vim.fn.isdirectory(directory) == 1 then
-        print("Selected directory: " .. directory)
+        Debug:log("component_generator.lua", string.format("Selected directory: %s", directory))
     else
-        error("invalid directory selected")
+        Util.clear_and_notify(
+            string.format("Directory does not exist: %s", directory),
+            vim.log.levels.ERROR
+        )
+        directory = nil
     end
     return lwc_name, directory
 end
@@ -21,71 +26,119 @@ local component_creation_callback = function(job)
         sfdx_output = table.concat(sfdx_output)
         Debug:log("component_generator.lua", "Result from command:")
         Debug:log("component_generator.lua", sfdx_output)
+        local json_ok, sfdx_response = pcall(vim.json.decode, sfdx_output)
+        if not json_ok or not sfdx_response then
+            vim.notify(
+                "Failed to parse the 'lightning generate component' SFDX command output",
+                vim.log.levels.ERROR
+            )
+            return
+        end
 
-        -- Errors still trigger this callback, but have an emty output.
-        if sfdx_output ~= nil and sfdx_output ~= "" then
-            vim.notify(sfdx_output, vim.log.levels.INFO)
+        if sfdx_response.status == 0 then
+            Util.clear_and_notify(
+                string.format(
+                    "Successfully created component in directory: %s",
+                    sfdx_response.result.outputDir
+                )
+            )
+        else
+            Util.clear_and_notify(
+                string.format("Failed to create component: %s", vim.inspect(sfdx_response)),
+                vim.log.levels.ERROR
+            )
         end
     end)
 end
 
 M.create_lightning_component = function()
-    local name, dir = prompt_for_name_and_dir("Component Name: ", "Please select a directory")
+    local name, dir =
+        prompt_for_name_and_dir("Lightning Component name: ", "Please select a directory: ")
+
+    if not dir then
+        return
+    end
+
+    Util.clear_prompt()
 
     vim.ui.select(
         { "Aura", "Lightning Web Component" },
         {
             prompt = "Lightning Component Type: ",
         },
         vim.schedule_wrap(function(choice)
+            if not choice then
+                return
+            end
             local type
             if choice == "Aura" then
                 type = "aura"
             else
                 type = "lwc"
             end
-            local command = string.format(
-                "%s lightning generate component --name %s --type %s --output-dir %s",
-                executable,
+            local args = {
+                "lightning",
+                "generate",
+                "component",
+                "--name",
                 name,
+                "--type",
                 type,
-                dir
-            )
+                "--output-dir",
+                dir,
+                "--json",
+            }
+            Util.clear_and_notify("Creating component...")
             Util.send_cli_command(
-                command,
+                args,
                 component_creation_callback,
-                "generate component",
+                category,
                 "component_generator.lua"
             )
         end)
     )
 end
 
 M.create_apex = function()
-    local name, dir = prompt_for_name_and_dir("Apex Name: ", "Please select a directory: ")
+    local name, dir =
+        prompt_for_name_and_dir("Trigger or Class name: ", "Please select a directory: ")
+
+    if not dir then
+        return
+    end
+
+    Util.clear_prompt()
+
     vim.ui.select(
         { "Class", "Trigger" },
         {
             prompt = "Apex file type: ",
         },
         vim.schedule_wrap(function(choice)
+            if not choice then
+                return
+            end
             local type
             if choice == "Class" then
                 type = "class"
             else
                 type = "trigger"
             end
-            local command = string.format(
-                "%s apex generate %s --name %s --output-dir %s",
-                executable,
+            local args = {
+                "apex",
+                "generate",
                 type,
+                "--name",
                 name,
-                dir
-            )
+                "--output-dir",
+                dir,
+                "--json",
+            }
+            Util.clear_and_notify("Creating component...")
             Util.send_cli_command(
-                command,
+                args,
                 component_creation_callback,
-                "generate component",
+                category,
                 "component_generator.lua"
             )
         end)

lua/salesforce/util.lua

@@ -39,6 +39,10 @@ function M.notify_default_org_not_set()
     vim.notify(message, vim.log.levels.ERROR)
 end
 
+function M.clear_prompt()
+    vim.fn.feedkeys(":", "nx")
+end
+
 function M.clear_and_notify(msg, log_level)
     vim.fn.feedkeys(":", "nx")
     vim.notify(msg, log_level)
@@ -123,26 +127,21 @@ function M.salesforce_cli_available()
     return false
 end
 
-M.send_cli_command = function(command, on_exit_callback, category, caller_name)
-    vim.schedule(function()
-        Debug:log(caller_name, "Executing command %s", command)
-    end)
-    local args = M.split(command, " ")
-    table.remove(args, 1)
+M.send_cli_command = function(args, on_exit_callback, category, caller_name)
+    local command = table.concat(args, " ")
+    Debug:log(caller_name, "Executing command %s", command)
     local new_job = Job:new({
         command = M.get_sf_executable(),
         env = M.get_env(),
         args = args,
         on_exit = on_exit_callback,
         on_stderr = function(_, data)
             vim.schedule(function()
-                Debug:log(caller_name, "command stderr is: %s", data)
-                Debug:log(string.format("%s", data))
-                vim.notify(data, vim.log.levels.ERROR)
+                Debug:log(caller_name, "Command stderr is: %s", data)
             end)
         end,
     })
-    if not M[category] or M[category].current_job or not M[category].current_job:is_running() then
+    if not M[category] or not M[category].current_job:is_running() then
         M[category] = {}
         M[category].current_job = new_job
         M[category].current_bufnr = vim.api.nvim_get_current_buf()