@html-validate/prettier-config 3.1.7 → 3.1.8

package/dist/sort-package-json.mjs

@@ -24,28 +24,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/sort-object-keys/index.js
-var require_sort_object_keys = __commonJS({
-  "node_modules/sort-object-keys/index.js"(exports, module) {
-    module.exports = function sortObjectByKeyNameList(object, sortWith) {
-      var keys;
-      var sortFn;
-      if (typeof sortWith === "function") {
-        sortFn = sortWith;
-      } else {
-        keys = sortWith;
-      }
-      var objectKeys = Object.keys(object);
-      return (keys || []).concat(objectKeys.sort(sortFn)).reduce(function(total, key) {
-        if (objectKeys.indexOf(key) !== -1) {
-          total[key] = object[key];
-        }
-        return total;
-      }, /* @__PURE__ */ Object.create(null));
-    };
-  }
-});
-
 // node_modules/sort-package-json/node_modules/semver/internal/constants.js
 var require_constants = __commonJS({
   "node_modules/sort-package-json/node_modules/semver/internal/constants.js"(exports, module) {
@@ -1979,8 +1957,24 @@ var require_semver2 = __commonJS({
 // src/sort-package-json.ts
 import { parsers } from "prettier/esm/parser-babel.mjs";
 
-// node_modules/sort-package-json/index.js
-var import_sort_object_keys = __toESM(require_sort_object_keys(), 1);
+// node_modules/sort-object-keys/index.js
+var has = (object, key) => Object.prototype.hasOwnProperty.call(object, key);
+function sortObjectByKeyNameList(object, sortWith) {
+  let keys, sortFn, key;
+  if (typeof sortWith === "function") {
+    sortFn = sortWith;
+  } else {
+    keys = sortWith;
+  }
+  const total = {};
+  const objectKeys = [...keys ?? [], ...Object.keys(object).sort(sortFn)];
+  for (key of objectKeys) {
+    if (has(object, key)) {
+      total[key] = object[key];
+    }
+  }
+  return total;
+}
 
 // node_modules/detect-indent/index.js
 var INDENT_REGEX = /^(?:( )+|\t+)/;
@@ -2156,10 +2150,26 @@ var sortObjectBy = (comparator, deep) => {
         Object.entries(object).map(([key, value]) => [key, over(value)])
       );
     }
-    return (0, import_sort_object_keys.default)(object, comparator);
+    return sortObjectByKeyNameList(object, comparator);
   });
   return over;
 };
+var objectGroupBy = (
+  // 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 = /* @__PURE__ */ Object.create(null);
+    for (const value of array) {
+      const key = callback(value);
+      if (result[key]) {
+        result[key].push(value);
+      } else {
+        result[key] = [value];
+      }
+    }
+    return result;
+  })
+);
 var sortObject = sortObjectBy();
 var sortURLObject = sortObjectBy(["type", "url"]);
 var sortPeopleObject = sortObjectBy(["name", "email", "url"]);
@@ -2272,7 +2282,7 @@ var sortVSCodeBadgeObject = sortObjectBy(["description", "url", "href"]);
 var sortPrettierConfig = onObject(
   pipe([
     // sort keys alphabetically, but put `overrides` at bottom
-    (config) => (0, import_sort_object_keys.default)(config, [
+    (config) => sortObjectByKeyNameList(config, [
       ...Object.keys(config).filter((key) => key !== "overrides").sort(),
       "overrides"
     ]),
@@ -2359,7 +2369,35 @@ var sortScripts = onObject((scripts, packageJson) => {
   const order = keys.flatMap(
     (key) => prefixable.has(key) ? [`pre${key}`, key, `post${key}`] : [key]
   );
-  return (0, import_sort_object_keys.default)(scripts, order);
+  return sortObjectByKeyNameList(scripts, order);
+});
+var sortConditions = (conditions) => {
+  const {
+    typesConditions = [],
+    defaultConditions = [],
+    restConditions = []
+  } = objectGroupBy(conditions, (condition) => {
+    if (condition === "types" || condition.startsWith("types@")) {
+      return "typesConditions";
+    }
+    if (condition === "default") {
+      return "defaultConditions";
+    }
+    return "restConditions";
+  });
+  return [...typesConditions, ...restConditions, ...defaultConditions];
+};
+var sortExports = onObject((exports) => {
+  const { paths = [], conditions = [] } = objectGroupBy(
+    Object.keys(exports),
+    (key) => key.startsWith(".") ? "paths" : "conditions"
+  );
+  return Object.fromEntries(
+    [...paths, ...sortConditions(conditions)].map((key) => [
+      key,
+      sortExports(exports[key])
+    ])
+  );
 });
 var fields = [
   { key: "$schema" },
@@ -2395,7 +2433,7 @@ var fields = [
   { key: "sideEffects" },
   { key: "type" },
   { key: "imports" },
-  { key: "exports" },
+  { key: "exports", over: sortExports },
   { key: "main" },
   { key: "svelte" },
   { key: "umd:main" },
@@ -2548,7 +2586,7 @@ function sortPackageJson(jsonIsh, options = {}) {
           ...privateKeys.sort()
         ];
       }
-      return overFields((0, import_sort_object_keys.default)(json, sortOrder), json);
+      return overFields(sortObjectByKeyNameList(json, sortOrder), json);
     })
   );
 }
@@ -2562,9 +2600,9 @@ var plugin = {
   parsers: {
     "json-stringify": {
       ...parser,
-      preprocess(text, options) {
+      async preprocess(text, options) {
         if (parser.preprocess) {
-          text = parser.preprocess(text, options);
+          text = await parser.preprocess(text, options);
         }
         return testPath(options.filepath) ? sortPackageJson(text) : text;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-validate/prettier-config",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "Prettier sharable config used by the various HTML-validate packages",
   "keywords": [
     "prettier"
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "lint-staged": "16.2.7",
-    "prettier": "3.6.2"
+    "prettier": "3.7.2"
   },
   "engines": {
     "node": ">= 20.18"