Skip to content

Commit

Permalink
Merge pull request #115 from crazy-max/input-comment-opt
Browse files Browse the repository at this point in the history
util: comment opt for getInputList
  • Loading branch information
crazy-max committed Jun 13, 2023
2 parents b1e0aee + 9450a45 commit 495c96b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
12 changes: 12 additions & 0 deletions __tests__/util.test.ts
Expand Up @@ -73,6 +73,18 @@ describe('getInputList', () => {
expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
});

it('multiline and ignoring comment correctly', async () => {
setInput('labels', 'foo=bar\nbar=qux#baz');
const res = Util.getInputList('labels');
expect(res).toEqual(['foo=bar', 'bar=qux#baz']);
});

it('multiline with comment', async () => {
setInput('labels', 'foo=bar\nbar=qux#baz');
const res = Util.getInputList('labels', {comment: '#'});
expect(res).toEqual(['foo=bar', 'bar=qux']);
});

it('different new lines and ignoring comma correctly', async () => {
setInput('cache-from', 'user/app:cache\r\ntype=local,src=path/to/dir');
const res = Util.getInputList('cache-from', {ignoreComma: true});
Expand Down
3 changes: 2 additions & 1 deletion src/util.ts
Expand Up @@ -21,6 +21,7 @@ import {parse} from 'csv-parse/sync';

export interface InputListOpts {
ignoreComma?: boolean;
comment?: string;
quote?: string | boolean | Buffer | null;
}

Expand All @@ -36,7 +37,7 @@ export class Util {
const records = parse(items, {
columns: false,
relaxQuotes: true,
comment: '#',
comment: opts?.comment,
relaxColumnCount: true,
skipEmptyLines: true,
quote: opts?.quote
Expand Down

0 comments on commit 495c96b

Please sign in to comment.