fix: refactor escapeHtml fn to cast nullish values to empty string #127

mostafa-raafat · 2022-01-19T13:51:14Z

No description provided.

Matwog · 2022-01-19T14:13:38Z

@mostafa-raafat Could you also please add a fallback value.

  function applyMarkdown(translation = '') {
    // Escape underscores.
    // (Since we use underscores to denote interpolations, we have to
    // exclude them from the markdown notation. Use asterisk (*) instead.)
    let finalTranslation = marked(translation.replace(/_/g, '\\_'))

    // remove single, outer wrapping <p>-tag
    if (isWrappedInPTag(finalTranslation)) {
      // last occurrence of <p> is at the start, first occurrence of </p> is a the very end
      finalTranslation = finalTranslation.substring(
        3,
        finalTranslation.length - 5
      )
    }

    return finalTranslation.replace(/\\_/g, '_')
  }

add tests to assert the fallback behaviour

mostafa-raafat · 2022-01-19T14:32:22Z

@mostafa-raafat Could you also please add a fallback value.

  function applyMarkdown(translation = '') {
    // Escape underscores.
    // (Since we use underscores to denote interpolations, we have to
    // exclude them from the markdown notation. Use asterisk (*) instead.)
    let finalTranslation = marked(translation.replace(/_/g, '\\_'))

    // remove single, outer wrapping <p>-tag
    if (isWrappedInPTag(finalTranslation)) {
      // last occurrence of <p> is at the start, first occurrence of </p> is a the very end
      finalTranslation = finalTranslation.substring(
        3,
        finalTranslation.length - 5
      )
    }

    return finalTranslation.replace(/\\_/g, '_')
  }

@Matwog Thank you for the suggestion 👍

…lish-values-to-empty-string' of github.com:signavio/i18n into refactor(translate)--refactor-escapeHtml-fn-to-cast-nullish-values-to-empty-string

Matwog · 2022-01-19T14:37:11Z

src/translate.js

@@ -70,7 +70,7 @@ export default (singleton) => {
    )
  }

-  function applyMarkdown(translation) {
+  function applyMarkdown(translation = '') {


hint: adds fallback

Matwog · 2022-01-19T14:37:18Z

src/translate.js

@@ -93,7 +93,7 @@ export default (singleton) => {
    return <span key={key} dangerouslySetInnerHTML={{ __html: html }} />
  }

-  function insertInterpolations(translation, options) {
+  function insertInterpolations(translation = '', options) {


hint: adds fallback

Matwog · 2022-01-19T14:37:32Z

src/translate.js

+  // Used to map characters to HTML entities.
+  const htmlEscapes = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#039;',
+  }
+
+  // Used to match HTML entities and HTML characters.
+  const reUnescapedHtml = /[&<>"']/g
+  // Cast (null,undefined,[] and 0 to empty string => '')
+  const reHasUnescapedHtml = RegExp(reUnescapedHtml.source)
+
+  return unsafe && reHasUnescapedHtml.test(unsafe)
+    ? unsafe.replace(reUnescapedHtml, (chr) => htmlEscapes[chr])
+    : unsafe || ''


hint: adds fallback

atilafassina

🏆

Matwog · 2022-01-19T14:37:52Z

test/specs/i18n.spec.js

+    it('should handle undefined values with markdown', () => {
+      expect(
+        i18n(undefined, {
+          markdown: true,
+        })
+      ).toStrictEqual([])
+    })
+
+    it('should handle undefined values without markdown', () => {
+      expect(i18n(undefined, {})).toStrictEqual([])


hint: adds tests

mostafa-raafat and others added 3 commits January 19, 2022 14:50

fix: refactor escapeHtml fn to cast nullish values to empty string

3da6182

Update translate.js

188c5a9

replace &#39 with &#39

141207a

mostafa-raafat and others added 2 commits January 19, 2022 15:31

add a fallback value

24c25e7

fix: add empty string as fallback

f8a13f8

add tests to assert the fallback behaviour

Merge branch 'refactor(translate)--refactor-escapeHtml-fn-to-cast-nul…

aa91861

…lish-values-to-empty-string' of github.com:signavio/i18n into refactor(translate)--refactor-escapeHtml-fn-to-cast-nullish-values-to-empty-string

Matwog requested a review from atilafassina January 19, 2022 14:36

Matwog reviewed Jan 19, 2022

View reviewed changes

atilafassina approved these changes Jan 19, 2022

View reviewed changes

Matwog reviewed Jan 19, 2022

View reviewed changes

Matwog merged commit ba3008e into master Jan 19, 2022

Matwog deleted the refactor(translate)--refactor-escapeHtml-fn-to-cast-nullish-values-to-empty-string branch January 19, 2022 14:38

signavio-fghedina mentioned this pull request Feb 2, 2022

fix: shouldn't htmlEntities and htmlNumbers pass ? #130

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: refactor escapeHtml fn to cast nullish values to empty string #127

fix: refactor escapeHtml fn to cast nullish values to empty string #127

mostafa-raafat commented Jan 19, 2022

Matwog commented Jan 19, 2022

mostafa-raafat commented Jan 19, 2022

Matwog Jan 19, 2022

Matwog Jan 19, 2022

Matwog Jan 19, 2022

atilafassina left a comment

Matwog Jan 19, 2022

fix: refactor escapeHtml fn to cast nullish values to empty string #127

fix: refactor escapeHtml fn to cast nullish values to empty string #127

Conversation

mostafa-raafat commented Jan 19, 2022

Matwog commented Jan 19, 2022

mostafa-raafat commented Jan 19, 2022

Matwog Jan 19, 2022

Choose a reason for hiding this comment

Matwog Jan 19, 2022

Choose a reason for hiding this comment

Matwog Jan 19, 2022

Choose a reason for hiding this comment

atilafassina left a comment

Choose a reason for hiding this comment

Matwog Jan 19, 2022

Choose a reason for hiding this comment