@sequencemedia/hooks 1.0.623 → 1.1.0

package/.circleci/config.yml

@@ -10,44 +10,11 @@ jobs:
           name: Publish to NPM
           command: |
             echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
-
-            PATTERN="([0-9]+)\.([0-9]+)\.([0-9]+)"
-            NAME=$(node -p "require('./package').name")
-            VERSION=$(node -p "require('./package').version")
-            PUBLISHED_VERSION=$(npm view $NAME version)
-
-            echo Version is $VERSION
-            echo Published version is $PUBLISHED_VERSION
-
-            [[ $VERSION =~ $PATTERN ]]
-
-            VERSION_MAJOR="${BASH_REMATCH[1]}"
-            VERSION_MINOR="${BASH_REMATCH[2]}"
-            VERSION_PATCH="${BASH_REMATCH[3]}"
-
-            [[ $PUBLISHED_VERSION =~ $PATTERN ]]
-
-            PUBLISHED_VERSION_MAJOR="${BASH_REMATCH[1]}"
-            PUBLISHED_VERSION_MINOR="${BASH_REMATCH[2]}"
-            PUBLISHED_VERSION_PATCH="${BASH_REMATCH[3]}"
-
-            if [ $VERSION_MAJOR -gt $PUBLISHED_VERSION_MAJOR ] || [ $VERSION_MINOR -gt $PUBLISHED_VERSION_MINOR ] || [ $VERSION_PATCH -gt $PUBLISHED_VERSION_PATCH ]
-            then
-              set +e
-
-              npm ci
-              npm publish
-
-              if [[ $? != 0 ]];
-              then
-                echo Version $VERSION was not published
-              else
-                echo Published version $VERSION
-              fi
-            fi
+            echo ".publish/publish.sh" >> .npmignore
+            git clone https://github.com/sequencemedia/publish.git .publish
+            .publish/publish.sh
 
 workflows:
-  version: 2
   commit-workflow:
     jobs:
       - publish:

package/.editorconfig

@@ -4,7 +4,7 @@
 root = true
 
 # Unix-style newlines with a newline ending every file
-[*.{js,ts}]
+[*.{cjs,mjs,cts,mts}]
 end_of_line = lf
 insert_final_newline = true
 

package/.gitattributes

@@ -2,13 +2,22 @@
 * text=auto
 
 # LF line endings
+*.yaml text eol=lf
+*.yml text eol=lf
 *.json text eol=lf
 *.mjs text eol=lf
 *.cjs text eol=lf
+*.jsx text eol=lf
 *.mts text eol=lf
+*.cts text eol=lf
+*.sh text eol=lf
 .editorconfig text eol=lf
 .eslintignore text eol=lf
 .eslintrc text eol=lf
 .gitattributes text eol=lf
 .gitignore text eol=lf
