Working on typst "kernel" for exporter

Author: thomasjm

codedown.nix

@@ -57,6 +57,7 @@ rec {
   };
 
   kernels = everythingEnv.config.builtKernels;
+  exporters = everythingEnv.config.builtExporters;
 
   makeEnvironment = callPackage ./nix/makeEnvironment.nix {
     inherit pkgsStable pkgsMaster;

modules/exporters/typst/default.nix

@@ -1,4 +1,5 @@
 { callPackage
+, lib
 , pandoc
 , symlinkJoin
 , typst
@@ -10,6 +11,8 @@
 with { inherit (settings.interface) attrs extensions; };
 
 let
+  kernelName = "typst";
+
   common = callPackage ../../kernels/common.nix {};
 
   script = common.writeShellScriptBinWithAttrs {} "typst-export" ''
@@ -18,6 +21,12 @@ let
     echo_and_run ${typst}/bin/typst compile "$1" "$2"
   '';
 
+  languageServers = lib.optionals settings.lsp.tinymist.enable
+    [(callPackage ./language_server_tinymist { inherit kernelName; })];
+
+  packageOptions = {};
+  packageSearch = common.searcher packageOptions;
+
   icon = ./typst.png;
   iconMonochrome = ./typst.svg;
 
@@ -28,7 +37,9 @@ symlinkJoin {
   paths = [
     (callPackage ./kernel.nix { inherit attrs extensions; })
     script
-  ];
+  ]
+  ++ languageServers
+  ;
 
   passthru = {
     meta = {
@@ -57,6 +68,15 @@ symlinkJoin {
       typst = typst.version;
     };
 
+    inherit packageOptions packageSearch;
+
     inherit settingsSchema settings;
+
+    modes = {
+      inherit attrs extensions;
+      code_mirror_mode = "typst";
+    };
+
+    languageServerNames = map (x: x.languageServerName) languageServers;
   };
 }

modules/exporters/typst/kernel.nix

@@ -7,7 +7,7 @@
 }:
 
 let
-  common = callPackage ../common.nix {};
+  common = callPackage ../../kernels/common.nix {};
 
 in
 

modules/exporters/typst/language_server_tinymist/default.nix

@@ -7,7 +7,7 @@
 }:
 
 let
-  common = callPackage ../../common.nix {};
+  common = callPackage ../../../kernels/common.nix {};
 
   languageServerName = "tinymist";
 
@@ -26,7 +26,6 @@ common.writeTextDirWithMetaAndPassthru tinymist.meta passthru "lib/codedown/lang
   type = "stream";
   primary = true;
   args = [
-    "${tinymist}/bin/typst"
-    "start"
+    "${tinymist}/bin/tinymist"
   ];
 }])

modules/exporters/typst/module.nix

@@ -1,4 +1,4 @@
-{ config, options, lib, nixosOptionsToSettingsSchema, ... }:
+{ config, options, lib, nixosOptionsToSettingsSchema, boilerplate, ... }:
 
 with lib;
 

nix/makeEnvironment.nix

@@ -82,6 +82,7 @@ symlinkJoin {
   paths =
     attrValues evaluated.config.builtKernels
     ++ attrValues evaluated.config.builtLanguageServers
+    ++ attrValues evaluated.config.builtExporters
     ++ lib.optionals (builtins.length exporters > 0) [(writeTextDir "lib/codedown/exporters.yaml" (lib.generators.toYAML {} exporters))]
     ++ attrValues evaluated.config.packages
     ++ lib.mapAttrsToList linkBinaries evaluated.config.extraBinDirs

tests/app/Spec/Tests/Typst.hs

@@ -0,0 +1,78 @@
+{-# LANGUAGE RankNTypes #-}
+{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
+{-# OPTIONS_GHC -fno-warn-incomplete-uni-patterns #-}
+
+module Spec.Tests.Typst (tests) where
+
+import Control.Lens hiding (List)
+import Data.String.Interpolate
+import Data.Text as T
+import Language.LSP.Protocol.Lens hiding (diagnostics, hover, text)
+import Language.LSP.Protocol.Types
+import Language.LSP.Test hiding (message)
+import Test.Sandwich as Sandwich
+import TestLib.JupyterRunnerContext
+import TestLib.LSP
+import TestLib.NixEnvironmentContext
+import TestLib.NixTypes
+import TestLib.TestBuilding
+import TestLib.TestSearchers
+import TestLib.Types
+
+
+kernelName :: Text
+kernelName = "typst"
+
+tests :: LanguageSpec
+tests = describe [i|Typst|] $ introduceNixEnvironment [] config [i|Typst|] $ introduceJupyterRunner $ do
+  it "has expected fields" $ do
+    testEval [i|exporters.typst.settingsSchema|]
+    testEval [i|exporters.typst.modes|]
+    testEval [i|exporters.typst.settings|]
+    testEval [i|exporters.typst.args|]
+    testEval [i|exporters.typst.meta|]
+
+    -- Used to view all versions in codedown-languages
+    testEval [i|exporters.typst.versions|]
+
+
+  describe "LSP" $ do
+    testDiagnosticsLabelDesired "simple" lsName "test.typ" (Just "typst")
+      [__i|TODO
+           |]
+      ((== []) . getDiagnosticRanges')
+
+
+documentHighlightCode :: Text
+documentHighlightCode = [__i|foo = "hello"
+                             println(foo)|]
+
+documentHighlightResults :: [DocumentHighlight]
+documentHighlightResults = [
+  DocumentHighlight (Range (Position 0 0) (Position 0 3)) (Just DocumentHighlightKind_Write)
+  , DocumentHighlight (Range (Position 1 8) (Position 1 11)) (Just DocumentHighlightKind_Read)
+  ]
+
+lsName :: Text
+lsName = "tinymist"
+
+-- kernelSpec :: NixKernelSpec
+-- kernelSpec = NixKernelSpec {
+--   nixKernelName = "typst"
+--   , nixKernelChannel = "codedown"
+--   , nixKernelDisplayName = Just [i|Typst|]
+--   , nixKernelPackages = []
+--   , nixKernelMeta = Nothing
+--   , nixKernelIcon = Nothing
+--   , nixKernelExtraConfig = Just [
+--       "lsp.tinymist.enable = true"
+--       ]
+--   }
+
+config = [
+  "exporters.typst.enable = true;"
+  , "exporters.typst.lsp.tinymist.enable = true;"
+  ]
+
+main :: IO ()
+main = jupyterMain tests

tests/src/TestLib/LSP.hs

@@ -256,6 +256,7 @@ withLspSession' handleFn name filename codeToTest extraFiles session = do
            & set (workspace . _Just . configuration) Nothing
            & set (workspace . _Just . didChangeWatchedFiles . _Just . dynamicRegistration) (Just False)
            & set (workspace . _Just . didChangeConfiguration . _Just . dynamicRegistration) (Just False)
+           & set (textDocument . _Just . semanticTokens . _Just . dynamicRegistration) (Just False)
 
   handleFn $ runSessionWithConfigCustomProcess modifyCp sessionConfig cp caps homeDir (session homeDir)
 

tests/tests.cabal

@@ -121,6 +121,7 @@ executable tests
       Spec.Tests.SettingsSchemas
       Spec.Tests.Shells.Zsh
       Spec.Tests.Spellchecker
+      Spec.Tests.Typst
       Paths_tests
   hs-source-dirs:
       app