Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: only save inlined magic when in a container #814

Merged
merged 2 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_VERSION=14
ARG NODE_VERSION=18
FROM node:${NODE_VERSION}-buster

ARG NODE_VERSION
Expand Down
109 changes: 101 additions & 8 deletions __tests__/__snapshots__/flavored-compilers.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`ReadMe Flavored Blocks Embed 1`] = `
"[block:embed]{\\"title\\":\\"Embedded meta links.\\",\\"url\\":\\"https://nyti.me/s/gzoa2xb2v3\\",\\"provider\\":\\"nyt\\"}[/block]
"[block:embed]
{
\\"title\\": \\"Embedded meta links.\\",
\\"url\\": \\"https://nyti.me/s/gzoa2xb2v3\\",
\\"provider\\": \\"nyt\\"
}
[/block]
"
`;

Expand All @@ -27,17 +33,54 @@ console.log('an unnamed sample snippet');
`;

exports[`ReadMe Magic Blocks Embed 1`] = `
"[block:embed]{\\"html\\":false,\\"url\\":\\"https://youtu.be/J3-uKv1DShQ\\",\\"title\\":null,\\"favicon\\":\\"https://youtu.be/favicon.ico\\",\\"provider\\":\\"youtu.be\\",\\"href\\":\\"https://youtu.be/J3-uKv1DShQ\\"}[/block]
"[block:embed]
{
\\"html\\": false,
\\"url\\": \\"https://youtu.be/J3-uKv1DShQ\\",
\\"title\\": null,
\\"favicon\\": \\"https://youtu.be/favicon.ico\\",
\\"provider\\": \\"youtu.be\\",
\\"href\\": \\"https://youtu.be/J3-uKv1DShQ\\"
}
[/block]
"
`;

exports[`ReadMe Magic Blocks Figure 1`] = `
"[block:image]{\\"images\\":[{\\"image\\":[\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",\\"rdme-blue.svg\\",\\"Ok, __pizza__ man.\\"],\\"sizing\\":\\"80\\",\\"caption\\":\\"Ok, **pizza** man.\\"}]}[/block]
"[block:image]
{
\\"images\\": [
{
\\"image\\": [
\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",
\\"rdme-blue.svg\\",
\\"Ok, __pizza__ man.\\"
],
\\"sizing\\": \\"80\\",
\\"caption\\": \\"Ok, **pizza** man.\\"
}
]
}
[/block]
"
`;

exports[`ReadMe Magic Blocks Figure with alt text 1`] = `
"[block:image]{\\"images\\":[{\\"image\\":[\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",\\"rdme-blue.svg\\",\\"A man eating pizza and making an OK gesture\\"],\\"sizing\\":\\"80\\",\\"caption\\":\\"Ok, **pizza** man.\\"}]}[/block]
"[block:image]
{
\\"images\\": [
{
\\"image\\": [
\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",
\\"rdme-blue.svg\\",
\\"A man eating pizza and making an OK gesture\\"
],
\\"sizing\\": \\"80\\",
\\"caption\\": \\"Ok, **pizza** man.\\"
}
]
}
[/block]
"
`;

Expand All @@ -47,12 +90,40 @@ exports[`ReadMe Magic Blocks Image 1`] = `
`;

exports[`ReadMe Magic Blocks Image with sizing and alignment 1`] = `
"[block:image]{\\"images\\":[{\\"image\\":[\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",\\"rdme-blue.svg\\",\\"\\"],\\"align\\":\\"right\\",\\"sizing\\":\\"80px\\"}]}[/block]
"[block:image]
{
\\"images\\": [
{
\\"image\\": [
\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",
\\"rdme-blue.svg\\",
\\"\\"
],
\\"align\\": \\"right\\",
\\"sizing\\": \\"80px\\"
}
]
}
[/block]
"
`;

exports[`ReadMe Magic Blocks Image with sizing and border 1`] = `
"[block:image]{\\"images\\":[{\\"image\\":[\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",\\"rdme-blue.svg\\",\\"\\"],\\"sizing\\":\\"80px\\",\\"border\\":true}]}[/block]
"[block:image]
{
\\"images\\": [
{
\\"image\\": [
\\"https://files.readme.io/6f52e22-man-eating-pizza-and-making-an-ok-gesture.jpg\\",
\\"rdme-blue.svg\\",
\\"\\"
],
\\"sizing\\": \\"80px\\",
\\"border\\": true
}
]
}
[/block]
"
`;

Expand All @@ -64,11 +135,33 @@ exports[`ReadMe Magic Blocks Tables 1`] = `
`;

exports[`ReadMe Magic Blocks Tables with breaks 1`] = `
"[block:parameters]{\\"data\\":{\\"h-0\\":\\"th 1\\",\\"h-1\\":\\"th 2\\",\\"0-0\\":\\"cell 1 \\\\nafter the break\\",\\"0-1\\":\\"cell 2\\"},\\"cols\\":2,\\"rows\\":1,\\"align\\":[\\"center\\",\\"center\\"]}[/block]
"[block:parameters]
{
\\"data\\": {
\\"h-0\\": \\"th 1\\",
\\"h-1\\": \\"th 2\\",
\\"0-0\\": \\"cell 1 \\\\nafter the break\\",
\\"0-1\\": \\"cell 2\\"
},
\\"cols\\": 2,
\\"rows\\": 1,
\\"align\\": [
\\"center\\",
\\"center\\"
]
}
[/block]
"
`;

exports[`ReadMe Magic Blocks custom blocks 1`] = `
"[block:tutorial-tile]{\\"backgroundColor\\":\\"#ffffff\\",\\"title\\":\\"Tutorial Title\\",\\"emoji\\":\\"🦉\\",\\"link\\":\\"http://test.com\\"}[/block]
"[block:tutorial-tile]
{
\\"backgroundColor\\": \\"#ffffff\\",
\\"title\\": \\"Tutorial Title\\",
\\"emoji\\": \\"🦉\\",
\\"link\\": \\"http://test.com\\"
}
[/block]
"
`;
6 changes: 5 additions & 1 deletion __tests__/flavored-compilers.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ describe('ReadMe Flavored Blocks', () => {
const ast = parse(text);

expect(compile(ast)).toMatchInlineSnapshot(`
"[block:html]{\\"html\\":\\"<style>\\\\n summary {\\\\n padding-top: 8px;\\\\n outline: none !important;\\\\n user-select: none;\\\\n }\\\\n details[open] + details > summary {\\\\n padding-top: 0;\\\\n }\\\\n details > summary + hr {\\\\n opacity: .66;\\\\n }\\\\n</style>\\"}[/block]
"[block:html]
{
\\"html\\": \\"<style>\\\\n summary {\\\\n padding-top: 8px;\\\\n outline: none !important;\\\\n user-select: none;\\\\n }\\\\n details[open] + details > summary {\\\\n padding-top: 0;\\\\n }\\\\n details > summary + hr {\\\\n opacity: .66;\\\\n }\\\\n</style>\\"
}
[/block]
"
`);
});
Expand Down
34 changes: 32 additions & 2 deletions __tests__/flavored-compilers/__snapshots__/tables.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,11 +1,41 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`table compiler converts to magic block syntax if there are breaks 1`] = `
"[block:parameters]{\\"data\\":{\\"h-0\\":\\"th 1\\",\\"h-1\\":\\"th 2\\",\\"0-0\\":\\"cell 1 \\\\nextra line\\",\\"0-1\\":\\"cell 2\\"},\\"cols\\":2,\\"rows\\":1,\\"align\\":[\\"center\\",\\"center\\"]}[/block]
"[block:parameters]
{
\\"data\\": {
\\"h-0\\": \\"th 1\\",
\\"h-1\\": \\"th 2\\",
\\"0-0\\": \\"cell 1 \\\\nextra line\\",
\\"0-1\\": \\"cell 2\\"
},
\\"cols\\": 2,
\\"rows\\": 1,
\\"align\\": [
\\"center\\",
\\"center\\"
]
}
[/block]
"
`;

exports[`table compiler saves to magic block syntax if there are breaks 1`] = `
"[block:parameters]{\\"data\\":{\\"h-0\\":\\"th 1\\",\\"h-1\\":\\"th 2\\",\\"0-0\\":\\"cell 1 \\\\nextra line\\",\\"0-1\\":\\"cell 2\\"},\\"cols\\":2,\\"rows\\":1,\\"align\\":[\\"center\\",\\"center\\"]}[/block]
"[block:parameters]
{
\\"data\\": {
\\"h-0\\": \\"th 1\\",
\\"h-1\\": \\"th 2\\",
\\"0-0\\": \\"cell 1 \\\\nextra line\\",
\\"0-1\\": \\"cell 2\\"
},
\\"cols\\": 2,
\\"rows\\": 1,
\\"align\\": [
\\"center\\",
\\"center\\"
]
}
[/block]
"
`;
59 changes: 56 additions & 3 deletions __tests__/flavored-compilers/magic-blocks.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,33 @@
import { md, mdast } from '../../index';

describe('Compile Magic Blocks', () => {
it('compiles a magic block in a callout', () => {
it('compiles a magic block to multiple lines', () => {
const text = `
[block:image]{ "images": [{ "image": ["https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png", "", "" ], "align": "center" } ]}[/block]
`;
const tree = mdast(text);
const compiled = md(tree);

expect(compiled).toMatchInlineSnapshot(`
"[block:image]
{
\\"images\\": [
{
\\"image\\": [
\\"https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png\\",
\\"\\",
\\"\\"
],
\\"align\\": \\"center\\"
}
]
}
[/block]
"
`);
});

it('compiles a magic block in a container on a single line', () => {
const text = `
> 👍 It works!
>
Expand All @@ -28,9 +54,36 @@ describe('Compile Magic Blocks', () => {
const compiled = md(tree);

expect(compiled).toMatchInlineSnapshot(`
"[block:image]{\\"images\\":[{\\"image\\":[\\"https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png\\",\\"\\",\\"\\"],\\"align\\":\\"center\\"}]}[/block]
"[block:image]
{
\\"images\\": [
{
\\"image\\": [
\\"https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png\\",
\\"\\",
\\"\\"
],
\\"align\\": \\"center\\"
}
]
}
[/block]


[block:image]{\\"images\\":[{\\"image\\":[\\"https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png\\",\\"\\",\\"\\"],\\"align\\":\\"center\\"}]}[/block]
[block:image]
{
\\"images\\": [
{
\\"image\\": [
\\"https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png\\",
\\"\\",
\\"\\"
],
\\"align\\": \\"center\\"
}
]
}
[/block]
"
`);
});
Expand Down
4 changes: 2 additions & 2 deletions processor/compile/div.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ export default function DivCompiler() {
const { Compiler } = this;
const { visitors } = Compiler.prototype;

visitors.div = function compile(node) {
visitors.div = function compile(node, parent) {
const data = node.data.hProperties;

return magicBlock(node.data.hName, data);
return magicBlock(node.data.hName, data, parent);
};
}
4 changes: 2 additions & 2 deletions processor/compile/embed.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import magicBlock from './magic-block';

function EmbedCompiler(node) {
function EmbedCompiler(node, parent) {
const data = node.data.hProperties;
let { provider = 'embed' } = data;
provider = provider.replace(/^@/, '');

return magicBlock('embed', { ...data, provider });
return magicBlock('embed', { ...data, provider }, parent);
}

export default function EmbedCompilerPlugin() {
Expand Down
4 changes: 2 additions & 2 deletions processor/compile/figure.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function FigureCompiler() {
const { Compiler } = this;
const { visitors } = Compiler.prototype;

visitors.figure = function figureCompiler(node) {
visitors.figure = function figureCompiler(node, parent) {
let image;
let caption;

Expand All @@ -35,6 +35,6 @@ export default function FigureCompiler() {
images: [img],
};

return magicBlock('image', block);
return magicBlock('image', block, parent);
};
}
4 changes: 2 additions & 2 deletions processor/compile/html-block.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ export default function HtmlBlockCompiler() {
const { Compiler } = this;
const { visitors } = Compiler.prototype;

visitors['html-block'] = node => {
visitors['html-block'] = (node, parent) => {
const html = node.data.hProperties.html;

return magicBlock('html', { html });
return magicBlock('html', { html }, parent);
};
}
6 changes: 5 additions & 1 deletion processor/compile/magic-block.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
const magicBlock = (type, data) => `[block:${type}]${JSON.stringify(data)}[/block]`;
const magicBlock = (type, data, parent) => {
return parent.type === 'root'
? `[block:${type}]\n${JSON.stringify(data, null, 2)}\n[/block]\n`
: `[block:${type}]${JSON.stringify(data)}[/block]`;
};

export default magicBlock;
4 changes: 2 additions & 2 deletions processor/compile/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function TableCompiler() {

const { table: original } = visitors;

visitors.table = function (node) {
visitors.table = function (node, parent) {
if (!find(node, n => n.type === 'break')) {
return original.call(this, node);
}
Expand All @@ -34,6 +34,6 @@ export default function TableCompiler() {
});
});

return magicBlock('parameters', data);
return magicBlock('parameters', data, parent);
};
}