@ndla/article-converter 10.0.133-alpha.0 → 10.0.135-alpha.0

package/es/plugins/embed/conceptEmbedPlugin.js

@@ -1,16 +1,17 @@
-import { attributesToProps } from "html-react-parser";
+import { attributesToProps, domToReact } from "html-react-parser";
 import { ConceptEmbed } from "@ndla/ui";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/plugins/embed/conceptEmbedPlugin.tsx
-const conceptEmbedPlugin = (element, _, opts) => {
+const conceptEmbedPlugin = (element, parserOpts, transformOpts) => {
 	const props = attributesToProps(element.attribs);
 	const data = JSON.parse(props["data-json"]);
 	return /* @__PURE__ */ jsx(ConceptEmbed, {
 		embed: data,
-		lang: opts.articleLanguage,
-		renderContext: opts.renderContext,
-		previewAlt: opts.previewAlt
+		lang: transformOpts.articleLanguage,
+		renderContext: transformOpts.renderContext,
+		previewAlt: transformOpts.previewAlt,
+		children: domToReact(element.children, parserOpts)
 	});
 };
 

package/es/plugins/embed/conceptEmbedPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"conceptEmbedPlugin.js","names":["conceptEmbedPlugin: PluginType"],"sources":["../../../src/plugins/embed/conceptEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type ConceptMetaData } from \"@ndla/types-embed\";\nimport { ConceptEmbed } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport const conceptEmbedPlugin: PluginType = (element, _, opts) => {\n  const props = attributesToProps(element.attribs);\n  const data = JSON.parse(props[\"data-json\"] as string) as ConceptMetaData;\n  return (\n    <ConceptEmbed\n      embed={data}\n      lang={opts.articleLanguage}\n      renderContext={opts.renderContext}\n      previewAlt={opts.previewAlt}\n    />\n  );\n};\n"],"mappings":";;;;;AAaA,MAAaA,qBAAiC,CAAC,SAAS,GAAG,SAAS;CAClE,MAAM,QAAQ,kBAAkB,QAAQ,QAAQ;CAChD,MAAM,OAAO,KAAK,MAAM,MAAM,aAAuB;AACrD,wBACE,IAAC;EACC,OAAO;EACP,MAAM,KAAK;EACX,eAAe,KAAK;EACpB,YAAY,KAAK;GACjB;AAEL"}
+{"version":3,"file":"conceptEmbedPlugin.js","names":["conceptEmbedPlugin: PluginType"],"sources":["../../../src/plugins/embed/conceptEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps, domToReact, type DOMNode } from \"html-react-parser\";\nimport { type ConceptMetaData } from \"@ndla/types-embed\";\nimport { ConceptEmbed } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport const conceptEmbedPlugin: PluginType = (element, parserOpts, transformOpts) => {\n  const props = attributesToProps(element.attribs);\n  const data = JSON.parse(props[\"data-json\"] as string) as ConceptMetaData;\n  return (\n    <ConceptEmbed\n      embed={data}\n      lang={transformOpts.articleLanguage}\n      renderContext={transformOpts.renderContext}\n      previewAlt={transformOpts.previewAlt}\n    >\n      {domToReact(element.children as DOMNode[], parserOpts)}\n    </ConceptEmbed>\n  );\n};\n"],"mappings":";;;;;AAaA,MAAaA,qBAAiC,CAAC,SAAS,YAAY,kBAAkB;CACpF,MAAM,QAAQ,kBAAkB,QAAQ,QAAQ;CAChD,MAAM,OAAO,KAAK,MAAM,MAAM,aAAuB;AACrD,wBACE,IAAC;EACC,OAAO;EACP,MAAM,cAAc;EACpB,eAAe,cAAc;EAC7B,YAAY,cAAc;YAEzB,WAAW,QAAQ,UAAuB,WAAW;GACzC;AAElB"}

package/es/plugins/mathPlugin.js

@@ -5,6 +5,7 @@ import { jsx } from "react/jsx-runtime";
 const mathPlugin = (node) => {
 	const { "data-math": mathContent,...props } = attributesToProps(node.attribs);
 	return /* @__PURE__ */ jsx("math", {
+		xmlns: "http://www.w3.org/1998/Math/MathML",
 		...props,
 		dangerouslySetInnerHTML: { __html: mathContent }
 	});

package/es/plugins/mathPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"mathPlugin.js","names":["mathPlugin: PluginType"],"sources":["../../src/plugins/mathPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type PluginType } from \"./types\";\nexport const mathPlugin: PluginType = (node) => {\n  const { \"data-math\": mathContent, ...props } = attributesToProps(node.attribs);\n  // @ts-expect-error - math is a valid tag\n  return <math {...props} dangerouslySetInnerHTML={{ __html: mathContent }} />;\n};\n"],"mappings":";;;;AAUA,MAAaA,aAAyB,CAAC,SAAS;CAC9C,MAAM,EAAE,aAAa,YAAa,GAAG,OAAO,GAAG,kBAAkB,KAAK,QAAQ;AAE9E,wBAAO,IAAC;EAAK,GAAI;EAAO,yBAAyB,EAAE,QAAQ,YAAa;GAAI;AAC7E"}
+{"version":3,"file":"mathPlugin.js","names":["mathPlugin: PluginType"],"sources":["../../src/plugins/mathPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type PluginType } from \"./types\";\nexport const mathPlugin: PluginType = (node) => {\n  const { \"data-math\": mathContent, ...props } = attributesToProps(node.attribs);\n  return (\n    // @ts-expect-error - math is a valid tag\n    <math xmlns=\"http://www.w3.org/1998/Math/MathML\" {...props} dangerouslySetInnerHTML={{ __html: mathContent }} />\n  );\n};\n"],"mappings":";;;;AAUA,MAAaA,aAAyB,CAAC,SAAS;CAC9C,MAAM,EAAE,aAAa,YAAa,GAAG,OAAO,GAAG,kBAAkB,KAAK,QAAQ;AAC9E,wBAEE,IAAC;EAAK,OAAM;EAAqC,GAAI;EAAO,yBAAyB,EAAE,QAAQ,YAAa;GAAI;AAEnH"}

