feat(spanner): support for type UUID

Author: alkatrivedi

src/codec.ts

@@ -33,6 +33,7 @@ import {Big} from 'big.js';
 import {common as p} from 'protobufjs';
 import {google as spannerClient} from '../protos/protos';
 import {GoogleError} from 'google-gax';
+import * as uuid from 'uuid';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Value = any;
@@ -154,20 +155,6 @@ export class SpannerDate extends Date {
   }
 }
 
-/**
- * @typedef UUID
- * @see Spanner.uuid
- */
-export class UUID {
-  value: string;
-  constructor(value: string) {
-    this.value = value;
-  }
-  valueOf(): string {
-    return String(this.value);
-  }
-}
-
 /**
  * Using an abstract class to simplify checking for wrapped numbers.
  *
@@ -872,10 +859,6 @@ function decode(
         enumObject: columnMetadata as object,
       });
       break;
-    case spannerClient.spanner.v1.TypeCode.UUID:
-    case 'UUID':
-      decoded = new UUID(decoded);
-      break;
     case spannerClient.spanner.v1.TypeCode.FLOAT32:
     case 'FLOAT32':
       decoded = new Float32(decoded);
@@ -1016,10 +999,6 @@ function encodeValue(value: Value): Value {
     return value.value;
   }
 
-  if (value instanceof UUID) {
-    return value.value;
-  }
-
   if (value instanceof Struct) {
     return Array.from(value).map(field => encodeValue(field.value));
   }
@@ -1098,6 +1077,7 @@ interface FieldType extends Type {
 /**
  * @typedef {object} ParamType
  * @property {string} type The param type. Must be one of the following:
+ *     - uuid
  *     - float32
  *     - float64
  *     - int64
@@ -1136,10 +1116,6 @@ function getType(value: Value): Type {
   const isSpecialNumber =
     isInfinite(value) || (isNumber(value) && isNaN(value));
 
-  if (value instanceof UUID) {
-    return {type: 'uuid'};
-  }
-
   if (value instanceof Float32) {
     return {type: 'float32'};
   }
@@ -1184,6 +1160,10 @@ function getType(value: Value): Type {
     return {type: 'bool'};
   }
 
+  if (uuid.validate(value)) {
+    return {type: 'unspecified'};
+  }
+  
   if (isString(value)) {
     return {type: 'string'};
   }
@@ -1339,7 +1319,6 @@ export const codec = {
   convertProtoTimestampToDate,
   createTypeObject,
   SpannerDate,
-  UUID,
   Float32,
   Float,
   Int,

src/index.ts

@@ -27,7 +27,6 @@ import {EventEmitter} from 'events';
 import * as through from 'through2';
 import {
   codec,
-  UUID,
   Float32,
   Float,
   Int,
@@ -1990,23 +1989,6 @@ class Spanner extends GrpcService {
     return new PreciseDate(value as number);
   }
 
-  /**
-   * Helper function to get a Cloud Spanner UUID object.
-   *
-   * @param {string} value The uuid as a string.
-   * @returns {UUID}
-   *
-   * @example
-   * ```
-   * const {Spanner} = require('@google-cloud/spanner');
-   * const value = uuidv4();
-   * const uuid = Spanner.uuid(value);
-   * ```
-   */
-  static uuid(value): UUID {
-    return new codec.UUID(value);
-  }
-
   /**
    * Helper function to get a Cloud Spanner Float32 object.
    *
@@ -2238,7 +2220,6 @@ process.on('beforeExit', () => {
 promisifyAll(Spanner, {
   exclude: [
     'date',
-    'uuid',
     'float32',
     'float',
     'instance',

src/transaction.ts

@@ -1728,7 +1728,17 @@ export class Snapshot extends EventEmitter {
     if (!isEmpty(typeMap)) {
       Object.keys(typeMap).forEach(param => {
         const type = typeMap[param];
-        paramTypes[param] = codec.createTypeObject(type);
+        const typeObject = codec.createTypeObject(type);
+        if (type.child) {
+          if (
+            typeObject.code === 'ARRAY' &&
+            typeObject.arrayElementType?.code !== 'TYPE_CODE_UNSPECIFIED'
+          ) {
+            paramTypes[param] = codec.createTypeObject(type);
+          }
+        } else if (typeObject.code !== 'TYPE_CODE_UNSPECIFIED') {
+          paramTypes[param] = codec.createTypeObject(type);
+        }
       });
     }