-
Notifications
You must be signed in to change notification settings - Fork 349
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add support for 'json_name' annotation (#408)
* feat: Add support for 'json_name' annotation * fix: remove snakeToCamel flag check for json_name
- Loading branch information
1 parent
cf1c7a6
commit b519717
Showing
10 changed files
with
412 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
206 changes: 206 additions & 0 deletions
206
integration/simple-json-name/google/protobuf/timestamp.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,206 @@ | ||
/* eslint-disable */ | ||
import { util, configure, Writer, Reader } from 'protobufjs/minimal'; | ||
import * as Long from 'long'; | ||
|
||
export const protobufPackage = 'google.protobuf'; | ||
|
||
/** | ||
* A Timestamp represents a point in time independent of any time zone or local | ||
* calendar, encoded as a count of seconds and fractions of seconds at | ||
* nanosecond resolution. The count is relative to an epoch at UTC midnight on | ||
* January 1, 1970, in the proleptic Gregorian calendar which extends the | ||
* Gregorian calendar backwards to year one. | ||
* | ||
* All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap | ||
* second table is needed for interpretation, using a [24-hour linear | ||
* smear](https://developers.google.com/time/smear). | ||
* | ||
* The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By | ||
* restricting to that range, we ensure that we can convert to and from [RFC | ||
* 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. | ||
* | ||
* # Examples | ||
* | ||
* Example 1: Compute Timestamp from POSIX `time()`. | ||
* | ||
* Timestamp timestamp; | ||
* timestamp.set_seconds(time(NULL)); | ||
* timestamp.set_nanos(0); | ||
* | ||
* Example 2: Compute Timestamp from POSIX `gettimeofday()`. | ||
* | ||
* struct timeval tv; | ||
* gettimeofday(&tv, NULL); | ||
* | ||
* Timestamp timestamp; | ||
* timestamp.set_seconds(tv.tv_sec); | ||
* timestamp.set_nanos(tv.tv_usec * 1000); | ||
* | ||
* Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. | ||
* | ||
* FILETIME ft; | ||
* GetSystemTimeAsFileTime(&ft); | ||
* UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; | ||
* | ||
* // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z | ||
* // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. | ||
* Timestamp timestamp; | ||
* timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); | ||
* timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); | ||
* | ||
* Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. | ||
* | ||
* long millis = System.currentTimeMillis(); | ||
* | ||
* Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) | ||
* .setNanos((int) ((millis % 1000) * 1000000)).build(); | ||
* | ||
* | ||
* Example 5: Compute Timestamp from Java `Instant.now()`. | ||
* | ||
* Instant now = Instant.now(); | ||
* | ||
* Timestamp timestamp = | ||
* Timestamp.newBuilder().setSeconds(now.getEpochSecond()) | ||
* .setNanos(now.getNano()).build(); | ||
* | ||
* | ||
* Example 6: Compute Timestamp from current time in Python. | ||
* | ||
* timestamp = Timestamp() | ||
* timestamp.GetCurrentTime() | ||
* | ||
* # JSON Mapping | ||
* | ||
* In JSON format, the Timestamp type is encoded as a string in the | ||
* [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the | ||
* format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" | ||
* where {year} is always expressed using four digits while {month}, {day}, | ||
* {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional | ||
* seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), | ||
* are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone | ||
* is required. A proto3 JSON serializer should always use UTC (as indicated by | ||
* "Z") when printing the Timestamp type and a proto3 JSON parser should be | ||
* able to accept both UTC and other timezones (as indicated by an offset). | ||
* | ||
* For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past | ||
* 01:30 UTC on January 15, 2017. | ||
* | ||
* In JavaScript, one can convert a Date object to this format using the | ||
* standard | ||
* [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) | ||
* method. In Python, a standard `datetime.datetime` object can be converted | ||
* to this format using | ||
* [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with | ||
* the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use | ||
* the Joda Time's [`ISODateTimeFormat.dateTime()`]( | ||
* http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D | ||
* ) to obtain a formatter capable of generating timestamps in this format. | ||
*/ | ||
export interface Timestamp { | ||
/** | ||
* Represents seconds of UTC time since Unix epoch | ||
* 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to | ||
* 9999-12-31T23:59:59Z inclusive. | ||
*/ | ||
seconds: number; | ||
/** | ||
* Non-negative fractions of a second at nanosecond resolution. Negative | ||
* second values with fractions must still have non-negative nanos values | ||
* that count forward in time. Must be from 0 to 999,999,999 | ||
* inclusive. | ||
*/ | ||
nanos: number; | ||
} | ||
|
||
const baseTimestamp: object = { seconds: 0, nanos: 0 }; | ||
|
||
export const Timestamp = { | ||
encode(message: Timestamp, writer: Writer = Writer.create()): Writer { | ||
if (message.seconds !== 0) { | ||
writer.uint32(8).int64(message.seconds); | ||
} | ||
if (message.nanos !== 0) { | ||
writer.uint32(16).int32(message.nanos); | ||
} | ||
return writer; | ||
}, | ||
|
||
decode(input: Reader | Uint8Array, length?: number): Timestamp { | ||
const reader = input instanceof Reader ? input : new Reader(input); | ||
let end = length === undefined ? reader.len : reader.pos + length; | ||
const message = { ...baseTimestamp } as Timestamp; | ||
while (reader.pos < end) { | ||
const tag = reader.uint32(); | ||
switch (tag >>> 3) { | ||
case 1: | ||
message.seconds = longToNumber(reader.int64() as Long); | ||
break; | ||
case 2: | ||
message.nanos = reader.int32(); | ||
break; | ||
default: | ||
reader.skipType(tag & 7); | ||
break; | ||
} | ||
} | ||
return message; | ||
}, | ||
|
||
fromJSON(object: any): Timestamp { | ||
const message = { ...baseTimestamp } as Timestamp; | ||
message.seconds = object.seconds !== undefined && object.seconds !== null ? Number(object.seconds) : 0; | ||
message.nanos = object.nanos !== undefined && object.nanos !== null ? Number(object.nanos) : 0; | ||
return message; | ||
}, | ||
|
||
toJSON(message: Timestamp): unknown { | ||
const obj: any = {}; | ||
message.seconds !== undefined && (obj.seconds = message.seconds); | ||
message.nanos !== undefined && (obj.nanos = message.nanos); | ||
return obj; | ||
}, | ||
|
||
fromPartial(object: DeepPartial<Timestamp>): Timestamp { | ||
const message = { ...baseTimestamp } as Timestamp; | ||
message.seconds = object.seconds ?? 0; | ||
message.nanos = object.nanos ?? 0; | ||
return message; | ||
}, | ||
}; | ||
|
||
declare var self: any | undefined; | ||
declare var window: any | undefined; | ||
declare var global: any | undefined; | ||
var globalThis: any = (() => { | ||
if (typeof globalThis !== 'undefined') return globalThis; | ||
if (typeof self !== 'undefined') return self; | ||
if (typeof window !== 'undefined') return window; | ||
if (typeof global !== 'undefined') return global; | ||
throw 'Unable to locate global object'; | ||
})(); | ||
|
||
type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined; | ||
export type DeepPartial<T> = T extends Builtin | ||
? T | ||
: T extends Array<infer U> | ||
? Array<DeepPartial<U>> | ||
: T extends ReadonlyArray<infer U> | ||
? ReadonlyArray<DeepPartial<U>> | ||
: T extends {} | ||
? { [K in keyof T]?: DeepPartial<T[K]> } | ||
: Partial<T>; | ||
|
||
function longToNumber(long: Long): number { | ||
if (long.gt(Number.MAX_SAFE_INTEGER)) { | ||
throw new globalThis.Error('Value is larger than Number.MAX_SAFE_INTEGER'); | ||
} | ||
return long.toNumber(); | ||
} | ||
|
||
// If you get a compile-error about 'Constructor<Long> and ... have no overlap', | ||
// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. | ||
if (util.Long !== Long) { | ||
util.Long = Long as any; | ||
configure(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import { Simple } from './simple'; | ||
|
||
describe('simple', () => { | ||
it('generates json field names correctly', () => { | ||
const simple: Simple = Simple.fromPartial({ name: 'test' }); | ||
const convertJsonObject: any = Simple.toJSON(simple); | ||
// Check if the generated json field name is correct | ||
expect(Object.prototype.hasOwnProperty.call(convertJsonObject, 'other_name')).toBe(true); | ||
|
||
if (typeof convertJsonObject?.other_name === 'string') { | ||
expect(convertJsonObject.other_name).toBe('test'); | ||
} | ||
|
||
// Check if field names from parsed json are correct | ||
const jsonObject = { | ||
other_name: 'test', | ||
other_age: 10, | ||
createdAt: '2020-01-01T00:00:00.000Z', | ||
}; | ||
const simple2: Simple = Simple.fromJSON(jsonObject); | ||
expect(simple2.name).toBe('test'); | ||
expect(typeof simple2.age).toBe('number'); | ||
expect(typeof simple2.createdAt).toBe(typeof new Date()); | ||
}); | ||
}); |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
syntax = "proto3"; | ||
|
||
import "google/protobuf/timestamp.proto"; | ||
|
||
package simple; | ||
|
||
message Simple { | ||
string name = 1 [ json_name = "other_name" ]; | ||
optional int32 age = 2 [ json_name = "other_age" ]; | ||
optional google.protobuf.Timestamp created_at = 9 [ json_name="createdAt" ]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
/* eslint-disable */ | ||
import { util, configure, Writer, Reader } from 'protobufjs/minimal'; | ||
import * as Long from 'long'; | ||
import { Timestamp } from './google/protobuf/timestamp'; | ||
|
||
export const protobufPackage = 'simple'; | ||
|
||
export interface Simple { | ||
name: string; | ||
age?: number | undefined; | ||
createdAt?: Date | undefined; | ||
} | ||
|
||
const baseSimple: object = { name: '' }; | ||
|
||
export const Simple = { | ||
encode(message: Simple, writer: Writer = Writer.create()): Writer { | ||
if (message.name !== '') { | ||
writer.uint32(10).string(message.name); | ||
} | ||
if (message.age !== undefined) { | ||
writer.uint32(16).int32(message.age); | ||
} | ||
if (message.createdAt !== undefined) { | ||
Timestamp.encode(toTimestamp(message.createdAt), writer.uint32(74).fork()).ldelim(); | ||
} | ||
return writer; | ||
}, | ||
|
||
decode(input: Reader | Uint8Array, length?: number): Simple { | ||
const reader = input instanceof Reader ? input : new Reader(input); | ||
let end = length === undefined ? reader.len : reader.pos + length; | ||
const message = { ...baseSimple } as Simple; | ||
while (reader.pos < end) { | ||
const tag = reader.uint32(); | ||
switch (tag >>> 3) { | ||
case 1: | ||
message.name = reader.string(); | ||
break; | ||
case 2: | ||
message.age = reader.int32(); | ||
break; | ||
case 9: | ||
message.createdAt = fromTimestamp(Timestamp.decode(reader, reader.uint32())); | ||
break; | ||
default: | ||
reader.skipType(tag & 7); | ||
break; | ||
} | ||
} | ||
return message; | ||
}, | ||
|
||
fromJSON(object: any): Simple { | ||
const message = { ...baseSimple } as Simple; | ||
message.name = object.other_name !== undefined && object.other_name !== null ? String(object.other_name) : ''; | ||
message.age = object.other_age !== undefined && object.other_age !== null ? Number(object.other_age) : undefined; | ||
message.createdAt = | ||
object.createdAt !== undefined && object.createdAt !== null ? fromJsonTimestamp(object.createdAt) : undefined; | ||
return message; | ||
}, | ||
|
||
toJSON(message: Simple): unknown { | ||
const obj: any = {}; | ||
message.name !== undefined && (obj.other_name = message.name); | ||
message.age !== undefined && (obj.other_age = message.age); | ||
message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString()); | ||
return obj; | ||
}, | ||
|
||
fromPartial(object: DeepPartial<Simple>): Simple { | ||
const message = { ...baseSimple } as Simple; | ||
message.name = object.name ?? ''; | ||
message.age = object.age ?? undefined; | ||
message.createdAt = object.createdAt ?? undefined; | ||
return message; | ||
}, | ||
}; | ||
|
||
type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined; | ||
export type DeepPartial<T> = T extends Builtin | ||
? T | ||
: T extends Array<infer U> | ||
? Array<DeepPartial<U>> | ||
: T extends ReadonlyArray<infer U> | ||
? ReadonlyArray<DeepPartial<U>> | ||
: T extends {} | ||
? { [K in keyof T]?: DeepPartial<T[K]> } | ||
: Partial<T>; | ||
|
||
function toTimestamp(date: Date): Timestamp { | ||
const seconds = date.getTime() / 1_000; | ||
const nanos = (date.getTime() % 1_000) * 1_000_000; | ||
return { seconds, nanos }; | ||
} | ||
|
||
function fromTimestamp(t: Timestamp): Date { | ||
let millis = t.seconds * 1_000; | ||
millis += t.nanos / 1_000_000; | ||
return new Date(millis); | ||
} | ||
|
||
function fromJsonTimestamp(o: any): Date { | ||
if (o instanceof Date) { | ||
return o; | ||
} else if (typeof o === 'string') { | ||
return new Date(o); | ||
} else { | ||
return fromTimestamp(Timestamp.fromJSON(o)); | ||
} | ||
} | ||
|
||
// If you get a compile-error about 'Constructor<Long> and ... have no overlap', | ||
// add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'. | ||
if (util.Long !== Long) { | ||
util.Long = Long as any; | ||
configure(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.