@sequencemedia/music-library 1.0.3 → 1.0.4

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run pre-commit

package/app.mjs

@@ -22,6 +22,10 @@ const {
   }
 } = watch
 
+const log = debug('@sequencemedia/music-library')
+
+log('`music-library` is awake')
+
 const NAME = 'ml.App'
 process.title = NAME
 
@@ -61,16 +65,12 @@ async function app () {
     return
   }
 
-  const log = debug('@sequencemedia/music-library')
-  const info = debug('@sequencemedia/music-library:info')
-
   const {
     pid,
     argv,
     env: {
-      JAR,
-      XML,
-      DESTINATION
+      TRACKS = false,
+      PLAYLISTS = false
     }
   } = process
 
@@ -80,58 +80,69 @@ async function app () {
     version
   } = PACKAGE
 
-  commander
-    .version(version)
-    .option('-j, --jar [jar]', 'Path to Saxon PE/EE JAR')
-    .option('-x, --xml [xml]', 'Path to iTunes Library XML')
-    .option('-d, --destination [destination]', 'Destination path for M3Us')
-    .option('-t, --tracks', 'Parse all tracks')
-    .option('-p, --playlists', 'Parse all playlists')
-    .parse(argv)
+  try {
+    commander
+      .version(version)
+      .exitOverride()
+      .requiredOption('-j, --jar [jar]', 'Path to Saxon PE/EE JAR')
+      .requiredOption('-x, --xml [xml]', 'Path to iTunes Library XML')
+      .requiredOption('-d, --destination [destination]', 'Destination path for M3Us')
+      .option('-t, --tracks', 'Parse all tracks')
+      .option('-p, --playlists', 'Parse all playlists')
+      .parse(argv)
+  } catch (e) {
+    const {
+      code
+    } = e
+
+    const error = debug('@sequencemedia/music-library:commander:error')
+
+    if (code !== 'commander.missingMandatoryOptionValue') error(e)
+
+    error(`Halting application "${name}" in process ${pid}.`)
+    return
+  }
 
   const {
-    jar = JAR,
-    xml = XML,
-    destination = DESTINATION,
-    tracks: t = false,
-    playlists: p = false
+    jar,
+    xml,
+    destination,
+    tracks: t = TRACKS,
+    playlists: p = PLAYLISTS
   } = commander.opts()
 
