@html-validate/prettier-config 3.1.11 → 3.1.12

package/dist/sort-package-json.mjs

@@ -820,7 +820,7 @@ var require_range = __commonJS({
       parseRange(range) {
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
-        const cached = cache.get(memoKey);
+        const cached = cache2.get(memoKey);
         if (cached) {
           return cached;
         }
@@ -854,7 +854,7 @@ var require_range = __commonJS({
           rangeMap.delete("");
         }
         const result = [...rangeMap.values()];
-        cache.set(memoKey, result);
+        cache2.set(memoKey, result);
         return result;
       }
       intersects(range, options) {
@@ -893,7 +893,7 @@ var require_range = __commonJS({
     };
     module.exports = Range;
     var LRU = require_lrucache();
-    var cache = new LRU();
+    var cache2 = new LRU();
     var parseOptions = require_parse_options();
     var Comparator = require_comparator();
     var debug = require_debug();
@@ -1187,6 +1187,9 @@ var require_min_version = __commonJS({
 // src/sort-package-json.ts
 import { parsers } from "prettier/esm/parser-babel.mjs";
 
+// node_modules/sort-package-json/index.js
+import fs from "node:fs";
+
 // node_modules/sort-object-keys/index.js
 var has = (object, key) => Object.prototype.hasOwnProperty.call(object, key);
 function sortObjectByKeyNameList(object, sortWith) {
@@ -1412,7 +1415,9 @@ var sortDirectories = sortObjectBy([
   "example",
   "test"
 ]);
-var overProperty = (property, over) => (object, ...args) => Object.hasOwn(object, property) ? { ...object, [property]: over(object[property], ...args) } : object;
+var overProperty = (property, over) => onObject(
+  (object, ...args) => Object.hasOwn(object, property) ? { ...object, [property]: over(object[property], ...args) } : object
+);
 var sortGitHooks = sortObjectBy(git_hooks_list_default);
 var parseNameAndVersionRange = (specifier) => {
   const [nameAndVersion] = specifier.split(">");
@@ -1451,14 +1456,49 @@ var sortObjectByIdent = (a, b) => {
   if (packageNameA > packageNameB) return 1;
   return 0;
 };
-var sortDependenciesLikeNpm = sortObjectBy((a, b) => a.localeCompare(b, "en"));
-var sortWorkspaces = onObject(
-  pipe([
-    sortObjectBy(["packages", "catalog"]),
-    overProperty("packages", uniqAndSortArray),
-    overProperty("catalog", sortDependenciesLikeNpm)
-  ])
-);
+var cache = /* @__PURE__ */ new Map();
+var hasYarnOrPnpmFiles = () => {
+  const cwd = process.cwd();
+  if (!cache.has(cwd)) {
+    cache.set(
+      cwd,
+      fs.existsSync("yarn.lock") || fs.existsSync(".yarn/") || fs.existsSync(".yarnrc.yml") || fs.existsSync("pnpm-lock.yaml") || fs.existsSync("pnpm-workspace.yaml")
+    );
+  }
+  return cache.get(cwd);
+};
+function shouldSortDependenciesLikeNpm(packageJson) {
+  if (typeof packageJson.packageManager === "string") {
+    return packageJson.packageManager.startsWith("npm@");
+  }
+  if (packageJson.devEngines?.packageManager?.name) {
+    return packageJson.devEngines.packageManager.name === "npm";
+  }
+  if (packageJson.pnpm) {
+    return false;
+  }
+  if (packageJson.engines?.npm) {
+    return true;
+  }
+  if (hasYarnOrPnpmFiles()) {
+    return false;
+  }
+  return true;
+}
+var sortDependencies = onObject((dependencies, packageJson) => {
+  if (Object.keys(dependencies).length < 2) {
+    return dependencies;
+  }
+  if (shouldSortDependenciesLikeNpm(packageJson)) {
+    return sortObjectByKeyNameList(dependencies, (a, b) => a.localeCompare(b, "en"));
+  }
+  return sortObjectByKeyNameList(dependencies);
+});
+var sortWorkspaces = pipe([
+  sortObjectBy(["packages", "catalog"]),
+  overProperty("packages", uniqAndSortArray),
+  overProperty("catalog", sortDependencies)
+]);
 var eslintBaseConfigProperties = [
   // `files` and `excludedFiles` are only on `overrides[]`
   // for easier sort `overrides[]`,
@@ -1479,51 +1519,53 @@ var eslintBaseConfigProperties = [
   "noInlineConfig",
   "reportUnusedDisableDirectives"
 ];
-var sortEslintConfig = onObject(
-  pipe([
-    sortObjectBy(eslintBaseConfigProperties),
-    overProperty("env", sortObject),
-    overProperty("globals", sortObject),
-    overProperty(
-      "overrides",
-      onArray((overrides) => overrides.map(sortEslintConfig))
-    ),
-    overProperty("parserOptions", sortObject),
-    overProperty(
-      "rules",
-      sortObjectBy(
-        (rule1, rule2) => rule1.split("/").length - rule2.split("/").length || rule1.localeCompare(rule2)
-      )
-    ),
-    overProperty("settings", sortObject)
-  ])
-);
+var sortEslintConfig = pipe([
+  sortObjectBy(eslintBaseConfigProperties),
+  overProperty("env", sortObject),
+  overProperty("globals", sortObject),
+  overProperty(
+    "overrides",
+    onArray((overrides) => overrides.map(sortEslintConfig))
+  ),
+  overProperty("parserOptions", sortObject),
+  overProperty(
+    "rules",
+    sortObjectBy(
+      (rule1, rule2) => rule1.split("/").length - rule2.split("/").length || rule1.localeCompare(rule2)
+    )
+  ),
+  overProperty("settings", sortObject)
+]);
 var sortVSCodeBadgeObject = sortObjectBy(["description", "url", "href"]);
-var sortPrettierConfig = onObject(
-  pipe([
-    // sort keys alphabetically, but put `overrides` at bottom
+var sortPrettierConfig = pipe([
+  // sort keys alphabetically, but put `overrides` at bottom
+  onObject(
     (config) => sortObjectByKeyNameList(config, [
       ...Object.keys(config).filter((key) => key !== "overrides").sort(),
       "overrides"
-    ]),
-    // if `config.overrides` exists
-    overProperty(
-      "overrides",
-      // and `config.overrides` is an array
-      onArray(
-        (overrides) => overrides.map(
-          pipe([
-            // sort `config.overrides[]` alphabetically
-            sortObject,
-            // sort `config.overrides[].options` alphabetically
-            overProperty("options", sortObject)
-          ])
-        )
+    ])
+  ),
+  // if `config.overrides` exists
+  overProperty(
+    "overrides",
+    // and `config.overrides` is an array
+    onArray(
+      (overrides) => overrides.map(
+        pipe([
+          // sort `config.overrides[]` alphabetically
+          sortObject,
+          // sort `config.overrides[].options` alphabetically
+          overProperty("options", sortObject)
+        ])
       )
     )
-  ])
-);
+  )
+]);
 var sortVolta = sortObjectBy(["node", "npm", "yarn"]);
+var sortDevEngines = overProperty(
+  "packageManager",
+  sortObjectBy(["name", "version", "onFail"])
+);
 var pnpmBaseConfigProperties = [
   "peerDependencyRules",
   "neverBuiltDependencies",
@@ -1539,12 +1581,10 @@ var pnpmBaseConfigProperties = [
   "patchedDependencies",
   "packageExtensions"
 ];
-var sortPnpmConfig = onObject(
-  pipe([
-    sortObjectBy(pnpmBaseConfigProperties, true),
-    overProperty("overrides", sortObjectBySemver)
-  ])
-);
+var sortPnpmConfig = pipe([
+  sortObjectBy(pnpmBaseConfigProperties, true),
+  overProperty("overrides", sortObjectBySemver)
+]);
 var defaultNpmScripts = /* @__PURE__ */ new Set([
   "install",
   "pack",
@@ -1577,7 +1617,7 @@ function sortScriptNames(keys, prefix = "") {
   for (const key of keys) {
     const rest = prefix ? key.slice(prefix.length + 1) : key;
     const idx = rest.indexOf(":");
-    if (idx !== -1) {
+    if (idx > 0) {
       const base = key.slice(0, (prefix ? prefix.length + 1 : 0) + idx);
       if (!groupMap.has(base)) groupMap.set(base, []);
       groupMap.get(base).push(key);
@@ -1750,14 +1790,14 @@ var fields = [
   { key: "tap", over: sortObject },
   { key: "oclif", over: sortObjectBy(void 0, true) },
   { key: "resolutions", over: sortObject },
-  { key: "overrides", over: sortDependenciesLikeNpm },
-  { key: "dependencies", over: sortDependenciesLikeNpm },
-  { key: "devDependencies", over: sortDependenciesLikeNpm },
+  { key: "overrides", over: sortDependencies },
+  { key: "dependencies", over: sortDependencies },
+  { key: "devDependencies", over: sortDependencies },
   { key: "dependenciesMeta", over: sortObjectBy(sortObjectByIdent, true) },
-  { key: "peerDependencies", over: sortDependenciesLikeNpm },
+  { key: "peerDependencies", over: sortDependencies },
   // TODO: only sort depth = 2
   { key: "peerDependenciesMeta", over: sortObjectBy(void 0, true) },
-  { key: "optionalDependencies", over: sortDependenciesLikeNpm },
+  { key: "optionalDependencies", over: sortDependencies },
   { key: "bundledDependencies", over: uniqAndSortArray },
   { key: "bundleDependencies", over: uniqAndSortArray },
   /* vscode */
@@ -1768,6 +1808,7 @@ var fields = [
   { key: "packageManager" },
   { key: "engines", over: sortObject },
   { key: "engineStrict", over: sortObject },
+  { key: "devEngines", over: sortDevEngines },
   { key: "volta", over: sortVolta },
   { key: "languageName" },
   { key: "os" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-validate/prettier-config",
-  "version": "3.1.11",
+  "version": "3.1.12",
   "description": "Prettier sharable config used by the various HTML-validate packages",
   "keywords": [
     "prettier"