diff --git a/handwritten/bigtable/src/execute-query/values.ts b/handwritten/bigtable/src/execute-query/values.ts index 258a25d11268..f5ee1cab81d8 100644 --- a/handwritten/bigtable/src/execute-query/values.ts +++ b/handwritten/bigtable/src/execute-query/values.ts @@ -38,10 +38,7 @@ export type ExecuteQueryParameterValue = | null; export type SqlValue = - | ExecuteQueryParameterValue - | Struct - | Array - | BigtableMap; + ExecuteQueryParameterValue | Struct | Array | BigtableMap; /** * A custom class created to allow setting year, month and date to 0. @@ -117,9 +114,10 @@ type MapKey = bigint | string | Uint8Array | null; // internal representation of the map contains the original key and value tuple type _MapValue = [MapKey, SqlValue]; -export class EncodedKeyMap - implements Map -{ +export class EncodedKeyMap implements ReadonlyMap< + bigint | string | Uint8Array | null, + SqlValue +> { private map_impl: Map; /** * Class representing a Map Value returned by ExecuteQuery. Native JS Map diff --git a/handwritten/bigtable/test/base64keymap.ts b/handwritten/bigtable/test/base64keymap.ts index 7446126bff45..527319240f45 100644 --- a/handwritten/bigtable/test/base64keymap.ts +++ b/handwritten/bigtable/test/base64keymap.ts @@ -180,5 +180,22 @@ describe('Bigtable/EncodedKeyMap', () => { assert.deepStrictEqual(resultForEach[1][0], 'stringKey1'); assert.deepStrictEqual(resultForEach[1][1], 'valueForString1'); }); + it('implements ReadonlyMap without adding extra methods', () => { + const map = new EncodedKeyMap([ + [Buffer.from('existingBuffer'), 'initialBufferValue'], + ['existingNullValue', null], + ]); + const readonlyMap: ReadonlyMap< + string | bigint | Uint8Array | null, + SqlValue + > = map; + assert.strictEqual( + readonlyMap.get(Buffer.from('existingBuffer')), + 'initialBufferValue', + ); + assert.strictEqual(readonlyMap.get('existingNullValue'), null); + assert.strictEqual('getOrInsert' in map, false); + assert.strictEqual('getOrInsertComputed' in map, false); + }); }); });