purgetss 6.2.32 → 6.2.34

package/bin/purgetss

@@ -70,14 +70,15 @@ program
   .argument('[hexcode]', 'The base hexcode value')
   .argument('[name]', 'Name of the color')
   .option('-n, --name', 'Specify the name of the color')
-  .option('-q, --quotes', `Keep double quotes in the ${chalk.yellow('config.js')} file`)
+  .option('-q, --quotes', `Keep double quotes in ${chalk.yellow('config.js')}`)
   .option('-r, --random', 'Generate shades from a random color')
+  .option('-o, --override', `Place new shades in ${chalk.yellow('theme.colors')} to override default colors`)
   .option('-s, --single', 'Generate a single color definition')
-  .option('-t, --tailwind', `Log the generated shades with a ${chalk.yellow('tailwind.config.js')} compatible structure`)
-  .option('-l, --log', 'Log the generated shades instead of saving them')
-  .option('-j, --json', `Log a JSON compatible structure, which can be used in ${chalk.yellow('app/config.json')}`)
-  .description('Color shades generator from a given hexcolor')
-  .help('Generate color shades from a given hexcolor to use in your project')
+  .option('-l, --log', 'Log shades instead of saving them')
+  .option('-j, --json', `Log shades in ${chalk.yellow('app/config.json')} format`)
+  .option('-t, --tailwind', `Log shades in ${chalk.yellow('tailwind.config.js')} format`)
+  .description(`Generate color shades for ${chalk.yellow('config.js')} from a given hexcolor`)
+  .help(`Generate color shades from a hexcolor for your project. By default, the new shades are placed in ${chalk.yellow('theme.extend.colors')}`)
   .action((args, options, logger) => {
     purgetss.shades(args, options)
   })
@@ -129,7 +130,7 @@ program
 program
   .command('build-fonts')
   .alias('bf')
-  .description(`Generate a ${chalk.yellow('fonts.tss')} file based on the font and css files located in ${chalk.yellow('./purgetss/fonts')}`)
+  .description(`Generate ${chalk.yellow('fonts.tss')} from font and CSS files in ${chalk.yellow('./purgetss/fonts')}`)
   .help(`Generate a ${chalk.yellow('./purgetss/styles/fonts.tss')} file based on the font and css files located in ${chalk.yellow('./purgetss/fonts')} folder`)
   .option('-m, --module', `To also generate a CommonJS module in ${chalk.yellow('./app/lib/')} folder called ${chalk.yellow('purgetss-fonts.js')}`)
   .action((args, options, logger) => {

package/index.js

@@ -429,8 +429,24 @@ function shades(args, options) {
 
   const silent = options.tailwind || options.json || options.log
   if (alloyProject(silent) && !silent) {
-    if (!configFile.theme.extend.colors) configFile.theme.extend.colors = {}
-    configFile.theme.extend.colors[colorObject.name] = colorObject.shades
+    if (options.override) {
+      if (!configFile.theme.colors) configFile.theme.colors = {}
+      configFile.theme.colors[colorObject.name] = colorObject.shades
+
+      if (configFile.theme.extend.colors) {
+        if (configFile.theme.extend.colors[colorObject.name]) delete configFile.theme.extend.colors[colorObject.name]
+        if (Object.keys(configFile.theme.extend.colors).length === 0) delete configFile.theme.extend.colors
+      }
+    } else {
+      if (!configFile.theme.extend.colors) configFile.theme.extend.colors = {}
+      configFile.theme.extend.colors[colorObject.name] = colorObject.shades
+
+      if (configFile.theme.colors) {
+        if (configFile.theme.colors[colorObject.name]) delete configFile.theme.colors[colorObject.name]
+        if (Object.keys(configFile.theme.colors).length === 0) delete configFile.theme.colors
+      }
+    }
+
     fs.writeFileSync(projectsConfigJS, 'module.exports = ' + cleanDoubleQuotes(configFile, options), 'utf8', err => { throw err })
     checkIfColorModule()
     logger.info(`${chalk.hex(colorFamily.hexcode).bold(`“${colorFamily.name}”`)} (${chalk.bgHex(colorFamily.hexcode)(colorFamily.hexcode)}) saved in`, chalk.yellow('config.js'))

package/lib/helpers.js

@@ -6494,18 +6494,20 @@ const arbitraryValuesTable = {
 	'rounded-b': 'borderRadius: [0, 0, {value}, {value}]',
 	'rounded-bl': 'borderRadius: [0, 0, 0, {value}]',
 	'rounded-br': 'borderRadius: [0, 0, {value}, 0]',
+	'rounded-full': 'width: {value}, height: {value}, borderRadius: {value1}',
 	'rounded-l': 'borderRadius: [{value}, 0, 0, {value}]',
 	'rounded-r': 'borderRadius: [0, {value}, {value}, 0]',
 	'rounded-t': 'borderRadius: [{value}, {value}, 0, 0]',
 	'rounded-tl': 'borderRadius: [{value}, 0, 0, 0]',
 	'rounded-tr': 'borderRadius: [0, {value}, 0, 0]',
 	'rounded': 'borderRadius: {value}',
-	'rounded-full': 'width: {value}, height: {value}, borderRadius: {value1}',
 	'row-h': 'rowHeight: {value}',
 	'rw': 'rightWidth: {value}',
 	'section-header-top-padding': 'sectionHeaderTopPadding: {value}',
 	'separator-h': 'separatorHeight: {value}',
 	'shadow-radius': 'shadowRadius: {value}',
+	'target-image-h': 'targetImageHeight: {value}',
+	'target-image-w': 'targetImageWidth: {value}',
 	'top': 'top: {value}',
 	'w': 'width: {value}',
 	'wh': 'width: {value}, height: {value}',
@@ -6517,6 +6519,8 @@ const arbitraryValuesTable = {
 	// Color
 	'active-tint': 'activeTintColor: {value}',
 	'active-title': 'activeTitleColor: {value}',
+	'badge-bg': 'badgeBackgroundColor: {value}',
+	'badge-text': 'badgeTextColor: {value}',
 	'badge': 'badgeColor: {value}',
 	'bar': 'barColor: {value}',
 	'bg-disabled': 'backgroundDisabledColor: {value}',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "purgetss",
-	"version": "6.2.32",
+	"version": "6.2.34",
 	"description": "A package that simplifies mobile app creation for Titanium developers.",
 	"main": "index.js",
 	"bin": {