@forsakringskassan/prettier-config 3.5.0 → 3.6.2

package/dist/index.cjs

@@ -824,6 +824,7 @@ var require_range = __commonJS({
         return this.range;
       }
       parseRange(range) {
+        range = range.replace(BUILDSTRIPRE, "");
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
         const cached = cache2.get(memoKey);
@@ -906,12 +907,14 @@ var require_range = __commonJS({
     var SemVer = require_semver();
     var {
       safeRe: re,
+      src,
       t,
       comparatorTrimReplace,
       tildeTrimReplace,
       caretTrimReplace
     } = require_re();
     var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+    var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
     var isNullSet = (c) => c.value === "<0.0.0-0";
     var isAny = (c) => c.value === "";
     var isSatisfiable = (comparators, options) => {
@@ -1401,22 +1404,6 @@ var sortObjectBy = (comparator, deep) => {
   });
   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"]);
@@ -1575,6 +1562,41 @@ var sortPrettierConfig = pipe([
   )
 ]);
 var sortVolta = sortObjectBy(["node", "npm", "yarn"]);
+var wireitScriptProperties = ["command", "dependencies", "files", "output"];
+var sortWireitScript = pipe([
+  sortObjectBy(wireitScriptProperties),
+  overProperty(
+    "dependencies",
+    onArray((deps) => deps.map(sortObjectBy(["script", "cascade"])))
+  ),
+  overProperty(
+    "env",
+    onObject(
+      (env) => sortObjectByKeyNameList(
+        Object.fromEntries(
+          Object.entries(env).map(([key, value]) => [
+            key,
+            sortObjectBy(["external", "default"])(value)
+          ])
+        )
+      )
+    )
+  ),
+  overProperty(
+    "service",
+    pipe([sortObjectBy(["readyWhen"]), overProperty("readyWhen", sortObject)])
+  )
+]);
+var sortWireit = onObject(
+  (wireit) => sortObjectByKeyNameList(
+    Object.fromEntries(
+      Object.entries(wireit).map(([name, config2]) => [
+        name,
+        sortWireitScript(config2)
+      ])
+    )
+  )
+);
 var sortDevEngines = overProperty(
   "packageManager",
   sortObjectBy(["name", "version", "onFail"])
@@ -1669,7 +1691,7 @@ var sortScripts = onObject((scripts, packageJson) => {
   return sortObjectByKeyNameList(scripts, names);
 });
 var sortConditions = (conditions) => {
-  const { defaultConditions = [], restConditions = [] } = objectGroupBy(
+  const { defaultConditions = [], restConditions = [] } = Object.groupBy(
     conditions,
     (condition) => {
       if (condition === "default") {
@@ -1681,7 +1703,7 @@ var sortConditions = (conditions) => {
   return [...restConditions, ...defaultConditions];
 };
 var sortExports = onObject((exports2) => {
-  const { paths = [], conditions = [] } = objectGroupBy(
+  const { paths = [], conditions = [] } = Object.groupBy(
     Object.keys(exports2),
     (key) => key.startsWith(".") ? "paths" : "conditions"
   );
@@ -1762,6 +1784,7 @@ var fields = [
   },
   { key: "scripts", over: sortScripts },
   { key: "betterScripts", over: sortScripts },
+  { key: "wireit", over: sortWireit },
   /* vscode */
   { key: "l10n" },
   /* vscode */
@@ -1864,7 +1887,7 @@ function sortPackageJson(jsonIsh, options = {}) {
       let sortOrder = options.sortOrder || defaultSortOrder;
       if (Array.isArray(sortOrder)) {
         const keys = Object.keys(json);
-        const { privateKeys = [], publicKeys = [] } = objectGroupBy(
+        const { privateKeys = [], publicKeys = [] } = Object.groupBy(
           keys,
           (key) => key[0] === "_" ? "privateKeys" : "publicKeys"
         );

package/dist/index.mjs

@@ -818,6 +818,7 @@ var require_range = __commonJS({
         return this.range;
       }
       parseRange(range) {
+        range = range.replace(BUILDSTRIPRE, "");
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
         const cached = cache2.get(memoKey);
@@ -900,12 +901,14 @@ var require_range = __commonJS({
     var SemVer = require_semver();
     var {
       safeRe: re,
+      src,
       t,
       comparatorTrimReplace,
       tildeTrimReplace,
       caretTrimReplace
     } = require_re();
     var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+    var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
     var isNullSet = (c) => c.value === "<0.0.0-0";
     var isAny = (c) => c.value === "";
     var isSatisfiable = (comparators, options) => {
@@ -1388,22 +1391,6 @@ var sortObjectBy = (comparator, deep) => {
   });
   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"]);
@@ -1562,6 +1549,41 @@ var sortPrettierConfig = pipe([
   )
 ]);
 var sortVolta = sortObjectBy(["node", "npm", "yarn"]);
+var wireitScriptProperties = ["command", "dependencies", "files", "output"];
+var sortWireitScript = pipe([
+  sortObjectBy(wireitScriptProperties),
+  overProperty(
+    "dependencies",
+    onArray((deps) => deps.map(sortObjectBy(["script", "cascade"])))
+  ),
+  overProperty(
+    "env",
+    onObject(
+      (env) => sortObjectByKeyNameList(
+        Object.fromEntries(
+          Object.entries(env).map(([key, value]) => [
+            key,
+            sortObjectBy(["external", "default"])(value)
+          ])
+        )
+      )
+    )
+  ),
+  overProperty(
+    "service",
+    pipe([sortObjectBy(["readyWhen"]), overProperty("readyWhen", sortObject)])
+  )
+]);
+var sortWireit = onObject(
+  (wireit) => sortObjectByKeyNameList(
+    Object.fromEntries(
+      Object.entries(wireit).map(([name, config2]) => [
+        name,
+        sortWireitScript(config2)
+      ])
+    )
+  )
+);
 var sortDevEngines = overProperty(
   "packageManager",
   sortObjectBy(["name", "version", "onFail"])
@@ -1656,7 +1678,7 @@ var sortScripts = onObject((scripts, packageJson) => {
   return sortObjectByKeyNameList(scripts, names);
 });
 var sortConditions = (conditions) => {
-  const { defaultConditions = [], restConditions = [] } = objectGroupBy(
+  const { defaultConditions = [], restConditions = [] } = Object.groupBy(
     conditions,
     (condition) => {
       if (condition === "default") {
@@ -1668,7 +1690,7 @@ var sortConditions = (conditions) => {
   return [...restConditions, ...defaultConditions];
 };
 var sortExports = onObject((exports) => {
-  const { paths = [], conditions = [] } = objectGroupBy(
+  const { paths = [], conditions = [] } = Object.groupBy(
     Object.keys(exports),
     (key) => key.startsWith(".") ? "paths" : "conditions"
   );
@@ -1749,6 +1771,7 @@ var fields = [
   },
   { key: "scripts", over: sortScripts },
   { key: "betterScripts", over: sortScripts },
+  { key: "wireit", over: sortWireit },
   /* vscode */
   { key: "l10n" },
   /* vscode */
@@ -1851,7 +1874,7 @@ function sortPackageJson(jsonIsh, options = {}) {
       let sortOrder = options.sortOrder || defaultSortOrder;
       if (Array.isArray(sortOrder)) {
         const keys = Object.keys(json);
-        const { privateKeys = [], publicKeys = [] } = objectGroupBy(
+        const { privateKeys = [], publicKeys = [] } = Object.groupBy(
           keys,
           (key) => key[0] === "_" ? "privateKeys" : "publicKeys"
         );

package/dist/sort-package-json.cjs

@@ -824,6 +824,7 @@ var require_range = __commonJS({
         return this.range;
       }
       parseRange(range) {
+        range = range.replace(BUILDSTRIPRE, "");
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
         const cached = cache2.get(memoKey);
@@ -906,12 +907,14 @@ var require_range = __commonJS({
     var SemVer = require_semver();
     var {
       safeRe: re,
+      src,
       t,
       comparatorTrimReplace,
       tildeTrimReplace,
       caretTrimReplace
     } = require_re();
     var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+    var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
     var isNullSet = (c) => c.value === "<0.0.0-0";
     var isAny = (c) => c.value === "";
     var isSatisfiable = (comparators, options) => {
@@ -1399,22 +1402,6 @@ var sortObjectBy = (comparator, deep) => {
   });
   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"]);
@@ -1573,6 +1560,41 @@ var sortPrettierConfig = pipe([
   )
 ]);
 var sortVolta = sortObjectBy(["node", "npm", "yarn"]);
+var wireitScriptProperties = ["command", "dependencies", "files", "output"];
+var sortWireitScript = pipe([
+  sortObjectBy(wireitScriptProperties),
+  overProperty(
+    "dependencies",
+    onArray((deps) => deps.map(sortObjectBy(["script", "cascade"])))
+  ),
+  overProperty(
+    "env",
+    onObject(
+      (env) => sortObjectByKeyNameList(
+        Object.fromEntries(
+          Object.entries(env).map(([key, value]) => [
+            key,
+            sortObjectBy(["external", "default"])(value)
+          ])
+        )
+      )
+    )
+  ),
+  overProperty(
+    "service",
+    pipe([sortObjectBy(["readyWhen"]), overProperty("readyWhen", sortObject)])
+  )
+]);
+var sortWireit = onObject(
+  (wireit) => sortObjectByKeyNameList(
+    Object.fromEntries(
+      Object.entries(wireit).map(([name, config]) => [
+        name,
+        sortWireitScript(config)
+      ])
+    )
+  )
+);
 var sortDevEngines = overProperty(
   "packageManager",
   sortObjectBy(["name", "version", "onFail"])
@@ -1667,7 +1689,7 @@ var sortScripts = onObject((scripts, packageJson) => {
   return sortObjectByKeyNameList(scripts, names);
 });
 var sortConditions = (conditions) => {
-  const { defaultConditions = [], restConditions = [] } = objectGroupBy(
+  const { defaultConditions = [], restConditions = [] } = Object.groupBy(
     conditions,
     (condition) => {
       if (condition === "default") {
@@ -1679,7 +1701,7 @@ var sortConditions = (conditions) => {
   return [...restConditions, ...defaultConditions];
 };
 var sortExports = onObject((exports2) => {
-  const { paths = [], conditions = [] } = objectGroupBy(
+  const { paths = [], conditions = [] } = Object.groupBy(
     Object.keys(exports2),
     (key) => key.startsWith(".") ? "paths" : "conditions"
   );
@@ -1760,6 +1782,7 @@ var fields = [
   },
   { key: "scripts", over: sortScripts },
   { key: "betterScripts", over: sortScripts },
+  { key: "wireit", over: sortWireit },
   /* vscode */
   { key: "l10n" },
   /* vscode */
@@ -1862,7 +1885,7 @@ function sortPackageJson(jsonIsh, options = {}) {
       let sortOrder = options.sortOrder || defaultSortOrder;
       if (Array.isArray(sortOrder)) {
         const keys = Object.keys(json);
-        const { privateKeys = [], publicKeys = [] } = objectGroupBy(
+        const { privateKeys = [], publicKeys = [] } = Object.groupBy(
           keys,
           (key) => key[0] === "_" ? "privateKeys" : "publicKeys"
         );

package/dist/sort-package-json.mjs

@@ -818,6 +818,7 @@ var require_range = __commonJS({
         return this.range;
       }
       parseRange(range) {
+        range = range.replace(BUILDSTRIPRE, "");
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
         const cached = cache2.get(memoKey);
@@ -900,12 +901,14 @@ var require_range = __commonJS({
     var SemVer = require_semver();
     var {
       safeRe: re,
+      src,
       t,
       comparatorTrimReplace,
       tildeTrimReplace,
       caretTrimReplace
     } = require_re();
     var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+    var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
     var isNullSet = (c) => c.value === "<0.0.0-0";
     var isAny = (c) => c.value === "";
     var isSatisfiable = (comparators, options) => {
@@ -1388,22 +1391,6 @@ var sortObjectBy = (comparator, deep) => {
   });
   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"]);
@@ -1562,6 +1549,41 @@ var sortPrettierConfig = pipe([
   )
 ]);
 var sortVolta = sortObjectBy(["node", "npm", "yarn"]);
+var wireitScriptProperties = ["command", "dependencies", "files", "output"];
+var sortWireitScript = pipe([
+  sortObjectBy(wireitScriptProperties),
+  overProperty(
+    "dependencies",
+    onArray((deps) => deps.map(sortObjectBy(["script", "cascade"])))
+  ),
+  overProperty(
+    "env",
+    onObject(
+      (env) => sortObjectByKeyNameList(
+        Object.fromEntries(
+          Object.entries(env).map(([key, value]) => [
+            key,
+            sortObjectBy(["external", "default"])(value)
+          ])
+        )
+      )
+    )
+  ),
+  overProperty(
+    "service",
+    pipe([sortObjectBy(["readyWhen"]), overProperty("readyWhen", sortObject)])
+  )
+]);
+var sortWireit = onObject(
+  (wireit) => sortObjectByKeyNameList(
+    Object.fromEntries(
+      Object.entries(wireit).map(([name, config]) => [
+        name,
+        sortWireitScript(config)
+      ])
+    )
+  )
+);
 var sortDevEngines = overProperty(
   "packageManager",
   sortObjectBy(["name", "version", "onFail"])
@@ -1656,7 +1678,7 @@ var sortScripts = onObject((scripts, packageJson) => {
   return sortObjectByKeyNameList(scripts, names);
 });
 var sortConditions = (conditions) => {
-  const { defaultConditions = [], restConditions = [] } = objectGroupBy(
+  const { defaultConditions = [], restConditions = [] } = Object.groupBy(
     conditions,
     (condition) => {
       if (condition === "default") {
@@ -1668,7 +1690,7 @@ var sortConditions = (conditions) => {
   return [...restConditions, ...defaultConditions];
 };
 var sortExports = onObject((exports) => {
-  const { paths = [], conditions = [] } = objectGroupBy(
+  const { paths = [], conditions = [] } = Object.groupBy(
     Object.keys(exports),
     (key) => key.startsWith(".") ? "paths" : "conditions"
   );
@@ -1749,6 +1771,7 @@ var fields = [
   },
   { key: "scripts", over: sortScripts },
   { key: "betterScripts", over: sortScripts },
+  { key: "wireit", over: sortWireit },
   /* vscode */
   { key: "l10n" },
   /* vscode */
@@ -1851,7 +1874,7 @@ function sortPackageJson(jsonIsh, options = {}) {
       let sortOrder = options.sortOrder || defaultSortOrder;
       if (Array.isArray(sortOrder)) {
         const keys = Object.keys(json);
-        const { privateKeys = [], publicKeys = [] } = objectGroupBy(
+        const { privateKeys = [], publicKeys = [] } = Object.groupBy(
           keys,
           (key) => key[0] === "_" ? "privateKeys" : "publicKeys"
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forsakringskassan/prettier-config",
-  "version": "3.5.0",
+  "version": "3.6.2",
   "description": "FK Prettier Config",
   "keywords": [
     "prettier"
@@ -40,5 +40,5 @@
     "node": "^22.16 || >= 24",
     "npm": ">= 9"
   },
-  "gitHead": "8ed39043fb567574a030a4c4fbc719548911139d"
+  "gitHead": "a5a8b5f4f783ba2524b87fc8c8b78ebebc02bc23"
 }