Merge pull request #729 from isomerpages/release/0.23.1

Release/0.23.1

CHANGELOG.md

@@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.23.1](https://github.com/isomerpages/isomercms-backend/compare/v0.23.0...v0.23.1)
+
+- hotfix: recursively handle arrays and objects when retrieving frontmatter [`8e236e7`](https://github.com/isomerpages/isomercms-backend/commit/8e236e799445cd411cae4e3f0ceef2bfac05e60b)
+
 #### [v0.23.0](https://github.com/isomerpages/isomercms-backend/compare/v0.22.1...v0.23.0)
 
+> 20 April 2023
+
 - [LS-81] fix(markdown-utils): change sanitization process + add unescape [`#718`](https://github.com/isomerpages/isomercms-backend/pull/718)
 - feat(site launch): Allow for ops to remove timed out domain associations [`#720`](https://github.com/isomerpages/isomercms-backend/pull/720)
 - style(env var): change naming of var [`#719`](https://github.com/isomerpages/isomercms-backend/pull/719)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomercms",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "private": true,
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

src/utils/markdown-utils.js

@@ -10,6 +10,20 @@ const { sanitizer } = require("@services/utilServices/Sanitizer")
 const getTrailingSlashWithPermalink = (permalink) =>
   permalink.endsWith("/") ? permalink : `${permalink}/`
 
+const recursiveUnescape = (val) => {
+  if (val === "") return val
+  if (Array.isArray(val)) {
+    return val.map(recursiveUnescape)
+  }
+  if (typeof val === "object") {
+    return Object.keys(val).reduce((result, key) => {
+      result[key] = recursiveUnescape(val[key])
+      return result
+    }, {})
+  }
+  return _.unescape(val)
+}
+
 const retrieveDataFromMarkdown = (fileContent) => {
   // eslint-disable-next-line no-unused-vars
   const [unused, encodedFrontMatter, ...pageContent] = fileContent.split("---")
@@ -27,7 +41,7 @@ const retrieveDataFromMarkdown = (fileContent) => {
     // so this does not do anything destructive.
     // Do note that frontmatter containing pre-existing html encoded characters (&)
     // will get transformed regardless.
-    (val) => _.unescape(val)
+    (val) => recursiveUnescape(val)
   )
   const originalPageContent = pageContent.join("---")
   // NOTE: We don't sanitize if there is no page content.