-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Markdoc] Refactor Renderer internals to use
renderComponent()
(#6607)
* wip: new TreeNode setup * fix: pass children through `render` * deps: remove stringify-attributes * chore: changeset --------- Co-authored-by: Nate Moore <[email protected]> Co-authored-by: Nate Moore <[email protected]>
- Loading branch information
1 parent
6afb1ef
commit 86273b5
Showing
7 changed files
with
88 additions
and
87 deletions.
There are no files selected for viewing
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,5 @@ | ||
--- | ||
'@astrojs/markdoc': patch | ||
--- | ||
|
||
Fix: Update Markdoc renderer internals to remove unneeded dependencies |
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,81 @@ | ||
import type { AstroInstance } from 'astro'; | ||
import type { RenderableTreeNode } from '@markdoc/markdoc'; | ||
import { createComponent, renderComponent, render } from 'astro/runtime/server/index.js'; | ||
import Markdoc from '@markdoc/markdoc'; | ||
import { MarkdocError, isCapitalized } from '../dist/utils.js'; | ||
|
||
export type TreeNode = | ||
| { | ||
type: 'text'; | ||
content: string; | ||
} | ||
| { | ||
type: 'component'; | ||
component: AstroInstance['default']; | ||
props: Record<string, any>; | ||
children: TreeNode[]; | ||
} | ||
| { | ||
type: 'element'; | ||
tag: string; | ||
attributes: Record<string, any>; | ||
children: TreeNode[]; | ||
}; | ||
|
||
export const ComponentNode = createComponent({ | ||
factory(result: any, { treeNode }: { treeNode: TreeNode }) { | ||
if (treeNode.type === 'text') return render`${treeNode.content}`; | ||
const slots = { | ||
default: () => render`${treeNode.children.map((child) => | ||
renderComponent(result, 'ComponentNode', ComponentNode, { treeNode: child }) | ||
)}`, | ||
}; | ||
if (treeNode.type === 'component') { | ||
return renderComponent( | ||
result, | ||
treeNode.component.name, | ||
treeNode.component, | ||
treeNode.props, | ||
slots | ||
); | ||
} | ||
return renderComponent(result, treeNode.tag, treeNode.tag, treeNode.attributes, slots); | ||
}, | ||
propagation: 'none', | ||
}); | ||
|
||
export function createTreeNode( | ||
node: RenderableTreeNode, | ||
components: Record<string, AstroInstance['default']> = {} | ||
): TreeNode { | ||
if (typeof node === 'string' || typeof node === 'number') { | ||
return { type: 'text', content: String(node) }; | ||
} else if (node === null || typeof node !== 'object' || !Markdoc.Tag.isTag(node)) { | ||
return { type: 'text', content: '' }; | ||
} | ||
|
||
if (node.name in components) { | ||
const component = components[node.name]; | ||
const props = node.attributes; | ||
const children = node.children.map((child) => createTreeNode(child, components)); | ||
|
||
return { | ||
type: 'component', | ||
component, | ||
props, | ||
children, | ||
}; | ||
} else if (isCapitalized(node.name)) { | ||
throw new MarkdocError({ | ||
message: `Unable to render ${JSON.stringify(node.name)}.`, | ||
hint: 'Did you add this to the "components" prop on your <Content /> component?', | ||
}); | ||
} else { | ||
return { | ||
type: 'element', | ||
tag: node.name, | ||
attributes: node.attributes, | ||
children: node.children.map((child) => createTreeNode(child, components)), | ||
}; | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.