@bundle-stats/utils 4.2.2 → 4.2.3-beta.1

package/lib-esm/webpack/selectors.js

@@ -18,7 +18,41 @@ const getSizeMetrics = (job) => {
     }), {});
 };
 const getAssetsMetrics = (job) => get(job, 'metrics.webpack.assets', {});
-const getModulesMetrics = (job) => get(job, 'metrics.webpack.modules', {});
+export const getModulesMetrics = (job) => {
+    const modules = get(job, 'metrics.webpack.modules', {});
+    const result = {};
+    Object.entries(modules).forEach(([moduleId, moduleData]) => {
+        result[moduleId] = {
+            ...moduleData,
+            originalValue: moduleData.value,
+        };
+    });
+    return result;
+};
+export const getModulesDuplicateSizeMetrics = (job) => {
+    const modules = get(job, 'metrics.webpack.modules', {});
+    const result = {};
+    Object.entries(modules).forEach(([moduleId, moduleData]) => {
+        result[moduleId] = {
+            ...moduleData,
+            value: moduleData.value * (moduleData.chunkIds.length - 1),
+            originalValue: moduleData.value,
+        };
+    });
+    return result;
+};
+export const getModulesTotalSizeMetrics = (job) => {
+    const modules = get(job, 'metrics.webpack.modules', {});
+    const result = {};
+    Object.entries(modules).forEach(([moduleId, moduleData]) => {
+        result[moduleId] = {
+            ...moduleData,
+            value: moduleData.value * moduleData.chunkIds.length,
+            originalValue: moduleData.value,
+        };
+    });
+    return result;
+};
 const getPackageMetrics = (job) => get(job, 'metrics.webpack.packages', {});
 export const selectors = {
     [SECTION_WEBPACK_STATS]: getStatsMetrics,

package/lib-esm/webpack/selectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../src/webpack/selectors.js"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,IAAI,MAAM,aAAa,CAAC;AAE/B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AAYnD,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,EAAE;IAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAGjD,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,GAAG;QACN,CAAC,WAAW,GAAG,EAAE,CAAC,EAAE,KAAK;KAC1B,CAAC,EAAE,EAAE,CAAC,CAAC;AACV,CAAC,CAAC;AAaF,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IAC7B,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAGtD,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1D,GAAG,GAAG;QACN,CAAC,iBAAiB,GAAG,EAAE,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC;KACvC,CAAC,EAAE,EAAE,CAAC,CAAC;AACV,CAAC,CAAC;AAaF,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAwB,EAAE,EAAE,CAAC,CAAC;AAazE,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;AAa3E,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;AAE5E,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,CAAC,qBAAqB,CAAC,EAAE,eAAe;IACxC,CAAC,qBAAqB,CAAC,EAAE,cAAc;IACvC,CAAC,sBAAsB,CAAC,EAAE,gBAAgB;IAC1C,CAAC,uBAAuB,CAAC,EAAE,iBAAiB;IAC5C,CAAC,wBAAwB,CAAC,EAAE,iBAAiB;CAC9C,CAAC"}
+{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../src/webpack/selectors.js"],"names":[],"mappings":"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"}

package/lib-esm/webpack/utils.js

@@ -1,43 +1,54 @@
-import last from 'lodash/last';
-import map from 'lodash/map';
 import round from 'lodash/round';
 import { PACKAGES_SEPARATOR, PACKAGE_ID_SEPARATOR } from '../config';
 import { createGetMetricType } from '../utils/metrics';
 import { metrics } from './metrics';
-const HASH_PATTERN = '[a-f|0-9]{5,32}';
-const HASH_SEPARATOR_PATTERN = '[-|.]';
-const EXTENSION_PATTERN = /(?:\.[a-z|0-9]{2,}){1,}/;
+const HEX_HASH_PATTERN = '[a-f0-9]{5,32}';
+const HEX_HASH_SEPARATOR_PATTERN = '[-_.~]';
+const BASE64URL_HASH_PATTERN = '[A-Za-z0-9_-]{4,}';
+const BASE64URL_SEPARATOR_PATTERN = '[.~]';
+const EXTENSION_PATTERN = /(?:\.[a-z0-9]{2,}){1,}/;
 const PATTERNS = [
-    `(.*)${HASH_SEPARATOR_PATTERN}${HASH_PATTERN}(${EXTENSION_PATTERN.source})$`,
-    `(static)/${HASH_PATTERN}(.*${EXTENSION_PATTERN.source})$`,
-].map((pattern) => new RegExp(pattern));
+    {
+        pattern: new RegExp(`(.*)${HEX_HASH_SEPARATOR_PATTERN}${HEX_HASH_PATTERN}(${EXTENSION_PATTERN.source})$`),
+        replace: '$1$2',
+    },
+    {
+        pattern: new RegExp(`(.*)${BASE64URL_SEPARATOR_PATTERN}${BASE64URL_HASH_PATTERN}(${EXTENSION_PATTERN.source})$`),
+        replace: '$1$2',
+    },
+    {
+        pattern: new RegExp(`(static)/${HEX_HASH_PATTERN}(.*${EXTENSION_PATTERN.source})$`),
+        replace: '$1$2',
+    },
+    {
+        pattern: new RegExp(`(static)/${BASE64URL_HASH_PATTERN}/(_.*${EXTENSION_PATTERN.source})$`),
+        replace: '$1/[hash]/$2',
+    },
+];
 const NO_BASENAME = /(^|.*\/)\..*$/;
