Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sept24 audit fix #266

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Sept24 audit fix #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2156999
chore(lint): resolve indentation error
mrodrig Sep 26, 2024
ed8f6e7
chore(deps): npm audit fix
mrodrig Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions src/json2csv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { excelBOM, errors } from './constants';
import * as utils from './utils';
import type { FullJson2CsvOptions, Json2CsvParams } from './types';

export const Json2Csv = function(options: FullJson2CsvOptions) {
export const Json2Csv = function (options: FullJson2CsvOptions) {
const wrapDelimiterCheckRegex = new RegExp(options.delimiter.wrap, 'g'),
crlfSearchRegex = /\r?\n|\r/,
customValueParser = options.parseValue && typeof options.parseValue === 'function' ? options.parseValue : null,
Expand Down Expand Up @@ -58,8 +58,8 @@ export const Json2Csv = function(options: FullJson2CsvOptions) {
function checkSchemaDifferences(documentSchemas: string[][]) {
// have multiple documents - ensure only one schema (regardless of field ordering)
const firstDocSchema = documentSchemas[0],
restOfDocumentSchemas = documentSchemas.slice(1),
schemaDifferences = computeNumberOfSchemaDifferences(firstDocSchema, restOfDocumentSchemas);
restOfDocumentSchemas = documentSchemas.slice(1),
schemaDifferences = computeNumberOfSchemaDifferences(firstDocSchema, restOfDocumentSchemas);

// If there are schema inconsistencies, throw a schema not the same error
if (schemaDifferences) {
Expand Down Expand Up @@ -134,7 +134,7 @@ export const Json2Csv = function(options: FullJson2CsvOptions) {
function wrapHeaderFields(params: Json2CsvParams) {
// only perform this if we are actually prepending the header
if (options.prependHeader) {
params.headerFields = params.headerFields.map(function(headingKey) {
params.headerFields = params.headerFields.map(function (headingKey) {
return wrapFieldValueIfNecessary(headingKey);
});
}
Expand All @@ -149,13 +149,13 @@ export const Json2Csv = function(options: FullJson2CsvOptions) {
const fieldTitleMapKeys = Object.keys(options.fieldTitleMap);

params.header = params.headerFields
.map(function(field) {
.map(function (field) {
let headerKey = field;

// If a custom field title was provided for this field, use that
if (fieldTitleMapKeys.includes(field)) {
headerKey = options.fieldTitleMap[field];
} else if (!options.escapeHeaderNestedDots) {
} else if (!options.escapeHeaderNestedDots) {
// Otherwise, if the user doesn't want nested dots in keys to be escaped, then unescape them
headerKey = headerKey.replace(/\\\./g, '.');
}
Expand Down Expand Up @@ -188,7 +188,7 @@ export const Json2Csv = function(options: FullJson2CsvOptions) {
} else if (item?.wildcardMatch) {
// Return "field" value for objects with wildcardMatch: true
return item.field;
}
}
// Exclude other objects
return [];
});
Expand All @@ -206,7 +206,7 @@ export const Json2Csv = function(options: FullJson2CsvOptions) {

if (options.keys) {
options.keys = keyStrings;

const matchedKeys = keyStrings.flatMap((userProvidedKey) => {
// If this is not a wildcard matched key, then just return and include it in the resulting key list
if (!wildcardMatchKeys.includes(userProvidedKey)) {
Expand Down
Loading