Support marking with codable to support "Codable" on the generated code.

liuliu · Nov 25, 2024 · af04a90 · af04a90
1 parent 65334e3
commit af04a90
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/parser/dflatc/main.swift b/src/parser/dflatc/main.swift
@@ -19,6 +19,7 @@ struct Enum: Decodable {
   var underlyingType: String?
   var fields: [EnumVal]
   var generated: Bool
+  var attributes: [[String: String]]
 }
 
 enum ElementTypeEnum: String, Decodable {
@@ -173,6 +174,18 @@ extension Field {
   }
 }
 
+extension Enum {
+  var isCodable: Bool {
+    attributes.contains { $0["codable"] != nil }
+  }
+}
+
+extension Struct {
+  var isCodable: Bool {
+    attributes.contains { $0["codable"] != nil }
+  }
+}
+
 extension Enum {
   func findEnumVal(_ value: Int) -> EnumVal? {
     for field in fields {
@@ -201,7 +214,7 @@ func SetNamespace(_ namespace: [String], previous pns: inout [String], code: ino
 
 func GenEnumDataModel(_ enumDef: Enum, code: inout String) {
   code +=
-    "\npublic enum \(enumDef.name): \(SwiftType[enumDef.underlyingType!]!), DflatFriendlyValue, CaseIterable {\n"
+    "\npublic enum \(enumDef.name): \(SwiftType[enumDef.underlyingType!]!), DflatFriendlyValue, CaseIterable\(enumDef.isCodable ? ", Codable" : "") {\n"
   for field in enumDef.fields {
     code += "  case \(field.name.firstLowercasedIfNotAllCaps()) = \(field.value)\n"
   }
@@ -459,7 +472,7 @@ func GetStructDeserializer(_ structDef: Struct) -> String {
 }
 
 func GenStructDataModel(_ structDef: Struct, code: inout String) {
-  code += "\npublic struct \(structDef.name): Equatable, FlatBuffersDecodable {\n"
+  code += "\npublic struct \(structDef.name): Equatable, FlatBuffersDecodable\(structDef.isCodable ? ", Codable" : "") {\n"
   for field in structDef.fields {
     guard IsDataField(field) else { continue }
     code += "  public var \(field.name): \(GetFieldType(field))\n"
@@ -506,7 +519,7 @@ func GenStructDataModel(_ structDef: Struct, code: inout String) {
 
 func GenRootDataModel(_ structDef: Struct, code: inout String) {
   code +=
-    "\npublic final class \(structDef.name): Dflat.Atom, SQLiteDflat.SQLiteAtom, FlatBuffersDecodable, Equatable {\n"
+    "\npublic final class \(structDef.name): Dflat.Atom, SQLiteDflat.SQLiteAtom, FlatBuffersDecodable, Equatable\(structDef.isCodable ? ", Codable" : "") {\n"
   code += "  public static func == (lhs: \(structDef.name), rhs: \(structDef.name)) -> Bool {\n"
   for field in structDef.fields {
     guard IsDataField(field) else { continue }

diff --git a/src/parser/dflats.cpp b/src/parser/dflats.cpp
@@ -115,6 +115,7 @@ const std::string GenUnion(const flatbuffers::EnumDef &enum_def) {
 	json += "\"generated\": ";
 	json += (enum_def.generated ? "true, " : "false, ");
 	json += "\"namespace\": [" + GenNamespace(*enum_def.defined_namespace) + "], ";
+	json += GenAttributes(enum_def.attributes) + ", ";
 	if (!enum_def.is_union) {
 		json += std::string("\"underlying_type\": \"") + idl_types[enum_def.underlying_type.base_type] + "\", ";
 	}
@@ -265,6 +266,7 @@ int main(int argc, const char **argv) {
     parser->known_attributes_["primary"] = true;
     parser->known_attributes_["indexed"] = true;
     parser->known_attributes_["unique"] = true;
+    parser->known_attributes_["codable"] = true;
     parser->known_attributes_["v"] = true;
     ParseFile(*parser.get(), filename, contents, include_directories);