chore: wip

src/convert/transformers/decomposeExternalServiceRegistrationTransformer.ts

@@ -21,8 +21,17 @@ export type ESR = JsonMap & {
 };
 
 export class DecomposeExternalServiceRegistrationTransformer extends BaseMetadataTransformer {
-  private xmlParser = new XMLParser({ ignoreAttributes: false });
-  private xmlBuilder = new XMLBuilder({ ignoreAttributes: false });
+  private xmlParser = new XMLParser({
+    ignoreAttributes: false,
+    processEntities: false, // Disable automatic decoding of entities
+  });
+  private xmlBuilder = new XMLBuilder({
+    format: true,
+    ignoreAttributes: false,
+    suppressUnpairedNode: true,
+    processEntities: true,
+    indentBy: '    ',
+  });
 
   // eslint-disable-next-line @typescript-eslint/require-await,class-methods-use-this,@typescript-eslint/no-unused-vars
   public async toSourceFormat(input: {
@@ -88,19 +97,27 @@ export class DecomposeExternalServiceRegistrationTransformer extends BaseMetadat
     const esrXml = this.xmlParser.parse(esrContent);
 
     // Read schema content from file
-    const schemaFileName = `${component.fullName}.schema.yaml`; // or .json based on your logic
-    const schemaFilePath = path.join(this.defaultDirectory ?? '', schemaFileName);
+    const schemaFileName = `${component.fullName}.yaml`; // or .json based on your logic
+    const schemaFilePath = path.join(path.dirname(esrFilePath) ?? '', schemaFileName);
     const schemaContent = await fs.readFile(schemaFilePath, 'utf8');
 
     // Add schema content back to ESR content
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    esrXml.ExternalServiceRegistration.schema = { _text: schemaContent };
+    esrXml.ExternalServiceRegistration['schema'] = schemaContent;
+    const esrMdApiFilePath = `${path.join(
+      this.defaultDirectory ?? '',
+      component.type.directoryName,
+      component.fullName
+    )}.externalServiceRegistration`;
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const source = this.xmlBuilder.build(esrXml);
 
     // Write combined content back to source format
     writeInfos.push({
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      source: this.xmlBuilder.build(esrXml),
-      output: esrFilePath,
+      source,
+      output: path.resolve(esrMdApiFilePath),
     });
 
     return writeInfos;

src/registry/presets/decomposeExternalServiceRegistrationBeta.json

@@ -25,18 +25,15 @@
         "decomposition": "topLevel",
         "transformer": "decomposeExternalServiceRegistration"
       },
-      "strictDirectoryName": true,
       "suffix": "externalServiceRegistration",
-      "supportsPartialDelete": true
+      "supportsPartialDelete": false
     }
   },
   "suffixes": {
     "yaml": "yaml",
     "externalServiceRegistration": "externalserviceregistration"
   },
-  "strictDirectoryNames": {
-    "externalServiceRegistrations": "externalserviceregistration"
-  },
+  "strictDirectoryNames": {},
   "childTypes": {
     "yaml": "externalserviceregistration"
   }

test/snapshot/helper/conversions.ts

@@ -92,8 +92,11 @@ export const sourceToMdapi = async (testDir: string): Promise<string[]> => {
 };
 
 /** checks that the two xml bodies have the same equivalent json (handles out-of-order things, etc) */
