@adobe/helix-md2jcr 1.1.21 → 1.1.22

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.22](https://github.com/adobe/helix-md2jcr/compare/v1.1.21...v1.1.22) (2025-06-12)
+
+
+### Bug Fixes
+
+* **103:** custom section metadata fields not being added to jcr result ([#104](https://github.com/adobe/helix-md2jcr/issues/104)) ([bd4b5e6](https://github.com/adobe/helix-md2jcr/commit/bd4b5e69287badbd1ccead61066472231390c9eb))
+
 ## [1.1.21](https://github.com/adobe/helix-md2jcr/compare/v1.1.20...v1.1.21) (2025-05-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-md2jcr",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "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.7.8",
+    "@adobe/helix-mediahandler": "2.7.10",
     "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
     "@semantic-release/changelog": "6.0.3",

package/src/mdast2jcr/domain/Models.js

@@ -42,20 +42,18 @@ function getField(model, fieldName) {
 }
 
 /**
- * Return a comma-separated list of fields in the model. If no fields are found,
- * return an empty string.
- * @param model
- * @return {string}
+ * Return a list of field names in the model, excluding 'classes'.
+ * @param {Model} model The model.
+ * @return {Array<string>} An array of field names.
  */
-function getModelFields(model) {
+function getModelFieldNames(model) {
   return model.fields
     .map((f) => f.name)
-    .filter((f) => f !== 'classes')
-    .join(',');
+    .filter((f) => f !== 'classes');
 }
 
 export {
   getField,
   findModelById,
-  getModelFields,
+  getModelFieldNames,
 };

package/src/mdast2jcr/hb/helpers/page-helper.js

@@ -11,7 +11,11 @@
  */
 import { find } from 'unist-util-find';
 import { toString } from 'mdast-util-to-string';
-import { findModelById, getField, getModelFields } from '../../domain/Models.js';
+import {
+  findModelById,
+  getField,
+  getModelFieldNames,
+} from '../../domain/Models.js';
 import { findAll } from '../../utils/mdast.js';
 import { encodeHTMLEntities, stripNewlines } from '../../utils.js';
 import link from '../partials/supports/link.js';
@@ -70,8 +74,8 @@ function buildPageMetadata(table, models) {
   // we need to add a property called modelFields for the Universal Editor
   // that has all the fields for the model
   if (model) {
-    const fields = getModelFields(model);
-    mappedMetadata.modelFields = `[${fields}]`;
+    const fields = getModelFieldNames(model);
+    mappedMetadata.modelFields = `[${fields.join(',')}]`;
   }
 
   return mappedMetadata;

package/src/mdast2jcr/hb/helpers/section-helper.js

@@ -13,55 +13,168 @@ import Handlebars from 'handlebars';
 import { find } from 'unist-util-find';
 import { toString } from 'mdast-util-to-string';
 import { findAll } from '../../utils/mdast.js';
-import { findModelById, getField, getModelFields } from '../../domain/Models.js';
+import {
+  findModelById,
+  getField,
+  getModelFieldNames,
+} from '../../domain/Models.js';
+
+/**
+ * Normalizes strings by converting to lowercase and replacing spaces with hyphens
+ * @param {string} str
+ * @return {string}
+ */
+function normalizeString(str) {
+  return str.toLowerCase().replaceAll(' ', '-');
+}
+
+/**
+ * Helper function to find the section model ID from the grid table.
+ * @param {Node} tree
+ * @return {string|null}
+ */
+function getSectionModelId(tree) {
+  const blockModelIdCell = find(tree, { type: 'text', value: 'blockModelId' });
+  if (!blockModelIdCell) {
+    return null;
+  }
+
+  const parentRow = find(tree, (node) => node.type === 'gtRow' && find(node, (child) => child === blockModelIdCell));
+
+  if (!parentRow) {
+    return null;
+  }
+
+  const cells = findAll(parentRow, (node) => node.type === 'gtCell', true);
+  return cells.length > 1 ? toString(cells[1]) : null;
+}
+
+/**
+ * Processes metadata rows and extracts field values
+ * @param {Array} rows
+ * @param {Model} model
+ * @return {object} result with attributes and modelFields
+ */
+function processMetadataRows(rows, model) {
+  const attributes = {};
+
+  // always push the model fields so UE can use them, even if no attributes are found
+  const modelFields = getModelFieldNames(model);
+
+  for (const row of rows) {
+    const cells = findAll(row, (n) => n.type === 'gtCell', true);
+    if (cells.length < 2) {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+
+    const key = toString(cells[0])?.trim();
+    const value = toString(cells[1])?.trim();
+
+    // Skip empty keys/values and the special blockModelId field
+    if (!key || !value || key === 'blockModelId') {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+
+    const field = getField(model, key);
+    if (!field) {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+
+    if (field.component === 'multiselect') {
+      const multiValue = value.split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
+      attributes[key] = `[${multiValue.join(',')}]`;
+    } else {
+      attributes[key] = value;
+    }
+  }
+
+  return { attributes, modelFields };
+}
+
+/**
+ * Finds and processes the section metadata table
+ * @param {Array} children
+ * @param {Array} models
+ * @return {object|null}
+ */
+function findSectionMetadata(children, models) {
+  for (const child of children) {
+    if (child.type !== 'gridTable') {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+
+    const headerCell = find(child, { type: 'gtCell' });
+    if (!headerCell) {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+
+    const isMetadata = normalizeString(toString(headerCell)) === 'section-metadata';
+    if (!isMetadata) {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+
+    // Found section metadata table
+    const sectionModelId = getSectionModelId(child) || 'section';
+    const model = findModelById(models, sectionModelId);
+
+    if (!model) {
+      return null;
+    }
+
+    const [, ...rows] = findAll(child, (n) => n.type === 'gtRow', false);
+
+    const result = processMetadataRows(rows, model);
+
+    return {
+      attributes: result.attributes,
+      modelFields: result.modelFields,
+    };
+  }
+
+  // see if there is a global section model to use
+  const sectionModel = findModelById(models, 'section');
+  if (!sectionModel) {
+    return null;
+  }
+
+  return {
+    modelFields: getModelFieldNames(sectionModel),
+  };
+}
 
 function sectionHelper(index, children, options) {
-  const {
-    models,
-  } = options.data.root;
+  const { models } = options.data.root;
+  const uniqueName = Handlebars.helpers.nameHelper.call(this, 'section');
 
-  const attributes = {
+  const metadataResult = findSectionMetadata(children, models);
+
+  let attributes = {
     'sling:resourceType': 'core/franklin/components/section/v1/section',
     'jcr:primaryType': 'nt:unstructured',
   };
+  let modelFields = [];
 
-  const model = findModelById(models, 'section');
-  if (model) {
-    const fields = getModelFields(model);
-    attributes.modelFields = `[${fields}]`;
+  if (metadataResult) {
+    attributes = { ...attributes, ...metadataResult.attributes };
+    modelFields = metadataResult.modelFields;
   }
 
-  const uniqueName = Handlebars.helpers.nameHelper.call(this, 'section');
-
-  // find the table that has a gtHeader that has a header value that contains 'section-metadata'
-  for (const child of children) {
-    if (child.type === 'gridTable') {
-      const cell = find(child, { type: 'gtCell' });
-      if (cell) {
-        const isMetadata = toString(cell).toLowerCase().replaceAll(' ', '-') === 'section-metadata';
-        if (isMetadata) {
-          const [, ...rows] = findAll(child, (n) => n.type === 'gtRow', false);
-          for (const row of rows) {
-            const cells = findAll(row, (n) => n.type === 'gtCell', true);
-            const key = toString(cells[0]);
-            const value = toString(cells[1]);
-            if (key.trim() !== '' && value.trim() !== '') {
-              const field = getField(model, key);
-              if (field?.component === 'multiselect') {
-                const multiValue = value.split(',').map((s) => s.trim()).filter(Boolean);
-                attributes[key.toLowerCase().replaceAll(' ', '-')] = `[${multiValue.join(',')}]`;
-              } else {
-                attributes[key.toLowerCase().replaceAll(' ', '-')] = value;
-              }
-            }
-          }
-          break;
-        }
-      }
-    }
+  if (modelFields.length > 0) {
+    attributes.modelFields = `[${modelFields.join(',')}]`;
   }
 
-  const attributesStr = Object.entries(attributes).map(([k, v]) => `${k}="${v}"`).join(' ');
+  const attributesStr = Object.entries(attributes)
+    .map(([k, v]) => `${k}="${v}"`)
+    .join(' ');
+
   return `<section${uniqueName} ${attributesStr}>${options.fn(this)}</section${uniqueName}>`;
 }
 

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

@@ -18,7 +18,8 @@ import { toHast } from 'mdast-util-to-hast';
 import { toHtml } from 'hast-util-to-html';
 import { getComponentById, getComponentByTitle, getModelId } from '../../domain/Definitions.js';
 import {
-  findModelById, getField, getModelFields,
+  findModelById,
+  getField, getModelFieldNames,
 } from '../../domain/Models.js';
 import { findAll } from '../../utils/mdast.js';
 import link from './supports/link.js';
@@ -360,7 +361,7 @@ function getBlockItems(mdast, modelHelper, definitions, allowedComponents) {
         const component = getComponentById(definitions, componentId);
         const properties = {
           ...component.defaultFields,
-          modelFields: `[${getModelFields(fieldGroup.model)}]`,
+          modelFields: `[${getModelFieldNames(fieldGroup.model).join(',')}]`,
         };
 
         extractProperties(row, fieldGroup.model, 'blockItem', component, fieldGroup.fields, properties);
@@ -428,7 +429,7 @@ function gridTablePartial(context) {
   };
 
   if (model) {
-    properties.modelFields = `[${getModelFields(model)}]`;
+    properties.modelFields = `[${getModelFieldNames(model).join(',')}]`;
   }
 
   let blockProperties = '';