fix: fix mixed composite externalId relationship handling

Author: hknokh2

src/modules/models/script/ScriptObject.ts

@@ -82,16 +82,10 @@ const expandComplexFieldNames = (fieldName: string): string[] => {
     if (splitParts.length === 0) {
       return [fieldName];
     }
-    const firstPart = splitParts[0] ?? '';
-    const relationshipPrefixIndex = firstPart.lastIndexOf('.');
-    const relationshipPrefix = relationshipPrefixIndex > 0 ? firstPart.slice(0, relationshipPrefixIndex + 1) : '';
     return splitParts.map((part) => {
       if (prefix) {
         return part.includes('.') ? part : `${prefix}${part}`;
       }
-      if (relationshipPrefix && !part.includes('.')) {
-        return `${relationshipPrefix}${part}`;
-      }
       return part;
     });
   }
@@ -3263,7 +3257,12 @@ export default class ScriptObject {
     void this;
     if (fieldName.includes('.')) {
       const relationshipName = fieldName.split('.')[0] ?? fieldName;
-      return Common.getFieldNameId(undefined, relationshipName);
+      let idFieldName = Common.getFieldNameId(undefined, relationshipName);
+      if (idFieldName === relationshipName && (relationshipName.endsWith('__r') || relationshipName.endsWith('__pr'))) {
+        idFieldName = Common.replaceLast(relationshipName, '__pr', '__pc');
+        idFieldName = Common.replaceLast(idFieldName, '__r', '__c');
+      }
+      return idFieldName;
     }
     return fieldName;
   }

test/modules/script/script-object.test.ts

@@ -229,6 +229,35 @@ describe('Script object external id', () => {
     assert.ok(object.query.includes('SobjectType'));
   });
 
+  it('keeps mixed relationship and local composite externalId fields separated', () => {
+    const script = new Script();
+    const object = new ScriptObject('TestObject3__c');
+    object.externalId = 'TestObject2__r.Name;Test2__c';
+    object.query = 'SELECT Name, TestObject2__c, Test2__c FROM TestObject3__c';
+    object.setup(script);
+
+    const describe = createDescribe('TestObject3__c', [
+      { name: 'Id', type: 'id' },
+      { name: 'Name', type: 'string', updateable: true, creatable: true, nameField: true },
+      { name: 'Test2__c', type: 'string', updateable: true, creatable: true, custom: true },
+      {
+        name: 'TestObject2__c',
+        type: 'reference',
+        updateable: true,
+        creatable: true,
+        lookup: true,
+        referencedObjectType: 'TestObject2__c',
+        custom: true,
+      },
+    ]);
+
+    object.applyDescribe(describe);
+
+    assert.ok(object.query.includes('TestObject2__r.Name'));
+    assert.ok(object.query.includes('Test2__c'));
+    assert.ok(!object.query.includes('TestObject2__r.Test2__c'));
+  });
+
   it('recalculates target query after external id change', () => {
     const script = new Script();
     const object = new ScriptObject('RecordType');