purgetss 7.5.2 → 7.6.1

package/src/cli/commands/fonts.js

@@ -431,7 +431,7 @@ function copyFreeFonts() {
   fs.copyFile(srcFonts_Folder + '/FontAwesome7Free-Regular.ttf', projectsFontsFolder + '/FontAwesome7Free-Regular.ttf', callback)
   fs.copyFile(srcFonts_Folder + '/FontAwesome7Free-Solid.ttf', projectsFontsFolder + '/FontAwesome7Free-Solid.ttf', callback)
 
-  logger.warn(' - Font Awesome Free')
+  logger.item(chalk.green('Font Awesome Free'))
 }
 
 /**
@@ -444,7 +444,7 @@ function copyFreeFonts() {
 function copyProFonts(fontFamilies, webFonts) {
   _.each(fontFamilies, (dest, src) => {
     if (copyFile(`${webFonts}/${src}`, dest)) {
-      logger.warn(` - ${dest} Font copied to`, chalk.yellow('./app/assets/fonts'), 'folder')
+      logger.item(`${dest} copied to ${chalk.yellow('./app/assets/fonts')}`)
     }
   })
 }
@@ -467,7 +467,7 @@ function copyMaterialIconsFonts() {
     copyFile(`${srcFonts_Folder}/${familyName}`, familyName)
   })
 
-  logger.warn(' - Material Icons')
+  logger.item(chalk.green('Material Icons'))
 }
 
 /**
@@ -486,7 +486,7 @@ function copyMaterialSymbolsFonts() {
     copyFile(`${srcFonts_Folder}/${familyName}`, familyName)
   })
 
-  logger.warn(' - Material Symbols')
+  logger.item(chalk.green('Material Symbols'))
 }
 
 /**
@@ -496,7 +496,7 @@ function copyMaterialSymbolsFonts() {
 function copyFramework7IconsFonts() {
   // Framework7 Font
   copyFile(srcFonts_Folder + '/Framework7-Icons.ttf', 'Framework7-Icons.ttf')
-  logger.warn(' - Framework 7')
+  logger.item(chalk.green('Framework 7'))
 }
 
 /**
@@ -572,23 +572,23 @@ function copyFontLibrary(vendor) {
         buildFontAwesomeJS()
       } else {
         fs.copyFileSync(srcLibFA, projectsLibFolder + '/fontawesome.js')
-        logger.warn(' - fontawesome.js')
+        logger.item(chalk.yellow('fontawesome.js'))
       }
       break
     case 'mi':
     case 'materialicons':
       fs.copyFileSync(srcLibMI, projectsLibFolder + '/materialicons.js')
-      logger.warn(' - materialicons.js')
+      logger.item(chalk.yellow('materialicons.js'))
       break
     case 'ms':
     case 'materialsymbol':
       fs.copyFileSync(srcLibMS, projectsLibFolder + '/materialsymbols.js')
-      logger.warn(' - materialsymbols.js')
+      logger.item(chalk.yellow('materialsymbols.js'))
       break
     case 'f7':
     case 'framework7':
       fs.copyFileSync(srcLibF7, projectsLibFolder + '/framework7icons.js')
-      logger.warn(' - framework7icons.js')
+      logger.item(chalk.yellow('framework7icons.js'))
       break
   }
 }

package/src/cli/commands/icon-library.js

@@ -100,7 +100,7 @@ function copyFreeFonts() {
   fs.copyFile(srcFonts_Folder + '/FontAwesome7Free-Regular.ttf', projectsFontsFolder + '/FontAwesome7Free-Regular.ttf', callback)
   fs.copyFile(srcFonts_Folder + '/FontAwesome7Free-Solid.ttf', projectsFontsFolder + '/FontAwesome7Free-Solid.ttf', callback)
 
-  logger.warn(' - Font Awesome Free')
+  logger.item(chalk.green('Font Awesome Free'))
 }
 
 /**
@@ -111,7 +111,7 @@ function copyFreeFonts() {
 function copyProFonts(fontFamilies, webFonts) {
   _.each(fontFamilies, (dest, src) => {
     if (copyFile(`${webFonts}/${src}`, dest)) {
-      logger.warn(` - ${dest} Font copied to`, chalk.yellow('./app/assets/fonts'), 'folder')
+      logger.item(`${dest} copied to ${chalk.yellow('./app/assets/fonts')}`)
     }
   })
 }
@@ -133,7 +133,7 @@ function copyMaterialIconsFonts() {
     copyFile(`${srcFonts_Folder}/${familyName}`, familyName)
   })
 
-  logger.warn(' - Material Icons')
+  logger.item(chalk.green('Material Icons'))
 }
 
 /**
@@ -151,7 +151,7 @@ function copyMaterialSymbolsFonts() {
     copyFile(`${srcFonts_Folder}/${familyName}`, familyName)
   })
 
-  logger.warn(' - Material Symbols')
+  logger.item(chalk.green('Material Symbols'))
 }
 
 /**
@@ -160,7 +160,7 @@ function copyMaterialSymbolsFonts() {
 function copyFramework7IconsFonts() {
   // Framework7 Font
   copyFile(srcFonts_Folder + '/Framework7-Icons.ttf', 'Framework7-Icons.ttf')
-  logger.warn(' - Framework 7')
+  logger.item(chalk.green('Framework 7'))
 }
 
 /**
@@ -170,7 +170,7 @@ function copyFramework7IconsFonts() {
 function buildFontAwesomeJS() {
   // This function should be imported from the fonts module
   // For now, just log that it would be called
-  logger.warn(' - Font Awesome JS module would be built')
+  logger.item(chalk.yellow('Font Awesome JS module would be built'))
 }
 
 /**
@@ -218,23 +218,23 @@ function copyFontLibrary(vendor) {
         buildFontAwesomeJS()
       } else {
         fs.copyFileSync(srcLibFA, projectsLibFolder + '/fontawesome.js')
-        logger.warn(' - fontawesome.js')
+        logger.item(chalk.yellow('fontawesome.js'))
       }
       break
     case 'mi':
     case 'materialicons':
       fs.copyFileSync(srcLibMI, projectsLibFolder + '/materialicons.js')
-      logger.warn(' - materialicons.js')
+      logger.item(chalk.yellow('materialicons.js'))
       break
     case 'ms':
     case 'materialsymbol':
       fs.copyFileSync(srcLibMS, projectsLibFolder + '/materialsymbols.js')
-      logger.warn(' - materialsymbols.js')
+      logger.item(chalk.yellow('materialsymbols.js'))
       break
     case 'f7':
     case 'framework7':
       fs.copyFileSync(srcLibF7, projectsLibFolder + '/framework7icons.js')
-      logger.warn(' - framework7icons.js')
+      logger.item(chalk.yellow('framework7icons.js'))
       break
   }
 }
@@ -251,23 +251,23 @@ function copyFontStyle(vendor) {
         buildFontAwesomeJS()
       } else {
         fs.copyFileSync(srcFontAwesomeTSSFile, projectsPurge_TSS_Styles_Folder + '/fontawesome.tss')
-        logger.warn(' - fontawesome.tss')
+        logger.item(chalk.yellow('fontawesome.tss'))
       }
       break
     case 'mi':
     case 'materialicons':
       fs.copyFileSync(srcMaterialIconsTSSFile, projectsPurge_TSS_Styles_Folder + '/materialicons.tss')
-      logger.warn(' - materialicons.tss')
+      logger.item(chalk.yellow('materialicons.tss'))
       break
     case 'ms':
     case 'materialsymbol':
       fs.copyFileSync(srcMaterialSymbolsTSSFile, projectsPurge_TSS_Styles_Folder + '/materialsymbols.tss')
-      logger.warn(' - materialsymbols.tss')
+      logger.item(chalk.yellow('materialsymbols.tss'))
       break
     case 'f7':
     case 'framework7':
       fs.copyFileSync(srcFramework7FontTSSFile, projectsPurge_TSS_Styles_Folder + '/framework7icons.tss')
-      logger.warn(' - framework7icons.tss')
+      logger.item(chalk.yellow('framework7icons.tss'))
       break
   }
 }
@@ -391,8 +391,10 @@ export async function copyModulesLibrary() {
       logger.info(chalk.yellow('purgetss.ui'), 'module copied to', chalk.yellow('./Resources/lib'), 'folder')
       return true
     } else {
-      logger.info(`Please make sure you are running ${chalk.green('purgetss')} within an Alloy or Classic Project.`)
-      logger.info(`For more information, visit ${chalk.green('https://purgetss.com')}`)
+      logger.block(
+        `Please make sure you are running ${chalk.green('purgetss')} within an Alloy or Classic Project.`,
+        `For more information, visit ${chalk.green('https://purgetss.com')}`
+      )
       return false
     }
   } catch (error) {

package/src/cli/commands/images.js

@@ -0,0 +1,116 @@
+/**
+ * PurgeTSS - Images Command
+ *
+ * Generates multi-density variants of UI images for Titanium Alloy or Classic
+ * projects. Auto-discovers sources in `./purgetss/images/` by default; accepts
+ * a path argument to override (file or directory).
+ *
+ * Precedence for every option: CLI flag > `images:` section in config > default.
+ *
+ * @fileoverview Assets command entry point
+ * @author César Estrada
+ */
+
+import fs from 'fs'
+import path from 'path'
+import chalk from 'chalk'
+import { runImages } from '../../core/images/index.js'
+import { logger } from '../../core/branding/branding-logger.js'
+import { ensureImagesSection } from '../../core/images/ensure-images-section.js'
+import { getConfigFile } from '../../shared/config-manager.js'
+import { projectsPurge_TSS_Images_Folder } from '../../shared/constants.js'
+
+const VALID_FORMATS = new Set(['webp', 'jpeg', 'jpg', 'png', 'avif', 'gif', 'tiff'])
+
+export async function images(cliSource, options = {}) {
+  if (options.debug) logger.setDebugMode(true)
+
+  const projectRoot = options.project ? path.resolve(options.project) : process.cwd()
+
+  if (!options.project) ensureImagesSection()
+
+  const cfg = loadImagesSection()
+
+  // --android and --ios are mutually exclusive.
+  if (options.android && options.ios) {
+    logger.error('--android and --ios are mutually exclusive. Pass neither to generate both, or pick one.')
+    process.exit(1)
+  }
+
+  const format = options.format ?? cfg.format ?? null
+  if (format && !VALID_FORMATS.has(format.toLowerCase())) {
+    logger.error(`Invalid --format '${format}'. Valid: ${[...VALID_FORMATS].join(', ')}`)
+    process.exit(1)
+  }
+
+  const source = resolveSource(cliSource, projectRoot)
+  if (!source) {
+    printMissingSourceHelp(projectRoot)
+    process.exit(1)
+  }
+
+  try {
+    await runImages({
+      source,
+      projectRoot,
+      androidOnly: Boolean(options.android),
+      iphoneOnly: Boolean(options.ios),
+      format: format ? format.toLowerCase() : null,
+      quality: options.quality ?? cfg.quality ?? 85,
+      dryRun: Boolean(options.dryRun),
+      yes: Boolean(options.yes),
+      confirmOverwrites: cfg.confirmOverwrites !== false
+    })
+  } catch (err) {
+    logger.error(err.message)
+    if (options.debug) console.error(err.stack)
+    process.exit(1)
+  }
+}
+
+function loadImagesSection() {
+  try {
+    const cfg = getConfigFile()
+    if (cfg && typeof cfg.images === 'object') return cfg.images
+  } catch {}
+  return {}
+}
+
+function resolveSource(cliSource, projectRoot) {
+  const imagesFolder = projectRoot === process.cwd()
+    ? projectsPurge_TSS_Images_Folder
+    : path.join(projectRoot, 'purgetss', 'images')
+
+  if (cliSource) {
+    if (path.isAbsolute(cliSource)) {
+      return fs.existsSync(cliSource) ? cliSource : null
+    }
+    // Relative paths: try purgetss/images/ first (convention), then cwd.
+    // Lets users write short paths like `background/pink.png` without the prefix.
+    const insideImages = path.resolve(imagesFolder, cliSource)
+    if (fs.existsSync(insideImages)) return insideImages
+
+    const cwdResolved = path.resolve(projectRoot, cliSource)
+    if (fs.existsSync(cwdResolved)) return cwdResolved
+
+    return null
+  }
+  return fs.existsSync(imagesFolder) ? imagesFolder : null
+}
+
+function printMissingSourceHelp(projectRoot) {
+  const rel = (p) => path.relative(projectRoot, p) || '.'
+  const imagesDir = path.join(projectRoot, 'purgetss', 'images')
+
+  logger.error('No source images found.')
+  console.log()
+  console.log(`  Expected images inside ${chalk.cyan(rel(imagesDir) + '/')}.`)
+  console.log(`  The folder already exists — drop your images into it (subdirectories are preserved):`)
+  console.log(`     ${chalk.cyan('cp my-ui-asset.png ' + rel(imagesDir) + '/')}`)
+  console.log()
+  console.log('  Alternatives:')
+  console.log(`    ${chalk.gray('•')} Pass a file or directory explicitly:`)
+  console.log(`       ${chalk.cyan('purgetss images ./docs/screenshots')}`)
+  console.log(`       ${chalk.cyan('purgetss images ./logo.png')}`)
+  console.log()
+}

