Merge pull request #1685 from happy5214/bump-hed-validator-3.9.0

Bump hed-validator dependency to v3.9.0

.eslintrc.json

@@ -1,4 +1,5 @@
 {
+  "root": true,
   "plugins": ["prettier"],
   "parserOptions": {
     "ecmaVersion": 2018,

bids-validator-web/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": ["eslint:recommended", "prettier", "next"],
+}

bids-validator-web/components/App.jsx

@@ -3,12 +3,11 @@ import bowser from 'bowser'
 import Issues from '../components/Issues'
 import BrowserWarning from './BrowserWarning'
 import Validate from '../components/Validate'
-import validate from 'bids-validator'
-import validatorPackageJson from 'bids-validator/package.json'
+import validate from '../../bids-validator'
+import validatorPackageJson from 'bids-validator/package.json' assert { type: 'json' }
 const version = validatorPackageJson.version
 
 // component setup -----------------------------------------------------------
-
 const initState = () => ({
   dirName: '',
   list: {},

bids-validator-web/components/Issues.jsx

@@ -22,14 +22,15 @@ class Issues extends React.Component {
     let dirName = this.props.dirName
 
     // counts
-    let totalErrors = 0
+    // let totalErrors = 0
     let totalWarnings = 0
-    let warningCount, errorCount
+    let warningCount = 0
+    // let errorCount = 0
     if (errors !== 'Invalid') {
-      totalErrors = errors.length
+      // totalErrors = errors.length
       totalWarnings = warnings.length
       warningCount = totalWarnings + ' ' + pluralize('Warning', totalWarnings)
-      errorCount = totalErrors + ' ' + pluralize('Error', totalErrors)
+      // errorCount = totalErrors + ' ' + pluralize('Error', totalErrors)
     }
     // messages
     let specLink = (

bids-validator-web/components/Upload.jsx

@@ -1,51 +1,31 @@
 // dependencies -------------------------------------------------------
 
 import React from 'react'
-import ReactDOM from 'react-dom'
 
 class Upload extends React.Component {
   // life cycle events --------------------------------------------------
-
-  componentDidMount() {
-    ReactDOM.findDOMNode(this).setAttribute('webkitdirectory', true)
-    ReactDOM.findDOMNode(this).setAttribute('directory', true)
-    this._setRefs(this.refs)
-  }
-
   render() {
     return (
       <input
         type="file"
         className="dirUpload-btn"
-        onClick={this._click.bind(this)}
+        onClick={this.props.onClick}
         onChange={this._onFileSelect.bind(this)}
-        ref="fileSelect"
+        ref={this.fileSelectRef}
+        directory=""
+        webkitdirectory=""
       />
     )
   }
 
   // custom methods -----------------------------------------------------
-
-  _click(e) {
-    ReactDOM.findDOMNode(this.refs.fileSelect).value = null
-    if (this.props.onClick) {
-      this.props.onClick(e)
-    }
-  }
-
   _onFileSelect(e) {
     if (e.target && e.target.files.length > 0) {
       let files = e.target.files
       let results = { list: files }
       this.props.onChange(results)
     }
   }
-
-  _setRefs(refs) {
-    if (this.props.setRefs) {
-      this.props.setRefs(refs)
-    }
-  }
 }
 
 export default Upload

bids-validator-web/next.config.js

@@ -1,12 +1,10 @@
 // next.config.js
-const withTM = require('next-transpile-modules')
 
-module.exports = withTM({
-  transpileModules: ['bids-validator'],
+module.exports = {
+  transpilePackages: ['bids-validator'],
   assetPrefix: './',
-  webpack5: false,
   webpack: (config, {}) => {
-    config.resolve.symlinks = false
+    config.watchOptions.ignored = '**/node_modules'
     return config
   },
-})
+}

bids-validator-web/package.json

@@ -8,17 +8,20 @@
     "@babel/runtime": "^7.16.7",
     "bootstrap": "^4.3.0",
     "bowser": "^1.0.0",
-    "next": "^11.1.2",
-    "next-transpile-modules": "^2.3.1",
+    "eslint-config-next": "^13.4.7",
+    "next": "^13.4.7",
     "pluralize": "^8.0.0",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
     "react-bootstrap": "^1.0.0-beta.5",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.2.0",
     "sass": "^1.32.8"
   },
   "scripts": {
     "dev": "next",
     "build": "next build",
     "start": "next start"
+  },
+  "devDependencies": {
+    "@next/eslint-plugin-next": "^13.4.7"
   }
 }

bids-validator/package.json

@@ -13,7 +13,8 @@
     },
     "./utils/consoleFormat": {
       "require": "./dist/commonjs/consoleFormat.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "scripts": {
     "build": "node ./esbuild.mjs",
@@ -44,12 +45,15 @@
     "date-fns": "^2.7.0",
     "events": "^3.3.0",
     "exifreader": "^4.1.0",
-    "hed-validator": "^3.8.0",
+    "hed-validator": "^3.10.0",
     "ignore": "^4.0.2",
     "is-utf8": "^0.2.1",
+    "jest": "^29.5.0",
     "jshint": "^2.9.6",
+    "lerna": "^6.4.1",
     "lodash": "^4.17.21",
     "minimatch": "3.0.5",
+    "next": "13.4.7",
     "nifti-js": "^1.0.1",
     "p-limit": "^2.1.0",
     "pako": "^1.0.6",
@@ -58,6 +62,7 @@
     "semver": "^7.3.2",
     "stream-browserify": "^3.0.0",
     "table": "^5.2.3",
+    "util": "^0.12.5",
     "xml2js": "^0.5.0",
     "yaml": "^1.10.2",
     "yargs": "^16.2.0"
@@ -71,7 +76,7 @@
     "eslint": "^8.17.0",
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-prettier": "^2.6.2",
-    "husky": "^1.0.0-rc.13",
+    "husky": "^8.0.3",
     "lockfile": "^1.0.4",
     "sync-request": "6.0.0"
   },

bids-validator/validators/events/hed.js

@@ -9,9 +9,12 @@ export default function checkHedStrings(events, jsonContents, jsonFiles, dir) {
   const eventData = constructEventData(events, jsonContents)
   const sidecarData = constructSidecarData(events, jsonContents, jsonFiles)
   const hedDataExists = detectHed(eventData, sidecarData)
+  console.log("in hed...")
+  console.log(jsonContents)
   if (!hedDataExists) {
     return Promise.resolve([])
   }
+  console.log("heddata exists...")
 
   const datasetDescription = jsonContents['/dataset_description.json']
   const datasetDescriptionData = new hedValidator.validator.BidsJsonFile(
@@ -106,7 +109,9 @@ function sidecarValueHasHed(sidecarValue) {
   return (
     sidecarValue !== null &&
     typeof sidecarValue === 'object' &&
-    sidecarValue.HED !== undefined
+    Object.values(sidecar).some(x => {
+      return x.HED !== undefined
+    })
   )
 }