-export const getAssetName = (assetFilepath) => {
-    if (!assetFilepath) {
+export const getAssetName = (statsAssetPath) => {
+    if (!statsAssetPath) {
         return '';
     }
-    let result;
-    for (let i = 0; i < PATTERNS.length && !result; i += 1) {
-        const pattern = PATTERNS[i];
-        const extracted = assetFilepath.replace(pattern, '$1$2');
-        if (extracted && extracted !== assetFilepath && !NO_BASENAME.test(extracted)) {
-            result = extracted;
+    for (let i = 0; i < PATTERNS.length; i += 1) {
+        const { pattern, replace } = PATTERNS[i];
+        const extracted = statsAssetPath.replace(pattern, replace);
+        if (extracted && extracted !== statsAssetPath && !NO_BASENAME.test(extracted)) {
+            return extracted;
         }
     }
-    if (!result) {
-        return assetFilepath;
-    }
-    return result;
+    return statsAssetPath;
 };
 const NAME_WITH_LOADERS = /!/;
-const NAME_WITH_MODULES = /\s\+\s\d*\smodules$/;
+const NAME_WITH_MODULES = /\s?\+\s?\d*\s?modules$/;
 const INVALID_CSS_PREFIX = /^css\s.*node_modules(?!\/)/;
 export const getModuleName = (name) => {
     if (!name) {
         return '';
     }
     if (NAME_WITH_LOADERS.test(name)) {
-        const normalizedName = last(name.split(NAME_WITH_LOADERS));
+        const segments = name.split(NAME_WITH_LOADERS);
+        const normalizedName = segments[segments.length - 1];
         if (normalizedName === null || normalizedName === void 0 ? void 0 : normalizedName.trim()) {
             return normalizedName;
         }
@@ -68,16 +79,17 @@ export const calculateCacheInvalidation = (rows) => {
     return round((invalidated / cached) * 100, 2);
 };
 export const getMetricAdded = (runs) => {
-    const [current, baseline] = map(runs, 'value');
+    const [current, baseline] = (runs === null || runs === void 0 ? void 0 : runs.map((run) => run === null || run === void 0 ? void 0 : run.value)) || [];
     return Boolean(current !== null && !baseline);
 };
 export const getMetricDeleted = (runs) => {
-    const [current, baseline] = map(runs, 'value');
+    const [current, baseline] = (runs === null || runs === void 0 ? void 0 : runs.map((run) => run === null || run === void 0 ? void 0 : run.value)) || [];
     return Boolean(baseline !== null && !current);
 };
 export const getMetricType = createGetMetricType(metrics);
 export const getPackagePublicName = (packageId) => {
-    const name = last(packageId.split(PACKAGES_SEPARATOR));
+    const packageNames = packageId.split(PACKAGES_SEPARATOR);
+    const name = packageNames[packageNames.length - 1];
     return name.split(PACKAGE_ID_SEPARATOR)[0];
 };
 export const normalizeChunkId = (chunkId) => chunkId.toString();

package/lib-esm/webpack/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/webpack/utils.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/webpack/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bundle-stats/utils",
-  "version": "4.2.2",
+  "version": "4.2.3-beta.1",
   "description": "BundleStats utils",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
@@ -14,16 +14,16 @@
   },
   "scripts": {
     "build": "npm run build-lib && npm run build-esm",
-    "build-lib": "npx rimraf ./lib && ../../node_modules/.bin/tsc --rootDir ./src --project tsconfig.lib.json --outDir ./lib",
-    "build-esm": "npx rimraf ./lib-esm ./types && ../../node_modules/.bin/tsc --rootDir ./src --project tsconfig.esm.json --outDir ./lib-esm",
-    "lint": "../../node_modules/.bin/eslint . --ext .js,.ts --resolve-plugins-relative-to ../../",
+    "build-lib": "rimraf ./lib && tsc --rootDir ./src --project tsconfig.lib.json --outDir ./lib",
+    "build-esm": "rimraf ./lib-esm ./types && tsc --rootDir ./src --project tsconfig.esm.json --outDir ./lib-esm",
+    "lint": "eslint",
     "test": "TZ=UTC jest src --maxWorkers=4"
   },
   "keywords": [],
   "author": {
     "name": "Viorel Cojocaru",
-    "email": "vio@beanon.com",
-    "url": "https://beanon.com"
+    "email": "vio@relative-ci.com",
+    "url": "https://relative-ci.com"
   },
   "license": "MIT",
   "repository": {
@@ -35,28 +35,26 @@
   },
   "homepage": "https://github.com/relative-ci/bundle-stats/blob/master/packages/utils#readme",
   "dependencies": {
-    "@bundle-stats/plugin-webpack-filter": "^4.2.2",
-    "@bundle-stats/plugin-webpack-validate": "^4.2.2",
-    "query-string": "7.1.3",
-    "serialize-query-params": "2.0.2",
-    "use-query-params": "2.2.0"
+    "@bundle-stats/plugin-webpack-filter": "4.2.3-beta.1",
+    "@bundle-stats/plugin-webpack-validate": "4.2.3-beta.1",
+    "serialize-query-params": "2.0.2"
   },
   "devDependencies": {
-    "@types/jest": "29.4.0",
-    "@types/lodash": "4.14.191",
-    "core-js": "3.28.0",
-    "jest": "29.4.3",
-    "jest-cli": "29.4.3",
-    "jest-date-mock": "1.0.8",
+    "@types/jest": "29.5.14",
+    "@types/lodash": "4.17.18",
+    "core-js": "3.43.0",
+    "jest": "29.7.0",
+    "jest-cli": "29.7.0",
+    "jest-date-mock": "1.0.10",
     "lodash": "4.17.21",
-    "regenerator-runtime": "0.13.11",
-    "rimraf": "4.1.2",
-    "ts-jest": "29.0.5",
-    "typescript": "4.9.5"
+    "regenerator-runtime": "0.14.1",
+    "rimraf": "6.0.1",
+    "ts-jest": "29.4.0",
+    "typescript": "5.8.3"
   },
   "peerDependencies": {
     "core-js": "^3.0.0",
     "lodash": "^4.0.0"
   },
-  "gitHead": "ee8246cd2e7b42961dd44f261e92b7433dbb8090"
+  "gitHead": "18734a4f1ce353ca150d7e0a40212f44a90c621e"
 }

package/src/browsertime/metrics.js

@@ -1,88 +1,88 @@
-import { METRIC_TYPE_DURATION } from '../config/metrics';
+import { MetricTypes } from '../constants';
 
 export const metrics = {
   firstPaint: {
     label: 'First Paint',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   fullyLoaded: {
     label: 'Fully Loaded',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   backEndTime: {
     label: 'BackEnd Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   domContentLoadedTime: {
     label: 'DOM Content Loaded Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   domInteractiveTime: {
     label: 'DOM Interactive Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   domainLookupTime: {
     label: 'Domain Lookup Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   frontEndTime: {
     label: 'FrontEnd Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   pageDownloadTime: {
     label: 'Page Download Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   pageLoadTime: {
     label: 'Page Load Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   redirectionTime: {
     label: 'Redirection Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   serverConnectionTime: {
     label: 'Server Connection Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   serverResponseTime: {
     label: 'Server Response Time',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   firstContentfulPaint: {
     label: 'First Contentful Paint',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   rumSpeedIndex: {
     label: 'RUM Speed Index',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   firstVisualChange: {
     label: 'First Visual Change',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   lastVisualChange: {
     label: 'Last Visual Change',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   perceptualSpeedIndex: {
     label: 'Perceptual SpeedIndex',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   speedIndex: {
     label: 'Speed Index',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   visualComplete85: {
     label: 'Visual Complete 85',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   visualComplete95: {
     label: 'Visual Complete 95',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
   visualComplete99: {
     label: 'Visual Complete 99',
-    type: METRIC_TYPE_DURATION,
+    type: MetricTypes.Duration,
   },
 };

package/src/config/component-links.js

@@ -1,4 +1,5 @@
 export const ASSET_ENTRY_TYPE = 'et';
+export const ASSET_CHUNK = 'c';
 export const ASSET_FILE_TYPE = 'ft';
 export const MODULE_CHUNK = 'c';
 export const MODULE_FILE_TYPE = 'mft';
@@ -17,6 +18,7 @@ export const MODULE_FILTERS = {
   DUPLICATED: 'md',
   FIRST_PARTY: 'fp',
   THIRD_PARTY: 'tp',
+  METRIC: 'metric',
 };
 
 export const PACKAGE_FILTERS = {
@@ -36,3 +38,8 @@ export const COMPONENT = {
   BUNDLE_MODULES: 'bm',
   BUNDLE_PACKAGES: 'bp',
 };
+
+export const MODULE_SOURCE_TYPE_LABELS = {
+  FIRST_PARTY: 'First party',
+  THIRD_PARTY: 'Third party',
+};

package/src/config/file-types.js

@@ -9,7 +9,7 @@ export const FILE_TYPE_OTHER = 'OTHER';
 
 export const FILE_TYPE_PATTERNS = {
   [FILE_TYPE_CSS]: /\.css$/,
-  [FILE_TYPE_JS]: /\.js$/,
+  [FILE_TYPE_JS]: /\.(js|cjs|mjs)$/,
   [FILE_TYPE_IMG]: /\.(a?png|jpe?g|webp|gif|svg|ico|avif)$/,
   [FILE_TYPE_MEDIA]: /\.(mp4|mp3|m4a|aac|mov|webm|wav|ogg)$/,
   [FILE_TYPE_FONT]: /\.(woff|woff2|ttf|otf|eot)$/,
@@ -34,14 +34,14 @@ export const FILE_TYPES = [...Object.keys(FILE_TYPE_PATTERNS), FILE_TYPE_OTHER];
  */
 export const MODULE_SOURCE_PATTERNS = {
   [FILE_TYPE_CSS]: /\.(css|styl|sass|scss|less)$/,
-  [FILE_TYPE_JS]: /\.(jsx?|tsx?|mjs)$/,
+  [FILE_TYPE_JS]: /\.(jsx?|tsx?|cjs|mjs)$/,
 };
 
 export const MODULE_SOURCE_FILE_TYPES = [...Object.keys(MODULE_SOURCE_PATTERNS), FILE_TYPE_OTHER];
 
 export const MODULE_DESTINATION_PATTERNS = {
   [FILE_TYPE_CSS]: /\.css$/,
-  [FILE_TYPE_JS]: /\.(js|mjs)$/,
+  [FILE_TYPE_JS]: /\.(js|cjs|mjs)$/,
 };
 
 export const MODULE_DESTINATION_FILE_TYPES = Object.keys(MODULE_DESTINATION_PATTERNS);

package/src/config/index.js

@@ -1,7 +1,6 @@
 export * from './component-links';
 export * from './file-types';
-export * from './metrics';
-export * from './delta';
+export * from './metric-types';
 
 export const PACKAGES_SEPARATOR = ':';
 export const PACKAGE_ID_SEPARATOR = '~';

package/src/config/metric-types.ts

@@ -0,0 +1,25 @@
+import { formatNumber, formatDuration, formatFileSize, formatPercentage } from '../utils/format';
+import { MetricTypes, MetricTypeConfig } from '../constants';
+
+export const METRIC_TYPE_CONFIGS: Record<MetricTypes, MetricTypeConfig> = {
+  [MetricTypes.Numeric]: {
+    biggerIsBetter: false,
+    formatter: formatNumber,
+  },
+  [MetricTypes.Score]: {
+    biggerIsBetter: true,
+    formatter: formatNumber,
+  },
+  [MetricTypes.Duration]: {
+    biggerIsBetter: false,
+    formatter: formatDuration,
+  },
+  [MetricTypes.FileSize]: {
+    biggerIsBetter: false,
+    formatter: formatFileSize,
+  },
+  [MetricTypes.Percentage]: {
+    biggerIsBetter: true,
+    formatter: formatPercentage,
+  },
+};

package/src/constants.ts

@@ -12,47 +12,92 @@ export enum InsightType {
   WARNING = 'warning',
 }
 
-export enum MetricTypeType {
-  METRIC_TYPE_NUMERIC = 'METRIC_TYPE_NUMERIC',
-  METRIC_TYPE_SCORE = 'METRIC_TYPE_SCORE',
-  METRIC_TYPE_FILE_SIZE = 'METRIC_TYPE_FILE_SIZE',
-  METRIC_TYPE_DURATION = 'METRIC_TYPE_DURATION',
-  METRIC_TYPE_PERCENTAGE = 'METRIC_TYPE_PERCENTAGE',
+/**
+ * Generic metric type names
+ */
+export enum MetricTypes {
+  Numeric = 'METRIC_TYPE_NUMERIC',
+  Score = 'METRIC_TYPE_SCORE',
+  FileSize = 'METRIC_TYPE_FILE_SIZE',
+  Duration = 'METRIC_TYPE_DURATION',
+  Percentage = 'METRIC_TYPE_PERCENTAGE',
 }
 
+/**
+ * Metric type base configuration
+ */
 export interface MetricTypeConfig {
-  label: string;
-  description: string;
-  type: MetricTypeType;
+  /**
+   * Increased values are regressions, decreased values are improvements
+   */
+  biggerIsBetter?: boolean | null;
+  /**
+   * Value formatter
+   */
+  formatter: (value: number | null) => string;
 }
 
-export interface MetricType extends MetricTypeConfig {
-  formatter: Function;
-  biggerIsBetter: boolean;
+/**
+ * Source metric configuration
+ */
+export interface MetricConfig {
+  label: string;
+  type: MetricTypes;
+  description?: string;
+  /**
+   * Documentation URL
+   */
+  url?: string;
+  /**
+   * Positive delta values are regressions and negative delta values are improvements
+   * overrides MetricTypeConfig['biggerIsBetter']
+   */
+  biggerIsBetter?: MetricTypeConfig['biggerIsBetter'];
+  /**
+   * Do not show the delta
+   */
+  skipDelta?: boolean;
 }
 
-export enum MetricRunInfoDeltaType {
-  'HIGH_NEGATIVE' = 'HIGH_NEGATIVE',
-  'NEGATIVE' = 'NEGATIVE',
-  'LOW_NEGATIVE' = 'LOW_NEGATIVE',
-  'NO_CHANGE' = 'NO_CHANGE',
-  'LOW_POSITIVE' = 'LOW_POSITIVE',
-  'POSITIVE' = 'POSITIVE',
-  'HIGH_POSITIVE' = 'HIGH_POSITIVE',
+export type Metric = MetricTypeConfig & MetricConfig;
+
+export enum DeltaType {
+  HIGH_NEGATIVE = 'HIGH_NEGATIVE',
+  NEGATIVE = 'NEGATIVE',
+  LOW_NEGATIVE = 'LOW_NEGATIVE',
+  NO_CHANGE = 'NO_CHANGE',
+  CHANGE = 'CHANGE',
+  LOW_POSITIVE = 'LOW_POSITIVE',
+  POSITIVE = 'POSITIVE',
+  HIGH_POSITIVE = 'HIGH_POSITIVE',
 }
 
+export type MetricRunInfoDeltaType = `${DeltaType}`;
+
+/**
+ * Metric data for a job/run
+ */
 export interface MetricRun {
   value: number;
 }
 
-export interface MetricRunInfo {
+export interface MetricRunDelta {
+  delta: number;
+  deltaPercentage: number;
+}
+
+export interface MetricRunInfoBaseline {
   value: number;
   displayValue: string;
-  delta?: number;
-  deltaPercentage?: number;
-  deltaType?: MetricRunInfoDeltaType;
-  displayDelta?: string;
-  displayDeltaPercentage?: string;
+}
+
+export interface MetricRunInfo extends MetricRunInfoBaseline {
+  delta: number;
+  deltaPercentage: number;
+  deltaType: MetricRunInfoDeltaType;
+  displayDelta: string;
+  displayDeltaPercentage: string;
+  regression?: boolean | null;
 }
 
 export type JobSection<T = object> = Record<Source, T>;
@@ -65,6 +110,20 @@ export enum JobSectionId {
   rawData = 'rawData',
 }
 
+export interface WebpackChunk {
+  id: string;
+  name: string;
+}
+
+export interface JobMeta {
+  [Source.webpack]: {
+    /**
+     * Webpack chunks data
+     */
+    chunks?: Array<WebpackChunk>;
+  };
+}
+
 export interface JobSummaryItem {
   baseline: number;
   current: number;
@@ -77,6 +136,7 @@ export interface JobInsight<T = object> {
 
 export interface JobInsightAssetsSizeTotalData {
   md: string;
+  text: string;
   info: MetricRunInfo;
 }
 export type JobInsightDuplicatePackagesData = Record<string, Array<string>>;
@@ -110,7 +170,7 @@ export type JobMetricsSource = Record<string, MetricRun | Record<string, MetricR
 export type JobMetrics = JobSection<JobMetricsSource>;
 
 export interface JobData {
-  [JobSectionId.meta]?: JobSection;
+  [JobSectionId.meta]?: JobMeta;
   [JobSectionId.insights]?: JobInsights;
   [JobSectionId.summary]?: JobSummary;
   [JobSectionId.metrics]?: JobMetrics;
@@ -160,10 +220,10 @@ export interface BrowsertimeSource {
   info?: {
     browsertime: {
       version: string;
-    }
+    };
     timestamp: string;
     url: string;
-  }
+  };
   statistics?: {
     timings: {
       firstPaint: BrowsertimeSourceMetric;
@@ -179,12 +239,12 @@ export interface BrowsertimeSource {
         redirectionTime: BrowsertimeSourceMetric;
         serverConnectionTime: BrowsertimeSourceMetric;
         serverResponseTime: BrowsertimeSourceMetric;
-      }
+      };
       paintTiming: {
         'first-contentful-paint': BrowsertimeSourceMetric;
-      }
+      };
       rumSpeedIndex: BrowsertimeSourceMetric;
-    }
+    };
     visualmetrics: {
       FirstVisualChange: BrowsertimeSourceMetric;
       LastVisualChange: BrowsertimeSourceMetric;
@@ -193,8 +253,8 @@ export interface BrowsertimeSource {
       VisualComplete85: BrowsertimeSourceMetric;
       VisualComplete95: BrowsertimeSourceMetric;
       VisualComplete99: BrowsertimeSourceMetric;
-    }
-  }
+    };
+  };
 }
 
 export interface BrowsertimeMetrics {