Merge pull request #25 from bhoov/main

Fixes #24, fixes #23, bumps Sverto to v1.0.1

Author: jimjam-slam

.gitignore

@@ -21,4 +21,7 @@
 /docs/.sverto/
 
 # sverto extension in docs site (we get it from project root on render)
-/docs/_extensions/sverto
+/docs/_extensions/sverto
+
+# rendered single doc example files
+/example_files/

_extensions/sverto/_extension.yml

@@ -1,6 +1,6 @@
 title: Sverto
 author: James Goldie
-version: 1.0.0
+version: 1.0.1
 quarto-version: ">=1.4.0"
 contributes:
   filters:

_extensions/sverto/sverto-prerender.lua

@@ -1,3 +1,26 @@
+-- fileExists: true if the file at `name` exists
+-- from https://pandoc.org/lua-filters.html#building-images-with-tikz
+local function fileExists(name)
+  local f = io.open(name, 'r')
+  if f ~= nil then
+    io.close(f)
+    return true
+  else
+    return false
+  end
+end
+
+-- getRollupConfig: return the path to the rollup config file
+local function getRollupConfig()
+  if fileExists("./_extensions/jimjam-slam/sverto/rollup.config.js") then
+    return "./_extensions/jimjam-slam/sverto/rollup.config.js"
+  elseif fileExists("./_extensions/sverto/rollup.config.js") then
+    return "./_extensions/sverto/rollup.config.js"
+  else
+    print("Error: no rollup config found. Is Sverto installed properly?")
+    os.exit(1)
+  end
+end
 
 -- return contents of named file
 function read_file(name)
@@ -30,18 +53,6 @@ end
 --   end
 -- end
 
--- file_exists: true if the file at `name` exists
--- from https://pandoc.org/lua-filters.html#building-images-with-tikz
-function file_exists(name)
-  local f = io.open(name, 'r')
-  if f ~= nil then
-    io.close(f)
-    return true
-  else
-    return false
-  end
-end
-
 -- offset a relative `svelte_path` to a .qmd `input_path`, or an absolute
 -- `svelte_path` to the project path. then normalize.
 function offset_svelte_path(svelte_path, input_path)
@@ -119,20 +130,10 @@ for _, svelte_path in pairs(svelte_paths) do
 end
 
 -- finally, call the svelte compiler via rollup
-rollup_config = ""
-if file_exists("./_extensions/jimjam-slam/sverto/rollup.config.js") then
-  rollup_config = "./_extensions/jimjam-slam/sverto/rollup.config.js"
-elseif file_exists("./_extensions/sverto/rollup.config.js") then
-  rollup_config = "./_extensions/sverto/rollup.config.js"
-else
-  print("Error: no rollup config found. Is Sverto installed properly?")
-  os.exit(1)
-end
-
 cmd =
   get_cmd_prefix() ..
   "npm run build " ..
-  rollup_config .. " -- " ..
+  getRollupConfig() .. " -- " ..
   '--configQuartoOutPath="' .. os.getenv("QUARTO_PROJECT_OUTPUT_DIR") .. '" ' ..
   '--configSvelteInPaths="' .. svelte_path_string .. '"'
 

_extensions/sverto/sverto.lua

@@ -1,3 +1,27 @@
+-- fileExists: true if the file at `name` exists
+-- from https://pandoc.org/lua-filters.html#building-images-with-tikz
+local function fileExists(name)
+  local f = io.open(name, 'r')
+  if f ~= nil then
+    io.close(f)
+    return true
+  else
+    return false
+  end
+end
+
+-- getRollupConfig: return the path to the rollup config file
+local function getRollupConfig()
+  if fileExists("./_extensions/jimjam-slam/sverto/rollup.config.js") then
+    return "./_extensions/jimjam-slam/sverto/rollup.config.js"
+  elseif fileExists("./_extensions/sverto/rollup.config.js") then
+    return "./_extensions/sverto/rollup.config.js"
+  else
+    print("Error: no rollup config found. Is Sverto installed properly?")
+    os.exit(1)
+  end
+end
+
 -- append_to_file: append a string of `content` to the file with the path `name`
 function append_to_file(name, content)
   local file = io.open(name, "a")
@@ -96,12 +120,14 @@ function inject_svelte_and_compile(m)
     if quarto.project.directory ~= nil then
       quarto.log.info("Project found; deferring Svelte compilation to post-render script")
     else
+
       local svelteCommand =
-        "npm run build rollup.config.js -- " ..
+        "npm run build " ..
+        getRollupConfig() .. " -- " ..
         '--configQuartoOutPath="./" ' ..
         '--configSvelteInPaths="' .. sveltePaths .. '"'
       local svelteResult = os.execute(svelteCommand)
-      quarto.log.warning("Svelte compiler finished with code " .. svelteResult)
+      quarto.log.warning("Svelte compiler finished with code " .. tostring(svelteResult))
 
     end
   end