package/src/cli/commands/init.js

@@ -21,6 +21,8 @@ import {
   projectsAlloyJMKFile,
   projectsPurgeTSSFolder,
   projectsPurge_TSS_Fonts_Folder,
+  projectsPurge_TSS_Brand_Folder,
+  projectsPurge_TSS_Images_Folder,
   srcConfigFile,
   projectsFA_TSS_File,
   srcFontAwesomeTSSFile,
@@ -70,6 +72,8 @@ export function createConfigFile() {
   if (alloyProject()) {
     makeSureFolderExists(projectsPurgeTSSFolder)
     makeSureFolderExists(projectsPurge_TSS_Fonts_Folder)
+    makeSureFolderExists(projectsPurge_TSS_Brand_Folder)
+    makeSureFolderExists(projectsPurge_TSS_Images_Folder)
 
     if (fs.existsSync(projectsConfigJS)) {
       logger.warn('./purgetss/config.cjs', chalk.red('file already exists!'))

package/src/cli/commands/module.js

@@ -41,8 +41,10 @@ export function copyModulesLibrary() {
     return true
   } else {
     // Not in a valid project
-    logger.info(`Please make sure you are running ${chalk.green('purgetss')} within an Alloy or Classic Project.`)
-    logger.info(`For more information, visit ${chalk.green('https://purgetss.com')}`)
+    logger.block(
+      `Please make sure you are running ${chalk.green('purgetss')} within an Alloy or Classic Project.`,
+      `For more information, visit ${chalk.green('https://purgetss.com')}`
+    )
     return false
   }
 }

package/src/cli/commands/purge.js

@@ -31,6 +31,7 @@ import { init } from './init.js'
 import { getConfigOptions, getConfigFile, ensureConfig } from '../../shared/config-manager.js'
 
 // Import purger functions from core modules
+import { processControllers } from '../../core/analyzers/class-extractor.js'
 import { purgeTailwind } from '../../core/purger/tailwind-purger.js'
 import {
   purgeFontAwesome,
@@ -191,7 +192,15 @@ function validateXML(xmlText, filePath) {
 function findSuspectLine(lines) {
   for (let i = 0; i < lines.length; i++) {
     const trimmed = lines[i].trim()
-    if (!trimmed || trimmed.startsWith('<!--')) continue
+    if (!trimmed) continue
+
+    // "--" inside XML comments (illegal in XML spec)
+    if (trimmed.includes('<!--')) {
+      const commentBody = trimmed.replace(/<!--/, '').replace(/-->.*$/, '')
+      if (/--/.test(commentBody)) return i + 1
+    }
+
+    if (trimmed.startsWith('<!--')) continue
 
     // Opening tag without tag name: "< class=..."
     if (/^<\s+\w+=/.test(trimmed)) return i + 1
@@ -235,8 +244,26 @@ function preValidateXML(xmlText, filePath) {
     const line = lines[i]
     const trimmed = line.trim()
 
-    // Skip empty lines and comments
-    if (!trimmed || trimmed.startsWith('<!--') || trimmed.startsWith('<Alloy')) {
+    // Skip empty lines and Alloy root tag
+    if (!trimmed || trimmed.startsWith('<Alloy')) {
+      continue
+    }
+
+    // Check for "--" inside XML comments (illegal in XML spec)
+    // e.g. <!-- Section: --modules Option --> is invalid because of the "--" before "modules"
+    if (trimmed.includes('<!--')) {
+      const commentBody = trimmed.replace(/<!--/, '').replace(/-->.*$/, '')
+      if (/--/.test(commentBody)) {
+        const dashMatch = commentBody.match(/--(\S*)/)
+        const offender = dashMatch ? `--${dashMatch[1]}` : '--'
+        throwPreValidationError({
+          relativePath,
+          lineNumber: i + 1,
+          lineContent: trimmed,
+          message: `XML comment contains illegal "--" sequence ("${offender}")`,
+          fix: `Replace "--" with "—" (em-dash) or reword the comment to avoid double dashes`
+        })
+      }
       continue
     }
 
@@ -359,12 +386,16 @@ function throwPreValidationError({ relativePath, lineNumber, lineContent, messag
   error.lineNumber = lineNumber
   error.lineContent = lineContent
 
-  logger.error('XML Syntax Error\n')
-  logger.info(`File: "${relativePath}"`)
-  logger.info(`Line: ${lineNumber}`)
-  logger.info(`Content: "${lineContent}"\n`)
-  logger.error(message)
-  logger.info(chalk.green(`Fix: ${fix}\n`))
+  logger.block(
+    chalk.red('XML Syntax Error'),
+    `File: ${chalk.yellow(`"${relativePath}"`)}`,
+    `Line: ${chalk.yellow(lineNumber)}`,
+    `Content: ${chalk.yellow(`"${lineContent}"`)}`,
+    '',
+    chalk.red(message),
+    '',
+    `${chalk.green('Fix:')} ${fix}`
+  )
 
   throw error
 }
@@ -386,69 +417,6 @@ function extractClasses(currentText, currentFile) {
   }
 }
 
-/**
- * Process controller files for classes
- * COPIED exactly from original processControllers() function
- */
-function processControllers(data) {
-  const allWords = []
-  const lines = data.split(/\r?\n/)
-
-  lines.forEach(line => {
-    const words = extractWordsFromLine(line)
-    if (words.length > 0) {
-      allWords.push(...words)
-    }
-  })
-
-  return allWords
-}
-
-/**
- * Extract words from a line of controller code
- * COPIED exactly from original extractWordsFromLine() function
- */
-function extractWordsFromLine(line) {
-  const patterns = [
-    {
-      // apply: 'classes'
-      regex: /apply:\s*'([^']+)'/,
-      process: match => match[1].split(/\s+/)
-    },
-    {
-      // classes: ['class1', 'class2'] o classes: ['class1 class2']
-      regex: /classes:\s*\[([^\]]+)\]/,
-      process: match => match[1].split(',').map(item => item.trim().replace(/['"]/g, ''))
-    },
-    {
-      // classes: 'class1 class2'
-      regex: /classes:\s*'([^']+)'/,
-      process: match => match[1].split(/\s+/)
-    }
-  ]
-
-  // Process simple patterns
-  const words = patterns.reduce((acc, { regex, process }) => {
-    const match = regex.exec(line)
-    return match ? [...acc, ...process(match)] : acc
-  }, [])
-
-  // Process addClass, removeClass, resetClass
-  const classFunctionRegex = /(?:\.\w+Class|resetClass)\([^,]+,\s*(?:'([^']+)'|\[([^\]]+)\])/g
-  let classFunctionMatch
-  while ((classFunctionMatch = classFunctionRegex.exec(line)) !== null) {
-    const content = classFunctionMatch[1] || classFunctionMatch[2]
-    if (content) {
-      const classes = content.includes(',')
-        ? content.split(',').map(item => item.trim().replace(/['"]/g, ''))
-        : content.replace(/['"]/g, '').split(/\s+/)
-      words.push(...classes)
-    }
-  }
-
-  return words
-}
-
 /**
  * Filter invalid characters from class names
  * COPIED exactly from original filterCharacters() function
@@ -711,49 +679,57 @@ export function purgeClasses(options) {
 
   if (Date.now() > (fs.statSync(projectsAppTSS).mtimeMs + 2000) || recentlyCreated) {
     start()
-
-    init(options)
-
-    backupOriginalAppTss()
-
-    let uniqueClasses
-
+    logger.startSection()
     try {
-      uniqueClasses = getUniqueClasses()
-    } catch (error) {
-      // Handle pre-validation errors (XML syntax errors detected before parsing)
-      if (error.isPreValidationError) {
-        // Error already printed by preValidateXML, exit cleanly
-        // eslint-disable-next-line n/no-process-exit
-        process.exit(1)
+      // Explicit header so every purge run shows which project is being
+      // processed — mirrors the Auto-Purging line emitted by the alloy.jmk hook.
+      logger.info('Purging', chalk.yellow(cwd))
+
+      init(options)
+
+      backupOriginalAppTss()
+
+      let uniqueClasses
+
+      try {
+        uniqueClasses = getUniqueClasses()
+      } catch (error) {
+        // Handle pre-validation errors (XML syntax errors detected before parsing)
+        if (error.isPreValidationError) {
+          // Error already printed by preValidateXML, exit cleanly
+          // eslint-disable-next-line n/no-process-exit
+          process.exit(1)
+        }
+        // Re-throw other errors
+        throw error
       }
-      // Re-throw other errors
-      throw error
-    }
 
-    let tempPurged = copyResetTemplateAnd_appTSS()
+      let tempPurged = copyResetTemplateAnd_appTSS()
 
-    tempPurged += purgeTailwind(uniqueClasses, purgingDebug)
+      tempPurged += purgeTailwind(uniqueClasses, purgingDebug)
 
-    const cleanUniqueClasses = cleanClasses(uniqueClasses)
+      const cleanUniqueClasses = cleanClasses(uniqueClasses)
 
-    tempPurged += purgeFontAwesome(uniqueClasses, cleanUniqueClasses, purgingDebug)
+      tempPurged += purgeFontAwesome(uniqueClasses, cleanUniqueClasses, purgingDebug)
 
-    tempPurged += purgeMaterialIcons(uniqueClasses, cleanUniqueClasses, purgingDebug)
+      tempPurged += purgeMaterialIcons(uniqueClasses, cleanUniqueClasses, purgingDebug)
 
-    tempPurged += purgeMaterialSymbols(uniqueClasses, cleanUniqueClasses, purgingDebug)
+      tempPurged += purgeMaterialSymbols(uniqueClasses, cleanUniqueClasses, purgingDebug)
 
-    tempPurged += purgeFramework7(uniqueClasses, cleanUniqueClasses, purgingDebug)
+      tempPurged += purgeFramework7(uniqueClasses, cleanUniqueClasses, purgingDebug)
 
-    tempPurged += purgeFonts(uniqueClasses, cleanUniqueClasses, purgingDebug)
+      tempPurged += purgeFonts(uniqueClasses, cleanUniqueClasses, purgingDebug)
 
-    tempPurged += processMissingClasses(tempPurged)
+      tempPurged += processMissingClasses(tempPurged)
 
-    saveFile(projectsAppTSS, tempPurged)
+      saveFile(projectsAppTSS, tempPurged)
 
-    logger.file('app.tss')
+      logger.file('app.tss')
 
-    finish()
+      finish()
+    } finally {
+      logger.endSection()
+    }
 
     return true
   } else {