@srcroot/ui 0.0.39 → 0.0.40

package/dist/index.js

@@ -372,11 +372,12 @@ async function init(options) {
   await initializer.run();
 }
 
-// src/cli/commands/add.ts
+// src/cli/services/component-adder.ts
 import fs4 from "fs-extra";
 import path4 from "path";
 import ora2 from "ora";
 import prompts2 from "prompts";
+import { execa as execa2 } from "execa";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/cli/registry.ts
@@ -755,121 +756,192 @@ var REGISTRY = {
     description: "AI chat interface",
     category: "Data Display",
     dependencies: ["button", "input", "scroll-area", "avatar"]
+  },
+  chart: {
+    file: "ui/chart.tsx",
+    description: "Charts using Recharts",
+    category: "Data Display",
+    dependencies: [],
+    registryDependencies: ["recharts"]
   }
 };
 
-// src/cli/commands/add.ts
+// src/cli/services/component-adder.ts
 var __dirname4 = path4.dirname(fileURLToPath3(import.meta.url));
-async function add(components, options) {
-  const cwd = path4.resolve(options.cwd);
-  if (options.all) {
-    components = Object.keys(REGISTRY);
+var ComponentAdder = class {
+  cwd;
+  options;
+  constructor(cwd, options) {
+    this.cwd = cwd;
+    this.options = options;
   }
-  if (components.length === 0) {
-    const { items } = await prompts2({
-      type: "multiselect",
-      name: "items",
-      message: "Which components would you like to add?",
-      hint: "Space to select. A to toggle all. Enter to submit.",
-      instructions: false,
-      choices: Object.keys(REGISTRY).map((name) => ({
-        title: name,
-        value: name
-      }))
-    });
-    if (!items || items.length === 0) {
-      logger.warn("No components selected.");
-      process.exit(0);
+  async add(components) {
+    components = await this.resolveComponents(components);
+    const { valid, invalid } = this.validateComponents(components);
+    if (invalid.length > 0) {
+      logger.error(`Unknown components: ${invalid.join(", ")}`);
+      console.log("\nRun '@srcroot/ui list' to see available components.");
+      process.exit(1);
     }
-    components = items;
-  }
-  const validComponents = [];
-  const invalidComponents = [];
-  for (const comp of components) {
-    if (comp in REGISTRY) {
-      validComponents.push(comp);
-    } else {
-      invalidComponents.push(comp);
+    const { componentDeps, packageDeps } = this.resolveDependencies(valid);
+    this.logPlan(componentDeps, packageDeps);
+    if (packageDeps.size > 0) {
+      await this.installPackages(Array.from(packageDeps));
     }
+    await this.copyComponents(Array.from(componentDeps));
+    logger.success("\n\u2705 Components added successfully!\n");
   }
-  if (invalidComponents.length > 0) {
-    logger.error(`Unknown components: ${invalidComponents.join(", ")}`);
-    console.log("\nRun '@srcroot/ui list' to see available components.");
-    process.exit(1);
+  async resolveComponents(components) {
+    if (this.options.all) {
+      return Object.keys(REGISTRY);
+    }
+    if (components.length === 0) {
+      const { items } = await prompts2({
+        type: "multiselect",
+        name: "items",
+        message: "Which components would you like to add?",
+        hint: "Space to select. A to toggle all. Enter to submit.",
+        instructions: false,
+        choices: Object.keys(REGISTRY).map((name) => ({
+          title: name,
+          value: name
+        }))
+      });
+      if (!items || items.length === 0) {
+        logger.warn("No components selected.");
+        process.exit(0);
+      }
+      return items;
+    }
+    return components;
   }
-  const toInstall = /* @__PURE__ */ new Set();
-  function resolveDeps(name) {
-    if (toInstall.has(name)) return;
-    toInstall.add(name);
-    const comp = REGISTRY[name];
-    if (comp.dependencies) {
-      for (const dep of comp.dependencies) {
-        resolveDeps(dep);
+  validateComponents(components) {
+    const valid = [];
+    const invalid = [];
+    for (const comp of components) {
+      if (comp in REGISTRY) {
+        valid.push(comp);
+      } else {
+        invalid.push(comp);
       }
     }
+    return { valid, invalid };
   }
-  for (const comp of validComponents) {
-    resolveDeps(comp);
+  resolveDependencies(components) {
+    const componentDeps = /* @__PURE__ */ new Set();
+    const packageDeps = /* @__PURE__ */ new Set();
+    const resolve = (name) => {
+      if (componentDeps.has(name)) return;
+      componentDeps.add(name);
+      const comp = REGISTRY[name];
+      if (comp.dependencies) {
+        for (const dep of comp.dependencies) {
+          resolve(dep);
+        }
+      }
+      if (comp.registryDependencies) {
+        for (const pkg of comp.registryDependencies) {
+          packageDeps.add(pkg);
+        }
+      }
+    };
+    for (const comp of components) {
+      resolve(comp);
+    }
+    return { componentDeps, packageDeps };
   }
-  const componentsToAdd = Array.from(toInstall);
-  if (componentsToAdd.length > 10) {
-    logger.info(`
+  logPlan(componentDeps, packageDeps) {
+    const componentsToAdd = Array.from(componentDeps);
+    const packagesToInstall = Array.from(packageDeps);
+    if (componentsToAdd.length > 10) {
+      logger.info(`
 \u{1F4E6} Adding ${componentsToAdd.length} components...
 `);
-  } else {
-    logger.info("\n\u{1F4E6} Adding components:\n");
-    componentsToAdd.forEach((name) => {
-      console.log(`  - ${name}`);
-    });
+    } else {
+      logger.info("\n\u{1F4E6} Adding components:\n");
+      componentsToAdd.forEach((name) => {
+        console.log(`  - ${name}`);
+      });
+    }
+    if (packagesToInstall.length > 0) {
+      logger.info("\n\u{1F4E6} Installing dependencies:\n");
+      packagesToInstall.forEach((pkg) => {
+        console.log(`  - ${pkg}`);
+      });
+    }
+    console.log();
   }
-  console.log();
-  const spinner = ora2("Adding components...").start();
-  const hasSrc = fs4.existsSync(path4.join(cwd, "src"));
-  const srcPath = hasSrc ? path4.join(cwd, "src") : cwd;
-  const componentsDir = path4.join(srcPath, "components", "ui");
-  try {
-    await fs4.ensureDir(componentsDir);
-    for (const name of componentsToAdd) {
-      const comp = REGISTRY[name];
-      const fileName = path4.basename(comp.file);
-      const targetPath = path4.join(componentsDir, fileName);
-      if (fs4.existsSync(targetPath) && !options.overwrite) {
-        spinner.stop();
-        const { overwrite } = await prompts2({
-          type: "confirm",
-          name: "overwrite",
-          message: `${fileName} already exists. Overwrite?`,
-          initial: false
-        });
-        if (!overwrite) {
-          spinner.info(`Skipped ${fileName}`);
+  async installPackages(packages) {
+    const packageManager = getPackageManager(this.cwd);
+    const spinner = ora2("Installing dependencies...").start();
+    const installCmd = packageManager === "npm" ? "install" : "add";
+    try {
+      await execa2(packageManager, [installCmd, ...packages], {
+        cwd: this.cwd
+      });
+      spinner.succeed("Dependencies installed");
+    } catch (error) {
+      spinner.fail("Failed to install dependencies");
+      logger.error(error);
+      logger.warn(`
+Please manually install: ${packages.join(" ")}`);
+    }
+  }
+  async copyComponents(components) {
+    const spinner = ora2("Adding components...").start();
+    const hasSrc = fs4.existsSync(path4.join(this.cwd, "src"));
+    const srcPath = hasSrc ? path4.join(this.cwd, "src") : this.cwd;
+    const componentsDir = path4.join(srcPath, "components", "ui");
+    try {
+      await fs4.ensureDir(componentsDir);
+      for (const name of components) {
+        const comp = REGISTRY[name];
+        const fileName = path4.basename(comp.file);
+        const targetPath = path4.join(componentsDir, fileName);
+        if (fs4.existsSync(targetPath) && !this.options.overwrite) {
+          spinner.stop();
+          const { overwrite } = await prompts2({
+            type: "confirm",
+            name: "overwrite",
+            message: `${fileName} already exists. Overwrite?`,
+            initial: false
+          });
+          if (!overwrite) {
+            spinner.info(`Skipped ${fileName}`);
+            spinner.start("Adding components...");
+            continue;
+          }
           spinner.start("Adding components...");
+        }
+        const registryPath = path4.resolve(__dirname4, "..", "..", "registry", comp.file);
+        if (!fs4.existsSync(registryPath)) {
+          spinner.warn(`Registry file not found for ${name}: ${registryPath}`);
           continue;
         }
-        spinner.start("Adding components...");
-      }
-      const registryPath = path4.resolve(__dirname4, "..", "src", "registry", comp.file);
-      if (!fs4.existsSync(registryPath)) {
-        spinner.warn(`Registry file not found for ${name}: ${registryPath}`);
-        continue;
+        const content = await fs4.readFile(registryPath, "utf-8");
+        await fs4.writeFile(targetPath, content);
+        if (components.length > 10) {
+          spinner.text = `Adding ${fileName}...`;
+        } else {
+          spinner.succeed(`Added ${fileName}`);
+        }
       }
-      const content = await fs4.readFile(registryPath, "utf-8");
-      await fs4.writeFile(targetPath, content);
-      if (componentsToAdd.length > 10) {
-        spinner.text = `Adding ${fileName}...`;
-      } else {
-        spinner.succeed(`Added ${fileName}`);
+      if (components.length > 10) {
+        spinner.succeed(`Added ${components.length} components`);
       }
+    } catch (error) {
+      spinner.fail("Failed to add components");
+      console.error(error);
+      process.exit(1);
     }
-    if (componentsToAdd.length > 10) {
-      spinner.succeed(`Added ${componentsToAdd.length} components`);
-    }
-    logger.success("\n\u2705 Components added successfully!\n");
-  } catch (error) {
-    spinner.fail("Failed to add components");
-    console.error(error);
-    process.exit(1);
   }
+};
+
+// src/cli/commands/add.ts
+async function add(components, options) {
+  const cwd = process.cwd();
+  const adder = new ComponentAdder(cwd, options);
+  await adder.add(components);
 }
 
 // src/cli/commands/list.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srcroot/ui",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "description": "A UI library with polymorphic, accessible React components",
   "type": "module",
   "bin": {

package/src/registry/analytics/google-tag-manager.tsx

@@ -11,7 +11,7 @@ interface GoogleTagManagerProps {
 }
 
 const GoogleTagManager: FC<GoogleTagManagerProps> = ({ containers }) => {
-    const defaultServer = 'https://www.googletagmanager.com/gtm.js';
+    const defaultServer = 'https://www.googletagmanager.com';
 
     // Group containers by tagServer to avoid duplicate script loads
     const scriptsMap = containers.reduce((map, container) => {
@@ -32,7 +32,7 @@ const GoogleTagManager: FC<GoogleTagManagerProps> = ({ containers }) => {
                 __html: `
           ${ids
                         .map(
-                            id => `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s);j.async=true;j.src="${server}?"+i;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','${id}');`
+                            id => `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s);j.async=true;j.src="${server}/gtm.js?"+i;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','${id}');`
                         )
                         .join('')}
         `,
@@ -45,7 +45,7 @@ const GoogleTagManager: FC<GoogleTagManagerProps> = ({ containers }) => {
             {scriptElements}
 
             <noscript>
-                {containers.map(({ gtmId, tagServer = defaultServer }) => (
+                {containers.map(({ gtmId, tagServerUrl = defaultServer }) => (
                     <iframe
                         key={gtmId}
                         src={`${tagServer}/ns.html?id=${gtmId}`}

package/src/registry/ui/chart.tsx

@@ -0,0 +1,371 @@
+"use client"
+
+import * as React from "react"
+import { ResponsiveContainer } from "recharts"
+
+import { cn } from "@/lib/utils"
+
+// Format: { THEME_NAME: CSS_VARIABLE }
+const THEMES = { light: "", dark: ".dark" } as const
+
+export type ChartConfig = {
+    [k in string]: {
+        label?: React.ReactNode
+        icon?: React.ComponentType
+    } & (
+        | { color?: string; theme?: never }
+        | { color?: never; theme: Record<keyof typeof THEMES, string> }
+    )
+}
+
+type ChartContextProps = {
+    config: ChartConfig
+}
+
+const ChartContext = React.createContext<ChartContextProps | null>(null)
+
+function useChart() {
+    const context = React.useContext(ChartContext)
+
+    if (!context) {
+        throw new Error("useChart must be used within a <ChartContainer />")
+    }
+
+    return context
+}
+
+const ChartContainer = React.forwardRef<
+    HTMLDivElement,
+    React.ComponentProps<"div"> & {
+        config: ChartConfig
+        children: React.ComponentProps<typeof ResponsiveContainer>["children"]
+    }
+>(({ id, className, children, config, ...props }, ref) => {
+    const uniqueId = React.useId()
+    const chartId = `chart-${id || uniqueId.replace(/:/g, "")}`
+
+    return (
+        <ChartContext.Provider value={{ config }}>
+            <div
+                data-chart={chartId}
+                ref={ref}
+                className={cn(
+                    "flex aspect-video justify-center text-xs [&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground [&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-border/50 [&_.recharts-curve.recharts-tooltip-cursor]:stroke-border [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-none [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-border [&_.recharts-radial-bar-background-sector]:fill-muted [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted [&_.recharts-reference-line_[stroke='#ccc']]:stroke-border [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-sector]:outline-none [&_.recharts-surface]:outline-none",
+                    className
+                )}
+                {...props}
+            >
+                <ChartStyle id={chartId} config={config} />
+                <ResponsiveContainer>
+                    {children}
+                </ResponsiveContainer>
+            </div>
+        </ChartContext.Provider>
+    )
+})
+ChartContainer.displayName = "ChartContainer"
+
+const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
+    const colorConfig = Object.entries(config).filter(
+        ([_, config]) => config.theme || config.color
+    )
+
+    if (!colorConfig.length) {
+        return null
+    }
+
+    return (
+        <style
+            dangerouslySetInnerHTML={{
+                __html: Object.entries(THEMES)
+                    .map(
+                        ([theme, prefix]) => `
+${prefix} [data-chart=${id}] {
+${colorConfig
+                                .map(([key, itemConfig]) => {
+                                    const color =
+                                        itemConfig.theme?.[theme as keyof typeof itemConfig.theme] ||
+                                        itemConfig.color
+                                    return color ? `  --color-${key}: ${color};` : null
+                                })
+                                .join("\n")}
+}
+`
+                    )
+                    .join("\n"),
+            }}
+        />
+    )
+}
+
+const ChartTooltip = ChartTooltipPrimitive
+
+const ChartTooltipContent = React.forwardRef<
+    HTMLDivElement,
+    React.ComponentProps<typeof ChartTooltipPrimitive> &
+    React.ComponentProps<"div"> & {
+        hideLabel?: boolean
+        hideIndicator?: boolean
+        indicator?: "line" | "dot" | "dashed"
+        nameKey?: string
+        labelKey?: string
+    }
+>(
+    (
+        {
+            active,
+            payload,
+            className,
+            indicator = "dot",
+            hideLabel = false,
+            hideIndicator = false,
+            label,
+            labelFormatter,
+            labelClassName,
+            formatter,
+            color,
+            nameKey,
+            labelKey,
+        },
+        ref
+    ) => {
+        const { config } = useChart()
+
+        const tooltipLabel = React.useMemo(() => {
+            if (hideLabel || !payload?.length) {
+                return null
+            }
+
+            const [item] = payload
+            const key = `${labelKey || item.dataKey || item.name || "value"}`
+            const itemConfig = getPayloadConfigFromPayload(config, item, key)
+            const value =
+                !labelKey && typeof label === "string"
+                    ? config[label as keyof typeof config]?.label || label
+                    : itemConfig?.label
+
+            if (labelFormatter) {
+                return (
+                    <div className={cn("font-medium", labelClassName)}>
+                        {labelFormatter(value, payload)}
+                    </div>
+                )
+            }
+
+            return value ? (
+                <div className={cn("font-medium", labelClassName)}>{value}</div>
+            ) : null
+        }, [
+            label,
+            labelFormatter,
+            payload,
+            hideLabel,
+            labelClassName,
+            config,
+            labelKey,
+        ])
+
+        if (!active || !payload?.length) {
+            return null
+        }
+
+        const nestLabel = payload.length === 1 && indicator !== "dot"
+
+        return (
+            <div
+                ref={ref}
+                className={cn(
+                    "grid min-w-[8rem] items-start gap-1.5 rounded-lg border border-border/50 bg-background px-2.5 py-1.5 text-xs shadow-xl",
+                    className
+                )}
+            >
+                {!nestLabel ? tooltipLabel : null}
+                <div className="grid gap-1.5">
+                    {payload.map((item, index) => {
+                        const key = `${nameKey || item.name || item.dataKey || "value"}`
+                        const itemConfig = getPayloadConfigFromPayload(config, item, key)
+                        const indicatorColor = color || item.payload.fill || item.color
+
+                        return (
+                            <div
+                                key={item.dataKey}
+                                className={cn(
+                                    "flex items-center gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5 [&>svg]:text-muted-foreground",
+                                    indicator === "dot" && "items-center"
+                                )}
+                            >
+                                {formatter && item?.value !== undefined && item.name ? (
+                                    formatter(item.value, item.name, item, index, item.payload)
+                                ) : (
+                                    <>
+                                        {itemConfig?.icon ? (
+                                            <itemConfig.icon />
+                                        ) : (
+                                            !hideIndicator && (
+                                                <div
+                                                    className={cn(
+                                                        "shrink-0 rounded-[2px] border-[--color-border] bg-[--color-bg]",
+                                                        {
+                                                            "h-2.5 w-2.5": indicator === "dot",
+                                                            "w-1": indicator === "line",
+                                                            "w-0 border-[1.5px] border-dashed bg-transparent":
+                                                                indicator === "dashed",
+                                                            "my-0.5": nestLabel && indicator === "dashed",
+                                                        }
+                                                    )}
+                                                    style={
+                                                        {
+                                                            "--color-bg": indicatorColor,
+                                                            "--color-border": indicatorColor,
+                                                        } as React.CSSProperties
+                                                    }
+                                                />
+                                            )
+                                        )}
+                                        <div
+                                            className={cn(
+                                                "flex flex-1 justify-between leading-none",
+                                                nestLabel ? "items-end" : "items-center"
+                                            )}
+                                        >
+                                            <div className="grid gap-1.5">
+                                                {nestLabel ? tooltipLabel : null}
+                                                <span className="text-muted-foreground">
+                                                    {itemConfig?.label || item.name}
+                                                </span>
+                                            </div>
+                                            {item.value && (
+                                                <span className="font-mono font-medium text-foreground tabular-nums">
+                                                    {item.value.toLocaleString()}
+                                                </span>
+                                            )}
+                                        </div>
+                                    </>
+                                )}
+                            </div>
+                        )
+                    })}
+                </div>
+            </div>
+        )
+    }
+)
+ChartTooltipContent.displayName = "ChartTooltip"
+
+const ChartLegend = ChartLegendPrimitive
+
+const ChartLegendContent = React.forwardRef<
+    HTMLDivElement,
+    React.ComponentProps<"div"> &
+    Pick<React.ComponentProps<typeof ChartLegendPrimitive>, "payload" | "verticalAlign"> & {
+        hideIcon?: boolean
+        nameKey?: string
+    }
+>(
+    (
+        { className, hideIcon = false, payload, verticalAlign = "bottom", nameKey },
+        ref
+    ) => {
+        const { config } = useChart()
+
+        if (!payload?.length) {
+            return null
+        }
+
+        return (
+            <div
+                ref={ref}
+                className={cn(
+                    "flex items-center justify-center gap-4",
+                    verticalAlign === "top" ? "pb-3" : "pt-3",
+                    className
+                )}
+            >
+                {payload.map((item) => {
+                    const key = `${nameKey || item.dataKey || "value"}`
+                    const itemConfig = getPayloadConfigFromPayload(config, item, key)
+
+                    return (
+                        <div
+                            key={item.value}
+                            className={cn(
+                                "flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3 [&>svg]:text-muted-foreground"
+                            )}
+                        >
+                            {itemConfig?.icon && !hideIcon ? (
+                                <itemConfig.icon />
+                            ) : (
+                                <div
+                                    className="h-2 w-2 shrink-0 rounded-[2px]"
+                                    style={{
+                                        backgroundColor: item.color,
+                                    }}
+                                />
+                            )}
+                            {itemConfig?.label}
+                        </div>
+                    )
+                })}
+            </div>
+        )
+    }
+)
+ChartLegendContent.displayName = "ChartLegend"
+
+// Helper to extract item config from a payload.
+function getPayloadConfigFromPayload(
+    config: ChartConfig,
+    payload: unknown,
+    key: string
+) {
+    if (typeof payload !== "object" || payload === null) {
+        return undefined
+    }
+
+    const payloadPayload =
+        "payload" in payload &&
+            typeof payload.payload === "object" &&
+            payload.payload !== null
+            ? payload.payload
+            : undefined
+
+    let configLabelKey: string = key
+
+    if (
+        key in payload &&
+        typeof payload[key as keyof typeof payload] === "string"
+    ) {
+        configLabelKey = payload[key as keyof typeof payload] as string
+    } else if (
+        payloadPayload &&
+        key in payloadPayload &&
+        typeof payloadPayload[key as keyof typeof payloadPayload] === "string"
+    ) {
+        configLabelKey = payloadPayload[
+            key as keyof typeof payloadPayload
+        ] as string
+    }
+
+    return configLabelKey in config
+        ? config[configLabelKey]
+        : config[key as keyof typeof config]
+}
+
+// Recharts Primitive Imports - We import specific components to avoid large bundle reference but for now let's just use * and assume tree shaking or specific imports in consuming app.
+// However, the above code uses RechartsPrimitive.Tooltip and Legend.
+// Ideally we should import them from recharts.
+
+import {
+    Legend as ChartLegendPrimitive,
+    Tooltip as ChartTooltipPrimitive,
+    ResponsiveContainer,
+} from "recharts"
+
+export {
+    ChartContainer,
+    ChartTooltip,
+    ChartTooltipContent,
+    ChartLegend,
+    ChartLegendContent,
+    ChartStyle,
+}

package/src/registry/ui/sidebar.tsx

@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from "react"
-import { PanelLeft } from "lucide-react"
+import { LuPanelLeft } from "react-icons/lu";
 import { cva, type VariantProps } from "class-variance-authority"
 
 import { cn } from "@/lib/utils"
@@ -236,7 +236,7 @@ const SidebarTrigger = React.forwardRef<
             }}
             {...props}
         >
-            <PanelLeft />
+            <LuPanelLeft />
             <span className="sr-only">Toggle Sidebar</span>
         </Button>
     )