package/lib/plugins/embed/conceptEmbedPlugin.js

@@ -4,14 +4,15 @@ const __ndla_ui = require_rolldown_runtime.__toESM(require("@ndla/ui"));
 const react_jsx_runtime = require_rolldown_runtime.__toESM(require("react/jsx-runtime"));
 
 //#region src/plugins/embed/conceptEmbedPlugin.tsx
-const conceptEmbedPlugin = (element, _, opts) => {
+const conceptEmbedPlugin = (element, parserOpts, transformOpts) => {
 	const props = (0, html_react_parser.attributesToProps)(element.attribs);
 	const data = JSON.parse(props["data-json"]);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__ndla_ui.ConceptEmbed, {
 		embed: data,
-		lang: opts.articleLanguage,
-		renderContext: opts.renderContext,
-		previewAlt: opts.previewAlt
+		lang: transformOpts.articleLanguage,
+		renderContext: transformOpts.renderContext,
+		previewAlt: transformOpts.previewAlt,
+		children: (0, html_react_parser.domToReact)(element.children, parserOpts)
 	});
 };
 

package/lib/plugins/embed/conceptEmbedPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"conceptEmbedPlugin.js","names":["conceptEmbedPlugin: PluginType","ConceptEmbed"],"sources":["../../../src/plugins/embed/conceptEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type ConceptMetaData } from \"@ndla/types-embed\";\nimport { ConceptEmbed } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport const conceptEmbedPlugin: PluginType = (element, _, opts) => {\n  const props = attributesToProps(element.attribs);\n  const data = JSON.parse(props[\"data-json\"] as string) as ConceptMetaData;\n  return (\n    <ConceptEmbed\n      embed={data}\n      lang={opts.articleLanguage}\n      renderContext={opts.renderContext}\n      previewAlt={opts.previewAlt}\n    />\n  );\n};\n"],"mappings":";;;;;;AAaA,MAAaA,qBAAiC,CAAC,SAAS,GAAG,SAAS;CAClE,MAAM,QAAQ,yCAAkB,QAAQ,QAAQ;CAChD,MAAM,OAAO,KAAK,MAAM,MAAM,aAAuB;AACrD,wBACE,2BAACC;EACC,OAAO;EACP,MAAM,KAAK;EACX,eAAe,KAAK;EACpB,YAAY,KAAK;GACjB;AAEL"}
+{"version":3,"file":"conceptEmbedPlugin.js","names":["conceptEmbedPlugin: PluginType","ConceptEmbed"],"sources":["../../../src/plugins/embed/conceptEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps, domToReact, type DOMNode } from \"html-react-parser\";\nimport { type ConceptMetaData } from \"@ndla/types-embed\";\nimport { ConceptEmbed } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport const conceptEmbedPlugin: PluginType = (element, parserOpts, transformOpts) => {\n  const props = attributesToProps(element.attribs);\n  const data = JSON.parse(props[\"data-json\"] as string) as ConceptMetaData;\n  return (\n    <ConceptEmbed\n      embed={data}\n      lang={transformOpts.articleLanguage}\n      renderContext={transformOpts.renderContext}\n      previewAlt={transformOpts.previewAlt}\n    >\n      {domToReact(element.children as DOMNode[], parserOpts)}\n    </ConceptEmbed>\n  );\n};\n"],"mappings":";;;;;;AAaA,MAAaA,qBAAiC,CAAC,SAAS,YAAY,kBAAkB;CACpF,MAAM,QAAQ,yCAAkB,QAAQ,QAAQ;CAChD,MAAM,OAAO,KAAK,MAAM,MAAM,aAAuB;AACrD,wBACE,2BAACC;EACC,OAAO;EACP,MAAM,cAAc;EACpB,eAAe,cAAc;EAC7B,YAAY,cAAc;YAEzB,kCAAW,QAAQ,UAAuB,WAAW;GACzC;AAElB"}

package/lib/plugins/mathPlugin.js

