feat: use nested list element to handle nullability properly (#2086)

Noroth · web-flow · commit 7445cb52732d · 2025-07-28T11:37:43.000+02:00
diff --git a/protographic/src/sdl-to-proto-visitor.ts b/protographic/src/sdl-to-proto-visitor.ts
@@ -1589,30 +1589,26 @@ Example:
       lines.push(...this.formatComment(`Wrapper message for a list of ${baseType.name}.`, 0));
     }
 
-    lines.push(`message ${wrapperName} {`);
-
     const formatIndent = (indent: number, content: string) => {
       return '  '.repeat(indent) + content;
     };
 
+    lines.push(`message ${wrapperName} {`);
+    let innerWrapperName = '';
     if (level > 1) {
-      // Nested structure for deep lists
-      const innerWrapperName = `${'ListOf'.repeat(level - 1)}${baseType.name}`;
-      lines.push(
-        formatIndent(1, `message List {`),
-        formatIndent(2, `repeated ${innerWrapperName} items = 1;`),
-        formatIndent(1, `}`),
-      );
-
-      // Wrapper types always use deterministic field numbers - 'list' field is always 1
-      lines.push(formatIndent(1, `List list = 1;`));
+      innerWrapperName = `${'ListOf'.repeat(level - 1)}${baseType.name}`;
     } else {
-      // Simple repeated field for level 1 - 'items' field is always 1
-      const protoType = this.getProtoTypeFromGraphQL(baseType, true);
-      lines.push(formatIndent(1, `repeated ${protoType.typeName} items = 1;`));
+      innerWrapperName = this.getProtoTypeFromGraphQL(baseType, true).typeName;
     }
 
-    lines.push('}', '');
+    lines.push(
+      formatIndent(1, `message List {`),
+      formatIndent(2, `repeated ${innerWrapperName} items = 1;`),
+      formatIndent(1, `}`),
+      formatIndent(1, `List list = 1;`),
+      formatIndent(0, `}`),
+    );
+
     return lines;
   }
 
