@metalsmith/collections 1.2.0 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ### Changelog
+#### [v1.2.1](https://github.com/metalsmith/collections/compare/v1.2.1...v1.2.0) / 2022-02-03
 
+- Fixes [`#99`](https://github.com/metalsmith/collections/issues/99): collection key on file metadata - no dupes, no nested arrays
+- Fixes regression: incorrect previous & next refs when reverse: true
+- Fixes typo's in README
 #### [v1.2.0](https://github.com/metalsmith/collections/compare/v1.2.0...v1.1.0) / 2022-01-29
 
 - Feature: sortBy now also understands nested metadata properties, e.g. `sortBy: 'meta.display.order'`

package/README.md

@@ -93,12 +93,12 @@ There are 2 ways to create collections & they can be used together:
       news: {
         metadata: {
           title: 'Latest news',
-          description: 'All the latest in politics & world news'
+          description: 'All the latest in politics & world news',
           slug: 'news'
         },
         pattern: 'news/**/*.html',
         sortBy: 'pubdate',
-        reverse: true,
+        reverse: true
       },
       services: 'services/**/*.html'
     })
@@ -147,7 +147,7 @@ Here is an example of using [@metalsmith/layouts](https://github.com/metalsmith/
 
 ```handlebars
 <h1>{{ title }}</h1> {{!-- something-happened.md title --}}
-<a href="/{{ collections.news.slug }}">Back to news</a> {{!-- news collection metadata.slug --}}
+<a href="/{{ collections.news.metadata.slug }}">Back to news</a> {{!-- news collection metadata.slug --}}
 {{ contents | safe }}
 <hr>
 {{!-- previous & next are added by @metalsmith/collections --}}
@@ -260,7 +260,7 @@ metalsmith.use(
     news: {
       metadata: {
         title: 'Latest news',
-        description: 'All the latest in politics & world news'
+        description: 'All the latest in politics & world news',
         slug: 'news'
       }
     }

package/lib/index.js

@@ -80,7 +80,7 @@ function normalizeOptions(options) {
 function initializeCollections(options) {
   options = normalizeOptions(options)
   const collectionNames = Object.keys(options)
-  const mapped = collectionNames.map((name) => {
+  const mappedCollections = collectionNames.map((name) => {
     return Object.assign({ name: name }, options[name])
   })
 
@@ -103,15 +103,15 @@ function initializeCollections(options) {
           if (!collectionNames.includes(name)) {
             collectionNames.push(name)
             const normalized = Object.assign({}, defaultOptions)
-            mapped.push(Object.assign({ name }, normalized))
+            mappedCollections.push(Object.assign({ name }, normalized))
           }
         })
       }
     })
 
-    debug('Identified %s collections: %s', mapped.length, collectionNames.join())
+    debug('Identified %s collections: %s', mappedCollections.length, collectionNames.join())
 
-    mapped.forEach((collection) => {
+    mappedCollections.forEach((collection) => {
       const { pattern, filterBy, sortBy, reverse, refer, limit } = collection
       const name = collection.name
       const matches = []
@@ -126,9 +126,12 @@ function initializeCollections(options) {
             // pattern-matched files might or might not have a "collection" property defined in front-matter
             // and might also be included in multiple collections
             if (!data.collection) {
-              data.collection = collection.name
-            } else {
-              data.collection = [data.collection, collection.name]
+              data.collection = []
+            } else if (typeof data.collection === 'string') {
+              data.collection = [data.collection]
+            }
+            if (!data.collection.includes(collection.name)) {
+              data.collection = [...data.collection, collection.name]
             }
             return data
           })
@@ -163,12 +166,21 @@ function initializeCollections(options) {
         metadata[name].metadata = collection.metadata
       }
       if (refer) {
-        metadata[name].forEach((file, i) => {
-          Object.assign(file, {
-            previous: i > 0 ? metadata[name][i - 1] : null,
-            next: i < metadata[name].length - 1 ? metadata[name][i + 1] : null
+        if (reverse) {
+          metadata[name].forEach((file, i) => {
+            Object.assign(file, {
+              next: i > 0 ? metadata[name][i - 1] : null,
+              previous: i < metadata[name].length - 1 ? metadata[name][i + 1] : null
+            })
           })
-        })
+        } else {
+          metadata[name].forEach((file, i) => {
+            Object.assign(file, {
+              previous: i > 0 ? metadata[name][i - 1] : null,
+              next: i < metadata[name].length - 1 ? metadata[name][i + 1] : null
+            })
+          })
+        }
       }
 
       metadata.collections[name] = metadata[name]

package/package.json

@@ -15,7 +15,7 @@
     "type": "git",
     "url": "https://github.com/metalsmith/collections.git"
   },
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {