feat: prepend custom order to default sort order (#108)

* feat: prepend custom order to default sort order * fix: support function type `options.sortOrder` * refactor: remove redundant code * fix: add defaultSortOrder keys * style: prettier * style: prettier Co-authored-by: Keith Cirkel <keithamus@users.noreply.github.com>

Author: fisker

index.js

@@ -192,7 +192,12 @@ function sortPackageJson(jsonIsh, options = {}) {
  if (Array.isArray(sortOrder)) {
  const keys = Object.keys(json)
  const [privateKeys, publicKeys] = partition(keys, isPrivateKey)
- sortOrder = [...sortOrder, ...publicKeys.sort(), ...privateKeys.sort()]
+ sortOrder = [
+ ...sortOrder,
+ ...defaultSortOrder,
+ ...publicKeys.sort(),
+ ...privateKeys.sort(),
+ ]
  }
 
  const newJson = sortObjectKeys(json, sortOrder)

test.js

@@ -92,6 +92,26 @@ fs.readFile('./package.json', 'utf8', (error, contents) => {
  ['z', 'a', 'name'],
  )
 
+ // defaultSortOrder still applied, when using custom sortOrder
+ assert.deepStrictEqual(
+ Object.keys(
+ sortPackageJson(
+ {
+ b: 'b',
+ a: 'a',
+ z: 'z',
+ version: '1.0.0',
+ name: 'foo',
+ private: true,
+ },
+ {
+ sortOrder: ['z', 'private'],
+ },
+ ),
+ ),
+ ['z', 'private', 'name', 'version', 'a', 'b'],
+ )
+
  // Custom sort order should not effect field sorting
  assert.deepStrictEqual(
  Object.keys(