Ensure getDelimitedInput handles trailing delimiters correctly (#60)

* Ensure getDelimitedInput handles trailing delimiters correctlyFixes #59 * Adding missing newline that's bothering me * Re-ordering filter (c/o @karoun)
quizlet · Nov 24, 2020 · 84d374d · 84d374d
1 parent 821aa8e
commit 84d374d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/utils/__tests__/inputs.test.ts b/src/utils/__tests__/inputs.test.ts
@@ -52,4 +52,22 @@ describe('getDelimitedArrayInput', () => {
     expect(getDelimitedArrayInput(key)).toStrictEqual(value);
     expect(mockGetInput).toHaveBeenCalledWith(key, undefined);
   });
+
+  it('ignores trailing commas', () => {
+    const key = 'input';
+    const value = ['foo', 'bar', 'baz'];
+    const rawValue = `${_.join(value, ',')},`;
+    mockGetInput.mockReturnValueOnce(rawValue);
+    expect(getDelimitedArrayInput(key)).toStrictEqual(value);
+    expect(mockGetInput).toHaveBeenCalledWith(key, undefined);
+  });
+
+  it('ignores trailing newlines', () => {
+    const key = 'input';
+    const value = ['foo', 'bar', 'baz'];
+    const rawValue = `${_.join(value, '\n')}\n`;
+    mockGetInput.mockReturnValueOnce(rawValue);
+    expect(getDelimitedArrayInput(key)).toStrictEqual(value);
+    expect(mockGetInput).toHaveBeenCalledWith(key, undefined);
+  });
 });
diff --git a/src/utils/inputs.ts b/src/utils/inputs.ts
@@ -35,5 +35,5 @@ export function getDelimitedArrayInput(name: string, options?: InputOptions): st
   const value = getInput(name, options);
   const sep = _.includes(value, '\n') ? '\n' : ',';
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  return _.map(_.split(value, sep), _.trim);
+  return _.filter(_.map(_.split(value, sep), _.trim));
 }