Fixed linting and added to pre-commit hook

Author: ntrjpatel

.husky/pre-commit

@@ -1,11 +1,30 @@
 #!/usr/bin/env sh
-# Pre-commit hook to run Snyk and Talisman scans, completing both before deciding to commit
+# Pre-commit hook to run lint, Snyk and Talisman scans, completing all before deciding to commit
 
 # Function to check if a command exists
 command_exists() {
   command -v "$1" >/dev/null 2>&1
 }
 
+# Allow bypassing the hook with an environment variable
+if [ "$SKIP_HOOK" = "1" ]; then
+  echo "Skipping lint, Snyk and Talisman scans (SKIP_HOOK=1)."
+  exit 0
+fi
+
+# Run ESLint check first
+echo "Running ESLint check..."
+npm run lint
+lint_exit_code=$?
+
+if [ $lint_exit_code -ne 0 ]; then
+  echo "ESLint check failed. Please fix the linting issues and try again."
+  echo "You can run 'npm run format' to auto-fix most issues."
+  exit 1
+fi
+
+echo "ESLint check passed."
+
 # Check if Snyk is installed
 if ! command_exists snyk; then
   echo "Error: Snyk is not installed. Please install it and try again."
@@ -18,12 +37,6 @@ if ! command_exists talisman; then
   exit 1
 fi
 
-# Allow bypassing the hook with an environment variable
-if [ "$SKIP_HOOK" = "1" ]; then
-  echo "Skipping Snyk and Talisman scans (SKIP_HOOK=1)."
-  exit 0
-fi
-
 # Initialize variables to track scan results
 snyk_failed=false
 talisman_failed=false
@@ -63,7 +76,7 @@ if [ "$snyk_failed" = true ] || [ "$talisman_failed" = true ]; then
   exit 1
 fi
 
-# If both scans pass, allow the commit
-echo "All scans passed. Proceeding with commit.cd ."
+# If all checks pass, allow the commit
+echo "All checks passed (ESLint, Snyk, Talisman). Proceeding with commit."
 rm -f snyk_output.log talisman_output.log
 exit 0

.talismanrc

@@ -1,4 +1,6 @@
 fileignoreconfig:
+  - filename: .husky/pre-commit
+    checksum: 52a664f536cf5d1be0bea19cb6031ca6e8107b45b6314fe7d47b7fad7d800632
   - filename: test/sanity-check/api/user-test.js
-    checksum: c82c76ef1a4d175044b9a30a82ed20f004320ec297ea37f27fdbd5c3fec9ff34
+    checksum: 6bb8251aad584e09f4d963a913bd0007e5f6e089357a44c3fb1529e3fda5509d
 version: ""

lib/contentstack.js

@@ -8,13 +8,13 @@ import getUserAgent from './core/Util.js'
 import contentstackClient from './contentstackClient.js'
 import httpClient from './core/contentstackHTTPClient.js'
 const regionHostMap = {
-    NA: 'api.contentstack.io',
-    EU: 'eu-api.contentstack.com',
-    AU: 'au-api.contentstack.com',
-    AZURE_NA: 'azure-na-api.contentstack.com',
-    AZURE_EU: 'azure-eu-api.contentstack.com',
-    GCP_NA: 'gcp-na-api.contentstack.com',
-    GCP_EU: 'gcp-eu-api.contentstack.com'
+  NA: 'api.contentstack.io',
+  EU: 'eu-api.contentstack.com',
+  AU: 'au-api.contentstack.com',
+  AZURE_NA: 'azure-na-api.contentstack.com',
+  AZURE_EU: 'azure-eu-api.contentstack.com',
+  GCP_NA: 'gcp-na-api.contentstack.com',
+  GCP_EU: 'gcp-eu-api.contentstack.com'
 }
 
 /**
@@ -169,56 +169,56 @@ const regionHostMap = {
  * @prop {string=} params.integration - Integration name and version e.g react/version
  * @returns Contentstack.Client
  */
-export function client(params = {}) {
-    let defaultHostName
+export function client (params = {}) {
+  let defaultHostName
 
-    if (params.region) {
-        const region = params.region.toUpperCase()
-        if (!regionHostMap[region]) {
-            throw new Error(`Invalid region '${params.region}' provided. Allowed regions are: ${Object.keys(regionHostMap).join(', ')}`)
-        }
-        defaultHostName = regionHostMap[region]
-    } else if (params.host) {
-        defaultHostName = params.host
-    } else {
-        defaultHostName = regionHostMap['NA']
+  if (params.region) {
+    const region = params.region.toUpperCase()
+    if (!regionHostMap[region]) {
+      throw new Error(`Invalid region '${params.region}' provided. Allowed regions are: ${Object.keys(regionHostMap).join(', ')}`)
     }
+    defaultHostName = regionHostMap[region]
+  } else if (params.host) {
+    defaultHostName = params.host
+  } else {
+    defaultHostName = regionHostMap['NA']
+  }
 
-    const defaultParameter = {
-        defaultHostName: defaultHostName
-    }
+  const defaultParameter = {
+    defaultHostName: defaultHostName
+  }
 
-    const sdkAgent = `contentstack-management-javascript/${packages.version}`
-    const userAgentHeader = getUserAgent(sdkAgent,
-        params.application,
-        params.integration,
-        params.feature
-    )
-    const requiredHeaders = {
-        'X-User-Agent': sdkAgent,
-        'User-Agent': userAgentHeader
-    }
+  const sdkAgent = `contentstack-management-javascript/${packages.version}`
+  const userAgentHeader = getUserAgent(sdkAgent,
+    params.application,
+    params.integration,
+    params.feature
+  )
+  const requiredHeaders = {
+    'X-User-Agent': sdkAgent,
+    'User-Agent': userAgentHeader
+  }
 
-    if (params.authtoken) {
-        requiredHeaders.authtoken = params.authtoken
-    }
-    if (params.authorization) {
-        requiredHeaders.authorization = params.authorization
-    }
-    if (params.early_access) {
-        requiredHeaders.early_access = params.early_access.join(',')
-    }
-    params = {
-        ...defaultParameter,
-        ...clonedeep(params)
-    }
+  if (params.authtoken) {
+    requiredHeaders.authtoken = params.authtoken
+  }
+  if (params.authorization) {
+    requiredHeaders.authorization = params.authorization
+  }
+  if (params.early_access) {
+    requiredHeaders.early_access = params.early_access.join(',')
+  }
+  params = {
+    ...defaultParameter,
+    ...clonedeep(params)
+  }
 
-    params.headers = {
-        ...params.headers,
-        ...requiredHeaders
-    }
-    const http = httpClient(params)
-    return contentstackClient({
-        http: http
-    })
+  params.headers = {
+    ...params.headers,
+    ...requiredHeaders
+  }
+  const http = httpClient(params)
+  return contentstackClient({
+    http: http
+  })
 }