3
0
Fork 0
mirror of https://gitea.com/docker/metadata-action.git synced 2024-11-21 19:49:32 +01:00

Fix csv-parse implementation since major update

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2022-04-25 13:35:08 +02:00
parent 2a96a96c9c
commit b7ad32e4f5
No known key found for this signature in database
GPG key ID: 3248E46B6BB8C7F7
4 changed files with 20 additions and 15 deletions

View file

@ -6,5 +6,8 @@ module.exports = {
transform: {
'^.+\\.ts$': 'ts-jest'
},
moduleNameMapper: {
'^csv-parse/sync': '<rootDir>/node_modules/csv-parse/dist/cjs/sync.cjs'
},
verbose: true
};

View file

@ -1,4 +1,4 @@
import csvparse from 'csv-parse/lib/sync';
import {parse} from 'csv-parse/sync';
import * as core from '@actions/core';
import {issueCommand} from '@actions/core/lib/command';
import * as fs from 'fs';
@ -46,21 +46,23 @@ export function getInputList(name: string, ignoreComma?: boolean): string[] {
return res;
}
for (const output of csvparse(items, {
const records = parse(items, {
columns: false,
relax: true,
relaxQuotes: true,
comment: '#',
relaxColumnCount: true,
skipLinesWithEmptyValues: true
}) as Array<string[]>) {
if (output.length == 1) {
res.push(output[0]);
skipEmptyLines: true
});
for (const record of records as Array<string[]>) {
if (record.length == 1) {
res.push(record[0]);
continue;
} else if (!ignoreComma) {
res.push(...output);
res.push(...record);
continue;
}
res.push(output.join(','));
res.push(record.join(','));
}
return res.filter(item => item).map(pat => pat.trim());

View file

@ -1,5 +1,5 @@
import {parse} from 'csv-parse/sync';
import * as core from '@actions/core';
import csvparse from 'csv-parse/lib/sync';
export interface Flavor {
latest: string;
@ -19,9 +19,9 @@ export function Transform(inputs: string[]): Flavor {
};
for (const input of inputs) {
const fields = csvparse(input, {
const fields = parse(input, {
relaxColumnCount: true,
skipLinesWithEmptyValues: true
skipEmptyLines: true
})[0];
let onlatestfor = '';
for (const field of fields) {

View file

@ -1,4 +1,4 @@
import csvparse from 'csv-parse/lib/sync';
import {parse} from 'csv-parse/sync';
import * as core from '@actions/core';
export enum Type {
@ -86,9 +86,9 @@ export function Transform(inputs: string[]): Tag[] {
}
export function Parse(s: string): Tag {
const fields = csvparse(s, {
const fields = parse(s, {
relaxColumnCount: true,
skipLinesWithEmptyValues: true
skipEmptyLines: true
})[0];
const tag = new Tag();