fix(types): address type incompatibilities, regen types

rvagg · Dec 4, 2024 · e9b9260 · e9b9260
1 parent 98bddb9
commit e9b9260
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 28 deletions.
diff --git a/lib/json/encode.js b/lib/json/encode.js
@@ -305,6 +305,7 @@ const defaultEncodeOptions = { addBreakTokens: true, mapSorter }
  */
 function encode (data, options) {
   options = Object.assign({}, defaultEncodeOptions, options)
+  // @ts-ignore TokenTypeEncoder[] requires compareTokens() on each encoder, we don't use them here
   return encodeCustom(data, new JSONEncoder(), options)
 }
 

diff --git a/types/lib/bin.d.ts.map b/types/lib/bin.d.ts.map
diff --git a/types/lib/bl.d.ts b/types/lib/bl.d.ts
@@ -2,7 +2,7 @@ export class Bl {
     /**
      * @param {number} [chunkSize]
      */
-    constructor(chunkSize?: number | undefined);
+    constructor(chunkSize?: number);
     chunkSize: number;
     /** @type {number} */
     cursor: number;
@@ -21,6 +21,6 @@ export class Bl {
      * @param {boolean} [reset]
      * @returns {Uint8Array}
      */
-    toBytes(reset?: boolean | undefined): Uint8Array;
+    toBytes(reset?: boolean): Uint8Array;
 }
 //# sourceMappingURL=bl.d.ts.map
diff --git a/types/lib/bl.d.ts.map b/types/lib/bl.d.ts.map
diff --git a/types/lib/byte-utils.d.ts b/types/lib/byte-utils.d.ts
@@ -21,14 +21,14 @@ export const useBuffer: boolean;
  * @param {number} end
  */
 export function toString(bytes: Uint8Array, start: number, end: number): string;
-export const fromString: ((string: string) => number[] | Buffer) | ((string: string) => Uint8Array | number[]);
+export const fromString: ((string: string) => number[] | Buffer<ArrayBuffer>) | ((string: string) => Uint8Array<ArrayBufferLike> | number[]);
 export function fromArray(arr: number[]): Uint8Array;
 /**
  * @param {Uint8Array} bytes
  * @param {number} start
  * @param {number} end
  */
-export function slice(bytes: Uint8Array, start: number, end: number): Uint8Array;
+export function slice(bytes: Uint8Array, start: number, end: number): Uint8Array<ArrayBuffer>;
 /**
  * @param {Uint8Array[]} chunks
  * @param {number} length

diff --git a/types/lib/byte-utils.d.ts.map b/types/lib/byte-utils.d.ts.map
diff --git a/types/lib/common.d.ts.map b/types/lib/common.d.ts.map
diff --git a/types/lib/decode.d.ts b/types/lib/decode.d.ts
@@ -11,7 +11,7 @@ export class Tokeniser implements DecodeTokenizer {
      */
     constructor(data: Uint8Array, options?: DecodeOptions);
     _pos: number;
-    data: Uint8Array;
+    data: Uint8Array<ArrayBufferLike>;
     options: import("../interface").DecodeOptions;
     pos(): number;
     done(): boolean;
@@ -28,13 +28,13 @@ export function tokensToObject(tokeniser: DecodeTokenizer, options: DecodeOption
  * @param {DecodeOptions} [options]
  * @returns {any}
  */
-export function decode(data: Uint8Array, options?: import("../interface").DecodeOptions | undefined): any;
+export function decode(data: Uint8Array, options?: DecodeOptions): any;
 /**
  * @param {Uint8Array} data
  * @param {DecodeOptions} [options]
  * @returns {[any, Uint8Array]}
  */
-export function decodeFirst(data: Uint8Array, options?: import("../interface").DecodeOptions | undefined): [any, Uint8Array];
+export function decodeFirst(data: Uint8Array, options?: DecodeOptions): [any, Uint8Array];
 declare const BREAK: unique symbol;
 declare const DONE: unique symbol;
 export {};

diff --git a/types/lib/decode.d.ts.map b/types/lib/decode.d.ts.map
diff --git a/types/lib/diagnostic.d.ts b/types/lib/diagnostic.d.ts
@@ -2,7 +2,7 @@
  * @param {Uint8Array} inp
  * @param {number} [width]
  */
-export function tokensToDiagnostic(inp: Uint8Array, width?: number | undefined): Generator<string, void, unknown>;
+export function tokensToDiagnostic(inp: Uint8Array, width?: number): Generator<string, void, unknown>;
 /**
  * Convert an input string formatted as CBOR diagnostic output into binary CBOR form.
  * @param {string} input

diff --git a/types/lib/diagnostic.d.ts.map b/types/lib/diagnostic.d.ts.map
diff --git a/types/lib/encode.d.ts b/types/lib/encode.d.ts
@@ -12,13 +12,13 @@ export type TokenOrNestedTokens = import("../interface").TokenOrNestedTokens;
  * @param {Reference} [refStack]
  * @returns {TokenOrNestedTokens}
  */
-export function objectToTokens(obj: any, options?: import("../interface").EncodeOptions | undefined, refStack?: import("../interface").Reference | undefined): TokenOrNestedTokens;
+export function objectToTokens(obj: any, options?: EncodeOptions, refStack?: Reference): TokenOrNestedTokens;
 /**
  * @param {any} data
  * @param {EncodeOptions} [options]
  * @returns {Uint8Array}
  */
-export function encode(data: any, options?: import("../interface").EncodeOptions | undefined): Uint8Array;
+export function encode(data: any, options?: EncodeOptions): Uint8Array;
 /**
  * @param {any} data
  * @param {TokenTypeEncoder[]} encoders

diff --git a/types/lib/encode.d.ts.map b/types/lib/encode.d.ts.map
diff --git a/types/lib/json/decode.d.ts b/types/lib/json/decode.d.ts
@@ -5,13 +5,13 @@ export type DecodeTokenizer = import("../../interface").DecodeTokenizer;
  * @param {DecodeOptions} [options]
  * @returns {any}
  */
-export function decode(data: Uint8Array, options?: import("../../interface").DecodeOptions | undefined): any;
+export function decode(data: Uint8Array, options?: DecodeOptions): any;
 /**
  * @param {Uint8Array} data
  * @param {DecodeOptions} [options]
  * @returns {[any, Uint8Array]}
  */
-export function decodeFirst(data: Uint8Array, options?: import("../../interface").DecodeOptions | undefined): [any, Uint8Array];
+export function decodeFirst(data: Uint8Array, options?: DecodeOptions): [any, Uint8Array];
 /**
  * @typedef {import('../../interface').DecodeOptions} DecodeOptions
  * @typedef {import('../../interface').DecodeTokenizer} DecodeTokenizer
@@ -26,7 +26,7 @@ export class Tokenizer implements DecodeTokenizer {
      */
     constructor(data: Uint8Array, options?: DecodeOptions);
     _pos: number;
-    data: Uint8Array;
+    data: Uint8Array<ArrayBufferLike>;
     options: import("../../interface").DecodeOptions;
     /** @type {string[]} */
     modeStack: string[];

diff --git a/types/lib/json/decode.d.ts.map b/types/lib/json/decode.d.ts.map
diff --git a/types/lib/json/encode.d.ts b/types/lib/json/encode.d.ts
@@ -6,5 +6,5 @@ export type Bl = import("../bl").Bl;
  * @param {EncodeOptions} [options]
  * @returns {Uint8Array}
  */
-export function encode(data: any, options?: import("../../interface").EncodeOptions | undefined): Uint8Array;
+export function encode(data: any, options?: EncodeOptions): Uint8Array;
 //# sourceMappingURL=encode.d.ts.map
diff --git a/types/lib/json/encode.d.ts.map b/types/lib/json/encode.d.ts.map
diff --git a/types/lib/length.d.ts b/types/lib/length.d.ts
@@ -9,7 +9,7 @@
  * @param {EncodeOptions} [options]
  * @returns {number}
  */
-export function encodedLength(data: any, options?: import("../interface").EncodeOptions | undefined): number;
+export function encodedLength(data: any, options?: EncodeOptions): number;
 /**
  * Calculate the byte length of the data as represented by the given tokens when
  * encoded as CBOR with the options provided.
@@ -20,7 +20,7 @@ export function encodedLength(data: any, options?: import("../interface").Encode
  * @param {TokenTypeEncoder[]} [encoders]
  * @param {EncodeOptions} [options]
  */
-export function tokensToLength(tokens: TokenOrNestedTokens, encoders?: import("../interface").TokenTypeEncoder[] | undefined, options?: import("../interface").EncodeOptions | undefined): number;
+export function tokensToLength(tokens: TokenOrNestedTokens, encoders?: TokenTypeEncoder[], options?: EncodeOptions): number;
 export type EncodeOptions = import("../interface").EncodeOptions;
 export type TokenTypeEncoder = import("../interface").TokenTypeEncoder;
 export type TokenOrNestedTokens = import("../interface").TokenOrNestedTokens;

diff --git a/types/lib/length.d.ts.map b/types/lib/length.d.ts.map
diff --git a/types/lib/token.d.ts b/types/lib/token.d.ts
@@ -41,7 +41,7 @@ export class Token {
      * @param {any} [value]
      * @param {number} [encodedLength]
      */
-    constructor(type: Type, value?: any, encodedLength?: number | undefined);
+    constructor(type: Type, value?: any, encodedLength?: number);
     type: Type;
     value: any;
     encodedLength: number | undefined;

diff --git a/types/lib/token.d.ts.map b/types/lib/token.d.ts.map