@quarklab/rad-ui 0.3.8 → 0.3.10

package/dist/index.js

@@ -84,8 +84,19 @@ async function detectSrcDir(cwd) {
     if (await fs.pathExists(configPath)) {
       try {
         const raw = await fs.readFile(configPath, "utf-8");
-        const cleaned = raw.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
-        const config = JSON.parse(cleaned);
+        let config;
+        try {
+          config = JSON.parse(raw);
+        } catch {
+          const cleaned = raw.replace(
+            /("(?:[^"\\]|\\.)*")|\/\/.*$/gm,
+            (_, str) => str || ""
+          ).replace(
+            /("(?:[^"\\]|\\.)*")|\/\*[\s\S]*?\*\//g,
+            (_, str) => str || ""
+          ).replace(/,\s*([\]}])/g, "$1");
+          config = JSON.parse(cleaned);
+        }
         const paths = config?.compilerOptions?.paths;
         if (paths) {
           const aliasKey = Object.keys(paths).find(
@@ -94,7 +105,7 @@ async function detectSrcDir(cwd) {
           if (aliasKey) {
             const aliasTargets = paths[aliasKey];
             if (Array.isArray(aliasTargets) && aliasTargets.length > 0) {
-              const target = aliasTargets[0].replace(/^\.\//, "").replace(/\/\*$/, "");
+              const target = aliasTargets[0].replace(/^\.\//, "").replace(/\/?\*$/, "");
               return target === "" ? "." : target;
             }
           }
@@ -111,7 +122,7 @@ function getDefaultCssPath(projectType, srcDir) {
   const prefix = srcDir === "." ? "" : srcDir ? `${srcDir}/` : "src/";
   switch (projectType) {
     case "nextjs":
-      return `${prefix}/globals.css`;
+      return `${prefix}app/globals.css`;
     case "vite":
       return `${prefix}index.css`;
     case "cra":
@@ -488,7 +499,12 @@ async function initCommand(opts) {
   p.log.info(`Tailwind CSS: ${chalk2.cyan(tailwindVersion)}`);
   const srcDirDisplay = detectedSrcDir === "." ? "project root" : detectedSrcDir + "/";
   p.log.info(`Source directory: ${chalk2.cyan(srcDirDisplay)}`);
-  const examplePrefix = detectedSrcDir === "." ? "" : detectedSrcDir + "/";
+  const isRootNextJs = projectType === "nextjs" && detectedSrcDir === ".";
+  const aliasBase = isRootNextJs ? "@/app" : "@";
+  const defaultComponents = `${aliasBase}/components/ui`;
+  const defaultUtils = `${aliasBase}/lib/utils`;
+  const defaultHooks = `${aliasBase}/hooks`;
+  const examplePrefix = isRootNextJs ? "app/" : detectedSrcDir === "." ? "" : detectedSrcDir + "/";
   const responses = await p.group(
     {
       theme: () => p.select({
@@ -506,18 +522,18 @@ async function initCommand(opts) {
       }),
       componentsPath: () => p.text({
         message: `Where to add UI components (e.g. ${examplePrefix}components/ui):`,
-        placeholder: "@/components/ui",
-        defaultValue: "@/components/ui"
+        placeholder: defaultComponents,
+        defaultValue: defaultComponents
       }),
       utilsPath: () => p.text({
         message: `Where to create the cn() helper (e.g. ${examplePrefix}lib/utils.ts):`,
-        placeholder: "@/lib/utils",
-        defaultValue: "@/lib/utils"
+        placeholder: defaultUtils,
+        defaultValue: defaultUtils
       }),
       hooksPath: () => p.text({
         message: `Where to add hooks (e.g. ${examplePrefix}hooks):`,
-        placeholder: "@/hooks",
-        defaultValue: "@/hooks"
+        placeholder: defaultHooks,
+        defaultValue: defaultHooks
       }),
       cssPath: () => p.text({
         message: `Path to your global CSS file:`,
@@ -1045,7 +1061,7 @@ function transformImports(source, config) {
   );
   result = result.replace(
     /from\s+["']\.\/lib\/utils["']/g,
-    `from "@${utilsAlias}"`
+    `from "${utilsAlias}"`
   );
   return result;
 }
@@ -1247,7 +1263,7 @@ async function addCommand(componentNames, opts) {
       const fileType = classifyFile(relPath);
       let destPath;
       if (fileType === "component") {
-        destPath = path4.resolve(componentsDir, relPath);
+        destPath = path4.resolve(componentsDir, fileName);
       } else if (fileType === "hook") {
         destPath = path4.resolve(hooksDir, fileName);
         hooksCount++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quarklab/rad-ui",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "A CLI for adding Rad UI components to your project. Beautiful Persian-themed React components built on Radix UI and Tailwind CSS.",
   "license": "MIT",
   "type": "module",