v5,6: fix error on empty token (#89)

Author: qetza

CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog
+## 5.3.0
+Task 6.3.1
+- Fix "name not supplied" on empty token ([#88](https://github.com/qetza/replacetokens-task/issues/88)).
+
+Task 5.6.1
+- Fix "name not supplied" on empty token ([#88](https://github.com/qetza/replacetokens-task/issues/88)).
+
 ## 5.3.0
 Task 6.3.0
 - Add `info` log level for parameter _missingVarLog_.

tasks/ReplaceTokensV5/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 5.6.1
+- Fix "name not supplied" on empty token ([#88](https://github.com/qetza/replacetokens-task/issues/88)).
+
 ## 5.6.0
 - Add `info` action for parameter _actionOnMissing_.
 

tasks/ReplaceTokensV5/index.ts

@@ -258,7 +258,7 @@ var replaceTokensInString = function (
     if (options.enableRecursion && names.includes(name)) throw new Error("recursion cycle with token '" + name + "'.");
 
     // replace value
-    let value: string = name in externalVariables || options.useAdditionalVariablesOnly ? externalVariables[name] : tl.getVariable(name);
+    let value: string = name in externalVariables || options.useAdditionalVariablesOnly ? externalVariables[name] : name ? tl.getVariable(name) : undefined;
 
     let usedDefaultValue: boolean = false;
     if (

tasks/ReplaceTokensV5/task.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 5,
     "Minor": 6,
-    "Patch": 0
+    "Patch": 1
   },
   "releaseNotes": "Migrate to Node10 handler (breaking change).<br/>Add Node16 handler.",
   "instanceNameFormat": "Replace tokens in $(targetFiles)",

tasks/ReplaceTokensV5/tests/L0.ts

@@ -1217,6 +1217,27 @@ describe('ReplaceTokens v5 L0 suite', function () {
         actual.should.equal(expected, 'replaced output');
       }, tr);
     });
+
+    it('should treat empty token as mising variable', async () => {
+      // arrange
+      let tp = path.join(__dirname, 'targetFiles', 'L0_InlineReplace.js');
+      let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+
+      process.env['__inputpath__'] = copyData('emptytoken.json', 'emptytoken.json');
+
+      // act
+      await tr.runAsync();
+
+      // assert
+      runValidation(() => {
+        tr.succeeded.should.equal(true, 'task succeeded');
+
+        tr.stdout.should.include('##vso[task.issue type=warning;source=TaskInternal;]  variable not found: ');
+        tr.stdout.should.include('##vso[task.debug]  : ');
+
+        assertFilesEqual(process.env['__inputpath__'], path.join(data, 'emptytoken.expected.json'), 'replaced output');
+      }, tr);
+    });
   });
 
   describe('external variables', function () {

tasks/ReplaceTokensV5/tests/_data/emptytoken.expected.json

@@ -0,0 +1,4 @@
+{
+  "var1": "var1_value",
+  "empty": ""
+}

tasks/ReplaceTokensV5/tests/_data/emptytoken.json

@@ -0,0 +1,4 @@
+{
+  "var1": "#{var1}#",
+  "empty": "#{}#"
+}

tasks/ReplaceTokensV6/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 6.3.1
+- Fix "name not supplied" on empty token ([#88](https://github.com/qetza/replacetokens-task/issues/88)).
+
 ## 6.3.0
 - Add `info` log level for parameter _missingVarLog_.
 

tasks/ReplaceTokensV6/index.ts

@@ -154,7 +154,7 @@ async function run() {
     // replace tokens
     const result = await rt.replaceTokens(
       sources,
-      (name: string) => (name in additionalVariables || useAdditionalVariablesOnly ? additionalVariables[name] : tl.getVariable(name)),
+      (name: string) => (name in additionalVariables || useAdditionalVariablesOnly ? additionalVariables[name] : name ? tl.getVariable(name) : undefined),
       options
     );
 

tasks/ReplaceTokensV6/task.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 6,
     "Minor": 3,
-    "Patch": 0
+    "Patch": 1
   },
   "releaseNotes": "breaking changes, see [changelog](https://github.com/qetza/replacetokens-task/blob/master/tasks/ReplaceTokensV6/CHANGELOG.md)",
   "instanceNameFormat": "Replace tokens",