@storm-software/linting-tools 1.134.85 → 1.134.87

package/bin/lint.cjs

@@ -2156,11 +2156,13 @@ function getConfig(workspaceRoot, skipLogs = false) {
 }
 
 // src/cli/index.ts
+var _getpackages = require('@manypkg/get-packages');
 var _checkdependencyversionconsistency = require('check-dependency-version-consistency');
 var _commander = require('commander');
 var _cspell = require('cspell');
 var _dpdm = require('dpdm');
 
+
 // ../../node_modules/.pnpm/actions-up@1.14.3_patch_hash=32dd3e797cb77f0406d81b94e597936599efa23c9bcf8f982de295457d4be41e/node_modules/actions-up/dist/core/ast/update/apply-updates.js
 
 async function n(n15) {
@@ -3762,7 +3764,7 @@ async function validateUser(gh, username) {
 // ../../node_modules/.pnpm/@manypkg+cli@0.25.1_patch_hash=93a1356678f1b712ee39c9629d429415839d8bc40fe1facac7203d8696155a45/node_modules/@manypkg/cli/dist/manypkg-cli.js
 var _picocolors = require('picocolors'); var _picocolors2 = _interopRequireDefault(_picocolors);
 var _util = require('util'); var _util2 = _interopRequireDefault(_util);
-var _getpackages = require('@manypkg/get-packages');
+
 
 
 var _sembear = require('sembear');
@@ -4486,7 +4488,25 @@ async function execCmd(args) {
       });
     })
   );