-export const compareTwoXml = (file1: string, file2: string): Chai.Assertion =>
-  expect(parser.parse(file1)).to.deep.equalInAnyOrder(parser.parse(file2));
+export const compareTwoXml = (file1: string, file2: string): Chai.Assertion => {
+  const f1doc = parser.parse(file1);
+  const f2doc = parser.parse(file2);
+  return expect(f1doc).to.deep.equalInAnyOrder(f2doc);
+};
 
 /**
  * catches missing files by asserting that two directories have the exact same children

test/snapshot/sampleProjects/preset-decomposedESR/__snapshots__/verify-md-files.expected/externalServiceRegistrations/OpenAPIChallenge.externalServiceRegistration

@@ -0,0 +1,58 @@
+<ExternalServiceRegistration xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label>BankService</label>
+    <namedCredential>ntest</namedCredential>
+    <registrationProviderType>Custom</registrationProviderType>
+    <schemaType>OpenApi3</schemaType>
+    <schemaUrl>/accounts/schema</schemaUrl>
+    <serviceBinding>{&amp;quot;host&amp;quot;:&amp;quot;&amp;quot;,&amp;quot;basePath&amp;quot;:&amp;quot;/&amp;quot;,&amp;quot;allowedSchemes&amp;quot;:[],&amp;quot;requestMediaTypes&amp;quot;:[],&amp;quot;responseMediaTypes&amp;quot;:[],&amp;quot;compatibleMediaTypes&amp;quot;:{}}</serviceBinding>
+    <status>Complete</status>
+    <systemVersion>3</systemVersion>
+    <schema>openapi: 3.0.0
+info:
+  title: OpenAPIChallenge
+  description: Now is the time for Apex OpenAPI
+  version: 63.1.0
+paths:
+  /getAccountSummaryWithOpportunities:
+    operations:
+      get:
+        summary: need to figure out what this means
+        description: need to figure out what this means
+        operationId: getAccountSummaryWithOpportunities
+        responses: {}
+  /getActiveCases:
+    operations:
+      get:
+        summary: need to figure out what this means
+        description: need to figure out what this means
+        operationId: getActiveCases
+        responses: {}
+  /getAllAccounts:
+    operations:
+      get:
+        summary: need to figure out what this means
+        description: need to figure out what this means
+        operationId: getAllAccounts
+        responses: {}
+  /getUserDetails:
+    operations:
+      get:
+        summary: need to figure out what this means
+        description: need to figure out what this means
+        operationId: getUserDetails
+        responses: {}
+  /updateContactDetails:
+    operations:
+      get:
+        summary: need to figure out what this means
+        description: need to figure out what this means
+        operationId: updateContactDetails
+        responses: {}
+  /getWelcomeMessage:
+    operations:
+      get:
+        summary: need to figure out what this means
+        description: need to figure out what this means
+        operationId: getWelcomeMessage
+        responses: {}</schema>
+</ExternalServiceRegistration>

test/snapshot/sampleProjects/preset-decomposedESR/__snapshots__/verify-md-files.expected/package.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types>
+        <members>OpenAPIChallenge</members>
+        <name>ExternalServiceRegistration</name>
+    </types>
+    <version>60.0</version>
+</Package>

test/snapshot/sampleProjects/preset-decomposedESR/force-app/main/default/externalServiceRegistrations/OpenAPIChallenge.externalServiceRegistration-meta.xml

@@ -1 +1,10 @@
-<ExternalServiceRegistration xmlns="http://soap.sforce.com/2006/04/metadata"><label>BankService</label><namedCredential>ntest</namedCredential><registrationProviderType>Custom</registrationProviderType><schemaType>OpenApi3</schemaType><schemaUrl>/accounts/schema</schemaUrl><serviceBinding>{&quot;host&quot;:&quot;&quot;,&quot;basePath&quot;:&quot;/&quot;,&quot;allowedSchemes&quot;:[],&quot;requestMediaTypes&quot;:[],&quot;responseMediaTypes&quot;:[],&quot;compatibleMediaTypes&quot;:{}}</serviceBinding><status>Complete</status><systemVersion>3</systemVersion></ExternalServiceRegistration>
+<ExternalServiceRegistration xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label>BankService</label>
+    <namedCredential>ntest</namedCredential>
+    <registrationProviderType>Custom</registrationProviderType>
+    <schemaType>OpenApi3</schemaType>
+    <schemaUrl>/accounts/schema</schemaUrl>
+    <serviceBinding>{&quot;host&quot;:&quot;&quot;,&quot;basePath&quot;:&quot;/&quot;,&quot;allowedSchemes&quot;:[],&quot;requestMediaTypes&quot;:[],&quot;responseMediaTypes&quot;:[],&quot;compatibleMediaTypes&quot;:{}}</serviceBinding>
+    <status>Complete</status>
+    <systemVersion>3</systemVersion>
+</ExternalServiceRegistration>

test/snapshot/sampleProjects/preset-decomposedESR/snapshots.test.ts

@@ -41,8 +41,8 @@ describe('fully decomposed external service registration via decomposeExternalSe
       await fileSnap(file, testDir);
     }
     await dirsAreIdentical(
-      path.join(testDir, 'force-app'),
-      path.join(testDir, '__snapshots__', 'verify-md-files.expected', 'force-app')
+      path.join(testDir, 'mdapiOutput'),
+      path.join(testDir, '__snapshots__', 'verify-md-files.expected')
     );
   });
   it('round trip of metadata format is equivalent', async () => {