fix: use slug-aware identity matching in MergeDeep for teams

Teams in YAML use slug format (name: "my-team") while the GitHub API
returns display name (name: "My Team") with a separate slug field.
This caused phantom diffs in NOP mode.

Changes:
- GET_NAME_USERNAME_PROPERTY: prefer slug for identity when present
- compareDeepIfVisited: strip identity field before value comparison
  to avoid reporting name casing differences as modifications

Backward compatible: items without slug (labels, rulesets) unchanged.

Author: fgenois-coveo

lib/mergeDeep.js

@@ -3,7 +3,12 @@ const DeploymentConfig = require('./deploymentConfig')
 
 const NAME_FIELDS = ['name', 'username', 'actor_id', 'login', 'type', 'key_prefix', 'context']
 const NAME_USERNAME_PROPERTY = item => NAME_FIELDS.find(prop => Object.prototype.hasOwnProperty.call(item, prop))
-const GET_NAME_USERNAME_PROPERTY = item => { if (NAME_USERNAME_PROPERTY(item)) return item[NAME_USERNAME_PROPERTY(item)] }
+const GET_NAME_USERNAME_PROPERTY = item => {
+  if (!item) return undefined
+  if (item.slug) return item.slug
+  const prop = NAME_USERNAME_PROPERTY(item)
+  return prop ? item[prop] : undefined
+}
 
 class MergeDeep {
   constructor (log, github, ignorableFields = [], configvalidators = {}, overridevalidators = {}) {
@@ -184,7 +189,7 @@ class MergeDeep {
     if (source.length < target.length) {
       const dels = target.filter(item => {
         if (this.isObjectNotArray(item)) {
-          return !source.some(sourceItem => { const s = GET_NAME_USERNAME_PROPERTY(sourceItem); const t = GET_NAME_USERNAME_PROPERTY(item); if (s === t) return true; if (item.slug && typeof s === "string") return item.slug === s || item.slug === s.toLowerCase(); return false; })
+          return !source.some(sourceItem => GET_NAME_USERNAME_PROPERTY(item) === GET_NAME_USERNAME_PROPERTY(sourceItem))
         } else {
           return !source.includes(item)
         }
@@ -222,7 +227,7 @@ class MergeDeep {
       // Elements that are not in target are additions
       additions[key] = combined.filter(item => {
         if (this.isObjectNotArray(item)) {
-          return !target.some(targetItem => { const s = GET_NAME_USERNAME_PROPERTY(item); const t = GET_NAME_USERNAME_PROPERTY(targetItem); if (s === t) return true; if (targetItem.slug && typeof s === "string") return targetItem.slug === s || targetItem.slug === s.toLowerCase(); return false; })
+          return !target.some(targetItem => GET_NAME_USERNAME_PROPERTY(item) === GET_NAME_USERNAME_PROPERTY(targetItem))
         } else {
           return !target.includes(item)
         }
@@ -233,7 +238,7 @@ class MergeDeep {
       // Elements that not in source are deletions
       deletions[key] = combined.filter(item => {
         if (this.isObjectNotArray(item)) {
-          return !source.some(sourceItem => { const s = GET_NAME_USERNAME_PROPERTY(sourceItem); const t = GET_NAME_USERNAME_PROPERTY(item); if (s === t) return true; if (item.slug && typeof s === "string") return item.slug === s || item.slug === s.toLowerCase(); return false; })
+          return !source.some(sourceItem => GET_NAME_USERNAME_PROPERTY(item) === GET_NAME_USERNAME_PROPERTY(sourceItem))
         } else {
           return !source.includes(item)
         }
@@ -249,7 +254,11 @@ class MergeDeep {
       additions.push({})
       deletions.push({})
       if (visited[id]) {
-        this.compareDeep(a, visited[id], additions[additions.length - 1], modifications[modifications.length - 1], deletions[deletions.length - 1])
+        // Strip the identity field before comparing — it was already used for matching
+        const idProp = NAME_USERNAME_PROPERTY(a) || NAME_USERNAME_PROPERTY(visited[id])
+        const targetObj = idProp ? Object.fromEntries(Object.entries(a).filter(([k]) => k !== idProp)) : a
+        const sourceObj = idProp ? Object.fromEntries(Object.entries(visited[id]).filter(([k]) => k !== idProp)) : visited[id]
+        this.compareDeep(targetObj, sourceObj, additions[additions.length - 1], modifications[modifications.length - 1], deletions[deletions.length - 1])
       }
       // Any addtions for the matching key must be moved to modifications
       const lastAddition = additions[additions.length - 1]