Merge pull request #3422 from square/unpartitioned_schema

oldergod · web-flow · commit f12b7db3271c · 2025-10-13T13:10:19.000+01:00
Provide the unpartitioned schema in SchemaHandler.Context
diff --git a/wire-compiler/src/test/java/com/squareup/wire/schema/WireRunTest.kt b/wire-compiler/src/test/java/com/squareup/wire/schema/WireRunTest.kt
@@ -1070,6 +1070,7 @@ class WireRunTest {
           logger = EmptyWireLogger(),
           errorCollector = errorCollector,
           claimedPaths = ClaimedPaths(),
+          fullSchema = schema,
         ),
       )
 
diff --git a/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/ErrorReportingSchemaHandlerTest.kt b/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/ErrorReportingSchemaHandlerTest.kt
@@ -64,6 +64,7 @@ class ErrorReportingSchemaHandlerTest {
       outDirectory = "out".toPath(),
       logger = WireTestLogger(),
       errorCollector = errorCollector,
+      fullSchema = schema,
     )
 
     ErrorReportingSchemaHandler().handle(schema, context)
diff --git a/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/LogToFileHandlerTest.kt b/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/LogToFileHandlerTest.kt
@@ -64,6 +64,7 @@ class LogToFileHandlerTest {
       outDirectory = "/".toPath(),
       logger = WireTestLogger(),
       sourcePathPaths = setOf("test/message.proto", "test/service.proto"),
+      fullSchema = schema,
     )
     LogToFileHandler().handle(schema, context)
 
diff --git a/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/LogToWireLoggerHandlerTest.kt b/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/LogToWireLoggerHandlerTest.kt
@@ -66,6 +66,7 @@ class LogToWireLoggerHandlerTest {
       outDirectory = "out".toPath(),
       logger = logger,
       sourcePathPaths = setOf("test/message.proto", "test/service.proto"),
+      fullSchema = schema,
     )
     LogToWireLoggerHandler().handle(schema, context)
 
diff --git a/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/MarkdownHandlerTest.kt b/wire-schema-tests/src/commonTest/kotlin/com/squareup/wire/recipes/MarkdownHandlerTest.kt
@@ -79,6 +79,7 @@ class MarkdownHandlerTest {
       outDirectory = "generated/markdown".toPath(),
       logger = WireTestLogger(),
       sourcePathPaths = setOf("squareup/colors/red.proto", "squareup/colors/blue.proto"),
+      fullSchema = schema,
     )
     MarkdownHandler().handle(schema, context)
 
