From a4e324201d9a7305ff66fecab469ea6962e28195 Mon Sep 17 00:00:00 2001 From: Eamonn Bell Date: Thu, 22 Jun 2017 21:25:30 +0100 Subject: [PATCH] Refactor indentifer field find and validation. --- src/backends/backend.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/backends/backend.js b/src/backends/backend.js index 8a5054e7..47ffaac4 100644 --- a/src/backends/backend.js +++ b/src/backends/backend.js @@ -29,19 +29,17 @@ const slugFormatter = (template = "{{slug}}", entryData) => { const getIdentifier = (entryData) => { const validIdentifierFields = ["title", "path"]; - const identifiers = validIdentifierFields.map((field) => { - return entryData.find((_, key) => { - return key.toLowerCase() === field; - }); - }); - - const identifier = identifiers.find(i => typeof i !== 'undefined'); + const identifiers = validIdentifierFields.map((field) => + entryData.find((_, key) => key.toLowerCase() === field) + ); - if (typeof identifier === 'undefined') { + const identifier = identifiers.find(ident => ident !== undefined); + + if (identifier === undefined) { throw new Error("Collection must have a field name that is a valid entry identifier"); - } else { - return identifier; } + + return identifier; }; return template.replace(/\{\{([^\}]+)\}\}/g, (_, field) => {