@sequencemedia/music-library 1.1.3 → 1.1.5

package/app.mjs

@@ -14,6 +14,10 @@ import {
   Command
 } from 'commander'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import * as watch from '#music-library/watch'
 
 const {
@@ -70,7 +74,9 @@ async function app () {
 
       process.kill(pid)
     }
-  } catch ({ message }) {
+  } catch ({
+    message = DEFAULT_ERROR_MESSAGE
+  }) {
     const error = debug('@sequencemedia/music-library:process:error')
 
     error(message)
@@ -151,7 +157,9 @@ async function app () {
         }
       }
     }
-  } catch ({ message }) {
+  } catch ({
+    message = DEFAULT_ERROR_MESSAGE
+  }) {
     const error = debug('@sequencemedia/music-library:error')
 
     error(message)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/music-library",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Watch Apple Music Library XML and parse to JSON, JS, ES, or M3U",
   "keywords": [
     "music",
@@ -43,7 +43,7 @@
     "start": "cross-env NODE_OPTIONS=\"--no-warnings\" NODE_ENV=production node ."
   },
   "dependencies": {
-    "@sequencemedia/music-library-parser": "1.1.3",
+    "@sequencemedia/music-library-parser": "1.1.4",
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
     "cross-env": "^7.0.3",
@@ -54,8 +54,8 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.4",
-    "@sequencemedia/eslint-config-standard": "^0.0.51",
-    "@sequencemedia/hooks": "^1.0.542",
+    "@sequencemedia/eslint-config-standard": "^0.0.53",
+    "@sequencemedia/hooks": "^1.0.544",
     "core-js": "^3.38.1",
     "eslint": "^9.9.1",
     "globals": "^15.9.0",
@@ -64,6 +64,7 @@
   "imports": {
     "#music-library": "./src/index.mjs",
     "#music-library/*": "./src/*/index.mjs",
-    "#music-library/common/normalise": "./src/common/normalise.mjs"
+    "#music-library/common": "./src/common/index.mjs",
+    "#music-library/common/*": "./src/common/*.mjs"
   }
 }

package/src/common/index.mjs

@@ -0,0 +1,9 @@
+import debug from 'debug'
+
+const log = debug('@sequencemedia/music-library')
+
+export const DEFAULT_ERROR_MESSAGE = 'No error message defined'
+
+export function DEFAULT_FUNC () {
+  log('DEFAULT_FUNC')
+}

package/src/common/normalise.mjs

@@ -6,6 +6,8 @@ import {
   resolve
 } from 'path'
 
-const normalise = (p = '') => resolve(String(p).trim().replace(/^~/, homedir()))
-
-export default normalise
+export default function normalise (p = '') {
+  return (
+    resolve(String(p).trim().replace(/^~/, homedir()))
+  )
+}

package/src/library/index.mjs

@@ -2,6 +2,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -15,6 +19,12 @@ const error = debug('@sequencemedia/music-library:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(message)
+}
+
 export async function toM3U (jar, xml, destination) {
   try {
     const j = jar
@@ -32,8 +42,8 @@ export async function toM3U (jar, xml, destination) {
     return (
       await parseToM3U(j, x, d)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 

package/src/library/playlists/index.mjs

@@ -2,6 +2,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -17,6 +21,12 @@ const error = debug('@sequencemedia/music-library:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(message)
+}
+
 export async function toM3U (jar, xml, destination) {
   try {
     const j = jar
@@ -34,8 +44,8 @@ export async function toM3U (jar, xml, destination) {
     return (
       await parseToM3U(j, x, d)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 

package/src/library/playlists/transform/index.mjs

@@ -2,6 +2,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -21,6 +25,12 @@ const error = debug('@sequencemedia/music-library:transform:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(message)
+}
+
 export async function toJSON (jar, xml) {
   try {
     const j = jar
@@ -34,8 +44,8 @@ export async function toJSON (jar, xml) {
     return (
       await transformToJSON(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 
@@ -52,8 +62,8 @@ export async function toJS (jar, xml) {
     return (
       await transformToJS(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 
@@ -70,7 +80,7 @@ export async function toES (jar, xml) {
     return (
       await transformToES(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }

package/src/library/tracks/index.mjs

@@ -2,6 +2,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -17,6 +21,12 @@ const error = debug('@sequencemedia/music-library:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(message)
+}
+
 export async function toM3U (jar, xml, destination) {
   try {
     const j = jar
@@ -34,8 +44,8 @@ export async function toM3U (jar, xml, destination) {
     return (
       await parseToM3U(j, x, d)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 

package/src/library/tracks/transform/index.mjs

@@ -2,6 +2,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -21,6 +25,12 @@ const error = debug('@sequencemedia/music-library:transform:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(message)
+}
+
 export async function toJSON (jar, xml) {
   try {
     const j = jar
@@ -34,8 +44,8 @@ export async function toJSON (jar, xml) {
     return (
       await transformToJSON(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 
@@ -52,8 +62,8 @@ export async function toJS (jar, xml) {
     return (
       await transformToJS(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 
@@ -70,7 +80,7 @@ export async function toES (jar, xml) {
     return (
       await transformToES(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }

package/src/library/transform/index.mjs

@@ -2,6 +2,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -19,6 +23,12 @@ const error = debug('@sequencemedia/music-library:transform:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(message)
+}
+
 export async function toJSON (jar, xml) {
   try {
     const j = jar
@@ -32,8 +42,8 @@ export async function toJSON (jar, xml) {
     return (
       await transformToJSON(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 
@@ -50,8 +60,8 @@ export async function toJS (jar, xml) {
     return (
       await transformToJS(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }
 
@@ -68,7 +78,7 @@ export async function toES (jar, xml) {
     return (
       await transformToES(j, x)
     )
-  } catch ({ message }) {
-    error(message)
+  } catch (e) {
+    handleError(e)
   }
 }

package/src/watch/library/index.mjs

@@ -4,6 +4,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -17,6 +21,12 @@ const error = debug('@sequencemedia/music-library:library:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(`Error in watcher. The message was "${message}"`)
+}
+
 export function toM3U (jar, xml, destination) {
   const j = jar
     ? normalise(jar)
@@ -32,18 +42,20 @@ export function toM3U (jar, xml, destination) {
 
   return (
     chokidar.watch(x)
-      .on('all', (t, p) => {
+      .on('all', function handleEvent (t, p) {
         log(`Event "${t}" for "${p}"`)
       })
-      .on('ready', () => (
-        parseToM3U(j, x, d)
-      ))
-      .on('change', () => (
-        parseToM3U(j, x, d)
-      ))
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
+      .on('ready', function handleReady () {
+        return (
+          parseToM3U(j, x, d)
+        )
+      })
+      .on('change', function handleChange () {
+        return (
+          parseToM3U(j, x, d)
+        )
       })
+      .on('error', handleError)
   )
 }
 

package/src/watch/library/playlists/index.mjs

@@ -4,6 +4,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -19,6 +23,12 @@ const error = debug('@sequencemedia/music-library:playlists:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(`Error in watcher. The message was "${message}"`)
+}
+
 export function toM3U (jar, xml, destination) {
   const j = jar
     ? normalise(jar)
@@ -34,18 +44,20 @@ export function toM3U (jar, xml, destination) {
 
   return (
     chokidar.watch(x)
-      .on('all', (t, p) => {
+      .on('all', function handleEvent (t, p) {
         log(`Event "${t}" for "${p}"`)
       })
-      .on('ready', () => (
-        parseToM3U(j, x, d)
-      ))
-      .on('change', () => (
-        parseToM3U(j, x, d)
-      ))
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
+      .on('ready', function handleReady () {
+        return (
+          parseToM3U(j, x, d)
+        )
+      })
+      .on('change', function handleChange () {
+        return (
+          parseToM3U(j, x, d)
+        )
       })
+      .on('error', handleError)
   )
 }
 

package/src/watch/library/playlists/transform/index.mjs

@@ -4,6 +4,11 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE,
+  DEFAULT_FUNC
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -23,7 +28,13 @@ const error = debug('@sequencemedia/music-library:transform:error')
 
 log('`music-library` is awake')
 
-export function toJSON (jar, xml, func = () => {}) {
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(`Error in watcher. The message was "${message}"`)
+}
+
+export function toJSON (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -34,23 +45,21 @@ export function toJSON (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToJSON(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToJSON(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }
 
-export function toJS (jar, xml, func = () => {}) {
+export function toJS (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -61,23 +70,21 @@ export function toJS (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToJS(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToJS(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }
 
-export function toES (jar, xml, func = () => {}) {
+export function toES (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -88,18 +95,16 @@ export function toES (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToES(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToES(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }

package/src/watch/library/tracks/index.mjs

@@ -4,6 +4,10 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -19,6 +23,12 @@ const error = debug('@sequencemedia/music-library:tracks:error')
 
 log('`music-library` is awake')
 
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(`Error in watcher. The message was "${message}"`)
+}
+
 export function toM3U (jar, xml, destination) {
   const j = jar
     ? normalise(jar)
@@ -34,18 +44,20 @@ export function toM3U (jar, xml, destination) {
 
   return (
     chokidar.watch(x)
-      .on('all', (t, p) => {
+      .on('all', function handleEvent (t, p) {
         log(`Event "${t}" for "${p}"`)
       })
-      .on('ready', () => (
-        parseToM3U(j, x, d)
-      ))
-      .on('change', () => (
-        parseToM3U(j, x, d)
-      ))
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
+      .on('ready', function handleReady () {
+        return (
+          parseToM3U(j, x, d)
+        )
+      })
+      .on('change', function handleChange () {
+        return (
+          parseToM3U(j, x, d)
+        )
       })
+      .on('error', handleError)
   )
 }
 

package/src/watch/library/tracks/transform/index.mjs

@@ -4,6 +4,11 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE,
+  DEFAULT_FUNC
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -23,7 +28,13 @@ const error = debug('@sequencemedia/music-library:transform:error')
 
 log('`music-library` is awake')
 
-export function toJSON (jar, xml, func = () => {}) {
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(`Error in watcher. The message was "${message}"`)
+}
+
+export function toJSON (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -34,23 +45,21 @@ export function toJSON (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToJSON(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToJSON(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }
 
-export function toJS (jar, xml, func = () => {}) {
+export function toJS (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -61,23 +70,21 @@ export function toJS (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToJS(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToJS(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }
 
-export function toES (jar, xml, func = () => {}) {
+export function toES (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -88,18 +95,16 @@ export function toES (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToES(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToES(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }

package/src/watch/library/transform/index.mjs

@@ -4,6 +4,11 @@ import debug from 'debug'
 
 import musicLibraryParser from '@sequencemedia/music-library-parser'
 
+import {
+  DEFAULT_ERROR_MESSAGE,
+  DEFAULT_FUNC
+} from '#music-library/common'
+
 import normalise from '#music-library/common/normalise'
 
 const {
@@ -21,7 +26,13 @@ const error = debug('@sequencemedia/music-library:transform:error')
 
 log('`music-library` is awake')
 
-export function toJSON (jar, xml, func = () => {}) {
+function handleError ({
+  message = DEFAULT_ERROR_MESSAGE
+} = {}) {
+  error(`Error in watcher. The message was "${message}"`)
+}
+
+export function toJSON (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -32,23 +43,21 @@ export function toJSON (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToJSON(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToJSON(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }
 
-export function toJS (jar, xml, func = () => {}) {
+export function toJS (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -59,23 +68,21 @@ export function toJS (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToJS(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToJS(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }
 
-export function toES (jar, xml, func = () => {}) {
+export function toES (jar, xml, func = DEFAULT_FUNC) {
   const j = jar
     ? normalise(jar)
     : jar
@@ -86,18 +93,16 @@ export function toES (jar, xml, func = () => {}) {
 
   return (
     chokidar.watch(x)
-      .on('ready', async function ready () {
+      .on('ready', async function handleReady () {
         func(
           await transformToES(j, x)
         )
       })
-      .on('change', async function change () {
+      .on('change', async function handleChange () {
         func(
           await transformToES(j, x)
         )
       })
-      .on('error', ({ message }) => {
-        error(`Error in watcher: "${message}"`)
-      })
+      .on('error', handleError)
   )
 }