+.npmignore text eol=lf
+.npmrc text eol=lf
+.eslintrc text eol=lf
+.babelrc text eol=lf
 .husky/* text eol=lf

package/.husky/post-commit

@@ -13,7 +13,5 @@ has_package_changes () {
 
 if has_package_changes;
 then
-  git clone https://github.com/sequencemedia/hooks.git .husky/hooks
-  npx cross-env DEBUG=@sequencemedia/hooks* node .husky/post-commit.mjs
-  rm -rf .husky/hooks
+  npx cross-env DEBUG=@sequencemedia/hooks* node ./post-commit.mjs
 fi

package/.publish/.gitattributes

@@ -0,0 +1,3 @@
+* text eol=lf
+*.png binary
+*.ico binary

package/.publish/README.md

@@ -0,0 +1,20 @@
+# Publish to NPM
+
+For CircleCI or the shell
+
+If you need an _authentication token_ to publish then you should resolve that before executing this script
+
+```bash
+echo ".publish/publish.sh" >> .npmignore
+git clone https://github.com/sequencemedia/publish.git .publish
+.publish/publish.sh
+```
+
+A Gist with the same content as `publish.sh` may need an additional step
+
+```bash
+echo ".publish/publish.sh" >> .npmignore
+git clone https://gist.github.com/3d97362bd1c87996c92f4e599aff64bd.git .publish
+chmod +x .publish/publish.sh
+.publish/publish.sh
+```

package/babel.config.cjs

@@ -1,16 +1,14 @@
-const presets = [
-  [
-    '@babel/env',
-    {
-      targets: {
-        node: 'current'
-      },
-      useBuiltIns: 'usage',
-      corejs: 3
-    }
-  ]
-]
-
 module.exports = {
-  presets
+  presets: [
+    [
+      '@babel/env',
+      {
+        targets: {
+          node: 'current'
+        },
+        useBuiltIns: 'usage',
+        corejs: 3
+      }
+    ]
+  ]
 }

package/eslint.config.mjs

@@ -1,13 +1,32 @@
 import globals from 'globals'
-import standard from '@sequencemedia/eslint-config-standard'
+import standard from '@sequencemedia/eslint-config-standard/configs/recommended/merge'
+import typescript from '@sequencemedia/eslint-config-typescript/configs/recommended/merge'
 
 export default [
-  {
+  /**
+   *  Standard config
+   */
+  standard({
+    files: [
+      '**/*.{mjs,cjs,mts,cts}'
+    ],
     languageOptions: {
       globals: {
         ...globals.node
       }
     }
-  },
-  ...standard
+  }),
+  /**
+   *  TypeScript config
+   */
+  typescript({
+    files: [
+      '**/*.{mts,cts}'
+    ],
+    languageOptions: {
+      globals: {
+        ...globals.node
+      }
+    }
+  })
 ]

package/index.d.mts

@@ -1,22 +1,24 @@
 declare module '@sequencemedia/hooks' {
-  export function postCommit(): string
-  export const common: {
+  interface CommonType {
     OPTIONS: {
       maxBuffer: number
-    },
-    BRANCH: string,
-    PACKAGE_VERSION_CHANGES: RegExp,
-    HAS_STAGED_CHANGES: RegExp,
-    NOT_STAGED_CHANGES: RegExp,
-    use (): Promise<void>,
-    trim (): string,
-    getGitRemoteShowOriginHeadBranch (): Promise<void>,
-    hasGitDiffHeadPackageVersionChanges (): Promise<void>,
-    notGitDiffHeadPackageVersionChanges (): Promise<void>,
-    hasStagedChanges (): Promise<void>,
-    notStagedChanges (): Promise<void>,
-    addPackageVersionChanges (): Promise<void>,
-    patchPackageVersion (): Promise<void>,
-    gitTag (a:string, m?:string): Promise<void>
+    }
+    BRANCH: string
+    PACKAGE_VERSION_CHANGES: RegExp
+    HAS_STAGED_CHANGES: RegExp
+    NOT_STAGED_CHANGES: RegExp
+    use: () => Promise<void>
+    trim: () => string
+    getGitRemoteShowOriginHeadBranch: () => Promise<void>
+    hasGitDiffHeadPackageVersionChanges: () => Promise<void>
+    notGitDiffHeadPackageVersionChanges: () => Promise<void>
+    hasStagedChanges: () => Promise<void>
+    notStagedChanges: () => Promise<void>
+    addPackageVersionChanges: () => Promise<void>
+    patchPackageVersion: () => Promise<void>
+    gitTag: (a:string, m?:string) => Promise<void>
   }
+
+  export function postCommit (): string
+  export const common: CommonType
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/hooks",
-  "version": "1.0.623",
+  "version": "1.1.0",
   "description": "Git Hooks",
   "keywords": [
     "git",
@@ -35,11 +35,9 @@
     "debug": "^4.4.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.10",
-    "@babel/eslint-parser": "^7.26.10",
-    "@babel/preset-env": "^7.26.9",
     "@sequencemedia/eslint-config-standard": "^0.2.44",
-    "core-js": "^3.41.0",
+    "@sequencemedia/eslint-config-typescript": "^0.1.65",
+    "@types/debug": "^4.1.12",
     "eslint": "^9.23.0",
     "globals": "^16.0.0",
     "husky": "^9.1.7"

package/post-commit.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import postCommit from '#hooks/post-commit'
+
+export default postCommit()

package/src/common.mjs

@@ -22,9 +22,17 @@ export const NOT_STAGED_CHANGES = /Changes not staged for commit/s
 
 export const trim = (v = '') => String(v).split('\n').map((v) => v.trimEnd()).join('\n').trim()
 
+/**
+ *  @param {string} key
+ *  @returns {(v: string) => void}
+ */
 export function use (key) {
-  const log = debug(`@sequencemedia/hooks:${key}`)
+  const log = debug(`@sequencemedia/hooks:common:${key}`)
 
+  /**
+   *  @param {string} v
+   *  @returns {void}
+   */
   return function use (v) {
     log(trim(v))
   }
@@ -42,8 +50,26 @@ export function getGitRemoteShowOriginHeadBranch () {
         stderr
       } = exec(command, OPTIONS, (e, v) => (!e) ? resolve(trim(v)) : reject(e))
 
-      stdout.on('data', use('git-remote-show-origin-head-branch'))
-      stderr.on('data', use('git-remote-show-origin-head-branch'))
+      if (stdout) stdout.on('data', use('git-remote-show-origin-head-branch'))
+      if (stderr) stderr.on('data', use('git-remote-show-origin-head-branch'))
+    })
+  )
+}
+
+export function getGitRevParseAbbrevRefHead () {
+  log('getGitRevParseAbbrevRefHead')
+
+  return (
+    new Promise((resolve, reject) => {
+      const command = 'git rev-parse --abbrev-ref HEAD'
+
+      const {
+        stdout,
+        stderr
+      } = exec(command, OPTIONS, (e, v) => (!e) ? resolve(trim(v)) : reject(e))
+
+      if (stdout) stdout.on('data', use('git-rev-parse-head'))
+      if (stderr) stderr.on('data', use('git-rev-parse-head'))
     })
   )
 }
