@newlogic-digital/cli 1.5.0-next.4 → 1.5.0-next.5

package/index.mjs

@@ -150,11 +150,12 @@ if (!command) {
   
     -- blocks --
     ${styleText('green', 'newlogic blocks list')} - Lists all available installable blocks with descriptions
-    ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', '<name...>')} - Installs one or more blocks by kebab-case or PascalCase name
+    ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', '<name[@variant]...>')} - Installs one or more blocks by kebab-case or PascalCase name
     ${styleText('green', 'newlogic blocks remove')} ${styleText('yellow', '<name...>')} - Removes one or more blocks and orphaned dependencies
     ${styleText('green', 'newlogic blocks update')} - Reinstalls all configured blocks from ${styleText('yellow', 'newlogic.config.json')}
     ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', 'about-accordion')}
     ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', 'AboutAccordion')}
+    ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', 'header-nav-left@stimulus')}
     ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', 'header-nav-left contact-info-card hero-floating-text')}
     ${styleText('green', 'newlogic blocks remove')} ${styleText('yellow', 'about-accordion')}
     ${styleText('green', 'newlogic blocks remove')} ${styleText('yellow', 'header-nav-left hero-floating-text')}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlogic-digital/cli",
-  "version": "1.5.0-next.4",
+  "version": "1.5.0-next.5",
   "main": "index.mjs",
   "bin": {
     "newlogic-cli": "index.mjs",

package/src/commands/blocks/index.mjs

@@ -134,13 +134,14 @@ function printBlocksUsage() {
     styleText(['white', 'bold'], 'Usage:'),
     '',
     `  ${styleText('green', 'newlogic blocks list')} - Lists all available blocks with descriptions`,
-    `  ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', '<name...>')} - Adds one or more blocks by kebab-case or PascalCase name`,
+    `  ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', '<name[@variant]...>')} - Adds one or more blocks by kebab-case or PascalCase name`,
     `  ${styleText('green', 'newlogic blocks remove')} ${styleText('yellow', '<name...>')} - Removes one or more blocks and orphaned dependencies`,
     `  ${styleText('green', 'newlogic blocks update')} - Reinstalls all configured blocks from ${styleText('yellow', 'newlogic.config.json')}`,
     '',
     styleText(['white', 'bold'], 'Examples:'),
     '',
     `  ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', 'header-nav-left contact-info-card hero-floating-text')}`,
+    `  ${styleText('green', 'newlogic blocks add')} ${styleText('yellow', 'header-nav-left@stimulus')}`,
     `  ${styleText('green', 'newlogic blocks remove')} ${styleText('yellow', 'header-nav-left hero-floating-text')}`,
   ].join('\n'))
 }

package/src/commands/blocks/service.mjs

@@ -83,6 +83,51 @@ function assertBlockName(name, label = 'block name') {
   }
 }
 
+function parseBlockSpecifier(rawValue, {
+  label = 'block name',
+  allowObject = false,
+} = {}) {
+  if (allowObject && rawValue && typeof rawValue === 'object' && !Array.isArray(rawValue)) {
+    const name = normalizeBlockName(rawValue.name)
+    const variant = rawValue.variant == null ? '' : `${rawValue.variant}`.trim()
+
+    assertBlockName(name, 'configured block name')
+
+    if (rawValue.variant != null && !variant) {
+      throw new Error(`Configured block "${name}" has an empty variant`)
+    }
+
+    return {
+      name,
+      variant: variant || undefined,
+      variantExplicit: rawValue.variant != null,
+    }
+  }
+
+  const value = `${rawValue ?? ''}`.trim()
+
+  if (!value) {
+    throw new Error(`Missing ${label}`)
+  }
+
+  const variantSeparator = value.indexOf('@')
+  const rawName = variantSeparator === -1 ? value : value.slice(0, variantSeparator)
+  const rawVariant = variantSeparator === -1 ? '' : value.slice(variantSeparator + 1).trim()
+  const name = normalizeBlockName(rawName)
+
+  assertBlockName(name, label)
+
+  if (variantSeparator !== -1 && !rawVariant) {
+    throw new Error(`Invalid ${label}: "${value}"`)
+  }
+
+  return {
+    name,
+    variant: rawVariant || undefined,
+    variantExplicit: variantSeparator !== -1,
+  }
+}
+
 function toBlockKey(block) {
   return `${block.name}@${block.variant}`
 }
