myst-to-react 0.10.0 → 0.11.0

package/dist/MyST.d.ts

@@ -1,4 +1,6 @@
+import type { NodeRenderersValidated } from '@myst-theme/providers';
 import type { GenericNode } from 'myst-common';
+export declare function selectRenderer(renderers: NodeRenderersValidated, node: GenericNode): import("@myst-theme/providers").NodeRenderer<any>;
 export declare function MyST({ ast }: {
     ast?: GenericNode | GenericNode[];
 }): import("react/jsx-runtime").JSX.Element | null;

package/dist/MyST.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MyST.d.ts","sourceRoot":"","sources":["../src/MyST.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAW/C,wBAAgB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAA;CAAE,kDAelE"}
+{"version":3,"file":"MyST.d.ts","sourceRoot":"","sources":["../src/MyST.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAW/C,wBAAgB,cAAc,CAAC,SAAS,EAAE,sBAAsB,EAAE,IAAI,EAAE,WAAW,qDAMlF;AAED,wBAAgB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAA;CAAE,kDAelE"}

package/dist/MyST.js

@@ -1,22 +1,29 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { matches } from 'unist-util-select';
 import { useNodeRenderers } from '@myst-theme/providers';
 function DefaultComponent({ node }) {
     if (!node.children)
         return _jsx("span", { children: node.value });
     return (_jsx("div", { children: _jsx(MyST, { ast: node.children }) }));
 }
+export function selectRenderer(renderers, node) {
+    var _a, _b, _c;
+    const componentRenderers = (_a = renderers[node.type]) !== null && _a !== void 0 ? _a : renderers['DefaultComponent'];
+    const SpecificComponent = (_b = Object.entries(componentRenderers !== null && componentRenderers !== void 0 ? componentRenderers : {})
+        .reverse()
+        .find(([selector]) => selector !== 'base' && matches(selector, node))) === null || _b === void 0 ? void 0 : _b[1];
+    return (_c = SpecificComponent !== null && SpecificComponent !== void 0 ? SpecificComponent : componentRenderers === null || componentRenderers === void 0 ? void 0 : componentRenderers.base) !== null && _c !== void 0 ? _c : DefaultComponent;
+}
 export function MyST({ ast }) {
-    var _a, _b;
     const renderers = useNodeRenderers();
     if (!ast || ast.length === 0)
         return null;
     if (!Array.isArray(ast)) {
-        const Component = (_b = (_a = renderers[ast.type]) !== null && _a !== void 0 ? _a : renderers['DefaultComponent']) !== null && _b !== void 0 ? _b : DefaultComponent;
+        const Component = selectRenderer(renderers, ast);
         return _jsx(Component, { node: ast }, ast.key);
     }
     return (_jsx(_Fragment, { children: ast === null || ast === void 0 ? void 0 : ast.map((node) => {
-            var _a;
-            const Component = (_a = renderers[node.type]) !== null && _a !== void 0 ? _a : DefaultComponent;
+            const Component = selectRenderer(renderers, node);
             return _jsx(Component, { node: node }, node.key);
         }) }));
 }

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import type { NodeRenderer } from '@myst-theme/providers';
 export { CopyIcon, HoverPopover, Tooltip, LinkCard } from './components/index.js';
 export { CodeBlock } from './code.js';
 export { HashLink, scrollToElement } from './hashLink.js';
@@ -6,6 +5,6 @@ export { Admonition, AdmonitionKind } from './admonitions.js';
 export { Details } from './dropdown.js';
 export { TabSet, TabItem } from './tabs.js';
 export { useFetchMdast } from './crossReference.js';
-export declare const DEFAULT_RENDERERS: Record<string, NodeRenderer>;
-export { MyST } from './MyST.js';
+export declare const DEFAULT_RENDERERS: import("@myst-theme/providers").NodeRenderersValidated;
+export { MyST, selectRenderer } from './MyST.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAwB1D,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAuB1D,CAAC;AAEF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAwBA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,eAAO,MAAM,iBAAiB,wDA0B7B,CAAC;AAEF,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC"}

package/dist/index.js

@@ -1,3 +1,4 @@
+import { mergeRenderers } from '@myst-theme/providers';
 import BASIC_RENDERERS from './basic.js';
 import ADMONITION_RENDERERS from './admonitions.js';
 import DROPDOWN_RENDERERS from './dropdown.js';
@@ -27,5 +28,28 @@ export { Admonition, AdmonitionKind } from './admonitions.js';
 export { Details } from './dropdown.js';
 export { TabSet, TabItem } from './tabs.js';
 export { useFetchMdast } from './crossReference.js';
-export const DEFAULT_RENDERERS = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, BASIC_RENDERERS), UNKNOWN_MYST_RENDERERS), IMAGE_RENDERERS), LINK_RENDERERS), CODE_RENDERERS), MATH_RENDERERS), CITE_RENDERERS), TAB_RENDERERS), IFRAME_RENDERERS), FOOTNOTE_RENDERERS), ADMONITION_RENDERERS), REACTIVE_RENDERERS), HEADING_RENDERERS), CROSS_REFERENCE_RENDERERS), DROPDOWN_RENDERERS), CARD_RENDERERS), GRID_RENDERERS), INLINE_EXPRESSION_RENDERERS), EXT_RENDERERS), PROOF_RENDERERS), EXERCISE_RENDERERS), ASIDE_RENDERERS);
-export { MyST } from './MyST.js';
+export const DEFAULT_RENDERERS = mergeRenderers([
+    BASIC_RENDERERS,
+    UNKNOWN_MYST_RENDERERS,
+    IMAGE_RENDERERS,
+    LINK_RENDERERS,
+    CODE_RENDERERS,
+    MATH_RENDERERS,
+    CITE_RENDERERS,
+    TAB_RENDERERS,
+    IFRAME_RENDERERS,
+    FOOTNOTE_RENDERERS,
+    ADMONITION_RENDERERS,
+    REACTIVE_RENDERERS,
+    HEADING_RENDERERS,
+    CROSS_REFERENCE_RENDERERS,
+    DROPDOWN_RENDERERS,
+    CARD_RENDERERS,
+    GRID_RENDERERS,
+    INLINE_EXPRESSION_RENDERERS,
+    EXT_RENDERERS,
+    PROOF_RENDERERS,
+    EXERCISE_RENDERERS,
+    ASIDE_RENDERERS,
+], true);
+export { MyST, selectRenderer } from './MyST.js';

