DEV: Restructure files

src/parseUtterance/index.js

@@ -1,5 +1,5 @@
- 
-
+import getLineType         from '../utilities/getLineType.js'
+import mergeTranscriptions from '../utilities/mergeTranscriptions.js'
 import parseCustom        from './parseCustom.js'
 import parseDuration      from './parseDuration.js'
 import parseLiteral       from './parseLiteral.js'
@@ -13,11 +13,6 @@ import parseTranscription from './parseTranscription.js'
 import parseTranslation   from './parseTranslation.js'
 import parseWords         from './parseWords.js'
 
-import {
-  getLineType,
-  mergeTranscriptions,
-} from '../utilities/index.js'
-
 /**
  * Parses an individual utterance as a string and returns it as a DLx Utterance object
  * @param  {String} rawLines  An array of utterance lines to parse
@@ -67,7 +62,7 @@ export default function parseUtterance(rawLines, schema, codesHash, options) {
       const data  = (match ? match.groups.lineData : line).trim()
 
       // replace a sequence of white space with a single space
-       
+
       hash[code] = data.replace(whiteSpaceRegExp, ` `)
 
       return hash

src/parseUtterance/parseCustom.js

@@ -1,4 +1,4 @@
-import { getLineType } from '../utilities/index.js'
+import getLineType from '../utilities/getLineType.js'
 
 /**
  * Extracts any unspecified lines from the lines hash and returns them in an object

src/parseUtterance/parseLiteral.js

@@ -1,8 +1,6 @@
-import {
-  groupLines,
-  removeBrackets,
-  removeEmphasis,
-} from '../utilities/index.js'
+import groupLines     from '../utilities/groupLines.js'
+import removeBrackets from '../utilities/removeBrackets.js'
+import removeEmphasis from '../utilities/removeEmphasis.js'
 
 /**
  * Parses, validates, and cleans the literal translation lines

src/parseUtterance/parseMorphemes/index.js

@@ -2,13 +2,11 @@ import getDuplicateMorphemes from './getDuplicateMorphemes.js'
 import separateInfix         from './separateInfix.js'
 import zip                   from '../../utilities/js/zip.js'
 
-import {
-  getLines,
-  groupLines,
-  mergeTranscriptions,
-  removeBrackets,
-  validateNumItems,
-} from '../../utilities/index.js'
+import getLines            from '../../utilities/getLines.js'
+import groupLines          from '../../utilities/groupLines.js'
+import mergeTranscriptions from '../../utilities/mergeTranscriptions.js'
+import removeBrackets      from '../../utilities/removeBrackets.js'
+import validateNumItems    from '../../utilities/validateNumItems.js'
 
 /**
  * Creates a morphemes hash of line codes and an array of morphemes based on the word lines
@@ -18,7 +16,7 @@ import {
 function createMorphemesHash(wordLines) {
   return Object.entries(wordLines)
   .reduce((hash, [code, data]) => {
-    hash[code] = tokenizeWord(data)  
+    hash[code] = tokenizeWord(data)
     return hash
   }, {})
 }

src/parseUtterance/parseMorphemes/separateInfix.js

@@ -1,4 +1,4 @@
-import { getLineType } from '../../utilities/index.js'
+import getLineType from '../../utilities/getLineType.js'
 
 /**
  * Checks a Morpheme object for infixes, and returns an array of two morphemes if one is present
@@ -27,10 +27,10 @@ export default function separateInfix(glossLineCode, morpheme) {
 
     const { infix, pre, post } = data.match(infixRegExp).groups
 
-     
+
     i[code] = infix
     m[code] = `${ pre }${ post }`
-     
+
 
     return [i, m]
 

src/parseUtterance/parseNotes.js

@@ -1,4 +1,4 @@
-import { getLines }      from '../utilities/index.js'
+import getLines          from '../utilities/getLines.js'
 import { isLanguageTag } from '../utilities/types/index.js'
 
 /**

src/parseUtterance/parsePhonetic.js

@@ -1,7 +1,5 @@
-import {
-  removeBrackets,
-  removeEmphasis,
-} from '../utilities/index.js'
+import removeBrackets from '../utilities/removeBrackets.js'
+import removeEmphasis from '../utilities/removeEmphasis.js'
 
 /**
  * Cleans and validates the phonetic line

src/parseUtterance/parseTranscript.js

@@ -1,4 +1,4 @@
-import { groupLines } from '../utilities/index.js'
+import groupLines from '../utilities/groupLines.js'
 
 /**
  * Extracts, validates, and cleans the transcript lines from the lines hash

src/parseUtterance/parseTranscription.js

@@ -1,8 +1,6 @@
-import {
-  groupLines,
-  removeBrackets,
-  removeEmphasis,
-} from '../utilities/index.js'
+import groupLines     from '../utilities/groupLines.js'
+import removeBrackets from '../utilities/removeBrackets.js'
+import removeEmphasis from '../utilities/removeEmphasis.js'
 
 /**
  * Extracts, validates, and cleans the transcription lines from the lines hash

src/parseUtterance/parseTranslation.js

@@ -1,8 +1,6 @@
-import {
-  groupLines,
-  removeBrackets,
-  removeEmphasis,
-} from '../utilities/index.js'
+import groupLines     from '../utilities/groupLines.js'
+import removeBrackets from '../utilities/removeBrackets.js'
+import removeEmphasis from '../utilities/removeEmphasis.js'
 
 /**
  * Extracts, validates, and cleans the translation lines from the lines hash

src/parseUtterance/parseWords.js

@@ -1,13 +1,10 @@
-import parseMorphemes from './parseMorphemes/index.js'
-import { wordTypes }  from '../utilities/constants/index.js'
-import zip            from '../utilities/js/zip.js'
-
-import {
-  getLines,
-  groupLines,
-  removeEmphasis,
-  validateNumItems,
-} from '../utilities/index.js'
+import getLines         from '../utilities/getLines.js'
+import groupLines       from '../utilities/groupLines.js'
+import parseMorphemes   from './parseMorphemes/index.js'
+import removeEmphasis   from '../utilities/removeEmphasis.js'
+import validateNumItems from '../utilities/validateNumItems.js'
+import { wordTypes }    from '../utilities/constants/index.js'
+import zip              from '../utilities/js/zip.js'
 
 /**
  * Parses the word hash into a DLx Word object
@@ -70,7 +67,7 @@ export default function parseWords(codesHash, lines, orthography) {
   // tokenizes the words in each line
   const wordsHash = Object.entries(wordLines)
   .reduce((hash, [code, data]) => {
-    hash[code] = tokenizeLine(data)  
+    hash[code] = tokenizeLine(data)
     return hash
   }, {})
 

src/parseUtterances.js

@@ -1,4 +1,4 @@
-import { getSchema }  from './utilities/index.js'
+import getSchema      from './utilities/getSchema.js'
 import parseUtterance from './parseUtterance/index.js'
 
 function splitUtterance(rawUtterance) {