From cc2942a230021b4dab82af3c349255678c84dab1 Mon Sep 17 00:00:00 2001 From: Jesse Houwing Date: Wed, 14 Feb 2018 15:09:24 +0100 Subject: [PATCH] Fix Pad Left|Right --- vsts-variable-set/vsts-variable-set.njsproj | 2 +- vsts-variable-transform/package.json | 2 ++ .../vsts-variable-transform.njsproj | 2 +- vsts-variable-transform/vsts-variable-transform.ts | 11 +++-------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/vsts-variable-set/vsts-variable-set.njsproj b/vsts-variable-set/vsts-variable-set.njsproj index 8a5f09c..600d776 100644 --- a/vsts-variable-set/vsts-variable-set.njsproj +++ b/vsts-variable-set/vsts-variable-set.njsproj @@ -5,6 +5,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) vsts-variable-set vsts-variable-set + 0.0 @@ -39,7 +40,6 @@ - diff --git a/vsts-variable-transform/package.json b/vsts-variable-transform/package.json index 3107998..10c84d0 100644 --- a/vsts-variable-transform/package.json +++ b/vsts-variable-transform/package.json @@ -7,6 +7,7 @@ "email": "jesse.houwing@gmail.com" }, "dependencies": { + "core-js": "^2.5.3", "vsts-task-lib": "^2.1.0" }, "scripts": { @@ -15,6 +16,7 @@ "build": "tsc && npm dedupe && npm prune --production" }, "devDependencies": { + "@types/core-js": "^0.9.46", "@types/node": "^6.0.56", "@types/q": "0.0.32", "types": "^0.1.1", diff --git a/vsts-variable-transform/vsts-variable-transform.njsproj b/vsts-variable-transform/vsts-variable-transform.njsproj index f48afe1..fb5fbd1 100644 --- a/vsts-variable-transform/vsts-variable-transform.njsproj +++ b/vsts-variable-transform/vsts-variable-transform.njsproj @@ -5,6 +5,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) vsts-variable-transform NodejsConsoleApp1 + 0.0 @@ -38,7 +39,6 @@ - diff --git a/vsts-variable-transform/vsts-variable-transform.ts b/vsts-variable-transform/vsts-variable-transform.ts index 60e21ac..7f25c28 100644 --- a/vsts-variable-transform/vsts-variable-transform.ts +++ b/vsts-variable-transform/vsts-variable-transform.ts @@ -1,4 +1,5 @@ import tl = require("vsts-task-lib/task"); +import "core-js"; const transformAction = tl.getInput("transformAction", true); let value = tl.getInput("value") || ""; @@ -121,20 +122,14 @@ function applyManipulations(value: string): string { if (!padCharacter) { padCharacter = " "; } - else if (padCharacter.length !== 1) { - console.log("More than one padding character specified."); - tl.setResult(tl.TaskResult.Failed, "Failed"); - return; - } const padLength = +tl.getInput("padLength", true); - const padBase = Array(padLength).join(padCharacter); switch (padType) { case "left": - value = (padBase + value).slice(value.length); + value = value.padStart(padLength, padCharacter); break; case "right": - value = (value + padBase).substring(0, padLength); + value = value.padEnd(padLength, padCharacter); break; } }