aem-eds-cli 1.0.0 → 1.2.0

package/bin/aem-eds.js

@@ -68,7 +68,6 @@ const FIELD_TYPES = {
   'radio-group':             { label: 'Radio buttons — single value',    valueType: 'string',   multi: false },
   'checkbox-group':          { label: 'Checkboxes — multiple values',    valueType: 'string[]', multi: false },
   number:                    { label: 'Number input',                    valueType: 'number',   multi: false },
-  'date-time':               { label: 'Date / time picker',             valueType: 'date',     multi: false },
   'aem-tag':                 { label: 'AEM Tag picker (cq:tags)',        valueType: 'string',   multi: false },
   container:                 { label: 'Grouped / repeating field set',   valueType: 'string',   multi: false },
   tab:                       { label: 'Tab — organises fields in panel', valueType: null,       multi: false },
@@ -78,7 +77,7 @@ const FIELD_GROUPS = [
   { title: 'Text inputs',         keys: ['text', 'textarea', 'richtext'] },
   { title: 'Media & references',  keys: ['reference', 'aem-content', 'aem-content-fragment', 'aem-experience-fragment'] },
   { title: 'Selection & toggles', keys: ['boolean', 'select', 'multiselect', 'radio-group', 'checkbox-group'] },
-  { title: 'Specialised',         keys: ['number', 'date-time', 'aem-tag'] },
+  { title: 'Specialised',         keys: ['number', 'aem-tag'] },
   { title: 'Layout (no value)',   keys: ['container', 'tab'] },
 ];
 
@@ -114,7 +113,6 @@ const VALIDATIONS = {
   'radio-group':            ['required', 'description', 'readOnly', 'hidden'],
   'checkbox-group':         ['required', 'description', 'readOnly', 'hidden'],
   number:                   ['required', 'description', 'readOnly', 'hidden', 'min', 'max', 'step'],
-  'date-time':              ['required', 'description', 'readOnly', 'hidden', 'min', 'max'],
   'aem-tag':                ['required', 'description', 'readOnly', 'hidden'],
   container:                ['description', 'readOnly', 'hidden'],
   tab:                      [],
@@ -148,7 +146,7 @@ function buildFieldSchema(fields) {
                  : f.defaultValue;
     }
 
-    if (f.type === 'date-time') { base.displayFormat = 'YYYY-MM-DD'; base.valueFormat = 'YYYY-MM-DD'; }
+    // number / date-time constraints go TOP-LEVEL — not inside validation.
     if (f.type === 'aem-content-fragment') base.variationName = '';
 
     const validation = {};
@@ -181,17 +179,6 @@ function genSimpleBlockJS(blockName) {
 `;
 }
 
-// ─── JS template — multi-row block ───────────────────────────────────────────
-function genMultiRowBlockJS(blockName) {
-  return `export default function decorate(block) {
-  const rows = [...block.children];
-  rows.forEach((row) => {
-    // TODO: implement ${blockName} row decoration
-  });
-}
-`;
-}
-
 // ─── JS template — container block ───────────────────────────────────────────
 function genContainerBlockJS(blockName, childName) {
   return `export default function decorate(block) {
@@ -430,7 +417,7 @@ async function collectOptions(rl, fieldName, ind = '') {
 const DEFAULT_VALUE_TYPES = new Set([
   'text', 'textarea', 'richtext', 'number', 'boolean',
   'select', 'multiselect', 'radio-group', 'checkbox-group',
-  'date-time', 'aem-tag',
+  'aem-tag',
 ]);
 
 async function collectDefaultValue(rl, field, ind = '') {
@@ -463,9 +450,6 @@ async function collectDefaultValue(rl, field, ind = '') {
       question = `${ind}  Default selected values for "${field.name}" (comma-separated, Enter to skip): `;
       break;
     }
-    case 'date-time':
-      question = `${ind}  Default date for "${field.name}" (YYYY-MM-DD, Enter to skip): `;
-      break;
     default:
       question = `${ind}  Default value for "${field.name}" (Enter to skip): `;
   }
@@ -534,14 +518,51 @@ async function collectValidation(rl, field, indent = '') {
   if (available.includes('description')) { const d = (await prompt(rl, `${indent}  Helper text (Enter to skip): `)).trim(); if (d) field.description = d; }
   if (available.includes('minLength'))   { const v = (await prompt(rl, `${indent}  Min length (Enter to skip): `)).trim(); if (v && !isNaN(v)) field.minLength = +v; }
   if (available.includes('maxLength'))   { const v = (await prompt(rl, `${indent}  Max length (Enter to skip): `)).trim(); if (v && !isNaN(v)) field.maxLength = +v; }
-  if (available.includes('min'))         { const v = (await prompt(rl, `${indent}  Min${field.type === 'date-time' ? ' (YYYY-MM-DD)' : ''} (Enter to skip): `)).trim(); if (v) field.min = field.type === 'number' ? +v : v; }
-  if (available.includes('max'))         { const v = (await prompt(rl, `${indent}  Max${field.type === 'date-time' ? ' (YYYY-MM-DD)' : ''} (Enter to skip): `)).trim(); if (v) field.max = field.type === 'number' ? +v : v; }
+  if (available.includes('min'))         { const v = (await prompt(rl, `${indent}  Min (Enter to skip): `)).trim(); if (v) field.min = field.type === 'number' ? +v : v; }
+  if (available.includes('max'))         { const v = (await prompt(rl, `${indent}  Max (Enter to skip): `)).trim(); if (v) field.max = field.type === 'number' ? +v : v; }
   if (available.includes('step'))        { const v = (await prompt(rl, `${indent}  Step (Enter to skip): `)).trim(); if (v && !isNaN(v)) field.step = +v; }
   if (available.includes('rootPath'))    { const v = (await prompt(rl, `${indent}  Root path (Enter to skip): `)).trim(); if (v) field.rootPath = v; }
   if (available.includes('customErrorMsg')) { const v = (await prompt(rl, `${indent}  Custom error message (Enter to skip): `)).trim(); if (v) field.customErrorMsg = v; }
   log.blank();
 }
 
+// ─── Field collector with tab grouping ───────────────────────────────────────
+async function collectFieldsWithTabs(rl, context) {
+  log.info(`Define tab groups for ${c.bold}${context}${c.reset}. Each tab appears as a panel section in UE.`);
+  log.blank();
+
+  const allFields = [];
+  let   tabCount  = 0;
+
+  while (true) {
+    tabCount++;
+    log.divider();
+
+    const tabLabelIn = (await prompt(rl, `Tab ${tabCount} name (e.g. Media, Links, Body): `)).trim();
+    if (!tabLabelIn) { log.warn('Tab name cannot be blank.'); tabCount--; continue; }
+
+    const tabName  = `tab${tabCount}`;
+    const tabLabel = tabLabelIn;
+
+    allFields.push({ name: tabName, label: tabLabel, type: 'tab' });
+    log.success(`Tab "${tabLabel}" created — define its fields:`);
+    log.blank();
+
+    const tabFields = await collectFields(rl, `"${tabLabel}" tab`);
+    allFields.push(...tabFields);
+
+    log.blank();
+    const addMore = await confirm(rl, `Add another tab?`, false);
+    if (!addMore) break;
+    log.blank();
+  }
+
+  log.blank();
+  log.info(`${tabCount} tab(s) defined with ${allFields.filter(f => f.type !== 'tab').length} total fields.`);
+  log.blank();
+  return allFields;
+}
+
 // ─── Field collector ──────────────────────────────────────────────────────────
 async function collectFields(rl, context, depth = 0) {
   const fields = [];
@@ -636,7 +657,6 @@ function genBlockJSON(blockName, isContainer, parentFields, childName, childFiel
   const models = [];
   const parentSchema = buildFieldSchema(parentFields);
 
-  // classes field only added when author explicitly opted in during scaffolding
   if (needsVariants) {
     parentSchema.push({
       component:  'text',
@@ -653,13 +673,15 @@ function genBlockJSON(blockName, isContainer, parentFields, childName, childFiel
   }
 
   // ── definitions ──────────────────────────────────────────────────────────────
+  // Must use groups.components format to match boilerplate's component-definition.json
+  // structure. merge-json-cli deep-merges this correctly into the global file.
+  // Using a flat "definitions" key would create a separate key that UE ignores.
   const template = { name: toTitleCase(blockName), model: blockName };
   if (isContainer) {
     template.filter = blockName;
-    // No :items — pre-population causes 409 JCR conflict on insert
   }
 
-  const definitions = [{
+  const components = [{
     title: toTitleCase(blockName),
     id:    blockName,
     plugins: {
@@ -672,11 +694,9 @@ function genBlockJSON(blockName, isContainer, parentFields, childName, childFiel
     },
   }];
 
-  // Container blocks need a SECOND definition for the child item
-  // with resourceType block/item — this is what UE uses when author
-  // clicks + inside the block to add a child
+  // Child item definition — block/item resourceType required for UE + button
   if (isContainer) {
-    definitions.push({
+    components.push({
       title: toTitleCase(childName),
       id:    childName,
       plugins: {
@@ -693,6 +713,14 @@ function genBlockJSON(blockName, isContainer, parentFields, childName, childFiel
     });
   }
 
+  const definitions = {
+    groups: [{
+      title:      'Blocks',
+      id:         'blocks',
+      components,
+    }],
+  };
+
   // ── filters ──────────────────────────────────────────────────────────────────
   // Section filter is NOT generated here — it is a project-level concern
   // maintained in the boilerplate's central component-filters.json.
@@ -747,18 +775,23 @@ async function cmdCreate(rl, cwd, argName, dryRun) {
   // Block type
   log.blank();
   console.log(`  ${c.bold}Block type:${c.reset}`);
-  console.log(`    ${c.dim}1.${c.reset} ${c.cyan}Simple${c.reset}     ${c.dim}Fixed fields — hero, banner, teaser, quote${c.reset}`);
-  console.log(`    ${c.dim}2.${c.reset} ${c.cyan}Multi-row${c.reset}  ${c.dim}Same fields repeating — slider, cards, table rows${c.reset}`);
-  console.log(`    ${c.dim}3.${c.reset} ${c.cyan}Container${c.reset}  ${c.dim}Children with different fields — accordion, tabs${c.reset}`);
+  console.log(`    ${c.dim}1.${c.reset} ${c.cyan}Simple${c.reset}              ${c.dim}Fixed fields — hero, banner, teaser${c.reset}`);
+  console.log(`    ${c.dim}2.${c.reset} ${c.cyan}Simple with tabs${c.reset}    ${c.dim}Fixed fields grouped into UE panel tabs${c.reset}`);
+  console.log(`    ${c.dim}3.${c.reset} ${c.cyan}Container${c.reset}           ${c.dim}Children with different fields — accordion, tabs${c.reset}`);
+  console.log(`    ${c.dim}4.${c.reset} ${c.cyan}Container with tabs${c.reset} ${c.dim}Container where parent config has tab groups${c.reset}`);
   log.blank();
-  const typeIn = (await prompt(rl, `Type [1]: `)).trim();
-  const isContainer = typeIn === '3' || typeIn.toLowerCase() === 'container';
-  const isMultiRow  = typeIn === '2' || typeIn.toLowerCase() === 'multi-row';
+  const typeIn      = (await prompt(rl, `Type [1]: `)).trim();
+  const isContainer = typeIn === '3' || typeIn === '4' || typeIn.toLowerCase().startsWith('container');
+  const useTabs     = typeIn === '2' || typeIn === '4'
+    || typeIn.toLowerCase() === 'simple with tabs'
+    || typeIn.toLowerCase() === 'container with tabs';
   log.blank();
 
-  // Parent fields
+  // Parent fields — with or without tab grouping based on block type
   log.section(isContainer ? `Phase 1 — Parent config fields` : `Define block fields`);
-  const parentFields = await collectFields(rl, isContainer ? `${blockName} config` : blockName);
+  const parentFields = useTabs
+    ? await collectFieldsWithTabs(rl, isContainer ? `${blockName} config` : blockName, true)
+    : await collectFields(rl, isContainer ? `${blockName} config` : blockName);
 
   // Container: child setup
   let childName = '', childFields = [];
@@ -792,10 +825,9 @@ async function cmdCreate(rl, cwd, argName, dryRun) {
   const dir = path.join(cwd, 'blocks', blockName);
 
   // Minimal lint-free JS based on block type
-  let jsContent;
-  if (isContainer)     jsContent = genContainerBlockJS(blockName, childName);
-  else if (isMultiRow) jsContent = genMultiRowBlockJS(blockName);
-  else                 jsContent = genSimpleBlockJS(blockName);
+  const jsContent = isContainer
+    ? genContainerBlockJS(blockName, childName)
+    : genSimpleBlockJS(blockName);
 
   writeFile(path.join(dir, `${blockName}.js`),  jsContent,              `blocks/${blockName}/${blockName}.js`,  dryRun);
   writeFile(path.join(dir, `${blockName}.css`), genBlockCSS(blockName), `blocks/${blockName}/${blockName}.css`, dryRun);
@@ -807,7 +839,10 @@ async function cmdCreate(rl, cwd, argName, dryRun) {
   // Summary
   log.blank(); log.divider();
   const prefix   = dryRun ? `${c.yellow}~ DRY RUN${c.reset} ` : `${c.green}✔${c.reset} `;
-  const typeLabel = isContainer ? `container → ${childName}` : isMultiRow ? 'multi-row' : 'simple';
+  const typeLabel = isContainer && useTabs ? `container with tabs → ${childName}`
+                  : isContainer            ? `container → ${childName}`
+                  : useTabs                ? 'simple with tabs'
+                  :                         'simple';
   console.log(`\n  ${prefix}${c.bold}"${blockName}" ${dryRun ? 'would be' : 'scaffolded!'} (${typeLabel})${c.reset}\n`);
   if (!dryRun) {
     console.log(`  ${c.dim}Files created:${c.reset}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aem-eds-cli",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "CLI scaffolding tool for AEM Edge delivery services blocks with Universal editor authoring support",
   "bin": {
     "aem-eds-cli": "./bin/aem-eds.js"