configuration-management 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configuration-management",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Schema-driven system configuration for Adobe Commerce App Builder sync apps. Magento-style scoped config in Adobe App Builder Database (ABDB) with encryption, Commerce REST helpers, and React Admin UI.",
   "license": "Apache-2.0",
   "author": "Adobe Inc.",

package/scripts/setup-app-config.js

@@ -11,6 +11,10 @@ const EXTENSION_POINT = 'commerce/backend-ui/1'
 const INCLUDE_REL = 'node_modules/configuration-management/actions/configurations/ext.config.yaml'
 const MARKER = '# configuration-management (auto-linked on npm install)'
 
+function escapeRe (str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
 function findProjectRoot (startDir) {
   let dir = startDir
   while (dir && dir !== path.dirname(dir)) {
@@ -35,6 +39,10 @@ function alreadyLinked (content) {
   return content.includes('configuration-management/actions/configurations/ext.config.yaml')
 }
 
+function hasExtensionPoint (content) {
+  return /^[ \t]*commerce\/backend-ui\/1:/m.test(content)
+}
+
 function buildExtensionBlock () {
   return [
     MARKER,
@@ -44,32 +52,58 @@ function buildExtensionBlock () {
   ].join('\n')
 }
 
+/**
+ * Update an existing `commerce/backend-ui/1` block in place (never add a duplicate key).
+ */
+function updateExistingExtensionBlock (content) {
+  const match = content.match(/^([ \t]*)commerce\/backend-ui\/1:/m)
+  if (!match) return null
+
+  const indent = match[1]
+  const includeIndent = `${indent}  `
+  const blockRe = new RegExp(
+    `^${escapeRe(indent)}commerce/backend-ui/1:[ \\t]*\\n` +
+      `(?:${escapeRe(includeIndent)}\\$include:[^\\n]*\\n)?`,
+    'm'
+  )
+  const replacement =
+    `${indent}${EXTENSION_POINT}:\n${includeIndent}$include: ${INCLUDE_REL}\n`
+  const next = content.replace(blockRe, replacement)
+  return next !== content ? next : null
+}
+
 function patchAppConfig (content) {
   if (alreadyLinked(content)) {
     return { content, changed: false, reason: 'already-linked' }
   }
 
-  if (/^extensions:\s*$/m.test(content) || /^extensions:\n/m.test(content)) {
-    const injection = [
-      `  ${EXTENSION_POINT}:`,
-      `    $include: ${INCLUDE_REL}`
-    ].join('\n')
-    const next = content.replace(
-      /^extensions:\s*\n/m,
-      `extensions:\n${injection}\n`
-    )
+  if (hasExtensionPoint(content)) {
+    const updated = updateExistingExtensionBlock(content)
+    if (updated) {
+      return { content: updated, changed: true, reason: 'updated-existing-extension' }
+    }
+    return { content, changed: false, reason: 'extension-exists-unmodified' }
+  }
+
+  if (/^extensions:[ \t]*\n/m.test(content)) {
+    const injection = `  ${EXTENSION_POINT}:\n    $include: ${INCLUDE_REL}\n`
+    const next = content.replace(/^extensions:[ \t]*\n/m, `extensions:\n${injection}`)
     if (next !== content) {
-      return { content: next, changed: true, reason: 'merged-into-extensions' }
+      return { content: next, changed: true, reason: 'added-under-extensions' }
     }
   }
 
-  const trimmed = content.replace(/\s+$/, '')
-  const separator = trimmed.length > 0 ? '\n\n' : ''
-  return {
-    content: `${trimmed}${separator}${buildExtensionBlock()}\n`,
-    changed: true,
-    reason: 'appended'
+  if (!/^extensions:/m.test(content)) {
+    const trimmed = content.replace(/\s+$/, '')
+    const separator = trimmed.length > 0 ? '\n\n' : ''
+    return {
+      content: `${trimmed}${separator}${buildExtensionBlock()}\n`,
+      changed: true,
+      reason: 'appended'
+    }
   }
+
+  return { content, changed: false, reason: 'no-change' }
 }
 
 function main () {
@@ -91,7 +125,7 @@ function main () {
   const { content, changed, reason } = patchAppConfig(original)
 
   if (!changed) {
-    console.log(`[configuration-management] app.config.yaml already links actions (${reason}).`)
+    console.log(`[configuration-management] app.config.yaml unchanged (${reason}).`)
     return
   }
 
@@ -111,4 +145,10 @@ if (require.main === module) {
   }
 }
 
-module.exports = { patchAppConfig, INCLUDE_REL, EXTENSION_POINT }
+module.exports = {
+  patchAppConfig,
+  INCLUDE_REL,
+  EXTENSION_POINT,
+  alreadyLinked,
+  hasExtensionPoint
+}