Rename OptionTypeSchama.Object to Struct

Author: kateinoigakukun

SourceKitLSPDevUtils/Sources/ConfigSchemaGen/JSONSchema.swift

@@ -107,11 +107,11 @@ struct JSONSchemaBuilder {
     case .dictionary(value: let value):
       schema.type = "object"
       schema.additionalProperties = try buildJSONSchema(from: value)
-    case .object(let object):
+    case .struct(let structInfo):
       schema.type = "object"
       var properties: [String: JSONSchema] = [:]
       var required: [String] = []
-      for property in object.properties {
+      for property in structInfo.properties {
         let propertyType = property.type
         var propertySchema = try buildJSONSchema(from: propertyType)
         propertySchema.description = property.description

SourceKitLSPDevUtils/Sources/ConfigSchemaGen/OptionDocument.swift

@@ -45,8 +45,8 @@ struct OptionDocumentBuilder {
       let type = property.type
       let typeDescription: String?
       switch type.kind {
-      case .object:
-        // Skip object type as we describe its properties in the next level
+      case .struct:
+        // Skip struct type as we describe its properties in the next level
         typeDescription = nil
       default:
         typeDescription = Self.typeToDisplay(type)
@@ -61,7 +61,7 @@ struct OptionDocumentBuilder {
       }
       doc += "\n"
       switch type.kind {
-      case .object(let schema):
+      case .struct(let schema):
         for property in schema.properties {
           try appendProperty(property, indentLevel: indentLevel + 1)
         }
@@ -78,7 +78,7 @@ struct OptionDocumentBuilder {
       default: break
       }
     }
-    guard case .object(let schema) = schema.kind else {
+    guard case .struct(let schema) = schema.kind else {
       fatalError("Root schema must be a struct")
     }
     for property in schema.properties {
@@ -97,8 +97,8 @@ struct OptionDocumentBuilder {
       return "\(typeToDisplay(value, shouldWrap: true))[]"
     case .dictionary(let value):
       return "[string: \(typeToDisplay(value))]"
-    case .object(let objectInfo):
-      return objectInfo.name
+    case .struct(let structInfo):
+      return structInfo.name
     case .enum(let enumInfo):
       let cases = enumInfo.cases.map { "\"\($0.name)\"" }.joined(separator: "|")
       return shouldWrap ? "(\(cases))" : cases

SourceKitLSPDevUtils/Sources/ConfigSchemaGen/OptionSchema.swift

@@ -22,7 +22,7 @@ struct OptionTypeSchama {
     var defaultValue: String?
   }
 
-  struct Object {
+  struct Struct {
     var name: String
     /// Properties of the object, preserving the order of declaration
     var properties: [Property]
@@ -45,7 +45,7 @@ struct OptionTypeSchama {
     case string
     indirect case array(value: OptionTypeSchama)
     indirect case dictionary(value: OptionTypeSchama)
-    case object(Object)
+    case `struct`(Struct)
     case `enum`(Enum)
   }
 
@@ -60,37 +60,41 @@ struct OptionTypeSchama {
   /// Accesses the property schema by name
   subscript(_ key: String) -> OptionTypeSchama? {
     get {
-      guard case .object(let object) = kind else {
+      guard case .struct(let structInfo) = kind else {
         return nil
       }
-      return object.properties.first { $0.name == key }?.type
+      return structInfo.properties.first { $0.name == key }?.type
     }
     set {
-      guard case .object(var object) = kind else {
+      guard case .struct(var structInfo) = kind else {
         fatalError("Cannot set property on non-object type")
       }
-      guard let index = object.properties.firstIndex(where: { $0.name == key }) else {
+      guard let index = structInfo.properties.firstIndex(where: { $0.name == key }) else {
         fatalError("Property not found: \(key)")
       }
       guard let newValue = newValue else {
         fatalError("Cannot set property to nil")
       }
-      object.properties[index].type = newValue
-      kind = .object(object)
+      structInfo.properties[index].type = newValue
+      kind = .struct(structInfo)
     }
   }
 }
 
 /// Context for resolving option schema from Swift syntax nodes
 struct OptionSchemaContext {
-  let typeNameResolver: TypeDeclResolver
+  private let typeNameResolver: TypeDeclResolver
+
+  init(typeNameResolver: TypeDeclResolver) {
+    self.typeNameResolver = typeNameResolver
+  }
 
   /// Builds a schema from a type declaration
   func buildSchema(from typeDecl: TypeDeclResolver.TypeDecl) throws -> OptionTypeSchama {
     switch DeclSyntax(typeDecl).as(DeclSyntaxEnum.self) {
     case .structDecl(let decl):
       let structInfo = try buildStructProperties(decl)
-      return OptionTypeSchama(kind: .object(structInfo))
+      return OptionTypeSchama(kind: .struct(structInfo))
     case .enumDecl(let decl):
       let enumInfo = buildEnumCases(decl)
       return OptionTypeSchama(kind: .enum(enumInfo))
@@ -165,7 +169,7 @@ struct OptionSchemaContext {
     return .init(name: typeName, cases: cases)
   }
 
-  private func buildStructProperties(_ node: StructDeclSyntax) throws -> OptionTypeSchama.Object {
+  private func buildStructProperties(_ node: StructDeclSyntax) throws -> OptionTypeSchama.Struct {
     var properties: [OptionTypeSchama.Property] = []
     for member in node.memberBlock.members {
       // Skip computed properties