build.zig

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

src/smithy.zig

@@ -7,16 +7,14 @@ 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, json_source: std.json.Parsed(std.json.Value)) Smithy {
+    pub fn init(allocator: std.mem.Allocator, version: []const u8, metadata: ModelMetadata, shapeinfo: []ShapeInfo) Smithy {
         return .{
             .version = version,
             .metadata = metadata,
             .shapes = shapeinfo,
             .allocator = allocator,
-            .json_source = json_source,
         };
     }
     pub fn deinit(self: Self) void {
@@ -78,7 +76,6 @@ pub const Smithy = struct {
             }
         }
         self.allocator.free(self.shapes);
-        self.json_source.deinit();
     }
 };
 pub const ShapeInfo = struct {
@@ -102,13 +99,13 @@ pub const TraitType = enum {
     aws_auth_sigv4,
     aws_protocol,
     ec2_query_name,
-    json_name,
-    xml_name,
     http,
     http_header,
     http_label,
     http_query,
     http_payload,
+    json_name,
+    xml_name,
     required,
     documentation,
     pattern,
@@ -256,10 +253,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
+    // construct a parser. We're not copying strings here, but that may
-    // Instead, we keep the original json string around
+    // be a poor decision
-    // 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,
@@ -268,7 +265,6 @@ pub fn parse(allocator: std.mem.Allocator, json_model: []const u8) !Smithy {
             .suppressions = &.{},
         },
         try shapes(allocator, vt.value.object.get("shapes").?.object),
-        vt,
     );
 }
 
@@ -576,7 +572,7 @@ fn getShape(allocator: std.mem.Allocator, shape: std.json.Value) SmithyParseErro
 }
 
 fn parseMembers(allocator: std.mem.Allocator, shape: ?std.json.Value) SmithyParseError![]TypeMember {
-    const rc: []TypeMember = &.{};
+    var rc: []TypeMember = &.{};
     if (shape == null)
         return rc;
 
@@ -610,7 +606,7 @@ fn parseTraitsOnly(allocator: std.mem.Allocator, shape: std.json.Value) SmithyPa
 }
 
 fn parseTraits(allocator: std.mem.Allocator, shape: ?std.json.Value) SmithyParseError![]Trait {
-    const rc: []Trait = &.{};
+    var rc: []Trait = &.{};
     if (shape == null)
         return rc;
 
@@ -868,7 +864,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 = 15; // 15 intrinsic types are added to every model (see shapes() function)
+const intrinsic_type_count: usize = 5; // 5 intrinsic types are added to every model
 
 test "parse string" {
     const test_string =