Fixing compilation issues introduced after refactoring

.sfdx/sfdx-config.json

@@ -1,3 +1,3 @@
 {
-  "defaultusername": "test-data-framework"
+  "defaultusername": "test-phcf1dmuknes@example.com"
 }

README.md

@@ -125,7 +125,9 @@ also allows you to create custom builders for different SObjectTypes.
 
 To create a custom builder you will need to **both** extend `SObjectTestDataBuilder` and implement `ITestDataBuilder`.
 For the framework to automatically detect your custom builder it also **needs* to have a name that ends in `TestDataBuilder` 
-(though there is a way to explicitly specify the builder to the framework, explained below):
+(though there is a way to explicitly specify the builder to the framework, explained below).
+
+Any custom builder should start with some boilerplate code that looks as follows:
 
 ```apex
 @IsTest
@@ -146,6 +148,10 @@ public with sharing class OrderTestDataBuilder extends SObjectTestDataBuilder im
     return this.registerSObjectsForInsert(numberOfRecords);
   }
 
+  public OrderTestDataBuilder withChild(ITestDataBuilder childBuilder, SObjectField relationshipField) {
+    return (OrderTestDataBuilder)this.withChildData(childBuilder, relationshipField);
+  }
+
   protected override Map<SObjectField, Object> getDefaultValueMap() {
     return new Map<SObjectField, Object> {
             Order__c.Customer__c => bindTo(SObjectTestDataBuilder.of(Account.SObjectType))

example/tests/AccountTestDataBuilder.cls

@@ -1,5 +1,5 @@
 @IsTest
-public with sharing class AccountTestDataBuilder extends SObjectTestDataBuilder {
+public with sharing class AccountTestDataBuilder extends SObjectTestDataBuilder implements ITestDataBuilder {
     public ITestDataBuilder with(SObjectField field, Object value) {
         this.withData(field, value);
         return this;
@@ -37,6 +37,10 @@ public with sharing class AccountTestDataBuilder extends SObjectTestDataBuilder
         return this;
     }
 
+    public AccountTestDataBuilder withChild(ITestDataBuilder childBuilder, SObjectField relationshipField) {
+        return (AccountTestDataBuilder)this.withChildData(childBuilder, relationshipField);
+    }
+
     protected override Map<SObjectField, Object> getDefaultValueMap() {
         return new Map<SObjectField, Object> {
             Account.Name => 'ACME'

example/tests/IntegrationTests.cls

@@ -270,6 +270,10 @@ private class IntegrationTests {
             return this.registerSObjectsForInsert(numberOfRecords);
         }
 
+        public PriceBookEntryBuilder withChild(ITestDataBuilder childBuilder, SObjectField relationshipField) {
+            return (PriceBookEntryBuilder)this.withChildData(childBuilder, relationshipField);
+        }
+
         protected override Map<SObjectField, Object> getDefaultValueMap() {
             return new Map<SObjectField, Object> {
                 PricebookEntry.Product2Id => bindTo(SObjectTestDataBuilder.of(Product2.SObjectType)),
@@ -296,6 +300,10 @@ private class IntegrationTests {
             return this.registerSObjectsForInsert(numberOfRecords);
         }
 
+        public OrderBuilder withChild(ITestDataBuilder childBuilder, SObjectField relationshipField) {
+            return (OrderBuilder)this.withChildData(childBuilder, relationshipField);
+        }
+
         protected override Map<SObjectField, Object> getDefaultValueMap() {
             return new Map<SObjectField, Object> {
               Order.Status => 'Draft',
@@ -323,6 +331,10 @@ private class IntegrationTests {
             return this.registerSObjectsForInsert(numberOfRecords);
         }
 
+        public OrderItemBuilder withChild(ITestDataBuilder childBuilder, SObjectField relationshipField) {
+            return (OrderItemBuilder)this.withChildData(childBuilder, relationshipField);
+        }
+
         protected override Map<SObjectField, Object> getDefaultValueMap() {
             return new Map<SObjectField, Object> {
                 OrderItem.PricebookEntryId => bindTo(SObjectTestDataBuilder.of(PricebookEntry.SObjectType)),

example/tests/OrderItemTestDataBuilder.cls

@@ -16,6 +16,10 @@ public with sharing class OrderItemTestDataBuilder extends SObjectTestDataBuilde
         return this.registerSObjectsForInsert(numberOfRecords);
     }
 
+    public OrderItemTestDataBuilder withChild(ITestDataBuilder childBuilder, SObjectField relationshipField) {
+        return (OrderItemTestDataBuilder)this.withChildData(childBuilder, relationshipField);
+    }
+
     protected override Map<SObjectField, Object> getDefaultValueMap() {
         return new Map<SObjectField, Object> {
             OrderItem__c.Order__c => bindTo(SObjectTestDataBuilder.of(Order__c.SObjectType)),

example/tests/OrderTestDataBuilder.cls

@@ -16,6 +16,10 @@ public with sharing class OrderTestDataBuilder extends SObjectTestDataBuilder im
         return this.registerSObjectsForInsert(numberOfRecords);
     }
 
+    public OrderTestDataBuilder withChild(ITestDataBuilder childBuilder, SObjectField relationshipField) {
+        return (OrderTestDataBuilder)this.withChildData(childBuilder, relationshipField);
+    }
+
     protected override Map<SObjectField, Object> getDefaultValueMap() {
         return new Map<SObjectField, Object> {
             Order__c.Customer__c => bindTo(SObjectTestDataBuilder.of(Account.SObjectType))

force-app/main/default/classes/SObjectTestDataBuilder.cls

@@ -2,7 +2,7 @@
  * @description Provides base functionality for building SObject records for testing purposes. Any custom TestDataBuilder
  *              must extend this class as well as implement {@link ITestDataBuilder}.
  */
-public abstract class SObjectTestDataBuilder implements ITestDataCallback.ITestDataCallback {
+public abstract class SObjectTestDataBuilder implements ITestDataCallback {
     private static TestDataBuilderCache builderCache = new TestDataBuilderCache();
     private static History testDataHistory = new History();
     private static List<LateBinding> allBindings = new List<LateBinding>();
@@ -397,7 +397,7 @@ public abstract class SObjectTestDataBuilder implements ITestDataCallback.ITestD
         }
 
         public void log(List<SObject> insertedRecords, SObject parentRecord, SObjectField relationshipField,
-            ITestDataCallback.ITestDataCallback callback) {
+            ITestDataCallback callback) {
             for (SObject insertedRecord : insertedRecords) {
                 HistoryItem item = new HistoryItem(insertedRecord, parentRecord, relationshipField, callback);
                 log(item);
@@ -480,10 +480,10 @@ public abstract class SObjectTestDataBuilder implements ITestDataCallback.ITestD
         private SObject record;
         private SObject parentRecord;
         private SObjectField relationshipToParent;
-        private ITestDataCallback.ITestDataCallback callback;
+        private ITestDataCallback callback;
 
         public HistoryItem(SObject record, SObject parentRecord, SObjectField relationshipField,
-            ITestDataCallback.ITestDataCallback callback) {
+            ITestDataCallback callback) {
             this.record = record;
             this.parentRecord = parentRecord;
             this.relationshipToParent = relationshipField;

force-app/main/default/classes/TestDataUnitOfWork.cls

@@ -67,9 +67,9 @@ public class TestDataUnitOfWork {
 
     private class NewSObjectAndCallback {
         public SObject Record { get; private set; }
-        public ITestDataCallback.ITestDataCallback Callback { get; set; }
+        public ITestDataCallback Callback { get; set; }
 
-        public NewSObjectAndCallback(SObject record, ITestDataCallback.ITestDataCallback callback) {
+        public NewSObjectAndCallback(SObject record, ITestDataCallback callback) {
             this.Record = record;
             this.Callback = callback;
         }
@@ -173,7 +173,7 @@ public class TestDataUnitOfWork {
      * @param record A newly created SObject instance to be inserted during commitWork
      * @param callback TestDataCallback.ITestDataCallback to be called before and after record insert.
      **/
-    public void registerNew(SObject record, ITestDataCallback.ITestDataCallback callback) {
+    public void registerNew(SObject record, ITestDataCallback callback) {
         if (record.Id != null) {
             throw new UnitOfWorkException('Only new records can be registered as new');
         }

sfdx-project.json

@@ -1,16 +1,22 @@
 {
-  "packageDirectories": [
-    {
-      "path": "force-app",
-      "default": true
-    },
-    {
-      "path": "example",
-      "default": false
+    "packageDirectories": [
+        {
+            "path": "force-app",
+            "default": true,
+            "package": "TestDataBuilder",
+            "versionName": "ver 0.1",
+            "versionNumber": "0.1.0.NEXT"
+        },
+        {
+            "path": "example",
+            "default": false
+        }
+    ],
+    "name": "test-data-framework",
+    "namespace": "",
+    "sfdcLoginUrl": "https://login.salesforce.com",
+    "sourceApiVersion": "54.0",
+    "packageAliases": {
+        "TestDataBuilder": "0Ho5w0000008OULCA2"
     }
-  ],
-  "name": "test-data-framework",
-  "namespace": "",
-  "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "54.0"
-}
+}