@ds-sfdc/sfparty 1.3.6 → 1.3.7

package/package.json

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

package/src/lib/packageUtil.js

@@ -25,7 +25,6 @@ export class Package {
                                 processJSON(that, json, fileUtils)
                                 resolve('existing')                                    
                             } catch (error) {
-                                console.error(error)
                                 reject(error)
                             }
                         })
@@ -55,6 +54,20 @@ export class Package {
             }
             that.packageJSON = json
             if (json.Package.types !== undefined) transformJSON(json.Package.types)
+            cleanPackage(that)
+        }
+
+        function cleanPackage(that) {
+            if (that.packageJSON === undefined) throw new Error('getPackageXML must be called before adding members')
+            if (that.packageJSON.Package == undefined) throw new Error('Package initialization failed')
+            if (that.packageJSON.Package.types === undefined) return 'No types found'
+        
+            const typeArray = Object.values(global.metaTypes).map(metaType => metaType.definition.root);
+            that.packageJSON.Package.types.forEach(typeItem => {
+                if (typeArray.includes(typeItem.name)) {
+                    typeItem.members = typeItem.members.filter(member => !member.endsWith(`.${global.format}`))
+                }
+            })
         }
     }
 

package/test/{checkVersion.spec.js → lib/checkVersion.spec.js}

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { spawnSync } from 'child_process'
 import clc from 'cli-color'
-import { checkVersion } from '../src/lib/checkVersion.js'
+import { checkVersion } from '../../src/lib/checkVersion.js'
 
 global.icons = {
     "success": clc.greenBright('✔'),

package/test/lib/package/getPackageXML.spec.js

@@ -1,5 +1,39 @@
+
 import * as packageDefinition from '../../../src/meta/Package.js'
 import { Package } from '../../../src/lib/packageUtil.js'
+import * as labelDefinition from '../../../src/meta/CustomLabels.js'
+import * as profileDefinition from '../../../src/meta/Profiles.js'
+import * as permsetDefinition from '../../../src/meta/PermissionSets.js'
+import * as workflowDefinition from '../../../src/meta/Workflows.js'
+
+global.__basedir = '.'
+
+global.metaTypes = {
+    label: {
+        type: labelDefinition.metadataDefinition.filetype,
+        definition: labelDefinition.metadataDefinition,
+        add: { files: [], directories: [] },
+        remove: { files: [], directories: [] },
+    },
+    profile: {
+        type: profileDefinition.metadataDefinition.filetype,
+        definition: profileDefinition.metadataDefinition,
+        add: { files: [], directories: [] },
+        remove: { files: [], directories: [] },
+    },
+    permset: {
+        type: permsetDefinition.metadataDefinition.filetype,
+        definition: permsetDefinition.metadataDefinition,
+        add: { files: [], directories: [] },
+        remove: { files: [], directories: [] },
+    },
+    workflow: {
+        type: workflowDefinition.metadataDefinition.filetype,
+        definition: workflowDefinition.metadataDefinition,
+        add: { files: [], directories: [] },
+        remove: { files: [], directories: [] },
+    },
+}
 
 let pkg;
 const fileUtils = {
@@ -9,7 +43,8 @@ const fileUtils = {
 beforeEach(() => {
     pkg = new Package('xmlPath');
 });
-global.__basedir = '.'
+
+
 afterEach(() => {
     jest.clearAllMocks();
 });
@@ -55,3 +90,79 @@ it('should throw an error if error occurs during processing', async () => {
     fileUtils.readFile.mockRejectedValue(new Error('Error'));
     await expect(pkg.getPackageXML(fileUtils)).rejects.toThrowError('Error');
 });
+
+it('should catch errors and reject the promise', async () => {
+    fileUtils.fileExists.mockReturnValue(true);
+    fileUtils.readFile.mockRejectedValue(new Error('Test Error'));
+    global.git = { append: true }
+    try {
+        await pkg.getPackageXML(fileUtils);
+    } catch (error) {
+        expect(error.message).toEqual('Test Error');
+    }
+});
+
+it('should default to an empty package if the read file is empty', async () => {
+    fileUtils.fileExists.mockReturnValue(true);
+    fileUtils.readFile.mockResolvedValue('');
+    global.git = { append: true }
+    const result = await pkg.getPackageXML(fileUtils);
+    expect(result).toBe('existing');
+    expect(pkg.packageJSON).toEqual(packageDefinition.metadataDefinition.emptyPackage);
+    expect(fileUtils.fileExists).toHaveBeenCalled();
+    expect(fileUtils.readFile).toHaveBeenCalled();
+});
+
+it('should throw an error if fileUtils.readFile() returns a rejected promise', async () => {
+    fileUtils.fileExists.mockReturnValue(true);
+    fileUtils.readFile.mockRejectedValue(new Error('Test Error'));
+    global.git = { append: true }
+    await expect(pkg.getPackageXML(fileUtils)).rejects.toThrowError('Test Error');
+    expect(fileUtils.fileExists).toHaveBeenCalled();
+    expect(fileUtils.readFile).toHaveBeenCalled();
+});
+
+it('should correctly process the json object returned from the XML file', async () => {
+    fileUtils.fileExists.mockReturnValue(true);
+    fileUtils.readFile.mockResolvedValue({
+        "Package": {
+            "types": [{
+                "members": ["Test", "Test.yaml"],
+                "name": "CustomLabels"
+            }, {
+                "members": ["Test", "Test.yaml"],
+                "name": "Profile"
+            }, {
+                "members": ["Test", "Test.yaml"],
+                "name": "PermissionSet"
+            }, {
+                "members": ["Test", "Test.yaml"],
+                "name": "Workflow"
+            }],
+            "version": "56.0"
+        }
+    });
+    global.git = { append: true }
+    const result = await pkg.getPackageXML(fileUtils);
+    expect(result).toBe('existing');
+    expect(fileUtils.fileExists).toHaveBeenCalled();
+    expect(fileUtils.readFile).toHaveBeenCalled();
+    expect(pkg.packageJSON).toEqual({
+        "Package": {
+            "types": [{
+                "members": ["Test", "Test.yaml"],
+                "name": "CustomLabels"
+            }, {
+                "members": ["Test", "Test.yaml"],
+                "name": "Profile"
+            }, {
+                "members": ["Test", "Test.yaml"],
+                "name": "PermissionSet"
+            }, {
+                "members": ["Test", "Test.yaml"],
+                "name": "Workflow"
+            }],
+            "version": "56.0"
+        }
+    });
+});