@zeroheight/adoption-cli 2.4.2 → 3.0.0

package/dist/components/analyze/non-interactive-analyze.js

@@ -2,18 +2,19 @@ import React from "react";
 import { Box, Newline, Text } from "ink";
 import Spinner from "ink-spinner";
 import Link from "ink-link";
-import { calculateNumberOfComponents } from "../../commands/analyze.utils.js";
+import { calculateNumberOfColors, calculateNumberOfComponents, } from "../../commands/analyze.utils.js";
 import { readConfig } from "../../common/config.js";
-import { submitUsageData } from "../../common/api.js";
+import { submitComponentUsageData, submitTokenLiteralUsageData, } from "../../common/api.js";
 import { ApiError } from "../../common/errors.js";
-export default function NonInteractiveAnalyze({ repoName, onAnalyzeFiles, }) {
+export default function NonInteractiveAnalyze({ repoName, onAnalyzeFiles, onAnalyzeColorUsage, shouldAnalyzeComponentUsage, shouldAnalyzeTokenUsage, }) {
     const [isSendingData, setIsSendingData] = React.useState(false);
     const [isAnalyzingFiles, setIsAnalyzingFiles] = React.useState(false);
     const [isFetchingCredentials, setIsFetchingCredentials] = React.useState(false);
     const [errorFileLocation, setErrorFileLocation] = React.useState(null);
     const [errorList, setErrorList] = React.useState([]);
     const [credentials, setCredentials] = React.useState(null);
-    const [usage, setUsage] = React.useState(null);
+    const [componentUsage, setComponentUsage] = React.useState(null);
+    const [colorUsage, setColorUsage] = React.useState(null);
     async function loadCredentials() {
         setIsFetchingCredentials(true);
         try {
@@ -31,13 +32,13 @@ export default function NonInteractiveAnalyze({ repoName, onAnalyzeFiles, }) {
         }
         return null;
     }
-    async function sendData(result, repoName, credentials) {
+    async function sendComponentUsageData(result, repoName, credentials) {
         setIsSendingData(true);
         try {
-            await submitUsageData(result, repoName, credentials);
+            await submitComponentUsageData(result, repoName, credentials);
         }
         catch (e) {
-            let errorMessage = "Failed to send data to zeroheight";
+            let errorMessage = "Failed to send component usage data to zeroheight";
             if (e instanceof ApiError) {
                 errorMessage = e.message;
             }
@@ -47,10 +48,36 @@ export default function NonInteractiveAnalyze({ repoName, onAnalyzeFiles, }) {
             setIsSendingData(false);
         }
     }
-    async function anaylzeUsage() {
+    async function sendTokenUsageData(result, repoName, credentials) {
+        setIsSendingData(true);
+        try {
+            await submitTokenLiteralUsageData(result, repoName, credentials);
+        }
+        catch (e) {
+            let errorMessage = "Failed to send color usage data to zeroheight";
+            if (e instanceof ApiError) {
+                errorMessage = e.message;
+            }
+            setErrorList((s) => [...s, errorMessage]);
+        }
+        finally {
+            setIsSendingData(false);
+        }
+    }
+    async function analyzeComponentUsage() {
         setIsAnalyzingFiles(true);
         const { errorFile, usage } = await onAnalyzeFiles();
-        setUsage(usage);
+        setComponentUsage(usage);
+        if (errorFile) {
+            setErrorFileLocation(errorFile);
+        }
+        setIsAnalyzingFiles(false);
+        return usage;
+    }
+    async function analyzeTokenUsage() {
+        setIsAnalyzingFiles(true);
+        const { errorFile, usage } = await onAnalyzeColorUsage();
+        setColorUsage(usage);
         if (errorFile) {
             setErrorFileLocation(errorFile);
         }
@@ -62,18 +89,25 @@ export default function NonInteractiveAnalyze({ repoName, onAnalyzeFiles, }) {
             const credentials = await loadCredentials();
             if (!credentials)
                 return;
-            const usage = await anaylzeUsage();
             if (!repoName)
                 return;
-            await sendData(usage, repoName, credentials);
+            if (shouldAnalyzeComponentUsage) {
+                const componentUsageMap = await analyzeComponentUsage();
+                await sendComponentUsageData(componentUsageMap, repoName, credentials);
+            }
+            if (shouldAnalyzeTokenUsage) {
+                const colorUsageMap = await analyzeTokenUsage();
+                await sendTokenUsageData(colorUsageMap, repoName, credentials);
+            }
         })();
     }, []);
     if (isAnalyzingFiles || isFetchingCredentials || isSendingData) {
         return (React.createElement(Text, null,
             React.createElement(Spinner, { type: "dots" }),
-            isAnalyzingFiles && React.createElement(Text, null, "Analyzing components"),
+            " ",
+            isAnalyzingFiles && React.createElement(Text, null, "Analyzing files"),
             isFetchingCredentials && React.createElement(Text, null, "Loading credentials"),
-            isSendingData && React.createElement(Text, null, "Sending data to zerohegiht")));
+            isSendingData && React.createElement(Text, null, "Sending data to zeroheight")));
     }
     if (errorList.length > 0) {
         return (React.createElement(Box, { flexDirection: "column" },
@@ -115,12 +149,16 @@ export default function NonInteractiveAnalyze({ repoName, onAnalyzeFiles, }) {
             " ",
             React.createElement(Text, { italic: true }, "--interactive false")));
     }
-    if (!usage) {
+    if (!componentUsage && !colorUsage) {
         return React.createElement(Text, null, "No usage could be found.");
     }
-    return (React.createElement(React.Fragment, null, usage && (React.createElement(Text, { color: "green" },
-        calculateNumberOfComponents(usage),
-        " components found and sent to",
-        " ",
-        React.createElement(Text, { color: "#f63e7c" }, "zeroheight")))));
+    return (React.createElement(React.Fragment, null,
+        componentUsage && (React.createElement(Text, { color: "green" },
+            calculateNumberOfComponents(componentUsage),
+            " components found and sent to ",
+            React.createElement(Text, { color: "#f63e7c" }, "zeroheight"))),
+        colorUsage && (React.createElement(Text, { color: "green" },
+            calculateNumberOfColors(colorUsage),
+            " usages of raw colors found and sent to ",
+            React.createElement(Text, { color: "#f63e7c" }, "zeroheight")))));
 }

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

@@ -22,7 +22,9 @@ export default function NoCredentialsOnboarding({ onCheckCredentials, onSaveCred
         React.createElement(Text, null,
             "If you need a new auth token, generate them from the",
             " ",
-            React.createElement(Link, { url: "https://zeroheight.com/settings/team/developers" }, "Developer Settings")),
+            React.createElement(Link, { url: "https://zeroheight.com/settings/team/developers" },
+                React.createElement(Text, { underline: true, color: "#f63e7c" }, "Developer Settings"))),
+        React.createElement(Newline, null),
         field === "client" && (React.createElement(Box, null,
             React.createElement(Text, null, "Client ID: "),
             React.createElement(TextInput, { onChange: setClient, value: client, onSubmit: (v) => {

package/dist/components/color-usage-table.d.ts

@@ -0,0 +1,7 @@
+import * as React from "react";
+import { RawColorUsageMap } from "../commands/analyze.js";
+interface ColorUsageTableProps {
+    usage: RawColorUsageMap;
+}
+export default function ColorUsageTable({ usage }: ColorUsageTableProps): React.JSX.Element;
+export {};

package/dist/components/color-usage-table.js

@@ -0,0 +1,38 @@
+import * as React from "react";
+import { Box, Text } from "ink";
+const colorTypeNameMap = {
+    hex: "HEX",
+    rgb: "RGB",
+    hsla: "HSL",
+    oklab: "Oklab",
+    hwb: "HWB",
+    lab: "LAB",
+    lch: "LCH",
+    colorSpace: "Color space",
+    totalCount: "Total usage",
+};
+export default function ColorUsageTable({ usage }) {
+    const rows = Array.from(usage.entries());
+    return (React.createElement(Box, { flexDirection: "column" }, rows.map(([filepath, rawColorUsage]) => {
+        const rowValues = Object.entries(rawColorUsage);
+        return (React.createElement(Box, { key: filepath, flexDirection: "column" },
+            React.createElement(Text, { color: "green" }, filepath),
+            React.createElement(Box, { flexDirection: "column", marginLeft: 2 },
+                React.createElement(Box, { flexDirection: "column", marginLeft: 2 }, rowValues.map(([type, values]) => {
+                    if (type === "totalCount")
+                        return null;
+                    const count = values.length;
+                    if (count === 0)
+                        return null;
+                    const name = colorTypeNameMap[type];
+                    return (React.createElement(Box, { gap: 2, key: `${type}-${count}` },
+                        React.createElement(Text, { bold: true },
+                            name,
+                            ": "),
+                        React.createElement(Text, null, count)));
+                })),
+                React.createElement(Text, { bold: true },
+                    "Total usage: ",
+                    rawColorUsage.totalCount))));
+    })));
+}

package/dist/components/latest-version-info.d.ts

@@ -0,0 +1,9 @@
+import * as React from "react";
+interface LatestVersionInfoProps {
+    latestVersion: string;
+}
+/**
+ * Rich help banner with info about the latest version
+ */
+export default function LatestVersionInfo({ latestVersion, }: LatestVersionInfoProps): React.JSX.Element;
+export {};

package/dist/components/latest-version-info.js

@@ -0,0 +1,27 @@
+import * as React from "react";
+import { Box, Text } from "ink";
+import Link from "ink-link";
+import { CURRENT_VERSION } from "../cli.js";
+/**
+ * Rich help banner with info about the latest version
+ */
+export default function LatestVersionInfo({ latestVersion, }) {
+    const isMajorVersionOut = Number(CURRENT_VERSION.split(".")[0]) < Number(latestVersion.split(".")[0]);
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Box, { borderStyle: "double", paddingLeft: 1, paddingRight: 1, marginBottom: 1, flexDirection: "column" },
+            React.createElement(Box, { justifyContent: "center", marginBottom: 1 },
+                React.createElement(Text, null, "\uD83D\uDC4B It seems you're not using the latest version of this package")),
+            React.createElement(Box, { flexDirection: "column", alignItems: "center", marginBottom: 1 },
+                React.createElement(Box, null,
+                    React.createElement(Text, { color: isMajorVersionOut ? "redBright" : "blueBright", bold: true }, CURRENT_VERSION),
+                    React.createElement(Text, { bold: true }, ` -> `),
+                    React.createElement(Text, { color: "green", bold: true }, latestVersion)),
+                React.createElement(Box, null,
+                    React.createElement(Text, null, "Update using: "),
+                    React.createElement(Text, { bold: true }, "npm i @zeroheight/adoption-cli"))),
+            React.createElement(Box, { flexDirection: "column", alignItems: "center" },
+                React.createElement(Text, null,
+                    "For more information on the latest version, check",
+                    " ",
+                    React.createElement(Link, { url: "https://www.npmjs.com/package/@zeroheight/adoption-cli" }, "here"))))));
+}

package/dist/components/track-package/non-interactive-track-package.d.ts

@@ -1,2 +1,5 @@
 import React from "react";
-export default function NonInteractiveTrackPackage(): React.JSX.Element;
+export interface NonInteractiveTrackPackageProps {
+    allowedPackages?: string[];
+}
+export default function NonInteractiveTrackPackage({ allowedPackages, }: NonInteractiveTrackPackageProps): React.JSX.Element;

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

@@ -13,7 +13,7 @@ var Step;
     Step[Step["MULTIPLE_PACKAGES_FOUND"] = 3] = "MULTIPLE_PACKAGES_FOUND";
     Step[Step["SINGLE_PACKAGE_FOUND"] = 4] = "SINGLE_PACKAGE_FOUND";
 })(Step || (Step = {}));
-export default function NonInteractiveTrackPackage() {
+export default function NonInteractiveTrackPackage({ allowedPackages, }) {
     const { exit } = useApp();
     const [currentStep, setCurrentStep] = React.useState(Step.FINDING_DETAILS);
     const [errorMessage, setErrorMessage] = React.useState(null);
@@ -22,7 +22,7 @@ export default function NonInteractiveTrackPackage() {
     const [packageVersion, setPackageVersion] = React.useState(null);
     async function runTrackPackage() {
         const config = (await readConfig()) ?? { token: "temp", client: "temp" };
-        const { files, error } = await getPackageInfo();
+        const { files, error } = await getPackageInfo(allowedPackages);
         try {
             if (files.length === 1) {
                 const { name, path, version, exports } = files[0];
@@ -83,7 +83,7 @@ export default function NonInteractiveTrackPackage() {
             " searching for package file...")),
         currentStep === Step.SINGLE_PACKAGE_FOUND && (React.createElement(React.Fragment, null,
             React.createElement(Text, null,
-                React.createElement(Text, { color: "green" }, "Details founds:"),
+                React.createElement(Text, { color: "green" }, "Details found:"),
                 " ",
                 packageName,
                 "@",

package/dist/components/ui/continue-prompt.js

@@ -5,7 +5,10 @@ export default function ContinuePrompt({ onContinue }) {
     const [shouldContinueText, setShouldContinueText] = React.useState("");
     return (React.createElement(Box, null,
         React.createElement(Text, null,
-            "Continue? ",
+            "Send this data to ",
+            React.createElement(Text, { color: "#f63e7c" }, "zeroheight"),
+            "?",
+            " ",
             React.createElement(Text, { dimColor: true }, "(Y/n):")),
         React.createElement(ConfirmInput, { isChecked: true, value: shouldContinueText, onChange: setShouldContinueText, onSubmit: (answer) => {
                 onContinue(answer);

package/package.json

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