purgetss 6.2.38 → 6.2.40

package/bin/purgetss

@@ -142,6 +142,7 @@ program
   .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')}`)
+  .option('-p, --prefix', "Apply the style's filename as the prefix in icon fonts for both the `fonts.tss` and `purgetss.fonts.js` files.")
   .action((args, options, logger) => {
     purgetss.buildFonts(options)
   })

package/dist/tailwind.tss

@@ -1,4 +1,4 @@
-// Based on Tailwind CSS v3.3.3: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
+// Based on Tailwind CSS v3.3.5: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
 // Created by Adam Wathan ( https://twitter.com/adamwathan ).
 
 // Tailwind-like styles

package/index.js

@@ -660,8 +660,10 @@ function buildFonts(options) {
     // ! Process styles files
     _.each(files, file => {
       if (file.endsWith('.css') || file.endsWith('.CSS')) {
+        const cssFile = readCSS(file)
         const theFile = file.split('/')
         const theCSSFile = theFile.pop()
+        const prefix = options.prefix ? theCSSFile.split('.').shift() : null
         let theFolder = theFile.pop() + '/'
         if (theFolder === 'fonts/') {
           theFolder = ''
@@ -672,12 +674,12 @@ function buildFonts(options) {
         tssClasses += oneTimeMessage + `\n// ${theCSSFileName}\n`
         oneTimeMessage = ''
 
-        tssClasses += processFontsCSS(readCSS(file))
+        tssClasses += processFontsCSS(cssFile, prefix)
 
         // ! JavaScript Module
         if (options.module) {
-          fontJS += processFontsJS(readCSS(file), `\n\t// ${theCSSFileName}`)
-          fontFamiliesJS += processFontFamilyNamesJS(readCSS(file), `\n\t// ${theCSSFileName}`)
+          fontJS += processFontsJS(cssFile, `\n\t// ${theCSSFileName}`, prefix)
+          fontFamiliesJS += processFontFamilyNamesJS(cssFile, `\n\t// ${theCSSFileName}`, prefix)
         }
 
         // !Done processing stylesheet
@@ -689,7 +691,7 @@ function buildFonts(options) {
       makeSureFolderExists(projectsPurgeTSSFolder)
       makeSureFolderExists(projectsPurge_TSS_Styles_Folder)
 
-      fs.writeFileSync(cwd + '/purgetss/styles/fonts.tss', tssClasses, err => {
+      fs.writeFileSync(`${cwd}/purgetss/styles/fonts.tss`, tssClasses, { encoding: 'utf8' }, err => {
         throw err
       })
     }
@@ -700,16 +702,18 @@ function buildFonts(options) {
       let exportIcons = 'const icons = {'
       exportIcons += fontJS.slice(0, -1)
       exportIcons += '\n};\n'
+      exportIcons += 'exports.icon = icons;\n'
       exportIcons += 'exports.icons = icons;\n'
 
       exportIcons += '\nconst families = {'
       exportIcons += fontFamiliesJS.slice(0, -1)
       exportIcons += '\n};\n'
+      exportIcons += 'exports.family = families;\n'
       exportIcons += 'exports.families = families;\n'
 
       exportIcons += '\n// Helper Functions\n' + fs.readFileSync(path.resolve(__dirname, './lib/templates/icon-functions.js'), 'utf8')
 
-      fs.writeFileSync(`${projectsLibFolder}/purgetss.fonts.js`, exportIcons, err => {
+      fs.writeFileSync(`${projectsLibFolder}/purgetss.fonts.js`, exportIcons, { encoding: 'utf8' }, err => {
         throw err
       })
 
@@ -890,50 +894,56 @@ function copyFramework7IconsFonts() {
   logger.warn(' - Framework 7')
 }
 
-function processFontsCSS(data) {
+function processFontsCSS(data, prefix) {
   const rules = getRules(data)
+  const fontsPrefix = findPrefix(rules)
 
   let processedRules = ''
-
   _.each(rules, rule => {
     if (rule) {
-      processedRules += `'${rule.selector}': { text: '\\u${rule.property}', title: '\\u${rule.property}' }\n`
+      if (prefix) {
+        processedRules += `'${rule.selector.replace(fontsPrefix, prefix)}': { text: '\\u${rule.property}', title: '\\u${rule.property}' }\n`
+      } else {
+        processedRules += `'${rule.selector}': { text: '\\u${rule.property}', title: '\\u${rule.property}' }\n`
+      }
     }
   })
 
   return processedRules
 }
 
-function processFontsJS(data, fontFamily = '') {
+function processFontsJS(data, fontFamily = '', prefix) {
   const rules = getRules(data)
 
   let exportIcons = '\n'
 
-  let thePrefix = findPrefix(rules)
+  let fontsPrefix = findPrefix(rules)
 
   _.each(rules, rule => {
     if (rule) {
-      exportIcons += `\t\t'${prettifyFontName(rule.selector.replace('.', ''), thePrefix)}': '\\u${rule.property}',\n`
+      exportIcons += `\t\t'${prettifyFontName(rule.selector.replace('.', ''), fontsPrefix)}': '\\u${rule.property}',\n`
     }
   })
 
-  if (thePrefix === undefined) {
-    thePrefix = fontFamily
+  if (prefix) {
+    fontsPrefix = prefix
+  } else if (fontsPrefix === undefined) {
+    fontsPrefix = fontFamily
   }
 
-  return `${fontFamily}\n\t'${_.camelCase(thePrefix)}': {${exportIcons}\t},`
+  return `${fontFamily}\n\t'${_.camelCase(fontsPrefix)}': {${exportIcons}\t},`
 }
 
-function processFontFamilyNamesJS(data, fontFamily = '') {
+function processFontFamilyNamesJS(data, fontFamily = '', prefix) {
   const rules = getRules(data)
 
-  let thePrefix = findPrefix(rules)
+  let fontsPrefix = prefix ?? findPrefix(rules)
 
-  if (thePrefix === undefined) {
-    thePrefix = fontFamily
+  if (fontsPrefix === undefined) {
+    fontsPrefix = fontFamily
   }
 
-  return `${fontFamily}\n\t'${_.camelCase(thePrefix)}': '${getFontFamily(data)}',`
+  return `${fontFamily}\n\t'${_.camelCase(fontsPrefix)}': '${getFontFamily(data)}',`
 }
 
 function processFontMeta(fontMeta) {

package/lib/helpers.js

@@ -6874,9 +6874,26 @@ function parseValue(value, sign = '') {
     value = 0
   }
 
+  if (value.includes('/')) {
+    /* eslint-disable no-eval */
+    let parsedFloat = parseFloat(eval(value)) * 100
+    const splittedValues = parsedFloat.toString().split('.')
+
+    if (splittedValues[1] && splittedValues[1].length >= 6) {
+      if (`.${splittedValues[1]}` < 0.5) {
+        parsedFloat += 0.000001
+      }
+      parsedFloat = parsedFloat.toFixed(6)
+    }
+
+    value = `${parsedFloat}%`
+  }
+
   const unit = isNaN(value) ? checkTitanium(value) : value
 
-  if (typeof value === 'string' && value.indexOf('-') > -1 || value < 0) sign = ''
+  if ((typeof value === 'string' && value.indexOf('-') > -1) || value < 0) {
+    sign = ''
+  }
 
   switch (unit) {
     case '0':

package/lib/templates/tailwind/template.tss

@@ -1,2 +1,2 @@
-// Based on Tailwind CSS v3.3.3: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
+// Based on Tailwind CSS v3.3.5: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
 // Created by Adam Wathan ( https://twitter.com/adamwathan ).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "purgetss",
-  "version": "6.2.38",
+  "version": "6.2.40",
   "description": "A package that simplifies mobile app creation for Titanium developers.",
   "main": "index.js",
   "bin": {
@@ -58,16 +58,16 @@
     "path": "^0.12.7",
     "prompts": "^2.4.2",
     "read-css": "^0.3.0",
-    "tailwindcss": "^3.3.3",
+    "tailwindcss": "^3.3.5",
     "traverse": "^0.6.7",
     "update-notifier": "^5.1.0",
     "uuid": "^9.0.1",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
-    "eslint": "^8.49.0",
+    "eslint": "^8.53.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-n": "^15.7.0"
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-n": "^16.3.0"
   }
 }