Re-enabling Husky and adjusting linter/prettier settings

Author: happy5214

.eslintrc.json

@@ -16,9 +16,9 @@
   },
   "extends": ["eslint:recommended", "prettier"],
   "rules": {
-    "prettier/prettier": "error",
     "no-console": ["error", { "allow": ["warn"] }],
     "linebreak-style": ["error", "unix"],
-    "guard-for-in": "error"
+    "guard-for-in": "error",
+    "max-len": "off"
   }
 }

.prettierrc.yaml

@@ -1,4 +1,4 @@
 singleQuote: true
-jsxBracketSameLine: true
 semi: false
 trailingComma: all
+printWidth: 120

package-lock.json

@@ -13,7 +13,8 @@
   "scripts": {
     "lint": "./node_modules/eslint/bin/eslint.js ./**/*.js",
     "test": "./node_modules/.bin/jest",
-    "coverage": "./node_modules/.bin/jest --coverage"
+    "coverage": "./node_modules/.bin/jest --coverage",
+    "prepare": "husky install"
   },
   "contributors": [
     "Alexander Jones",
@@ -38,7 +39,7 @@
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^8.0.1",
+    "husky": "^8.0.0",
     "jest": "^28.1.0",
     "jest-environment-node": "^28.1.0",
     "prettier": "^2.6.2",

package.json

@@ -2,35 +2,24 @@ const utils = require('../utils')
 const { hedStringIsAGroup, removeGroupParentheses } = require('../utils/hed')
 const { generateIssue } = require('../common/issues/issues')
 
-const {
-  ParsedHedTag,
-  ParsedHed2Tag,
-  ParsedHed3Tag,
-  ParsedHedGroup,
-  ParsedHedString,
-} = require('./types/parsedHed')
+const { ParsedHedTag, ParsedHed2Tag, ParsedHed3Tag, ParsedHedGroup, ParsedHedString } = require('./types/parsedHed')
 
 const openingGroupCharacter = '('
 const closingGroupCharacter = ')'
 const delimiters = new Set([','])
 
 /**
- * Split a full HED string into tags.
+ * Split a HED string into tags.
  *
- * @param {string} hedString The full HED string.
+ * @param {string} hedString The HED string to be split.
  * @param {Schemas} hedSchemas The collection of HED schemas.
- * @param {int} groupStartingIndex The start index of the group in the full HED string.
- * @returns {[ParsedHedTag[], object<string, Issue[]>]} An array of HED tags (top-level relative to the passed string) and any issues found.
+ * @param {int} groupStartingIndex The start index of the containing group in the full HED string.
+ * @returns {[ParsedHedTag[], Object<string, Issue[]>]} An array of HED tags (top-level relative to the passed string) and any issues found.
  */
-const splitHedString = function (
-  hedString,
-  hedSchemas,
-  groupStartingIndex = 0,
-) {
-  const doubleQuoteCharacter = '"'
+const splitHedString = function (hedString, hedSchemas, groupStartingIndex = 0) {
   const colonCharacter = ':'
   const slashCharacter = '/'
-  const invalidCharacters = ['{', '}', '[', ']', '~']
+  const invalidCharacters = ['{', '}', '[', ']', '~', '"']
 
   const hedTags = []
   const conversionIssues = []
@@ -89,10 +78,7 @@ const splitHedString = function (
       resetStartingIndex = false
     }
     const character = hedString.charAt(i)
-    if (character === doubleQuoteCharacter) {
-      // Skip double quotes
-      continue
-    } else if (character === openingGroupCharacter) {
+    if (character === openingGroupCharacter) {
       // Count group characters
       groupDepth++
     } else if (character === closingGroupCharacter) {
@@ -141,14 +127,9 @@ const splitHedString = function (
  * @param {Schemas} hedSchemas The collection of HED schemas.
  * @param {ParsedHedString} parsedString The object to store parsed output in.
  * @param {boolean} isTopLevel Whether these tag groups are at the top level.
- * @return {object<string, Issue[]>[]} The array of issues.
+ * @return {Object<string, Issue[]>[]} The array of issues.
  */
-const findTagGroups = function (
-  groupTagsList,
-  hedSchemas,
-  parsedString,
-  isTopLevel,
-) {
+const findTagGroups = function (groupTagsList, hedSchemas, parsedString, isTopLevel) {
   const issues = []
   const copiedGroupTagsList = groupTagsList.slice()
   copiedGroupTagsList.forEach((tagOrGroup, index) => {
@@ -160,12 +141,7 @@ const findTagGroups = function (
         hedSchemas,
         tagOrGroup.originalBounds[0] + 1,
       )
-      const nestedIssues = findTagGroups(
-        nestedGroupTagList,
-        hedSchemas,
-        parsedString,
-        false,
-      )
+      const nestedIssues = findTagGroups(nestedGroupTagList, hedSchemas, parsedString, false)
       groupTagsList[index] = new ParsedHedGroup(
         tagOrGroup.originalTag,
         nestedGroupTagList,
@@ -246,14 +222,8 @@ const substituteCharacters = function (hedString) {
  */
 const countTagGroupParentheses = function (hedString) {
   const issues = []
-  const numberOfOpeningParentheses = utils.string.getCharacterCount(
-    hedString,
-    openingGroupCharacter,
-  )
-  const numberOfClosingParentheses = utils.string.getCharacterCount(
-    hedString,
-    closingGroupCharacter,
-  )
+  const numberOfOpeningParentheses = utils.string.getCharacterCount(hedString, openingGroupCharacter)
+  const numberOfClosingParentheses = utils.string.getCharacterCount(hedString, closingGroupCharacter)
   if (numberOfOpeningParentheses !== numberOfClosingParentheses) {
     issues.push(
       generateIssue('parentheses', {
@@ -268,16 +238,10 @@ const countTagGroupParentheses = function (hedString) {
 /**
  * Check if a comma is missing after an opening parenthesis.
  */
-const isCommaMissingAfterClosingParenthesis = function (
-  lastNonEmptyCharacter,
-  currentCharacter,
-) {
+const isCommaMissingAfterClosingParenthesis = function (lastNonEmptyCharacter, currentCharacter) {
   return (
     lastNonEmptyCharacter === closingGroupCharacter &&
-    !(
-      delimiters.has(currentCharacter) ||
-      currentCharacter === closingGroupCharacter
-    )
+    !(delimiters.has(currentCharacter) || currentCharacter === closingGroupCharacter)
   )
 }
 
@@ -314,12 +278,7 @@ const findDelimiterIssuesInHedString = function (hedString) {
       } else {
         issues.push(generateIssue('invalidTag', { tag: currentTag }))
       }
-    } else if (
-      isCommaMissingAfterClosingParenthesis(
-        lastNonEmptyValidCharacter,
-        currentCharacter,
-      )
-    ) {
+    } else if (isCommaMissingAfterClosingParenthesis(lastNonEmptyValidCharacter, currentCharacter)) {
       issues.push(
         generateIssue('commaMissing', {
           tag: currentTag.slice(0, -1),
@@ -346,7 +305,7 @@ const findDelimiterIssuesInHedString = function (hedString) {
  * Validate the full unparsed HED string.
  *
  * @param {string} hedString The unparsed HED string.
- * @return {object<string, Issue[]>} String substitution issues and other issues.
+ * @return {Object<string, Issue[]>} String substitution issues and other issues.
  */
 const validateFullUnparsedHedString = function (hedString) {
   const [fixedHedString, substitutionIssues] = substituteCharacters(hedString)
@@ -364,38 +323,27 @@ const validateFullUnparsedHedString = function (hedString) {
 const mergeParsingIssues = function (previousIssues, currentIssues) {
   for (const key of Object.keys(currentIssues)) {
     previousIssues[key] =
-      previousIssues[key] !== undefined
-        ? previousIssues[key].concat(currentIssues[key])
-        : currentIssues[key]
+      previousIssues[key] !== undefined ? previousIssues[key].concat(currentIssues[key]) : currentIssues[key]
   }
 }
 
 /**
- * Parse a full HED string into a object of tag types.
+ * Parse a full HED string into an object of tag types.
  *
  * @param {string} hedString The full HED string to parse.
  * @param {Schemas} hedSchemas The collection of HED schemas.
- * @returns {[ParsedHedString|null, object<string, Issue[]>]} The parsed HED tag data and an object containing lists of parsing issues.
+ * @returns {[ParsedHedString|null, Object<string, Issue[]>]} The parsed HED tag data and an object containing lists of parsing issues.
  */
 const parseHedString = function (hedString, hedSchemas) {
   const fullStringIssues = validateFullUnparsedHedString(hedString)
   if (fullStringIssues.delimiter.length > 0) {
     fullStringIssues.syntax = []
     return [null, fullStringIssues]
   }
-  const parsedString = new ParsedHedString(hedString)
   const [hedTagList, splitIssues] = splitHedString(hedString, hedSchemas)
-  parsedString.topLevelTags = findTopLevelTags(
-    hedTagList,
-    hedSchemas,
-    parsedString,
-  )
-  const tagGroupIssues = findTagGroups(
-    hedTagList,
-    hedSchemas,
-    parsedString,
-    true,
-  )
+  const parsedString = new ParsedHedString(hedString)
+  parsedString.topLevelTags = findTopLevelTags(hedTagList, hedSchemas, parsedString)
+  const tagGroupIssues = findTagGroups(hedTagList, hedSchemas, parsedString, true)
   const parsingIssues = Object.assign(fullStringIssues, splitIssues)
   for (const tagGroup of tagGroupIssues) {
     mergeParsingIssues(parsingIssues, tagGroup)
@@ -408,7 +356,7 @@ const parseHedString = function (hedString, hedSchemas) {
  *
  * @param {string[]} hedStrings A set of HED strings.
  * @param {Schemas} hedSchemas The collection of HED schemas.
- * @return {[ParsedHedString[], object<string, Issue[]>]} The parsed HED strings and any issues found.
+ * @return {[ParsedHedString[], Object<string, Issue[]>]} The parsed HED strings and any issues found.
  */
 const parseHedStrings = function (hedStrings, hedSchemas) {
   return hedStrings