package/dist/links/index.d.ts

@@ -1,14 +1,15 @@
 import type { Link } from 'myst-spec';
-import type { NodeRenderer } from '@myst-theme/providers';
+import type { NodeRenderer, NodeRenderers } from '@myst-theme/providers';
 type TransformedLink = Link & {
     internal?: boolean;
     protocol?: string;
 };
-export declare const link: NodeRenderer<TransformedLink>;
+export declare const WikiLinkRenderer: NodeRenderer<TransformedLink>;
+export declare const GithubLinkRenderer: NodeRenderer<TransformedLink>;
+export declare const RRIDLinkRenderer: NodeRenderer<TransformedLink>;
+export declare const RORLinkRenderer: NodeRenderer<TransformedLink>;
+export declare const SimpleLink: NodeRenderer<TransformedLink>;
 export declare const linkBlock: NodeRenderer<TransformedLink>;
-declare const LINK_RENDERERS: {
-    link: NodeRenderer<TransformedLink>;
-    linkBlock: NodeRenderer<TransformedLink>;
-};
+declare const LINK_RENDERERS: NodeRenderers;
 export default LINK_RENDERERS;
 //# sourceMappingURL=index.d.ts.map

package/dist/links/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/links/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAOtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAQ1D,KAAK,eAAe,GAAG,IAAI,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA0CxE,eAAO,MAAM,IAAI,EAAE,YAAY,CAAC,eAAe,CA6C9C,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,YAAY,CAAC,eAAe,CA8BnD,CAAC;AAEF,QAAA,MAAM,cAAc;;;CAGnB,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/links/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAOtC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQzE,KAAK,eAAe,GAAG,IAAI,GAAG;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA0CxE,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,eAAe,CAM1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,eAAe,CAgB5D,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,eAAe,CAE1D,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,eAAe,CAEzD,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,eAAe,CAcpD,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,YAAY,CAAC,eAAe,CA8BnD,CAAC;AAEF,QAAA,MAAM,cAAc,EAAE,aAerB,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/links/index.js

@@ -28,25 +28,29 @@ function InternalLink({ url, children }) {
     }
     return (_jsx(HoverPopover, { card: _jsx(LinkCard, { internal: true, url: url, title: page.title, description: page.description, thumbnail: page.thumbnailOptimized || page.thumbnail }), children: _jsx(Link, { to: withBaseurl(url, baseurl), prefetch: "intent", children: children }) }));
 }
