Exclude empty values from recursion (#260)

qetza · Mar 13, 2022 · 64e8c9d · 64e8c9d
1 parent 05201e7
commit 64e8c9d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tasks/ReplaceTokensV3/index.ts b/tasks/ReplaceTokensV3/index.ts
@@ -318,8 +318,8 @@ var replaceTokensInString = function (
             if (options.useLegacyEmptyFeature && options.emptyValue && value === options.emptyValue) // old empty/default feature
                 value = '';
 
-            // apply recursion on value (never apply escape)
-            if (options.enableRecursion)
+            // apply recursion on non-empty value (never apply escape)
+            if (value && options.enableRecursion)
                 value = replaceTokensInString(value, regex, transformRegex, options, false, escapeType, counter, names + name);
 
             // apply transformation

diff --git a/tasks/ReplaceTokensV4/index.ts b/tasks/ReplaceTokensV4/index.ts
@@ -318,8 +318,8 @@ var replaceTokensInString = function (
             if (options.useLegacyEmptyFeature && options.emptyValue && value === options.emptyValue) // old empty/default feature
                 value = '';
 
-            // apply recursion on value (never apply escape)
-            if (options.enableRecursion)
+            // apply recursion on non-empty value (never apply escape)
+            if (value && options.enableRecursion)
                 value = replaceTokensInString(value, regex, transformRegex, options, false, escapeType, counter, names + name);
 
             // apply transformation

diff --git a/tasks/ReplaceTokensV5/index.ts b/tasks/ReplaceTokensV5/index.ts
@@ -318,8 +318,8 @@ var replaceTokensInString = function (
             if (options.useLegacyEmptyFeature && options.emptyValue && value === options.emptyValue) // old empty/default feature
                 value = '';
 
-            // apply recursion on value (never apply escape)
-            if (options.enableRecursion)
+            // apply recursion on non-empty value (never apply escape)
+            if (value && options.enableRecursion)
                 value = replaceTokensInString(value, regex, transformRegex, options, false, escapeType, counter, names + name);
 
             // apply transformation