Merge remote-tracking branch 'upstream/master' into schema/json_array…

…_type_checks

bids-validator/deno.json

@@ -8,6 +8,5 @@
     "singleQuote": true,
     "proseWrap": "preserve",
     "include": ["src/"]
-  },
-  "lock": false
+  }
 }

bids-validator/src/schema/context.ts

@@ -142,6 +142,10 @@ export class BIDSContext implements Context {
     this.associations = {} as ContextAssociations
   }
 
+  get size(): number {
+    return this.file.size
+  }
+
   get path(): string {
     return this.file.path
   }
@@ -200,7 +204,7 @@ export class BIDSContext implements Context {
       Object.keys(json).map((x) => this.sidecarKeyOrigin[x] = validSidecars[0].path)
     }
     const nextDir = fileTree.directories.find((directory) => {
-      return this.file.path.startsWith(directory.path)
+      return this.file.path.startsWith(`${directory.path}/`)
     })
     if (nextDir) {
       await this.loadSidecar(nextDir)

bids-validator/src/summary/summary.ts

@@ -123,7 +123,7 @@ export class Summary {
     }
 
     if (context.extension === '.json') {
-      if ('TaskName' in context.json) {
+      if (typeof context.json === 'object' && 'TaskName' in context.json) {
         this.tasks.add(context.json.TaskName as string)
       }
     }

bids-validator/src/types/context.ts

@@ -94,6 +94,7 @@ export interface Context {
   dataset: ContextDataset
   subject: ContextSubject
   path: string
+  size: number
   entities: object
   datatype: string
   suffix: string

deno.json

@@ -0,0 +1,3 @@
+{
+  "lock": false
+}