-
Notifications
You must be signed in to change notification settings - Fork 89
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.
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
feat: show diff after sorting #268
Open
miwashutaro0611
wants to merge
11
commits into
keithamus:main
Choose a base branch
from
miwashutaro0611:feature/chore-install-jsdiff
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,540
−3,250
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9b95324
feat: show diff after sorting
miwashutaro0611 56e2346
fix: changed to picocolors library
miwashutaro0611 12f90e3
fix: put +/- before the line
miwashutaro0611 885ad4b
Update cli.js
miwashutaro0611 113ab6e
chore: conflict resolution
miwashutaro0611 56ac777
test: fix test
fisker 3305a00
chore: refresh lock file
fisker b6b8fd2
ci: run test on more platform and node versions
fisker 43f4d2f
chore: meta tweak
fisker 45ad676
refactor: use `yoctocolors`
fisker 8f437e6
refactor: use process.execPath
fisker File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
* text=auto eol=lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,8 @@ | |
import fs from 'node:fs' | ||
import { globbySync } from 'globby' | ||
import sortPackageJson from './index.js' | ||
import * as yoctocolors from 'yoctocolors' | ||
import { diffLines } from 'diff' | ||
|
||
const isCheckFlag = (argument) => argument === '--check' || argument === '-c' | ||
|
||
|
@@ -34,6 +36,20 @@ files.forEach((file) => { | |
} else { | ||
fs.writeFileSync(file, sorted, 'utf8') | ||
console.log(`${file} is sorted!`) | ||
const diff = diffLines(packageJson, sorted) | ||
diff.forEach((part) => { | ||
const partLineList = part.value.split('\n') | ||
partLineList.forEach((line, index) => { | ||
if ((part.added || part.removed) && index === partLineList.length - 1) | ||
return | ||
const colorValue = part.added | ||
? yoctocolors.green(`+${line}\n`) | ||
: part.removed | ||
? yoctocolors.red(`-${line}\n`) | ||
: yoctocolors.gray(` ${line}\n`) | ||
process.stderr.write(colorValue) | ||
}) | ||
Comment on lines
+40
to
+51
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can use |
||
}) | ||
} | ||
} | ||
}) | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the EOL can be
\r
or\r\n
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see.
Thank you for the information on how to respond.