googleapis · crwilcox · Nov 14, 2019 · Oct 13, 2019 · Oct 13, 2019 · Oct 16, 2019
diff --git a/src/entity.ts b/src/entity.ts
@@ -17,7 +17,7 @@
 import arrify = require('arrify');
 import * as extend from 'extend';
 import * as is from 'is';
-import {Query, QueryProto} from './query';
+import {Query, QueryProto, IntegerTypeCastOptions} from './query';
 import {PathType} from '.';
 import * as Protobuf from 'protobufjs';
 import * as path from 'path';
@@ -111,16 +111,36 @@ export namespace entity {
    *
    * @class
    * @param {number|string} value The integer value.
+   * @param {object} [typeCastOptions] Configuration to convert
+   *     values of `integerValue` type to a custom value. Must provide an
+   *     `integerTypeCastFunction` to handle `integerValue` conversion.
+   * @param {function} typeCastOptions.integerTypeCastFunction A custom user
+   *     provided function to convert `integerValue`.
+   * @param {sting|string[]} [typeCastOptions.properties] `Entity` property
+   *     names to be converted using `integerTypeCastFunction`.
    *
    * @example
    * const {Datastore} = require('@google-cloud/datastore');
    * const datastore = new Datastore();
    * const anInt = datastore.int(7);
    */
-  export class Int {
+  export class Int extends Number {
     type: string;
     value: string;
-    constructor(value: number | string) {
+    typeCastFunction?: Function;
+    typeCastProperties?: string[];
+    private _entityPropertyName: string | undefined;
+    constructor(
+      value: number | string | ValueProto,
+      typeCastOptions?: IntegerTypeCastOptions
+    ) {
+      super(typeof value === 'object' ? value.integerValue : value);
+      this._entityPropertyName =
+        typeof value === 'object' ? value.propertyName : undefined;
+      this.value =
+        typeof value === 'object'
+          ? value.integerValue.toString()
+          : value.toString();
       /**
        * @name Int#type
        * @type {string}
@@ -130,7 +150,46 @@ export namespace entity {
        * @name Int#value
        * @type {string}
        */
-      this.value = value.toString();
+      if (typeCastOptions) {
+        this.typeCastFunction = typeCastOptions.integerTypeCastFunction;
+        if (typeof typeCastOptions.integerTypeCastFunction !== 'function') {
+          throw new Error(
+            `integerTypeCastFunction is not a function or is not provided.`
+          );
+        }
+
+        this.typeCastProperties = typeCastOptions.properties
+          ? arrify(typeCastOptions.properties)
+          : undefined;
+      }
+    }
+    // tslint:disable-next-line no-any
+    valueOf(): any {
+      let shouldCustomCast = this.typeCastFunction ? true : false;
+      if (
+        this.typeCastProperties &&
+        !this.typeCastProperties.includes(this._entityPropertyName!)
+      ) {
+        shouldCustomCast = false;
+      }
+
+      if (shouldCustomCast) {
+        try {
+          return this.typeCastFunction!(this.value);
+        } catch (error) {
+          error.message = `integerTypeCastFunction threw an error:\n\n - ${error.message}`;
+          throw error;
+        }
+      } else {
+        return decodeIntegerValue({
+          integerValue: this.value,
+          propertyName: this._entityPropertyName,
+        });
+      }
+    }
+
+    toJSON(): Json {
+      return {type: this.type, value: this.value};
     }
   }
 
@@ -376,11 +435,49 @@ export namespace entity {
     return value instanceof entity.Key;
   }
 
+  /**
+   * Convert a protobuf `integerValue`.
+   *
+   * @private
+   * @param {object} value The `integerValue` to convert.
+   */
+  function decodeIntegerValue(value: ValueProto) {
+    const num = Number(value.integerValue);
+    if (!Number.isSafeInteger(num)) {
+      throw new Error(
+        'We attempted to return all of the numeric values, but ' +
+          (value.propertyName ? value.propertyName + ' ' : '') +
+          'value ' +
+          value.integerValue +
+          " is out of bounds of 'Number.MAX_SAFE_INTEGER'.\n" +
+          "Please consider passing 'options.wrapNumbersOptions=true' or\n" +
+          "'options.wrapNumbersOptions' as\n" +
+          '{\n' +
+          '  integerTypeCastFunction: provide <your_custom_function>\n' +
+          '  properties: optionally specify property name(s) to be cutom casted' +
+          '}\n' +
+          'to prevent this error.'
+      );
+    }
+    return num;
+  }
+
+  /**
+   * @typedef {object} IntegerTypeCastOptions Configuration to convert
+   *     values of `integerValue` type to a custom value. Must provide an
+   *     `integerTypeCastFunction` to handle `integerValue` conversion.
+   * @property {function} integerTypeCastFunction A custom user
+   *     provided function to convert `integerValue`.
+   * @property {string | string[]} [properties] `Entity` property
+   *     names to be converted using `integerTypeCastFunction`.
+   */
   /**
    * Convert a protobuf Value message to its native value.
    *
    * @private
    * @param {object} valueProto The protobuf Value message to convert.
+   * @param {boolean | IntegerTypeCastOptions} [wrapNumbersOptions=false] Wrap values of integerValue type in
+   *     {@link Datastore#Int} object.
    * @returns {*}
    *
    * @example
@@ -399,13 +496,19 @@ export namespace entity {
    * });
    * // <Buffer 68 65 6c 6c 6f>
    */
-  export function decodeValueProto(valueProto: ValueProto) {
+  export function decodeValueProto(
+    valueProto: ValueProto,
+    wrapNumbersOptions?: boolean | IntegerTypeCastOptions
+  ) {
     const valueType = valueProto.valueType!;
     const value = valueProto[valueType];
 
     switch (valueType) {
       case 'arrayValue': {
-        return value.values.map(entity.decodeValueProto);
+        // tslint:disable-next-line no-any
+        return value.values.map((val: any) =>
+          entity.decodeValueProto(val, wrapNumbersOptions)
+        );
       }
 
       case 'blobValue': {
@@ -421,11 +524,18 @@ export namespace entity {
       }
 
       case 'integerValue': {
-        return Number(value);
+        return wrapNumbersOptions
+          ? new entity.Int(
+              valueProto,
+              typeof wrapNumbersOptions === 'object'
+                ? (wrapNumbersOptions as IntegerTypeCastOptions)
+                : undefined
+            )
+          : decodeIntegerValue(valueProto);
       }
 
       case 'entityValue': {
-        return entity.entityFromEntityProto(value);
+        return entity.entityFromEntityProto(value, wrapNumbersOptions);
       }
 
       case 'keyValue': {
@@ -554,6 +664,8 @@ export namespace entity {
    *
    * @private
    * @param {object} entityProto The protocol entity object to convert.
+   * @param {boolean | IntegerTypeCastOptions} [wrapNumbersOptions=false] Wrap values of integerValue type in
+   *     {@link Datastore#Int} object.
    * @returns {object}
    *
    * @example
@@ -574,15 +686,21 @@ export namespace entity {
    * // }
    */
   // tslint:disable-next-line no-any
-  export function entityFromEntityProto(entityProto: EntityProto): any {
+  export function entityFromEntityProto(
+    entityProto: EntityProto,
+    wrapNumbersOptions?: boolean | IntegerTypeCastOptions
+  ) {
     // tslint:disable-next-line no-any
     const entityObject: any = {};
     const properties = entityProto.properties || {};
 
     // tslint:disable-next-line forin
     for (const property in properties) {
       const value = properties[property];
-      entityObject[property] = entity.decodeValueProto(value);
+      entityObject[property] = entity.decodeValueProto(
+        value,
+        wrapNumbersOptions
+      );
     }
 
     return entityObject;
@@ -768,7 +886,8 @@ export namespace entity {
    * @param {object[]} results The response array.
    * @param {object} results.entity An entity object.
    * @param {object} results.entity.key The entity's key.
-   * @returns {object[]}
+   * @param {boolean | IntegerTypeCastOptions} [wrapNumbersOptions=false] Wrap values of integerValue type in
+   *     {@link Datastore#Int} object.
    *
    * @example
    * request_('runQuery', {}, (err, response) => {
@@ -782,9 +901,15 @@ export namespace entity {
    *   //
    * });
    */
-  export function formatArray(results: ResponseResult[]) {
+  export function formatArray(
+    results: ResponseResult[],
+    wrapNumbersOptions?: boolean | IntegerTypeCastOptions
+  ) {
     return results.map(result => {
-      const ent = entity.entityFromEntityProto(result.entity!);
+      const ent = entity.entityFromEntityProto(
+        result.entity!,
+        wrapNumbersOptions
+      );
       ent[entity.KEY_SYMBOL] = entity.keyFromKeyProto(result.entity!.key!);
       return ent;
     });
@@ -1274,6 +1399,7 @@ export interface ValueProto {
   values?: ValueProto[];
   // tslint:disable-next-line no-any
   value?: any;
+  propertyName?: string;
 }
 
 export interface EntityProto {
@@ -1305,3 +1431,7 @@ export interface EntityObject {
   data: {[k: string]: Entity};
   excludeFromIndexes: string[];
 }
+
+export interface Json {
+  [field: string]: string;
+}
diff --git a/src/query.ts b/src/query.ts
@@ -397,6 +397,10 @@ class Query {
    *     If not specified, default values are chosen by Datastore for the
    *     operation. Learn more about strong and eventual consistency
    *     [here](https://cloud.google.com/datastore/docs/articles/balancing-strong-and-eventual-consistency-with-google-cloud-datastore).
+   * @param {object} [options.gaxOptions] Request configuration options, outlined
+   *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
+   * @param {boolean | IntegerTypeCastOptions} [options.wrapNumbersOptions=false]
+   *     Wrap values of integerValue type in {@link Datastore#Int} object.
    * @param {function} [callback] The callback function. If omitted, a readable
    *     stream instance is returned.
    * @param {?error} callback.err An error returned while making this request
@@ -517,9 +521,15 @@ export interface QueryProto {
  */
 export {Query};
 
+export interface IntegerTypeCastOptions {
+  integerTypeCastFunction: Function;
+  properties?: string | string[];
+}
+
 export interface RunQueryOptions {
   consistency?: 'strong' | 'eventual';
   gaxOptions?: CallOptions;
+  wrapNumbersOptions?: boolean | IntegerTypeCastOptions;
 }
 
 export interface RunQueryCallback {

diff --git a/src/request.ts b/src/request.ts
@@ -290,7 +290,10 @@ class DatastoreRequest {
             return;
           }
 
-          const entities = entity.formatArray(resp!.found! as ResponseResult[]);
+          const entities = entity.formatArray(
+            resp!.found! as ResponseResult[],
+            options.wrapNumbersOptions
+          );
           const nextKeys = (resp!.deferred || [])
             .map(entity.keyFromKeyProto)
             .map(entity.keyToKeyProto);
@@ -432,6 +435,8 @@ class DatastoreRequest {
    *     [here](https://cloud.google.com/datastore/docs/articles/balancing-strong-and-eventual-consistency-with-google-cloud-datastore).
    * @param {object} [options.gaxOptions] Request configuration options, outlined
    *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
+   * @param {boolean | IntegerTypeCastOptions} [options.wrapNumbersOptions=false]
+   *     Wrap values of integerValue type in {@link Datastore#Int} object.
    * @param {function} callback The callback function.
    * @param {?error} callback.err An error returned while making this request
    * @param {object|object[]} callback.entity The entity object(s) which match
@@ -571,7 +576,6 @@ class DatastoreRequest {
    * that uses the end cursor from the previous query as the starting cursor for
    * the next query. You can pass that object back to this method to see if more
    * results exist.
-   *
    * @param {Query} query Query object.
    * @param {object} [options] Optional configuration.
    * @param {string} [options.consistency] Specify either `strong` or `eventual`.
@@ -580,6 +584,8 @@ class DatastoreRequest {
    *     [here](https://cloud.google.com/datastore/docs/articles/balancing-strong-and-eventual-consistency-with-google-cloud-datastore).
    * @param {object} [options.gaxOptions] Request configuration options, outlined
    *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
+   * @param {boolean | IntegerTypeCastOptions} [options.wrapNumbersOptions=false]
+   *     Wrap values of integerValue type in {@link Datastore#Int} object.
    * @param {function} [callback] The callback function. If omitted, a readable
    *     stream instance is returned.
    * @param {?error} callback.err An error returned while making this request
@@ -764,7 +770,10 @@ class DatastoreRequest {
       let entities: Entity[] = [];
 
       if (resp.batch.entityResults) {
-        entities = entity.formatArray(resp.batch.entityResults);
+        entities = entity.formatArray(
+          resp.batch.entityResults,
+          options.wrapNumbersOptions
+        );
       }
 
       // Emit each result right away, then get the rest if necessary.
@@ -1400,10 +1409,7 @@ export interface AllocateIdsOptions {
   allocations?: number;
   gaxOptions?: CallOptions;
 }
-export interface CreateReadStreamOptions {
-  consistency?: string;
-  gaxOptions?: CallOptions;
-}
+export interface CreateReadStreamOptions extends RunQueryOptions {}
 export interface GetCallback {
   (err?: Error | null, entity?: Entities): void;
 }