fix: load project staged-lint config

Author: chrisbbreuer

bin/cli.ts

@@ -3,8 +3,8 @@ import process from 'node:process'
 import { CLI } from '@stacksjs/clapp'
 import { Logger } from '@stacksjs/clarity'
 import { version } from '../package.json'
-import { config } from '../src/config'
-import { removeHooks, setHooksFromConfig, getConfigFromPackageJson } from '../src/git-hooks'
+import { getConfig } from '../src/config'
+import { removeHooks, setHooksFromConfig } from '../src/git-hooks'
 import { runStagedLint } from '../src/staged-lint'
 
 const cli = new CLI('git-hooks')
@@ -44,11 +44,12 @@ cli
       }
 
       if (configPath) {
-        const config = await import(configPath)
-        setHooksFromConfig(process.cwd(), { configFile: config, verbose: options?.verbose ?? false })
+        const importedConfig = await import(configPath)
+        setHooksFromConfig(process.cwd(), { configFile: importedConfig.default ?? importedConfig, verbose: options?.verbose ?? false })
       }
       else {
-        setHooksFromConfig(process.cwd(), { verbose: options?.verbose ?? false })
+        const config = await getConfig()
+        setHooksFromConfig(process.cwd(), { configFile: config, verbose: options?.verbose ?? false })
       }
 
       log.success('Successfully set all git hooks')
@@ -101,8 +102,8 @@ cli
         }
       }
 
-      const effectiveConfig = getConfigFromPackageJson(process.cwd()) || config
-      const success = await runStagedLint(hook, effectiveConfig, process.cwd(), options?.verbose ?? false, options?.autoRestage)
+      const config = await getConfig()
+      const success = await runStagedLint(hook, config, process.cwd(), options?.verbose ?? false, options?.autoRestage)
 
       if (success) {
         log.success('Staged lint completed successfully')

git-hooks.config.ts

@@ -1,17 +1,12 @@
 import type { GitHooksConfig } from './src/types'
 
 const config: GitHooksConfig = {
-  // Hook-specific configuration (takes precedence)
   'pre-commit': {
     'staged-lint': {
-      '**/*.{js,ts}': [
-        'bunx --bun eslint --fix',
-        'bunx --bun tsc --noEmit'
-      ]
-    }
+      '**/*.{js,ts,json,yaml,yml,md}': 'bunx --bun pickier {files} --fix',
+    },
   },
   'commit-msg': 'bunx gitlint .git/COMMIT_EDITMSG',
-  verbose: true
 }
 
 export default config

package.json

@@ -86,10 +86,10 @@
   "git-hooks": {
     "pre-commit": {
       "staged-lint": {
-        "*.{js,ts,json,yaml,yml,md}": "bunx --bun pickier lint --fix"
+        "*.{js,ts,json,yaml,yml,md}": "bunx --bun pickier {files} --fix"
       },
       "autoRestage": true
     },
-    "commit-msg": "bunx gitlint --edit .git/COMMIT_EDITMSG"
+    "commit-msg": "bunx gitlint .git/COMMIT_EDITMSG"
   }
 }

src/config.ts

@@ -1,21 +1,27 @@
 import type { GitHooksConfig } from './types'
 import process from 'node:process'
 import { loadConfig } from 'bunfig'
-import defaultConfig from '../git-hooks.config.ts'
+import bundledDefaultConfig from '../git-hooks.config.ts'
 
 // Lazy-loaded config to avoid top-level await (enables bun --compile)
 let _config: GitHooksConfig | null = null
