Skip to content

Commit

Permalink
fix: prefix and suffixes were not being applied to to/fromTimestamp r…
Browse files Browse the repository at this point in the history
…esulting in compile error (#1118)
  • Loading branch information
halkeye authored Oct 4, 2024
1 parent 6a8188e commit 22c2905
Show file tree
Hide file tree
Showing 9 changed files with 492 additions and 4 deletions.
7 changes: 7 additions & 0 deletions integration/affixes/affixes.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
syntax = "proto3";
import "google/protobuf/wrappers.proto";
import "google/protobuf/timestamp.proto";

package affixes;

Expand All @@ -15,3 +17,8 @@ enum AwesomeEnum {

service AwesomeService {
}

message Google {
google.protobuf.UInt64Value guint64 = 13;
google.protobuf.Timestamp timestamp = 14;
}
109 changes: 109 additions & 0 deletions integration/affixes/affixes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

/* eslint-disable */
import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
import { PrefixTimestampSuffix } from "./google/protobuf/timestamp";
import { PrefixUInt64ValueSuffix } from "./google/protobuf/wrappers";

export const protobufPackage = "affixes";

Expand Down Expand Up @@ -51,6 +53,11 @@ export interface PrefixAwesomeMessageSuffix {
export interface PrefixAwesomeMessage_InnerSuffix {
}

export interface PrefixGoogleSuffix {
guint64: number | undefined;
timestamp: Date | undefined;
}

function createBasePrefixAwesomeMessageSuffix(): PrefixAwesomeMessageSuffix {
return {};
}
Expand Down Expand Up @@ -141,6 +148,82 @@ export const PrefixAwesomeMessage_InnerSuffix: MessageFns<PrefixAwesomeMessage_I
},
};

function createBasePrefixGoogleSuffix(): PrefixGoogleSuffix {
return { guint64: undefined, timestamp: undefined };
}

export const PrefixGoogleSuffix: MessageFns<PrefixGoogleSuffix> = {
encode(message: PrefixGoogleSuffix, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
if (message.guint64 !== undefined) {
PrefixUInt64ValueSuffix.encode({ value: message.guint64! }, writer.uint32(106).fork()).join();
}
if (message.timestamp !== undefined) {
PrefixTimestampSuffix.encode(toTimestamp(message.timestamp), writer.uint32(114).fork()).join();
}
return writer;
},

decode(input: BinaryReader | Uint8Array, length?: number): PrefixGoogleSuffix {
const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
let end = length === undefined ? reader.len : reader.pos + length;
const message = createBasePrefixGoogleSuffix();
while (reader.pos < end) {
const tag = reader.uint32();
switch (tag >>> 3) {
case 13: {
if (tag !== 106) {
break;
}

message.guint64 = PrefixUInt64ValueSuffix.decode(reader, reader.uint32()).value;
continue;
}
case 14: {
if (tag !== 114) {
break;
}

message.timestamp = fromTimestamp(PrefixTimestampSuffix.decode(reader, reader.uint32()));
continue;
}
}
if ((tag & 7) === 4 || tag === 0) {
break;
}
reader.skip(tag & 7);
}
return message;
},

fromJSON(object: any): PrefixGoogleSuffix {
return {
guint64: isSet(object.guint64) ? Number(object.guint64) : undefined,
timestamp: isSet(object.timestamp) ? fromJsonTimestamp(object.timestamp) : undefined,
};
},

toJSON(message: PrefixGoogleSuffix): unknown {
const obj: any = {};
if (message.guint64 !== undefined) {
obj.guint64 = message.guint64;
}
if (message.timestamp !== undefined) {
obj.timestamp = message.timestamp.toISOString();
}
return obj;
},

create<I extends Exact<DeepPartial<PrefixGoogleSuffix>, I>>(base?: I): PrefixGoogleSuffix {
return PrefixGoogleSuffix.fromPartial(base ?? ({} as any));
},
fromPartial<I extends Exact<DeepPartial<PrefixGoogleSuffix>, I>>(object: I): PrefixGoogleSuffix {
const message = createBasePrefixGoogleSuffix();
message.guint64 = object.guint64 ?? undefined;
message.timestamp = object.timestamp ?? undefined;
return message;
},
};

export interface AwesomeService {
}

Expand Down Expand Up @@ -170,6 +253,32 @@ type KeysOfUnion<T> = T extends T ? keyof T : never;
export type Exact<P, I extends P> = P extends Builtin ? P
: P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };

function toTimestamp(date: Date): PrefixTimestampSuffix {
const seconds = Math.trunc(date.getTime() / 1_000);
const nanos = (date.getTime() % 1_000) * 1_000_000;
return { seconds, nanos };
}

function fromTimestamp(t: PrefixTimestampSuffix): Date {
let millis = (t.seconds || 0) * 1_000;
millis += (t.nanos || 0) / 1_000_000;
return new globalThis.Date(millis);
}

function fromJsonTimestamp(o: any): Date {
if (o instanceof globalThis.Date) {
return o;
} else if (typeof o === "string") {
return new globalThis.Date(o);
} else {
return fromTimestamp(PrefixTimestampSuffix.fromJSON(o));
}
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}

export interface MessageFns<T> {
encode(message: T, writer?: BinaryWriter): BinaryWriter;
decode(input: BinaryReader | Uint8Array, length?: number): T;
Expand Down
226 changes: 226 additions & 0 deletions integration/suffix-type/google/protobuf/timestamp.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
// source: google/protobuf/timestamp.proto

/* eslint-disable */
import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";

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 GRPCPTimestampGRPCS {
/**
* 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;
}

function createBaseGRPCPTimestampGRPCS(): GRPCPTimestampGRPCS {
return { seconds: 0, nanos: 0 };
}

export const GRPCPTimestampGRPCS: MessageFns<GRPCPTimestampGRPCS> = {
encode(message: GRPCPTimestampGRPCS, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
if (message.seconds !== 0) {
writer.uint32(8).int64(message.seconds);
}
if (message.nanos !== 0) {
writer.uint32(16).int32(message.nanos);
}
return writer;
},

decode(input: BinaryReader | Uint8Array, length?: number): GRPCPTimestampGRPCS {
const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
let end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseGRPCPTimestampGRPCS();
while (reader.pos < end) {
const tag = reader.uint32();
switch (tag >>> 3) {
case 1: {
if (tag !== 8) {
break;
}

message.seconds = longToNumber(reader.int64());
continue;
}
case 2: {
if (tag !== 16) {
break;
}

message.nanos = reader.int32();
continue;
}
}
if ((tag & 7) === 4 || tag === 0) {
break;
}
reader.skip(tag & 7);
}
return message;
},

fromJSON(object: any): GRPCPTimestampGRPCS {
return {
seconds: isSet(object.seconds) ? globalThis.Number(object.seconds) : 0,
nanos: isSet(object.nanos) ? globalThis.Number(object.nanos) : 0,
};
},

toJSON(message: GRPCPTimestampGRPCS): unknown {
const obj: any = {};
if (message.seconds !== 0) {
obj.seconds = Math.round(message.seconds);
}
if (message.nanos !== 0) {
obj.nanos = Math.round(message.nanos);
}
return obj;
},

create<I extends Exact<DeepPartial<GRPCPTimestampGRPCS>, I>>(base?: I): GRPCPTimestampGRPCS {
return GRPCPTimestampGRPCS.fromPartial(base ?? ({} as any));
},
fromPartial<I extends Exact<DeepPartial<GRPCPTimestampGRPCS>, I>>(object: I): GRPCPTimestampGRPCS {
const message = createBaseGRPCPTimestampGRPCS();
message.seconds = object.seconds ?? 0;
message.nanos = object.nanos ?? 0;
return message;
},
};

type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;

export type DeepPartial<T> = T extends Builtin ? T
: T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
: T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
: T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
: Partial<T>;

type KeysOfUnion<T> = T extends T ? keyof T : never;
export type Exact<P, I extends P> = P extends Builtin ? P
: P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };

function longToNumber(int64: { toString(): string }): number {
const num = globalThis.Number(int64.toString());
if (num > globalThis.Number.MAX_SAFE_INTEGER) {
throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
}
if (num < globalThis.Number.MIN_SAFE_INTEGER) {
throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
}
return num;
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}

export interface MessageFns<T> {
encode(message: T, writer?: BinaryWriter): BinaryWriter;
decode(input: BinaryReader | Uint8Array, length?: number): T;
fromJSON(object: any): T;
toJSON(message: T): unknown;
create<I extends Exact<DeepPartial<T>, I>>(base?: I): T;
fromPartial<I extends Exact<DeepPartial<T>, I>>(object: I): T;
}
1 change: 1 addition & 0 deletions integration/suffix-type/parameters.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
typeSuffix=GRPCS,typePrefix=GRPCP
Loading

0 comments on commit 22c2905

Please sign in to comment.