-export const link = ({ node }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+export const WikiLinkRenderer = ({ node }) => {
+    var _a, _b;
+    return (_jsx(WikiLink, { url: node.url, page: (_a = node.data) === null || _a === void 0 ? void 0 : _a.page, wiki: (_b = node.data) === null || _b === void 0 ? void 0 : _b.wiki, children: _jsx(MyST, { ast: node.children }) }));
+};
+export const GithubLinkRenderer = ({ node }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    return (_jsx(GithubLink, { kind: (_a = node.data) === null || _a === void 0 ? void 0 : _a.kind, url: node.url, org: (_b = node.data) === null || _b === void 0 ? void 0 : _b.org, repo: (_c = node.data) === null || _c === void 0 ? void 0 : _c.repo, raw: (_d = node.data) === null || _d === void 0 ? void 0 : _d.raw, file: (_e = node.data) === null || _e === void 0 ? void 0 : _e.file, from: (_f = node.data) === null || _f === void 0 ? void 0 : _f.from, to: (_g = node.data) === null || _g === void 0 ? void 0 : _g.to, issue_number: (_h = node.data) === null || _h === void 0 ? void 0 : _h.issue_number, children: _jsx(MyST, { ast: node.children }) }));
+};
+export const RRIDLinkRenderer = ({ node }) => {
+    var _a;
+    return (_jsx(RRIDLink, { rrid: (_a = node.data) === null || _a === void 0 ? void 0 : _a.rrid }));
+};
+export const RORLinkRenderer = ({ node }) => {
+    var _a;
+    return (_jsx(RORLink, { node: node, ror: (_a = node.data) === null || _a === void 0 ? void 0 : _a.ror }));
+};
+export const SimpleLink = ({ node }) => {
+    var _a;
     const internal = (_a = node.internal) !== null && _a !== void 0 ? _a : false;
-    const protocol = node.protocol;
-    switch (protocol) {
-        case 'wiki':
-            return (_jsx(WikiLink, { url: node.url, page: (_b = node.data) === null || _b === void 0 ? void 0 : _b.page, wiki: (_c = node.data) === null || _c === void 0 ? void 0 : _c.wiki, children: _jsx(MyST, { ast: node.children }) }));
-        case 'github':
-            return (_jsx(GithubLink, { kind: (_d = node.data) === null || _d === void 0 ? void 0 : _d.kind, url: node.url, org: (_e = node.data) === null || _e === void 0 ? void 0 : _e.org, repo: (_f = node.data) === null || _f === void 0 ? void 0 : _f.repo, raw: (_g = node.data) === null || _g === void 0 ? void 0 : _g.raw, file: (_h = node.data) === null || _h === void 0 ? void 0 : _h.file, from: (_j = node.data) === null || _j === void 0 ? void 0 : _j.from, to: (_k = node.data) === null || _k === void 0 ? void 0 : _k.to, issue_number: (_l = node.data) === null || _l === void 0 ? void 0 : _l.issue_number, children: _jsx(MyST, { ast: node.children }) }));
-        case 'rrid':
-            return _jsx(RRIDLink, { rrid: (_m = node.data) === null || _m === void 0 ? void 0 : _m.rrid });
-        case 'ror':
-            return _jsx(RORLink, { node: node, ror: (_o = node.data) === null || _o === void 0 ? void 0 : _o.ror });
-        default:
-            if (internal) {
-                return (_jsx(InternalLink, { url: node.url, children: _jsx(MyST, { ast: node.children }) }));
-            }
-            return (_jsx("a", { target: "_blank", href: node.url, rel: "noreferrer", children: _jsx(MyST, { ast: node.children }) }));
+    if (internal) {
+        return (_jsx(InternalLink, { url: node.url, children: _jsx(MyST, { ast: node.children }) }));
     }
+    return (_jsx("a", { target: "_blank", href: node.url, rel: "noreferrer", children: _jsx(MyST, { ast: node.children }) }));
 };
 export const linkBlock = ({ node }) => {
     var _a;
@@ -60,7 +64,19 @@ export const linkBlock = ({ node }) => {
     return (_jsx("a", { className: containerClass, target: "_blank", rel: "noopener noreferrer", href: node.url, children: nested }));
 };
 const LINK_RENDERERS = {
-    link,
+    link: {
+        base: SimpleLink,
+        // Then duplicate the renderers for protocols
+        'link[protocol=github]': GithubLinkRenderer,
+        'link[protocol=wiki]': WikiLinkRenderer,
+        'link[protocol=rrid]': RRIDLinkRenderer,
+        'link[protocol=ror]': RORLinkRenderer,
+        // Put the kinds last as they will match first in the future
+        'link[kind=github]': GithubLinkRenderer,
+        'link[kind=wiki]': WikiLinkRenderer,
+        'link[kind=rrid]': RRIDLinkRenderer,
+        'link[kind=ror]': RORLinkRenderer,
+    },
     linkBlock,
 };
 export default LINK_RENDERERS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myst-to-react",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,12 +21,12 @@
   },
   "dependencies": {
     "@heroicons/react": "^2.0.18",
-    "@myst-theme/providers": "^0.10.0",
+    "@myst-theme/providers": "^0.11.0",
     "@scienceicons/react": "^0.0.6",
     "@radix-ui/react-hover-card": "^1.0.6",
     "buffer": "^6.0.3",
     "classnames": "^2.3.2",
-    "myst-common": "^1.5.0",
+    "myst-common": "^1.6.0",
     "myst-config": "^1.5.0",
     "myst-spec": "^0.0.5",
     "nanoid": "^4.0.2",