From 634b263ed20d6258c0cee7fab390a629d9f8a4ad Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sat, 16 Dec 2023 09:37:47 +1300 Subject: [PATCH] Generalize constraints on keys in KeyedDictionary --- implementations/javascript/packages/core/src/dictionary.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/implementations/javascript/packages/core/src/dictionary.ts b/implementations/javascript/packages/core/src/dictionary.ts index a2db039..570614b 100644 --- a/implementations/javascript/packages/core/src/dictionary.ts +++ b/implementations/javascript/packages/core/src/dictionary.ts @@ -1,17 +1,17 @@ -import { Encoder, canonicalEncode, canonicalString } from "./encoder"; +import { Encodable, Encoder, canonicalEncode, canonicalString } from "./encoder"; import { Tag } from "./constants"; import { FlexMap, FlexSet, _iterMap } from "./flex"; import { Value } from "./values"; import { Bytes } from './bytes'; import { GenericEmbedded } from "./embedded"; import type { Preservable } from "./encoder"; -import type { Writer, PreserveWritable } from "./writer"; +import type { Writable, Writer, PreserveWritable } from "./writer"; import { annotations, Annotated } from "./annotated"; export type DictionaryType = 'Dictionary' | 'Set'; export const DictionaryType = Symbol.for('DictionaryType'); -export class KeyedDictionary, V, T = GenericEmbedded> extends FlexMap +export class KeyedDictionary & Writable), V, T = GenericEmbedded> extends FlexMap implements Preservable, PreserveWritable { get [DictionaryType](): DictionaryType {