From 8f5353eca64c0ac15ebc63f8a9086df8b9ab360c Mon Sep 17 00:00:00 2001 From: Mariusz Nowak Date: Mon, 1 Oct 2018 15:04:01 +0200 Subject: [PATCH] feat: support literal modifier resolution within resolver --- get-resolver.js | 8 ++++++-- index.js | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/get-resolver.js b/get-resolver.js index b48a342..587128f 100644 --- a/get-resolver.js +++ b/get-resolver.js @@ -61,8 +61,12 @@ module.exports = function (modifiers) { var data = parse(format); var args = slice.call(arguments, 1); - result = { literals: data.literals }; - if (data.literals.length <= 1) { + var literals = data.literals; + if (modifiers.literal) { + literals = literals.map(function (literal) { return modifiers.literal(literal); }); + } + result = { literals: literals }; + if (literals.length <= 1) { result.substitutions = []; result.rest = resolveRest(modifiers.rest, data, args, 0); return result; diff --git a/index.js b/index.js index 2e580fd..4c7dbbd 100644 --- a/index.js +++ b/index.js @@ -9,9 +9,6 @@ module.exports = function (modifiers) { var data = resolve.apply(null, arguments); var literals = data.literals; var substitutions = data.substitutions; - if (modifiers.literal) { - literals = literals.map(function (literal) { return modifiers.literal(literal); }); - } var resolvedString = literals.length ? literals.reduce(function (resolved, literal, index) { return resolved + substitutions[index - 1] + literal;