Skip to content

TypeMap.Entryをenumにする #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
omochi wants to merge 1 commit into from
Closed

TypeMap.Entryをenumにする #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Sources/CodableToTypeScript/TypeConverter/TypeMapConverter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ public struct TypeMapConverter: TypeConverter {
public func name(for target: GenerationTarget) throws -> String {
switch target {
case .entity:
return entry.name
return entry.entityType
case .json:
if let jsonName = entry.jsonType {
return jsonName
}
return try `default`.name(for: .json)
return entry.jsonType
}
}

Expand Down
56 changes: 35 additions & 21 deletions Sources/CodableToTypeScript/Value/TypeMap.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,37 @@
import SwiftTypeReader

public struct TypeMap {
public struct Entry {
public init(
name: String,
jsonType: String? = nil,
decode: String? = nil,
encode: String? = nil
) {
self.name = name
self.jsonType = jsonType
self.decode = decode
self.encode = encode
public enum Entry {
case identity(name: String)
case coding(entityType: String, jsonType: String, decode: String?, encode: String?)

internal var entityType: String {
switch self {
case .identity(name: let name): return name
case .coding(entityType: let name, _, _, _): return name
}
}

internal var jsonType: String {
switch self {
case .identity(name: let name): return name
case .coding(_, jsonType: let name, _, _): return name
}
}

public var name: String
public var jsonType: String?
public var decode: String?
public var encode: String?
internal var decode: String? {
switch self {
case .identity: return nil
case .coding(_, _, decode: let name, _): return name
}
}

internal var encode: String? {
switch self {
case .identity: return nil
case .coding(_, _, _, encode: let name): return name
}
}
}

public typealias MapFunction = (any SType) -> Entry?
Expand All @@ -27,12 +41,12 @@ public struct TypeMap {
)

public static let defaultTable: [String: Entry] = [
"Void": Entry(name: "void"),
"Bool": Entry(name: "boolean"),
"Int": Entry(name: "number"),
"Float": Entry(name: "number"),
"Double": Entry(name: "number"),
"String": Entry(name: "string")
"Void": .identity(name: "void"),
"Bool": .identity(name: "boolean"),
"Int": .identity(name: "number"),
"Float": .identity(name: "number"),
"Double": .identity(name: "number"),
"String": .identity(name: "string")
]

public init(
Expand Down