Mostly working!

.editorconfig

@@ -7,7 +7,7 @@ end_of_line = lf
 indent_size = 2
 indent_style = space
 insert_final_newline = true
-max_line_length = 100
+max_line_length = 120
 trim_trailing_whitespace = true
 
 [*.ts]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "songshowplus-parser",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Parses and extracts data from SongShow Plus files",
   "main": "dist/main/index.js",
   "typings": "dist/main/index.d.ts",

src/index.spec.ts

@@ -1,4 +1,5 @@
 import { readFileSync } from 'fs';
+import { ISongShowPlusSong } from './models';
 import { SongShowPlus } from '.';
 
 describe('SongShowPlus', (): void => {
@@ -13,209 +14,222 @@ describe('SongShowPlus', (): void => {
   });
 
   it('should return a song for an ENGLISH SongShow Plus 7 file: "Be Near.sbsong"', () => {
-    const testFile = readFileSync('./sample-files/Be Near.sbsong').toString();
+    const testFile = readFileSync('./sample-files/Be Near.sbsong');
 
     expect(sspParser.parse(testFile)).toEqual({
+      songNumber: '0707',
       title: 'Be Near',
-      keywords: ['Longing', "Security'"],
       artist: 'Barnard, Shane',
       copyright: '2003 Waiting Room Music',
       ccli: '4090362',
-      sections: [
+      key: 'B',
+      keywords: ['Longing', 'Security'],
+      lyricSections: [
         {
           title: 'Chorus 1',
           lyrics:
-            'Be near O God\r\nBe near O God of us\r\nYour nearness is to us our good\r\nBe near O God\r\nBe near O God of us\r\nYour nearness is to us our good\r\nOur good',
+            'Be near O God\nBe near O God of us\nYour nearness is to us our good\nBe near O God\nBe near O God of us\nYour nearness is to us our good\nOur good',
         },
+        { title: 'Other', lyrics: '' },
         {
           title: 'Verse 1',
           lyrics:
-            "You are all big and small\r\nBeautiful\r\nAnd wonderful\r\nTo trust in grace through faith\r\nBut I'm asking to taste",
+            "You are all big and small\nBeautiful\nAnd wonderful\nTo trust in grace through faith\nBut I'm asking to taste",
         },
         {
           title: 'Verse 2',
           lyrics:
-            'For dark is light to You\r\nDepths are height to You\r\nFar is near\r\nBut Lord I need to hear from You',
+            'For dark is light to You\nDepths are height to You\nFar is near\nBut Lord I need to hear from You',
         },
         {
           title: 'Verse 3',
           lyrics:
-            'Your fullness is mine\r\nRevelation divine\r\nBut oh to taste\r\nTo know much more than a page\r\nTo feel Your embrace',
+            'Your fullness is mine\nRevelation divine\nBut oh to taste\nTo know much more than a page\nTo feel Your embrace',
         },
         {
           title: 'Verse 4',
           lyrics:
-            'For dark is light to You\r\nDepths are height to You\r\nFar is near\r\nBut Lord I need to hear from You',
+            'For dark is light to You\nDepths are height to You\nFar is near\nBut Lord I need to hear from You',
         },
         {
           title: 'Ending',
           lyrics: 'My good',
         },
       ],
-    });
+    } as ISongShowPlusSong);
   });
 
   it('should return a song for an ENGLISH SongShow Plus 7 file: "Give Us Clean Hands.sbsong"', () => {
-    const testFile = readFileSync('./sample-files/Give Us Clean Hands.sbsong').toString();
+    const testFile = readFileSync('./sample-files/Give Us Clean Hands.sbsong');
 
     expect(sspParser.parse(testFile)).toEqual({
+      songNumber: '0707',
       title: 'Give Us Clean Hands',
-      keywords: ['Prayer', 'Repentance'],
       artist: 'Hall, Charlie',
       copyright: '2000 worshiptogether.com songs',
       ccli: '2060208',
-      sections: [
+      key: 'Ab',
+      keywords: ['Prayer', 'Repentance'],
+      lyricSections: [
         {
           title: 'Chorus 1',
           lyrics:
-            'Give us clean hands\r\ngive us pure hearts\r\nLet us not lift our\r\nsouls to another\r\nGive us clean hands\r\ngive us pure hearts\r\nLet us not lift our\r\nsouls to another',
+            'Give us clean hands\ngive us pure hearts\nLet us not lift our\nsouls to another\nGive us clean hands\ngive us pure hearts\nLet us not lift our\nsouls to another',
         },
         {
           title: 'Chorus',
           lyrics:
-            'And oh God let us be\r\na generation that seeks\r\nThat seeks Your face\r\noh God of Jacob\r\nAnd oh God let us be\r\na generation that seeks\r\nThat seeks Your face\r\noh God of Jacob',
+            'And oh God let us be\na generation that seeks\nThat seeks Your face\noh God of Jacob\nAnd oh God let us be\na generation that seeks\nThat seeks Your face\noh God of Jacob',
         },
         {
           title: 'Verse 1',
           lyrics:
-            'We bow our hearts\r\nwe bend our knees\r\nOh Spirit come\r\nmake us humble\r\nWe turn our eyes\r\nfrom evil things\r\nOh Lord we cast\r\ndown our idols',
+            'We bow our hearts\nwe bend our knees\nOh Spirit come\nmake us humble\nWe turn our eyes\nfrom evil things\nOh Lord we cast\ndown our idols',
         },
       ],
-    });
+    } as ISongShowPlusSong);
   });
 
   it('should return a song for an ENGLISH SongShow Plus 7 file: "Jesus Saves.sbsong"', () => {
-    const testFile = readFileSync('./sample-files/Jesus Saves.sbsong').toString();
+    const testFile = readFileSync('./sample-files/Jesus Saves.sbsong');
 
     expect(sspParser.parse(testFile)).toEqual({
+      songNumber: '0718',
       title: 'Jesus Saves (2)',
-      keywords: [],
       artist: 'Eddie James',
-      copyright: '© Fresh Wine Publishing',
+      copyright: 'Fresh Wine Publishing',
       ccli: '',
-      sections: [
+      key: '',
+      keywords: [],
+      lyricSections: [
         {
           title: 'Verse 1',
           lyrics:
-            'Jesus saves from the power\r\nAnd the penalty of sin\r\nJesus saves from the torment\r\nAnd the anguish within\r\nJesus saves from the bondage\r\nAnd control of the enemy\r\nHe heals the broken heart\r\nAnd set the captives free',
+            'Jesus saves from the power\nAnd the penalty of sin\nJesus saves from the torment\nAnd the anguish within\nJesus saves from the bondage\nAnd control of the enemy\nHe heals the broken heart\nAnd set the captives free',
         },
         {
           title: 'Verse 2',
           lyrics:
-            "Jesus saves from the guilt\r\nAnd the shame of what you've done\r\nJesus saves from a life\r\nFilled with lies and deception\r\nJesus saves from the pain of the memories \r\nThat have scarred your past",
+            "Jesus saves from the guilt\nAnd the shame of what you've done\nJesus saves from a life\nFilled with lies and deception\nJesus saves from the pain of the memories \nThat have scarred your past",
         },
         {
           title: 'Pre-chorus 1',
           lyrics:
-            'Gabriel came to Joseph in a dream\r\nFor by the Holy Spirit Mary conceived\r\nAnd with a message from heaven\r\nGabriel came declaring',
+            'Gabriel came to Joseph in a dream\nFor by the Holy Spirit Mary conceived\nAnd with a message from heaven\nGabriel came declaring',
         },
         {
           title: 'Chorus 1',
           lyrics:
-            'She shall bring forth a Son thou\r\nShalt call His name Jesus and He shall save\r\nSave His people from sin and give peace within\r\nWhat amazing grace - Jesus saves',
+            'She shall bring forth a Son thou\nShalt call His name Jesus and He shall save\nSave His people from sin and give peace within\nWhat amazing grace - Jesus saves',
         },
         {
-          title: 'Verse 3r',
+          title: 'Verse 3',
           lyrics:
-            "Jesus saves, He's the One that has never known sin\r\nJesus saves, yet for us He took on the sins of men\r\nJesus saves for he became our sin that we \r\nMay become the righteousness of God\r\nJesus saves and now I'll see His face in peace\r\nJesus saves and I will live with Him eternally\r\nJesus saves and I will join with the angels\r\nAround the throne Singing Holy, Holy, Holy",
+            "Jesus saves, He's the One that has never known sin\nJesus saves, yet for us He took on the sins of men\nJesus saves for he became our sin that we \nMay become the righteousness of God\nJesus saves and now I'll see His face in peace\nJesus saves and I will live with Him eternally\nJesus saves and I will join with the angels\nAround the throne Singing Holy, Holy, Holy",
         },
         {
-          title: 'Verse 4z',
+          title: 'Verse 4',
           lyrics:
-            "Jesus saves and today you can leave here set free\r\nJesus saves and even now He will give you liberty\r\nJesus saves no matter what, no matter who, no\r\nMatter where just call Him, He'll answer your prayer\r\nJesus saves and your life will never be the same\r\nJesus saves and right now you can be born again\r\nJesus saves for he that be in Christ\r\nThe old has past and all is made new",
+            "Jesus saves and today you can leave here set free\nJesus saves and even now He will give you liberty\nJesus saves no matter what, no matter who, no\nMatter where just call Him, He'll answer your prayer\nJesus saves and your life will never be the same\nJesus saves and right now you can be born again\nJesus saves for he that be in Christ\nThe old has past and all is made new",
         },
         {
           title: 'Bridge 1',
           lyrics:
-            "Redeemer, liberator, healer, emancipator \r\nChain-Breaker, strong deliverer, He fights for me\r\nWarrior, restorer, forgiver, peace make\r\nJustifier, Intercessor, through Him I'm free",
+            "Redeemer, liberator, healer, emancipator \nChain-Breaker, strong deliverer, He fights for me\nWarrior, restorer, forgiver, peace make\nJustifier, Intercessor, through Him I'm free",
         },
         {
           title: 'Vamp 1',
-          lyrics: "Jesus saves (repeat) Hallelujah (repeat)\r\n'(",
+          lyrics: 'Jesus saves (repeat) Hallelujah (repeat)',
         },
       ],
-    });
+    } as ISongShowPlusSong);
   });
 
   it('should return a song for an ENGLISH SongShow Plus 7 file: "You Are.sbsong"', () => {
-    const testFile = readFileSync('./sample-files/You Are.sbsong').toString();
+    const testFile = readFileSync('./sample-files/You Are.sbsong');
 
     expect(sspParser.parse(testFile)).toEqual({
+      songNumber: '0718',
       title: 'You Are (2)',
-      keywords: ['Appreciation', 'Breakthrough', 'Christ', 'Declaration', "Jesus'"],
       artist: '8Jobe, Caleb | Cohen, Ezra | Hesami, Josh | Trimble, Paul',
       copyright: '2010 CFN Music',
       ccli: '5715921',
-      sections: [
+      key: 'C',
+      keywords: ['Appreciation', 'Breakthrough', 'Christ', 'Declaration', 'Jesus'],
+      lyricSections: [
         {
           title: 'Verse 1',
           lyrics:
-            "Bought back from a life in chains\r\nNow I can sing that I have been redeemed\r\nYour blood covers all of me\r\nI'm not ashamed to shout who You are\r\nI'm living in the light of grace\r\nMercy made a way to make things bright\r\nLove overcame the grave in victory in victory",
+            "Bought back from a life in chains\nNow I can sing that I have been redeemed\nYour blood covers all of me\nI'm not ashamed to shout who You are\nI'm living in the light of grace\nMercy made a way to make things bright\nLove overcame the grave in victory in victory",
         },
         {
           title: 'Chorus 1',
           lyrics:
-            'You are You are You are the Lord of all\r\nGave Your life to save us\r\nFreedom has embraced us\r\nYou are You are You are the Love for all\r\nHope of every nation\r\nAll creation shouts Your glory',
+            'You are You are You are the Lord of all\nGave Your life to save us\nFreedom has embraced us\nYou are You are You are the Love for all\nHope of every nation\nAll creation shouts Your glory',
         },
         {
           title: 'Verse 2',
           lyrics:
-            "I'm running with a heart that's changed\r\nEverything to see Your kingdom come\r\nYou guide every step I take\r\nI'm not ashamed to shout who You are\r\nI'm living in a brand new day\r\nA life to give a life to lift You high\r\nAll glory and power and praise\r\nTo You alone to You alone",
+            "I'm running with a heart that's changed\nEverything to see Your kingdom come\nYou guide every step I take\nI'm not ashamed to shout who You are\nI'm living in a brand new day\nA life to give a life to lift You high\nAll glory and power and praise\nTo You alone to You alone",
         },
         {
           title: 'Bridge',
           lyrics:
-            "I'm not ashamed of who You are\r\nYour love broke through\r\nAnd grace has made me Yours\r\nNow upon this Rock I stand\r\nIn victory in victory\r\n(REPEAT 3X)",
+            "I'm not ashamed of who You are\nYour love broke through\nAnd grace has made me Yours\nNow upon this Rock I stand\nIn victory in victory\n(REPEAT 3X)",
         },
       ],
-    });
+    } as ISongShowPlusSong);
   });
 
   it('should return a song for a SPANISH SongShow Plus 7 file: "Devuelveme El Gozo.sbsong"', () => {
-    const testFile = readFileSync('./sample-files/Devuelveme El Gozo.sbsong').toString();
+    const testFile = readFileSync('./sample-files/Devuelveme El Gozo.sbsong');
 
     expect(sspParser.parse(testFile)).toEqual({
+      songNumber: '0707',
       title: 'Devuelveme El Gozo',
-      keywords: ['Tahoma', '�?'],
       artist: '',
       copyright: '',
       ccli: '',
-      sections: [
+      key: '',
+      keywords: [],
+      lyricSections: [
         {
           title: 'Verse 1',
           lyrics:
-            'En medio del dolor \r\nEn medio de la aflicción\r\nTu me das paz y \r\nMe enseñas tu amor \r\nTodo lo que perdí \r\nLo restauras Señor en mi \r\nMe das las fuerza para seguir',
+            'En medio del dolor \nEn medio de la aflicción\nTu me das paz y \nMe enseñas tu amor \nTodo lo que perdí \nLo restauras Señor en mi \nMe das las fuerza para seguir',
         },
         {
           title: 'Chorus',
           lyrics:
-            'Devuelve me el gozo \r\nDe Tu salvación y\r\nTu Espíritu noble me sustente \r\nTe necesito Dios \r\nSin ti no soy nada \r\nTe necesito Dios \r\nDame un nuevo corazón',
+            'Devuelve me el gozo \nDe Tu salvación y\nTu Espíritu noble me sustente \nTe necesito Dios \nSin ti no soy nada \nTe necesito Dios \nDame un nuevo corazón',
         },
       ],
-    });
+    } as ISongShowPlusSong);
   });
 
   it('should return a song for a SPANISH SongShow Plus 7 file: "La Sangre (The Blood).sbsong"', () => {
-    const testFile = readFileSync('./sample-files/La Sangre (The Blood).sbsong').toString();
+    const testFile = readFileSync('./sample-files/La Sangre (The Blood).sbsong');
 
     expect(sspParser.parse(testFile)).toEqual({
+      songNumber: '0707',
       title: 'La Sangre (The Blood)',
-      keywords: ['Background Improv'],
       artist: '',
       copyright: '',
       ccli: '',
-      sections: [
+      key: '',
+      keywords: [],
+      lyricSections: [
         {
           title: 'Verse 1',
           lyrics:
-            'La sangre de mi Cristo\r\nque el vertio por mi en la cruz\r\naun es eficaz, para limpiar tu ser\r\nporque Cristo nunca perdera su fuerza',
+            'La sangre de mi Cristo\nque el vertio por mi en la cruz\naun es eficaz, para limpiar tu ser\nporque Cristo nunca perdera su fuerza',
         },
         {
           title: 'Chorus',
           lyrics:
-            'Oh, porque alcanza a limpiar nuestras manchas\r\ny alcanza a curar nuestras llagas\r\npecador ven al manantial \r\nque fluyendo esta\r\ny lavara tu ser\r\nporque Cristo nunca perdera su fuerza!!"',
+            'Oh, porque alcanza a limpiar nuestras manchas\ny alcanza a curar nuestras llagas\npecador ven al manantial \nque fluyendo esta\ny lavara tu ser\nporque Cristo nunca perdera su fuerza!!"',
         },
       ],
-    });
+    } as ISongShowPlusSong);
   });
 });