@zeroheight/adoption-cli 2.4.0 → 2.4.2

package/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Release notes
 
-## [2.4.0](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/2.4.0) - 10th December 2024
+## [2.4.2](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/2.4.2) - 17th December 2024
+
+- Fix issue with parsing pnpm lockfiles using version `6.0`
+
+## [2.4.1](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/2.4.1) - 11th December 2024
 
-- `analyze --ignore` option can be used moe than once to allow for more glob patterns, this fixes an issue in **2.3.0** where glob patterns containing commas would not work as expected
+- The monitor-repo command now supports custom package naming for projects.
+
+## [2.4.0](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/2.4.0) - 10th December 2024
 
+- `analyze --ignore` option can be used more than once to allow for more glob patterns, this fixes an issue in **2.3.0** where glob patterns containing commas would not work as expected
 
 ## [2.3.0](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/2.3.0) - 5th December 2024
 

package/dist/cli.js

@@ -13,7 +13,7 @@ const { output, cleanup } = render(React.createElement(HelpInfo, null));
 program
     .name("zh-adoption")
     .description("CLI for measuring design system usage usage in your products")
-    .version("2.4.0")
+    .version("2.4.2")
     .addHelpText("before", output)
     .option("--log-file <path>", "Path to write logs to, if not provided logs only error logs will be written to stderr")
     .addOption(new Option("--log-level <level>", "The lowest level of logs to display")

package/dist/commands/monitor-repo.d.ts

@@ -3,6 +3,7 @@ import { RenderOptions } from "ink";
 interface MonitorRepoOptions {
     interactive: boolean;
     dir?: string[];
+    packageName?: string;
 }
 export declare function monitorRepoAction(options: MonitorRepoOptions, _renderOptions?: RenderOptions): Promise<void>;
 export declare function monitorRepoCommand(): Command;

package/dist/commands/monitor-repo.js

@@ -8,7 +8,7 @@ export async function monitorRepoAction(options, _renderOptions) {
     // if (options.interactive) {
     //   render(<MonitorRepo />, renderOptions);
     // } else {
-    render(React.createElement(NonInteractiveMonitorRepo, { packageDirs: options.dir }));
+    render(React.createElement(NonInteractiveMonitorRepo, { packageDirs: options.dir, packageName: options.packageName }));
     // }
 }
 export function monitorRepoCommand() {
@@ -28,6 +28,7 @@ export function monitorRepoCommand() {
         //     .argParser((value) => yn(value))
         // )
         .addOption(new Option("-d, --dir <path...>", "use package directory to find package.json and lockfile"))
+        .addOption(new Option("-p, --package-name <name>", "specify the name used to identify the package in zeroheight"))
         .action(async (options) => {
         setStdErrStream();
         try {

package/dist/components/monitor-repo/non-interactive-monitor-repo.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 interface NonInteractiveMonitorRepoProps {
     packageDirs?: string[];
+    packageName?: string;
 }
-export default function NonInteractiveMonitorRepo({ packageDirs, }: NonInteractiveMonitorRepoProps): React.JSX.Element;
+export default function NonInteractiveMonitorRepo({ packageDirs, packageName, }: NonInteractiveMonitorRepoProps): React.JSX.Element;
 export {};

package/dist/components/monitor-repo/non-interactive-monitor-repo.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Box, Text } from "ink";
 import Spinner from "ink-spinner";
-import { join as joinPath } from "path";
+import { basename, join as joinPath } from "path";
 import { findLockfiles, getPackageMeta, groupByBasename, parseLockfile, } from "../../commands/monitor-repo.utils.js";
 import { findPackageFiles } from "../../commands/track-package.utils.js";
 import { ResponseStatus, submitMonitoredRepoDetails, } from "../../common/api.js";
@@ -15,7 +15,7 @@ var Step;
     Step[Step["FINDING_DETAILS"] = 2] = "FINDING_DETAILS";
     Step[Step["SENDING_DATA"] = 3] = "SENDING_DATA";
 })(Step || (Step = {}));
-export default function NonInteractiveMonitorRepo({ packageDirs, }) {
+export default function NonInteractiveMonitorRepo({ packageDirs, packageName, }) {
     const [errorMessage, setErrorMessage] = React.useState(); // Global error message
     const [repoStatus, setRepoStatus] = React.useState({});
     function updateRepoStatus(name, step, error) {
@@ -51,6 +51,13 @@ export default function NonInteractiveMonitorRepo({ packageDirs, }) {
             let packageMeta;
             try {
                 packageMeta = await getPackageMeta(joinPath(directory, "package.json"));
+                if (packageName) {
+                    packageMeta.name = packageName;
+                }
+                if (!packageMeta.name) {
+                    setErrorMessage(`Name field is missing in your ${basename(directory)}/package.json file. Re-run the command with --package-name <name> to continue.`);
+                    continue;
+                }
             }
             catch (e) {
                 // package.json doesn't exist or is invalid, skip pair

package/dist/lockfile-parsers/pnpm-lock-parser.js

@@ -37,7 +37,13 @@ _PNPMLockParser_instances = new WeakSet(), _PNPMLockParser_parseV5 = function _P
 }, _PNPMLockParser_parseV6 = function _PNPMLockParser_parseV6(data) {
     return Object.keys(data.packages)
         .map((packagePair) => {
-        const [name, version] = packagePair.split("@");
+        const lastIndex = packagePair.lastIndexOf("@");
+        let name = packagePair.slice(0, lastIndex);
+        const version = packagePair.slice(lastIndex + 1);
+        // v6 lockfiles have a leading slash
+        if (name.startsWith("/")) {
+            name = name.slice(1);
+        }
         return { name, version };
     })
         .filter((p) => p.name && p.version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeroheight/adoption-cli",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "license": "ISC",
   "main": "dist/cli.js",
   "bin": {