From 9b870aa969124de05de2a71e0afb9050a2998b14 Mon Sep 17 00:00:00 2001
From: Emil Lerch <emil@lerch.org>
Date: Tue, 25 Nov 2025 15:02:11 -0800
Subject: [PATCH] replace usages of @Type

---
 src/aws.zig          | 65 ++++++++++++++++++++------------------------
 src/servicemodel.zig | 41 ++++++++++++++--------------
 2 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/src/aws.zig b/src/aws.zig
index 20ac4f8..7a8d1ab 100644
--- a/src/aws.zig
+++ b/src/aws.zig
@@ -1057,45 +1057,37 @@ fn ServerResponse(comptime action: anytype) type {
     const ResponseMetadata = struct {
         RequestId: []u8,
     };
-    const Result = @Type(.{
-        .@"struct" = .{
-            .layout = .auto,
-            .fields = &[_]std.builtin.Type.StructField{
-                .{
-                    .name = action.action_name ++ "Result",
-                    .type = T,
-                    .default_value_ptr = null,
-                    .is_comptime = false,
-                    .alignment = std.meta.alignment(T),
-                },
-                .{
-                    .name = "ResponseMetadata",
-                    .type = ResponseMetadata,
-                    .default_value_ptr = null,
-                    .is_comptime = false,
-                    .alignment = std.meta.alignment(ResponseMetadata),
-                },
+    const Result = @Struct(
+        .auto,
+        null,
+        &[_][]const u8{ action.action_name ++ "Result", "ResponseMetadata" },
+        &[_]type{ T, ResponseMetadata },
+        &[_]std.builtin.Type.StructField.Attributes{
+            .{
+                .default_value_ptr = null,
+                .@"comptime" = false,
+                .@"align" = std.meta.alignment(T),
             },
-            .decls = &[_]std.builtin.Type.Declaration{},
-            .is_tuple = false,
-        },
-    });
-    return @Type(.{
-        .@"struct" = .{
-            .layout = .auto,
-            .fields = &[_]std.builtin.Type.StructField{
-                .{
-                    .name = action.action_name ++ "Response",
-                    .type = Result,
-                    .default_value_ptr = null,
-                    .is_comptime = false,
-                    .alignment = std.meta.alignment(Result),
-                },
+            .{
+                .default_value_ptr = null,
+                .@"comptime" = false,
+                .@"align" = std.meta.alignment(ResponseMetadata),
             },
-            .decls = &[_]std.builtin.Type.Declaration{},
-            .is_tuple = false,
         },
-    });
+    );
+    return @Struct(
+        .auto,
+        null,
+        &[_][]const u8{action.action_name ++ "Response"},
+        &[_]type{Result},
+        &[_]std.builtin.Type.StructField.Attributes{
+            .{
+                .default_value_ptr = null,
+                .@"comptime" = false,
+                .@"align" = std.meta.alignment(Result),
+            },
+        },
+    );
 }
 fn FullResponse(comptime action: anytype) type {
     return struct {
@@ -1413,6 +1405,7 @@ fn reportTraffic(
 
 test {
     _ = @import("aws_test.zig");
+    _ = @import("servicemodel.zig");
 }
 
 // buildQuery/buildPath tests, which are here as they are a) generic and b) private
diff --git a/src/servicemodel.zig b/src/servicemodel.zig
index 1612c89..4465f6b 100644
--- a/src/servicemodel.zig
+++ b/src/servicemodel.zig
@@ -1,32 +1,27 @@
 const std = @import("std");
 const service_list = @import("service_manifest");
-const expectEqualStrings = std.testing.expectEqualStrings;
 
 pub fn Services(comptime service_imports: anytype) type {
     if (service_imports.len == 0) return services;
     // From here, the fields of our structure can be generated at comptime...
-    var fields: [serviceCount(service_imports)]std.builtin.Type.StructField = undefined;
+    const fields_len = serviceCount(service_imports);
+    var field_names: [fields_len][]const u8 = undefined;
+    var field_types: [fields_len]type = undefined;
+    var field_attrs: [fields_len]std.builtin.Type.StructField.Attributes = undefined;
 
-    for (&fields, 0..) |*item, i| {
+    for (0..fields_len) |i| {
         const import_field = @field(service_list, @tagName(service_imports[i]));
-        item.* = .{
-            .name = @tagName(service_imports[i]),
-            .type = @TypeOf(import_field),
+        field_names[i] = @tagName(service_imports[i]);
+        field_types[i] = @TypeOf(import_field);
+        field_attrs[i] = .{
             .default_value_ptr = &import_field,
-            .is_comptime = false,
-            .alignment = std.meta.alignment(@TypeOf(import_field)),
+            .@"comptime" = false,
+            .@"align" = std.meta.alignment(field_types[i]),
         };
     }
 
     // finally, generate the type
-    return @Type(.{
-        .@"struct" = .{
-            .layout = .auto,
-            .fields = &fields,
-            .decls = &[_]std.builtin.Type.Declaration{},
-            .is_tuple = false,
-        },
-    });
+    return @Struct(.auto, null, &field_names, &field_types, &field_attrs);
 }
 
 fn serviceCount(desired_services: anytype) usize {
@@ -39,17 +34,23 @@ fn serviceCount(desired_services: anytype) usize {
 pub const services = service_list;
 
 test "services includes sts" {
-    try expectEqualStrings("2011-06-15", services.sts.version.?);
+    try std.testing.expectEqualStrings("2011-06-15", services.sts.version.?);
 }
 test "sts includes get_caller_identity" {
-    try expectEqualStrings("GetCallerIdentity", services.sts.get_caller_identity.action_name);
+    try std.testing.expectEqualStrings("GetCallerIdentity", services.sts.get_caller_identity.action_name);
 }
 test "can get service and action name from request" {
     // get request object. This call doesn't have parameters
     const metadata = services.sts.get_caller_identity.Request.metaInfo();
-    try expectEqualStrings("2011-06-15", metadata.service_metadata.version.?);
+    try std.testing.expectEqualStrings("2011-06-15", metadata.service_metadata.version.?);
 }
 test "can filter services" {
     const filtered_services = Services(.{ .sts, .wafv2 }){};
-    try expectEqualStrings("2011-06-15", filtered_services.sts.version.?);
+    try std.testing.expectEqualStrings("2011-06-15", filtered_services.sts.version.?);
+}
+test "can reify type" {
+    const F = Services(.{.lambda});
+    const info = @typeInfo(F).@"struct";
+    try std.testing.expectEqual(@as(usize, 1), info.fields.len);
+    try std.testing.expectEqualStrings("lambda", info.fields[0].name);
 }