purgetss 6.2.7 → 6.2.9

package/bin/purgetss

@@ -72,6 +72,7 @@ program
 	.option('-n, --name', 'Name of the color')
 	.option('-q, --quotes', 'Keep double quotes in config.js')
 	.option('-r, --random', 'Generates shades from a random color')
+	.option('-s, --single', 'Generate a single color definition')
 	.option('-l, --log', `Log the generated shades instead of saving them`)
 	.option('-j, --json', `Log a JSON compatible structure, to use it in ${chalk.yellow('app/config.json')}`)
 	.description(`Color shades generator from a given hexcolor`)

package/experimental/completions2.js

@@ -33,7 +33,6 @@ const srcConfigFile = path.resolve(__dirname, '../lib/templates/purgetss.config.
 const configFile = (fs.existsSync(projectsConfigJS)) ? require(projectsConfigJS) : require(srcConfigFile);
 configFile.purge = configFile.purge ?? { mode: 'all' };
 configFile.theme.extend = configFile.theme.extend ?? {};
-configFile.fonts = configFile.fonts ?? { mode: 'fileName' };
 
 const configOptions = (configFile.purge && configFile.purge.options) ? configFile.purge.options : false;
 if (configOptions) {

package/index.js

@@ -102,7 +102,6 @@ const srcConfigFile = path.resolve(__dirname, './lib/templates/purgetss.config.j
 const configFile = (fs.existsSync(projectsConfigJS)) ? require(projectsConfigJS) : require(srcConfigFile);
 configFile.purge = configFile.purge ?? { mode: 'all' };
 configFile.theme.extend = configFile.theme.extend ?? {};
-configFile.fonts = configFile.fonts ?? { mode: 'fileName' };
 
 const configOptions = (configFile.purge && configFile.purge.options) ? configFile.purge.options : false;
 if (configOptions) {
@@ -396,8 +395,6 @@ exports.create = create;
 
 //! Command: shades
 function shades(args, options) {
-	delete configFile.fonts;
-
 	let chroma = require('chroma-js');
 	let generateColorShades = require('./lib/color-shades/generateColorShades');
 	let referenceColorFamilies = require('./lib/color-shades/tailwind').filter((item) => {
@@ -421,11 +418,9 @@ function shades(args, options) {
 		if (!configFile['theme']['extend']['colors']) configFile['theme']['extend']['colors'] = {};
 		configFile['theme']['extend']['colors'][colorObject.name] = colorObject.shades;
 		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'));
-
-		if (options.module) {
-			colorModule();
-		}
+		// if (options.module) colorModule();
 	} else if (options.json) {
 		logger.info(`${chalk.hex(colorFamily.hexcode).bold(`“${colorFamily.name}”`)} (${chalk.bgHex(colorFamily.hexcode)(`${colorFamily.hexcode}`)})\n${JSON.stringify(colorObject, null, 2)}`);
 	} else {
@@ -435,15 +430,19 @@ function shades(args, options) {
 exports.shades = shades;
 
 function colorModule() {
-	// read config.js
-	let configFile = require(projectsConfigJS);
+	initIfNotConfig();
+	let colorModuleConfigFile = require(projectsConfigJS);
 	makeSureFolderExists(projectsLibFolder);
-	let mainColors = { ...configFile.theme.colors, ...configFile.theme.extend.colors };
+	let mainColors = { ...colorModuleConfigFile.theme.colors, ...colorModuleConfigFile.theme.extend.colors };
 	fs.writeFileSync(`${projectsLibFolder}/purgetss.colors.js`, 'module.exports = ' + cleanDoubleQuotes(mainColors, {}), 'utf8', err => { throw err; });
-	logger.info(`All colors copied to ${chalk.yellow('lib/purgetss.colors.js')} module`);
+	logger.info(`All colors copied to ${chalk.yellow('lib/purgetss.colors.js')}`);
 }
 exports.colorModule = colorModule;
 
+function checkIfColorModule() {
+	if (fs.existsSync(`${projectsLibFolder}/purgetss.colors.js`)) colorModule();
+}
+
 function cleanDoubleQuotes(configFile, options) {
 	const regexUnicode = /[^\u0000-\u00FF]/g;
 
@@ -459,18 +458,21 @@ function cleanDoubleQuotes(configFile, options) {
 
 function createColorObject(family, hexcode, options) {
 	let colors = {};
+	let name = family.name.toLowerCase().split(" ").join("-");
 
 	if (options.json) {
 		let shades = {};
 		colors.global = {};
-		let name = family.name.toLowerCase().split(" ").join("-");
 		shades[name] = hexcode;
 		family.shades.forEach((shade) => shades[`${name}-${shade.number}`] = shade.hexcode);
-		colors.global.colors = shades;
+		colors.global.colors = (options.single) ? { [name]: hexcode } : shades;
+	} else if (options.single) {
+		colors.name = name;
+		colors.shades = hexcode;
 	} else {
 		let shades = { default: hexcode };
 		family.shades.forEach((shade) => shades[shade.number] = shade.hexcode);
-		colors.name = family.name.toLowerCase().split(" ").join("-");
+		colors.name = name;
 		colors.shades = shades;
 	}
 
@@ -581,7 +583,7 @@ function buildFonts(options) {
 
 				let fontFamilyName = fontMeta.postScriptName.replace(/\//g, '');
 				//! Maybe this is deprecated
-				if (configFile.fonts.mode.toLowerCase() === 'postscriptname' || configFile.fonts.mode.toLowerCase() === 'postscript' || configFile.fonts.mode.toLowerCase() === 'ps') {
+				if (configFile.fonts && (configFile.fonts.mode.toLowerCase() === 'postscriptname' || configFile.fonts.mode.toLowerCase() === 'postscript' || configFile.fonts.mode.toLowerCase() === 'ps')) {
 					tssClasses += `\n'.${fontFamilyName.toLowerCase()}': { font: { fontFamily: '${fontFamilyName}' } }\n`;
 				} else {
 					tssClasses += `\n'.${getFileName(file)}': { font: { fontFamily: '${fontFamilyName}' } }\n`;
@@ -2396,6 +2398,7 @@ function purgeTailwind(uniqueClasses) {
 
 	if (`// config.js file updated on: ${getFileUpdatedDate(projectsConfigJS)}` !== tailwindClasses[6]) {
 		logger.info(chalk.yellow('config.js'), 'file changed!, rebuilding tailwind.tss...');
+		checkIfColorModule();
 		buildTailwindBasedOnConfigOptions();
 		createDefinitionsFile();
 		tailwindClasses = fs.readFileSync(projectsTailwind_TSS, 'utf8').split(/\r?\n/);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "purgetss",
-	"version": "6.2.7",
+	"version": "6.2.9",
 	"description": "An extension for Titanium SDK that contains a set of Tailwind-like classes to easily and quickly create beautifully designed mobile apps.",
 	"main": "index.js",
 	"bin": {