Skip to content
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

Add wrapper types for map keys and values #73

Merged
merged 11 commits into from
Jun 21, 2020
Merged

Add wrapper types for map keys and values #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a95556b
fixup option docs and add key_wrap option
andrewparmet Jun 19, 2020
60886f8
sloppy, but serialization is working
andrewparmet Jun 19, 2020
49606fe
still sloppy, but sizeof is working
andrewparmet Jun 19, 2020
bad1b4a
sloppy, but deserialize is working
andrewparmet Jun 19, 2020
8c5eddb
begin cleanup
andrewparmet Jun 19, 2020
64a9ad3
more cleanup
andrewparmet Jun 19, 2020
9b81549
add int example
andrewparmet Jun 19, 2020
00de1a8
extract map sizeof
andrewparmet Jun 19, 2020
4be559c
only resolve map entries at protocol converstion time
andrewparmet Jun 19, 2020
3bc7c9b
wrapped map values working
andrewparmet Jun 19, 2020
da831d0
add tests
andrewparmet Jun 19, 2020
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
28 changes: 13 additions & 15 deletions protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/AnnotatorUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,35 @@ import arrow.core.None
import arrow.core.Some
import com.toasttab.protokt.codegen.algebra.AST
import com.toasttab.protokt.codegen.impl.STAnnotator.Context
import com.toasttab.protokt.codegen.impl.Wrapper.interceptMapKeyTypeName
import com.toasttab.protokt.codegen.impl.Wrapper.interceptMapValueTypeName
import com.toasttab.protokt.codegen.protoc.MapEntry
import com.toasttab.protokt.codegen.protoc.Message
import com.toasttab.protokt.codegen.protoc.Oneof
import com.toasttab.protokt.codegen.protoc.StandardField
import com.toasttab.protokt.codegen.protoc.TypeDesc
import com.toasttab.protokt.codegen.template.Renderers.ConcatWithScope

