purgetss 6.2.0 → 6.2.2

package/experimental/completions2.js

@@ -412,7 +412,9 @@ function combineDefaultThemeWithConfigFile() {
 		? _.merge({ apply: configFile.theme.View.apply }, configFile.theme.View)
 		: _.merge({ default: { width: 'Ti.UI.SIZE', height: 'Ti.UI.SIZE' } }, configFile.theme.View);
 
-	_.each(configFile.plugins, value => {
+	// !Delete plugins specified in the config file
+	let deletePlugins = Array.isArray(configFile.plugins) ? configFile.plugins : Object.keys(configFile.plugins).map(key => key);
+	_.each(deletePlugins, value => {
 		delete base[value];
 		delete configFile.theme[value];
 		delete configFile.theme.extend[value];

package/index.js

@@ -396,13 +396,14 @@ function shades(args, options) {
 exports.shades = shades;
 
 function cleanDoubleQuotes(configFile, options) {
-	let json = JSON.stringify(configFile, null, 2);
+	const regexUnicode = /[^\u0000-\u00FF]/g;
 
-	if (options.quotes) return json;
+	if (options.quotes) return JSON.stringify(configFile, null, 2).replace(regexUnicode, match => `\\u${match.charCodeAt(0).toString(16)}`);
 
-	json = json.replace(/"([^"]+)":/g, (match, p1) => (p1.match(/[#._-]/)) ? `'${p1}':` : `${p1}:`);
+	let util = require('util');
+	let inspected = util.inspect(configFile, false, 10);
 
-	return json.replaceAll("\"", "'");
+	return inspected.replace(regexUnicode, match => `\\u${match.charCodeAt(0).toString(16)}`);
 }
 
 function createColorObject(family, hexcode, options) {
@@ -1594,10 +1595,11 @@ function combineAllValues(base, defaultTheme) {
 	}
 
 	// !Delete plugins specified in the config file
-	let plugins = Array.isArray(configFile.plugins) ? configFile.plugins : Object.keys(configFile.plugins).map(key => key);
-	_.each(plugins, value => {
+	let deletePlugins = Array.isArray(configFile.plugins) ? configFile.plugins : Object.keys(configFile.plugins).map(key => key);
+	_.each(deletePlugins, value => {
 		delete allValues[value];
 		delete configFile.theme[value];
+		delete configFile.theme.extend[value];
 	});
 
 	_.each(allValues, (_value, key) => {
@@ -2132,7 +2134,7 @@ function extractClassesOnly(currentText, currentFile) {
 		let jsontext = convert.xml2json(encodeHTML(currentText), { compact: true });
 
 		return traverse(JSON.parse(jsontext)).reduce(function(acc, value) {
-			if (this.key === 'class') acc.push(value.split(' '));
+			if (this.key === 'class' || this.key === 'classes' || this.key === 'icon') acc.push(value.split(' '));
 			return acc;
 		}, []);
 	} catch (error) {

package/lib/helpers.js

@@ -2,6 +2,7 @@ let _applyClasses = {};
 const fs = require('fs');
 const cwd = process.cwd();
 const _ = require('lodash');
+const regexUnicode = /[^\u0000-\u00FF]/;
 const readCSS = require('read-css');
 const HEX_3_REGEX = /^#?([a-f\d])([a-f\d])([a-f\d])$/i; // i.e. #0F3
 const HEX_4_REGEX = /^#?([a-f\d])([a-f\d])([a-f\d])([a-f\d])$/i; // i.e. #80F3
@@ -6797,10 +6798,10 @@ function findIndexOfClassName(_substring, _array) {
 function parseValue(value, sign = '') {
 	if (value === '') return `''`;
 
-	// Hack for unicode values
-	// if (/[^\u0000-\u00ff]/.test(value)) {
-	// 	return `'\\u${value.charCodeAt(0).toString(16)}'`;
-	// }
+	// Match on everything outside this range: [^\u0000-\u00FF].
+	if (regexUnicode.test(value)) {
+		return `'\\u${value.charCodeAt(0).toString(16)}'`;
+	}
 
 	if (value === '0px') {
 		value = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "purgetss",
-	"version": "6.2.0",
+	"version": "6.2.2",
 	"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": {