feat: support literal modifier resolution within resolver

medikoo · Oct 1, 2018 · 8f5353e · 8f5353e
1 parent a3425a0
commit 8f5353e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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;