forked from tldraw/tldraw
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix markdown list rendering on docs site (tldraw#3813)
We write our API docs in markdown embedded in tsdocs comments. vscode's hover preview of these docs renders them as expected, but api-extract treats whitespace as insignificant and strips out most newlines, which breaks markdown lists. See microsoft/tsdoc#178 for details. This PR patches tsdoc's emitter so that it preserves newlines. That way, we can write markdown lists and have them picked up as expected by the docs site markdown parser. I don't expect this to introduce other issues with previously ignored line breaks and markdown is only sensitive to linebreaks in certain scenarios (like lists) anyway. (Extracted from bindings docs - tldraw#3812) Before: <img width="740" alt="Screenshot 2024-05-22 at 15 00 43" src="https://github.com/tldraw/tldraw/assets/1489520/846f88b1-9480-48a6-9795-6a9f27ca242a"> After: <img width="708" alt="Screenshot 2024-05-22 at 14 51 28" src="https://github.com/tldraw/tldraw/assets/1489520/80c54b8e-4f74-45e7-9cba-0287175e9f97"> ### Change Type - [x] `docs` — Changes to the documentation, examples, or templates. - [x] `bugfix` — Bug fix
- Loading branch information
Showing
4 changed files
with
103 additions
and
4 deletions.
There are no files selected for viewing
91 changes: 91 additions & 0 deletions
91
.yarn/patches/@microsoft-tsdoc-npm-0.14.2-9988282153.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| diff --git a/lib-commonjs/emitters/TSDocEmitter.js b/lib-commonjs/emitters/TSDocEmitter.js | ||
| index 36c607ac192810524ae28ce818d64652efedca98..41650ab83b6825d33b75fb86ec9b8eb0f0b5dfc7 100644 | ||
| --- a/lib-commonjs/emitters/TSDocEmitter.js | ||
| +++ b/lib-commonjs/emitters/TSDocEmitter.js | ||
| @@ -278,6 +278,9 @@ var TSDocEmitter = /** @class */ (function () { | ||
| var docPlainText = docNode; | ||
| this._writeContent(docPlainText.text); | ||
| break; | ||
| + case DocNode_1.DocNodeKind.SoftBreak: | ||
| + this._ensureAtStartOfLine(); | ||
| + break; | ||
| } | ||
| }; | ||
| TSDocEmitter.prototype._renderInlineTag = function (docInlineTagBase, writeInlineTagContent) { | ||
| diff --git a/lib-commonjs/transforms/TrimSpacesTransform.js b/lib-commonjs/transforms/TrimSpacesTransform.js | ||
| index 8d8a92b9a2c97347c29094df7d0e2b23cdcdffaf..6c5946e3f9adb61e46ce1d7d39ab07ee81db923e 100644 | ||
| --- a/lib-commonjs/transforms/TrimSpacesTransform.js | ||
| +++ b/lib-commonjs/transforms/TrimSpacesTransform.js | ||
| @@ -18,6 +18,25 @@ var TrimSpacesTransform = /** @class */ (function () { | ||
| // We always trim leading whitespace for a paragraph. This flag gets set to true | ||
| // as soon as nonempty content is encountered. | ||
| var finishedSkippingLeadingSpaces = false; | ||
| + | ||
| + function pushAccumulatedText() { | ||
| + const lines = accumulatedTextChunks.join('').split('\n') | ||
| + for (let i = 0; i < lines.length; i++) { | ||
| + const line = lines[i] | ||
| + transformedNodes.push(new nodes_1.DocPlainText({ | ||
| + configuration: docParagraph.configuration, | ||
| + text: line | ||
| + })); | ||
| + if (i < lines.length - 1) { | ||
| + transformedNodes.push(new nodes_1.DocSoftBreak({ | ||
| + configuration: docParagraph.configuration | ||
| + })); | ||
| + } | ||
| + } | ||
| + accumulatedTextChunks.length = 0; | ||
| + accumulatedNodes.length = 0; | ||
| + } | ||
| + | ||
| for (var _i = 0, _a = docParagraph.nodes; _i < _a.length; _i++) { | ||
| var node = _a[_i]; | ||
| switch (node.kind) { | ||
| @@ -44,9 +63,15 @@ var TrimSpacesTransform = /** @class */ (function () { | ||
| } | ||
| break; | ||
| case nodes_1.DocNodeKind.SoftBreak: | ||
| - if (finishedSkippingLeadingSpaces) { | ||
| - pendingSpace = true; | ||
| - } | ||
| + // by default, this transform strips out all soft-breaks and replaces them with | ||
| + // spaces where needed. because we're rendering to markdown and markdown is | ||
| + // whitespace-sensitive, we don't want to do this. instead, we accumulate the | ||
| + // soft-breaks and emit them as normal. | ||
| + | ||
| + // if (finishedSkippingLeadingSpaces) { | ||
| + // pendingSpace = true; | ||
| + // } | ||
| + accumulatedTextChunks.push('\n'); | ||
| accumulatedNodes.push(node); | ||
| break; | ||
| default: | ||
| @@ -58,12 +83,7 @@ var TrimSpacesTransform = /** @class */ (function () { | ||
| if (accumulatedTextChunks.length > 0) { | ||
| // TODO: We should probably track the accumulatedNodes somehow, e.g. so we can map them back to the | ||
| // original excerpts. But we need a developer scenario before we can design this API. | ||
| - transformedNodes.push(new nodes_1.DocPlainText({ | ||
| - configuration: docParagraph.configuration, | ||
| - text: accumulatedTextChunks.join('') | ||
| - })); | ||
| - accumulatedTextChunks.length = 0; | ||
| - accumulatedNodes.length = 0; | ||
| + pushAccumulatedText() | ||
| } | ||
| transformedNodes.push(node); | ||
| finishedSkippingLeadingSpaces = true; | ||
| @@ -71,12 +91,7 @@ var TrimSpacesTransform = /** @class */ (function () { | ||
| } | ||
| // Push the accumulated text | ||
| if (accumulatedTextChunks.length > 0) { | ||
| - transformedNodes.push(new nodes_1.DocPlainText({ | ||
| - configuration: docParagraph.configuration, | ||
| - text: accumulatedTextChunks.join('') | ||
| - })); | ||
| - accumulatedTextChunks.length = 0; | ||
| - accumulatedNodes.length = 0; | ||
| + pushAccumulatedText() | ||
| } | ||
| var transformedParagraph = new nodes_1.DocParagraph({ | ||
| configuration: docParagraph.configuration |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -113,7 +113,8 @@ | |
| "@microsoft/api-extractor@^7.35.4": "patch:@microsoft/api-extractor@npm%3A7.35.4#./.yarn/patches/@microsoft-api-extractor-npm-7.35.4-5f4f0357b4.patch", | ||
| "vectra@^0.4.4": "patch:vectra@npm%3A0.4.4#./.yarn/patches/vectra-npm-0.4.4-6aac3f6c29.patch", | ||
| "domino@^2.1.6": "patch:domino@npm%3A2.1.6#./.yarn/patches/domino-npm-2.1.6-b0dc3de857.patch", | ||
| "canvas": "npm:[email protected]" | ||
| "canvas": "npm:[email protected]", | ||
| "@microsoft/tsdoc@npm:0.14.2": "patch:@microsoft/tsdoc@npm%3A0.14.2#~/.yarn/patches/@microsoft-tsdoc-npm-0.14.2-9988282153.patch" | ||
| }, | ||
| "dependencies": { | ||
| "@sentry/cli": "^2.25.0", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters