mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
Normalizes non-standard code-fence language tags across `docs/**` so a strict highlighter (Shiki, used by Fumadocs) won't fail the build on an unrecognized language, and unifies redundant synonym tags onto one canonical form per language. The current renderer (Speed-Highlight) detects the language from the code content, not the fence label, so this drift wasn't visible until now. ## Changes - `hcl` -> `tf` (199 fences, including indented ones nested in numbered/bulleted lists). Shiki ships `hcl` and `terraform` as two distinct grammars (not aliases); every `hcl`-tagged fence in `docs/**` is actually Terraform resource/data/provider syntax, so the more specific `terraform` grammar is correct for all of them. `tf` is Shiki's own alias for that grammar, and it's also what GitHub's own markdown renderer resolves to the same HCL/Terraform highlighting. - `pwsh`/`powershell` -> `ps1`. Both `ps` and `ps1` are registered PowerShell aliases in Shiki, but on GitHub's renderer only `.ps1` is a registered file extension (`.ps` isn't), so `ps1` renders identically to `powershell` there today while bare `ps` would silently lose highlighting. - `env` -> `dotenv` (a dedicated Shiki grammar for `KEY=VALUE` files) - `text`/`output`/`none`/`url` -> `txt`. Same built-in plain-text fallback either way, just shorter. - `Dockerfile` -> `dockerfile` (lowercase) - `bash`/`shell` -> `sh` (732 fences). Shiki and GitHub both alias all three to a single shell grammar; this was already the style guide's stated preference, just not enforced across the existing corpus until now. - `markdown` -> `md` (4 fences). Alias of the same grammar in both Shiki and GitHub. - `jsonc` -> `json` (1 fence). The block has no comments or trailing commas, so it doesn't need the comments-capable grammar. - `ts` -> `tsx` (2 fences, `docs/about/contributing/frontend.md`). Verified the actual content tokenizes identically under both grammars, and a sibling block in the same file already needs `tsx` for real JSX, so unifying to one tag is safe for this file. Documented a caveat: `tsx` mis-tokenizes the legacy angle-bracket type-assertion syntax (`<Type>value`), which is invalid in real `.tsx` files anyway, so use `value as Type` instead. - `yml` -> `yaml` (1 fence) - Updated `docs/.style/style-guide/formatting.md` to document all canonical tags `promql` (2 fences) and `caddyfile` (2 fences) are left as-is. Shiki doesn't bundle a grammar for either, so they need a custom grammar registration when the site adopts Shiki, rather than degrading to `txt`. Tracked as follow-up work under DOCS-118 and [DOCS-544](https://linear.app/codercom/issue/DOCS-544/vendor-a-local-promql-grammar-for-shiki-syntax-highlighting) (promql). Does not touch `offlinedocs/`. Linear: [DOCS-476](https://linear.app/codercom/issue/DOCS-476/normalize-docs-code-fence-languages-de-risk-shikifumadocs) <details> <summary>How the fence tags were verified</summary> Each tag was tested against a real `shiki@latest` highlighter instance (`codeToHtml`/`codeToTokens`) and cross-checked against GitHub's `@wooorm/starry-night` grammar sources (the renderer that actually displays these `.md` files today, in repo browsing and PR diffs), since that's what determines whether brevity is safe before Shiki adoption: ```text FAIL env -- Language `env` is not included in this bundle. FAIL Dockerfile -- Language `Dockerfile` is not included in this bundle. FAIL promql -- Language `promql` is not included in this bundle. FAIL caddyfile -- Language `caddyfile` is not included in this bundle. FAIL pwsh -- Language `pwsh` is not included in this bundle. FAIL output -- Language `output` is not included in this bundle. ``` `hcl` doesn't error in Shiki, since it's a real grammar, but that's exactly the trap: it was silently rendering every fence with the generic HCL grammar instead of the Terraform-specific one. Every `hcl`-tagged fence in `docs/**` was manually checked against `origin/main` and is genuinely Terraform content. For `ts`/`tsx`, tokenizing the actual doc content confirmed identical output under both grammars; a synthetic test with the legacy angle-bracket cast syntax confirmed `tsx` degrades on that specific construct, which the style guide now calls out. The first normalization pass only matched fence tags at column 0 (`^```tag$`), missing tags indented inside numbered/bulleted lists. A follow-up pass caught the remaining occurrences at any indentation level. </details> --- *This PR description and the underlying changes were prepared with Coder Agents assistance.*
266 lines
6.6 KiB
Go
266 lines
6.6 KiB
Go
package main
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"encoding/json"
|
|
"flag"
|
|
"log"
|
|
"os"
|
|
"path"
|
|
"regexp"
|
|
"slices"
|
|
"sort"
|
|
"strings"
|
|
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/coder/coder/v2/scripts/atomicwrite"
|
|
)
|
|
|
|
const (
|
|
apiSubdir = "reference/api"
|
|
apiIndexFile = "index.md"
|
|
apiIndexContent = `# API
|
|
|
|
Get started with the Coder API:
|
|
|
|
## Quickstart
|
|
|
|
Generate a token on your Coder deployment by visiting:
|
|
|
|
` + "````txt" + `
|
|
https://coder.example.com/settings/tokens
|
|
` + "````" + `
|
|
|
|
List your workspaces
|
|
|
|
` + "````sh" + `
|
|
# CLI
|
|
curl https://coder.example.com/api/v2/workspaces?q=owner:me \
|
|
-H "Coder-Session-Token: <your-token>"
|
|
` + "````" + `
|
|
|
|
## Use cases
|
|
|
|
See some common [use cases](../../reference/index.md#use-cases) for the REST API.
|
|
|
|
## Sections
|
|
|
|
<children>
|
|
This page is rendered on https://coder.com/docs/reference/api. Refer to the other documents in the ` + "`api/`" + ` directory.
|
|
</children>
|
|
`
|
|
)
|
|
|
|
var (
|
|
docsDirectory string
|
|
inMdFileSingle string
|
|
|
|
sectionSeparator = []byte("<!-- APIDOCGEN: BEGIN SECTION -->\n")
|
|
nonAlphanumericRegex = regexp.MustCompile(`[^a-z0-9 ]+`)
|
|
)
|
|
|
|
func main() {
|
|
log.Println("Postprocess API docs")
|
|
|
|
flag.StringVar(&docsDirectory, "docs-directory", "../../docs", "Path to Coder docs directory")
|
|
flag.StringVar(&inMdFileSingle, "in-md-file-single", "", "Path to single Markdown file, output from widdershins.js")
|
|
flag.Parse()
|
|
|
|
if inMdFileSingle == "" {
|
|
flag.Usage()
|
|
log.Fatal("missing value for in-md-file-single")
|
|
}
|
|
|
|
sections, err := loadMarkdownSections()
|
|
if err != nil {
|
|
log.Fatal("can't load markdown sections: ", err)
|
|
}
|
|
|
|
err = prepareDocsDirectory()
|
|
if err != nil {
|
|
log.Fatal("can't prepare docs directory: ", err)
|
|
}
|
|
|
|
err = writeDocs(sections)
|
|
if err != nil {
|
|
log.Fatal("can't write docs directory: ", err)
|
|
}
|
|
|
|
log.Println("Done")
|
|
}
|
|
|
|
func loadMarkdownSections() ([][]byte, error) {
|
|
log.Printf("Read the md-file-single: %s", inMdFileSingle)
|
|
mdFile, err := os.ReadFile(inMdFileSingle)
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("can't read the md-file-single: %w", err)
|
|
}
|
|
log.Printf("Read %dB", len(mdFile))
|
|
|
|
sections := bytes.Split(mdFile, sectionSeparator)
|
|
if len(sections) < 2 {
|
|
return nil, xerrors.Errorf("At least 1 section is expected: %w", err)
|
|
}
|
|
sections = sections[1:] // Skip the first element which is the empty byte array
|
|
log.Printf("Loaded %d sections", len(sections))
|
|
return sections, nil
|
|
}
|
|
|
|
func prepareDocsDirectory() error {
|
|
log.Println("Prepare docs directory")
|
|
|
|
apiPath := path.Join(docsDirectory, apiSubdir)
|
|
|
|
err := os.RemoveAll(apiPath)
|
|
if err != nil {
|
|
return xerrors.Errorf(`os.RemoveAll failed for "%s": %w`, apiPath, err)
|
|
}
|
|
|
|
err = os.MkdirAll(apiPath, 0o755)
|
|
if err != nil {
|
|
return xerrors.Errorf(`os.MkdirAll failed for "%s": %w`, apiPath, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func writeDocs(sections [][]byte) error {
|
|
log.Println("Write docs to destination")
|
|
|
|
apiDir := path.Join(docsDirectory, apiSubdir)
|
|
err := atomicwrite.File(path.Join(apiDir, apiIndexFile), []byte(apiIndexContent))
|
|
if err != nil {
|
|
return xerrors.Errorf(`can't write the index file: %w`, err)
|
|
}
|
|
|
|
type mdFile struct {
|
|
title string
|
|
path string
|
|
}
|
|
var mdFiles []mdFile
|
|
|
|
// Write .md files for grouped API method (Templates, Workspaces, etc.)
|
|
for _, section := range sections {
|
|
sectionName, err := extractSectionName(section)
|
|
if err != nil {
|
|
return xerrors.Errorf("can't extract section name: %w", err)
|
|
}
|
|
log.Printf("Write section: %s", sectionName)
|
|
|
|
mdFilename := toMdFilename(sectionName)
|
|
docPath := path.Join(apiDir, mdFilename)
|
|
err = atomicwrite.File(docPath, section)
|
|
if err != nil {
|
|
return xerrors.Errorf(`can't write doc file "%s": %w`, docPath, err)
|
|
}
|
|
mdFiles = append(mdFiles, mdFile{
|
|
title: sectionName,
|
|
path: "./" + path.Join(apiSubdir, mdFilename),
|
|
})
|
|
}
|
|
|
|
// Sort API pages
|
|
// The "General" section is expected to be always first.
|
|
sort.Slice(mdFiles, func(i, j int) bool {
|
|
if mdFiles[i].title == "General" {
|
|
return true // "General" < ... - sorted
|
|
}
|
|
if mdFiles[j].title == "General" {
|
|
return false // ... < "General" - not sorted
|
|
}
|
|
return slices.IsSorted([]string{mdFiles[i].title, mdFiles[j].title})
|
|
})
|
|
|
|
// Update manifest.json
|
|
type route struct {
|
|
Title string `json:"title,omitempty"`
|
|
Description string `json:"description,omitempty"`
|
|
Path string `json:"path,omitempty"`
|
|
IconPath string `json:"icon_path,omitempty"`
|
|
State []string `json:"state,omitempty"`
|
|
Children []route `json:"children,omitempty"`
|
|
}
|
|
|
|
type manifest struct {
|
|
Versions []string `json:"versions,omitempty"`
|
|
Routes []route `json:"routes,omitempty"`
|
|
}
|
|
|
|
manifestPath := path.Join(docsDirectory, "manifest.json")
|
|
manifestFile, err := os.ReadFile(manifestPath)
|
|
if err != nil {
|
|
return xerrors.Errorf("can't read manifest file: %w", err)
|
|
}
|
|
log.Printf("Read manifest file: %dB", len(manifestFile))
|
|
|
|
var m manifest
|
|
err = json.Unmarshal(manifestFile, &m)
|
|
if err != nil {
|
|
return xerrors.Errorf("json.Unmarshal failed: %w", err)
|
|
}
|
|
|
|
for i, r := range m.Routes {
|
|
if r.Title != "Reference" {
|
|
continue
|
|
}
|
|
for j, child := range r.Children {
|
|
if child.Title != "REST API" {
|
|
continue
|
|
}
|
|
|
|
// Preserve existing state and description on children, keyed by
|
|
// title, so that callouts like `state: ["experimental"]` survive
|
|
// regeneration. Generated routes always overwrite Title and Path.
|
|
existingByTitle := make(map[string]route, len(child.Children))
|
|
for _, existing := range child.Children {
|
|
existingByTitle[existing.Title] = existing
|
|
}
|
|
|
|
var children []route
|
|
for _, mdf := range mdFiles {
|
|
docRoute := route{
|
|
Title: mdf.title,
|
|
Path: mdf.path,
|
|
}
|
|
if existing, ok := existingByTitle[mdf.title]; ok {
|
|
docRoute.State = existing.State
|
|
docRoute.Description = existing.Description
|
|
docRoute.IconPath = existing.IconPath
|
|
}
|
|
children = append(children, docRoute)
|
|
}
|
|
|
|
m.Routes[i].Children[j].Children = children
|
|
break
|
|
}
|
|
break
|
|
}
|
|
|
|
manifestFile, err = json.MarshalIndent(m, "", " ")
|
|
if err != nil {
|
|
return xerrors.Errorf("json.Marshal failed: %w", err)
|
|
}
|
|
|
|
err = atomicwrite.File(manifestPath, manifestFile)
|
|
if err != nil {
|
|
return xerrors.Errorf("can't write manifest file: %w", err)
|
|
}
|
|
log.Printf("Write manifest file: %dB", len(manifestFile))
|
|
return nil
|
|
}
|
|
|
|
func extractSectionName(section []byte) (string, error) {
|
|
scanner := bufio.NewScanner(bytes.NewReader(section))
|
|
if !scanner.Scan() {
|
|
return "", xerrors.Errorf("section header was expected")
|
|
}
|
|
|
|
header := scanner.Text()[2:] // Skip #<space>
|
|
return strings.TrimSpace(header), nil
|
|
}
|
|
|
|
func toMdFilename(sectionName string) string {
|
|
return nonAlphanumericRegex.ReplaceAllLiteralString(strings.ReplaceAll(strings.ToLower(sectionName), " ", ""), "-") + ".md"
|
|
}
|