internal fun resolveMapEntry(m: Message) =
MapEntryInfo(
fun resolveMapEntry(m: Message) =
MapEntry(
(m.fields[0] as StandardField),
(m.fields[1] as StandardField)
)

internal fun resolveMapEntryTypes(m: Message, ctx: Context) =
resolveMapEntry(m).let {
fun resolveMapEntryTypes(f: StandardField, ctx: Context) =
f.mapEntry!!.let {
MapTypeParams(
it.key.unqualifiedTypeName,
it.value.typePClass.renderName(ctx.pkg)
interceptMapKeyTypeName(f, it.key.unqualifiedTypeName, ctx),
interceptMapValueTypeName(f, it.value.typePClass.renderName(ctx.pkg), ctx)
)
}

internal class MapTypeParams(
class MapTypeParams(
val kType: String,
val vType: String
)

internal class MapEntryInfo(
val key: StandardField,
val value: StandardField
)

internal fun oneOfScope(f: Oneof, type: String, ctx: Context) =
fun oneOfScope(f: Oneof, type: String, ctx: Context) =
ctx.stripEnclosingMessageNamePrefix(
ctx.stripRootMessageNamePrefix(
ConcatWithScope.render(
Expand All @@ -59,14 +57,14 @@ internal fun oneOfScope(f: Oneof, type: String, ctx: Context) =
)
)

internal fun String.emptyToNone() =
fun String.emptyToNone() =
if (isEmpty()) {
None
} else {
Some(this)
}

internal fun kotlinPackage(ast: AST<TypeDesc>) =
fun kotlinPackage(ast: AST<TypeDesc>) =
resolvePackage(
ast.data.desc.options,
ast.data.desc.packageName,
Expand Down
9 changes: 8 additions & 1 deletion protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/DeserializerAnnotator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ import arrow.core.getOrElse
import com.toasttab.protokt.codegen.impl.MessageAnnotator.idealMaxWidth
import com.toasttab.protokt.codegen.impl.STAnnotator.Context
import com.toasttab.protokt.codegen.impl.Wrapper.interceptReadFn
import com.toasttab.protokt.codegen.impl.Wrapper.keyWrapped
import com.toasttab.protokt.codegen.impl.Wrapper.mapKeyConverter
import com.toasttab.protokt.codegen.impl.Wrapper.mapValueConverter
import com.toasttab.protokt.codegen.impl.Wrapper.valueWrapped
import com.toasttab.protokt.codegen.impl.Wrapper.wrapped
import com.toasttab.protokt.codegen.impl.Wrapper.wrapperName
import com.toasttab.protokt.codegen.model.FieldType
Expand Down Expand Up @@ -99,9 +103,12 @@ private constructor(
lhs = f.fieldName,
packed = packed,
options =
if (f.wrapped) {
if (f.wrapped || f.keyWrapped || f.valueWrapped) {
Options(
wrapName = wrapperName(f, ctx).getOrElse { "" },
keyWrap = mapKeyConverter(f, ctx),
valueWrap = mapValueConverter(f, ctx),
valueType = f.mapEntry?.value?.type,
type = f.type.toString(),
oneof = true
)
Expand Down
26 changes: 1 addition & 25 deletions protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/PropertyAnnotator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@

package com.toasttab.protokt.codegen.impl

import arrow.core.None
import arrow.core.Option
import arrow.core.Some
import arrow.core.getOrElse
import arrow.core.toOption
import com.toasttab.protokt.codegen.impl.Deprecation.renderOptions
import com.toasttab.protokt.codegen.impl.Implements.overrides
import com.toasttab.protokt.codegen.impl.Nullability.deserializeType
Expand Down Expand Up @@ -101,7 +96,7 @@ private constructor(
field = f,
any =
if (f.map) {
typeParams(f.protoTypeName)
resolveMapEntryTypes(f, ctx)
} else {
interceptTypeName(
f,
Expand All @@ -111,25 +106,6 @@ private constructor(
}
)

private fun typeParams(n: String) =
findType(n, msg)
.map { resolveMapEntryTypes(it, ctx) }
.getOrElse { error("missing type params") }

private fun findType(
tn: String,
msg: Message
): Option<Message> {
val n = tn.split(".").let { if (it.isEmpty()) tn else it.last() }
return msg.nestedTypes.find {
when (it) {
is Message ->
if (it.name == n) Some(it) else findType(n, it)
else -> None
}.isDefined()
}.toOption().map { f -> f as Message }
}

private fun Field.defaultValue(ctx: Context) =
when (this) {
is StandardField ->
Expand Down
7 changes: 6 additions & 1 deletion protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/SizeofAnnotator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import com.toasttab.protokt.codegen.impl.STAnnotator.Context
import com.toasttab.protokt.codegen.impl.Wrapper.interceptFieldSizeof
import com.toasttab.protokt.codegen.impl.Wrapper.interceptSizeof
import com.toasttab.protokt.codegen.impl.Wrapper.interceptValueAccess
import com.toasttab.protokt.codegen.impl.Wrapper.mapKeyConverter
import com.toasttab.protokt.codegen.impl.Wrapper.mapValueConverter
import com.toasttab.protokt.codegen.protoc.Message
import com.toasttab.protokt.codegen.protoc.Oneof
import com.toasttab.protokt.codegen.protoc.StandardField
Expand Down Expand Up @@ -87,7 +89,10 @@ private constructor(
Options(
fieldSizeof = interceptFieldSizeof(f, name, ctx),
fieldAccess =
interceptValueAccess(f, ctx, IterationVar.render())
interceptValueAccess(f, ctx, IterationVar.render()),
keyAccess = mapKeyConverter(f, ctx),
valueAccess = mapValueConverter(f, ctx),
valueType = f.mapEntry?.value?.type
)
)
}
Expand Down
9 changes: 8 additions & 1 deletion protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/StandardFieldExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ package com.toasttab.protokt.codegen.impl

import com.toasttab.protokt.codegen.impl.STAnnotator.Context
import com.toasttab.protokt.codegen.impl.Wrapper.interceptValueAccess
import com.toasttab.protokt.codegen.impl.Wrapper.mapKeyConverter
import com.toasttab.protokt.codegen.impl.Wrapper.mapValueConverter
import com.toasttab.protokt.codegen.protoc.StandardField
import com.toasttab.protokt.codegen.protoc.Tag
import com.toasttab.protokt.codegen.template.Renderers.Box
Expand Down Expand Up @@ -69,7 +71,12 @@ internal fun StandardField.nonDefault(ctx: Context) =
internal fun StandardField.boxMap(ctx: Context) =
BoxMap.render(
type = type,
box = unqualifiedNestedTypeName(ctx)
box = unqualifiedNestedTypeName(ctx),
options = BoxMap.Options(
keyWrap = mapKeyConverter(this, ctx),
valueWrap = mapValueConverter(this, ctx),
valueType = mapEntry!!.value.type
)
)

internal fun StandardField.box(s: String) =
Expand Down
4 changes: 2 additions & 2 deletions ...-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/StandardFieldImportResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package com.toasttab.protokt.codegen.impl
import com.github.andrewoma.dexx.kollection.ImmutableSet
import com.github.andrewoma.dexx.kollection.immutableSetOf
import com.toasttab.protokt.codegen.impl.Wrapper.converter
import com.toasttab.protokt.codegen.impl.Wrapper.foldWrap
import com.toasttab.protokt.codegen.impl.Wrapper.foldFieldWrap
import com.toasttab.protokt.codegen.model.Import
import com.toasttab.protokt.codegen.model.PPackage
import com.toasttab.protokt.codegen.model.pclass
Expand Down Expand Up @@ -81,7 +81,7 @@ class StandardFieldImportResolver(
set.add(Import.Class(f.typePClass))
}

f.foldWrap(
f.foldFieldWrap(
pkg,
ctx,
{ },
Expand Down
Loading