Enable detection and deployment of Quarto scripts

docs/configuration.md

@@ -16,7 +16,8 @@ Indicates the type of content being deployed. Valid values are:
 - `python-shiny`
 - `python-streamlit`
 - `quarto-shiny`
-- `quarto`
+- `quarto-static`
+- `quarto` (Deprecated use `quarto-static` instead)
 - `r-plumber`
 - `r-shiny`
 - `rmd-shiny`
@@ -76,7 +77,7 @@ Example:
 
 ```toml
 "$schema" = "https://cdn.posit.co/publisher/schemas/posit-publishing-schema-v3.json"
-type = "quarto"
+type = "quarto-static"
 entrypoint = "report.qmd"
 title = "Regional Quarterly Sales Report"
 description = "This is the quarterly sales report, broken down by region."

extensions/vscode/src/api/types/configurations.ts

@@ -55,6 +55,7 @@ export enum ContentType {
   PYTHON_STREAMLIT = "python-streamlit",
   QUARTO_SHINY = "quarto-shiny",
   QUARTO = "quarto",
+  QUARTO_STATIC = "quarto-static",
   R_PLUMBER = "r-plumber",
   R_SHINY = "r-shiny",
   RMD_SHINY = "rmd-shiny",
@@ -74,6 +75,7 @@ export const allValidContentTypes: ContentType[] = [
   ContentType.PYTHON_STREAMLIT,
   ContentType.QUARTO_SHINY,
   ContentType.QUARTO,
+  ContentType.QUARTO_STATIC,
   ContentType.R_PLUMBER,
   ContentType.R_SHINY,
   ContentType.RMD_SHINY,
@@ -92,6 +94,7 @@ export const contentTypeStrings = {
   [ContentType.PYTHON_STREAMLIT]: "run with Streamlit",
   [ContentType.QUARTO_SHINY]: "render with Quarto and run embedded Shiny app",
   [ContentType.QUARTO]: "render with Quarto",
+  [ContentType.QUARTO_STATIC]: "render with Quarto",
   [ContentType.R_PLUMBER]: "run with Plumber",
   [ContentType.R_SHINY]: "run with R Shiny",
   [ContentType.RMD_SHINY]:

internal/clients/connect/apptypes.go

@@ -246,21 +246,22 @@ func (t AppMode) Description() string {
 }
 
 var connectContentTypeMap = map[config.ContentType]AppMode{
-	config.ContentTypeHTML:            StaticMode,
-	config.ContentTypeJupyterNotebook: StaticJupyterMode,
-	config.ContentTypeJupyterVoila:    JupyterVoilaMode,
-	config.ContentTypePythonBokeh:     PythonBokehMode,
-	config.ContentTypePythonDash:      PythonDashMode,
-	config.ContentTypePythonFastAPI:   PythonFastAPIMode,
-	config.ContentTypePythonFlask:     PythonAPIMode,
-	config.ContentTypePythonShiny:     PythonShinyMode,
-	config.ContentTypePythonStreamlit: PythonStreamlitMode,
-	config.ContentTypeQuartoShiny:     ShinyQuartoMode,
-	config.ContentTypeQuarto:          StaticQuartoMode,
-	config.ContentTypeRPlumber:        PlumberAPIMode,
-	config.ContentTypeRShiny:          ShinyMode,
-	config.ContentTypeRMarkdownShiny:  ShinyRmdMode,
-	config.ContentTypeRMarkdown:       StaticRmdMode,
+	config.ContentTypeHTML:             StaticMode,
+	config.ContentTypeJupyterNotebook:  StaticJupyterMode,
+	config.ContentTypeJupyterVoila:     JupyterVoilaMode,
+	config.ContentTypePythonBokeh:      PythonBokehMode,
+	config.ContentTypePythonDash:       PythonDashMode,
+	config.ContentTypePythonFastAPI:    PythonFastAPIMode,
+	config.ContentTypePythonFlask:      PythonAPIMode,
+	config.ContentTypePythonShiny:      PythonShinyMode,
+	config.ContentTypePythonStreamlit:  PythonStreamlitMode,
+	config.ContentTypeQuartoShiny:      ShinyQuartoMode,
+	config.ContentTypeQuartoDeprecated: StaticQuartoMode,
+	config.ContentTypeQuarto:           StaticQuartoMode,
+	config.ContentTypeRPlumber:         PlumberAPIMode,
+	config.ContentTypeRShiny:           ShinyMode,
+	config.ContentTypeRMarkdownShiny:   ShinyRmdMode,
+	config.ContentTypeRMarkdown:        StaticRmdMode,
 }
 
 func AppModeFromType(t config.ContentType) AppMode {

internal/clients/connect/client_connect.go

@@ -539,11 +539,10 @@ func (c *ConnectClient) ValidateDeploymentTarget(contentID types.ContentID, cfg
 	}
 
 	// Verify content type has not changed
-	log.Info("Verifying content type is the same")
-	existingType := ContentTypeFromAppMode(content.AppMode)
-	configType := cfg.Type
-	if existingType != configType && existingType != config.ContentTypeUnknown {
-		msg := fmt.Sprintf("Content was previously deployed as '%s' but your configuration is set to '%s'.", existingType, configType)
+	log.Info("Verifying app mode is the same")
+	configAppType := AppModeFromType(cfg.Type)
+	if content.AppMode != configAppType && content.AppMode != UnknownMode {
+		msg := fmt.Sprintf("Content was previously deployed as '%s' but your configuration is set to '%s'.", ContentTypeFromAppMode(content.AppMode), cfg.Type)
 		return types.NewAgentError(events.AppModeNotModifiableCode, errors.New(msg), nil)
 	}
 

internal/config/types.go

@@ -5,22 +5,23 @@ package config
 type ContentType string
 
 const (
-	ContentTypeHTML            ContentType = "html"
-	ContentTypeJupyterNotebook ContentType = "jupyter-notebook"
-	ContentTypeJupyterVoila    ContentType = "jupyter-voila"
-	ContentTypePythonBokeh     ContentType = "python-bokeh"
-	ContentTypePythonDash      ContentType = "python-dash"
-	ContentTypePythonFastAPI   ContentType = "python-fastapi"
-	ContentTypePythonFlask     ContentType = "python-flask"
-	ContentTypePythonShiny     ContentType = "python-shiny"
-	ContentTypePythonStreamlit ContentType = "python-streamlit"
-	ContentTypeQuartoShiny     ContentType = "quarto-shiny"
-	ContentTypeQuarto          ContentType = "quarto"
-	ContentTypeRPlumber        ContentType = "r-plumber"
-	ContentTypeRShiny          ContentType = "r-shiny"
-	ContentTypeRMarkdownShiny  ContentType = "rmd-shiny"
-	ContentTypeRMarkdown       ContentType = "rmd"
-	ContentTypeUnknown         ContentType = "unknown"
+	ContentTypeHTML             ContentType = "html"
+	ContentTypeJupyterNotebook  ContentType = "jupyter-notebook"
+	ContentTypeJupyterVoila     ContentType = "jupyter-voila"
+	ContentTypePythonBokeh      ContentType = "python-bokeh"
+	ContentTypePythonDash       ContentType = "python-dash"
+	ContentTypePythonFastAPI    ContentType = "python-fastapi"
+	ContentTypePythonFlask      ContentType = "python-flask"
+	ContentTypePythonShiny      ContentType = "python-shiny"
+	ContentTypePythonStreamlit  ContentType = "python-streamlit"
+	ContentTypeQuartoShiny      ContentType = "quarto-shiny"
+	ContentTypeQuartoDeprecated ContentType = "quarto"
+	ContentTypeQuarto           ContentType = "quarto-static"
+	ContentTypeRPlumber         ContentType = "r-plumber"
+	ContentTypeRShiny           ContentType = "r-shiny"
+	ContentTypeRMarkdownShiny   ContentType = "rmd-shiny"
+	ContentTypeRMarkdown        ContentType = "rmd"
+	ContentTypeUnknown          ContentType = "unknown"
 )
 
 func AllValidContentTypeNames() []string {
@@ -35,6 +36,7 @@ func AllValidContentTypeNames() []string {
 		string(ContentTypePythonShiny),
 		string(ContentTypePythonStreamlit),
 		string(ContentTypeQuartoShiny),
+		string(ContentTypeQuartoDeprecated),
 		string(ContentTypeQuarto),
 		string(ContentTypeRPlumber),
 		string(ContentTypeRShiny),

internal/inspect/detectors/quarto.go

@@ -173,7 +173,7 @@ func (d *QuartoDetector) getTitle(inspectOutput *quartoInspectOutput, entrypoint
 	return ""
 }
 
-var quartoSuffixes = []string{".qmd", ".Rmd", ".ipynb"}
+var quartoSuffixes = []string{".qmd", ".Rmd", ".ipynb", ".R", ".py", ".jl"}
 
 func (d *QuartoDetector) findEntrypoints(base util.AbsolutePath) ([]util.AbsolutePath, error) {
 	allPaths := []util.AbsolutePath{}

internal/inspect/detectors/quarto_test.go

@@ -343,3 +343,45 @@ func (s *QuartoDetectorSuite) TestInferTypeRevalJSQuartoShiny() {
 		R: &config.R{},
 	}, configs[0])
 }
+
+func (s *QuartoDetectorSuite) TestInferTypeQuartoScriptPy() {
+	if runtime.GOOS == "windows" {
+		s.T().Skip("This test does not run on Windows")
+	}
+	configs := s.runInferType("quarto-script-py")
+	s.Len(configs, 1)
+	s.Equal(&config.Config{
+		Schema:     schema.ConfigSchemaURL,
+		Type:       config.ContentTypeQuarto,
+		Entrypoint: "script.py",
+		Title:      "Penguin data transformations",
+		Validate:   true,
+		Files:      []string{"/script.py", "/_quarto.yml"},
+		Python:     &config.Python{},
+		Quarto: &config.Quarto{
+			Version: "1.5.54",
+			Engines: []string{"jupyter"},
+		},
+	}, configs[0])
+}
+
+func (s *QuartoDetectorSuite) TestInferTypeQuartoScriptR() {
+	if runtime.GOOS == "windows" {
+		s.T().Skip("This test does not run on Windows")
+	}
+	configs := s.runInferType("quarto-script-r")
+	s.Len(configs, 1)
+	s.Equal(&config.Config{
+		Schema:     schema.ConfigSchemaURL,
+		Type:       config.ContentTypeQuarto,
+		Entrypoint: "script.R",
+		Title:      "Penguin data transformations",
+		Validate:   true,
+		Files:      []string{"/script.R", "/_quarto.yml"},
+		Quarto: &config.Quarto{
+			Version: "1.5.54",
+			Engines: []string{"knitr"},
+		},
+		R: &config.R{},
+	}, configs[0])
+}

internal/inspect/detectors/testdata/quarto-script-py/_quarto.yml

@@ -0,0 +1,2 @@
+project:
+  title: "Penguin data transformations"