Merge pull request #1902 from bids-standard/fix/deno-214

fix(dep): Handle deprecations in deno>=0.214.0
bids-standard · Feb 29, 2024 · 8a44726 · 8a44726
2 parents a943a61 + 5f1f015
commit 8a44726
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/bids-validator/deno.json b/bids-validator/deno.json
@@ -1,6 +1,6 @@
 {
   "imports": {
-    "std/": "https://deno.land/std@0.214.0/"
+    "std/": "https://deno.land/std@0.217.0/"
   },
   "tasks": {
     "test": "deno test -A src/tests/"

diff --git a/bids-validator/src/deps/logger.ts b/bids-validator/src/deps/logger.ts
@@ -1,14 +1,14 @@
 export {
+  ConsoleHandler,
   critical,
   debug,
   error,
   getLogger,
   info,
   Logger,
+  LogLevelNames,
   LogLevels,
   setup,
-  warning,
+  warn,
 } from "std/log/mod.ts"
-export { ConsoleHandler } from "std/log/console_handler.ts"
-export { LogLevelNames } from "std/log/levels.ts"
 export type { LevelName } from "std/log/mod.ts"
diff --git a/bids-validator/src/deps/path.ts b/bids-validator/src/deps/path.ts
@@ -7,5 +7,5 @@ export {
   extname,
   fromFileUrl,
   parse,
+  SEPARATOR,
 } from 'std/path/mod.ts'
-export { SEP } from 'std/path/separator.ts'
diff --git a/bids-validator/src/deps/stream.ts b/bids-validator/src/deps/stream.ts
@@ -1,4 +1,4 @@
 export {
   readAll,
   readerFromStreamReader,
-} from 'std/streams/mod.ts'
+} from 'std/io/mod.ts'
diff --git a/bids-validator/src/files/browser.ts b/bids-validator/src/files/browser.ts
@@ -1,7 +1,7 @@
 import { BIDSFile } from '../types/file.ts'
 import { FileTree } from '../types/filetree.ts'
 import { FileIgnoreRules } from './ignore.ts'
-import { parse, join, SEP } from '../deps/path.ts'
+import { parse, join, SEPARATOR } from '../deps/path.ts'
 
 /**
  * Browser implement of BIDSFile wrapping native File/FileList types
@@ -60,7 +60,7 @@ export function fileListToTree(files: File[]): Promise<FileTree> {
       // Top level file
       tree.files.push(file)
     } else {
-      const levels = fPath.dir.split(SEP).slice(1)
+      const levels = fPath.dir.split(SEPARATOR).slice(1)
       let currentLevelTree = tree
       for (const level of levels) {
         const exists = currentLevelTree.directories.find(

diff --git a/bids-validator/src/utils/logger.ts b/bids-validator/src/utils/logger.ts
@@ -40,7 +40,7 @@ const loggerProxyHandler = {
       const callerLocation = parseStack(stack)
       logger.debug(`Logger invoked at "${callerLocation}"`)
     }
-    const logFunc = logger[prop] as typeof logger.warning
+    const logFunc = logger[prop] as typeof logger.warn
     return logFunc.bind(logger)
   },
 }

diff --git a/bids-validator/src/validators/filenameIdentify.ts b/bids-validator/src/validators/filenameIdentify.ts
@@ -12,7 +12,7 @@
  * object in the schema for reference.
  */
 // @ts-nocheck
-import { SEP } from '../deps/path.ts'
+import { SEPARATOR } from '../deps/path.ts'
 import { GenericSchema, Schema } from '../types/schema.ts'
 import { BIDSContext } from '../schema/context.ts'
 import { lookupModality } from '../schema/modalities.ts'
@@ -71,7 +71,7 @@ export async function datatypeFromDirectory(schema, context) {
   const subFormat = schema.objects.formats[subEntity.format]
   const sesEntity = schema.objects.entities.session.name
   const sesFormat = schema.objects.formats[sesEntity.format]
-  const parts = context.file.path.split(SEP)
+  const parts = context.file.path.split(SEPARATOR)
   let datatypeIndex = 2
   if (parts[0] !== '') {
     // we assume paths have leading '/'

diff --git a/bids-validator/src/validators/filenameValidate.ts b/bids-validator/src/validators/filenameValidate.ts
@@ -2,7 +2,7 @@ import { CheckFunction, RuleCheckFunction } from '../types/check.ts'
 import { DatasetIssues } from '../issues/datasetIssues.ts'
 import { BIDSContext } from '../schema/context.ts'
 import { GenericSchema, Schema, Entity, Format } from '../types/schema.ts'
-import { SEP } from '../deps/path.ts'
+import { SEPARATOR } from '../deps/path.ts'
 import { hasProp } from '../utils/objectPathHandler.ts'
 
 const sidecarExtensions = ['.json', '.tsv', '.bvec', '.bval']
@@ -25,7 +25,7 @@ export async function filenameValidate(
 }
 
 export function isAtRoot(context: BIDSContext) {
-  if (context.file.path.split(SEP).length !== 2) {
+  if (context.file.path.split(SEPARATOR).length !== 2) {
     return false
   }
   return true

diff --git a/bids-validator/src/validators/isBidsy.ts b/bids-validator/src/validators/isBidsy.ts
@@ -3,7 +3,7 @@
  * derivatives to have the lowest common denomenator of bids like file names.
  */
 // @ts-nocheck
-import { SEP } from '../deps/path.ts'
+import { SEPARATOR } from '../deps/path.ts'
 import { BIDSContext } from '../schema/context.ts'
 import { CheckFunction } from '../../types/check.ts'
 import { BIDSFile } from '../types/file.ts'