@@ -151,20 +196,14 @@ function loadProjectConfig(projectRoot) {
   }
 
   const blocks = blocksRaw.map((entry, index) => {
-    if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+    if (typeof entry !== 'string' && (!entry || typeof entry !== 'object' || Array.isArray(entry))) {
       throw new Error(`Invalid block config entry at index ${index}`)
     }
 
-    const name = normalizeBlockName(entry.name)
-    const variant = `${entry.variant ?? ''}`.trim()
-
-    assertBlockName(name, 'configured block name')
-
-    if (!variant) {
-      throw new Error(`Configured block "${name}" is missing a variant`)
-    }
-
-    return { name, variant }
+    return parseBlockSpecifier(entry, {
+      label: `block config entry at index ${index}`,
+      allowObject: true,
+    })
   })
 
   return { configPath, config, blocks: dedupeExplicitBlocks(blocks) }
@@ -173,7 +212,7 @@ function loadProjectConfig(projectRoot) {
 function saveProjectConfig(configPath, config, blocks) {
   const nextConfig = {
     ...config,
-    blocks,
+    blocks: blocks.map(block => block.variantExplicit ? `${block.name}@${block.variant}` : block.name),
   }
 
   fs.writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 2)}\n`)
@@ -194,15 +233,25 @@ function normalizeRequestedBlockNames(rawNames, label = 'block name') {
     throw new Error(`Missing ${label}`)
   }
 
-  const normalizedNames = rawNames.map((rawName) => {
-    const name = normalizeBlockName(rawName)
+  const normalizedNames = rawNames
+    .map(rawName => parseBlockSpecifier(rawName, { label }).name)
 
-    assertBlockName(name, label)
+  return [...new Set(normalizedNames)]
+}
 
-    return name
-  })
+function normalizeRequestedBlocks(rawNames, label = 'block name') {
+  if (!Array.isArray(rawNames) || rawNames.length === 0) {
+    throw new Error(`Missing ${label}`)
+  }
 
-  return [...new Set(normalizedNames)]
+  const blocks = rawNames.map(rawName => parseBlockSpecifier(rawName, { label }))
+  const byName = new Map()
+
+  for (const block of blocks) {
+    byName.set(block.name, block)
+  }
+
+  return [...byName.values()]
 }
 
 async function createMetaValidator(repository) {
@@ -488,16 +537,21 @@ export function createBlocksService({
   }
 
   async function addBlocks(rawNames) {
-    const names = normalizeRequestedBlockNames(rawNames)
+    const requestedBlocks = normalizeRequestedBlocks(rawNames)
     const rootBlocks = []
 
-    for (const name of names) {
-      const meta = await getMeta(name)
+    for (const requestedBlock of requestedBlocks) {
+      const meta = await getMeta(requestedBlock.name)
 
       rootBlocks.push({
-        name,
-        variant: meta.install.defaultVariant,
+        name: requestedBlock.name,
+        variant: requestedBlock.variant,
+        variantExplicit: requestedBlock.variantExplicit,
       })
+
+      if (requestedBlock.variant && !meta.install?.variants?.[requestedBlock.variant]) {
+        throw new Error(`Variant "${requestedBlock.variant}" is not available for block "${requestedBlock.name}"`)
+      }
     }
 
     const plan = await resolveInstallPlan(rootBlocks)
@@ -506,12 +560,12 @@ export function createBlocksService({
 
     const { configPath, config, blocks } = loadProjectConfig(projectRoot)
     const nextBlocks = dedupeExplicitBlocks([
-      ...blocks.filter(block => !names.includes(block.name)),
+      ...blocks.filter(block => !requestedBlocks.some(requestedBlock => requestedBlock.name === block.name)),
       ...rootBlocks,
     ])
 
     saveProjectConfig(configPath, config, nextBlocks)
-    logger.info(`added ${rootBlocks.map(block => `${block.name}@${block.variant}`).join(', ')}`)
+    logger.info(`added ${rootBlocks.map(block => block.variantExplicit ? `${block.name}@${block.variant}` : block.name).join(', ')}`)
 
     return {
       blocks: rootBlocks,