More details, fix impl

README.md

@@ -1,3 +1,34 @@
 # merge-sitemaps
 
 A simple CLI and npm package to merge sitemaps together.
+
+## Usage
+
+### With CLI
+
+```bash
+$ npx merge-sitemaps sitemap.xml subdir/other-sitemap.xml build/sitemap.xml
+```
+
+(With the CLI, argument 1 is the base sitemap, argument 2 is the secondary sitemap, and argument 3 is the destination for the output.)
+
+### With API
+
+```js
+var mergeSitemaps = require("merge-sitemaps");
+
+// note: the API doesn't actually do any work with files, it just does the string manipulation and related stuff
+console.log(
+  mergeSitemaps("base-xml-sitemap-as-string", "secondary-xml-sitemap-as-string")
+);
+```
+
+## License
+
+MIT. See the LICENSE file.
+
+## Credits
+
+- [Reece Dunham](https://rdil.rocks) - Author
+- [Dowland Aiello](https://github.com/dowlandaiello) - Making it work
+- [This StackOverflow post](https://stackoverflow.com/questions/27936772/how-to-deep-merge-instead-of-shallow-merge) - Very helpful

dev/README.md

@@ -0,0 +1,3 @@
+# Dev files
+
+These are example sitemaps used to test the program in development.

dev/outmap.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url><loc>https://rdil.rocks/thing/</loc><changefreq>weekly</changefreq><priority>0.5</priority></url></urlset>
+<?xml version="1.0" encoding="UTF-8"?><urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1"><url><loc>https://rdil.rocks/pages/thing.html</loc><lastmod>2020-09-15T11:03:04-04:00</lastmod></url><url><loc>https://rdil.rocks/</loc><lastmod>2020-09-15T11:03:04-04:00</lastmod></url></urlset>

package.json

@@ -4,7 +4,7 @@
     "description": "A simple CLI and npm package to merge sitemaps together.",
     "homepage": "https://github.com/rdilweb/merge-sitemaps",
     "bin": {
-        "merge-sitemaps": "./src/index.js"
+        "merge-sitemaps": "./src/cli.js"
     },
     "keywords": [
         "sitemap",

source/index.js

@@ -1,5 +1,25 @@
 import xml from "xml-js"
-import { merge } from "merge-anything"
+
+const isObject = (target) =>
+    typeof target === "object" && !Array.isArray(target)
+
+const mergeDeep = (target, ...sources) => {
+    if (!sources.length) return target
+    const source = sources.shift()
+
+    if (isObject(target) && isObject(source)) {
+        for (const key in source) {
+            if (isObject(source[key])) {
+                if (!target[key]) Object.assign(target, { [key]: {} })
+                mergeDeep(target[key], source[key])
+            } else {
+                Object.assign(target, { [key]: source[key] })
+            }
+        }
+    }
+
+    return mergeDeep(target, ...sources)
+}
 
 /**
  * Merge sitemaps together.
@@ -9,24 +29,10 @@ import { merge } from "merge-anything"
  * @returns {string} The generated XML.
  */
 export default function mergeSitemaps(map1, map2) {
-    let mapObj = xml.xml2js(map1)
-    const secondMap = xml.xml2js(map2)
+    let mapObj = xml.xml2js(map1, { compact: true })
+    const secondMap = xml.xml2js(map2, { compact: true })
 
-    let getXmlValByName = (name, xml) => {
-        let item
-        xml.forEach((thing) => {
-            if (thing.name === name) {
-                item = thing
-            }
-        })
-        return item
-    }
+    mergeDeep(mapObj, secondMap)
 
-    mapObj.elements[
-        mapObj.elements.indexOf(getXmlValByName("urlset", mapObj.elements))
-    ].elements = merge(
-        getXmlValByName("urlset", mapObj.elements).elements,
-        getXmlValByName("urlset", secondMap.elements).elements
-    )
-    return xml.js2xml(mapObj)
+    return xml.js2xml(mapObj, { compact: true })
 }