@@ -93,7 +119,7 @@ export function addPackageVersionChanges () {
 
   return (
     new Promise((resolve, reject) => {
-      exec('git add package.json package-lock.json', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+      exec('git add package.json package-lock.json', OPTIONS, (e, v) => (!e) ? resolve(v) : reject(e))
     })
   )
 }
@@ -103,7 +129,7 @@ export function patchPackageVersion () {
 
   return (
     new Promise((resolve, reject) => {
-      exec('npm version patch -m "%s" -n --no-commit-hooks', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+      exec('npm version patch -m "%s" -n --no-commit-hooks', OPTIONS, (e, v) => (!e) ? resolve(v) : reject(e))
     })
   )
 }

package/src/post-commit.mjs

@@ -3,6 +3,7 @@ import debug from 'debug'
 import {
   hasStagedChanges,
   getGitRemoteShowOriginHeadBranch,
+  getGitRevParseAbbrevRefHead,
   hasGitDiffHeadPackageVersionChanges,
   patchPackageVersion
 } from '#hooks/common'
@@ -12,18 +13,26 @@ const error = debug('@sequencemedia/hooks:post-commit:error')
 
 log('`@sequencemedia/hooks` is awake')
 
+function handleError ({
+  code = 'NONE',
+  message = 'NONE'
+}) {
+  error({ code, message })
+}
+
 export default async function postCommit () {
   log('postCommit')
 
   try {
     if (await hasStagedChanges()) return
 
-    if (await hasGitDiffHeadPackageVersionChanges(await getGitRemoteShowOriginHeadBranch())) return
+    const originHeadBranch = await getGitRemoteShowOriginHeadBranch()
+    if (originHeadBranch === await getGitRevParseAbbrevRefHead()) {
+      if (await hasGitDiffHeadPackageVersionChanges(originHeadBranch)) return
 
-    await patchPackageVersion()
-  } catch ({
-    message = 'No error message defined'
-  }) {
-    error(message)
+      await patchPackageVersion()
+    }
+  } catch (e) { // @ts-expect-error
+    handleError(e)
   }
 }

package/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "module": "NodeNext",
+    "target": "ESNext",
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true,
+    "strict": true
+  },
+  "include": [
+    "."
+  ]
+}