diff --git a/wire-schema/api/wire-schema.api b/wire-schema/api/wire-schema.api
@@ -831,10 +831,11 @@ public abstract class com/squareup/wire/schema/SchemaHandler {
 }
 
 public final class com/squareup/wire/schema/SchemaHandler$Context {
-	public fun <init> (Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;)V
-	public synthetic fun <init> (Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;Lcom/squareup/wire/schema/Schema;)V
+	public synthetic fun <init> (Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;Lcom/squareup/wire/schema/Schema;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Lokio/FileSystem;
 	public final fun component10 ()Lcom/squareup/wire/schema/ProfileLoader;
+	public final fun component11 ()Lcom/squareup/wire/schema/Schema;
 	public final fun component2 ()Lokio/Path;
 	public final fun component3 ()Lcom/squareup/wire/WireLogger;
 	public final fun component4 ()Lcom/squareup/wire/schema/ErrorCollector;
@@ -843,14 +844,15 @@ public final class com/squareup/wire/schema/SchemaHandler$Context {
 	public final fun component7 ()Lcom/squareup/wire/schema/ClaimedPaths;
 	public final fun component8 ()Lcom/squareup/wire/schema/SchemaHandler$Module;
 	public final fun component9 ()Ljava/util/Set;
-	public final fun copy (Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;)Lcom/squareup/wire/schema/SchemaHandler$Context;
-	public static synthetic fun copy$default (Lcom/squareup/wire/schema/SchemaHandler$Context;Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;ILjava/lang/Object;)Lcom/squareup/wire/schema/SchemaHandler$Context;
+	public final fun copy (Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;Lcom/squareup/wire/schema/Schema;)Lcom/squareup/wire/schema/SchemaHandler$Context;
+	public static synthetic fun copy$default (Lcom/squareup/wire/schema/SchemaHandler$Context;Lokio/FileSystem;Lokio/Path;Lcom/squareup/wire/WireLogger;Lcom/squareup/wire/schema/ErrorCollector;Lcom/squareup/wire/schema/EmittingRules;Lcom/squareup/wire/schema/ClaimedDefinitions;Lcom/squareup/wire/schema/ClaimedPaths;Lcom/squareup/wire/schema/SchemaHandler$Module;Ljava/util/Set;Lcom/squareup/wire/schema/ProfileLoader;Lcom/squareup/wire/schema/Schema;ILjava/lang/Object;)Lcom/squareup/wire/schema/SchemaHandler$Context;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getClaimedDefinitions ()Lcom/squareup/wire/schema/ClaimedDefinitions;
 	public final fun getClaimedPaths ()Lcom/squareup/wire/schema/ClaimedPaths;
 	public final fun getEmittingRules ()Lcom/squareup/wire/schema/EmittingRules;
 	public final fun getErrorCollector ()Lcom/squareup/wire/schema/ErrorCollector;
 	public final fun getFileSystem ()Lokio/FileSystem;
+	public final fun getFullSchema ()Lcom/squareup/wire/schema/Schema;
 	public final fun getLogger ()Lcom/squareup/wire/WireLogger;
 	public final fun getModule ()Lcom/squareup/wire/schema/SchemaHandler$Module;
 	public final fun getOutDirectory ()Lokio/Path;
diff --git a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/SchemaHandler.kt b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/SchemaHandler.kt
@@ -107,6 +107,9 @@ abstract class SchemaHandler {
      * is unstable and can change at anytime.
      */
     val profileLoader: ProfileLoader? = null,
+
+    /** The full refactored [Schema] prior partitioning. See [WireRun.modules]. */
+    val fullSchema: Schema,
   ) {
     /** True if this [protoFile] ia part of a `sourcePath` root. */
     fun inSourcePath(protoFile: ProtoFile): Boolean {
diff --git a/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/WireRun.kt b/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/WireRun.kt
@@ -313,6 +313,7 @@ class WireRun(
           sourcePathPaths = sourcePathPaths,
           module = module,
           profileLoader = schemaLoader,
+          fullSchema = schema,
         )
 
         eventListeners.forEach {

Original file line number	Diff line number	Diff line change
`@@ -1070,6 +1070,7 @@ class WireRunTest {`
`1070`	`1070`	`logger = EmptyWireLogger(),`
`1071`	`1071`	`errorCollector = errorCollector,`
`1072`	`1072`	`claimedPaths = ClaimedPaths(),`
	`1073`	`+ fullSchema = schema,`
`1073`	`1074`	`),`
`1074`	`1075`	`)`
`1075`	`1076`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ class ErrorReportingSchemaHandlerTest {`
`64`	`64`	`outDirectory = "out".toPath(),`
`65`	`65`	`logger = WireTestLogger(),`
`66`	`66`	`errorCollector = errorCollector,`
	`67`	`+ fullSchema = schema,`
`67`	`68`	`)`
`68`	`69`
`69`	`70`	`ErrorReportingSchemaHandler().handle(schema, context)`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ class LogToFileHandlerTest {`
`64`	`64`	`outDirectory = "/".toPath(),`
`65`	`65`	`logger = WireTestLogger(),`
`66`	`66`	`sourcePathPaths = setOf("test/message.proto", "test/service.proto"),`
	`67`	`+ fullSchema = schema,`
`67`	`68`	`)`
`68`	`69`	`LogToFileHandler().handle(schema, context)`
`69`	`70`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ class LogToWireLoggerHandlerTest {`
`66`	`66`	`outDirectory = "out".toPath(),`
`67`	`67`	`logger = logger,`
`68`	`68`	`sourcePathPaths = setOf("test/message.proto", "test/service.proto"),`
	`69`	`+ fullSchema = schema,`
`69`	`70`	`)`
`70`	`71`	`LogToWireLoggerHandler().handle(schema, context)`
`71`	`72`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ class MarkdownHandlerTest {`
`79`	`79`	`outDirectory = "generated/markdown".toPath(),`
`80`	`80`	`logger = WireTestLogger(),`
`81`	`81`	`sourcePathPaths = setOf("squareup/colors/red.proto", "squareup/colors/blue.proto"),`
	`82`	`+ fullSchema = schema,`
`82`	`83`	`)`
`83`	`84`	`MarkdownHandler().handle(schema, context)`
`84`	`85`
Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,7 @@ class WireRun(`
`313`	`313`	`sourcePathPaths = sourcePathPaths,`
`314`	`314`	`module = module,`
`315`	`315`	`profileLoader = schemaLoader,`
	`316`	`+ fullSchema = schema,`
`316`	`317`	`)`
`317`	`318`
`318`	`319`	`eventListeners.forEach {`