fix tests broken in 0a5a08a

build.zig

@@ -30,9 +30,9 @@ pub fn build(b: *std.Build) void {
     b.installArtifact(lib);
 
     const module = b.addModule("smithy", .{
-        .source_file = .{ .path = "src/smithy.zig" },
+        .root_source_file = .{ .path = "src/smithy.zig" },
     });
-    lib.addModule("smithy", module);
+    lib.root_module.addImport("smithy", module);
 
     // Creates a step for unit testing. This only builds the test executable
     // but does not run it.

src/smithy.zig

@@ -7,14 +7,16 @@ pub const Smithy = struct {
     metadata: ModelMetadata,
     shapes: []ShapeInfo,
     allocator: std.mem.Allocator,
+    json_source: std.json.Parsed(std.json.Value),
 
     const Self = @This();
-    pub fn init(allocator: std.mem.Allocator, version: []const u8, metadata: ModelMetadata, shapeinfo: []ShapeInfo) Smithy {
+    pub fn init(allocator: std.mem.Allocator, version: []const u8, metadata: ModelMetadata, shapeinfo: []ShapeInfo, json_source: std.json.Parsed(std.json.Value)) Smithy {
         return .{
             .version = version,
             .metadata = metadata,
             .shapes = shapeinfo,
             .allocator = allocator,
+            .json_source = json_source,
         };
     }
     pub fn deinit(self: Self) void {
@@ -76,6 +78,7 @@ pub const Smithy = struct {
             }
         }
         self.allocator.free(self.shapes);
+        self.json_source.deinit();
     }
 };
 pub const ShapeInfo = struct {
@@ -99,6 +102,8 @@ pub const TraitType = enum {
     aws_auth_sigv4,
     aws_protocol,
     ec2_query_name,
+    json_name,
+    xml_name,
     http,
     http_header,
     http_label,
@@ -106,13 +111,16 @@ pub const TraitType = enum {
     http_payload,
     json_name,
     xml_name,
-    required,
+    required, // required on the server
+    client_optional, // optional as far as the client is concerned
     documentation,
     pattern,
     range,
     length,
     box,
     sparse,
+    enum_value,
+    aws_query_error,
 };
 pub const Trait = union(TraitType) {
     aws_api_service: struct {
@@ -139,6 +147,7 @@ pub const Trait = union(TraitType) {
     http_query: []const u8,
     http_payload: struct {},
     required: struct {},
+    client_optional: void,
     documentation: []const u8,
     pattern: []const u8,
     range: struct { // most data is actually integers, but as some are floats, we'll use that here
@@ -151,6 +160,11 @@ pub const Trait = union(TraitType) {
     },
     box: struct {},
     sparse: struct {},
+    enum_value: []const u8,
+    aws_query_error: struct {
+        http_response_code: i64,
+        code: []const u8,
+    },
 };
 const ShapeType = enum {
     blob,
@@ -253,10 +267,10 @@ pub const AwsProtocol = enum {
 };
 
 pub fn parse(allocator: std.mem.Allocator, json_model: []const u8) !Smithy {
-    // construct a parser. We're not copying strings here, but that may
+    // construct a parser. We're not copying strings here
-    // be a poor decision
+    // Instead, we keep the original json string around
+    // This might be bad if we only need a small fraction of the original json source
     var vt = try std.json.parseFromSlice(std.json.Value, allocator, json_model, .{});
-    defer vt.deinit();
     return Smithy.init(
         allocator,
         vt.value.object.get("smithy").?.string,
@@ -265,6 +279,7 @@ pub fn parse(allocator: std.mem.Allocator, json_model: []const u8) !Smithy {
             .suppressions = &.{},
         },
         try shapes(allocator, vt.value.object.get("shapes").?.object),
+        vt,
     );
 }
 
@@ -572,7 +587,7 @@ fn getShape(allocator: std.mem.Allocator, shape: std.json.Value) SmithyParseErro
 }
 
 fn parseMembers(allocator: std.mem.Allocator, shape: ?std.json.Value) SmithyParseError![]TypeMember {
-    var rc: []TypeMember = &.{};
+    const rc: []TypeMember = &.{};
     if (shape == null)
         return rc;
 
@@ -606,7 +621,7 @@ fn parseTraitsOnly(allocator: std.mem.Allocator, shape: std.json.Value) SmithyPa
 }
 
 fn parseTraits(allocator: std.mem.Allocator, shape: ?std.json.Value) SmithyParseError![]Trait {
-    var rc: []Trait = &.{};
+    const rc: []Trait = &.{};
     if (shape == null)
         return rc;
 
@@ -641,6 +656,8 @@ fn getTrait(trait_type: []const u8, value: std.json.Value) SmithyParseError!?Tra
         };
     if (std.mem.eql(u8, trait_type, "smithy.api#required"))
         return Trait{ .required = .{} };
+    if (std.mem.eql(u8, trait_type, "smithy.api#clientOptional"))
+        return Trait{ .client_optional = {} };
     if (std.mem.eql(u8, trait_type, "smithy.api#sparse"))
         return Trait{ .sparse = .{} };
     if (std.mem.eql(u8, trait_type, "smithy.api#box"))
@@ -705,6 +722,14 @@ fn getTrait(trait_type: []const u8, value: std.json.Value) SmithyParseError!?Tra
             .code = code,
         } };
     }
+    if (std.mem.eql(u8, trait_type, "aws.protocols#awsQueryError")) {
+        return Trait{
+            .aws_query_error = .{
+                .code = value.object.get("code").?.string, // code is required
+                .http_response_code = value.object.get("httpResponseCode").?.integer,
+            },
+        };
+    }
     if (std.mem.eql(u8, trait_type, "smithy.api#jsonName"))
         return Trait{ .json_name = value.string };
     if (std.mem.eql(u8, trait_type, "smithy.api#xmlName"))
@@ -722,6 +747,10 @@ fn getTrait(trait_type: []const u8, value: std.json.Value) SmithyParseError!?Tra
 
     if (std.mem.eql(u8, trait_type, "smithy.api#xmlNamespace"))
         return null;
+
+    if (std.mem.eql(u8, trait_type, "smithy.api#enumValue"))
+        return Trait{ .enum_value = value.string };
+
     // TODO: win argument with compiler to get this comptime
     const list =
         \\aws.api#arnReference
@@ -864,7 +893,7 @@ fn read_file_to_string(allocator: std.mem.Allocator, file_name: []const u8, max_
     return file.readToEndAlloc(allocator, max_bytes);
 }
 const test_data: []const u8 = @embedFile("test.json");
-const intrinsic_type_count: usize = 5; // 5 intrinsic types are added to every model
+const intrinsic_type_count: usize = 15; // 15 intrinsic types are added to every model (see shapes() function)
 
 test "parse string" {
     const test_string =