@zeroheight/adoption-cli 3.0.0 → 3.0.2

package/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Release notes
 
-## [3.0.0](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/3.0.0) - 15th March 2025
+## [3.0.2](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/3.0.2) - 8th April 2025
+
+- Fix bug where not sending component usage data to zeroheight would exit you from the analyze flow
+- Improve clarity of command flow wording
+- Improve clarity of authentication errors
+
+## [3.0.1](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/3.0.1) - 25th March 2025
+
+- Fix bug where color analysis didn't occur when using non-interactive mode
+
+## [3.0.0](https://www.npmjs.com/package/@zeroheight/adoption-cli/v/3.0.0) - 25th March 2025
 
 - `analyze` command updated to collect date about color usage
   - For non-interactive command new flags introduced: `--color-usage` and `--component-usage`

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 declare const program: Command;
-export declare const CURRENT_VERSION = "3.0.0";
+export declare const CURRENT_VERSION = "3.0.2";
 export default program;

package/dist/cli.js

@@ -10,7 +10,7 @@ import { monitorRepoCommand } from "./commands/monitor-repo.js";
 import { trackPackageCommand } from "./commands/track-package.js";
 import logger, { setFileStream } from "./common/logging.js";
 const program = new Command();
-export const CURRENT_VERSION = "3.0.0";
+export const CURRENT_VERSION = "3.0.2";
 async function getLatestPackageVersion() {
     const response = await fetch("https://registry.npmjs.org/@zeroheight/adoption-cli/latest");
     const json = await response.json();

package/dist/commands/analyze.d.ts

@@ -7,7 +7,7 @@ interface AnalyzeOptions {
     repoName?: string;
     interactive: boolean;
     componentUsage: boolean;
-    tokenUsage: boolean;
+    colorUsage: boolean;
 }
 export type RawComponentUsageMap = Map<string, RawUsage[]>;
 export type RawColorUsageMap = Map<string, RawColorUsage>;

package/dist/commands/analyze.js

@@ -11,7 +11,7 @@ export async function analyzeAction(options, renderOptions) {
         render(React.createElement(Analyze, { onAnalyzeFiles: () => analyzeFiles(options.extensions, options.ignore), onAnalyzeColorUsage: () => analyzeRawColorUsage(options.extensions, options.ignore), repoName: options.repoName }), renderOptions);
     }
     else {
-        render(React.createElement(NonInteractiveAnalyze, { repoName: options.repoName, onAnalyzeFiles: () => analyzeFiles(options.extensions, options.ignore), onAnalyzeColorUsage: () => analyzeRawColorUsage(options.extensions, options.ignore), shouldAnalyzeComponentUsage: options.componentUsage, shouldAnalyzeTokenUsage: options.tokenUsage }));
+        render(React.createElement(NonInteractiveAnalyze, { repoName: options.repoName, onAnalyzeFiles: () => analyzeFiles(options.extensions, options.ignore), onAnalyzeColorUsage: () => analyzeRawColorUsage(options.extensions, options.ignore), shouldAnalyzeComponentUsage: options.componentUsage, shouldAnalyzeTokenUsage: options.colorUsage }));
     }
 }
 export function analyzeCommand() {

package/dist/common/api.js

@@ -1,4 +1,4 @@
-import { MaxRetriesError, UnauthorizedError, UnknownError } from "./errors.js";
+import { IncorrectScopeError, MaxRetriesError, UnauthorizedError, UnknownError, } from "./errors.js";
 import logger from "./logging.js";
 const API_PATH = "/open_api/v2";
 export var ResponseStatus;
@@ -98,7 +98,12 @@ async function request(path, credentials, init) {
         }
         else if (response.status < 200 || response.status >= 300) {
             logger.error({ response: { status: response.status, body: await response.text() } }, "API request failed");
-            throw new UnknownError();
+            if (response.status === 403) {
+                throw new IncorrectScopeError();
+            }
+            else {
+                throw new UnknownError();
+            }
         }
         const responseJson = await response.json();
         logger.info({ response: { status: response.status, body: responseJson } }, "API response");

package/dist/common/errors.d.ts

@@ -4,6 +4,9 @@ export declare class ApiError extends Error {
 export declare class UnauthorizedError extends ApiError {
     constructor();
 }
+export declare class IncorrectScopeError extends ApiError {
+    constructor();
+}
 export declare class UnknownError extends ApiError {
     constructor();
 }

package/dist/common/errors.js

@@ -9,6 +9,11 @@ export class UnauthorizedError extends ApiError {
         super("Unauthorized. Please reset your authentication by running: npx @zeroheight/adoption-cli auth");
     }
 }
+export class IncorrectScopeError extends ApiError {
+    constructor() {
+        super("The authentication token used does not have the correct scope. \n\nPlease create a new authentication token with the 'Adoption' scopes and then reset your authentication by running: npx @zeroheight/adoption-cli auth");
+    }
+}
 export class UnknownError extends ApiError {
     constructor() {
         super("An unknown error occurred while calling the zeroheight API");

package/dist/components/analyze/analyze.js

@@ -98,7 +98,6 @@ export default function Analyze({ onAnalyzeFiles, onAnalyzeColorUsage, repoName,
         }
         else {
             setCurrentStage(AnalyzeStage.tuConfirmRun);
-            exit();
         }
     }
     async function fetchCredentials() {
@@ -246,9 +245,9 @@ export default function Analyze({ onAnalyzeFiles, onAnalyzeColorUsage, repoName,
     if (errorList.length > 0) {
         return (React.createElement(Box, { flexDirection: "column" },
             React.createElement(Text, { color: "red" }, "Error:"),
-            React.createElement(Box, { flexDirection: "column", marginLeft: 1 }, errorList.map((e) => (React.createElement(Text, { key: e },
-                "- ",
-                e))))));
+            React.createElement(Box, { flexDirection: "column", marginLeft: 1 }, errorList.map((e) => (React.createElement(React.Fragment, null,
+                React.createElement(Text, { key: e }, e),
+                React.createElement(Newline, null)))))));
     }
     if (currentStage === AnalyzeStage.initial) {
         return (React.createElement(Box, { flexDirection: "column" },

package/dist/components/auth/credentials-already-exists.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Box, Text } from "ink";
+import { Box, Newline, Text } from "ink";
 import Link from "ink-link";
 import CredentialsPreview from "./credentials-preview.js";
 /**
@@ -7,10 +7,10 @@ import CredentialsPreview from "./credentials-preview.js";
  */
 export default function CredentialsAlreadyExists({ configPath, existingConfig, }) {
     return (React.createElement(Box, { flexDirection: "column" },
-        React.createElement(Text, { bold: true, color: "yellow" }, "Credentials already exist"),
+        React.createElement(Text, { bold: true, color: "yellow" }, "You already have your authentication credentials set up"),
+        React.createElement(Newline, null),
         React.createElement(Text, null,
-            "You already have credentials in",
-            " ",
+            "You can find them in: ",
             React.createElement(Link, { url: configPath }, configPath)),
         React.createElement(CredentialsPreview, { client: existingConfig.client, token: existingConfig.token })));
 }

package/dist/components/auth/no-credentials-onboarding.js

@@ -19,6 +19,11 @@ export default function NoCredentialsOnboarding({ onCheckCredentials, onSaveCred
         await onSaveCredentials(answer, client.trim(), token.trim());
     };
     return (React.createElement(Box, { flexDirection: "column" },
+        React.createElement(Text, null,
+            "\uD83D\uDC4B Welcome to the ",
+            React.createElement(Text, { color: "#f63e7c" }, "zeroheight"),
+            " adoption CLI tool"),
+        React.createElement(Newline, null),
         React.createElement(Text, null,
             "If you need a new auth token, generate them from the",
             " ",

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

@@ -111,9 +111,12 @@ export default function NonInteractiveMonitorRepo({ packageDirs, packageName, })
                 React.createElement(Text, { color: "green" },
                     React.createElement(Spinner, { type: "dots" })),
                 `${name} - sending data to zeroheight...`)),
-            step === Step.COMPLETE && (React.createElement(Text, null,
-                React.createElement(Text, { color: "green" }, "Success: "),
-                `${name} - sent to your zeroheight account`)),
+            step === Step.COMPLETE && (React.createElement(Box, { flexDirection: "column" },
+                React.createElement(Text, { color: "green" }, "Success"),
+                React.createElement(Text, null,
+                    "Packages being used by ",
+                    name,
+                    " have been sent to your zeroheight account"))),
             step === Step.ERRORED && (React.createElement(Text, null,
                 React.createElement(Text, { color: "red" }, "Error: "),
                 `${name} - ${error}`))))),

package/dist/components/track-package/track-package.js

@@ -16,9 +16,8 @@ var Step;
     Step[Step["MULTIPLE_PACKAGES_FOUND"] = 3] = "MULTIPLE_PACKAGES_FOUND";
     Step[Step["MULTIPLE_PACKAGES_SELECT"] = 4] = "MULTIPLE_PACKAGES_SELECT";
     Step[Step["SENDING_DETAILS"] = 5] = "SENDING_DETAILS";
-    Step[Step["SHOULD_SEND_ALL"] = 6] = "SHOULD_SEND_ALL";
-    Step[Step["SHOULD_SENDING_DETAILS"] = 7] = "SHOULD_SENDING_DETAILS";
-    Step[Step["SINGLE_PACKAGE_FOUND"] = 8] = "SINGLE_PACKAGE_FOUND";
+    Step[Step["SHOULD_SENDING_DETAILS"] = 6] = "SHOULD_SENDING_DETAILS";
+    Step[Step["SINGLE_PACKAGE_FOUND"] = 7] = "SINGLE_PACKAGE_FOUND";
 })(Step || (Step = {}));
 export default function TrackPackage() {
     const { exit } = useApp();
@@ -83,7 +82,7 @@ export default function TrackPackage() {
             setCurrentStep(Step.MULTIPLE_PACKAGES_SELECT);
         }
         else {
-            setCurrentStep(Step.SHOULD_SEND_ALL);
+            handleSendToZh(true);
         }
     };
     const handlePackageSelected = ({ label, }) => {
@@ -139,21 +138,23 @@ export default function TrackPackage() {
                 " Searching for package file..."));
         case Step.SINGLE_PACKAGE_FOUND:
             return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, null,
-                    React.createElement(Text, { color: "green" }, "Details founds:"),
-                    " ",
-                    packageName,
-                    "@",
-                    packageVersion),
+                React.createElement(Text, null, "The following package details have been found:"),
+                React.createElement(Box, { marginLeft: 1, marginTop: 0.5 },
+                    React.createElement(Text, null,
+                        "\uD83D\uDCE6 ",
+                        packageName,
+                        "@",
+                        packageVersion)),
                 React.createElement(Newline, null),
                 React.createElement(Text, null,
-                    "Send to zeroheight? ",
+                    "Send details to zeroheight? ",
                     React.createElement(Text, { dimColor: true }, "(Y/n):")),
                 React.createElement(ConfirmInput, { isChecked: true, onChange: setShouldSend, onSubmit: handleSendToZh, value: shouldSend })));
         case Step.MULTIPLE_PACKAGES_FOUND:
             return (React.createElement(Box, { flexDirection: "column" },
                 React.createElement(Text, null,
                     React.createElement(Text, { color: "green" },
+                        "\uD83D\uDCE6 ",
                         packageFiles.length,
                         " package files found")),
                 React.createElement(Newline, null),
@@ -179,15 +180,6 @@ export default function TrackPackage() {
                     "Send to zeroheight? ",
                     React.createElement(Text, { dimColor: true }, "(Y/n):")),
                 React.createElement(ConfirmInput, { isChecked: true, onChange: setShouldSend, onSubmit: handleSendToZh, value: shouldSend })));
-        case Step.SHOULD_SEND_ALL:
-            return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, null,
-                    "Send ",
-                    packageFiles.length,
-                    " packages to zeroheight?",
-                    " ",
-                    React.createElement(Text, { dimColor: true }, "(Y/n):")),
-                React.createElement(ConfirmInput, { isChecked: true, onChange: setShouldSend, onSubmit: handleSendToZh, value: shouldSend })));
         case Step.SENDING_DETAILS:
             return (React.createElement(Text, null,
                 React.createElement(Text, { color: "green" },

package/package.json

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