purgetss 7.1.5 → 7.1.7

package/bin/purgetss

@@ -45,12 +45,34 @@ program
   .allowUnknownOption(false)
   .action(async (options) => {
     try {
-      const result = await purgeClasses(options)
-      if (!result) {
-        process.exit(1)
+      if (options.all) {
+        // When --all is specified, run the 3 commands in sequence
+        console.log(chalk.yellow('Running all commands: build, build-fonts, and purge...'))
+
+        // Run commands in sequence to avoid race conditions
+        console.log(chalk.cyan('\n1. Running build command...'))
+        await build(options)
+
+        console.log(chalk.cyan('\n2. Running build-fonts command...'))
+        await buildFonts(options)
+
+        console.log(chalk.cyan('\n3. Running purge command...'))
+        const result = await purgeClasses(options)
+
+        if (!result) {
+          process.exit(1)
+        }
+
+        console.log(chalk.green('\n✅ All commands completed successfully!'))
+      } else {
+        // Default behavior: just run purgeClasses
+        const result = await purgeClasses(options)
+        if (!result) {
+          process.exit(1)
+        }
       }
     } catch (error) {
-      console.error(chalk.red('Error running purgeClasses:'), error.message)
+      console.error(chalk.red('Error running command:'), error.message)
       process.exit(1)
     }
   })
@@ -182,7 +204,8 @@ program
   .option('--all', 'Create all files')
   .action(async (options) => {
     try {
-      const result = await init(options)
+      // Pass flag to indicate this is an explicit init command
+      const result = await init({ ...options, isExplicitInit: true })
       if (!result) {
         process.exit(1)
       }
@@ -421,16 +444,16 @@ program
 // Function to calculate string similarity (Levenshtein distance)
 function calculateSimilarity(str1, str2) {
   const matrix = []
-  
+
   // Create distance matrix
   for (let i = 0; i <= str2.length; i++) {
     matrix[i] = [i]
   }
-  
+
   for (let j = 0; j <= str1.length; j++) {
     matrix[0][j] = j
   }
-  
+
   // Fill the matrix
   for (let i = 1; i <= str2.length; i++) {
     for (let j = 1; j <= str1.length; j++) {
@@ -445,24 +468,24 @@ function calculateSimilarity(str1, str2) {
       }
     }
   }
-  
+
   return matrix[str2.length][str1.length]
 }
 
 // Function to find similar commands
 function findSimilarCommands(input, validCommands) {
   const suggestions = []
-  
+
   validCommands.forEach(cmd => {
     const distance = calculateSimilarity(input.toLowerCase(), cmd.toLowerCase())
     const similarity = 1 - (distance / Math.max(input.length, cmd.length))
-    
+
     // Suggest commands with similarity > 0.4 or that start with the same letter
     if (similarity > 0.4 || cmd.toLowerCase().startsWith(input.toLowerCase().charAt(0))) {
       suggestions.push({ command: cmd, similarity })
     }
   })
-  
+
   // Sort by similarity and return top 3
   return suggestions
     .sort((a, b) => b.similarity - a.similarity)
@@ -488,20 +511,20 @@ if (args.length > 0) {
   // Check if it's an unknown command (doesn't start with - and not in valid commands)
   if (!firstArg.startsWith('-') && !validCommands.includes(firstArg)) {
     console.log(chalk.red(`\nUnknown command: ${firstArg}`))
-    
+
     // Find similar commands and suggest them
     const suggestions = findSimilarCommands(firstArg, validCommands)
     if (suggestions.length > 0) {
       console.log(chalk.yellow('Did you mean one of these?'))
       suggestions.forEach(suggestion => {
         // Get the command info to show alias if available
-        const commandInfo = program.commands.find(cmd => 
+        const commandInfo = program.commands.find(cmd =>
           cmd.name() === suggestion || cmd.alias() === suggestion
         )
-        
+
         if (commandInfo) {
-          const displayName = commandInfo.alias() 
-            ? `${commandInfo.name()}|${commandInfo.alias()}` 
+          const displayName = commandInfo.alias()
+            ? `${commandInfo.name()}|${commandInfo.alias()}`
             : commandInfo.name()
           console.log(`  ${chalk.cyan(displayName)}`)
         } else {

package/dist/purgetss.ui.js

@@ -1,4 +1,4 @@
-// PurgeTSS v7.1.5
+// PurgeTSS v7.1.7
 // Created by César Estrada
 // https://purgetss.com
 

package/experimental/completions2.js

@@ -30,12 +30,12 @@ const logger = {
   file: (...args) => console.log(purgeLabel, chalk.yellow(args.join(' ')), 'file created!')
 }
 
-const configFile = getConfigFile()
+let configFile = getConfigFile()
 configFile.purge = configFile.purge ?? { mode: 'all' }
 configFile.theme = configFile.theme ?? {}
 configFile.theme.extend = configFile.theme.extend ?? {}
 
-const configOptions = (configFile.purge && configFile.purge.options) ? configFile.purge.options : {}
+let configOptions = (configFile.purge && configFile.purge.options) ? configFile.purge.options : {}
 if (configOptions) {
   configOptions.plugins = configOptions.plugins ?? []
   configOptions.safelist = configOptions.safelist ?? []
@@ -44,6 +44,20 @@ if (configOptions) {
 }
 
 function autoBuildTailwindTSS(options = {}) {
+  // Refresh config at the start of the function to ensure it's up-to-date
+  configFile = getConfigFile()
+  configFile.purge = configFile.purge ?? { mode: 'all' }
+  configFile.theme = configFile.theme ?? {}
+  configFile.theme.extend = configFile.theme.extend ?? {}
+
+  configOptions = (configFile.purge && configFile.purge.options) ? configFile.purge.options : {}
+  if (configOptions) {
+    configOptions.plugins = configOptions.plugins ?? []
+    configOptions.safelist = configOptions.safelist ?? []
+    configOptions.missing = configOptions.missing ?? true
+    configOptions.widgets = configOptions.widgets ?? false
+  }
+
   saveGlossary = options.glossary ?? false
   let tailwindStyles = fs.readFileSync(path.resolve(__dirname, '../lib/templates/tailwind/template.tss'), 'utf8')
   tailwindStyles += fs.readFileSync(path.resolve(__dirname, '../lib/templates/tailwind/custom-template.tss'), 'utf8')

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "purgetss",
-  "version": "7.1.5",
+  "version": "7.1.7",
   "main": "src/index.js",
   "bin": {
     "purgetss": "bin/purgetss"

package/src/cli/commands/build.js

@@ -11,7 +11,7 @@
  */
 
 import { alloyProject } from '../../shared/utils.js'
-import { initIfNotConfig } from '../utils/file-operations.js'
+import { ensureConfig } from '../../shared/config-manager.js'
 import { buildTailwindBasedOnConfigOptions } from '../../core/builders/tailwind-builder.js'
 import { createDefinitionsFile } from './init.js'
 
@@ -27,7 +27,7 @@ import { buildFontAwesome, buildFontAwesomeJS } from '../../dev/builders/fontawe
  */
 export function build(options) {
   if (alloyProject()) {
-    initIfNotConfig()
+    ensureConfig()
     buildTailwindBasedOnConfigOptions(options)
     buildFontAwesome()
     buildFontAwesomeJS()

package/src/cli/commands/color-module.js

@@ -16,7 +16,7 @@ import { createRequire } from 'module'
 import { alloyProject, makeSureFolderExists } from '../../shared/utils.js'
 import { projectsConfigJS, projectsLibFolder } from '../../shared/constants.js'
 import { logger } from '../../shared/logger.js'
-import { initIfNotConfig } from '../utils/file-operations.js'
+import { ensureConfig } from '../../shared/config-manager.js'
 import { cleanDoubleQuotes } from '../utils/file-operations.js'
 
 // Create require for ESM compatibility
@@ -34,7 +34,7 @@ export function colorModule(options) {
     return false
   }
 
-  initIfNotConfig()
+  ensureConfig()
   const colorModuleConfigFile = require(projectsConfigJS)
   makeSureFolderExists(projectsLibFolder)
   const mainColors = { ...colorModuleConfigFile.theme.colors, ...colorModuleConfigFile.theme.extend.colors }

package/src/cli/commands/init.js

@@ -1,4 +1,4 @@
-/* eslint-disable camelcase */
+
 /**
  * PurgeTSS v7.1 - Init Command
  *
@@ -30,7 +30,7 @@ import {
   PurgeTSSPackageJSON
 } from '../../shared/constants.js'
 import { logger } from '../../shared/logger.js'
-import { getConfigOptions, getConfigFile } from '../../shared/config-manager.js'
+import { getConfigOptions, getConfigFile, ensureConfig } from '../../shared/config-manager.js'
 import { addHook, deleteHook, createJMKFile } from '../utils/hook-management.js'
 import { getFiles } from '../utils/font-utilities.js'
 import { buildTailwindBasedOnConfigOptions } from '../../core/builders/tailwind-builder.js'
@@ -156,27 +156,34 @@ function createDefinitionsFile() {
  */
 export { createDefinitionsFile }
 
-export function init(options) {
+export function init(options = {}) {
   // Check if we're in an Alloy project first
   if (!alloyProject()) {
     return false
   }
 
-  // Get commands when needed
-  const { methodCommand, oppositeCommand } = getCommands()
+  // Only show warning for explicit init command (not when called from other commands)
+  const isExplicitInitCommand = options.isExplicitInit === true
+  const configExisted = isExplicitInitCommand ? fs.existsSync(projectsConfigJS) : false
+
+  // SUPER SIMPLE: Ensure config exists (migrate or create)
+  ensureConfig()
 
-  // config file
-  if (!fs.existsSync(projectsConfigJS)) {
-    createConfigFile()
+  // Show warning ONLY if this is an explicit init command AND config already existed
+  if (isExplicitInitCommand && configExisted) {
+    logger.warn('./purgetss/config.cjs', chalk.red('file already exists!'))
   }
 
+  // Get commands when needed
+  const { methodCommand, oppositeCommand } = getCommands()
+
   // tailwind.tss
-  if (!fs.existsSync(projectsTailwind_TSS) || options.all) {
+  if (!fs.existsSync(projectsTailwind_TSS)) {
     buildTailwindBasedOnConfigOptions(options)
   }
 
   // definitions file
-  if (!fs.existsSync(`${cwd}/purgetss/styles/definitions.css`) || options.all) {
+  if (!fs.existsSync(`${cwd}/purgetss/styles/definitions.css`)) {
     createDefinitionsFile()
   }
 

package/src/cli/commands/purge.js

@@ -1,4 +1,4 @@
-/* eslint-disable camelcase */
+
 /**
  * PurgeTSS v7.1 - Purge Command
  *
@@ -28,7 +28,7 @@ import {
 import { logger, setDebugMode } from '../../shared/logger.js'
 import { start, finish, localStart, localFinish } from '../utils/cli-helpers.js'
 import { init } from './init.js'
-import { getConfigOptions, getConfigFile } from '../../shared/config-manager.js'
+import { getConfigOptions, getConfigFile, ensureConfig } from '../../shared/config-manager.js'
 
 // Import purger functions from core modules
 import { purgeTailwind } from '../../core/purger/tailwind-purger.js'

package/src/cli/commands/shades.js

@@ -1,4 +1,4 @@
-/* eslint-disable camelcase */
+ 
 /**
  * PurgeTSS v7.1 - Shades Commands
  *
@@ -17,7 +17,8 @@ import { createRequire } from 'module'
 import { alloyProject, makeSureFolderExists } from '../../shared/utils.js'
 import { projectsConfigJS, projectsLibFolder } from '../../shared/constants.js'
 import { logger } from '../../shared/logger.js'
-import { initIfNotConfig, cleanDoubleQuotes } from '../utils/file-operations.js'
+import { ensureConfig, getConfigFile } from '../../shared/config-manager.js'
+import { cleanDoubleQuotes } from '../utils/file-operations.js'
 
 // Create require for ESM compatibility
 const require = createRequire(import.meta.url)
@@ -33,7 +34,7 @@ export function colorModule() {
     return false
   }
 
-  initIfNotConfig()
+  ensureConfig()
 
   const colorModuleConfigFile = require(projectsConfigJS)
 
@@ -101,10 +102,15 @@ export async function shades(args, options) {
   const colorObject = createColorObject(colorFamily, colorFamily.hexcode, options)
 
   const silent = options.tailwind || options.json || options.log
-  
-  // Get config file first (this triggers auto-migration if needed)
+
+  // Ensure config migration happens before getting config file
+  if (alloyProject(silent) && !silent) {
+    ensureConfig()
+  }
+
+  // Get config file (after potential migration)
   const configFile = getConfigFile()
-  
+
   if (alloyProject(silent) && !silent) {
 
     if (options.override) {
@@ -174,9 +180,6 @@ function createColorObject(family, hexcode, options) {
   return colors
 }
 
-// Import config manager
-import { getConfigFile } from '../../shared/config-manager.js'
-
 /**
  * Export for CLI usage
  */

package/src/cli/commands/watch.js

@@ -15,7 +15,7 @@ import chalk from 'chalk'
 import { alloyProject } from '../../shared/utils.js'
 import { projectsAlloyJMKFile } from '../../shared/constants.js'
 import { logger } from '../../shared/logger.js'
-import { getConfigFile } from '../../shared/config-manager.js'
+import { getConfigFile, ensureConfig } from '../../shared/config-manager.js'
 import { disableHook, deleteHook, addHook, enableHook, createJMKFile } from '../utils/hook-management.js'
 
 /**
@@ -58,6 +58,9 @@ export function watchMode(options) {
     return false
   }
 
+  // Ensure config exists before accessing it
+  ensureConfig()
+
   if (fs.existsSync(projectsAlloyJMKFile)) {
     // Get commands when needed
     const { methodCommand } = getCommands()

package/src/cli/utils/file-operations.js

@@ -12,22 +12,15 @@
 
 import fs from 'fs'
 import util from 'util'
-import { projectsConfigJS } from '../../shared/constants.js'
-import { createConfigFile } from '../commands/init.js'
-import { migrateConfigIfNeeded } from '../../shared/config-manager.js'
+import { ensureConfig } from '../../shared/config-manager.js'
 
 /**
+ * @deprecated Use ensureConfig() from config-manager.js instead
  * Initialize config if it doesn't exist
  * FIRST migrates any existing config.js, THEN creates default if needed
  */
 export function initIfNotConfig() {
-  // CRITICAL: Migrate config.js to config.cjs BEFORE checking if file exists
-  migrateConfigIfNeeded()
-  
-  // Now check if we need to create default config
-  if (!fs.existsSync(projectsConfigJS)) {
-    createConfigFile()
-  }
+  ensureConfig()
 }
 
 /**

package/src/shared/config-manager.js

@@ -25,6 +25,34 @@ import { makeSureFolderExists } from './utils.js'
 const require = createRequire(import.meta.url)
 
 /**
+ * Ensure config file exists - SIMPLE logic
+ * 1. If config.cjs exists → use it
+ * 2. If config.js exists → rename to config.cjs
+ * 3. If nothing exists → create config.cjs
+ */
+export function ensureConfig() {
+  // 1. ¿Existe config.cjs? → Úsalo
+  if (fs.existsSync(projectsConfigJS)) {
+    return
+  }
+
+  // 2. ¿Existe config.js? → Renómbralo
+  const oldConfigPath = `${projectsPurgeTSSFolder}/config.js`
+  if (fs.existsSync(oldConfigPath)) {
+    makeSureFolderExists(projectsPurgeTSSFolder)
+    fs.renameSync(oldConfigPath, projectsConfigJS)
+    logger.info('Migrated config.js to config.cjs for ESM compatibility')
+    return
+  }
+
+  // 3. No existe nada → Crear config.cjs
+  makeSureFolderExists(projectsPurgeTSSFolder)
+  fs.copyFileSync(srcConfigFile, projectsConfigJS)
+  logger.file('./purgetss/config.cjs')
+}
+
+/**
+ * @deprecated Use ensureConfig() instead
  * Migrate config.js to config.cjs for ESM compatibility
  * This must be called BEFORE any config file creation
  */