purgetss 7.1.6 → 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.6
+// 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.6",
+  "version": "7.1.7",
   "main": "src/index.js",
   "bin": {
     "purgetss": "bin/purgetss"

package/src/cli/commands/init.js

@@ -1,4 +1,4 @@
- 
+
 /**
  * PurgeTSS v7.1 - Init Command
  *
@@ -156,20 +156,21 @@ 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
   }
 
-  // Check if config.cjs already exists to show appropriate message
-  const configExisted = fs.existsSync(projectsConfigJS)
+  // 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()
 
-  // Show warning if config already existed (for init command specifically)
-  if (configExisted) {
+  // 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!'))
   }
 
@@ -177,12 +178,12 @@ export function init(options) {
   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()
   }