grg-kit-cli 0.6.14 → 0.6.16

package/README.md

@@ -151,6 +151,14 @@ Examples:
 | `shell` | `sidebar`, `sidebar-footer`, `topnav`, `topnav-footer`, `collapsible`, `collapsible-footer` |
 | `settings` | `profile`, `security`, `notification`, `danger-zone` |
 
+**Search tags** (for MCP server discoverability):
+
+| Block | Search Terms |
+|-------|--------------|
+| `auth` | signin, sign-in, signup, register, password, credentials, onboarding |
+| `shell` | dashboard, admin, navbar, menu, left-nav, top-bar, wrapper |
+| `settings` | user-settings, my-account, configuration, notifications, privacy |
+
 ### `grg list [category]`
 
 List available blocks and themes.

package/commands/add.js

@@ -200,11 +200,6 @@ function showUsage(RESOURCES) {
  *   grg add component --all            # All components
  */
 async function addComponent(componentName, options) {
-  // Fetch catalog dynamically (with caching)
-  const spinner = ora('Fetching catalog...').start();
-  const RESOURCES = await fetchCatalog({ silent: true });
-  spinner.stop();
-
   // Handle --all flag (download all components)
   if (options.all) {
     console.log(chalk.bold.cyan(`\n📦 Adding all components\n`));
@@ -296,11 +291,6 @@ function showComponentUsage(RESOURCES) {
  *   grg add theme modern-minimal   # Download and set modern-minimal theme
  */
 async function addTheme(themeName, options) {
-  // Fetch catalog dynamically (with caching)
-  const spinner = ora('Fetching catalog...').start();
-  const RESOURCES = await fetchCatalog({ silent: true });
-  spinner.stop();
-
   // Validate theme name
   if (!themeName) {
     showThemeUsage(RESOURCES);
@@ -360,10 +350,12 @@ async function downloadTheme(theme, customOutput) {
       stylesContent = '';
     }
 
-    const themeImport = `@import './themes/${theme.file}';`;
+    // Use relative path from src/ to the theme file
+    const relativeThemePath = path.relative('src', outputPath).replace(/\\/g, '/');
+    const themeImport = `@import './${relativeThemePath}';`;
     
-    // Check if any theme is already imported
-    const themeImportRegex = /@import\s+['"]\.\/themes\/[^'"]+['"];?\n?/g;
+    // Check if any theme is already imported (match any .css file import from relative paths)
+    const themeImportRegex = /@import\s+['"]\.\/.+\.css['"];?\n?/g;
     const existingThemeImports = stylesContent.match(themeImportRegex);
     
     if (existingThemeImports && existingThemeImports.length > 0) {
@@ -400,7 +392,8 @@ async function downloadTheme(theme, customOutput) {
   } catch (error) {
     downloadSpinner.warn(chalk.yellow('Could not update src/styles.css automatically'));
     console.log(chalk.gray('\nPlease add the following to your src/styles.css:'));
-    console.log(chalk.cyan(`  @import './themes/${theme.file}';`));
+    const relativeThemePath = path.relative('src', outputPath).replace(/\\/g, '/');
+    console.log(chalk.cyan(`  @import './${relativeThemePath}';`));
   }
 
   console.log();

package/commands/init.js

@@ -10,6 +10,71 @@ const { RESOURCES, REPO } = require('../config/resources');
 
 const execAsync = promisify(exec);
 
+/**
+ * Strip comments and trailing commas from JSON (for tsconfig.json parsing)
+ * Handles: block comments, line comments, and trailing commas
+ * Preserves // inside strings (like URLs)
+ */
+function stripJsonComments(jsonString) {
+  let result = '';
+  let i = 0;
+  let inString = false;
+  let stringChar = '';
+  
+  while (i < jsonString.length) {
+    const char = jsonString[i];
+    const nextChar = jsonString[i + 1];
+    
+    // Handle string boundaries
+    if ((char === '"' || char === "'") && (i === 0 || jsonString[i - 1] !== '\\')) {
+      if (!inString) {
+        inString = true;
+        stringChar = char;
+      } else if (char === stringChar) {
+        inString = false;
+      }
+      result += char;
+      i++;
+      continue;
+    }
+    
+    // Inside a string, copy everything
+    if (inString) {
+      result += char;
+      i++;
+      continue;
+    }
+    
+    // Block comment /* ... */
+    if (char === '/' && nextChar === '*') {
+      const endIndex = jsonString.indexOf('*/', i + 2);
+      if (endIndex !== -1) {
+        i = endIndex + 2;
+        continue;
+      }
+    }
+    
+    // Line comment // ...
+    if (char === '/' && nextChar === '/') {
+      const endIndex = jsonString.indexOf('\n', i);
+      if (endIndex !== -1) {
+        i = endIndex;
+        continue;
+      } else {
+        break; // Comment goes to end of file
+      }
+    }
+    
+    result += char;
+    i++;
+  }
+  
+  // Remove trailing commas before } or ]
+  result = result.replace(/,(\s*[}\]])/g, '$1');
+  
+  return result;
+}
+
 /**
  * Download a file from a URL
  */
@@ -82,7 +147,7 @@ async function init(options) {
   // Step 2: Install Tailwind CSS v4
   spinner.start('Installing Tailwind CSS v4...');
   try {
-    await execAsync('npm install tailwindcss @tailwindcss/postcss postcss --force');
+    await execAsync('npm install tailwindcss @tailwindcss/postcss postcss --legacy-peer-deps');
     spinner.succeed(chalk.green('✓ Tailwind CSS v4 installed'));
   } catch (error) {
     spinner.fail(chalk.red('Failed to install Tailwind CSS v4'));
@@ -107,7 +172,7 @@ async function init(options) {
   // Step 4: Install Spartan-NG CLI
   spinner.start('Installing Spartan-NG CLI...');
   try {
-    await execAsync('npm install -D @spartan-ng/cli');
+    await execAsync('npm install -D @spartan-ng/cli --legacy-peer-deps');
     spinner.succeed(chalk.green('✓ Spartan-NG CLI installed'));
   } catch (error) {
     spinner.fail(chalk.red('Failed to install Spartan-NG CLI'));
@@ -135,14 +200,9 @@ async function init(options) {
     let tsconfigContent = await fs.readFile(tsconfigPath, 'utf-8');
     
     // Strip comments from tsconfig (Angular generates tsconfig with comments)
-    // Be careful not to strip // inside strings (like URLs)
-    tsconfigContent = tsconfigContent
-      .replace(/\/\*[\s\S]*?\*\//g, '') // Remove block comments
-      .replace(/^\s*\/\/.*/gm, '');     // Remove line comments (only at start of line after whitespace)
-    
-    // Remove trailing commas (common in tsconfig files)
-    tsconfigContent = tsconfigContent
-      .replace(/,(\s*[}\]])/g, '$1');
+    // This handles: /* block comments */, // line comments, and trailing commas
+    // We need to be careful not to strip // inside strings
+    tsconfigContent = stripJsonComments(tsconfigContent);
     
     const tsconfig = JSON.parse(tsconfigContent);
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grg-kit-cli",
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "CLI tool for pulling GRG Kit resources into your Angular project",
   "main": "index.js",
   "bin": {