diff --git a/protographic/tests/sdl-to-proto/01-basic-types.test.ts b/protographic/tests/sdl-to-proto/01-basic-types.test.ts
@@ -142,9 +142,11 @@ describe('SDL to Proto - Basic Types', () => {
 
       // Wrapper message for a list of String.
       message ListOfString {
-        repeated string items = 1;
+        message List {
+          repeated string items = 1;
+        }
+        List list = 1;
       }
-
       // Request message for stringList operation.
       message QueryStringListRequest {
       }
@@ -247,9 +249,11 @@ describe('SDL to Proto - Basic Types', () => {
 
       // Wrapper message for a list of User.
       message ListOfUser {
-        repeated User items = 1;
+        message List {
+          repeated User items = 1;
+        }
+        List list = 1;
       }
-
       // Request message for user operation.
       message QueryUserRequest {
         string id = 1;
@@ -478,48 +482,53 @@ describe('SDL to Proto - Basic Types', () => {
 
       // Wrapper message for a list of Float.
       message ListOfFloat {
-        repeated double items = 1;
+        message List {
+          repeated double items = 1;
+        }
+        List list = 1;
       }
-
       // Wrapper message for a list of Int.
       message ListOfInt {
-        repeated int32 items = 1;
+        message List {
+          repeated int32 items = 1;
+        }
+        List list = 1;
       }
-
       // Wrapper message for a list of Float.
       message ListOfListOfFloat {
         message List {
           repeated ListOfFloat items = 1;
         }
         List list = 1;
       }
-
       // Wrapper message for a list of Int.
       message ListOfListOfInt {
         message List {
           repeated ListOfInt items = 1;
         }
         List list = 1;
       }
-
       // Wrapper message for a list of Point.
       message ListOfListOfPoint {
         message List {
           repeated ListOfPoint items = 1;
         }
         List list = 1;
       }
-
       // Wrapper message for a list of Point.
       message ListOfPoint {
-        repeated Point items = 1;
+        message List {
+          repeated Point items = 1;
+        }
+        List list = 1;
       }
-
       // Wrapper message for a list of String.
       message ListOfString {
-        repeated string items = 1;
+        message List {
+          repeated string items = 1;
+        }
+        List list = 1;
       }
-
       // Request message for getMatrix operation.
       message QueryGetMatrixRequest {
       }
@@ -703,14 +712,18 @@ describe('SDL to Proto - Basic Types', () => {
 
       // Wrapper message for a list of TreeNode.
       message ListOfTreeNode {
-        repeated TreeNode items = 1;
+        message List {
+          repeated TreeNode items = 1;
+        }
+        List list = 1;
       }
-
       // Wrapper message for a list of User.
       message ListOfUser {
-        repeated User items = 1;
+        message List {
+          repeated User items = 1;
+        }
+        List list = 1;
       }
-
       // Request message for user operation.
       message QueryUserRequest {
         string id = 1;
diff --git a/protographic/tests/sdl-to-proto/02-complex-types.test.ts b/protographic/tests/sdl-to-proto/02-complex-types.test.ts
@@ -38,9 +38,11 @@ describe('SDL to Proto - Complex Types', () => {
 
       // Wrapper message for a list of User.
       message ListOfUser {
-        repeated User items = 1;
+        message List {
+          repeated User items = 1;
+        }
+        List list = 1;
       }
-
       // Request message for usersByRole operation.
       message QueryUsersByRoleRequest {
         UserRole role = 1;
@@ -231,9 +233,11 @@ describe('SDL to Proto - Complex Types', () => {
 
       // Wrapper message for a list of TreeNode.
       message ListOfTreeNode {
-        repeated TreeNode items = 1;
+        message List {
+          repeated TreeNode items = 1;
+        }
+        List list = 1;
       }
-
       // Request message for rootNode operation.
       message QueryRootNodeRequest {
       }
@@ -305,14 +309,18 @@ describe('SDL to Proto - Complex Types', () => {
 
       // Wrapper message for a list of AddressInput.
       message ListOfAddressInput {
-        repeated AddressInput items = 1;
+        message List {
+          repeated AddressInput items = 1;
+        }
+        List list = 1;
       }
-
       // Wrapper message for a list of User.
       message ListOfUser {
-        repeated User items = 1;
+        message List {
+          repeated User items = 1;
+        }
+        List list = 1;
       }
-
       // Request message for users operation.
       message QueryUsersRequest {
         UserFilterInput filter = 1;
diff --git a/protographic/tests/sdl-to-proto/05-edge-cases.test.ts b/protographic/tests/sdl-to-proto/05-edge-cases.test.ts
@@ -366,19 +366,25 @@ describe('SDL to Proto - Edge Cases and Error Handling', () => {
 
       // Wrapper message for a list of Comment.
       message ListOfComment {
-        repeated Comment items = 1;
+        message List {
+          repeated Comment items = 1;
+        }
+        List list = 1;
       }
-
       // Wrapper message for a list of Post.
       message ListOfPost {
-        repeated Post items = 1;
+        message List {
+          repeated Post items = 1;
+        }
+        List list = 1;
       }
-
       // Wrapper message for a list of String.
       message ListOfString {
-        repeated string items = 1;
+        message List {
+          repeated string items = 1;
+        }
+        List list = 1;
       }
-
       // Key message for User entity lookup
       message LookupUserByIdRequestKey {
         // Key field for User entity lookup.
diff --git a/protographic/tests/sdl-to-proto/06-field-ordering.test.ts b/protographic/tests/sdl-to-proto/06-field-ordering.test.ts
diff --git a/protographic/tests/sdl-to-proto/11-lists.test.ts b/protographic/tests/sdl-to-proto/11-lists.test.ts