-  throw new Error(`Command ${args[0]} failed with exit code ${highestExitCode}`);
+  throw new Error(
+    `Command ${args[0]} failed with exit code ${highestExitCode}`
+  );
+}
+async function formatPackageJsonFiles(config, files, cwd) {
+  if (files.length === 0) {
+    return;
+  }
+  try {
+    await runAsync(
+      config,
+      `${_nullishCoalesce(config.packageManager, () => ( "pnpm"))} exec prettier --write --ignore-unknown ${files.map((file) => JSON.stringify(file)).join(" ")}`,
+      cwd
+    );
+  } catch (e25) {
+    console.warn(
+      `\u26A0\uFE0F Unable to format the fixed package.json files with Prettier: ${_optionalChain([e25, 'optionalAccess', _130 => _130.message])}`
+    );
+  }
 }
 var MANY_PKG_TYPE_OPTIONS = [
   "fix",
@@ -4521,7 +4541,7 @@ async function runManypkg(config, manypkgType = "fix", manypkgArgs) {
   const options = {
     defaultBranch: "main",
     workspaceProtocol: "require",
-    ..._optionalChain([rootPackage, 'optionalAccess', _130 => _130.packageJson, 'access', _131 => _131.manypkg])
+    ..._optionalChain([rootPackage, 'optionalAccess', _131 => _131.packageJson, 'access', _132 => _132.manypkg])
   };
   const packagesByName = new Map(
     packages.map((x) => [x.packageJson.name, x])
@@ -4530,6 +4550,12 @@ async function runManypkg(config, manypkgType = "fix", manypkgArgs) {
   if (rootPackage) {
     packagesByName.set(rootPackage.packageJson.name, rootPackage);
   }
+  const original = new Map(
+    [...packagesByName].map(([name, x]) => [
+      name,
+      JSON.stringify(x.packageJson)
+    ])
+  );
   const { hasErrored, requiresInstall } = runChecks(
     packagesByName,
     rootPackage,
@@ -4537,10 +4563,14 @@ async function runManypkg(config, manypkgType = "fix", manypkgArgs) {
     options
   );
   if (manypkgType === "fix") {
-    await Promise.all(
-      [...packagesByName].map(([_, workspace]) => {
-        writePackage(workspace);
-      })
+    const changed = [...packagesByName].filter(
+      ([name, x]) => original.get(name) !== JSON.stringify(x.packageJson)
+    ).map(([, x]) => x);
+    await Promise.all(changed.map(async (x) => writePackage(x)));
+    await formatPackageJsonFiles(
+      config,
+      changed.map((x) => `${x.dir}/package.json`),
+      rootDir
     );
     if (requiresInstall) {
       console.log(`Running install in ${rootDir}...`);
@@ -4896,6 +4926,13 @@ async function depsVersionAction({
       `${brandIcon(_config)}  Linting the workspace dependency version consistency`,
       _config
     );
+    const { packages, rootPackage, rootDir } = _getpackages.getPackagesSync.call(void 0, ".");
+    const original = new Map(
+      [...packages, ...rootPackage ? [rootPackage] : []].map((x) => {
+        const file = `${x.dir}/package.json`;
+        return [file, _fs.readFileSync.call(void 0, file, "utf8")];
+      })
+    );
     const cdvc = new (0, _checkdependencyversionconsistency.CDVC)(".", {
       fix: true,
       ignoreDep: ignoreDepsVersion,
@@ -4904,6 +4941,11 @@ async function depsVersionAction({
     });
     if (cdvc.hasMismatchingDependenciesFixable) {
       writeDebug(cdvc.toFixedSummary(), _config);
+      await formatPackageJsonFiles(
+        _config,
+        [...original].filter(([file, content]) => _fs.readFileSync.call(void 0, file, "utf8") !== content).map(([file]) => file),
+        rootDir
+      );
     }
     if (cdvc.hasMismatchingDependenciesNotFixable) {
       throw new Error(cdvc.toMismatchSummary());
@@ -5029,7 +5071,7 @@ void (async () => {
   } catch (error2) {
     writeFatal(
       `A fatal error occurred while running the Storm Lint tool:
-${_optionalChain([error2, 'optionalAccess', _132 => _132.message]) ? error2.message : JSON.stringify(error2)}${_optionalChain([error2, 'optionalAccess', _133 => _133.stack]) ? `
+${_optionalChain([error2, 'optionalAccess', _133 => _133.message]) ? error2.message : JSON.stringify(error2)}${_optionalChain([error2, 'optionalAccess', _134 => _134.stack]) ? `
 Stack Trace: ${error2.stack}` : ""}`,
       config
     );

package/bin/lint.js

@@ -2156,10 +2156,12 @@ function getConfig(workspaceRoot, skipLogs = false) {
 }
 
 // src/cli/index.ts
+import { getPackagesSync } from "@manypkg/get-packages";
 import { CDVC } from "check-dependency-version-consistency";
 import { Command } from "commander";
 import { lint } from "cspell";
 import { parseCircular, parseDependencyTree, prettyCircular } from "dpdm";
+import { readFileSync } from "node:fs";
 
 // ../../node_modules/.pnpm/actions-up@1.14.3_patch_hash=32dd3e797cb77f0406d81b94e597936599efa23c9bcf8f982de295457d4be41e/node_modules/actions-up/dist/core/ast/update/apply-updates.js
 import { readFile as e, writeFile as t } from "node:fs/promises";
@@ -4486,7 +4488,25 @@ async function execCmd(args) {
       });
     })
   );
-  throw new Error(`Command ${args[0]} failed with exit code ${highestExitCode}`);
+  throw new Error(
+    `Command ${args[0]} failed with exit code ${highestExitCode}`
+  );
+}
+async function formatPackageJsonFiles(config, files, cwd) {
+  if (files.length === 0) {
+    return;
+  }
+  try {
+    await runAsync(
+      config,
+      `${config.packageManager ?? "pnpm"} exec prettier --write --ignore-unknown ${files.map((file) => JSON.stringify(file)).join(" ")}`,
+      cwd
+    );
+  } catch (e25) {
+    console.warn(
+      `\u26A0\uFE0F Unable to format the fixed package.json files with Prettier: ${e25?.message}`
+    );
+  }
 }
 var MANY_PKG_TYPE_OPTIONS = [
   "fix",
@@ -4530,6 +4550,12 @@ async function runManypkg(config, manypkgType = "fix", manypkgArgs) {
   if (rootPackage) {
     packagesByName.set(rootPackage.packageJson.name, rootPackage);
   }
+  const original = new Map(
+    [...packagesByName].map(([name, x]) => [
+      name,
+      JSON.stringify(x.packageJson)
+    ])
+  );
   const { hasErrored, requiresInstall } = runChecks(
     packagesByName,
     rootPackage,
@@ -4537,10 +4563,14 @@ async function runManypkg(config, manypkgType = "fix", manypkgArgs) {
     options
   );
   if (manypkgType === "fix") {
-    await Promise.all(
-      [...packagesByName].map(([_, workspace]) => {
-        writePackage(workspace);
-      })
+    const changed = [...packagesByName].filter(
+      ([name, x]) => original.get(name) !== JSON.stringify(x.packageJson)
+    ).map(([, x]) => x);
+    await Promise.all(changed.map(async (x) => writePackage(x)));
+    await formatPackageJsonFiles(
+      config,
+      changed.map((x) => `${x.dir}/package.json`),
+      rootDir
     );
     if (requiresInstall) {
       console.log(`Running install in ${rootDir}...`);
@@ -4896,6 +4926,13 @@ async function depsVersionAction({
       `${brandIcon(_config)}  Linting the workspace dependency version consistency`,
       _config
     );
+    const { packages, rootPackage, rootDir } = getPackagesSync(".");
+    const original = new Map(
+      [...packages, ...rootPackage ? [rootPackage] : []].map((x) => {
+        const file = `${x.dir}/package.json`;
+        return [file, readFileSync(file, "utf8")];
+      })
+    );
     const cdvc = new CDVC(".", {
       fix: true,
       ignoreDep: ignoreDepsVersion,
@@ -4904,6 +4941,11 @@ async function depsVersionAction({
     });
     if (cdvc.hasMismatchingDependenciesFixable) {
       writeDebug(cdvc.toFixedSummary(), _config);
+      await formatPackageJsonFiles(
+        _config,
+        [...original].filter(([file, content]) => readFileSync(file, "utf8") !== content).map(([file]) => file),
+        rootDir
+      );
     }
     if (cdvc.hasMismatchingDependenciesNotFixable) {
       throw new Error(cdvc.toMismatchSummary());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/linting-tools",
-  "version": "1.134.85",
+  "version": "1.134.87",
   "private": false,
   "description": "⚡ A package containing various linting tools used to validate syntax, enforce design standards, and format code in a Storm workspace.",
   "keywords": [
@@ -162,5 +162,5 @@
     "tsup": "8.4.0"
   },
   "publishConfig": { "access": "public" },
-  "gitHead": "0ec9d8df83892574533d32d36603d46a667c0932"
+  "gitHead": "b146c778f114b18b4a31981e037fc030bfe31f9d"
 }