dependency-cruiser 17.3.5 → 17.3.7

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2025 Sander Verweij
+Copyright (c) 2016-2026 Sander Verweij
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dependency-cruiser",
-	"version": "17.3.5",
+	"version": "17.3.7",
 	"description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
 	"keywords": [
 		"static analysis",
@@ -131,8 +131,8 @@
 		"configs/plugins/",
 		"src",
 		"!src/**/*.json",
-		"!src/**/*.ts",
 		"!src/**/*.md",
+		"!src/**/*.ts",
 		"!src/**/*.schema.mjs",
 		"!types/README.md",
 		"!src/schema/README.md",
@@ -154,14 +154,16 @@
 		"interpret": "3.1.1",
 		"is-installed-globally": "1.0.0",
 		"json5": "2.2.3",
-		"memoize": "10.2.0",
 		"picomatch": "4.0.3",
 		"prompts": "2.4.2",
 		"rechoir": "0.8.0",
 		"safe-regex": "2.1.1",
 		"semver": "7.7.3",
 		"tsconfig-paths-webpack-plugin": "4.2.0",
-		"watskeburt": "5.0.0"
+		"watskeburt": "5.0.2"
+	},
+	"overrides": {
+		"baseline-browser-mapping": "^2.9.15"
 	},
 	"engines": {
 		"node": "^20.12||^22||>=24"

package/src/{enrich/enrich-modules.mjs → analyze/analyze-modules.mjs}

@@ -15,7 +15,7 @@ import { bus } from "#utl/bus.mjs";
  * @param {IOptions} pOptions
  * @returns {IModule[]}
  */
-export default function enrichModules(pModules, pOptions) {
+export default function analyzeModules(pModules, pOptions) {
 	bus.info("analyze: cycles");
 
 	let lModules = deriveCycles(pModules, {

package/src/{enrich → analyze}/derive/dependents.mjs

@@ -27,12 +27,23 @@ export function hasDependentsRule(pRuleSet) {
 		(pRuleSet?.allowed ?? []).some(isDependentsRule)
 	);
 }
-
+/**
+ *
+ * @param {Partial<import("../../../types/cruise-result.d.mts").IModule[]>} pModules
+ * @param {import("../../../types/options.d.mts").ICruiseOptions} options
+ * @returns
+ */
 export default function addDependents(
 	pModules,
-	{ skipAnalysisNotInRules, metrics, ruleSet },
+	{ skipAnalysisNotInRules, metrics, ruleSet, reaches, focus },
 ) {
-	if (!skipAnalysisNotInRules || metrics || hasDependentsRule(ruleSet)) {
+	if (
+		!skipAnalysisNotInRules ||
+		metrics ||
+		reaches ||
+		focus ||
+		hasDependentsRule(ruleSet)
+	) {
 		// creating this optimized structure here might seem overkill, but on
 		// large graphs it pays off significantly - creation is a few centiseconds
 		// but it cuts analysis in half on large graphs (and even on smaller

package/src/{enrich → analyze}/index.mjs

@@ -1,4 +1,4 @@
-import enrichModules from "./enrich-modules.mjs";
+import analyzeModules from "./analyze-modules.mjs";
 import aggregateToFolders from "./derive/folders/index.mjs";
 import summarize from "./summarize/index.mjs";
 import { bus } from "#utl/bus.mjs";
@@ -16,8 +16,8 @@ import { bus } from "#utl/bus.mjs";
  * @param {string[]} pFileAndDirectoryArray
  * @returns {import("../../types/dependency-cruiser.js").ICruiseResult}
  */
-export default function enrich(pModules, pOptions, pFileAndDirectoryArray) {
-	const lModules = enrichModules(pModules, pOptions);
+export default function analyze(pModules, pOptions, pFileAndDirectoryArray) {
+	const lModules = analyzeModules(pModules, pOptions);
 	bus.info("analyze: aggregate to folders");
 	const lFolders = aggregateToFolders(lModules, pOptions);
 

package/src/cache/cache.mjs

@@ -31,19 +31,12 @@ const EMPTY_CACHE = {
 		optionsUsed: {},
 	},
 };
-// Bump this to the current major.minor version when the cache format changes in
-// a way that's not backwards compatible.
-// e.g. version 3.0.0 => 3
-//     version 3.1.0 => 3.1
-//     version 3.1.1 => 3.1
-//     version 3.11.0 => 3.11
-// This means we assume breaking cache format versions won't occur
-// in patch releases. If worst case scenario it _is_ necessary we could
-// add the patch version divided by 1000_000 e.g.:
-//     version 3.14.16 => 3.14 + 16/1000_000 = 3.140016
+
+// see ./cache-rationales.md#cache-format-versioning for rationale & bump instructions
 const CACHE_FORMAT_VERSION = 16.2;
 
 export default class Cache {
+	/** @type {(IRevisionData | null)=} */
 	#revisionData;
 	#cacheStrategy;
 	#compress;
@@ -59,7 +52,11 @@ export default class Cache {
 				: new MetadataStrategy();
 		this.#compress = pCompress ?? false;
 	}
-
+	/**
+	 *
+	 * @param {ICruiseResult} pCachedCruiseResult
+	 * @returns {boolean}
+	 */
 	cacheFormatVersionCompatible(pCachedCruiseResult) {
 		return (
 			(pCachedCruiseResult?.revisionData?.cacheFormatVersion ?? 1) >=
@@ -130,22 +127,7 @@ export default class Cache {
 	 */
 	#compact(pPayload, pCompress) {
 		if (pCompress) {
-			/**
-			 * we landed on brotli with BROTLI_MIN_QUALITY because:
-			 * - even with BROTLI_MIN_QUALITY it compresses better than gzip
-			 *   (regardless of compression level)
-			 * - at BROTLI_MIN_QUALITY it's faster than gzip
-			 * - BROTLI_MAX_QUALITY gives a bit better compression but is _much_
-			 *   slower than even gzip
-			 *
-			 * In our situation the sync version is significantly faster than the
-			 * async version + zlib functions need to be promisified before they
-			 * can be used in promises, which will add the to the execution time
-			 * as well.
-			 *
-			 * As sync or async doesn't _really_
-			 * matter for the cli, we're using the sync version here.
-			 */
+			// see ./cache-rationales.md#cache-compression for rationale
 			return brotliCompressSync(pPayload, {
 				params: {
 					[zlibConstants.BROTLI_PARAM_QUALITY]:

package/src/cache/content-strategy.mjs

@@ -17,7 +17,7 @@ import {
 
 /**
  * @param {string} pBaseDirectory
- * @returns {(IModule) => IModule}
+ * @returns {(pModule: IModule) => IModule}
  */
 function addCheckSumToModule(pBaseDirectory) {
 	return (pModule) => {

package/src/cache/helpers.mjs

@@ -2,7 +2,6 @@
 import { createHash } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { extname } from "node:path";
-import memoize from "memoize";
 import { filenameMatchesPattern } from "#graph-utl/match-facade.mjs";
 
 /**
@@ -20,20 +19,31 @@ function hash(pString) {
 	return createHash("sha1").update(pString).digest("base64");
 }
 
+// We should clear this cache when we're done with it (typically: after a cruise
+// is done). Not a big issue for cli use, though, might become one for repeated
+// runs in a long running process (e.g. when used as a library).
+/** @type {Map<string, string>} */
+const HASHES_CACHE = new Map();
+
 /**
  * @param {string} pFileName
  * @returns {string}
  */
-function _getFileHashSync(pFileName) {
+export function getFileHashSync(pFileName) {
+	if (HASHES_CACHE.has(pFileName)) {
+		// @ts-expect-error TS2322 .has already guarantees the pFileName exists, and hence we can't get undefined
+		return HASHES_CACHE.get(pFileName);
+	}
+	let lHashedFileName = "file not found";
 	try {
-		return hash(readFileSync(pFileName, "utf8"));
+		lHashedFileName = hash(readFileSync(pFileName, "utf8"));
 	} catch (pError) {
-		return "file not found";
+		// will return "file not found" as per default
 	}
+	HASHES_CACHE.set(pFileName, lHashedFileName);
+	return lHashedFileName;
 }
 
-export const getFileHashSync = memoize(_getFileHashSync);
-
 /**
  * @param {IChange} pChange
  * @return {IRevisionChange}

package/src/cli/init-config/config-template.mjs

@@ -6,8 +6,8 @@ module.exports = {
       name: 'no-circular',
       severity: 'warn',
       comment:
-        'This dependency is part of a circular relationship. You might want to revise ' +
-        'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ',
+        "This dependency is part of a circular relationship. You might want to revise " +
+        "your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ",
       from: {},
       to: {
         circular: true
@@ -118,19 +118,18 @@ module.exports = {
       from: {},
       to: {
         moreThanOneDependencyType: true,
-        // as it's pretty common to have a type import be a type only import 
-        // _and_ (e.g.) a devDependency - don't consider type-only dependency
-        // types for this rule
+        // as it's common to use a devDependency for type-only imports: don't
+        // consider type-only dependencyTypes for this rule
         dependencyTypesNot: ["type-only"]
       }
     },
 
-    /* rules you might want to tweak for your specific situation: */
+    // rules you might want to tweak for your specific situation:
     {{notToTestRule}}
     {
       name: 'not-to-spec',
       comment:
-        'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' +
+        'This module depends on a spec (test) file. The responsibility of a spec file is to test code. ' +
         "If there's something in a spec that's of use to other modules, it doesn't have that single " +
         'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.',
       severity: 'error',
@@ -172,7 +171,7 @@ module.exports = {
       comment:
         "This module depends on an npm package that is declared as an optional dependency " +
         "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
-        "If you're using an optional dependency here by design - add an exception to your" +
+        "If you use an optional dependency here by design - add an exception to your" +
         "dependency-cruiser configuration.",
       from: {},
       to: {
@@ -198,196 +197,164 @@ module.exports = {
     }
   ],
   options: {
-
-    /* Which modules not to follow further when encountered */
+    // Which modules not to follow further when encountered
     doNotFollow: {
-      /* path: an array of regular expressions in strings to match against */
+      // path: an array of regular expressions in strings to match against
       path: ['node_modules']
     },
 
-    /* Which modules to exclude */
+    // Which modules to exclude
     // exclude : {
-    //   /* path: an array of regular expressions in strings to match against */
+    //   // path: an array of regular expressions in strings to match against
     //   path: '',
     // },
 
-    /* Which modules to exclusively include (array of regular expressions in strings)
-       dependency-cruiser will skip everything not matching this pattern
-    */
+    // Which modules to exclusively include (array of regular expressions in strings)
+    // dependency-cruiser will skip everything that doesn't match this pattern
     // includeOnly : [''],
 
-    /* List of module systems to cruise.
-       When left out dependency-cruiser will fall back to the list of _all_
-       module systems it knows of. It's the default because it's the safe option
-       It might come at a performance penalty, though.
-       moduleSystems: ['amd', 'cjs', 'es6', 'tsd']
-      
-       As in practice only commonjs ('cjs') and ecmascript modules ('es6')
-       are widely used, you can limit the moduleSystems to those.
-     */
-    
+    // List of module systems to cruise.
+    // When left out dependency-cruiser will fall back to the list of _all_
+    // module systems it knows of ('amd', 'cjs', 'es6', 'tsd']). It's the
+    // default because it's the safe option. It comes at a performance penalty, though
+    // As in practice only commonjs ('cjs') and ecmascript modules ('es6')
+    // are in wide use, you can limit the moduleSystems to those.
     // moduleSystems: ['cjs', 'es6'],
 
-    /* 
-      false: don't look at JSDoc imports (the default)
-      true: dependency-cruiser will detect dependencies in JSDoc-style
-      import statements. Implies "parser": "tsc", so the dependency-cruiser
-      will use the typescript parser for JavaScript files.
-     
-      For this to work the typescript compiler will need to be installed in the
-      same spot as you're running dependency-cruiser from.
-     */
+    // false: don't look at JSDoc imports (the default)
+    // true: detect dependencies in JSDoc-style import statements. 
+    // Implies parser: 'tsc', which a.o. means the typescript compiler will need
+    // to be installed in the same spot you run dependency-cruiser from.
     {{detectJSDocImportsAttribute}}
 
-    /*
-      false: don't look at process.getBuiltinModule calls (the default)
-      true: dependency-cruiser will detect calls to process.getBuiltinModule/
-      globalThis.process.getBuiltinModule as imports.
-     */
+    // false: don't look at process.getBuiltinModule calls (the default)
+    // true: dependency-cruiser will detect calls to process.getBuiltinModule/
+    // globalThis.process.getBuiltinModule as imports.
     {{detectProcessBuiltinModuleCalls}}
 
-    /* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/main/'
-       to open it on your online repo or \`vscode://file/$\{process.cwd()}/\` to 
-       open it in visual studio code),
-     */
+    // prefix for links in html, d2, mermaid and dot/ svg output (e.g. 'https://github.com/you/yourrepo/blob/main/'
+    // to open it on your online repo or \`vscode://file/$\{process.cwd()}/\` to 
+    // open it in visual studio code),
     // prefix: \`vscode://file/$\{process.cwd()}/\`,
 
-    /* false (the default): ignore dependencies that only exist before typescript-to-javascript compilation
-       true: also detect dependencies that only exist before typescript-to-javascript compilation
-       "specify": for each dependency identify whether it only exists before compilation or also after
-     */
+    // suffix for links in output. E.g. put .html here if you use it to link to
+    // your coverage reports.
+    // suffix: '.html',
+
+    // false (the default): ignore dependencies that only exist before typescript-to-javascript compilation
+    // true: also detect dependencies that only exist before typescript-to-javascript compilation
+    // 'specify': for each dependency identify whether it only exists before compilation or also after
     {{tsPreCompilationDepsAttribute}}
     
-    /* list of extensions to scan that aren't javascript or compile-to-javascript.
-       Empty by default. Only put extensions in here that you want to take into
-       account that are _not_ parsable.
-    */
-    // extraExtensionsToScan: [".json", ".jpg", ".png", ".svg", ".webp"],
+    // list of extensions to scan that aren't javascript or compile-to-javascript.
+    // Empty by default. Only put extensions in here that you want to take into
+    // account that are _not_ parsable.
+    // extraExtensionsToScan: ['.json', '.jpg', '.png', '.svg', '.webp'],
 
-    /* if true combines the package.jsons found from the module up to the base
-       folder the cruise is initiated from. Useful for how (some) mono-repos
-       manage dependencies & dependency definitions.
-     */
+    // if true combines the package.jsons found from the module up to the base
+    // folder the cruise is initiated from. Useful for how (some) mono-repos
+    // manage dependencies & dependency definitions.
     {{combinedDependenciesAttribute}}
 
-    /* if true leave symlinks untouched, otherwise use the realpath */
+    // if true leave symlinks untouched, otherwise use the realpath
     // preserveSymlinks: false,
 
-    /* TypeScript project file ('tsconfig.json') to use for
-       (1) compilation and
-       (2) resolution (e.g. with the paths property)
-
-       The (optional) fileName attribute specifies which file to take (relative to
-       dependency-cruiser's current working directory). When not provided
-       defaults to './tsconfig.json'.
-     */
+    // TypeScript project file ('tsconfig.json') to use for
+    // (1) compilation and
+    // (2) resolution (e.g. with the paths property)
+    //
+    // The (optional) fileName attribute specifies which file to take (relative to
+    // dependency-cruiser's current working directory). When not provided
+    // defaults to './tsconfig.json'.
     {{tsOrJsConfigAttribute}}
 
-    /* Webpack configuration to use to get resolve options from.
-
-       The (optional) fileName attribute specifies which file to take (relative
-       to dependency-cruiser's current working directory. When not provided defaults
-       to './webpack.conf.js'.
-
-       The (optional) \`env\` and \`arguments\` attributes contain the parameters
-       to be passed if your webpack config is a function and takes them (see 
-        webpack documentation for details)
-     */
+    // Webpack configuration to use to get resolve options from.
+    //
+    // The (optional) fileName attribute specifies which file to take (relative
+    // to dependency-cruiser's current working directory. When not provided defaults
+    // to './webpack.conf.js'.
+    //
+    // The (optional) 'env' and 'arguments' attributes contain the parameters
+    // to be passed if your webpack config is a function and takes them (see 
+    //  webpack documentation for details)
     {{webpackConfigAttribute}}
 
-    /* Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use
-      for compilation
-     */
+    // Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use
+    // for compilation
     {{babelConfigAttribute}}
 
-    /* List of strings you have in use in addition to cjs/ es6 requires
-       & imports to declare module dependencies. Use this e.g. if you've
-       re-declared require, use a require-wrapper or use window.require as
-       a hack.
-    */
+    // List of strings you have in use in addition to cjs/ es6 requires
+    // & imports to declare module dependencies. Use this e.g. if you've
+    // re-declared require, use a require-wrapper or use window.require as
+    // a hack.
     // exoticRequireStrings: [],
     
-    /* options to pass on to enhanced-resolve, the package dependency-cruiser
-       uses to resolve module references to disk. The values below should be
-       suitable for most situations
-
-       If you use webpack: you can also set these in webpack.conf.js. The set
-       there will override the ones specified here.
-     */
+    // options to pass on to enhanced-resolve, the package dependency-cruiser
+    // uses to resolve module references to disk. The values below should be
+    // suitable for most situations
+    //
+    // If you use webpack: you can also set these in webpack.conf.js. The set
+    // there will override the ones specified here.
     enhancedResolveOptions: {
-      /* What to consider as an 'exports' field in package.jsons */ 
-      exportsFields: ["exports"],
-      /* List of conditions to check for in the exports field.
-         Only works when the 'exportsFields' array is non-empty.
-      */
-      conditionNames: ["import", "require", "node", "default", "types"],
-      /* The extensions, by default are the same as the ones dependency-cruiser
-         can access (run \`npx depcruise --info\` to see which ones that are in
-         _your_ environment). If that list is larger than you need you can pass
-         the extensions you actually use (e.g. [".js", ".jsx"]). This can speed
-         up module resolution, which is the most expensive step.
-       */
+      // What to consider as an 'exports' field in package.jsons
+      exportsFields: ['exports'],
+      
+      // List of conditions to check for in the exports field.
+      // Only works when the 'exportsFields' array is non-empty.
+      conditionNames: ['import', 'require', 'node', 'default', 'types'],
+      
+      // The extensions, by default are the same as the ones dependency-cruiser
+      // can access (run \`npx depcruise --info\` to see which ones that are in
+      // _your_ environment). If that list is larger than you need you can pass
+      // the extensions you actually use (e.g. ['.js', '.jsx']). This can speed
+      // up module resolution, which is the most expensive step.
       {{extensionsAttribute}}
-      /* What to consider a 'main' field in package.json */
+      
+      // What to consider a 'main' field in package.json
       {{mainFieldsAttribute}}
-      /* A list of alias fields in package.jsons
-        
-         See [this specification](https://github.com/defunctzombie/package-browser-field-spec) and
-         the webpack [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields)
-         documentation.
-         
-         Defaults to an empty array (= don't use alias fields).
-       */
-      // aliasFields: ["browser"],
+      
+      // A list of alias fields in package.jsons
+      // See https://github.com/defunctzombie/package-browser-field-spec and
+      // the webpack [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields)
+      // documentation.
+      // Defaults to an empty array (= don't use alias fields).
+      // aliasFields: ['browser'],
     },
 
-    /* skipAnalysisNotInRules will make dependency-cruiser execute 
-       analysis strictly necessary for checking the rule set only. 
-
-       See https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#skipanalysisnotinrules
-       for details
-     */
+    // skipAnalysisNotInRules will make dependency-cruiser execute 
+    // analysis strictly necessary for checking the rule set only. 
+    // See https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#skipanalysisnotinrules
     skipAnalysisNotInRules: true,
     {{builtInModulesAttribute}}
     reporterOptions: {
       dot: {
-        /* pattern of modules that can be consolidated in the detailed
-           graphical dependency graph. The default pattern in this configuration
-           collapses everything in node_modules to one folder deep so you see
-           the external modules, but their innards.
-         */
+        // Pattern of modules to consolidate to. The default pattern in this configuration
+        // collapses everything in node_modules to one folder deep so you see
+        // the external modules, but not their innards.
         collapsePattern: 'node_modules/(?:@[^/]+/[^/]+|[^/]+)',
 
-        /* Options to tweak the appearance of your graph.See
-           https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions
-           for details and some examples. If you don't specify a theme
-           dependency-cruiser falls back to a built-in one.
-        */
+        // Options to tweak the appearance of your graph. See
+        // https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions
+        // If you don't specify a theme dependency-cruiser falls back to a built-in one.
         // theme: {
         //   graph: {
-        //     /* splines: "ortho" gives straight lines, but is slow on big graphs
-        //        splines: "true" gives bezier curves (fast, not as nice as ortho)
-        //    */
-        //     splines: "true"
+        //     // splines: 'ortho' - straight lines; slow on big graphs
+        //     // splines: 'true' - bezier curves; fast but not as nice as ortho
+        //     splines: 'true'
         //   },
-        // }
+        // },
       },
       archi: {
-        /* pattern of modules that can be consolidated in the high level
-           graphical dependency graph. If you use the high level graphical
-           dependency graph reporter (\`archi\`) you probably want to tweak
-           this collapsePattern to your situation.
-        */
+        // Pattern of modules to consolidate to.
         collapsePattern: '^(?:packages|src|lib(s?)|app(s?)|bin|test(s?)|spec(s?))/[^/]+|node_modules/(?:@[^/]+/[^/]+|[^/]+)',
 
-        /* Options to tweak the appearance of your graph. If you don't specify a
-           theme for 'archi' dependency-cruiser will use the one specified in the
-           dot section above and otherwise use the default one.
-         */
+        // Options to tweak the appearance of your graph. If you don't specify a
+        // theme for 'archi' dependency-cruiser will use the one specified in the
+        // dot section above and otherwise use the default one.
         // theme: { },
       },
-      "text": {
-        "highlightFocused": true
+      text: {
+        highlightFocused: true
       },
     }
   }

package/src/cli/init-config/find-extensions.mjs

@@ -17,6 +17,10 @@ function reduceToCounts(pAll, pExtension) {
 	return pAll;
 }
 
+/**
+ * @param {Record<string,number>} pCountsObject
+ * @returns {(pLeft: string, pRight: string) => number}
+ */
 function compareByCount(pCountsObject) {
 	return function compare(pLeft, pRight) {
 		return pCountsObject[pRight] - pCountsObject[pLeft];

package/src/cli/listeners/ndjson.mjs

@@ -1,14 +1,22 @@
+import { randomInt } from "node:crypto";
 import { EOL } from "node:os";
 import { INFO, SUMMARY } from "#utl/bus.mjs";
 
-const MICRO_SECONDS_PER_SECOND = 1000000;
+const MICRO_SECONDS_PER_SECOND = 1_000_000;
+// 2 ** 47;
+const MIN_RUN_ID = 140_737_488_355_328;
+// Max safe int (2 ** 48), - 1. Note: != Number.MAX_SAFE_INTEGER, which is too big for crypto.randomInt
+const MAX_RUN_ID = 281_474_976_710_655;
 
 function formatPerfLine({
 	runStartTime,
+	runId,
 	message,
 	time,
 	elapsedTime,
+	user,
 	elapsedUser,
+	system,
 	elapsedSystem,
 	rss,
 	heapUsed,
@@ -18,10 +26,13 @@ function formatPerfLine({
 	return (
 		JSON.stringify({
 			runStartTime,
+			runId,
 			message,
 			time: Math.round(time * MICRO_SECONDS_PER_SECOND),
 			elapsedTime: Math.round(elapsedTime * MICRO_SECONDS_PER_SECOND),
+			user,
 			elapsedUser,
+			system,
 			elapsedSystem,
 			rss,
 			heapUsed,
@@ -40,10 +51,13 @@ function getProgressLine(pMessage, pState, pLevel, pMaxLevel) {
 		const { rss, heapTotal, heapUsed, external } = process.memoryUsage();
 		const lStats = {
 			runStartTime: pState.runStartTime,
+			runId: pState.runId,
 			message: pState.previousMessage,
 			time: lTime,
 			elapsedTime: lTime - pState.previousTime,
+			user,
 			elapsedUser: user - pState.previousUserUsage,
+			system,
 			elapsedSystem: system - pState.previousSystemUsage,
 			rss,
 			heapUsed,
@@ -76,6 +90,7 @@ export default function setUpNDJSONListener(
 ) {
 	let lState = {
 		runStartTime: new Date(Date.now()).toISOString(),
+		runId: randomInt(MIN_RUN_ID, MAX_RUN_ID),
 		previousMessage: "startup: nodejs loading",
 		previousTime: 0,
 		previousUserUsage: 0,