fix: indentation

PreziosiRaffaele · Jan 30, 2024 · 6525351 · 6525351
1 parent 9ba3a5d
commit 6525351
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sf-perms",
   "description": "",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "dependencies": {
     "@oclif/core": "^3.18.1",
     "@salesforce/core": "^6.4.7",

diff --git a/src/PermissionSetUpdater.ts b/src/PermissionSetUpdater.ts
@@ -16,11 +16,6 @@ interface PermissionSet {
 }
 
 export class PermissionSetUpdater {
-  private parserOptions = { ignoreAttributes: false };
-  private builderOptions = { ignoreAttributes: false, format: true };
-
-  private parser = new XMLParser(this.parserOptions);
-  private builder = new XMLBuilder(this.builderOptions);
   private fs;
 
   public constructor(fs: typeof fsPromises) {
@@ -35,7 +30,9 @@ export class PermissionSetUpdater {
   ): Promise<void> {
     const completeFilePath: string = path.resolve(directoryPath, 'permissionsets', permissionSet);
     const permissionSetXml: string = await this.fs.readFile(completeFilePath, 'utf8');
-    const permissionSetParsedJSON: PermissionSet = this.parser.parse(permissionSetXml) as PermissionSet;
+    const indentation: string = this.getIndentation(permissionSetXml);
+    const parser = new XMLParser({ ignoreAttributes: false });
+    const permissionSetParsedJSON: PermissionSet = parser.parse(permissionSetXml) as PermissionSet;
 
     for (const field in fieldsPermissionSelected) {
       if (Object.prototype.hasOwnProperty.call(fieldsPermissionSelected, field)) {
@@ -58,11 +55,16 @@ export class PermissionSetUpdater {
         }
       }
     }
-
-    const xmlContent: string = this.builder.build(permissionSetParsedJSON) as string;
+    const builder = new XMLBuilder({ ignoreAttributes: false, format: true, indentBy: indentation });
+    const xmlContent: string = builder.build(permissionSetParsedJSON) as string;
     await this.fs.writeFile(completeFilePath, xmlContent);
   }
 
+  private getIndentation(permissionSetXml: string): string {
+    const match = permissionSetXml.match(/^( |\t)+/m);
+    return match ? match[0] : '  '; // Default to two spaces if no indentation is found
+  }
+
   private insertRespectingSorting(fieldPermissions: FieldPermission[], newFieldPermission: FieldPermission): void {
     let low = 0;
     let high = fieldPermissions.length - 1;