convert typst module

modules/plugins/languages/typst.nix

@@ -6,52 +6,87 @@
 }: let
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) nullOr enum either attrsOf listOf package str;
+  inherit (lib.types) nullOr enum attrsOf listOf package str;
   inherit (lib.attrsets) attrNames;
   inherit (lib.meta) getExe;
-  inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
   inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.languages.typst;
 
-  defaultServer = "tinymist";
+  defaultServers = ["tinymist"];
   servers = {
-    typst-lsp = {
-      package = pkgs.typst-lsp;
-      lspConfig = ''
-        lspconfig.typst_lsp.setup {
-          capabilities = capabilities,
-          on_attach = function(client, bufnr)
+    typst_lsp = {
+      enable = true;
+      cmd = [(getExe pkgs.typst-lsp)];
+      filetypes = ["typst"];
+      root_markers = [".git"];
+      on_attach = mkLuaInline ''
+        function(client, bufnr)
           -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
           client.server_capabilities.semanticTokensProvider = nil
-          end,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/typst-lsp"}''
-        },
-        }
+        end
       '';
     };
 
     tinymist = {
-      package = pkgs.tinymist;
-      lspConfig = ''
-        lspconfig.tinymist.setup {
-          capabilities = capabilities,
-          single_file_support = true,
-          on_attach = function(client, bufnr)
-            -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
-            client.server_capabilities.semanticTokensProvider = nil
-          end,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/tinymist"}''
-        },
-        }
+      enable = true;
+      cmd = [(getExe pkgs.tinymist)];
+      filetypes = ["typst"];
+      root_markers = [".git"];
+      on_attach = mkLuaInline ''
+        function(client, bufnr)
+          local function create_tinymist_command(command_name, client, bufnr)
+            local export_type = command_name:match 'tinymist%.export(%w+)'
+            local info_type = command_name:match 'tinymist%.(%w+)'
+            if info_type and info_type:match '^get' then
+              info_type = info_type:gsub('^get', 'Get')
+            end
+            local cmd_display = export_type or info_type
+            local function run_tinymist_command()
+              local arguments = { vim.api.nvim_buf_get_name(bufnr) }
+              local title_str = export_type and ('Export ' .. cmd_display) or cmd_display
+              local function handler(err, res)
+                if err then
+                  return vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
+                end
+                vim.notify(export_type and res or vim.inspect(res), vim.log.levels.INFO)
+              end
+              if vim.fn.has 'nvim-0.11' == 1 then
+                return client:exec_cmd({
+                  title = title_str,
+                  command = command_name,
+                  arguments = arguments,
+                }, { bufnr = bufnr }, handler)
+              else
+                return vim.notify('Tinymist commands require Neovim 0.11+', vim.log.levels.WARN)
+              end
+            end
+            local cmd_name = export_type and ('LspTinymistExport' .. cmd_display) or ('LspTinymist' .. cmd_display)
+            local cmd_desc = export_type and ('Export to ' .. cmd_display) or ('Get ' .. cmd_display)
+            return run_tinymist_command, cmd_name, cmd_desc
+          end
+
+          for _, command in ipairs {
+            'tinymist.exportSvg',
+            'tinymist.exportPng',
+            'tinymist.exportPdf',
+            'tinymist.exportMarkdown',
+            'tinymist.exportText',
+            'tinymist.exportQuery',
+            'tinymist.exportAnsiHighlight',
+            'tinymist.getServerInfo',
+            'tinymist.getDocumentTrace',
+            'tinymist.getWorkspaceLabels',
+            'tinymist.getDocumentMetrics',
+          } do
+            local cmd_func, cmd_name, cmd_desc = create_tinymist_command(command, client, bufnr)
+            vim.api.nvim_buf_create_user_command(bufnr, cmd_name, cmd_func, { nargs = 0, desc = cmd_desc })
+          end
+        end
       '';
     };
   };
@@ -78,17 +113,10 @@ in {
     lsp = {
       enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
+      servers = mkOption {
         description = "Typst LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "typst-lsp package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
 
@@ -131,7 +159,7 @@ in {
           dependencies_bin = mkOption {
             type = attrsOf str;
             default = {
-              "tinymist" = getExe servers.tinymist.package;
+              "tinymist" = getExe pkgs.tinymist;
               "websocat" = getExe pkgs.websocat;
             };
 
@@ -169,8 +197,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.typst-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
 
     # Extensions