purgetss 7.1.4 → 7.1.6

package/dist/purgetss.ui.js

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

package/experimental/completions2.js

@@ -18,7 +18,10 @@ import { colores } from '../src/shared/brand-colors.js'
 export { colores }
 const purgeLabel = colores.purgeLabel
 
-const projectsConfigJS = cwd + '/purgetss/config.cjs'
+import * as helpers from '../src/shared/helpers.js'
+import { getConfigFile } from '../src/shared/config-manager.js'
+import { projectsConfigJS } from '../src/shared/constants.js'
+const tiCompletionsFile = require('../lib/completions/titanium/completions-v3.json')
 
 const logger = {
   info: (...args) => console.log(purgeLabel, args.join(' ')),
@@ -27,11 +30,7 @@ const logger = {
   file: (...args) => console.log(purgeLabel, chalk.yellow(args.join(' ')), 'file created!')
 }
 
-import * as helpers from '../src/shared/helpers.js'
-const tiCompletionsFile = require('../lib/completions/titanium/completions-v3.json')
-const srcConfigFile = path.resolve(__dirname, '../lib/templates/purgetss.config.js.cjs')
-
-const configFile = (fs.existsSync(projectsConfigJS)) ? require(projectsConfigJS) : require(srcConfigFile)
+const configFile = getConfigFile()
 configFile.purge = configFile.purge ?? { mode: 'all' }
 configFile.theme = configFile.theme ?? {}
 configFile.theme.extend = configFile.theme.extend ?? {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "purgetss",
-  "version": "7.1.4",
+  "version": "7.1.6",
   "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'
@@ -162,14 +162,20 @@ export function init(options) {
     return false
   }
 
-  // Get commands when needed
-  const { methodCommand, oppositeCommand } = getCommands()
+  // Check if config.cjs already exists to show appropriate message
+  const configExisted = fs.existsSync(projectsConfigJS)
+
+  // SUPER SIMPLE: Ensure config exists (migrate or create)
+  ensureConfig()
 
-  // config file
-  if (!fs.existsSync(projectsConfigJS)) {
-    createConfigFile()
+  // Show warning if config already existed (for init command specifically)
+  if (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) {
     buildTailwindBasedOnConfigOptions(options)

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,17 +12,15 @@
 
 import fs from 'fs'
 import util from 'util'
-import { projectsConfigJS } from '../../shared/constants.js'
-import { createConfigFile } from '../commands/init.js'
+import { ensureConfig } from '../../shared/config-manager.js'
 
 /**
+ * @deprecated Use ensureConfig() from config-manager.js instead
  * Initialize config if it doesn't exist
- * Maintains exact same logic as original initIfNotConfig() function
+ * FIRST migrates any existing config.js, THEN creates default if needed
  */
 export function initIfNotConfig() {
-  if (!fs.existsSync(projectsConfigJS)) {
-    createConfigFile()
-  }
+  ensureConfig()
 }
 
 /**

package/src/shared/config-manager.js

@@ -25,23 +25,59 @@ import { makeSureFolderExists } from './utils.js'
 const require = createRequire(import.meta.url)
 
 /**
- * Get configuration file with fallback to default template
- * Maintains exact same logic as original getConfigFile()
- *
- * @returns {Object} Configuration object with defaults applied
+ * 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 getConfigFile() {
-  // Auto-migration: rename config.js to config.cjs for ESM compatibility
+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
+ */
+export function migrateConfigIfNeeded() {
+  const oldConfigPath = `${projectsPurgeTSSFolder}/config.js`
+
+  // If only config.js exists, migrate it directly
   if (fs.existsSync(oldConfigPath) && !fs.existsSync(projectsConfigJS)) {
     makeSureFolderExists(projectsPurgeTSSFolder)
     fs.renameSync(oldConfigPath, projectsConfigJS)
     logger.info('Migrated config.js to config.cjs for ESM compatibility')
-  } else if (fs.existsSync(oldConfigPath) && fs.existsSync(projectsConfigJS)) {
-    // Remove old config.js if both exist
-    fs.unlinkSync(oldConfigPath)
-    logger.info('Removed duplicate config.js file')
   }
+  // If both exist, preserve config.js (let the user decide)
+  else if (fs.existsSync(oldConfigPath) && fs.existsSync(projectsConfigJS)) {
+    logger.warn('Both config.js and config.cjs exist. Please manually merge and remove config.js')
+  }
+}
+
+/**
+ * Get configuration file with fallback to default template
+ * Maintains exact same logic as original getConfigFile()
+ *
+ * @returns {Object} Configuration object with defaults applied
+ */
+export function getConfigFile() {
 
   const configFile = (fs.existsSync(projectsConfigJS))
     ? require(projectsConfigJS)
@@ -56,7 +92,7 @@ export function getConfigFile() {
   configFile.purge.options.widgets = configFile.purge.options.widgets ?? false
   configFile.purge.options.safelist = configFile.purge.options.safelist ?? []
   configFile.purge.options.plugins = configFile.purge.options.plugins ?? []
-  
+
   configFile.theme = configFile.theme ?? {}
   configFile.theme.extend = configFile.theme.extend ?? {}
 
@@ -160,5 +196,6 @@ export default {
   loadRawConfig,
   getGlobalConfigFile,
   getGlobalConfigOptions,
+  migrateConfigIfNeeded,
   defaultTheme
 }