show reify diff on --long#7175

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

Merged
wraithgar merged 2 commits into from
Jan 24, 2024
Merged

show reify diff on --long#7175

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
9a1b985
fix: inline diff table code w/ summary code
wraithgar Jan 23, 2024
52c90ee
feat: display tree diff on `--long`
wraithgar Jan 23, 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
88 changes: 36 additions & 52 deletions lib/utils/reify-output.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
}

if (diff) {
if (npm.config.get('dry-run')) {
printDiff(npm, diff)
let diffTable
if (npm.config.get('dry-run') || npm.config.get('long')) {
diffTable = new Table({
chars: {
top: '',
'top-mid': '',
'top-left': '',
'top-right': '',
bottom: '',
'bottom-mid': '',
'bottom-left': '',
'bottom-right': '',
left: '',
'left-mid': '',
mid: '',
'mid-mid': '',
right: '',
'right-mid': '',
middle: ' ',
},
style: {
'padding-left': 0,
'padding-right': 0,
border: 0,
},
})
}

depth({
tree: diff,
visit: d => {
switch (d.action) {
case 'REMOVE':
diffTable?.push(['remove', d.actual.name, d.actual.package.version])
summary.removed++
break
case 'ADD':
diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
actualTree.inventory.has(d.ideal) && summary.added++
break
case 'CHANGE':
diffTable?.push(['change',
d.actual.name,
d.actual.package.version + ' -> ' + d.ideal.package.version,
])
summary.changed++
break
default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
},
getChildren: d => d.children,
})

if (diffTable) {
npm.output('\n' + diffTable.toString())
}
}

if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
const table = new Table({
chars: {
top: '',
'top-mid': '',
'top-left': '',
'top-right': '',
bottom: '',
'bottom-mid': '',
'bottom-left': '',
'bottom-right': '',
left: '',
'left-mid': '',
mid: '',
'mid-mid': '',
right: '',
'right-mid': '',
middle: ' ',
},
style: {
'padding-left': 0,
'padding-right': 0,
border: 0,
},
})

for (let i = 0; i < diff.children.length; ++i) {
const child = diff.children[i]
table[i] = [child.action.toLowerCase()]

switch (child.action) {
case 'ADD':
table[i].push(child.ideal.name, child.ideal.package.version)
break
case 'REMOVE':
table[i].push(child.actual.name, child.actual.package.version)
break
case 'CHANGE':
table[i].push(
child.actual.name,
child.actual.package.version + ' -> ' + child.ideal.package.version
)
break
}
}

npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
if (!report) {
return
Expand Down
13 changes: 11 additions & 2 deletions tap-snapshots/test/lib/utils/reify-output.js.test.cjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0
add foo 1.0.0

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0
add foo 1.0.0

removed 1 package, and changed 1 package in {TIME}
`
30 changes: 29 additions & 1 deletion test/lib/utils/reify-output.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
})
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
const mock = {
actualTree: {
name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
const mock = {
actualTree: {
name: 'foo',
inventory: {
has: () => false,
},
},
diff: {
children: [
{ action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
{ action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
{
action: 'CHANGE',
actual: { name: 'bar', package: { version: '1.0.0' } },
ideal: { package: { version: '2.1.0' } },
},
],
},
}

const out = await mockReify(t, mock, {
long: true,
})

t.matchSnapshot(out, 'diff table')
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
show reify diff on --long#7175

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

 Merged

wraithgar
merged 2 commits into

from

Jan 24, 2024
 Merged


show reify diff on --long#7175
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
9a1b985

fix: inline diff table code w/ summary code


wraithgar Jan 23, 2024
52c90ee

feat: display tree diff on `--long`


wraithgar Jan 23, 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


88 changes: 36 additions & 52 deletions
lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
 }

 if (diff) {
 if (npm.config.get('dry-run')) {
 printDiff(npm, diff)
 let diffTable
 if (npm.config.get('dry-run') || npm.config.get('long')) {
 diffTable = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })
 }

 depth({
 tree: diff,
 visit: d => {
 switch (d.action) {
 case 'REMOVE':
 diffTable?.push(['remove', d.actual.name, d.actual.package.version])
 summary.removed++
 break
 case 'ADD':
 diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
 actualTree.inventory.has(d.ideal) && summary.added++
 break
 case 'CHANGE':
 diffTable?.push(['change',
 d.actual.name,
 d.actual.package.version + ' -> ' + d.ideal.package.version,
 ])
 summary.changed++
 break
 default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
 },
 getChildren: d => d.children,
 })

 if (diffTable) {
 npm.output('\n' + diffTable.toString())
 }
 }

 if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
 npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
 const table = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })

 for (let i = 0; i < diff.children.length; ++i) {
 const child = diff.children[i]
 table[i] = [child.action.toLowerCase()]

 switch (child.action) {
 case 'ADD':
 table[i].push(child.ideal.name, child.ideal.package.version)
 break
 case 'REMOVE':
 table[i].push(child.actual.name, child.actual.package.version)
 break
 case 'CHANGE':
 table[i].push(
 child.actual.name,
 child.actual.package.version + ' -> ' + child.ideal.package.version
 )
 break
 }
 }

 npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
 if (!report) {
 return
Expand Down

13 changes: 11 additions & 2 deletions
tap-snapshots/test/lib/utils/reify-output.js.test.cjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0 
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

30 changes: 29 additions & 1 deletion
test/lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
 })
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

 t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
 inventory: {
 has: () => false,
 },
 },
 diff: {
 children: [
 { action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
 { action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
 {
 action: 'CHANGE',
 actual: { name: 'bar', package: { version: '1.0.0' } },
 ideal: { package: { version: '2.1.0' } },
 },
 ],
 },
 }

 const out = await mockReify(t, mock, {
 long: true,
 })

 t.matchSnapshot(out, 'diff table')
})

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
show reify diff on --long#7175

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

 Merged

wraithgar
merged 2 commits into

from

Jan 24, 2024
 Merged


show reify diff on --long#7175
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
9a1b985

fix: inline diff table code w/ summary code


wraithgar Jan 23, 2024
52c90ee

feat: display tree diff on `--long`


wraithgar Jan 23, 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


88 changes: 36 additions & 52 deletions
lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
 }

 if (diff) {
 if (npm.config.get('dry-run')) {
 printDiff(npm, diff)
 let diffTable
 if (npm.config.get('dry-run') || npm.config.get('long')) {
 diffTable = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })
 }

 depth({
 tree: diff,
 visit: d => {
 switch (d.action) {
 case 'REMOVE':
 diffTable?.push(['remove', d.actual.name, d.actual.package.version])
 summary.removed++
 break
 case 'ADD':
 diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
 actualTree.inventory.has(d.ideal) && summary.added++
 break
 case 'CHANGE':
 diffTable?.push(['change',
 d.actual.name,
 d.actual.package.version + ' -> ' + d.ideal.package.version,
 ])
 summary.changed++
 break
 default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
 },
 getChildren: d => d.children,
 })

 if (diffTable) {
 npm.output('\n' + diffTable.toString())
 }
 }

 if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
 npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
 const table = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })

 for (let i = 0; i < diff.children.length; ++i) {
 const child = diff.children[i]
 table[i] = [child.action.toLowerCase()]

 switch (child.action) {
 case 'ADD':
 table[i].push(child.ideal.name, child.ideal.package.version)
 break
 case 'REMOVE':
 table[i].push(child.actual.name, child.actual.package.version)
 break
 case 'CHANGE':
 table[i].push(
 child.actual.name,
 child.actual.package.version + ' -> ' + child.ideal.package.version
 )
 break
 }
 }

 npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
 if (!report) {
 return
Expand Down

13 changes: 11 additions & 2 deletions
tap-snapshots/test/lib/utils/reify-output.js.test.cjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0 
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

30 changes: 29 additions & 1 deletion
test/lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
 })
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

 t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
 inventory: {
 has: () => false,
 },
 },
 diff: {
 children: [
 { action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
 { action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
 {
 action: 'CHANGE',
 actual: { name: 'bar', package: { version: '1.0.0' } },
 ideal: { package: { version: '2.1.0' } },
 },
 ],
 },
 }

 const out = await mockReify(t, mock, {
 long: true,
 })

 t.matchSnapshot(out, 'diff table')
})

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
show reify diff on --long#7175

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

 Merged

wraithgar
merged 2 commits into

from

Jan 24, 2024
 Merged


show reify diff on --long#7175
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
9a1b985

fix: inline diff table code w/ summary code


wraithgar Jan 23, 2024
52c90ee

feat: display tree diff on `--long`


wraithgar Jan 23, 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


88 changes: 36 additions & 52 deletions
lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
 }

 if (diff) {
 if (npm.config.get('dry-run')) {
 printDiff(npm, diff)
 let diffTable
 if (npm.config.get('dry-run') || npm.config.get('long')) {
 diffTable = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })
 }

 depth({
 tree: diff,
 visit: d => {
 switch (d.action) {
 case 'REMOVE':
 diffTable?.push(['remove', d.actual.name, d.actual.package.version])
 summary.removed++
 break
 case 'ADD':
 diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
 actualTree.inventory.has(d.ideal) && summary.added++
 break
 case 'CHANGE':
 diffTable?.push(['change',
 d.actual.name,
 d.actual.package.version + ' -> ' + d.ideal.package.version,
 ])
 summary.changed++
 break
 default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
 },
 getChildren: d => d.children,
 })

 if (diffTable) {
 npm.output('\n' + diffTable.toString())
 }
 }

 if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
 npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
 const table = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })

 for (let i = 0; i < diff.children.length; ++i) {
 const child = diff.children[i]
 table[i] = [child.action.toLowerCase()]

 switch (child.action) {
 case 'ADD':
 table[i].push(child.ideal.name, child.ideal.package.version)
 break
 case 'REMOVE':
 table[i].push(child.actual.name, child.actual.package.version)
 break
 case 'CHANGE':
 table[i].push(
 child.actual.name,
 child.actual.package.version + ' -> ' + child.ideal.package.version
 )
 break
 }
 }

 npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
 if (!report) {
 return
Expand Down

13 changes: 11 additions & 2 deletions
tap-snapshots/test/lib/utils/reify-output.js.test.cjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0 
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

30 changes: 29 additions & 1 deletion
test/lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
 })
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

 t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
 inventory: {
 has: () => false,
 },
 },
 diff: {
 children: [
 { action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
 { action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
 {
 action: 'CHANGE',
 actual: { name: 'bar', package: { version: '1.0.0' } },
 ideal: { package: { version: '2.1.0' } },
 },
 ],
 },
 }

 const out = await mockReify(t, mock, {
 long: true,
 })

 t.matchSnapshot(out, 'diff table')
})

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
show reify diff on --long#7175

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

 Merged

wraithgar
merged 2 commits into

from

Jan 24, 2024
 Merged


show reify diff on --long#7175
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
9a1b985

fix: inline diff table code w/ summary code


wraithgar Jan 23, 2024
52c90ee

feat: display tree diff on `--long`


wraithgar Jan 23, 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


88 changes: 36 additions & 52 deletions
lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
 }

 if (diff) {
 if (npm.config.get('dry-run')) {
 printDiff(npm, diff)
 let diffTable
 if (npm.config.get('dry-run') || npm.config.get('long')) {
 diffTable = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })
 }

 depth({
 tree: diff,
 visit: d => {
 switch (d.action) {
 case 'REMOVE':
 diffTable?.push(['remove', d.actual.name, d.actual.package.version])
 summary.removed++
 break
 case 'ADD':
 diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
 actualTree.inventory.has(d.ideal) && summary.added++
 break
 case 'CHANGE':
 diffTable?.push(['change',
 d.actual.name,
 d.actual.package.version + ' -> ' + d.ideal.package.version,
 ])
 summary.changed++
 break
 default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
 },
 getChildren: d => d.children,
 })

 if (diffTable) {
 npm.output('\n' + diffTable.toString())
 }
 }

 if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
 npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
 const table = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })

 for (let i = 0; i < diff.children.length; ++i) {
 const child = diff.children[i]
 table[i] = [child.action.toLowerCase()]

 switch (child.action) {
 case 'ADD':
 table[i].push(child.ideal.name, child.ideal.package.version)
 break
 case 'REMOVE':
 table[i].push(child.actual.name, child.actual.package.version)
 break
 case 'CHANGE':
 table[i].push(
 child.actual.name,
 child.actual.package.version + ' -> ' + child.ideal.package.version
 )
 break
 }
 }

 npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
 if (!report) {
 return
Expand Down

13 changes: 11 additions & 2 deletions
tap-snapshots/test/lib/utils/reify-output.js.test.cjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0 
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

30 changes: 29 additions & 1 deletion
test/lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
 })
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

 t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
 inventory: {
 has: () => false,
 },
 },
 diff: {
 children: [
 { action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
 { action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
 {
 action: 'CHANGE',
 actual: { name: 'bar', package: { version: '1.0.0' } },
 ideal: { package: { version: '2.1.0' } },
 },
 ],
 },
 }

 const out = await mockReify(t, mock, {
 long: true,
 })

 t.matchSnapshot(out, 'diff table')
})

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
show reify diff on --long#7175

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

 Merged

wraithgar
merged 2 commits into

from

Jan 24, 2024
 Merged


show reify diff on --long#7175
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
9a1b985

fix: inline diff table code w/ summary code


wraithgar Jan 23, 2024
52c90ee

feat: display tree diff on `--long`


wraithgar Jan 23, 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


88 changes: 36 additions & 52 deletions
lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
 }

 if (diff) {
 if (npm.config.get('dry-run')) {
 printDiff(npm, diff)
 let diffTable
 if (npm.config.get('dry-run') || npm.config.get('long')) {
 diffTable = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })
 }

 depth({
 tree: diff,
 visit: d => {
 switch (d.action) {
 case 'REMOVE':
 diffTable?.push(['remove', d.actual.name, d.actual.package.version])
 summary.removed++
 break
 case 'ADD':
 diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
 actualTree.inventory.has(d.ideal) && summary.added++
 break
 case 'CHANGE':
 diffTable?.push(['change',
 d.actual.name,
 d.actual.package.version + ' -> ' + d.ideal.package.version,
 ])
 summary.changed++
 break
 default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
 },
 getChildren: d => d.children,
 })

 if (diffTable) {
 npm.output('\n' + diffTable.toString())
 }
 }

 if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
 npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
 const table = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })

 for (let i = 0; i < diff.children.length; ++i) {
 const child = diff.children[i]
 table[i] = [child.action.toLowerCase()]

 switch (child.action) {
 case 'ADD':
 table[i].push(child.ideal.name, child.ideal.package.version)
 break
 case 'REMOVE':
 table[i].push(child.actual.name, child.actual.package.version)
 break
 case 'CHANGE':
 table[i].push(
 child.actual.name,
 child.actual.package.version + ' -> ' + child.ideal.package.version
 )
 break
 }
 }

 npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
 if (!report) {
 return
Expand Down

13 changes: 11 additions & 2 deletions
tap-snapshots/test/lib/utils/reify-output.js.test.cjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0 
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

30 changes: 29 additions & 1 deletion
test/lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
 })
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

 t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
 inventory: {
 has: () => false,
 },
 },
 diff: {
 children: [
 { action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
 { action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
 {
 action: 'CHANGE',
 actual: { name: 'bar', package: { version: '1.0.0' } },
 ideal: { package: { version: '2.1.0' } },
 },
 ],
 },
 }

 const out = await mockReify(t, mock, {
 long: true,
 })

 t.matchSnapshot(out, 'diff table')
})

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
show reify diff on --long#7175

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

 Merged

wraithgar
merged 2 commits into

from

Jan 24, 2024
 Merged


show reify diff on --long#7175
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
9a1b985

fix: inline diff table code w/ summary code


wraithgar Jan 23, 2024
52c90ee

feat: display tree diff on `--long`


wraithgar Jan 23, 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


88 changes: 36 additions & 52 deletions
lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
 }

 if (diff) {
 if (npm.config.get('dry-run')) {
 printDiff(npm, diff)
 let diffTable
 if (npm.config.get('dry-run') || npm.config.get('long')) {
 diffTable = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })
 }

 depth({
 tree: diff,
 visit: d => {
 switch (d.action) {
 case 'REMOVE':
 diffTable?.push(['remove', d.actual.name, d.actual.package.version])
 summary.removed++
 break
 case 'ADD':
 diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
 actualTree.inventory.has(d.ideal) && summary.added++
 break
 case 'CHANGE':
 diffTable?.push(['change',
 d.actual.name,
 d.actual.package.version + ' -> ' + d.ideal.package.version,
 ])
 summary.changed++
 break
 default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
 },
 getChildren: d => d.children,
 })

 if (diffTable) {
 npm.output('\n' + diffTable.toString())
 }
 }

 if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
 npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
 const table = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })

 for (let i = 0; i < diff.children.length; ++i) {
 const child = diff.children[i]
 table[i] = [child.action.toLowerCase()]

 switch (child.action) {
 case 'ADD':
 table[i].push(child.ideal.name, child.ideal.package.version)
 break
 case 'REMOVE':
 table[i].push(child.actual.name, child.actual.package.version)
 break
 case 'CHANGE':
 table[i].push(
 child.actual.name,
 child.actual.package.version + ' -> ' + child.ideal.package.version
 )
 break
 }
 }

 npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
 if (!report) {
 return
Expand Down

13 changes: 11 additions & 2 deletions
tap-snapshots/test/lib/utils/reify-output.js.test.cjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0 
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

30 changes: 29 additions & 1 deletion
test/lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
 })
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

 t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
 inventory: {
 has: () => false,
 },
 },
 diff: {
 children: [
 { action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
 { action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
 {
 action: 'CHANGE',
 actual: { name: 'bar', package: { version: '1.0.0' } },
 ideal: { package: { version: '2.1.0' } },
 },
 ],
 },
 }

 const out = await mockReify(t, mock, {
 long: true,
 })

 t.matchSnapshot(out, 'diff table')
})

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
show reify diff on --long#7175

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

 Merged

wraithgar
merged 2 commits into

from

Jan 24, 2024
 Merged


show reify diff on --long#7175
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
9a1b985

fix: inline diff table code w/ summary code


wraithgar Jan 23, 2024
52c90ee

feat: display tree diff on `--long`


wraithgar Jan 23, 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


88 changes: 36 additions & 52 deletions
lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,21 +42,51 @@ const reifyOutput = (npm, arb) => {
 }

 if (diff) {
 if (npm.config.get('dry-run')) {
 printDiff(npm, diff)
 let diffTable
 if (npm.config.get('dry-run') || npm.config.get('long')) {
 diffTable = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })
 }

 depth({
 tree: diff,
 visit: d => {
 switch (d.action) {
 case 'REMOVE':
 diffTable?.push(['remove', d.actual.name, d.actual.package.version])
 summary.removed++
 break
 case 'ADD':
 diffTable?.push(['add', d.ideal.name, d.ideal.package.version])
 actualTree.inventory.has(d.ideal) && summary.added++
 break
 case 'CHANGE':
 diffTable?.push(['change',
 d.actual.name,
 d.actual.package.version + ' -> ' + d.ideal.package.version,
 ])
 summary.changed++
 break
 default:
Expand All@@ -67,6 +97,10 @@ const reifyOutput = (npm, arb) => {
 },
 getChildren: d => d.children,
 })

 if (diffTable) {
 npm.output('\n' + diffTable.toString())
 }
 }

 if (npm.flatOptions.fund) {
Expand DownExpand Up@@ -103,56 +137,6 @@ const printAuditReport = (npm, report) => {
 npm.output(`\n${res.report}`)
}

// print the diff tree of actions that would be taken
const printDiff = (npm, diff) => {
 const table = new Table({
 chars: {
 top: '',
 'top-mid': '',
 'top-left': '',
 'top-right': '',
 bottom: '',
 'bottom-mid': '',
 'bottom-left': '',
 'bottom-right': '',
 left: '',
 'left-mid': '',
 mid: '',
 'mid-mid': '',
 right: '',
 'right-mid': '',
 middle: ' ',
 },
 style: {
 'padding-left': 0,
 'padding-right': 0,
 border: 0,
 },
 })

 for (let i = 0; i < diff.children.length; ++i) {
 const child = diff.children[i]
 table[i] = [child.action.toLowerCase()]

 switch (child.action) {
 case 'ADD':
 table[i].push(child.ideal.name, child.ideal.package.version)
 break
 case 'REMOVE':
 table[i].push(child.actual.name, child.actual.package.version)
 break
 case 'CHANGE':
 table[i].push(
 child.actual.name,
 child.actual.package.version + ' -> ' + child.ideal.package.version
 )
 break
 }
 }

 npm.output('\n' + table.toString())
}

const getAuditReport = (npm, report) => {
 if (!report) {
 return
Expand Down

13 changes: 11 additions & 2 deletions
tap-snapshots/test/lib/utils/reify-output.js.test.cjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1633,11 +1633,20 @@ exports[`test/lib/utils/reify-output.js TAP packages changed message > {"added"
}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference > diff table 1`] = `
exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on dry-run > diff table 1`] = `

add foo 1.0.0 
change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

exports[`test/lib/utils/reify-output.js TAP prints dedupe difference on long > diff table 1`] = `

change bar 1.0.0 -> 2.1.0
remove bar 1.0.0 
add foo 1.0.0 

removed 1 package, and changed 1 package in {TIME}
`

30 changes: 29 additions & 1 deletion
test/lib/utils/reify-output.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ t.test('added packages should be looked up within returned tree', async t => {
 })
})

t.test('prints dedupe difference', async t => {
t.test('prints dedupe difference on dry-run', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
Expand All@@ -408,3 +408,31 @@ t.test('prints dedupe difference', async t => {

 t.matchSnapshot(out, 'diff table')
})

t.test('prints dedupe difference on long', async t => {
 const mock = {
 actualTree: {
 name: 'foo',
 inventory: {
 has: () => false,
 },
 },
 diff: {
 children: [
 { action: 'ADD', ideal: { name: 'foo', package: { version: '1.0.0' } } },
 { action: 'REMOVE', actual: { name: 'bar', package: { version: '1.0.0' } } },
 {
 action: 'CHANGE',
 actual: { name: 'bar', package: { version: '1.0.0' } },
 ideal: { package: { version: '2.1.0' } },
 },
 ],
 },
 }

 const out = await mockReify(t, mock, {
 long: true,
 })

 t.matchSnapshot(out, 'diff table')
})