Merge branch 'main' into sort-exports

# Conflicts:
#	index.js

Author: fisker

.github/workflows/pr.yml

@@ -14,10 +14,6 @@ jobs:
         node_version:
           - '22'
           - '20'
-          - '18'
-          - '16'
-          - '14'
-          - '12'
     name: Node.js ${{ matrix.node_version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:

.gitignore

@@ -1,4 +1,3 @@
 node_modules
-/.nyc_output
 /index.cjs
 /coverage

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npm t && npx lint-staged

cli.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
-import { globSync } from 'tinyglobby'
 import fs from 'node:fs'
-import getStdin from 'get-stdin'
+import streamConsumers from 'node:stream/consumers'
+import { parseArgs } from 'node:util'
+import { globSync } from 'tinyglobby'
 import sortPackageJson from './index.js'
 import Reporter from './reporter.js'
 
@@ -30,6 +31,32 @@ If file/glob is omitted, './package.json' file will be processed.
   )
 }
 
+function parseCliArguments() {
+  const { values: options, positionals: patterns } = parseArgs({
+    options: {
+      check: { type: 'boolean', short: 'c', default: false },
+      quiet: { type: 'boolean', short: 'q', default: false },
+      stdin: { type: 'boolean', default: false },
+      ignore: {
+        type: 'string',
+        short: 'i',
+        multiple: true,
+        default: ['node_modules/**'],
+      },
+      version: { type: 'boolean', short: 'v', default: false },
+      help: { type: 'boolean', short: 'h', default: false },
+    },
+    allowPositionals: true,
+    strict: true,
+  })
+
+  if (patterns.length === 0) {
+    patterns[0] = 'package.json'
+  }
+
+  return { options, patterns }
+}
+
 function sortPackageJsonFile(file, reporter, isCheck) {
   const original = fs.readFileSync(file, 'utf8')
   const sorted = sortPackageJson(original)
@@ -46,6 +73,7 @@ function sortPackageJsonFile(file, reporter, isCheck) {
 
 function sortPackageJsonFiles(patterns, { ignore, ...options }) {
   const files = globSync(patterns, { ignore })
+
   const reporter = new Reporter(files, options)
   const { isCheck } = options
 
@@ -60,65 +88,44 @@ function sortPackageJsonFiles(patterns, { ignore, ...options }) {
 }
 
 async function sortPackageJsonFromStdin() {
-  process.stdout.write(sortPackageJson(await getStdin()))
+  process.stdout.write(
+    sortPackageJson(await streamConsumers.text(process.stdin)),
+  )
 }
 
 function run() {
-  const cliArguments = process.argv
-    .slice(2)
-    .map((arg) => arg.split('='))
-    .flat()
-
-  if (
-    cliArguments.some((argument) => argument === '--help' || argument === '-h')
-  ) {
+  let options, patterns
+  try {
+    ;({ options, patterns } = parseCliArguments())
+  } catch (error) {
+    process.exitCode = 2
+    console.error(error.message)
+    if (
+      error.code === 'ERR_PARSE_ARGS_UNKNOWN_OPTION' ||
+      error.code === 'ERR_PARSE_ARGS_INVALID_OPTION_VALUE'
+    ) {
+      console.error(`Try 'sort-package-json --help' for more information.`)
+    }
+    return
+  }
+
+  if (options.help) {
     return showHelpInformation()
   }
 
-  if (
-    cliArguments.some(
-      (argument) => argument === '--version' || argument === '-v',
-    )
-  ) {
+  if (options.version) {
     return showVersion()
   }
 
-  if (cliArguments.some((argument) => argument === '--stdin')) {
+  if (options.stdin) {
     return sortPackageJsonFromStdin()
   }
 
-  const patterns = []
-  const ignore = []
-  let isCheck = false
-  let shouldBeQuiet = false
-
-  let lastArg
-  for (const argument of cliArguments) {
-    if (lastArg === '--ignore' || lastArg === '-i') {
-      ignore.push(argument)
-      lastArg = undefined
-      continue
-    }
-    if (argument === '--check' || argument === '-c') {
-      isCheck = true
-    } else if (argument === '--quiet' || argument === '-q') {
-      shouldBeQuiet = true
-    } else if (argument === '--ignore' || argument === '-i') {
-      lastArg = argument
-    } else {
-      patterns.push(argument)
-    }
-  }
-
-  if (!patterns.length) {
-    patterns[0] = 'package.json'
-  }
-
-  if (!ignore.length) {
-    ignore[0] = 'node_modules'
-  }
-
-  sortPackageJsonFiles(patterns, { ignore, isCheck, shouldBeQuiet })
+  sortPackageJsonFiles(patterns, {
+    ignore: options.ignore,
+    isCheck: options.check,
+    shouldBeQuiet: options.quiet,
+  })
 }
 
 run()

eslint.config.js

@@ -13,6 +13,7 @@ export default [
     languageOptions: {
       globals: { ...globals.builtin, ...globals.node },
     },
+    settings: { node: { version: '20' } },
   },
   { ignores: ['index.cjs'] },
 ]

git-hooks-list_shim.cjs

@@ -5,11 +5,6 @@ import gitHooks from 'git-hooks-list'
 import isPlainObject from 'is-plain-obj'
 import semver from 'semver'
 
-const hasOwn =
-  // eslint-disable-next-line n/no-unsupported-features/es-builtins, n/no-unsupported-features/es-syntax -- Safe
-  Object.hasOwn ||
-  // TODO: Remove this when we drop supported for Node.js v20
-  ((object, property) => Object.prototype.hasOwnProperty.call(object, property))
 const pipe =
   (fns) =>
   (x, ...args) =>
@@ -38,8 +33,9 @@ const sortObjectBy = (comparator, deep) => {
   return over
 }
 const objectGroupBy =
-  // eslint-disable-next-line n/no-unsupported-features/es-builtins, n/no-unsupported-features/es-syntax -- will enable later
+  // eslint-disable-next-line n/no-unsupported-features/es-builtins, n/no-unsupported-features/es-syntax -- Safe
   Object.groupBy ||
+  // Remove this when we drop support for Node.js 20
   ((array, callback) => {
     const result = Object.create(null)
     for (const value of array) {
@@ -66,7 +62,7 @@ const sortDirectories = sortObjectBy([
 const overProperty =
   (property, over) =>
   (object, ...args) =>
-    hasOwn(object, property)
+    Object.hasOwn(object, property)
       ? { ...object, [property]: over(object[property], ...args) }
       : object
 const sortGitHooks = sortObjectBy(gitHooks)
@@ -233,8 +229,8 @@ const defaultNpmScripts = new Set([
 
 const hasDevDependency = (dependency, packageJson) => {
   return (
-    hasOwn(packageJson, 'devDependencies') &&
-    hasOwn(packageJson.devDependencies, dependency)
+    Object.hasOwn(packageJson, 'devDependencies') &&
+    Object.hasOwn(packageJson.devDependencies, dependency)
   )
 }