-
Notifications
You must be signed in to change notification settings - Fork 345
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.
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 support for useDate=false #211
Merged
+372
−8
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
219 changes: 219 additions & 0 deletions
219
integration/use-date-false/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,219 @@ | ||
/* eslint-disable */ | ||
import * as Long from 'long'; | ||
import { util, configure, Writer, Reader } from 'protobufjs/minimal'; | ||
|
||
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 Uint8Array ? new Reader(input) : input; | ||
let end = length === undefined ? reader.len : reader.pos + length; | ||
const message = globalThis.Object.create(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 = globalThis.Object.create(baseTimestamp) as Timestamp; | ||
if (object.seconds !== undefined && object.seconds !== null) { | ||
message.seconds = Number(object.seconds); | ||
} else { | ||
message.seconds = 0; | ||
} | ||
if (object.nanos !== undefined && object.nanos !== null) { | ||
message.nanos = Number(object.nanos); | ||
} else { | ||
message.nanos = 0; | ||
} | ||
return message; | ||
}, | ||
|
||
fromPartial(object: DeepPartial<Timestamp>): Timestamp { | ||
const message = { ...baseTimestamp } as Timestamp; | ||
if (object.seconds !== undefined && object.seconds !== null) { | ||
message.seconds = object.seconds; | ||
} else { | ||
message.seconds = 0; | ||
} | ||
if (object.nanos !== undefined && object.nanos !== null) { | ||
message.nanos = object.nanos; | ||
} else { | ||
message.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; | ||
}, | ||
}; | ||
|
||
declare var self: any | undefined; | ||
declare var window: 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 | 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 (util.Long !== Long) { | ||
util.Long = Long as any; | ||
configure(); | ||
} |
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,7 @@ | ||
syntax = "proto3"; | ||
|
||
import "google/protobuf/timestamp.proto"; | ||
|
||
message Metadata { | ||
google.protobuf.Timestamp last_edited = 1; | ||
} |
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,108 @@ | ||
/* eslint-disable */ | ||
import { Timestamp } from './google/protobuf/timestamp'; | ||
import { Writer, Reader } from 'protobufjs/minimal'; | ||
|
||
export const protobufPackage = ''; | ||
|
||
export interface Metadata { | ||
lastEdited: Timestamp | undefined; | ||
} | ||
|
||
const baseMetadata: object = {}; | ||
|
||
export const Metadata = { | ||
encode(message: Metadata, writer: Writer = Writer.create()): Writer { | ||
if (message.lastEdited !== undefined) { | ||
Timestamp.encode(message.lastEdited, writer.uint32(10).fork()).ldelim(); | ||
} | ||
return writer; | ||
}, | ||
|
||
decode(input: Reader | Uint8Array, length?: number): Metadata { | ||
const reader = input instanceof Uint8Array ? new Reader(input) : input; | ||
let end = length === undefined ? reader.len : reader.pos + length; | ||
const message = globalThis.Object.create(baseMetadata) as Metadata; | ||
while (reader.pos < end) { | ||
const tag = reader.uint32(); | ||
switch (tag >>> 3) { | ||
case 1: | ||
message.lastEdited = Timestamp.decode(reader, reader.uint32()); | ||
break; | ||
default: | ||
reader.skipType(tag & 7); | ||
break; | ||
} | ||
} | ||
return message; | ||
}, | ||
|
||
fromJSON(object: any): Metadata { | ||
const message = globalThis.Object.create(baseMetadata) as Metadata; | ||
if (object.lastEdited !== undefined && object.lastEdited !== null) { | ||
message.lastEdited = fromJsonTimestamp(object.lastEdited); | ||
} else { | ||
message.lastEdited = undefined; | ||
} | ||
return message; | ||
}, | ||
|
||
fromPartial(object: DeepPartial<Metadata>): Metadata { | ||
const message = { ...baseMetadata } as Metadata; | ||
if (object.lastEdited !== undefined && object.lastEdited !== null) { | ||
message.lastEdited = Timestamp.fromPartial(object.lastEdited); | ||
} else { | ||
message.lastEdited = undefined; | ||
} | ||
return message; | ||
}, | ||
|
||
toJSON(message: Metadata): unknown { | ||
const obj: any = {}; | ||
message.lastEdited !== undefined && | ||
(obj.lastEdited = message.lastEdited !== undefined ? fromTimestamp(message.lastEdited).toISOString() : null); | ||
return obj; | ||
}, | ||
}; | ||
|
||
declare var self: any | undefined; | ||
declare var window: 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 | 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): Timestamp { | ||
if (o instanceof Date) { | ||
return toTimestamp(o); | ||
} else if (typeof o === 'string') { | ||
return toTimestamp(new Date(o)); | ||
} else { | ||
return Timestamp.fromJSON(o); | ||
} | ||
} |
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 @@ | ||
useDate=false |
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,13 @@ | ||
import { Metadata } from './metadata'; | ||
|
||
describe('useDate=false', () => { | ||
it('generates types that compile and encode', () => { | ||
const output = Metadata.encode({ | ||
lastEdited: { | ||
seconds: 123456789, | ||
nanos: 234567890, | ||
} | ||
}).finish(); | ||
expect(output.length).toBeGreaterThan(8); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a great small repro, thanks!