fix: different output when project file is same

Author: Val-istar-Guo

src/handlers/merge/merge-ignore.js

@@ -1,52 +1,85 @@
-module.exports = file => {
-  const ignoreList = file.content.split('\n')
-  const projectIgnoreList = file.targetFile.content.split('\n')
+const defaultBucketName = Symbol()
+const classifyIgnore = list => {
+  let last = { name: defaultBucketName, values: [] }
+  const bucket = [last]
 
+  list.forEach(item => {
+    if (/^#/.test(item)) {
+      const name = item.substring(1)
+      /** comment adjacent comments */
+      if (!last.values.length && last.name !== defaultBucketName) {
+        last.name = `${last.name}\n${name}`
+        return
+      }
 
-  let mergedList = []
-  let lastIgnoreListIndex = 0
-  let lastProjectIgnoreListIndex = 0
-
-  ignoreList.forEach((item, index) => {
-    let i = projectIgnoreList
-      .slice(lastProjectIgnoreListIndex)
-      .findIndex(value => value === item)
-    i = i === -1 ? -1 : i + lastProjectIgnoreListIndex
-
-    if (i !== -1 && lastProjectIgnoreListIndex < i) {
-      mergedList.push(...ignoreList.slice(lastIgnoreListIndex, index))
-
-      const lastProjectListFragment = projectIgnoreList
-        .slice(lastProjectIgnoreListIndex, i)
-        .filter(item => !ignoreList.includes(item) && item.length)
-      mergedList.push(...lastProjectListFragment)
-
-      lastIgnoreListIndex = index
-      lastProjectIgnoreListIndex = i
-    } else if (index === ignoreList.length - 1) {
-      mergedList.push(...ignoreList.slice(lastIgnoreListIndex))
-      const lastProjectListFragment = projectIgnoreList
-        .slice(lastProjectIgnoreListIndex)
-        .filter(item => !ignoreList.includes(item) && item.length)
-      mergedList.push(...lastProjectListFragment)
+      const pair = bucket.find(item => item.name === name)
+      if (pair) {
+        last = pair
+      } else {
+        last = { name, values: [] }
+        bucket.push(last)
+      }
+    } else if (item) {
+      if (!last.values.includes(item)) last.values.push(item)
     }
   })
 
-  if (lastIgnoreListIndex < projectIgnoreList.length) {
-    const lastProjectListFragment = projectIgnoreList
-      .slice(lastProjectIgnoreListIndex, projectIgnoreList.length)
-      .filter(item => !ignoreList.includes(item) && item.length)
-    mergedList.push(...lastProjectListFragment)
-  }
+  return bucket
+}
+
+const mergeBucket = (b1, b2) => {
+  const bucket = b1.map(item => ({ ...item }))
+
+  b2.forEach(pair => {
+    const sameOne = bucket.find(item => item.name === pair.name)
+    if (!sameOne) {
+      bucket.push(pair)
+    } else {
+      pair.values.forEach(value => {
+        if (!(sameOne.values.includes(value))) sameOne.values = sameOne.values.concat(value)
+      })
+    }
+  })
+
+  return bucket
+}
+
+const uniqBucket = (b1, b2) => {
+  const allValues = [].concat(...b2.map(item => item.values))
+  return b1.map(pair => {
+    const values = pair.values.filter(item => !allValues.includes(item))
+    return { name: pair.name, values }
+  })
+}
+
+const renderBucket = bucket => bucket
+  .filter(pair => (pair.name !== defaultBucketName || pair.values.length))
+  .map(({ name, values }) => {
+    let str = ''
+    if (typeof name === 'string') str += name.replace(/^(.*)(\n|$)/mg, '#$1\n')
+    str += values.join('\n')
+
+    return str
+  })
+  .join('\n\n')
+
+module.exports = file => {
+  const templateIgnoreList = file.content.split('\n')
+  const projectIgnoreList = file.targetFile.content.split('\n')
+
+  const templateIgnoreBucket = classifyIgnore(templateIgnoreList)
+  const projectIgnoreBucket = classifyIgnore(projectIgnoreList)
+
+  const uniquedBucket = uniqBucket(projectIgnoreBucket, templateIgnoreBucket)
 
-  mergedList = mergedList.reduce((list, item) => {
-    if (!item.length || !list.includes(item)) list.push(item)
-    return list
-  }, [])
+  const bucket = mergeBucket(templateIgnoreBucket, uniquedBucket)
+  const result = renderBucket(bucket)
 
+  const beginBlank = file.content.match(/^\s*/g)[0]
+  const endBlank = file.content.match(/\s*$/g)[0]
 
   return {
     ...file,
-    content: mergedList.join('\n'),
+    content: `${beginBlank}${result}${endBlank}`,
   }
 }

src/handlers/merge/merge-json.js

@@ -28,8 +28,13 @@ module.exports = file => {
     return file
   }
 
+  const beginBlank = file.content.match(/^\s*/g)[0]
+  const endBlank = file.content.match(/\s*$/g)[0]
+
+  const result = JSON.stringify(merge(targetFileContent, content), null, '  ')
+
   return {
     ...file,
-    content: JSON.stringify(merge(targetFileContent, content), null, '  '),
+    content: `${beginBlank}${result}${endBlank}`,
   }
 }

src/handlers/merge/merge-yaml.js

@@ -29,8 +29,13 @@ module.exports = file => {
     return file
   }
 
+  const beginBlank = file.content.match(/^\s*/g)[0]
+  const endBlank = file.content.match(/\s*$/g)[0]
+
+  const result = yaml.dump(merge(targetFileContent, content))
+
   return {
     ...file,
-    content: yaml.dump(merge(targetFileContent, content)),
+    content: `${beginBlank}${result}${endBlank}`,
   }
 }