Merge pull request #203 from hed-standard/rewrite-split-hed-string

Rewrite HED string parsing and splitting as classes
hed-standard · Oct 11, 2024 · 70a3681 · 70a3681
2 parents a166bf6 + cae39a3
commit 70a3681
Show file tree

Hide file tree

Showing 17 changed files with 439 additions and 326 deletions.
diff --git a/bids/types/json.js b/bids/types/json.js
@@ -1,7 +1,7 @@
 import isPlainObject from 'lodash/isPlainObject'
 
 import { sidecarValueHasHed } from '../utils'
-import { parseHedString } from '../../parser/main'
+import { parseHedString } from '../../parser/parser'
 import ParsedHedString from '../../parser/parsedHedString'
 import { BidsFile } from './basic'
 import BidsHedSidecarValidator from '../validator/bidsHedSidecarValidator'

diff --git a/bids/validator/bidsHedTsvValidator.js b/bids/validator/bidsHedTsvValidator.js
@@ -1,7 +1,7 @@
 import BidsHedSidecarValidator from './bidsHedSidecarValidator'
 import { BidsHedIssue, BidsIssue } from '../types/issues'
 import { BidsTsvEvent, BidsTsvRow } from '../types/tsv'
-import { parseHedString } from '../../parser/main'
+import { parseHedString } from '../../parser/parser'
 import ColumnSplicer from '../../parser/columnSplicer'
 import ParsedHedString from '../../parser/parsedHedString'
 import { generateIssue } from '../../common/issues/issues'

diff --git a/converter/converter.js b/converter/converter.js
@@ -1,4 +1,4 @@
-import { parseHedString } from '../parser/main'
+import { parseHedString } from '../parser/parser'
 
 /**
  * Convert a HED string.

diff --git a/esbuild.mjs b/esbuild.mjs
@@ -7,7 +7,7 @@ await esbuild.build({
   entryPoints: [path.join(process.cwd(), 'index.js')],
   loader: { '.xml': 'text' },
   outdir: path.join(process.cwd(), 'dist', 'commonjs'),
-  target: 'node12',
+  target: 'node18',
   bundle: true,
   sourcemap: true,
   platform: 'node',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "pluralize": "^8.0.0",
     "semver": "^7.6.0",
     "string_decoder": "^1.3.0",
+    "unicode-name": "^1.0.2",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
@@ -74,7 +75,10 @@
     "transform": {
       "\\.js$": "esbuild-runner/jest",
       "\\.xml$": "<rootDir>/fileTransformer.js"
-    }
+    },
+    "transformIgnorePatterns": [
+      "node_modules/(?!unicode-name)"
+    ]
   },
   "browser": {
     "fs": false

diff --git a/parser/columnSplicer.js b/parser/columnSplicer.js
@@ -2,7 +2,7 @@ import ParsedHedString from './parsedHedString'
 import ParsedHedColumnSplice from './parsedHedColumnSplice'
 import ParsedHedGroup from './parsedHedGroup'
 import { generateIssue } from '../common/issues/issues'
-import { parseHedString } from './main'
+import { parseHedString } from './parser'
 
 export class ColumnSplicer {
   /**

diff --git a/parser/main.js b/parser/main.js