scss-variable-extractor 1.5.3 → 1.6.2

package/bin/cli.js

@@ -11,6 +11,7 @@ const { generateVariablesFile, generateReport } = require('../src/generator');
 const { refactorScssFiles } = require('../src/refactorer');
 const { analyzeAngularPatterns, refactorAngularPatterns, generateAngularPatternReport } = require('../src/ng-refactorer');
 const { detectBootstrap, migrateBootstrapToMaterial, generateBootstrapReport } = require('../src/bootstrap-migrator');
+const { analyzeStyleOrganization, generateOrganizationReport } = require('../src/style-organizer');
 
 const program = new Command();
 
@@ -589,4 +590,63 @@ program
     }
   });
 
+// Analyze style organization command
+program
+  .command('analyze-organization')
+  .description('Analyze style organization and get recommendations for best practices')
+  .argument('[src]', 'Source directory to scan (optional if using angular.json)')
+  .option('--format <format>', 'Report format (table, json, markdown)', 'table')
+  .option('--config <path>', 'Path to config file')
+  .option('--angular-json <path>', 'Path to angular.json file')
+  .option('--project <name>', 'Angular project name (uses default if not specified)')
+  .option('--no-angular', 'Disable angular.json integration')
+  .action(async (src, options) => {
+    try {
+      console.log(chalk.cyan.bold('\n📋 Style Organization Analysis\n'));
+      
+      const config = loadConfig(options.config, {
+        useAngularJson: options.angular !== false,
+        angularJsonPath: options.angularJson,
+        projectName: options.project
+      });
+      if (src) config.src = src;
+      
+      // Show Angular project info if available
+      if (config.angular) {
+        console.log(chalk.cyan(`Angular Project: ${config.angular.project}`));
+        console.log(chalk.gray(`Prefix: ${config.angular.prefix}`));
+        console.log(chalk.gray(`Style: ${config.angular.stylePreprocessor}\n`));
+      }
+      
+      console.log(chalk.gray(`Scanning: ${config.src}\n`));
+      
+      // Scan files
+      const files = await scanScssFiles(config.src, config.ignore);
+      console.log(chalk.green(`✓ Found ${files.length} SCSS files\n`));
+      
+      // Analyze organization
+      const analysis = analyzeStyleOrganization(files, config);
+      
+      // Generate report
+      const report = generateOrganizationReport(analysis, options.format);
+      console.log(report);
+      
+      // Provide guidance
+      if (analysis.recommendations.length > 0) {
+        console.log(chalk.yellow.bold('💡 Next Steps:\n'));
+        console.log(chalk.gray('1. Review recommendations above'));
+        console.log(chalk.gray('2. Run "refactor" command to extract variables'));
+        console.log(chalk.gray('3. Run "modernize" to remove anti-patterns'));
+        console.log(chalk.gray('4. Consider restructuring based on suggested organization'));
+        console.log(chalk.gray('5. Use @use instead of @import for better modularity\n'));
+      } else {
+        console.log(chalk.green('✓ Your styles are well organized!\n'));
+      }
+      
+    } catch (error) {
+      console.error(chalk.red('✗ Error:'), error.message);
+      process.exit(1);
+    }
+  });
+
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scss-variable-extractor",
-  "version": "1.5.3",
+  "version": "1.6.2",
   "description": "Analyzes Angular SCSS files and extracts repeated hardcoded values into reusable variables",
   "bin": {
     "scss-extract": "./bin/cli.js"
@@ -14,7 +14,10 @@
     "analyze-patterns": "node bin/cli.js analyze-patterns .",
     "modernize": "node bin/cli.js modernize .",
     "detect-bootstrap": "node bin/cli.js detect-bootstrap .",
-    "migrate-bootstrap": "node bin/cli.js migrate-bootstrap ."
+    "migrate-bootstrap": "node bin/cli.js migrate-bootstrap .",
+    "release": "npm test && npm version patch && npm publish && git push --follow-tags",
+    "release:minor": "npm test && npm version minor && npm publish && git push --follow-tags",
+    "release:major": "npm test && npm version major && npm publish && git push --follow-tags"
   },
   "keywords": [
     "angular",

package/src/index.js

@@ -7,6 +7,7 @@ const { refactorScssFiles } = require('./refactorer');
 const { analyzeAngularPatterns, refactorAngularPatterns, generateAngularPatternReport } = require('./ng-refactorer');
 const angularParser = require('./angular-parser');
 const { detectBootstrap, migrateBootstrapToMaterial, generateBootstrapReport } = require('./bootstrap-migrator');
+const { analyzeStyleOrganization, generateOrganizationReport } = require('./style-organizer');
 
 module.exports = {
   loadConfig,
@@ -22,5 +23,7 @@ module.exports = {
   angularParser,
   detectBootstrap,
   migrateBootstrapToMaterial,
-  generateBootstrapReport
+  generateBootstrapReport,
+  analyzeStyleOrganization,
+  generateOrganizationReport
 };

package/src/refactorer.js

@@ -57,7 +57,7 @@ function refactorFile(content, analysis, variablesFilePath, currentFilePath, con
     
     // Check if replacements are in safe zones
     matches.forEach(m => {
-      if (!isInSafeZone(content, m.index)) {
+      if (!isInSafeZone(content, m.index, m.matched)) {
         // Replace the value
         const before = newContent;
         newContent = replaceAt(newContent, m.matched, variableName, m.index);
@@ -109,14 +109,31 @@ function buildValueMap(analysis) {
 function createReplacementRegex(value) {
   // Escape special regex characters
   const escaped = value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-  // Match the value with word boundaries or specific contexts
-  return new RegExp(escaped, 'g');
+  
+  // Add appropriate boundaries based on value type to prevent partial matches
+  
+  if (/^#[0-9a-fA-F]+$/.test(value)) {
+    // Hex colors - no word boundary before #, but check after
+    return new RegExp(`${escaped}\\b`, 'g');
+  } else if (/\d+(?:px|%|em|rem|vh|vw|pt|ch|ex)$/.test(value)) {
+    // Values with CSS units - ensure not part of larger number
+    return new RegExp(`(?<!\\d)${escaped}\\b`, 'g');
+  } else if (/^-?\d+(?:\.\d+)?$/.test(value)) {
+    // Pure numbers (including decimals) - ensure not part of larger number
+    return new RegExp(`(?<!\\d)${escaped}(?!\\d)`, 'g');
+  } else if (/^rgba?\(/.test(value)) {
+    // RGB/RGBA colors - match complete function
+    return new RegExp(escaped, 'g');
+  } else {
+    // Other values (keywords, etc.) - use word boundaries
+    return new RegExp(`\\b${escaped}\\b`, 'g');
+  }
 }
 
 /**
  * Checks if a position in content is in a safe zone (should not be replaced)
  */
-function isInSafeZone(content, position) {
+function isInSafeZone(content, position, matchedValue) {
   // Check for variable declarations
   const lineStart = content.lastIndexOf('\n', position);
   const lineEnd = content.indexOf('\n', position);
@@ -127,6 +144,20 @@ function isInSafeZone(content, position) {
     return true;
   }
   
+  // Check if we're in the middle of a larger number or value
+  const charBefore = content.charAt(position - 1);
+  const charAfter = content.charAt(position + matchedValue.length);
+  
+  // Prevent replacement if surrounded by digits (partial number match)
+  if (/\d/.test(charBefore) || (/^\d+$/.test(matchedValue) && /\d/.test(charAfter))) {
+    return true;
+  }
+  
+  // Prevent replacement if it would create invalid variable concatenation
+  if (charBefore === '$' || charAfter === '$') {
+    return true;
+  }
+  
   // Check for @use, @forward, @import
   if (/@(?:use|forward|import)/.test(line)) {
     return true;

package/src/style-organizer.js

@@ -0,0 +1,499 @@
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Analyzes style organization across the project
+ * @param {Array<string>} scssFiles - Array of SCSS file paths
+ * @param {Object} config - Configuration options
+ * @returns {Object} - Organization analysis results
+ */
+function analyzeStyleOrganization(scssFiles, config = {}) {
+  const analysis = {
+    summary: {
+      totalFiles: scssFiles.length,
+      componentStyles: 0,
+      globalStyles: 0,
+      utilityFiles: 0,
+      themeFiles: 0,
+      mixinFiles: 0
+    },
+    duplicates: {
+      selectors: [],
+      rules: [],
+      mixins: []
+    },
+    imports: {
+      global: [],
+      component: [],
+      unused: [],
+      circular: []
+    },
+    recommendations: [],
+    structure: {
+      current: {},
+      suggested: {}
+    }
+  };
+
+  const selectorMap = new Map(); // Track selector usage across files
+  const ruleMap = new Map(); // Track identical rule blocks
+  const mixinMap = new Map(); // Track mixin definitions
+  const importMap = new Map(); // Track import statements
+
+  scssFiles.forEach(filePath => {
+    const content = fs.readFileSync(filePath, 'utf8');
+    const fileName = path.basename(filePath);
+    const fileInfo = analyzeFile(content, filePath);
+
+    // Categorize file type
+    if (fileName.includes('theme') || fileName.includes('_variables')) {
+      analysis.summary.themeFiles++;
+    } else if (fileName.includes('mixin') || fileName.includes('_mixins')) {
+      analysis.summary.mixinFiles++;
+    } else if (fileName.includes('util') || fileName.includes('helper')) {
+      analysis.summary.utilityFiles++;
+    } else if (filePath.includes('styles.scss') || filePath.includes('global')) {
+      analysis.summary.globalStyles++;
+    } else if (fileName.includes('.component.scss')) {
+      analysis.summary.componentStyles++;
+    }
+
+    // Track selectors
+    fileInfo.selectors.forEach(selector => {
+      if (!selectorMap.has(selector)) {
+        selectorMap.set(selector, []);
+      }
+      selectorMap.get(selector).push({ file: filePath, content: fileInfo.selectorContent[selector] });
+    });
+
+    // Track rules
+    fileInfo.rules.forEach(rule => {
+      const ruleKey = rule.replace(/\s+/g, ' ').trim();
+      if (!ruleMap.has(ruleKey)) {
+        ruleMap.set(ruleKey, []);
+      }
+      ruleMap.get(ruleKey).push(filePath);
+    });
+
+    // Track mixins
+    fileInfo.mixins.forEach(mixin => {
+      if (!mixinMap.has(mixin)) {
+        mixinMap.set(mixin, []);
+      }
+      mixinMap.get(mixin).push(filePath);
+    });
+
+    // Track imports
+    fileInfo.imports.forEach(importPath => {
+      if (!importMap.has(importPath)) {
+        importMap.set(importPath, []);
+      }
+      importMap.get(importPath).push(filePath);
+    });
+  });
+
+  // Analyze duplicates
+  selectorMap.forEach((files, selector) => {
+    if (files.length > 1) {
+      analysis.duplicates.selectors.push({
+        selector,
+        count: files.length,
+        files: files.map(f => f.file)
+      });
+    }
+  });
+
+  ruleMap.forEach((files, rule) => {
+    if (files.length > 2 && rule.length > 50) { // Only report significant duplicates
+      analysis.duplicates.rules.push({
+        rule: rule.substring(0, 100) + '...',
+        count: files.length,
+        files
+      });
+    }
+  });
+
+  mixinMap.forEach((files, mixin) => {
+    if (files.length > 1) {
+      analysis.duplicates.mixins.push({
+        mixin,
+        count: files.length,
+        files
+      });
+    }
+  });
+
+  // Analyze imports
+  analyzeImportPatterns(importMap, analysis, scssFiles);
+
+  // Generate recommendations
+  generateRecommendations(analysis, config);
+
+  // Suggest structure
+  suggestStructure(analysis, config);
+
+  return analysis;
+}
+
+/**
+ * Analyzes a single SCSS file
+ * @param {string} content - File content
+ * @param {string} filePath - File path
+ * @returns {Object} - File analysis
+ */
+function analyzeFile(content, filePath) {
+  const selectors = [];
+  const selectorContent = {};
+  const rules = [];
+  const mixins = [];
+  const imports = [];
+
+  // Extract selectors
+  const selectorRegex = /([.#]?[\w-]+(?:\s*[>+~]\s*[\w-]+)*)\s*\{([^}]*)\}/g;
+  let match;
+  while ((match = selectorRegex.exec(content)) !== null) {
+    const selector = match[1].trim();
+    const ruleContent = match[2].trim();
+    selectors.push(selector);
+    selectorContent[selector] = ruleContent;
+    if (ruleContent.length > 20) {
+      rules.push(match[0]);
+    }
+  }
+
+  // Extract mixins
+  const mixinRegex = /@mixin\s+([\w-]+)/g;
+  while ((match = mixinRegex.exec(content)) !== null) {
+    mixins.push(match[1]);
+  }
+
+  // Extract imports
+  const importRegex = /@(?:import|use|forward)\s+['"]([^'"]+)['"]/g;
+  while ((match = importRegex.exec(content)) !== null) {
+    imports.push(match[1]);
+  }
+
+  return {
+    selectors,
+    selectorContent,
+    rules,
+    mixins,
+    imports
+  };
+}
+
+/**
+ * Analyzes import patterns
+ * @param {Map} importMap - Map of imports
+ * @param {Object} analysis - Analysis object
+ * @param {Array} scssFiles - All SCSS files
+ */
+function analyzeImportPatterns(importMap, analysis, scssFiles) {
+  const fileSet = new Set(scssFiles.map(f => path.basename(f, '.scss')));
+
+  importMap.forEach((importingFiles, importPath) => {
+    const isGlobal = importPath.includes('variables') || 
+                     importPath.includes('theme') || 
+                     importPath.includes('mixins');
+    
+    if (isGlobal && importingFiles.length > 5) {
+      analysis.imports.global.push({
+        path: importPath,
+        usedIn: importingFiles.length,
+        suggestion: 'Consider adding to global styles.scss'
+      });
+    } else if (importingFiles.length === 1) {
+      analysis.imports.unused.push({
+        path: importPath,
+        file: importingFiles[0],
+        suggestion: 'Potentially unused or should be in component file'
+      });
+    }
+
+    // Check for component-level imports
+    importingFiles.forEach(file => {
+      if (file.includes('.component.scss')) {
+        analysis.imports.component.push({
+          path: importPath,
+          component: path.basename(file)
+        });
+      }
+    });
+  });
+}
+
+/**
+ * Generates organization recommendations
+ * @param {Object} analysis - Analysis object
+ * @param {Object} config - Configuration
+ */
+function generateRecommendations(analysis, config) {
+  const recs = analysis.recommendations;
+
+  // Duplicate selectors
+  if (analysis.duplicates.selectors.length > 0) {
+    recs.push({
+      priority: 'high',
+      category: 'duplication',
+      title: 'Duplicate selectors detected',
+      description: `Found ${analysis.duplicates.selectors.length} selectors used in multiple files`,
+      action: 'Extract common selectors to shared utility files or use mixins',
+      files: analysis.duplicates.selectors.slice(0, 5)
+    });
+  }
+
+  // Duplicate rules
+  if (analysis.duplicates.rules.length > 0) {
+    recs.push({
+      priority: 'high',
+      category: 'duplication',
+      title: 'Duplicate CSS rules detected',
+      description: `Found ${analysis.duplicates.rules.length} identical rule blocks`,
+      action: 'Create reusable mixins or utility classes',
+      count: analysis.duplicates.rules.length
+    });
+  }
+
+  // Component vs global styles
+  if (analysis.summary.componentStyles > 10 && analysis.summary.globalStyles === 0) {
+    recs.push({
+      priority: 'medium',
+      category: 'organization',
+      title: 'No global styles file detected',
+      description: 'Consider creating a global styles.scss for shared utilities and resets',
+      action: 'Create src/styles.scss with @use imports'
+    });
+  }
+
+  // Import optimization
+  if (analysis.imports.global.length > 3) {
+    recs.push({
+      priority: 'medium',
+      category: 'imports',
+      title: 'Optimize global imports',
+      description: `${analysis.imports.global.length} files are imported globally across many components`,
+      action: 'Consolidate into a single theme file or add to styles.scss',
+      files: analysis.imports.global.map(i => i.path)
+    });
+  }
+
+  // Theme organization
+  if (analysis.summary.themeFiles === 0 && analysis.summary.componentStyles > 5) {
+    recs.push({
+      priority: 'medium',
+      category: 'theming',
+      title: 'No theme structure detected',
+      description: 'Consider organizing styles following Angular Material theming patterns',
+      action: 'Create theme files: _variables.scss, _typography.scss, _theme.scss'
+    });
+  }
+
+  // Mixin organization
+  if (analysis.duplicates.mixins.length > 0) {
+    recs.push({
+      priority: 'low',
+      category: 'mixins',
+      title: 'Duplicate mixin definitions',
+      description: `${analysis.duplicates.mixins.length} mixins defined in multiple files`,
+      action: 'Consolidate mixins into a shared _mixins.scss file'
+    });
+  }
+}
+
+/**
+ * Suggests ideal folder structure
+ * @param {Object} analysis - Analysis object
+ * @param {Object} config - Configuration
+ */
+function suggestStructure(analysis, config) {
+  const angularConfigured = config.angular !== undefined;
+  
+  analysis.structure.current = {
+    componentStyles: analysis.summary.componentStyles,
+    globalStyles: analysis.summary.globalStyles,
+    themeFiles: analysis.summary.themeFiles,
+    utilityFiles: analysis.summary.utilityFiles,
+    mixinFiles: analysis.summary.mixinFiles
+  };
+
+  analysis.structure.suggested = {
+    description: 'Recommended Angular Material theme structure',
+    folders: [
+      {
+        path: 'src/styles/',
+        files: [
+          '_variables.scss - Design tokens (colors, spacing, typography)',
+          '_mixins.scss - Reusable SCSS mixins',
+          '_utilities.scss - Utility classes (flex, spacing, etc.)',
+          '_theme.scss - Angular Material theme configuration',
+          '_typography.scss - Typography styles',
+          'styles.scss - Global entry point'
+        ]
+      },
+      {
+        path: 'src/app/components/',
+        files: [
+          '*.component.scss - Component-scoped styles only',
+          'Use @use for variables/mixins instead of @import'
+        ]
+      }
+    ],
+    imports: {
+      global: [
+        '@use "@angular/material" as mat;',
+        '@use "./styles/variables" as vars;',
+        '@use "./styles/mixins";',
+        '@use "./styles/utilities";'
+      ],
+      component: [
+        '@use "../../../styles/variables" as vars;',
+        '@use "../../../styles/mixins";'
+      ]
+    }
+  };
+}
+
+/**
+ * Generates organization report
+ * @param {Object} analysis - Analysis results
+ * @param {string} format - Report format
+ * @returns {string} - Formatted report
+ */
+function generateOrganizationReport(analysis, format = 'table') {
+  if (format === 'json') {
+    return JSON.stringify(analysis, null, 2);
+  }
+
+  if (format === 'markdown') {
+    return generateMarkdownOrganizationReport(analysis);
+  }
+
+  // Table format
+  const chalk = require('chalk');
+  const Table = require('cli-table3');
+
+  let report = chalk.cyan.bold('\n📋 Style Organization Analysis\n\n');
+
+  // Summary
+  report += chalk.white.bold('Summary:\n');
+  const summaryTable = new Table({
+    head: ['Metric', 'Count'],
+    style: { head: ['cyan'] }
+  });
+  
+  summaryTable.push(
+    ['Total SCSS Files', analysis.summary.totalFiles],
+    ['Component Styles', analysis.summary.componentStyles],
+    ['Global Styles', analysis.summary.globalStyles],
+    ['Theme Files', analysis.summary.themeFiles],
+    ['Utility Files', analysis.summary.utilityFiles],
+    ['Mixin Files', analysis.summary.mixinFiles]
+  );
+  
+  report += summaryTable.toString() + '\n\n';
+
+  // Duplicates
+  if (analysis.duplicates.selectors.length > 0 || 
+      analysis.duplicates.rules.length > 0) {
+    report += chalk.yellow.bold('Duplication Issues:\n');
+    const dupTable = new Table({
+      head: ['Type', 'Count', 'Example'],
+      style: { head: ['yellow'] }
+    });
+
+    if (analysis.duplicates.selectors.length > 0) {
+      const example = analysis.duplicates.selectors[0];
+      dupTable.push([
+        'Duplicate Selectors',
+        analysis.duplicates.selectors.length,
+        `${example.selector} (${example.count} files)`
+      ]);
+    }
+
+    if (analysis.duplicates.rules.length > 0) {
+      dupTable.push([
+        'Duplicate Rules',
+        analysis.duplicates.rules.length,
+        'Identical CSS blocks'
+      ]);
+    }
+
+    if (analysis.duplicates.mixins.length > 0) {
+      dupTable.push([
+        'Duplicate Mixins',
+        analysis.duplicates.mixins.length,
+        analysis.duplicates.mixins[0].mixin
+      ]);
+    }
+
+    report += dupTable.toString() + '\n\n';
+  }
+
+  // Recommendations
+  if (analysis.recommendations.length > 0) {
+    report += chalk.green.bold('Recommendations:\n\n');
+    analysis.recommendations.forEach((rec, i) => {
+      const priorityColor = rec.priority === 'high' ? 'red' : 
+                           rec.priority === 'medium' ? 'yellow' : 'gray';
+      report += chalk[priorityColor](`${i + 1}. [${rec.priority.toUpperCase()}] ${rec.title}\n`);
+      report += chalk.gray(`   ${rec.description}\n`);
+      report += chalk.white(`   → ${rec.action}\n\n`);
+    });
+  }
+
+  // Suggested structure
+  report += chalk.blue.bold('Suggested Structure:\n\n');
+  analysis.structure.suggested.folders.forEach(folder => {
+    report += chalk.cyan(`${folder.path}\n`);
+    folder.files.forEach(file => {
+      report += chalk.gray(`  • ${file}\n`);
+    });
+    report += '\n';
+  });
+
+  return report;
+}
+
+/**
+ * Generates markdown report
+ * @param {Object} analysis - Analysis results
+ * @returns {string} - Markdown formatted report
+ */
+function generateMarkdownOrganizationReport(analysis) {
+  let md = '# Style Organization Analysis\n\n';
+
+  md += '## Summary\n\n';
+  md += '| Metric | Count |\n';
+  md += '|--------|-------|\n';
+  md += `| Total SCSS Files | ${analysis.summary.totalFiles} |\n`;
+  md += `| Component Styles | ${analysis.summary.componentStyles} |\n`;
+  md += `| Global Styles | ${analysis.summary.globalStyles} |\n`;
+  md += `| Theme Files | ${analysis.summary.themeFiles} |\n`;
+  md += `| Utility Files | ${analysis.summary.utilityFiles} |\n`;
+  md += `| Mixin Files | ${analysis.summary.mixinFiles} |\n\n`;
+
+  if (analysis.recommendations.length > 0) {
+    md += '## Recommendations\n\n';
+    analysis.recommendations.forEach((rec, i) => {
+      md += `### ${i + 1}. ${rec.title} (${rec.priority})\n\n`;
+      md += `**Description:** ${rec.description}\n\n`;
+      md += `**Action:** ${rec.action}\n\n`;
+    });
+  }
+
+  md += '## Suggested Structure\n\n';
+  analysis.structure.suggested.folders.forEach(folder => {
+    md += `### ${folder.path}\n\n`;
+    folder.files.forEach(file => {
+      md += `- ${file}\n`;
+    });
+    md += '\n';
+  });
+
+  return md;
+}
+
+module.exports = {
+  analyzeStyleOrganization,
+  generateOrganizationReport
+};

package/test/refactorer.test.js

@@ -124,4 +124,47 @@ describe('Refactorer', () => {
     // Should not replace in variable declaration
     expect(result.content).toContain('$my-color: #1976d2');
   });
+
+  test('should not do partial replacements within larger values', () => {
+    const scss = `
+      @media (min-width: 768px) {
+        .container {
+          width: 233px;
+          padding: 8px;
+          z-index: 100;
+        }
+      }
+    `;
+    
+    const analysis = {
+      colors: [],
+      spacing: [
+        { value: '8px', suggestedName: '$spacing-sm' }
+      ],
+      fontSizes: [],
+      fontWeights: [],
+      fontFamilies: [],
+      borderRadius: [],
+      shadows: [],
+      zIndex: [
+        { value: '100', suggestedName: '$z-index-modal' }
+      ],
+      sizing: [],
+      lineHeight: [],
+      opacity: [],
+      transitions: []
+    };
+    
+    const result = refactorFile(scss, analysis, '/libs/styles/_variables.scss', '/app/test.scss', {});
+    
+    // Should replace complete values
+    expect(result.content).toContain('padding: $spacing-sm');
+    expect(result.content).toContain('z-index: $z-index-modal');
+    
+    // Should NOT do partial replacements
+    expect(result.content).toContain('768px'); // Not 76$spacing-smpx
+    expect(result.content).toContain('233px'); // Not 2$spacing-sm$spacing-smpx
+    expect(result.content).not.toContain('76$spacing-sm');
+    expect(result.content).not.toContain('$z-index23');
+  });
 });

package/test/style-organizer.test.js

@@ -0,0 +1,106 @@
+const { analyzeStyleOrganization, generateOrganizationReport } = require('../src/style-organizer');
+const path = require('path');
+const fs = require('fs');
+
+describe('Style Organizer', () => {
+  const fixturesPath = path.join(__dirname, 'fixtures/apps/subapp/src');
+  
+  describe('analyzeStyleOrganization', () => {
+    test('should analyze style organization', async () => {
+      const { scanScssFiles } = require('../src/scanner');
+      const files = await scanScssFiles(fixturesPath);
+      
+      const analysis = analyzeStyleOrganization(files);
+      
+      expect(analysis).toHaveProperty('summary');
+      expect(analysis).toHaveProperty('duplicates');
+      expect(analysis).toHaveProperty('imports');
+      expect(analysis).toHaveProperty('recommendations');
+      expect(analysis).toHaveProperty('structure');
+      
+      expect(analysis.summary.totalFiles).toBeGreaterThan(0);
+    });
+    
+    test('should categorize file types', async () => {
+      const { scanScssFiles } = require('../src/scanner');
+      const files = await scanScssFiles(fixturesPath);
+      
+      const analysis = analyzeStyleOrganization(files);
+      
+      expect(analysis.summary).toHaveProperty('componentStyles');
+      expect(analysis.summary).toHaveProperty('globalStyles');
+      expect(analysis.summary).toHaveProperty('themeFiles');
+      expect(analysis.summary).toHaveProperty('utilityFiles');
+    });
+    
+    test('should detect duplicate selectors', () => {
+      const testFiles = [
+        path.join(__dirname, 'fixtures/apps/subapp/src/app/component-a/component-a.component.scss'),
+        path.join(__dirname, 'fixtures/apps/subapp/src/app/component-b/component-b.component.scss')
+      ];
+      
+      const analysis = analyzeStyleOrganization(testFiles);
+      
+      expect(analysis.duplicates).toHaveProperty('selectors');
+      expect(Array.isArray(analysis.duplicates.selectors)).toBe(true);
+    });
+    
+    test('should generate recommendations', async () => {
+      const { scanScssFiles } = require('../src/scanner');
+      const files = await scanScssFiles(fixturesPath);
+      
+      const analysis = analyzeStyleOrganization(files);
+      
+      expect(Array.isArray(analysis.recommendations)).toBe(true);
+    });
+    
+    test('should suggest structure', async () => {
+      const { scanScssFiles } = require('../src/scanner');
+      const files = await scanScssFiles(fixturesPath);
+      
+      const analysis = analyzeStyleOrganization(files);
+      
+      expect(analysis.structure).toHaveProperty('current');
+      expect(analysis.structure).toHaveProperty('suggested');
+      expect(analysis.structure.suggested).toHaveProperty('folders');
+    });
+  });
+  
+  describe('generateOrganizationReport', () => {
+    test('should generate table report', async () => {
+      const { scanScssFiles } = require('../src/scanner');
+      const files = await scanScssFiles(fixturesPath);
+      const analysis = analyzeStyleOrganization(files);
+      
+      const report = generateOrganizationReport(analysis, 'table');
+      
+      expect(report).toContain('Style Organization Analysis');
+      expect(report).toContain('Summary');
+      expect(typeof report).toBe('string');
+    });
+    
+    test('should generate JSON report', async () => {
+      const { scanScssFiles } = require('../src/scanner');
+      const files = await scanScssFiles(fixturesPath);
+      const analysis = analyzeStyleOrganization(files);
+      
+      const report = generateOrganizationReport(analysis, 'json');
+      
+      const parsed = JSON.parse(report);
+      expect(parsed).toHaveProperty('summary');
+      expect(parsed).toHaveProperty('recommendations');
+    });
+    
+    test('should generate Markdown report', async () => {
+      const { scanScssFiles } = require('../src/scanner');
+      const files = await scanScssFiles(fixturesPath);
+      const analysis = analyzeStyleOrganization(files);
+      
+      const report = generateOrganizationReport(analysis, 'markdown');
+      
+      expect(report).toContain('# Style Organization Analysis');
+      expect(report).toContain('## Summary');
+      expect(report).toContain('## Suggested Structure');
+    });
+  });
+});