@ndla/article-converter 2.3.14 → 2.3.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
3
3
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
4
4
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
5
5
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
6
- function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
6
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
7
7
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
8
8
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
9
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -59,10 +59,12 @@ export var divPlugin = function divPlugin(node, opts) {
59
59
  }));
60
60
  } else if (node.attribs['data-type'] === 'grid' && node.children.length > 0) {
61
61
  var _props2 = attributesToProps(node.attribs);
62
- var columns = Number.parseInt(_props2['data-columns']);
62
+ var columns = _props2['data-columns'];
63
63
  var border = _props2['data-border'];
64
64
  var background = _props2['data-background'];
65
+ var frontpage = !!_props2['data-size'];
65
66
  return _jsx(Grid, _objectSpread(_objectSpread({
67
+ isFrontpage: frontpage,
66
68
  border: border,
67
69
  columns: columns,
68
70
  background: background
@@ -21,7 +21,7 @@ export var olPlugin = function olPlugin(node, opts) {
21
21
  var letterClass = node.attribs['data-type'] === 'letters' ? 'ol-list--roman' : false;
22
22
  var num = node.attribs['start'];
23
23
  var numClass = num ? "ol-reset-".concat(num) : false;
24
- var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : false, letterClass, numClass].filter(function (c) {
24
+ var classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : false, letterClass, numClass].filter(function (c) {
25
25
  return !!c;
26
26
  }).join(' ');
27
27
  return _jsx(OrderedList, _objectSpread(_objectSpread({}, props), {}, {
@@ -18,7 +18,7 @@ export var paragraphPlugin = function paragraphPlugin(node, opts) {
18
18
  if (node.attribs['data-align'] === 'center') {
19
19
  var _node$attribs$class;
20
20
  var props = attributesToProps(node.attribs);
21
- var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', 'u-text-center'].filter(function (c) {
21
+ var classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', 'u-text-center'].filter(function (c) {
22
22
  return !!c;
23
23
  }).join(' ');
24
24
  return _jsx("p", _objectSpread(_objectSpread({}, props), {}, {
@@ -20,7 +20,7 @@ export var spanPlugin = function spanPlugin(node, opts) {
20
20
  var props = attributesToProps(node.attribs);
21
21
  return _jsx("span", _objectSpread(_objectSpread({}, props), {}, {
22
22
  "data-size": undefined,
23
- className: "".concat((_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', " u-large-body-text"),
23
+ className: "".concat((_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', " u-large-body-text"),
24
24
  children: domToReact(node.children, opts)
25
25
  }));
26
26
  }
@@ -18,7 +18,7 @@ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
18
18
  export var ulPlugin = function ulPlugin(node, opts) {
19
19
  var _node$attribs$class;
20
20
  var props = attributesToProps(node.attribs);
21
- var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', node.attribs['data-type'] === 'two-column' ? 'o-list--two-columns' : ''].filter(function (c) {
21
+ var classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', node.attribs['data-type'] === 'two-column' ? 'o-list--two-columns' : ''].filter(function (c) {
22
22
  return !!c;
23
23
  }).join(' ');
24
24
  return _jsx(UnOrderedList, _objectSpread(_objectSpread({}, props), {}, {
@@ -3,9 +3,9 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports["default"] = void 0;
6
+ exports.default = void 0;
7
7
  var _htmlReactParser = _interopRequireDefault(require("html-react-parser"));
8
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
8
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
9
9
  /**
10
10
  * Copyright (c) 2023-present, NDLA.
11
11
  *
@@ -15,11 +15,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
15
15
  */
16
16
 
17
17
  var extractEmbedMeta = function extractEmbedMeta(embed) {
18
- var node = (0, _htmlReactParser["default"])(embed);
18
+ var node = (0, _htmlReactParser.default)(embed);
19
19
  if (typeof node === 'string' || Array.isArray(node) || node.type !== 'ndlaembed' || !node.props['data-json']) {
20
20
  return;
21
21
  }
22
22
  return JSON.parse(node.props['data-json']);
23
23
  };
24
24
  var _default = extractEmbedMeta;
25
- exports["default"] = _default;
25
+ exports.default = _default;
package/lib/index.js CHANGED
@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", {
6
6
  Object.defineProperty(exports, "extractEmbedMeta", {
7
7
  enumerable: true,
8
8
  get: function get() {
9
- return _extractEmbedMeta["default"];
9
+ return _extractEmbedMeta.default;
10
10
  }
11
11
  });
12
12
  Object.defineProperty(exports, "transform", {
13
13
  enumerable: true,
14
14
  get: function get() {
15
- return _transform["default"];
15
+ return _transform.default;
16
16
  }
17
17
  });
18
18
  var _transform = _interopRequireDefault(require("./transform"));
19
19
  var _extractEmbedMeta = _interopRequireDefault(require("./extractEmbedMeta"));
20
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -8,13 +8,13 @@ var _partition3 = _interopRequireDefault(require("lodash/partition"));
8
8
  var _htmlReactParser = require("html-react-parser");
9
9
  var _ui = require("@ndla/ui");
10
10
  var _jsxRuntime = require("@emotion/react/jsx-runtime");
11
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
12
  function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
13
13
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
14
14
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
15
15
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
16
16
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
17
- function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
17
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
18
18
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
19
19
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
20
20
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -39,7 +39,7 @@ var divPlugin = function divPlugin(node, opts) {
39
39
  var elements = node.childNodes.filter(function (c) {
40
40
  return c.type === 'tag' && c.name === 'ndlaembed' && c.attribs['data-resource'] === 'file';
41
41
  });
42
- var _partition = (0, _partition3["default"])(elements, function (el) {
42
+ var _partition = (0, _partition3.default)(elements, function (el) {
43
43
  return el.attribs['data-type'] === 'pdf' && el.attribs['data-display'] === 'block';
44
44
  }),
45
45
  _partition2 = _slicedToArray(_partition, 2),
@@ -62,10 +62,12 @@ var divPlugin = function divPlugin(node, opts) {
62
62
  }));
63
63
  } else if (node.attribs['data-type'] === 'grid' && node.children.length > 0) {
64
64
  var _props2 = (0, _htmlReactParser.attributesToProps)(node.attribs);
65
- var columns = Number.parseInt(_props2['data-columns']);
65
+ var columns = _props2['data-columns'];
66
66
  var border = _props2['data-border'];
67
67
  var background = _props2['data-background'];
68
+ var frontpage = !!_props2['data-size'];
68
69
  return (0, _jsxRuntime.jsx)(_ui.Grid, _objectSpread(_objectSpread({
70
+ isFrontpage: frontpage,
69
71
  border: border,
70
72
  columns: columns,
71
73
  background: background
@@ -25,7 +25,7 @@ var olPlugin = function olPlugin(node, opts) {
25
25
  var letterClass = node.attribs['data-type'] === 'letters' ? 'ol-list--roman' : false;
26
26
  var num = node.attribs['start'];
27
27
  var numClass = num ? "ol-reset-".concat(num) : false;
28
- var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : false, letterClass, numClass].filter(function (c) {
28
+ var classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : false, letterClass, numClass].filter(function (c) {
29
29
  return !!c;
30
30
  }).join(' ');
31
31
  return (0, _jsxRuntime.jsx)(_ui.OrderedList, _objectSpread(_objectSpread({}, props), {}, {
@@ -22,7 +22,7 @@ var paragraphPlugin = function paragraphPlugin(node, opts) {
22
22
  if (node.attribs['data-align'] === 'center') {
23
23
  var _node$attribs$class;
24
24
  var props = (0, _htmlReactParser.attributesToProps)(node.attribs);
25
- var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', 'u-text-center'].filter(function (c) {
25
+ var classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', 'u-text-center'].filter(function (c) {
26
26
  return !!c;
27
27
  }).join(' ');
28
28
  return (0, _jsxRuntime.jsx)("p", _objectSpread(_objectSpread({}, props), {}, {
@@ -24,7 +24,7 @@ var spanPlugin = function spanPlugin(node, opts) {
24
24
  var props = (0, _htmlReactParser.attributesToProps)(node.attribs);
25
25
  return (0, _jsxRuntime.jsx)("span", _objectSpread(_objectSpread({}, props), {}, {
26
26
  "data-size": undefined,
27
- className: "".concat((_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', " u-large-body-text"),
27
+ className: "".concat((_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', " u-large-body-text"),
28
28
  children: (0, _htmlReactParser.domToReact)(node.children, opts)
29
29
  }));
30
30
  }
@@ -22,7 +22,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
22
22
  var ulPlugin = function ulPlugin(node, opts) {
23
23
  var _node$attribs$class;
24
24
  var props = (0, _htmlReactParser.attributesToProps)(node.attribs);
25
- var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', node.attribs['data-type'] === 'two-column' ? 'o-list--two-columns' : ''].filter(function (c) {
25
+ var classes = [(_node$attribs$class = node.attribs.class) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', node.attribs['data-type'] === 'two-column' ? 'o-list--two-columns' : ''].filter(function (c) {
26
26
  return !!c;
27
27
  }).join(' ');
28
28
  return (0, _jsxRuntime.jsx)(_ui.UnOrderedList, _objectSpread(_objectSpread({}, props), {}, {
package/lib/transform.js CHANGED
@@ -3,13 +3,13 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports["default"] = void 0;
6
+ exports.default = void 0;
7
7
  var _htmlReactParser = _interopRequireDefault(require("html-react-parser"));
8
8
  var _ui = require("@ndla/ui");
9
9
  var _plugins = require("./plugins");
10
10
  var _embed = require("./plugins/embed");
11
11
  var _jsxRuntime = require("@emotion/react/jsx-runtime");
12
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
12
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
  /**
14
14
  * Copyright (c) 2023-present, NDLA.
15
15
  *
@@ -40,8 +40,8 @@ var transform = function transform(content, opts) {
40
40
  }
41
41
  }
42
42
  };
43
- var replaced = (0, _htmlReactParser["default"])(content, options);
43
+ var replaced = (0, _htmlReactParser.default)(content, options);
44
44
  return replaced;
45
45
  };
46
46
  var _default = transform;
47
- exports["default"] = _default;
47
+ exports.default = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ndla/article-converter",
3
- "version": "2.3.14",
3
+ "version": "2.3.15",
4
4
  "description": "Transforms NDLA articles into extended html versions",
5
5
  "license": "GPL-3.0",
6
6
  "main": "lib/index.js",
@@ -30,8 +30,8 @@
30
30
  "@ndla/types-embed": "^2.0.5"
31
31
  },
32
32
  "dependencies": {
33
- "@ndla/code": "^2.2.13",
34
- "@ndla/ui": "^41.2.4",
33
+ "@ndla/code": "^2.2.14",
34
+ "@ndla/ui": "^41.2.5",
35
35
  "html-react-parser": "^3.0.8",
36
36
  "lodash": "^4.17.20"
37
37
  },
@@ -44,5 +44,5 @@
44
44
  "publishConfig": {
45
45
  "access": "public"
46
46
  },
47
- "gitHead": "f171d7eb3f2d97ae7e68f34576e560f9aac6d586"
47
+ "gitHead": "d5b859163608f1921fa425b333d5bbdd898c64d1"
48
48
  }
@@ -48,11 +48,12 @@ export const divPlugin: PluginType = (node, opts) => {
48
48
  );
49
49
  } else if (node.attribs['data-type'] === 'grid' && node.children.length > 0) {
50
50
  const props = attributesToProps(node.attribs);
51
- const columns = Number.parseInt(props['data-columns']) as GridType['columns'];
51
+ const columns = props['data-columns'] as GridType['columns'];
52
52
  const border = props['data-border'] as GridType['border'];
53
53
  const background = props['data-background'] as GridType['background'];
54
+ const frontpage = !!props['data-size'] as GridType['size'];
54
55
  return (
55
- <Grid border={border} columns={columns} background={background} {...props}>
56
+ <Grid isFrontpage={frontpage} border={border} columns={columns} background={background} {...props}>
56
57
  {/* @ts-ignore */}
57
58
  {domToReact(node.children, opts)}
58
59
  </Grid>