Commit 74dcdbb

Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method when a child path had already been seen through a different pattern context, silently dropping the remaining sibling entries. Whether this triggered depended on directory iteration order, which also made test-fs-glob.mjs flaky. Remove the check: the cache.add call at the start of the traversal already prevents reprocessing. Fixes: #62897 Co-authored-by: semimikoh <ejffjeosms@gmail.com> Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com> PR-URL: #64895 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb

2 files changed

Lines changed: 76 additions & 6 deletions

File tree

‎lib/internal/fs/glob.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);

‎test/parallel/test-fs-glob.mjs‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
const assert = require('node:assert');
684+
const fs = require('node:fs');
685+
const fsPromises = require('node:fs/promises');
686+
const path = require('node:path');
687+
688+
const cwd = process.argv[1];
689+
const a = path.join(cwd, 'a');
690+
fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
fs.writeFileSync(path.join(a, 'x'), '');
693+
fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
const originalReaddirSync = fs.readdirSync;
696+
const originalReaddir = fsPromises.readdir;
697+
698+
const reorder = (target, entries) => {
699+
if (!Array.isArray(entries) || target !== a) return entries;
700+
const names = ['c', 'b', 'x', 'z'];
701+
return names.map((name) => entries.find((entry) => entry.name === name))
702+
.filter(Boolean);
703+
};
704+
705+
fs.readdirSync = function(target, options) {
706+
return reorder(target, originalReaddirSync.call(this, target, options));
707+
};
708+
fsPromises.readdir = async function(target, options) {
709+
return reorder(target, await originalReaddir.call(this, target, options));
710+
};
711+
712+
const { Glob } = require('internal/fs/glob');
713+
const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
const normalize = (results) =>
715+
results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
(async () => {
718+
const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
for (const item of expected) {
720+
assert.ok(syncResults.includes(item),
721+
\`missing \${item} from sync results: \${syncResults}\`);
722+
}
723+
724+
const asyncResults = [];
725+
for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
asyncResults.push(item);
727+
}
728+
const normalized = normalize(asyncResults);
729+
for (const item of expected) {
730+
assert.ok(normalized.includes(item),
731+
\`missing \${item} from async results: \${normalized}\`);
732+
}
733+
})().catch((err) => {
734+
console.error(err);
735+
process.exitCode = 1;
736+
});
737+
`;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
Commit 74dcdbb
Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method
when a child path had already been seen through a different pattern
context, silently dropping the remaining sibling entries. Whether this
triggered depended on directory iteration order, which also made
test-fs-glob.mjs flaky.
Remove the check: the cache.add call at the start of the traversal
already prevents reprocessing.
Fixes: #62897
Co-authored-by: semimikoh <ejffjeosms@gmail.com>
Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com>
PR-URL: #64895
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb
2 files changed
Lines changed: 76 additions & 6 deletions
File tree
‎lib/internal/fs/glob.js‎
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);
‎test/parallel/test-fs-glob.mjs‎
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
 const assert = require('node:assert');
684+
 const fs = require('node:fs');
685+
 const fsPromises = require('node:fs/promises');
686+
 const path = require('node:path');
687+
688+
 const cwd = process.argv[1];
689+
 const a = path.join(cwd, 'a');
690+
 fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
 fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
 fs.writeFileSync(path.join(a, 'x'), '');
693+
 fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
 const originalReaddirSync = fs.readdirSync;
696+
 const originalReaddir = fsPromises.readdir;
697+
698+
 const reorder = (target, entries) => {
699+
 if (!Array.isArray(entries) || target !== a) return entries;
700+
 const names = ['c', 'b', 'x', 'z'];
701+
 return names.map((name) => entries.find((entry) => entry.name === name))
702+
 .filter(Boolean);
703+
 };
704+
705+
 fs.readdirSync = function(target, options) {
706+
 return reorder(target, originalReaddirSync.call(this, target, options));
707+
 };
708+
 fsPromises.readdir = async function(target, options) {
709+
 return reorder(target, await originalReaddir.call(this, target, options));
710+
 };
711+
712+
 const { Glob } = require('internal/fs/glob');
713+
 const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
 const normalize = (results) =>
715+
 results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
 (async () => {
718+
 const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
 for (const item of expected) {
720+
 assert.ok(syncResults.includes(item),
721+
 \`missing \${item} from sync results: \${syncResults}\`);
722+
 }
723+
724+
 const asyncResults = [];
725+
 for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
 asyncResults.push(item);
727+
 }
728+
 const normalized = normalize(asyncResults);
729+
 for (const item of expected) {
730+
 assert.ok(normalized.includes(item),
731+
 \`missing \${item} from async results: \${normalized}\`);
732+
 }
733+
 })().catch((err) => {
734+
 console.error(err);
735+
 process.exitCode = 1;
736+
 });
737+
 `;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});
0 commit comments
Comments
 (0)

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

Skip to content
Commit 74dcdbb
Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method
when a child path had already been seen through a different pattern
context, silently dropping the remaining sibling entries. Whether this
triggered depended on directory iteration order, which also made
test-fs-glob.mjs flaky.
Remove the check: the cache.add call at the start of the traversal
already prevents reprocessing.
Fixes: #62897
Co-authored-by: semimikoh <ejffjeosms@gmail.com>
Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com>
PR-URL: #64895
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb
2 files changed
Lines changed: 76 additions & 6 deletions
File tree
‎lib/internal/fs/glob.js‎
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);
‎test/parallel/test-fs-glob.mjs‎
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
 const assert = require('node:assert');
684+
 const fs = require('node:fs');
685+
 const fsPromises = require('node:fs/promises');
686+
 const path = require('node:path');
687+
688+
 const cwd = process.argv[1];
689+
 const a = path.join(cwd, 'a');
690+
 fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
 fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
 fs.writeFileSync(path.join(a, 'x'), '');
693+
 fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
 const originalReaddirSync = fs.readdirSync;
696+
 const originalReaddir = fsPromises.readdir;
697+
698+
 const reorder = (target, entries) => {
699+
 if (!Array.isArray(entries) || target !== a) return entries;
700+
 const names = ['c', 'b', 'x', 'z'];
701+
 return names.map((name) => entries.find((entry) => entry.name === name))
702+
 .filter(Boolean);
703+
 };
704+
705+
 fs.readdirSync = function(target, options) {
706+
 return reorder(target, originalReaddirSync.call(this, target, options));
707+
 };
708+
 fsPromises.readdir = async function(target, options) {
709+
 return reorder(target, await originalReaddir.call(this, target, options));
710+
 };
711+
712+
 const { Glob } = require('internal/fs/glob');
713+
 const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
 const normalize = (results) =>
715+
 results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
 (async () => {
718+
 const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
 for (const item of expected) {
720+
 assert.ok(syncResults.includes(item),
721+
 \`missing \${item} from sync results: \${syncResults}\`);
722+
 }
723+
724+
 const asyncResults = [];
725+
 for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
 asyncResults.push(item);
727+
 }
728+
 const normalized = normalize(asyncResults);
729+
 for (const item of expected) {
730+
 assert.ok(normalized.includes(item),
731+
 \`missing \${item} from async results: \${normalized}\`);
732+
 }
733+
 })().catch((err) => {
734+
 console.error(err);
735+
 process.exitCode = 1;
736+
 });
737+
 `;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});
0 commit comments
Comments
 (0)

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

Skip to content
Commit 74dcdbb
Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method
when a child path had already been seen through a different pattern
context, silently dropping the remaining sibling entries. Whether this
triggered depended on directory iteration order, which also made
test-fs-glob.mjs flaky.
Remove the check: the cache.add call at the start of the traversal
already prevents reprocessing.
Fixes: #62897
Co-authored-by: semimikoh <ejffjeosms@gmail.com>
Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com>
PR-URL: #64895
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb
2 files changed
Lines changed: 76 additions & 6 deletions
File tree
‎lib/internal/fs/glob.js‎
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);
‎test/parallel/test-fs-glob.mjs‎
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
 const assert = require('node:assert');
684+
 const fs = require('node:fs');
685+
 const fsPromises = require('node:fs/promises');
686+
 const path = require('node:path');
687+
688+
 const cwd = process.argv[1];
689+
 const a = path.join(cwd, 'a');
690+
 fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
 fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
 fs.writeFileSync(path.join(a, 'x'), '');
693+
 fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
 const originalReaddirSync = fs.readdirSync;
696+
 const originalReaddir = fsPromises.readdir;
697+
698+
 const reorder = (target, entries) => {
699+
 if (!Array.isArray(entries) || target !== a) return entries;
700+
 const names = ['c', 'b', 'x', 'z'];
701+
 return names.map((name) => entries.find((entry) => entry.name === name))
702+
 .filter(Boolean);
703+
 };
704+
705+
 fs.readdirSync = function(target, options) {
706+
 return reorder(target, originalReaddirSync.call(this, target, options));
707+
 };
708+
 fsPromises.readdir = async function(target, options) {
709+
 return reorder(target, await originalReaddir.call(this, target, options));
710+
 };
711+
712+
 const { Glob } = require('internal/fs/glob');
713+
 const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
 const normalize = (results) =>
715+
 results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
 (async () => {
718+
 const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
 for (const item of expected) {
720+
 assert.ok(syncResults.includes(item),
721+
 \`missing \${item} from sync results: \${syncResults}\`);
722+
 }
723+
724+
 const asyncResults = [];
725+
 for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
 asyncResults.push(item);
727+
 }
728+
 const normalized = normalize(asyncResults);
729+
 for (const item of expected) {
730+
 assert.ok(normalized.includes(item),
731+
 \`missing \${item} from async results: \${normalized}\`);
732+
 }
733+
 })().catch((err) => {
734+
 console.error(err);
735+
 process.exitCode = 1;
736+
 });
737+
 `;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
Commit 74dcdbb
Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method
when a child path had already been seen through a different pattern
context, silently dropping the remaining sibling entries. Whether this
triggered depended on directory iteration order, which also made
test-fs-glob.mjs flaky.
Remove the check: the cache.add call at the start of the traversal
already prevents reprocessing.
Fixes: #62897
Co-authored-by: semimikoh <ejffjeosms@gmail.com>
Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com>
PR-URL: #64895
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb
2 files changed
Lines changed: 76 additions & 6 deletions
File tree
‎lib/internal/fs/glob.js‎
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);
‎test/parallel/test-fs-glob.mjs‎
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
 const assert = require('node:assert');
684+
 const fs = require('node:fs');
685+
 const fsPromises = require('node:fs/promises');
686+
 const path = require('node:path');
687+
688+
 const cwd = process.argv[1];
689+
 const a = path.join(cwd, 'a');
690+
 fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
 fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
 fs.writeFileSync(path.join(a, 'x'), '');
693+
 fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
 const originalReaddirSync = fs.readdirSync;
696+
 const originalReaddir = fsPromises.readdir;
697+
698+
 const reorder = (target, entries) => {
699+
 if (!Array.isArray(entries) || target !== a) return entries;
700+
 const names = ['c', 'b', 'x', 'z'];
701+
 return names.map((name) => entries.find((entry) => entry.name === name))
702+
 .filter(Boolean);
703+
 };
704+
705+
 fs.readdirSync = function(target, options) {
706+
 return reorder(target, originalReaddirSync.call(this, target, options));
707+
 };
708+
 fsPromises.readdir = async function(target, options) {
709+
 return reorder(target, await originalReaddir.call(this, target, options));
710+
 };
711+
712+
 const { Glob } = require('internal/fs/glob');
713+
 const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
 const normalize = (results) =>
715+
 results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
 (async () => {
718+
 const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
 for (const item of expected) {
720+
 assert.ok(syncResults.includes(item),
721+
 \`missing \${item} from sync results: \${syncResults}\`);
722+
 }
723+
724+
 const asyncResults = [];
725+
 for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
 asyncResults.push(item);
727+
 }
728+
 const normalized = normalize(asyncResults);
729+
 for (const item of expected) {
730+
 assert.ok(normalized.includes(item),
731+
 \`missing \${item} from async results: \${normalized}\`);
732+
 }
733+
 })().catch((err) => {
734+
 console.error(err);
735+
 process.exitCode = 1;
736+
 });
737+
 `;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});
0 commit comments
Comments
 (0)

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

Skip to content
Commit 74dcdbb
Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method
when a child path had already been seen through a different pattern
context, silently dropping the remaining sibling entries. Whether this
triggered depended on directory iteration order, which also made
test-fs-glob.mjs flaky.
Remove the check: the cache.add call at the start of the traversal
already prevents reprocessing.
Fixes: #62897
Co-authored-by: semimikoh <ejffjeosms@gmail.com>
Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com>
PR-URL: #64895
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb
2 files changed
Lines changed: 76 additions & 6 deletions
File tree
‎lib/internal/fs/glob.js‎
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);
‎test/parallel/test-fs-glob.mjs‎
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
 const assert = require('node:assert');
684+
 const fs = require('node:fs');
685+
 const fsPromises = require('node:fs/promises');
686+
 const path = require('node:path');
687+
688+
 const cwd = process.argv[1];
689+
 const a = path.join(cwd, 'a');
690+
 fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
 fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
 fs.writeFileSync(path.join(a, 'x'), '');
693+
 fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
 const originalReaddirSync = fs.readdirSync;
696+
 const originalReaddir = fsPromises.readdir;
697+
698+
 const reorder = (target, entries) => {
699+
 if (!Array.isArray(entries) || target !== a) return entries;
700+
 const names = ['c', 'b', 'x', 'z'];
701+
 return names.map((name) => entries.find((entry) => entry.name === name))
702+
 .filter(Boolean);
703+
 };
704+
705+
 fs.readdirSync = function(target, options) {
706+
 return reorder(target, originalReaddirSync.call(this, target, options));
707+
 };
708+
 fsPromises.readdir = async function(target, options) {
709+
 return reorder(target, await originalReaddir.call(this, target, options));
710+
 };
711+
712+
 const { Glob } = require('internal/fs/glob');
713+
 const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
 const normalize = (results) =>
715+
 results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
 (async () => {
718+
 const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
 for (const item of expected) {
720+
 assert.ok(syncResults.includes(item),
721+
 \`missing \${item} from sync results: \${syncResults}\`);
722+
 }
723+
724+
 const asyncResults = [];
725+
 for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
 asyncResults.push(item);
727+
 }
728+
 const normalized = normalize(asyncResults);
729+
 for (const item of expected) {
730+
 assert.ok(normalized.includes(item),
731+
 \`missing \${item} from async results: \${normalized}\`);
732+
 }
733+
 })().catch((err) => {
734+
 console.error(err);
735+
 process.exitCode = 1;
736+
 });
737+
 `;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});
0 commit comments
Comments
 (0)

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

Skip to content
Commit 74dcdbb
Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method
when a child path had already been seen through a different pattern
context, silently dropping the remaining sibling entries. Whether this
triggered depended on directory iteration order, which also made
test-fs-glob.mjs flaky.
Remove the check: the cache.add call at the start of the traversal
already prevents reprocessing.
Fixes: #62897
Co-authored-by: semimikoh <ejffjeosms@gmail.com>
Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com>
PR-URL: #64895
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb
2 files changed
Lines changed: 76 additions & 6 deletions
File tree
‎lib/internal/fs/glob.js‎
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);
‎test/parallel/test-fs-glob.mjs‎
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
 const assert = require('node:assert');
684+
 const fs = require('node:fs');
685+
 const fsPromises = require('node:fs/promises');
686+
 const path = require('node:path');
687+
688+
 const cwd = process.argv[1];
689+
 const a = path.join(cwd, 'a');
690+
 fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
 fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
 fs.writeFileSync(path.join(a, 'x'), '');
693+
 fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
 const originalReaddirSync = fs.readdirSync;
696+
 const originalReaddir = fsPromises.readdir;
697+
698+
 const reorder = (target, entries) => {
699+
 if (!Array.isArray(entries) || target !== a) return entries;
700+
 const names = ['c', 'b', 'x', 'z'];
701+
 return names.map((name) => entries.find((entry) => entry.name === name))
702+
 .filter(Boolean);
703+
 };
704+
705+
 fs.readdirSync = function(target, options) {
706+
 return reorder(target, originalReaddirSync.call(this, target, options));
707+
 };
708+
 fsPromises.readdir = async function(target, options) {
709+
 return reorder(target, await originalReaddir.call(this, target, options));
710+
 };
711+
712+
 const { Glob } = require('internal/fs/glob');
713+
 const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
 const normalize = (results) =>
715+
 results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
 (async () => {
718+
 const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
 for (const item of expected) {
720+
 assert.ok(syncResults.includes(item),
721+
 \`missing \${item} from sync results: \${syncResults}\`);
722+
 }
723+
724+
 const asyncResults = [];
725+
 for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
 asyncResults.push(item);
727+
 }
728+
 const normalized = normalize(asyncResults);
729+
 for (const item of expected) {
730+
 assert.ok(normalized.includes(item),
731+
 \`missing \${item} from async results: \${normalized}\`);
732+
 }
733+
 })().catch((err) => {
734+
 console.error(err);
735+
 process.exitCode = 1;
736+
 });
737+
 `;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});
0 commit comments
Comments
 (0)

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

Skip to content
Commit 74dcdbb
Browse files
webdevelopersrinusemimikoh
authored and
aduh95
committed
fs: fix glob early return skipping sibling entries
The children loop in the glob traversal returned from the whole method
when a child path had already been seen through a different pattern
context, silently dropping the remaining sibling entries. Whether this
triggered depended on directory iteration order, which also made
test-fs-glob.mjs flaky.
Remove the check: the cache.add call at the start of the traversal
already prevents reprocessing.
Fixes: #62897
Co-authored-by: semimikoh <ejffjeosms@gmail.com>
Signed-off-by: webdevelopersrinu <webdeveloper.srinu9@gmail.com>
PR-URL: #64895
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9139389 commit 74dcdbb
2 files changed
Lines changed: 76 additions & 6 deletions
File tree
‎lib/internal/fs/glob.js‎
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ class Glob {
576576
constnSymlinks=newSafeSet();
577577
for(constindexofpattern.indexes){
578578
// For each child, check potential patterns
579-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
580-
return;
581-
}
582579
constcurrent=pattern.at(index);
583580
constnextIndex=index+1;
584581
constnext=pattern.at(nextIndex);
@@ -793,9 +790,6 @@ class Glob {
793790
constnSymlinks=newSafeSet();
794791
for(constindexofpattern.indexes){
795792
// For each child, check potential patterns
796-
if(this.#cache.seen(entryPath,pattern,index)||this.#cache.seen(entryPath,pattern,index+1)){
797-
return;
798-
}
799793
constcurrent=pattern.at(index);
800794
constnextIndex=index+1;
801795
constnext=pattern.at(nextIndex);
‎test/parallel/test-fs-glob.mjs‎
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import*ascommonfrom'../common/index.mjs';
22
importtmpdirfrom'../common/tmpdir.js';
3+
import{spawnSync}from'node:child_process';
34
import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
45
import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
56
import{glob,globSync,Dirent,chmodSync,writeFileSync,rmSync}from'node:fs';
@@ -669,3 +670,78 @@ describe('globSync - ENOTDIR', function() {
669670
}
670671
});
671672
});
673+
674+
describe('glob - seen cache',function(){
675+
// Refs: https://github.com/nodejs/node/issues/62897
676+
test('does not skip siblings after a seen child path',()=>{
677+
// The glob traversal used to return early from the children loop when a
678+
// child path had already been seen through a different pattern context,
679+
// silently dropping the remaining siblings. Whether the bug triggered
680+
// depended on directory iteration order, so the child process pins the
681+
// order by patching readdir before loading the glob implementation.
682+
constscript=`
683+
 const assert = require('node:assert');
684+
 const fs = require('node:fs');
685+
 const fsPromises = require('node:fs/promises');
686+
 const path = require('node:path');
687+
688+
 const cwd = process.argv[1];
689+
 const a = path.join(cwd, 'a');
690+
 fs.mkdirSync(path.join(a, 'b', 'c', 'd'), { recursive: true });
691+
 fs.mkdirSync(path.join(a, 'c', 'd', 'c'), { recursive: true });
692+
 fs.writeFileSync(path.join(a, 'x'), '');
693+
 fs.writeFileSync(path.join(a, 'z'), '');
694+
695+
 const originalReaddirSync = fs.readdirSync;
696+
 const originalReaddir = fsPromises.readdir;
697+
698+
 const reorder = (target, entries) => {
699+
 if (!Array.isArray(entries) || target !== a) return entries;
700+
 const names = ['c', 'b', 'x', 'z'];
701+
 return names.map((name) => entries.find((entry) => entry.name === name))
702+
 .filter(Boolean);
703+
 };
704+
705+
 fs.readdirSync = function(target, options) {
706+
 return reorder(target, originalReaddirSync.call(this, target, options));
707+
 };
708+
 fsPromises.readdir = async function(target, options) {
709+
 return reorder(target, await originalReaddir.call(this, target, options));
710+
 };
711+
712+
 const { Glob } = require('internal/fs/glob');
713+
 const expected = ['a/b', 'a/c', 'a/x', 'a/z'];
714+
 const normalize = (results) =>
715+
 results.map((item) => item.replaceAll(path.sep, '/')).sort();
716+
717+
 (async () => {
718+
 const syncResults = normalize(new Glob('a/**/../*', { cwd }).globSync());
719+
 for (const item of expected) {
720+
 assert.ok(syncResults.includes(item),
721+
 \`missing \${item} from sync results: \${syncResults}\`);
722+
 }
723+
724+
 const asyncResults = [];
725+
 for await (const item of new Glob('a/**/../*', { cwd }).glob()) {
726+
 asyncResults.push(item);
727+
 }
728+
 const normalized = normalize(asyncResults);
729+
 for (const item of expected) {
730+
 assert.ok(normalized.includes(item),
731+
 \`missing \${item} from async results: \${normalized}\`);
732+
 }
733+
 })().catch((err) => {
734+
 console.error(err);
735+
 process.exitCode = 1;
736+
 });
737+
 `;
738+
739+
constseenDir=tmpdir.resolve('glob-seen');
740+
constchild=spawnSync(
741+
process.execPath,
742+
['--expose-internals','-e',script,seenDir],
743+
{encoding: 'utf8'},
744+
);
745+
assert.strictEqual(child.status,0,child.stderr||child.stdout);
746+
});
747+
});
0 commit comments
Comments
 (0)