@@ -6,6 +6,7 @@ const react_jsx_runtime = require_rolldown_runtime.__toESM(require("react/jsx-ru
 const mathPlugin = (node) => {
 	const { "data-math": mathContent,...props } = (0, html_react_parser.attributesToProps)(node.attribs);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("math", {
+		xmlns: "http://www.w3.org/1998/Math/MathML",
 		...props,
 		dangerouslySetInnerHTML: { __html: mathContent }
 	});

package/lib/plugins/mathPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"mathPlugin.js","names":["mathPlugin: PluginType"],"sources":["../../src/plugins/mathPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type PluginType } from \"./types\";\nexport const mathPlugin: PluginType = (node) => {\n  const { \"data-math\": mathContent, ...props } = attributesToProps(node.attribs);\n  // @ts-expect-error - math is a valid tag\n  return <math {...props} dangerouslySetInnerHTML={{ __html: mathContent }} />;\n};\n"],"mappings":";;;;;AAUA,MAAaA,aAAyB,CAAC,SAAS;CAC9C,MAAM,EAAE,aAAa,YAAa,GAAG,OAAO,GAAG,yCAAkB,KAAK,QAAQ;AAE9E,wBAAO,2BAAC;EAAK,GAAI;EAAO,yBAAyB,EAAE,QAAQ,YAAa;GAAI;AAC7E"}
+{"version":3,"file":"mathPlugin.js","names":["mathPlugin: PluginType"],"sources":["../../src/plugins/mathPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type PluginType } from \"./types\";\nexport const mathPlugin: PluginType = (node) => {\n  const { \"data-math\": mathContent, ...props } = attributesToProps(node.attribs);\n  return (\n    // @ts-expect-error - math is a valid tag\n    <math xmlns=\"http://www.w3.org/1998/Math/MathML\" {...props} dangerouslySetInnerHTML={{ __html: mathContent }} />\n  );\n};\n"],"mappings":";;;;;AAUA,MAAaA,aAAyB,CAAC,SAAS;CAC9C,MAAM,EAAE,aAAa,YAAa,GAAG,OAAO,GAAG,yCAAkB,KAAK,QAAQ;AAC9E,wBAEE,2BAAC;EAAK,OAAM;EAAqC,GAAI;EAAO,yBAAyB,EAAE,QAAQ,YAAa;GAAI;AAEnH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/article-converter",
-  "version": "10.0.133-alpha.0",
+  "version": "10.0.135-alpha.0",
   "description": "Transforms NDLA articles into extended html versions",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -29,12 +29,12 @@
   ],
   "devDependencies": {
     "@ndla/types-backend": "^1.0.50",
-    "@ndla/types-embed": "^5.0.15-alpha.0"
+    "@ndla/types-embed": "^5.0.16-alpha.0"
   },
   "dependencies": {
     "@ndla/primitives": "^1.0.93-alpha.0",
     "@ndla/safelink": "^7.0.95-alpha.0",
-    "@ndla/ui": "^56.0.130-alpha.0",
+    "@ndla/ui": "^56.0.132-alpha.0",
     "html-react-parser": "^5.1.19"
   },
   "peerDependencies": {
@@ -47,5 +47,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7ce19c361e51c5ed4460cf952a7764b9f017f41e"
+  "gitHead": "acbf5abd6a95cb34bc345df93895ac4e37b0b88e"
 }

package/src/plugins/embed/conceptEmbedPlugin.tsx

@@ -6,20 +6,22 @@
  *
  */
 
-import { attributesToProps } from "html-react-parser";
+import { attributesToProps, domToReact, type DOMNode } from "html-react-parser";
 import { type ConceptMetaData } from "@ndla/types-embed";
 import { ConceptEmbed } from "@ndla/ui";
 import { type PluginType } from "../types";
 
-export const conceptEmbedPlugin: PluginType = (element, _, opts) => {
+export const conceptEmbedPlugin: PluginType = (element, parserOpts, transformOpts) => {
   const props = attributesToProps(element.attribs);
   const data = JSON.parse(props["data-json"] as string) as ConceptMetaData;
   return (
     <ConceptEmbed
       embed={data}
-      lang={opts.articleLanguage}
-      renderContext={opts.renderContext}
-      previewAlt={opts.previewAlt}
-    />
+      lang={transformOpts.articleLanguage}
+      renderContext={transformOpts.renderContext}
+      previewAlt={transformOpts.previewAlt}
+    >
+      {domToReact(element.children as DOMNode[], parserOpts)}
+    </ConceptEmbed>
   );
 };

package/src/plugins/mathPlugin.tsx

@@ -10,6 +10,8 @@ import { attributesToProps } from "html-react-parser";
 import { type PluginType } from "./types";
 export const mathPlugin: PluginType = (node) => {
   const { "data-math": mathContent, ...props } = attributesToProps(node.attribs);
-  // @ts-expect-error - math is a valid tag
-  return <math {...props} dangerouslySetInnerHTML={{ __html: mathContent }} />;
+  return (
+    // @ts-expect-error - math is a valid tag
+    <math xmlns="http://www.w3.org/1998/Math/MathML" {...props} dangerouslySetInnerHTML={{ __html: mathContent }} />
+  );
 };