Skip to content

fix: 🐛 asset in nested reference with json rte #24

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

Merged
merged 1 commit into from
Apr 25, 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 .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: '12.x'
registry-url: 'https://registry.npmjs.org'
registry-url: 'https://npm.pkg.github.com'
scope: '@contentstack'
- run: npm ci
- run: npm publish
Expand Down
2 changes: 1 addition & 1 deletion __test__/mock/json-element-mock-result.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const plainTextHtml = "<strong>Aliquam sit amet libero dapibus, eleifend ligula at, varius justo</strong><strong><em>Lorem ipsum</em></strong><strong><em><u>dolor sit amet</u></em></strong><strong><em><u><strike>consectetur adipiscing elit.</strike></u></em></strong><strong><em><u><span>Sed condimentum iaculis magna in vehicula. </span></u></em></strong><strong><em><u><sup> Vestibulum vitae convallis </sup></u></em></strong><strong><em><u><sub> lacus. </sub></u></em></strong>"
const plainTextHtml = "<strong>Aliquam sit amet libero dapibus, eleifend ligula at, varius justo</strong><strong><em>Lorem ipsum</em></strong><strong><em><u>dolor sit amet</u></em></strong><strong><em><u><strike><br />consectetur adipiscing elit.</strike></u></em></strong><strong><em><u><span>Sed condimentum iaculis magna in vehicula. </span></u></em></strong><strong><em><u><sup> Vestibulum vitae convallis </sup></u></em></strong><strong><em><u><sub> lacus. </sub></u></em></strong>"
const paragraphHtml = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed condimentum iaculis magna in vehicula. Vestibulum vitae convallis lacus. Praesent a diam iaculis turpis rhoncus faucibus. Aliquam sed pulvinar sem.</p>"
const h1Html = "<h1><strong><em><u><sub>Lorem ipsum dolor sit amet.</sub></u></em></strong></h1>"
const h2Html = "<h2><strong><em><u><sub>Vestibulum a ligula eget massa sagittis aliquam sit amet quis tortor. </sub></u></em></strong></h2>"
Expand Down
3 changes: 2 additions & 1 deletion __test__/mock/json-element-mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ const plainTextJson = {
"bold": true,
"italic": true,
"underline": true,
"strikethrough": true
"strikethrough": true,
"break": true
},
{
"text": "Sed condimentum iaculis magna in vehicula. ",
Expand Down
8 changes: 8 additions & 0 deletions __test__/reference-to-html.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Metadata } from '../src/Models/metadata-model'
import Node from '../src/nodes/node'
import NodeType from '../src/nodes/node-type'
import { Next, RenderOption } from '../src/options'
import { defaultNodeOption } from '../src/options/default-node-options'
import { defaultOptions } from '../src/options/default-options'
import { assetReferenceJson, embeddedAssetJsonEntry, embeddedEntryJsonEntry, entryReferenceBlockJson, entryReferenceInlineJson, entryReferenceLinkJson } from './mock/json-element-mock'
import { embeddedAssetWithRenderOption, embeddedObjectDefaultRender, embeddedObjectWithRenderOption } from './mock/render-options'
Expand Down Expand Up @@ -152,6 +153,13 @@ describe('Reference Node To HTML', () => {
expect(resultHTML).toEqual('<img src=https://image.url/11.jpg>')
done()
})
it('Should return image for undefined node asset from default node option', done => {
const node = assetReferenceJson.children[0] as unknown as Node

const resultHTML = referenceToHTML(node, defaultNodeOption)
expect(resultHTML).toEqual('<img src="https://image.url/11.jpg" />')
done()
})

it('Should return HTML for embedded link entry', done => {
const node = entryReferenceLinkJson.children[0] as unknown as Node
Expand Down
3 changes: 3 additions & 0 deletions src/helper/enumerate-entries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ export function enumerateContents(

export function textNodeToHTML(node: TextNode, renderOption: RenderOption): string {
let text = node.text
if (node.break) {
text = (renderOption[MarkType.BREAK] as RenderMark)(text)
}
if (node.superscript) {
text = (renderOption[MarkType.SUPERSCRIPT] as RenderMark)(text)
}
Expand Down
3 changes: 2 additions & 1 deletion src/nodes/mark-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ enum MarkType {


SUBSCRIPT = 'subscript',
SUPERSCRIPT = 'superscript'
SUPERSCRIPT = 'superscript',
BREAK = 'break'
}

export default MarkType
1 change: 1 addition & 0 deletions src/nodes/text-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default class TextNode extends Node {
inlineCode?: boolean
superscript?: boolean
subscript?: boolean
break?: boolean

text: string

Expand Down
6 changes: 6 additions & 0 deletions src/options/default-node-options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ export const defaultNodeOption: RenderOption = {
},

['reference']:(node: Node, next: Next) => {
if (node.attrs['type'] === 'asset') {
return `<img src="${node.attrs['asset-link']}" />`
}
return ``
},
['default']:(node: Node, next: Next) => {
Expand Down Expand Up @@ -105,5 +108,8 @@ export const defaultNodeOption: RenderOption = {
[MarkType.SUPERSCRIPT]:(text: string) => {
return `<sup>${text}</sup>`
},
[MarkType.BREAK]:(text: string) => {
return `<br />${text}`
},

}