purgetss 6.2.50 → 6.3.2

package/index.js

@@ -1106,14 +1106,14 @@ function findMissingClasses(tempPurged) {
     tempPurged += '\n' + fs.readFileSync(file, 'utf8')
   })
 
-  // ! Get Styles from Widgets  ( Experimental )
+  // ! Get Styles from Widgets
   if (configOptions.widgets && fs.existsSync(cwd + '/app/widgets/')) {
     _.each(getFiles(cwd + '/app/widgets').filter(file => file.endsWith('.tss')), file => {
       tempPurged += '\n' + fs.readFileSync(file, 'utf8')
     })
   }
 
-  // ! Get Views from Themes  ( Experimental )
+  // ! Get Views from Themes
   if (fs.existsSync(cwd + '/app/themes/')) {
     _.each(getFiles(cwd + '/app/themes').filter(file => file.endsWith('.tss')), file => {
       tempPurged += '\n' + fs.readFileSync(file, 'utf8')
@@ -1126,7 +1126,20 @@ function findMissingClasses(tempPurged) {
     })
   }
 
-  return getClassesOnlyFromXMLFiles().filter(item => !tempPurged.includes(item))
+  const classesFromXmlFiles = getClassesOnlyFromXMLFiles().filter(item => !tempPurged.includes(item))
+
+  let classesFromJsFiles = []
+  const controllerPaths = getControllerPaths()
+  _.each(controllerPaths, controllerPath => {
+    const data = fs.readFileSync(controllerPath, 'utf8')
+    if (data) classesFromJsFiles.push(processControllers(data))
+  })
+  const reservedWords = 'Alloy.isTablet Alloy.isHandheld ? ,'
+  classesFromJsFiles = [...new Set([...classesFromJsFiles.flat().filter(item => !reservedWords.includes(item))])]
+
+  classesFromJsFiles = classesFromJsFiles.filter(item => !reservedWords.includes(item))
+
+  return [...new Set([...classesFromJsFiles.filter(item => !tempPurged.includes(item)), ...classesFromXmlFiles])]
 }
 
 function addHook() {
@@ -1249,12 +1262,12 @@ function getViewPaths() {
   // ! Parse Views from App
   viewPaths.push(...glob.sync(cwd + '/app/views/**/*.xml'))
 
-  // ! Parse Views from Widgets  ( Experimental )
+  // ! Parse Views from Widgets
   if (configOptions.widgets && fs.existsSync(cwd + '/app/widgets/')) {
     viewPaths.push(...glob.sync(cwd + '/app/widgets/**/views/*.xml'))
   }
 
-  // ! Parse Views from Themes  ( Experimental )
+  // ! Parse Views from Themes
   if (fs.existsSync(cwd + '/app/themes/')) {
     viewPaths.push(...glob.sync(cwd + '/app/themes/**/views/*.xml'))
   }
@@ -1262,6 +1275,25 @@ function getViewPaths() {
   return viewPaths
 }
 
+function getControllerPaths() {
+  const controllerPaths = []
+
+  // ! Parse Controllers from App
+  controllerPaths.push(...glob.sync(cwd + '/app/controllers/**/*.js'))
+
+  // ! Parse Controllers from Widgets
+  if (configOptions.widgets && fs.existsSync(cwd + '/app/widgets/')) {
+    controllerPaths.push(...glob.sync(cwd + '/app/widgets/**/controllers/*.js'))
+  }
+
+  // ! Parse Controllers from Themes
+  if (fs.existsSync(cwd + '/app/themes/')) {
+    controllerPaths.push(...glob.sync(cwd + '/app/themes/**/controllers/*.js'))
+  }
+
+  return controllerPaths
+}
+
 function getClassesOnlyFromXMLFiles() {
   const allClasses = []
   const viewPaths = getViewPaths()
@@ -1285,6 +1317,12 @@ function getUniqueClasses() {
     if (file) allClasses.push((configFile.purge.mode === 'all') ? file.match(/[^<>"'`\s]*[^<>"'`\s:]/g) : extractClasses(file, viewPath))
   })
 
+  const controllerPaths = getControllerPaths()
+  _.each(controllerPaths, controllerPath => {
+    const data = fs.readFileSync(controllerPath, 'utf8')
+    if (data) allClasses.push(processControllers(data))
+  })
+
   if (configOptions.safelist) _.each(configOptions.safelist, safe => allClasses.push(safe))
 
   const uniqueClasses = []
@@ -1297,6 +1335,68 @@ function getUniqueClasses() {
   return uniqueClasses.sort()
 }
 
+function extractWordsFromLine(line) {
+  let words = []
+
+  // Matching apply
+  const applyRegex = /apply:\s*'([^']+)'/
+  const applyMatch = applyRegex.exec(line)
+  if (applyMatch) {
+    const applyContent = applyMatch[1]
+    words = words.concat(applyContent.split(/\s+/))
+  }
+
+  // Matching classes as array
+  const classesArrayRegex = /classes:\s*\[([^\]]+)\]/
+  const classesArrayMatch = classesArrayRegex.exec(line)
+  if (classesArrayMatch) {
+    const classesContent = classesArrayMatch[1]
+    const classesArray = classesContent.split(',').map(item => item.trim().replace(/['"]/g, ''))
+    words = words.concat(classesArray)
+  }
+
+  // Matching classes as string
+  const classesStringRegex = /classes:\s*'([^']+)'/
+  const classesStringMatch = classesStringRegex.exec(line)
+  if (classesStringMatch) {
+    const classesContent = classesStringMatch[1]
+    words = words.concat(classesContent.split(/\s+/))
+  }
+
+  // Matching addClass, removeClass, resetClass
+  const classFunctionRegex = /(?:\.\w+Class|resetClass)\([^,]+,\s*'([^']+)'/g
+  let classFunctionMatch
+  while ((classFunctionMatch = classFunctionRegex.exec(line)) !== null) {
+    const classFunctionContent = classFunctionMatch[1]
+    words = words.concat(classFunctionContent.split(/\s+/))
+  }
+
+  // Matching generic arrays
+  // const genericArrayRegex = /(\w+:\s*\[([^\]]+)\])/g
+  // let genericArrayMatch
+  // while ((genericArrayMatch = genericArrayRegex.exec(line)) !== null) {
+  //   const genericArrayContent = genericArrayMatch[2]
+  //   const genericArray = genericArrayContent.split(',').map(item => item.trim().replace(/['"]/g, ''))
+  //   words = words.concat(genericArray)
+  // }
+
+  return words
+}
+
+function processControllers(data) {
+  const allWords = []
+  const lines = data.split(/\r?\n/)
+
+  lines.forEach(line => {
+    const words = extractWordsFromLine(line)
+    if (words.length > 0) {
+      allWords.push(...words)
+    }
+  })
+
+  return allWords
+}
+
 function filterCharacters(uniqueClass) {
   if (uniqueClass.length === 1 && !/^[a-zA-Z_]/.test(uniqueClass)) {
     return false
@@ -1893,7 +1993,7 @@ function createDefinitionsFile() {
     })
   }
 
-  // ! Get Styles from Themes  ( Experimental )
+  // ! Get Styles from Themes
   if (fs.existsSync(cwd + '/app/themes/')) {
     _.each(getFiles(cwd + '/app/themes').filter(file => file.endsWith('.tss')), file => {
       classDefinitions += fs.readFileSync(file, 'utf8')
@@ -2296,7 +2396,7 @@ function extractClassesOnly(currentText, currentFile) {
     const jsontext = convert.xml2json(encodeHTML(currentText), { compact: true })
 
     return traverse(JSON.parse(jsontext)).reduce(function (acc, value) {
-      if (this.key === 'class' || this.key === 'classes' || this.key === 'icon') acc.push(value.split(' '))
+      if (this.key === 'class' || this.key === 'classes' || this.key === 'icon' || this.key === 'activeIcon') acc.push(value.split(' '))
       return acc
     }, [])
   } catch (error) {

package/lib/helpers.js

@@ -3117,7 +3117,8 @@ function orientationModes() {
       'landscape-right': '[ Ti.UI.LANDSCAPE_RIGHT ]',
       portrait: '[ Ti.UI.PORTRAIT ]',
       'upside-portrait': '[ Ti.UI.UPSIDE_PORTRAIT ]',
-      landscape: '[ Ti.UI.LANDSCAPE_LEFT, Ti.UI.LANDSCAPE_RIGHT ]'
+      landscape: '[ Ti.UI.LANDSCAPE_LEFT, Ti.UI.LANDSCAPE_RIGHT ]',
+      all: '[ Ti.UI.PORTRAIT, Ti.UI.UPSIDE_PORTRAIT, Ti.UI.LANDSCAPE_LEFT, Ti.UI.LANDSCAPE_RIGHT ]'
     }
   })
 

package/package.json

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