@bundle-stats/utils 3.1.4-alpha.0 → 3.2.1-alpha.0

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.1.4-alpha.0](https://github.com/relative-ci/bundle-stats/compare/v3.1.3...v3.1.4-alpha.0) (2021-09-21)
+## [3.2.1-alpha.0](https://github.com/relative-ci/bundle-stats/compare/v3.2.0...v3.2.1-alpha.0) (2021-10-27)
 
 **Note:** Version bump only for package @bundle-stats/utils
 
@@ -11,6 +11,25 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+# [3.2.0](https://github.com/relative-ci/bundle-stats/compare/v3.1.3...v3.2.0) (2021-10-13)
+
+
+### Bug Fixes
+
+* Consistent dependency versions across packages ([cceebb7](https://github.com/relative-ci/bundle-stats/commit/cceebb7724670a7c40c156c395449fc65d183690))
+* **utils:** Use convert-units@beta ([731e7a4](https://github.com/relative-ci/bundle-stats/commit/731e7a4c1cf3fc2189f961388632fdbab838be3f))
+* **utils:** Webpack module packages -construct patterns ([29c8606](https://github.com/relative-ci/bundle-stats/commit/29c86067d07188e4a553f7a41f70cc0621ea7c0d))
+* **utils:** Webpack packages - make slug pattern more restrictive ([4d1ac7f](https://github.com/relative-ci/bundle-stats/commit/4d1ac7f7fc3c4783a0124efb651de2ff2752301e))
+
+
+### Features
+
+* **utils:** Extract packages - add support for pnpm ([527e154](https://github.com/relative-ci/bundle-stats/commit/527e15422447c14dfa6f0ba0fdfe859c0aae7b9a))
+
+
+
+
+
 ## [3.1.2](https://github.com/relative-ci/bundle-stats/compare/v3.1.1...v3.1.2) (2021-08-10)
 
 

package/README.md

@@ -41,9 +41,9 @@ console.log(report.insights.webpack.assetsSizeTotal.data.text);
 
 Specialized insights for web bundles:
 
-- Monitor and analyze bundle size, assets, modules, packages
+- Analyze and monitor webpack stats(bundle size, assets, modules, packages)
 - GitHub Check, GitHub Pull Request, and Slack integrations
-- Support for all major CI services (CircleCI, GitHub Actions, Travis CI CI, Jenkins, Gitlab CI, Codeship)
+- Support for all major CI services (CircleCI, GitHub Actions, Gitlab CI, Jenkins, Travis CI)
 - Free for OpenSource, developers and small teams
 
 [Try for free](https://relative-ci.com?utm_source=github&utm_medium=bundle-stats)

package/lib/utils/format.js

@@ -1,18 +1,38 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatPercentage = exports.formatCommit = exports.formatNumber = exports.formatDuration = exports.formatFileSize = void 0;
-const convert_units_1 = __importDefault(require("convert-units"));
+const convert_units_1 = __importStar(require("convert-units"));
 const round_1 = __importDefault(require("lodash/round"));
+const convert = convert_units_1.default({ digital: convert_units_1.digital, time: convert_units_1.time });
 const formatFileSize = (val) => {
-    const res = convert_units_1.default(val).from('B').toBest();
+    const res = convert(val).from('B').toBest();
     return `${round_1.default(res.val, 2)}${res.unit}`;
 };
 exports.formatFileSize = formatFileSize;
 const formatDuration = (val) => {
-    const res = convert_units_1.default(val).from('ms').toBest();
+    const res = convert(val).from('ms').toBest();
     return `${round_1.default(res.val, 4)}${res.unit}`;
 };
 exports.formatDuration = formatDuration;

package/lib/utils/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/utils/format.js"],"names":[],"mappings":";;;;;;AAAA,kEAAoC;AACpC,yDAAiC;AAE1B,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,uBAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5C,OAAO,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB;AAEK,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,uBAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7C,OAAO,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB;AAEK,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;AAAjC,QAAA,YAAY,gBAAqB;AAEvC,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAA1E,QAAA,YAAY,gBAA8D;AAEhF,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;AAAtC,QAAA,gBAAgB,oBAAsB"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/utils/format.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAqE;AACrE,yDAAiC;AAEjC,MAAM,OAAO,GAAG,uBAAqB,CAAC,EAAE,OAAO,EAAP,uBAAO,EAAE,IAAI,EAAJ,oBAAI,EAAE,CAAC,CAAC;AAElD,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5C,OAAO,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB;AAEK,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7C,OAAO,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB;AAEK,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;AAAjC,QAAA,YAAY,gBAAqB;AAEvC,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAA1E,QAAA,YAAY,gBAA8D;AAEhF,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;AAAtC,QAAA,gBAAgB,oBAAsB"}

package/lib/webpack/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MODULE_PATH_PACKAGES = exports.SUMMARY_METRIC_PATHS = exports.SECTIONS = exports.SECTION_WEBPACK_PACKAGES = exports.SECTION_WEBPACK_MODULES = exports.SECTION_WEBPACK_ASSETS = exports.SECTION_WEBPACK_SIZES = exports.SECTION_WEBPACK_STATS = void 0;
+exports.PACKAGE_PATH_NAME = exports.MODULE_PATH_PACKAGES = exports.SUMMARY_METRIC_PATHS = exports.SECTIONS = exports.SECTION_WEBPACK_PACKAGES = exports.SECTION_WEBPACK_MODULES = exports.SECTION_WEBPACK_ASSETS = exports.SECTION_WEBPACK_SIZES = exports.SECTION_WEBPACK_STATS = void 0;
 exports.SECTION_WEBPACK_STATS = 'stats';
 exports.SECTION_WEBPACK_SIZES = 'sizes';
 exports.SECTION_WEBPACK_ASSETS = 'assets';
@@ -24,5 +24,41 @@ exports.SUMMARY_METRIC_PATHS = [
     'packageCount',
     'duplicatePackagesCount',
 ];
-exports.MODULE_PATH_PACKAGES = /(node_modules|~)\/((!?@(([\w|\-|_|.]*)\/){2})|(([\w|\-|_|.]*)\/))/g;
+const PACKAGE_PREFIX = /(?:node_modules|~)(?:\/\.pnpm)?/;
+const PACKAGE_SLUG = /[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*/;
+const VERSION = /@[\w|\-|_|.]+/;
+exports.MODULE_PATH_PACKAGES = new RegExp([
+    `(?:${PACKAGE_PREFIX.source}/)`,
+    '(?:',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:${PACKAGE_SLUG.source}\\+)*`,
+    `(?:${PACKAGE_SLUG.source})`,
+    `(?:${VERSION.source})?`,
+    ')',
+    '(?:_',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:${PACKAGE_SLUG.source})`,
+    `(?:@${PACKAGE_SLUG.source})?`,
+    ')*',
+    '/',
+].join(''), 'g');
+exports.PACKAGE_PATH_NAME = new RegExp([
+    `(?:${PACKAGE_PREFIX.source}/)`,
+    '(?:',
+    '(',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:(?:${PACKAGE_SLUG.source}\\+)*)`,
+    `(?:${PACKAGE_SLUG.source})`,
+    ')',
+    `(?:${VERSION.source})?`,
+    ')',
+    '(?:_',
+    '(',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:${PACKAGE_SLUG.source})`,
+    ')',
+    `(?:@${PACKAGE_SLUG.source})`,
+    ')*',
+    '/',
+].join(''), 'g');
 //# sourceMappingURL=constants.js.map

package/lib/webpack/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/webpack/constants.js"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,wBAAwB,GAAG,UAAU,CAAC;AAEtC,QAAA,QAAQ,GAAG;IACtB,6BAAqB;IACrB,6BAAqB;IACrB,8BAAsB;IACtB,+BAAuB;IACvB,gCAAwB;CACzB,CAAC;AAEW,QAAA,oBAAoB,GAAG;IAClC,oBAAoB;IACpB,oBAAoB;IACpB,qBAAqB;IACrB,mBAAmB;IACnB,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,wBAAwB;CACzB,CAAC;AAGW,QAAA,oBAAoB,GAAG,oEAAoE,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/webpack/constants.js"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,wBAAwB,GAAG,UAAU,CAAC;AAEtC,QAAA,QAAQ,GAAG;IACtB,6BAAqB;IACrB,6BAAqB;IACrB,8BAAsB;IACtB,+BAAuB;IACvB,gCAAwB;CACzB,CAAC;AAEW,QAAA,oBAAoB,GAAG;IAClC,oBAAoB;IACpB,oBAAoB;IACpB,qBAAqB;IACrB,mBAAmB;IACnB,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,wBAAwB;CACzB,CAAC;AAEF,MAAM,cAAc,GAAG,iCAAiC,CAAC;AACzD,MAAM,YAAY,GAAG,uCAAuC,CAAC;AAC7D,MAAM,OAAO,GAAG,eAAe,CAAC;AAKnB,QAAA,oBAAoB,GAAG,IAAI,MAAM,CAAC;IAE7C,MAAM,cAAc,CAAC,MAAM,IAAI;IAE/B,KAAK;IAEH,OAAO,YAAY,CAAC,MAAM,SAAS;IAEnC,MAAM,YAAY,CAAC,MAAM,OAAO;IAEhC,MAAM,YAAY,CAAC,MAAM,GAAG;IAE5B,MAAM,OAAO,CAAC,MAAM,IAAI;IAC1B,GAAG;IAGH,MAAM;IACJ,OAAO,YAAY,CAAC,MAAM,SAAS;IACnC,MAAM,YAAY,CAAC,MAAM,GAAG;IAC5B,OAAO,YAAY,CAAC,MAAM,IAAI;IAChC,IAAI;IACJ,GAAG;CACJ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;AAMJ,QAAA,iBAAiB,GAAG,IAAI,MAAM,CAAC;IAC1C,MAAM,cAAc,CAAC,MAAM,IAAI;IAE/B,KAAK;IACH,GAAG;IACD,OAAO,YAAY,CAAC,MAAM,SAAS;IACnC,SAAS,YAAY,CAAC,MAAM,QAAQ;IACpC,MAAM,YAAY,CAAC,MAAM,GAAG;IAC9B,GAAG;IACH,MAAM,OAAO,CAAC,MAAM,IAAI;IAC1B,GAAG;IAEH,MAAM;IACJ,GAAG;IACD,OAAO,YAAY,CAAC,MAAM,SAAS;IACnC,MAAM,YAAY,CAAC,MAAM,GAAG;IAC9B,GAAG;IACH,OAAO,YAAY,CAAC,MAAM,GAAG;IAC/B,IAAI;IACJ,GAAG;CACJ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC"}

package/lib/webpack/extract/modules-packages.js

@@ -6,15 +6,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractModulesPackages = exports.getPackageMetaFromModulePath = void 0;
 const max_1 = __importDefault(require("lodash/max"));
 const last_1 = __importDefault(require("lodash/last"));
+const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const config_1 = require("../../config");
 const constants_1 = require("../constants");
-const PACKAGE_PATH_REPLACE = /.*(node_modules|~)\/(.*)\/$/;
+const uniqLast = (data) => {
+    const res = [];
+    data.forEach((item, index) => {
+        if (!data.slice(index + 1).includes(item)) {
+            res.push(item);
+        }
+    });
+    return res;
+};
 const getPackageMetaFromModulePath = (modulePath) => {
     const paths = modulePath.match(constants_1.MODULE_PATH_PACKAGES);
     if (!paths) {
         return null;
     }
-    const names = paths.map((packagePath) => packagePath.replace(PACKAGE_PATH_REPLACE, '$2'));
+    const names = uniqLast(paths
+        .map((packagePath) => {
+        const found = packagePath.matchAll(constants_1.PACKAGE_PATH_NAME);
+        if (!found) {
+            return [];
+        }
+        return [...found].flat().slice(1).filter(Boolean).map((name) => name.replace(/\+/g, '/'));
+    })
+        .flat());
+    if (isEmpty_1.default(names)) {
+        return null;
+    }
     const name = last_1.default(names);
     const pattern = new RegExp(`(.*)(${last_1.default(paths)}).*`);
     const path = modulePath.replace(pattern, '$1$2').replace(/\/$/, '');

package/lib/webpack/extract/modules-packages.js.map

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

package/lib-esm/utils/format.js

@@ -1,5 +1,6 @@
-import convert from 'convert-units';
+import configureMeasurements, { digital, time } from 'convert-units';
 import round from 'lodash/round';
+const convert = configureMeasurements({ digital, time });
 export const formatFileSize = (val) => {
     const res = convert(val).from('B').toBest();
     return `${round(res.val, 2)}${res.unit}`;

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

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/utils/format.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,eAAe,CAAC;AACpC,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5C,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7C,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAEvF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/utils/format.js"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,MAAM,OAAO,GAAG,qBAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAEzD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5C,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7C,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAEvF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC"}

package/lib-esm/webpack/constants.js

@@ -21,5 +21,41 @@ export const SUMMARY_METRIC_PATHS = [
     'packageCount',
     'duplicatePackagesCount',
 ];
-export const MODULE_PATH_PACKAGES = /(node_modules|~)\/((!?@(([\w|\-|_|.]*)\/){2})|(([\w|\-|_|.]*)\/))/g;
+const PACKAGE_PREFIX = /(?:node_modules|~)(?:\/\.pnpm)?/;
+const PACKAGE_SLUG = /[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*/;
+const VERSION = /@[\w|\-|_|.]+/;
+export const MODULE_PATH_PACKAGES = new RegExp([
+    `(?:${PACKAGE_PREFIX.source}/)`,
+    '(?:',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:${PACKAGE_SLUG.source}\\+)*`,
+    `(?:${PACKAGE_SLUG.source})`,
+    `(?:${VERSION.source})?`,
+    ')',
+    '(?:_',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:${PACKAGE_SLUG.source})`,
+    `(?:@${PACKAGE_SLUG.source})?`,
+    ')*',
+    '/',
+].join(''), 'g');
+export const PACKAGE_PATH_NAME = new RegExp([
+    `(?:${PACKAGE_PREFIX.source}/)`,
+    '(?:',
+    '(',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:(?:${PACKAGE_SLUG.source}\\+)*)`,
+    `(?:${PACKAGE_SLUG.source})`,
+    ')',
+    `(?:${VERSION.source})?`,
+    ')',
+    '(?:_',
+    '(',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:${PACKAGE_SLUG.source})`,
+    ')',
+    `(?:@${PACKAGE_SLUG.source})`,
+    ')*',
+    '/',
+].join(''), 'g');
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/webpack/constants.js"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAC7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAC7C,MAAM,CAAC,MAAM,sBAAsB,GAAG,QAAQ,CAAC;AAC/C,MAAM,CAAC,MAAM,uBAAuB,GAAG,SAAS,CAAC;AACjD,MAAM,CAAC,MAAM,wBAAwB,GAAG,UAAU,CAAC;AAEnD,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,qBAAqB;IACrB,qBAAqB;IACrB,sBAAsB;IACtB,uBAAuB;IACvB,wBAAwB;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,oBAAoB;IACpB,oBAAoB;IACpB,qBAAqB;IACrB,mBAAmB;IACnB,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,wBAAwB;CACzB,CAAC;AAGF,MAAM,CAAC,MAAM,oBAAoB,GAAG,oEAAoE,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/webpack/constants.js"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAC7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAC7C,MAAM,CAAC,MAAM,sBAAsB,GAAG,QAAQ,CAAC;AAC/C,MAAM,CAAC,MAAM,uBAAuB,GAAG,SAAS,CAAC;AACjD,MAAM,CAAC,MAAM,wBAAwB,GAAG,UAAU,CAAC;AAEnD,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,qBAAqB;IACrB,qBAAqB;IACrB,sBAAsB;IACtB,uBAAuB;IACvB,wBAAwB;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,oBAAoB;IACpB,oBAAoB;IACpB,qBAAqB;IACrB,mBAAmB;IACnB,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,wBAAwB;CACzB,CAAC;AAEF,MAAM,cAAc,GAAG,iCAAiC,CAAC;AACzD,MAAM,YAAY,GAAG,uCAAuC,CAAC;AAC7D,MAAM,OAAO,GAAG,eAAe,CAAC;AAKhC,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,MAAM,CAAC;IAE7C,MAAM,cAAc,CAAC,MAAM,IAAI;IAE/B,KAAK;IAEH,OAAO,YAAY,CAAC,MAAM,SAAS;IAEnC,MAAM,YAAY,CAAC,MAAM,OAAO;IAEhC,MAAM,YAAY,CAAC,MAAM,GAAG;IAE5B,MAAM,OAAO,CAAC,MAAM,IAAI;IAC1B,GAAG;IAGH,MAAM;IACJ,OAAO,YAAY,CAAC,MAAM,SAAS;IACnC,MAAM,YAAY,CAAC,MAAM,GAAG;IAC5B,OAAO,YAAY,CAAC,MAAM,IAAI;IAChC,IAAI;IACJ,GAAG;CACJ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;AAMjB,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC;IAC1C,MAAM,cAAc,CAAC,MAAM,IAAI;IAE/B,KAAK;IACH,GAAG;IACD,OAAO,YAAY,CAAC,MAAM,SAAS;IACnC,SAAS,YAAY,CAAC,MAAM,QAAQ;IACpC,MAAM,YAAY,CAAC,MAAM,GAAG;IAC9B,GAAG;IACH,MAAM,OAAO,CAAC,MAAM,IAAI;IAC1B,GAAG;IAEH,MAAM;IACJ,GAAG;IACD,OAAO,YAAY,CAAC,MAAM,SAAS;IACnC,MAAM,YAAY,CAAC,MAAM,GAAG;IAC9B,GAAG;IACH,OAAO,YAAY,CAAC,MAAM,GAAG;IAC/B,IAAI;IACJ,GAAG;CACJ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC"}

package/lib-esm/webpack/extract/modules-packages.js

@@ -1,14 +1,34 @@
 import max from 'lodash/max';
 import last from 'lodash/last';
+import isEmpty from 'lodash/isEmpty';
 import { PACKAGES_SEPARATOR, PACKAGE_ID_SEPARATOR } from '../../config';
-import { MODULE_PATH_PACKAGES } from '../constants';
-const PACKAGE_PATH_REPLACE = /.*(node_modules|~)\/(.*)\/$/;
+import { MODULE_PATH_PACKAGES, PACKAGE_PATH_NAME } from '../constants';
+const uniqLast = (data) => {
+    const res = [];
+    data.forEach((item, index) => {
+        if (!data.slice(index + 1).includes(item)) {
+            res.push(item);
+        }
+    });
+    return res;
+};
 export const getPackageMetaFromModulePath = (modulePath) => {
     const paths = modulePath.match(MODULE_PATH_PACKAGES);
     if (!paths) {
         return null;
     }
-    const names = paths.map((packagePath) => packagePath.replace(PACKAGE_PATH_REPLACE, '$2'));
+    const names = uniqLast(paths
+        .map((packagePath) => {
+        const found = packagePath.matchAll(PACKAGE_PATH_NAME);
+        if (!found) {
+            return [];
+        }
+        return [...found].flat().slice(1).filter(Boolean).map((name) => name.replace(/\+/g, '/'));
+    })
+        .flat());
+    if (isEmpty(names)) {
+        return null;
+    }
     const name = last(names);
     const pattern = new RegExp(`(.*)(${last(paths)}).*`);
     const path = modulePath.replace(pattern, '$1$2').replace(/\/$/, '');

package/lib-esm/webpack/extract/modules-packages.js.map

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

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@bundle-stats/utils",
-  "version": "3.1.4-alpha.0",
+  "version": "3.2.1-alpha.0",
   "description": "BundleStats utils",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
   "types": "types/index.d.ts",
+  "sideEffects": false,
   "engines": {
     "node": ">= 12.0"
   },
@@ -34,16 +35,16 @@
   },
   "homepage": "https://github.com/relative-ci/bundle-stats/blob/master/packages/utils#readme",
   "dependencies": {
-    "@bundle-stats/plugin-webpack-filter": "^3.1.4-alpha.0",
-    "@bundle-stats/plugin-webpack-validate": "^3.1.4-alpha.0",
-    "convert-units": "^2.3.4",
+    "@bundle-stats/plugin-webpack-filter": "^3.2.1-alpha.0",
+    "@bundle-stats/plugin-webpack-validate": "^3.2.1-alpha.0",
+    "convert-units": "^3.0.0-beta.2",
     "query-string": "^7.0.0",
     "serialize-query-params": "^1.3.3"
   },
   "devDependencies": {
     "@types/jest": "26.0.24",
-    "@types/lodash": "4.14.172",
-    "core-js": "3.15.2",
+    "@types/lodash": "4.14.176",
+    "core-js": "3.19.0",
     "jest": "26.6.3",
     "jest-cli": "26.6.3",
     "jest-date-mock": "1.0.8",
@@ -53,8 +54,8 @@
     "ts-jest": "26.5.6"
   },
   "peerDependencies": {
-    "core-js": "^3.9.1",
-    "lodash": "^4.17.11"
+    "core-js": "^3.16.2",
+    "lodash": "^4.17.21"
   },
-  "gitHead": "903d336ce3f7a0bd060fbd1327b57c5783f133ff"
+  "gitHead": "fdb4b6931ebbc35ad469608725603cde5ecab9b7"
 }

package/src/utils/format.js

@@ -1,6 +1,8 @@
-import convert from 'convert-units';
+import configureMeasurements, { digital, time } from 'convert-units';
 import round from 'lodash/round';
 
+const convert = configureMeasurements({ digital, time });
+
 export const formatFileSize = (val) => {
   const res = convert(val).from('B').toBest();
   return `${round(res.val, 2)}${res.unit}`;

package/src/webpack/constants.js

@@ -24,5 +24,60 @@ export const SUMMARY_METRIC_PATHS = [
   'duplicatePackagesCount',
 ];
 
-// Extract npm package names from a module path
-export const MODULE_PATH_PACKAGES = /(node_modules|~)\/((!?@(([\w|\-|_|.]*)\/){2})|(([\w|\-|_|.]*)\/))/g;
+const PACKAGE_PREFIX = /(?:node_modules|~)(?:\/\.pnpm)?/;
+const PACKAGE_SLUG = /[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*/;
+const VERSION = /@[\w|\-|_|.]+/;
+
+// Extract package paths from module path
+// https://regex101.com/r/22Leep/6
+/* eslint-disable prettier/prettier */
+export const MODULE_PATH_PACKAGES = new RegExp([
+  // match dependency directory (eg: `node_modules/`, `node_modules/.pnpm/`)
+  `(?:${PACKAGE_PREFIX.source}/)`,
+  // match package name
+  '(?:',
+    // match `@organization/` or `@organization+`(pnpm)
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    // match github.com+organization+
+    `(?:${PACKAGE_SLUG.source}\\+)*`,
+    // match package name
+    `(?:${PACKAGE_SLUG.source})`,
+    // match version
+    `(?:${VERSION.source})?`,
+  ')',
+
+  // Match pnpm peer dependencies (eg: package-a@version_package-b@version)
+  '(?:_',
+    `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+    `(?:${PACKAGE_SLUG.source})`,
+    `(?:@${PACKAGE_SLUG.source})?`,
+  ')*',
+  '/',
+].join(''), 'g');
+/* eslint-enable prettier/prettier */
+
+// Extract package name from package path
+// https://regex101.com/r/tTlU0W/6
+/* eslint-disable prettier/prettier */
+export const PACKAGE_PATH_NAME = new RegExp([
+  `(?:${PACKAGE_PREFIX.source}/)`,
+  // match dependency
+  '(?:',
+    '(',
+      `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+      `(?:(?:${PACKAGE_SLUG.source}\\+)*)`,
+      `(?:${PACKAGE_SLUG.source})`,
+    ')',
+    `(?:${VERSION.source})?`,
+  ')',
+  // match peer dependency
+  '(?:_',
+    '(',
+      `(?:@${PACKAGE_SLUG.source}[/|+])?`,
+      `(?:${PACKAGE_SLUG.source})`,
+    ')',
+    `(?:@${PACKAGE_SLUG.source})`,
+  ')*',
+  '/',
+].join(''), 'g');
+/* eslint-enable prettier/prettier */

package/src/webpack/extract/modules-packages.ts

@@ -1,11 +1,22 @@
 import max from 'lodash/max';
 import last from 'lodash/last';
+import isEmpty from 'lodash/isEmpty';
 
 import { PACKAGES_SEPARATOR, PACKAGE_ID_SEPARATOR } from '../../config';
 import { PackageMetric, WebpackMetricsModules, WebpackMetricsPackages } from '../../constants';
-import { MODULE_PATH_PACKAGES } from '../constants';
+import { MODULE_PATH_PACKAGES, PACKAGE_PATH_NAME } from '../constants';
 
-const PACKAGE_PATH_REPLACE = /.*(node_modules|~)\/(.*)\/$/;
+const uniqLast = (data: Array<unknown>) => {
+  const res: Array<unknown> = [];
+
+  data.forEach((item, index) => {
+    if (!data.slice(index + 1).includes(item)) {
+      res.push(item);
+    }
+  });
+
+  return res;
+};
 
 /**
  * Heuristics to extract package id, name, and path from a module path
@@ -13,11 +24,33 @@ const PACKAGE_PATH_REPLACE = /.*(node_modules|~)\/(.*)\/$/;
 export const getPackageMetaFromModulePath = (modulePath: string) => {
   const paths = modulePath.match(MODULE_PATH_PACKAGES);
 
+  // No package paths found, skip
   if (!paths) {
     return null;
   }
 
-  const names = paths.map((packagePath) => packagePath.replace(PACKAGE_PATH_REPLACE, '$2'));
+  // Extract package names from module path
+  // @NOTE check for uniq for pnpm cases
+  const names = uniqLast(
+    paths
+      .map((packagePath) => {
+        // @ts-ignore
+        const found = packagePath.matchAll(PACKAGE_PATH_NAME);
+
+        if (!found) {
+          return [];
+        }
+
+        return [...found].flat().slice(1).filter(Boolean).map((name) => name.replace(/\+/g, '/'));
+      })
+      .flat(),
+  );
+
+  // If no names, skip
+  if (isEmpty(names)) {
+    return null;
+  }
+
   const name = last(names);
 
   // Get package full path

package/types/webpack/constants.d.ts

@@ -6,3 +6,4 @@ export const SECTION_WEBPACK_PACKAGES: "packages";
 export const SECTIONS: string[];
 export const SUMMARY_METRIC_PATHS: string[];
 export const MODULE_PATH_PACKAGES: RegExp;
+export const PACKAGE_PATH_NAME: RegExp;

package/types/webpack/extract/modules-packages.d.ts

@@ -1,7 +1,7 @@
 import { WebpackMetricsModules, WebpackMetricsPackages } from '../../constants';
 export declare const getPackageMetaFromModulePath: (modulePath: string) => {
     id: string;
-    name: string | undefined;
+    name: unknown;
     path: string;
 } | null;
 export declare const extractModulesPackages: (webpackStats?: any, currentExtractedData?: WebpackMetricsModules | undefined) => WebpackMetricsPackages;