+const emptyConfig: GitHooksConfig = {}
 
 export async function getConfig(): Promise<GitHooksConfig> {
   if (!_config) {
-    _config = await loadConfig({
+    const loadedConfig = await loadConfig({
       name: 'git-hooks',
       cwd: process.cwd(),
-      defaultConfig,
+      defaultConfig: emptyConfig,
     })
+
+    _config = Object.keys(loadedConfig).length > 0
+      ? loadedConfig
+      : bundledDefaultConfig
   }
+
   return _config
 }
 
 // For backwards compatibility - synchronous access with default fallback
-export const config: GitHooksConfig = defaultConfig
+export const config: GitHooksConfig = bundledDefaultConfig

src/git-hooks.ts

@@ -1,16 +1,20 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
-import { config } from './config'
+import { config as defaultConfig } from './config'
 import type { GitHooksConfig, StagedLintConfig, StagedLintTask, SetHooksFromConfigOptions } from './types'
 import { exec } from 'node:child_process'
 import { promisify } from 'node:util'
 import { Logger, italic, bgRed, green, bgYellow } from '@stacksjs/clarity'
 
 const execAsync = promisify(exec)
-const log = new Logger('git-hooks', {
-  showTags: true
-})
+let log: Logger | undefined
+
+function getLog(): Logger {
+  return log ??= new Logger('git-hooks', {
+    showTags: true,
+  })
+}
 
 // Module-level verbose switch. Default: false
 let VERBOSE = false
@@ -194,12 +198,12 @@ export function areHooksInstalled(projectRootPath: string = process.cwd()): bool
     return false
   }
 
-  if (!config || Object.keys(config).length === 0) {
+  if (!defaultConfig || Object.keys(defaultConfig).length === 0) {
     return false
   }
 
   // Check if at least one configured hook exists and contains our script marker
-  const configuredHooks = Object.keys(config).filter(key =>
+  const configuredHooks = Object.keys(defaultConfig).filter(key =>
     VALID_GIT_HOOKS.includes(key as typeof VALID_GIT_HOOKS[number])
   )
 
@@ -249,16 +253,15 @@ export function getConfigFromPackageJson(projectPath: string): GitHooksConfig |
  * Parses the config and sets git hooks
  */
 export function setHooksFromConfig(projectRootPath: string = process.cwd(), options?: SetHooksFromConfigOptions): void {
-  // Always use the provided configFile if available, otherwise try package.json in projectRoot, then cached config
-  const configFile = options?.configFile || getConfigFromPackageJson(projectRootPath) || (config && Object.keys(config).length > 0 ? { ...config } : undefined)
+  const configFile = options?.configFile || getConfigFromPackageJson(projectRootPath) || (defaultConfig && Object.keys(defaultConfig).length > 0 ? { ...defaultConfig } : undefined)
 
   if (!configFile || Object.keys(configFile).length === 0)
     throw new Error('[ERROR] Config was not found! Please add `.git-hooks.config.{ts,js,mjs,cjs,json}` or `git-hooks.config.{ts,js,mjs,cjs,json}` or the `git-hooks` entry in package.json.\r\nCheck README for details')
 
   // Set module verbosity strictly from options (CLI flag). Ignore config.verbose for logs.
   VERBOSE = Boolean(options?.verbose)
   if (VERBOSE) {
-    log.config.level = 'debug'
+    getLog().config.level = 'debug'
   }
 
   _validateStagedLintConfig(configFile)
@@ -277,7 +280,7 @@ export function setHooksFromConfig(projectRootPath: string = process.cwd(), opti
   // For programmatic usage, fall back to config file setting
   const verbose = options?.verbose !== undefined ? options.verbose : (configFile.verbose ?? false)
   if (verbose) {
-    log.debug(`Hook Keys: ${logKeys}`)
+    getLog().debug(`Hook Keys: ${logKeys}`)
   }
   for (const hook of VALID_GIT_HOOKS) {
     if (Object.prototype.hasOwnProperty.call(configFile, hook)) {
@@ -347,7 +350,7 @@ else {
 
   const addOrModify = fs.existsSync(hookPath) ? 'Modify' : 'Add'
   if (verbose) {
-    log.debug(`${addOrModify} ${italic(hook)} hook`)
+    getLog().debug(`${addOrModify} ${italic(hook)} hook`)
   }
 
   fs.writeFileSync(hookPath, hookCommand, { mode: 0o755 })
@@ -369,12 +372,12 @@ function _removeHook(hook: string, projectRoot = process.cwd(), verbose = false)
   const hookPath = path.normalize(`${gitRoot}/hooks/${hook}`)
 
   if (fs.existsSync(hookPath)){
-    if (VERBOSE) log.debug(`Hook ${hook} is not set, removing!`)
+    if (VERBOSE) getLog().debug(`Hook ${hook} is not set, removing!`)
     fs.unlinkSync(hookPath)
   }
 
   if (verbose)
-    log.success(`Successfully removed the ${hook} hook`)
+    getLog().success(`Successfully removed the ${hook} hook`)
 }
 
 /**