rf: Await context load in walkFileTree, check ignore before loading

Author: effigies

src/schema/walk.ts

@@ -47,9 +47,15 @@ async function* _walkFileTree(
   dsContext: BIDSContextDataset,
 ): AsyncIterable<BIDSContext | CleanupFunction> {
   for (const file of fileTree.files) {
+    if (file.ignored) {
+      continue
+    }
     yield new BIDSContext(file, dsContext)
   }
   for (const dir of fileTree.directories) {
+    if (dir.ignored) {
+      continue
+    }
     const pseudo = dsContext.isPseudoFile(dir)
     const opaque = pseudo || dsContext.isOpaqueDirectory(dir)
     const context = new BIDSContext(pseudoFile(dir, opaque), dsContext)
@@ -70,12 +76,8 @@ export async function* walkFileTree(
   dsContext: BIDSContextDataset,
   bufferSize: number = 1,
 ): AsyncIterable<BIDSContext> {
-  for await (
-    await using context of queuedAsyncIterator(
-      _walkFileTree(dsContext.tree, dsContext),
-      bufferSize,
-    )
-  ) {
+  for await (const context of queuedAsyncIterator(_walkFileTree(dsContext.tree, dsContext), bufferSize)) {
+    await context.loaded
     yield context
   }
 }

src/validators/bids.ts

@@ -109,17 +109,12 @@ export async function validate(
   })
 
   for await (const context of walkFileTree(dsContext, 20)) {
-    // TODO - Skip ignored files for now (some tests may reference ignored files)
-    if (context.file.ignored) {
-      continue
-    }
     if (
       dsContext.dataset_description.DatasetType == 'raw' &&
       context.file.path.includes('derivatives')
     ) {
       continue
     }
-    await context.loaded
     // Run majority of checks
     for (const check of perContextChecks) {
       await check(schema as unknown as GenericSchema, context)