@ds-sfdc/sfparty 1.3.1 → 1.3.3

package/README.md

@@ -46,6 +46,7 @@ sfparty combine
 -f, --format   format to use yaml (default) or json
 -s, --source   package directory path specified in sfdx-project.json  
 -t, --target   target path to directory to create yaml/json files  
+-g, --git      combine files based on git commits
 -h, --help     Show help  
 ```
 
@@ -138,6 +139,9 @@ sfparty combine --git
 ## CI/CD
 sfparty is meant to be a supplemental addition to your CI/CD process. Your pipeline should already build out a `package.xml` and `destructiveChanges.xml`. When sfparty runs it will do a `git diff` and append changes to the files. You can use a utility like [sfdx-git-delta](https://www.npmjs.com/package/sfdx-git-delta) to build out the package.
 ```
+Command:
+sfparty combine --git
+
 Required:  
 -g, --git         process files based on git commits. This option does not require a value.
 

package/package.json

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

package/src/index.js

@@ -11,7 +11,7 @@ import convertHrtime from 'convert-hrtime'
 import axios from 'axios'
 import { marked } from 'marked'
 import markedTerminal from 'marked-terminal'
-
+import * as pkgObj from '../package.json'  assert { type: "json" }
 import * as fileUtils from './lib/fileUtils.js'
 import * as yargOptions from './meta/yargs.js'
 import * as metadataSplit from './party/split.js'
@@ -23,7 +23,6 @@ import * as workflowDefinition from './meta/Workflows.js'
 import { checkVersion } from './lib/checkVersion.js'
 import * as git from './lib/gitUtils.js'
 
-const pkgObj = fileUtils.readFile('package.json')
 const processStartTime = process.hrtime.bigint()
 
 marked.setOptions({
@@ -140,7 +139,7 @@ yargs(hideBin(process.argv))
                 .check(yargCheck)
         },
         handler: (argv) => {
-            checkVersion(axios, exec, pkgObj.version, true)
+            checkVersion(axios, exec, pkgObj.default.version, true)
         }
     })
     .command({
@@ -155,7 +154,7 @@ yargs(hideBin(process.argv))
                 .check(yargCheck)
         },
         handler: (argv) => {
-            checkVersion(axios, exec, pkgObj.version)
+            checkVersion(axios, exec, pkgObj.default.version)
             global.format = argv.format
             splitHandler(argv, processStartTime)
         }
@@ -172,7 +171,7 @@ yargs(hideBin(process.argv))
                 .check(yargCheck)
         },
         handler: (argv) => {
-            checkVersion(axios, exec, pkgObj.version)
+            checkVersion(axios, exec, pkgObj.default.version)
             global.format = argv.format
             const startProm = new Promise((resolve, reject) => {
                 if (argv.git !== undefined) {
@@ -603,7 +602,7 @@ function displayHeader() {
         horizontal: '─',
         vertical: '│',
     }
-    let versionString = `sfparty v${pkgObj.version}${(process.stdout.columns > pkgObj.description.length + 15) ? ' - ' + pkgObj.description : ''}`
+    let versionString = `sfparty v${pkgObj.default.version}${(process.stdout.columns > pkgObj.default.description.length + 15) ? ' - ' + pkgObj.default.description : ''}`
     let titleMessage = `${global.icons.party} ${chalk.yellowBright(versionString)} ${global.icons.party}`
     titleMessage = titleMessage.padEnd((process.stdout.columns / 2) + versionString.length / 1.65)
     titleMessage = titleMessage.padStart(process.stdout.columns)
@@ -619,7 +618,16 @@ function getRootPath(packageDir) {
     let defaultDir
     if (rootPath) {
         global.__basedir = fileUtils.fileInfo(rootPath).dirname
-        let packageJSON = JSON.parse(readFileSync(rootPath))
+        let packageJSON
+        try {
+            packageJSON = JSON.parse(readFileSync(rootPath))            
+        } catch (error) {
+            if (error.message.indexOf('JSON at position') > 0) {
+                global.displayError('sfdx-project.json has invalid JSON', true)
+            } else {
+                global.displayError(error, true)
+            }
+        }
         if (Array.isArray(packageJSON.packageDirectories)) {
             packageJSON.packageDirectories.every(directory => {
                 if (directory.default || packageJSON.packageDirectories.length == 1) defaultDir = directory.path

package/src/lib/packageUtil.js

@@ -5,10 +5,11 @@ import * as fileUtils from './fileUtils.js'
 import * as packageDefinition from '../meta/Package.js'
 
 export class Package {
-    #packageJSON = undefined
+    
 
     constructor(xmlPath) {
         this.xmlPath = xmlPath
+        this.packageJSON = undefined
     }
 
     getPackageXML() {
@@ -16,7 +17,7 @@ export class Package {
         return new Promise((resolve, reject) => {
             if (that.xmlPath === undefined) throw new Error('Package not initialized')
 
-            let fileName = path.join(global.__basedir, that.xmlPath)
+            let fileName = path.resolve(that.xmlPath)
             if (fileUtils.fileExists(fileName) && global.git.append) {
                 let data = fileUtils.readFile(fileName)
                 data
@@ -40,18 +41,18 @@ export class Package {
             } catch (error) {
                 json.Package.version = packageDefinition.metadataDefinition.fallbackVersion
             }
-            that.#packageJSON = json
+            that.packageJSON = json
             if (json.Package.types !== undefined) transformJSON(json.Package.types)
         }
     }
 
     addMember(type, member) {
         const that = this
-        if (that.#packageJSON === undefined) throw new Error('getPackageXML must be called before adding members')
+        if (that.packageJSON === undefined) throw new Error('getPackageXML must be called before adding members')
         if (type === undefined) throw new Error('An undefined type was received when attempting to add a member')
         if (member === undefined) throw new Error('An undefined member was received when attempting to add a member')
 
-        const packageJSON = that.#packageJSON
+        const packageJSON = that.packageJSON
         let foundMember = false
         let foundAsterisk = false
         let typeJSON = undefined
@@ -83,7 +84,7 @@ export class Package {
         // exit if member already exists
         if (foundMember) return
         if (foundAsterisk) {
-            global.logger.warn(`Found ${chalk.bgBlackBright('*')} in type: ${type}.`)
+            // global.logger.warn(`Found ${chalk.bgBlackBright('*')} in type: ${type}.`)
             return
         }
 
@@ -107,7 +108,7 @@ export class Package {
 
     savePackage() {
         let that = this
-        let json = that.#packageJSON.Package
+        let json = that.packageJSON.Package
         json.$.xmlns = json.$.xmlns.replace('http:', 'https:')
 
         const builder = new xml2js.Builder(
@@ -153,3 +154,5 @@ function xml2json(currentValue) {
     if (currentValue == 'false') currentValue = false
     return currentValue
 }
+
+// Create JEST tests that cover 100% of the code