@adobe/helix-md2jcr 1.1.11 → 1.1.13

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.1.13](https://github.com/adobe/helix-md2jcr/compare/v1.1.12...v1.1.13) (2025-04-15)
+
+
+### Bug Fixes
+
+* **sites-30804:** container blocks throw error with empty cell ([#82](https://github.com/adobe/helix-md2jcr/issues/82)) ([abbd3c2](https://github.com/adobe/helix-md2jcr/commit/abbd3c28a44990e29e08f242e13954f14fb63bbe))
+
+## [1.1.12](https://github.com/adobe/helix-md2jcr/compare/v1.1.11...v1.1.12) (2025-04-10)
+
+
+### Bug Fixes
+
+* missing required primary type on block items ([#81](https://github.com/adobe/helix-md2jcr/issues/81)) ([e5d2139](https://github.com/adobe/helix-md2jcr/commit/e5d2139620fa00d76a4a051250e4c7eb9e0949a7))
+
 ## [1.1.11](https://github.com/adobe/helix-md2jcr/compare/v1.1.10...v1.1.11) (2025-04-07)
 
 

package/baseline-tests.sh

@@ -2,14 +2,15 @@
 
 # create a function that prints the usage of the script
 usage() {
-  echo "Usage: $0 [-v] [-d]"
+  echo "Usage: $0 [-v] [-d] [-f file]"
   echo "  -v: Verbose mode"
   echo "  -d: Decode output mode"
+  echo "  -f: Specify a single file to process"
   exit 1
 }
 
-# verify that the command arguments are only -v or -d if any other commands are found exit with an error. If -d is present but -v is not present, exit with an error.
-while getopts ":vd" opt; do
+# verify that the command arguments are only -v, -d, or -f if any other commands are found exit with an error
+while getopts ":vdf:" opt; do
   case ${opt} in
     v )
       VERBOSE="true"
@@ -17,6 +18,9 @@ while getopts ":vd" opt; do
     d )
       DECODE="true"
       ;;
+    f )
+      SPECIFIC_FILE="$OPTARG"
+      ;;
     \? )
       echo "Invalid option: $OPTARG" 1>&2
       usage
@@ -28,7 +32,6 @@ while getopts ":vd" opt; do
   esac
 done
 
-
 # Set the root directory to search for .md files
 MD_DIR="test/fixtures"
 
@@ -41,6 +44,31 @@ if [ ! -d "$MD_DIR" ]; then
   exit 1
 fi
 
+ARGS=""
+[ "$VERBOSE" = "true" ] && ARGS="$ARGS -v"
+[ "$DECODE" = "true" ] && ARGS="$ARGS -d"
+
+# If a specific file is provided, process only that file
+if [ -n "$SPECIFIC_FILE" ]; then
+  if [ ! -f "$SPECIFIC_FILE" ]; then
+    echo "File $SPECIFIC_FILE does not exist."
+    exit 1
+  fi
+  
+  echo "Processing $SPECIFIC_FILE..."
+  [ "$VERBOSE" = "true" ] && echo
+  
+  node "$NODE_SCRIPT" "$SPECIFIC_FILE" $ARGS 2>/dev/null
+  
+  if [ $? -ne 0 ]; then
+    echo "Error processing $SPECIFIC_FILE with $NODE_SCRIPT."
+    exit 1
+  fi
+  
+  echo "File processed successfully."
+  exit 0
+fi
+
 # Find all .md files recursively in the directory
 MD_FILES=$(find "$MD_DIR" -type f -name "*.md")
 
@@ -50,10 +78,6 @@ if [ -z "$MD_FILES" ]; then
   exit 1
 fi
 
-ARGS=""
-[ "$VERBOSE" = "true" ] && ARGS="$ARGS -v"
-[ "$DECODE" = "true" ] && ARGS="$ARGS -d"
-
 # Iterate over each .md file
 for MD_FILE in $MD_FILES; do
   # if VERBOSE is true then echo a new line
@@ -74,5 +98,4 @@ for MD_FILE in $MD_FILES; do
   fi
 done
 
-
 echo "All .md files have been processed successfully."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-md2jcr",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "Helix Service that converts markdown to JCR content structure",
   "main": "src/index.js",
   "type": "module",
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.9",
-    "@adobe/helix-mediahandler": "2.6.10",
+    "@adobe/helix-mediahandler": "2.6.12",
     "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
     "@semantic-release/changelog": "6.0.3",
@@ -63,14 +63,14 @@
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.3",
     "chai": "^5.2.0",
-    "dotenv": "16.4.7",
+    "dotenv": "16.5.0",
     "eslint": "8.57.1",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.31.0",
     "husky": "^9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "15.5.0",
+    "lint-staged": "15.5.1",
     "mocha": "10.8.2",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.5.6",

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

@@ -34,6 +34,7 @@ import ModelHelper from '../../domain/ModelHelper.js';
 /**
  * @typedef {import('../../index.d.ts').FieldDef} Field
  * @typedef {import('../../index.d.ts').DefinitionDef} Definition
+ * @typedef {import('../../index.d.ts').Filter} Filters
  */
 
 /**
@@ -188,16 +189,41 @@ function extractKeyValueProperties(row, model, fieldResolver, fieldGroup, proper
   }
 }
 
-/**
- * Given a row, a component, and a model, extract the properties from the row
- * @param {object} mdast - the mdast tree.
- * @param {Model} model - the model.
- * @param {string} mode - the mode either 'keyValue' or 'simple'.
- * @param {Component} component - the component.
- * @param fields - the field grouping object.
- * @param properties
- * @return {{}} - the properties
- */
+function processCell(cell, fieldGroup, fieldResolver, properties) {
+  const cellChildren = cell.children;
+  if (cellChildren.length !== 0) {
+    while (cellChildren.length > 0) {
+      const node = cellChildren.shift();
+      const field = fieldResolver.resolve(node, fieldGroup);
+      let pWrapper;
+      if (field.component === 'richtext') {
+        pWrapper = {
+          type: 'wrapper',
+          children: [node],
+        };
+
+        let searching = true;
+
+        while (searching) {
+          const n = cellChildren.shift();
+          if (!n) break;
+
+          if (find(n, { type: 'image' })) {
+            cellChildren.unshift(n);
+            searching = false;
+          }
+          if (searching) {
+            pWrapper.children.push(n);
+          }
+        }
+      } else {
+        pWrapper = node;
+      }
+      extractPropertiesForNode(field, pWrapper, properties);
+    }
+  }
+}
+
 function extractProperties(mdast, model, mode, component, fields, properties) {
   const fieldsCloned = structuredClone(fields);
 
@@ -251,57 +277,11 @@ function extractProperties(mdast, model, mode, component, fields, properties) {
     if (mode === 'keyValue') {
       extractKeyValueProperties(row, model, fieldResolver, fieldGroup, properties);
     } else {
-      // for each cell in the row, process the nodes that exist in the cell
-      let processing = false;
       for (const cell of cells) {
-        if (mode === 'blockItem' && !processing) {
+        if (mode === 'blockItem') {
           fieldGroup = fieldsCloned.shift();
         }
-
-        const nodes = cell.children;
-        if (nodes.length === 0) {
-          // throw away the field that was associated with the cell
-          fieldGroup.fields.shift();
-          processing = true;
-          // if there are no nodes in the cell, then we need to skip it
-        } else {
-          while (nodes.length > 0) {
-            const node = nodes.shift();
-
-            // give the field group (all fields to the resolver)
-            if (fieldGroup === undefined) {
-              console.warn(`No field group for ${model.id}`);
-              return;
-            }
-
-            const field = fieldResolver.resolve(node, fieldGroup);
-            let pWrapper;
-            if (field.component === 'richtext') {
-              pWrapper = {
-                type: 'wrapper',
-                children: [node],
-              };
-
-              let searching = true;
-
-              while (searching) {
-                const n = nodes.shift();
-                if (!n) break;
-
-                if (find(n, { type: 'image' })) {
-                  nodes.unshift(n);
-                  searching = false;
-                }
-                if (searching) {
-                  pWrapper.children.push(n);
-                }
-              }
-            } else {
-              pWrapper = node;
-            }
-            extractPropertiesForNode(field, pWrapper, properties);
-          }
-        }
+        processCell(cell, fieldGroup, fieldResolver, properties, mode);
       }
     }
   }
@@ -377,15 +357,8 @@ function getBlockItems(mdast, modelHelper, definitions, allowedComponents) {
         };
 
         extractProperties(row, fieldGroup.model, 'blockItem', component, fieldGroup.fields, properties);
-
-        items.push(`<item_${items.length} sling:resourceType="core/franklin/components/block/v1/block/item" name="${fieldGroup.model.id}" ${Object.entries(properties).map(([k, v]) => `${k}="${v}"`).join(' ')}></item_${items.length}>`);
+        items.push(`<item_${items.length} jcr:primaryType="nt:unstructured" sling:resourceType="core/franklin/components/block/v1/block/item" name="${fieldGroup.model.id}" ${Object.entries(properties).map(([k, v]) => `${k}="${v}"`).join(' ')}></item_${items.length}>`);
       }
-    } else {
-      // const msg = `The component '${componentId}' is not allowed in the block
-      // '${modelHelper.blockName}'. Modify the ${modelHelper.blockName} filters
-      // file to include the '${componentId}' component in the list of
-      // components.`;
-      // console.error(msg);
     }
   });