@ds-sfdc/sfparty 1.2.2 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ds-sfdc/sfparty",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Salesforce metadata XML splitter for CI/CD",
   "type": "module",
   "repository": {

package/src/index.js

@@ -17,6 +17,7 @@ import * as profileDefinition from './meta/Profiles.js'
 import * as permsetDefinition from './meta/PermissionSets.js'
 import * as workflowDefinition from './meta/Workflows.js'
 import * as git from './lib/gitUtils.js'
+import logUpdate from 'log-update'
 
 const processStartTime = process.hrtime.bigint()
 
@@ -35,6 +36,7 @@ global.icons = {
     "fail": '❗',
     "working": '⏳',
     "party": '🎉',
+    "delete": '❌💀❌',
 }
 
 global.displayError = (error, quit = false) => {
@@ -243,8 +245,9 @@ yargs(hideBin(process.argv))
                                 reject(error)
                             })
                     }
+                } else {
+                    resolve(false)
                 }
-
             })
             startProm.then((result) => {
                 global.git.enabled = result
@@ -445,6 +448,9 @@ function combineHandler(argv, startTime) {
             }
         }
     })
+    combine.catch((error) => {
+        throw error
+    })
 
 }
 
@@ -481,7 +487,7 @@ function processCombine(typeItem, argv) {
 
 
         if (type == global.metaTypes.label.type) {
-            if (!global.git.enabled || [...new Set([...global.metaTypes.label.add.directories, ...global.metaTypes.label.remove.directories])].includes(global.metaTypes.label.definition.root)) {
+            if (!global.git.enabled || [...new Set([...global.metaTypes[typeItem].add.directories, ...global.metaTypes[typeItem].remove.directories])].includes(global.metaTypes[typeItem].definition.root)) {
                 processList.push(global.metaTypes.label.definition.root)
             }
         } else if (!all) {
@@ -493,26 +499,25 @@ function processCombine(typeItem, argv) {
             processList.push(name)
         } else {
             if (global.git.enabled) {
-                processList = [...new Set([...global.metaTypes.label.add.directories, ...global.metaTypes.label.remove.directories])]
+                processList = [...new Set([...global.metaTypes[typeItem].add.directories, ...global.metaTypes[typeItem].remove.directories])]
             } else {
                 processList = fileUtils.getDirectories(sourceDir)
             }
         }
 
         processed.total = processList.length
+        console.log(`${ chalk.bgBlackBright(processed.total) } ${ typeItem } file(s) to process`)
 
         // Abort if there are no files to process
         if (processed.total == 0) {
-            console.log(`${ chalk.bgBlackBright('0') } ${ typeItem } files to process`)
             resolve(true)
             return
         }
 
+        console.log()
         console.log(`${ chalk.bgBlackBright('Source path:') } ${ sourceDir }`)
         console.log(`${ chalk.bgBlackBright('Target path:') } ${ targetDir }`)
         console.log()
-        console.log(`Combining a total of ${ processed.total } file(s)`)
-        console.log()
 
         const promList = []
         processList.forEach(metaDir => {
@@ -533,7 +538,7 @@ function processCombine(typeItem, argv) {
 
         Promise.allSettled(promList).then((results) => {
             let successes = 0
-            let errors = 0
+            let errors = processed.errors++
             results.forEach(result => {
                 if (result.value == true) {
                     successes++
@@ -571,9 +576,5 @@ function gitFiles(data) {
                 }
             }
         }
-        const found = typeArray.some(r => item.path.split(path.sep).includes(r))
-        if (found.length > 0) {
-            let data1 = item.path
-        }
     })
 }

package/src/lib/fileUtils.js

@@ -68,7 +68,7 @@ export function deleteFile(filePath) {
     if (!fileExists(filePath)) {
         return false
     } else {
-        return unlinkSync(filePath, { recursive: false, force: true });
+        return fs.unlinkSync(filePath, { recursive: false, force: true });
     }
 }
 

package/src/lib/gitUtils.js

@@ -47,8 +47,11 @@ export function diff(dir, gitRef) {
             const gitData = gitString.split(os.EOL)
             let leftOver = ''
             gitData.forEach((gitRow, index) => {
-                if (index < count || lastIndex + 1 == gitString) {
+                if (gitRow.indexOf('\t') !== -1 &&(index < count || lastIndex + 1 == gitString)) {
                     const file = gitRow.split('\t')
+                    if (file.slice(-1)[0] == 'uthorizationFormConsent.yaml') {
+                        let test = true
+                    }
                     if (file.slice(-1) !== '') {
                         files.push({
                             type: status[(file[0] === file.slice(-1)) ? 'A' : Array.from(file[0])[0]],
@@ -76,16 +79,18 @@ export function diff(dir, gitRef) {
             reject(error)
         })
         gitDiff.on("close", code => {
-            const gitData = data.toString().split(os.EOL)
-            gitData.forEach(gitRow => {
-                const file = gitRow.split('\t')
-                if (file.slice(-1) !== '') {
-                    files.push({
-                        type: status[(file[0] === file.slice(-1)) ? 'A' : Array.from(file[0])[0]],
-                        path: file.slice(-1)[0],
-                    })
-                }
-            })
+            if (data !== '') {
+                const gitData = data.toString().split(os.EOL)
+                gitData.forEach(gitRow => {
+                    const file = gitRow.split('\t')
+                    if (file.slice(-1) !== '') {
+                        files.push({
+                            type: status[(file[0] === file.slice(-1)) ? 'A' : Array.from(file[0])[0]],
+                            path: file.slice(-1)[0],
+                        })
+                    }
+                })    
+            }
 
             resolve(files)
         })

package/src/party/combine.js

@@ -102,9 +102,21 @@ export class Combine {
                 that.#json[key] = undefined
             })
 
-            getXML(that)
-
-            saveXML(that)
+            let success = getXML(that)
+            if (success) {
+                saveXML(that)
+            } else {
+                logUpdate(that.#spinnerMessage
+                    .replace('[%1]', that.sequence.toString().padStart(that.total.toString().length, ' '))
+                    .replace('[%2]', `. ${chalk.redBright('source not found - removing XML file')}`)
+                    .replace('[%3]', ``)
+                    .replace('[%4]', `${global.icons.delete} `)
+                    .replace('[%5]', that.#fileName.shortName)
+                )
+                logUpdate.done()
+                deleteFile(that.#fileName.fullName)
+                resolve('deleted')
+            }
             resolve(true)
         })
 
@@ -118,35 +130,47 @@ export class Combine {
             that.#startTime = process.hrtime.bigint()
             that.#spinnerMessage = `[%1] of ${that.total} - ${that.#root}: [%4]${chalk.yellowBright('[%5]')}[%2][%3]`
 
-            that.#types.forEach(key => {
-                // display message
-                logUpdate(that.#spinnerMessage
-                    .replace('[%1]', that.sequence.toString().padStart(that.total.toString().length, ' '))
-                    .replace('[%2]', `\n${chalk.magentaBright(nextFrame(that))} ${key}`)
-                    .replace('[%3]', `${that.#errorMessage}`)
-                    .replace('[%4]', `${global.icons.working} `)
-                    .replace('[%5]', `${that.#fileName.shortName} `)
-                )
+            try {
+                that.#types.forEach(key => {
+                    // display message
+                    logUpdate(that.#spinnerMessage
+                        .replace('[%1]', that.sequence.toString().padStart(that.total.toString().length, ' '))
+                        .replace('[%2]', `\n${chalk.magentaBright(nextFrame(that))} ${key}`)
+                        .replace('[%3]', `${that.#errorMessage}`)
+                        .replace('[%4]', `${global.icons.working} `)
+                        .replace('[%5]', `${that.#fileName.shortName} `)
+                    )
 
 
-                if (that.metadataDefinition.main.includes(key)) {
-                    // TODO process main
-                    const fileObj = {
-                        shortName: 'Main',
-                        fullName: path.join(that.sourceDir, that.metaDir, `main.${global.format}`),
-                    }
-                    processFile(that, key, fileObj, 'main')
-                    if (that.#json.$ === undefined) {
-                        that.#json.$ = { xmlns: 'https://soap.sforce.com/2006/04/metadata' }
+                    if (that.metadataDefinition.main.includes(key)) {
+                        // TODO process main
+                        const fileObj = {
+                            shortName: 'Main',
+                            fullName: path.join(that.sourceDir, that.metaDir, `main.${global.format}`),
+                        }
+                        let success = processFile(that, key, fileObj, 'main')
+                        if (!success) {
+                            throw new Error('delete XML')
+                        }
+                        if (that.#json.$ === undefined) {
+                            that.#json.$ = { xmlns: 'https://soap.sforce.com/2006/04/metadata' }
+                        }
+                    } else if (that.metadataDefinition.singleFiles.includes(key)) {
+                        processSingleFile(that, key)
+                    } else if (that.metadataDefinition.directories.includes(key)) {
+                        processDirectory(that, key)
+                    } else {
+                        global.logger.warn(`Unexpected metadata type: ${chalk.redBright(key)}`)
                     }
-                } else if (that.metadataDefinition.singleFiles.includes(key)) {
-                    processSingleFile(that, key)
-                } else if (that.metadataDefinition.directories.includes(key)) {
-                    processDirectory(that, key)
+                })
+                return true
+            } catch (error) {
+                if (error.message == 'delete XML') {
+                    return false
                 } else {
-                    global.logger.warn(`Unexpected metadata type: ${chalk.redBright(key)}`)
+                    return true
                 }
-            })
+            }
         }
 
         function processSingleFile(that, key) {
@@ -188,6 +212,10 @@ export class Combine {
             return true
         }
 
+        function deleteFile(fileName) {
+            fileUtils.deleteFile(fileName)
+        }
+
         function processFile(that, key, fileObj = undefined, rootKey = undefined) {
             if (
                 fileObj === undefined ||
@@ -200,7 +228,12 @@ export class Combine {
             }
 
             if (!fileUtils.fileExists(fileObj.fullName)) {
-                return
+                // File does not exist
+                // If file is main.yaml, then return false to indicate that the XML file should be deleted
+                if (fileObj.fullName == path.join(that.sourceDir, that.metaDir, `main.${global.format}`)) {
+                    return false
+                }
+                return true
             }
 
             let result = fileUtils.readFile(fileObj.fullName)
@@ -216,7 +249,7 @@ export class Combine {
                     if (Array.isArray(result[key])) {
                         result[key].forEach(arrItem => {
                             that.#json[key].push(arrItem)
-                        })                          
+                        })
                     } else {
                         that.#json[key].push(result[key])
                     }
@@ -233,7 +266,7 @@ export class Combine {
             }
 
             updateFileStats(that, fileObj.fullName, fileUtils.fileInfo(fileObj.fullName).stats)
-            // genericXML(that, key, fileObj.fullName)
+            return true
         }
 
         function hydrateObject(that, json, key, fileObj) {