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

fix: left-hand-side character fixes + refactoring #39

Merged
merged 9 commits into from
Jun 27, 2020
Merged

fix: left-hand-side character fixes + refactoring #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d7424c2
refactor: refactored B class functions
Berkmann18 Jun 20, 2020
f0d172d
test(index): more test cases
Berkmann18 Jun 20, 2020
5899676
feat(fixer): trailing char fixer simplification
Berkmann18 Jun 20, 2020
fedb73f
chore(samples): added test samples
Berkmann18 Jun 26, 2020
e2f8b9d
fix(fixer): fixing missing LHS quotes with 1-2 chars
Berkmann18 Jun 26, 2020
253ebfc
fix(index): not applying trailing-char fixes on LHS issues
Berkmann18 Jun 27, 2020
bcd65b8
test(index): lefty chars test
Berkmann18 Jun 27, 2020
b8a4588
test(index): overall refactoring of the test suite
Berkmann18 Jun 27, 2020
f3c6d3c
test(index): further refactoring
Berkmann18 Jun 27, 2020
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
20 changes: 11 additions & 9 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ const extraChar = (err) => err.expected[0].type === 'other' && ['}', ']'].includ

const trailingChar = (err) => {
const literal = err.expected[0].type === 'literal' && err.expected[0].text !== ':';
return (
['.', ',', 'x', 'b', 'o'].includes(err.found) && (err.expected[0].type === 'other' || literal)
);
return ['.', ',', 'x', 'b', 'o'].includes(err.found) && literal;
};

const missingChar = (err) => err.expected[0].text === ',' && ['"', '[', '{'].includes(err.found);
Expand Down Expand Up @@ -100,6 +98,15 @@ const fixJson = (err, data, options) => {
};
/*eslint-enable no-console */

const fixingTime = ({ data, err, optionsCopy }) => {
fixRounds = 0;
setFixThreshold(data);
return {
data: fixJson(err, data, optionsCopy),
changed: true
};
};

/**
* @param {string} data JSON string data to check (and fix).
* @param {{verbose:boolean, parse:boolean}} options configuration object which specifies verbosity and whether the object should be parsed or returned as fixed string
Expand Down Expand Up @@ -128,12 +135,7 @@ const checkJson = (data, options) => {
};
}
} catch (err) {
fixRounds = 0;
setFixThreshold(data);
return {
data: fixJson(err, data, optionsCopy),
changed: true
};
return fixingTime({ data, err, optionsCopy });
}
};

Expand Down
Loading