@adobe/helix-md2jcr 1.1.27 → 1.1.29

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.1.29](https://github.com/adobe/helix-md2jcr/compare/v1.1.28...v1.1.29) (2025-07-29)
+
+
+### Bug Fixes
+
+* report content failing to map to the model ([#128](https://github.com/adobe/helix-md2jcr/issues/128)) ([52f9989](https://github.com/adobe/helix-md2jcr/commit/52f99890b6c7145afae65d784af62c09b25c9495)), closes [#127](https://github.com/adobe/helix-md2jcr/issues/127)
+
+## [1.1.28](https://github.com/adobe/helix-md2jcr/compare/v1.1.27...v1.1.28) (2025-07-16)
+
+
+### Bug Fixes
+
+* **deps:** update external major ([#16](https://github.com/adobe/helix-md2jcr/issues/16)) ([20a1999](https://github.com/adobe/helix-md2jcr/commit/20a1999bc2ae2f5fb3755a3da029b38f5b5e9f58))
+
 ## [1.1.27](https://github.com/adobe/helix-md2jcr/compare/v1.1.26...v1.1.27) (2025-07-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-md2jcr",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "description": "Helix Service that converts markdown to JCR content structure",
   "main": "src/index.js",
   "type": "module",
@@ -32,13 +32,13 @@
     "@adobe/helix-markdown-support": "7.1.12",
     "@adobe/helix-shared-process-queue": "3.1.3",
     "@adobe/remark-gridtables": "3.0.14",
-    "entities": "^5.0.0",
+    "entities": "^6.0.0",
     "github-slugger": "2.0.0",
     "handlebars": "^4.7.8",
     "hast-util-is-element": "3.0.0",
     "hast-util-to-html": "^9.0.3",
     "hast-util-to-mdast": "10.1.2",
-    "image-size": "1.2.1",
+    "image-size": "2.0.2",
     "mdast-util-to-hast": "^13.2.0",
     "mdast-util-to-string": "^4.0.0",
     "mime": "4.0.7",
@@ -55,23 +55,23 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "3.0.8",
-    "@adobe/helix-mediahandler": "2.7.17",
+    "@adobe/helix-mediahandler": "2.7.21",
     "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
     "@semantic-release/changelog": "6.0.3",
-    "@semantic-release/exec": "6.0.3",
+    "@semantic-release/exec": "7.1.0",
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.3",
     "chai": "^5.2.0",
-    "dotenv": "16.6.1",
+    "dotenv": "17.2.1",
     "eslint": "^9.0.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.32.0",
     "husky": "^9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "15.5.2",
-    "mocha": "10.8.2",
+    "lint-staged": "16.1.2",
+    "mocha": "11.7.1",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.5.6",
     "semantic-release": "24.2.7",

package/src/mdast2jcr/hb/partials/grid-table.js

@@ -199,10 +199,25 @@ function extractKeyValueProperties(row, model, fieldResolver, fieldGroup, proper
 
 function processCell(cell, fieldGroup, fieldResolver, properties) {
   const cellChildren = cell.children;
+
   if (cellChildren.length !== 0) {
+    // while the cell has children we need to process the fields in the fieldGroup
+    // if we run out of fields but there are still more nodes, then we need to throw an error
+    // because the model does not map correctly to the content
     while (cellChildren.length > 0) {
       const node = cellChildren.shift();
+
+      // have we run out of fields?
+      if (fieldGroup.fields.length === 0) {
+        let errorMsg = 'The content isn’t mapping to the model correctly, likely due to the import ';
+        errorMsg += 'script generating incompatible markdown. Review the model file and ensure the ';
+        errorMsg += 'import script meets all column and row requirements, every field must align ';
+        errorMsg += 'with a column, even if empty.';
+        throw new Error(errorMsg);
+      }
+
       const field = fieldResolver.resolve(node, fieldGroup);
+
       let pWrapper;
       if (field.component === 'richtext') {
         pWrapper = {
@@ -294,7 +309,7 @@ function extractProperties(mdast, model, mode, component, fields, properties) {
         if (mode === 'blockItem') {
           fieldGroup = fieldsCloned.shift();
         }
-        processCell(cell, fieldGroup, fieldResolver, properties, mode);
+        processCell(cell, fieldGroup, fieldResolver, properties);
       }
     }
   }
@@ -447,45 +462,53 @@ function gridTablePartial(context) {
     filters,
   );
 
+  // children of the parent block
+  let blockItems;
+
   // it is possible that a block (Accordion) does not have a model, but the
   // child component will, which will be handled in the Component Block Processing
   // section
-  if (model) {
-    fieldGroup = modelHelper.getModelFieldGroup(model.id);
-    extractProperties(mdast, model, mode, component, fieldGroup.fields, properties);
-  } else {
-    // because we have no model we expect the block to have a filter with a component that does
-    // so that means we can remove the header row from the mdast tree
-    remove(mdast, (n) => is(n, { type: 'gtHeader' }));
-  }
+  try {
+    if (model) {
+      fieldGroup = modelHelper.getModelFieldGroup(model.id);
+      extractProperties(mdast, model, mode, component, fieldGroup.fields, properties);
+    } else {
+      // because we have no model we expect the block to have a filter with a component that does
+      // so that means we can remove the header row from the mdast tree
+      remove(mdast, (n) => is(n, { type: 'gtHeader' }));
+    }
 
-  // sort all the properties so that they are in a consistent order
-  // helpful for debugging and xml readability
-  const sorted = Object.entries(properties).sort(sortJcrProperties);
-  blockProperties = sorted.map(([k, v]) => `${k}="${v}"`).join(' ');
-
-  // *****************************************************
-  // Component Block Processing
-  // *****************************************************
-  // 1. In this section attempt to locate the associated model for the block.
-  // 2. Trim the mdast nodes to only be relevant for the child block.
-  // 3. Then getBlockitems will process the mdast nodes and return the block items.
-  const allowedComponents = filters.find((f) => f.id === component.filterId)?.components || [];
-  // collect all rows
-  const blockRows = findAll(mdast, (node) => node.type === 'gtRow', true);
-  // the fieldGroup (parent model) determines the expected number of rows in the table
-  // so we can remove the rows that belong to the parent and leave only the
-  // relevant rows for the child
-  if (model) {
-    const removed = blockRows.splice(0, fieldGroup.fields.length + 1);
-    // remove the elements from the mdast tree that match the items in the removed array
-    removed.forEach((r) => {
-      remove(mdast, (n) => is(n, r));
-    });
+    // sort all the properties so that they are in a consistent order
+    // helpful for debugging and xml readability
+    const sorted = Object.entries(properties).sort(sortJcrProperties);
+    blockProperties = sorted.map(([k, v]) => `${k}="${v}"`).join(' ');
+
+    // *****************************************************
+    // Component Block Processing
+    // *****************************************************
+    // 1. In this section attempt to locate the associated model for the block.
+    // 2. Trim the mdast nodes to only be relevant for the child block.
+    // 3. Then getBlockitems will process the mdast nodes and return the block items.
+    const allowedComponents = filters.find((f) => f.id === component.filterId)?.components || [];
+    // collect all rows
+    const blockRows = findAll(mdast, (node) => node.type === 'gtRow', true);
+    // the fieldGroup (parent model) determines the expected number of rows in the table
+    // so we can remove the rows that belong to the parent and leave only the
+    // relevant rows for the child
+    if (model) {
+      const removed = blockRows.splice(0, fieldGroup.fields.length + 1);
+      // remove the elements from the mdast tree that match the items in the removed array
+      removed.forEach((r) => {
+        remove(mdast, (n) => is(n, r));
+      });
+    }
+    blockItems = getBlockItems(mdast, modelHelper, definition, allowedComponents) || [];
+  } catch (e) {
+    const blockname = `${blockHeaderProperties.name} ${blockHeaderProperties.classes ? `(${blockHeaderProperties.classes})` : ''}`;
+    const msg = `${blockname} has errors!`;
+    throw new Error(`${msg}\n${e?.message || e}`);
   }
 
-  const blockItems = getBlockItems(mdast, modelHelper, definition, allowedComponents) || [];
-
   return `<block${uniqueName} ${blockProperties}>${blockItems.length > 0 ? blockItems.join('\n') : ''}</block${uniqueName}>`;
 }