-  const l = (
-    (t && p) || (!t && !p)
-  )
-
-  if (l) {
-    log(`Application "${name}" in process ${pid} watching Library.`)
+  log({
+    jar,
+    xml,
+    destination
+  })
 
-    info({ jar, xml, destination })
-
-    return (
-      library
-        .toM3U(jar, xml, destination)
+  try {
+    const l = (
+      (t && p) || (!t && !p)
     )
-  } else {
-    if (t) {
-      log(`Application "${name}" in process ${pid} watching Tracks.`)
 
-    info({ jar, xml, destination })
-
-      return (
-        tracks
-          .toM3U(jar, xml, destination)
-      )
-    }
+    if (l) {
+      log(`Application "${name}" in process ${pid} watching Library.`)
 
-    if (p) {
-      log(`Application "${name}" in process ${pid} watching Playlists.`)
+      await library.toM3U(jar, xml, destination)
+    } else {
+      if (t) {
+        log(`Application "${name}" in process ${pid} watching Tracks.`)
 
-    info({ jar, xml, destination })
+        await tracks.toM3U(jar, xml, destination)
+      } else {
+        if (p) {
+          log(`Application "${name}" in process ${pid} watching Playlists.`)
 
-      return (
-        playlists
-          .toM3U(jar, xml, destination)
-      )
+          await playlists.toM3U(jar, xml, destination)
+        }
+      }
     }
+  } catch ({ message }) {
+    const error = debug('@sequencemedia/music-library:error')
+
+    error(message)
   }
 }
 

package/build/gulp/pre-commit.mjs

@@ -0,0 +1,114 @@
+import debug from 'debug'
+
+import {
+  exec
+} from 'child_process'
+
+const log = debug('@sequencemedia/music-library:build:gulp:pre-commit')
+
+log('`@sequencemedia/music-library` is awake')
+
+const PACKAGE_VERSION_CHANGES = /\-+\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+\++\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+/ /* eslint-disable-line no-useless-escape */
+
+const HAS_STAGED_CHANGES = /Changes to be committed/s
+
+const NOT_STAGED_CHANGES = /Changes not staged for commit/s
+
+const OPTIONS = {
+  maxBuffer: 1024 * 500
+}
+
+export function hasPackageVersionChanges () {
+  log('hasPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git diff HEAD origin/main package.json', OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notPackageVersionChanges () {
+  log('notPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git diff HEAD origin/main package.json', OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v) !== true) : reject(e))
+    })
+  )
+}
+
+export function hasStagedChanges () {
+  log('hasStagedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git status', OPTIONS, (e, v) => (!e) ? resolve(HAS_STAGED_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notStagedChanges () {
+  log('notStagedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git status', OPTIONS, (e, v) => (!e) ? resolve(NOT_STAGED_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notPushedChanges () {
+  log('notPushedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git log origin/main..HEAD', OPTIONS, (e, v) => (!e) ? resolve(!!v) : reject(e))
+    })
+  )
+}
+
+export function patchPackageVersion () {
+  log('patchPackageVersion')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('npm version patch -m %s -n --no-git-tag-version --no-verify', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
+
+export function addPackageVersionChanges () {
+  log('addPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git add package.json package-lock.json', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
+
+export default async function preCommit () {
+  log('pre-commit')
+
+  try {
+    /**
+     *  Not changes added, exit
+     */
+    if (await notStagedChanges()) return
+    /**
+     *  Has changes added, continue
+     */
+    if (await hasStagedChanges()) {
+      /**
+       *  Not package version changes, continue
+       */
+      if (await notPackageVersionChanges()) {
+        await patchPackageVersion()
+        await addPackageVersionChanges()
+      }
+    }
+  } catch ({ code = 'NONE', message = 'No error message defined' }) {
+    log({ code, message })
+  }
+}

package/gulpfile.mjs

@@ -0,0 +1,9 @@
+import gulp from 'gulp'
+
+import preCommit from '#build/gulp/pre-commit'
+
+gulp
+  .task('pre-commit', preCommit)
+
+gulp
+  .task('default', gulp.series('pre-commit'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/music-library",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Watch Apple Music Library XML and parse to JSON, JS, ES, or M3U",
   "keywords": [
     "music",
@@ -35,7 +35,10 @@
     "lint": "eslint . --ext .mjs --ext .cjs",
     "lint:fix": "npm run lint -- --fix",
     "start": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:*,@sequencemedia/music-library-parser,@sequencemedia/music-library-parser:* NODE_ENV=production node .",
-    "start:dev": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:*,@sequencemedia/music-library-parser,@sequencemedia/music-library-parser:* NODE_ENV=development node ."
+    "dev": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:*,@sequencemedia/music-library-parser,@sequencemedia/music-library-parser:* NODE_ENV=development node .",
+    "gulp": "gulp --color",
+    "pre-commit": "npm run lint && cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:* npm run gulp -- pre-commit",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@sequencemedia/music-library-parser": "1.0.2",
@@ -59,17 +62,25 @@
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "5.2.0"
+    "eslint-plugin-promise": "5.2.0",
+    "gulp": "^4.0.2",
+    "husky": "^7.0.4"
   },
   "imports": {
     "#music-library/common/normalise": "./src/common/normalise.mjs",
     "#music-library/library": "./src/library/index.mjs",
+    "#music-library/library/transform": "./src/library/transform/index.mjs",
+    "#music-library/library/playlists": "./src/library/playlists/index.mjs",
+    "#music-library/library/playlists/transform": "./src/library/playlists/transform/index.mjs",
+    "#music-library/library/tracks": "./src/library/tracks/index.mjs",
+    "#music-library/library/tracks/transform": "./src/library/tracks/transform/index.mjs",
     "#music-library/watch": "./src/watch/index.mjs",
     "#music-library/watch/library": "./src/watch/library/index.mjs",
     "#music-library/watch/library/transform": "./src/watch/library/transform/index.mjs",
     "#music-library/watch/library/playlists": "./src/watch/library/playlists/index.mjs",
     "#music-library/watch/library/playlists/transform": "./src/watch/library/playlists/transform/index.mjs",
     "#music-library/watch/library/tracks": "./src/watch/library/tracks/index.mjs",
-    "#music-library/watch/library/tracks/transform": "./src/watch/library/tracks/transform/index.mjs"
+    "#music-library/watch/library/tracks/transform": "./src/watch/library/tracks/transform/index.mjs",
+    "#build/gulp/*": "./build/gulp/*.mjs"
   }
 }

package/src/common/normalise.mjs

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

package/src/library/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 

package/src/library/playlists/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 
@@ -34,4 +34,4 @@ export async function toM3U (jar, xml, destination) {
   }
 }
 
-export * as transform from './transform'
+export * as transform from '#music-library/library/playlists/transform'

package/src/library/playlists/transform/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 

package/src/library/tracks/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 
@@ -34,4 +34,4 @@ export async function toM3U (jar, xml, destination) {
   }
 }
 
-export * as transform from './transform'
+export * as transform from '#music-library/library/tracks/transform'

package/src/library/tracks/transform/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 

package/src/library/transform/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'