From f13238a5d2086cd87f3209704f8897f7f701d957 Mon Sep 17 00:00:00 2001 From: Alexander T Date: Fri, 15 Nov 2019 22:41:20 +0200 Subject: [PATCH] base-x: Provides its own types (#39654) * base-x: Provides its own types * add @types/base-x to bs58/v3 --- notNeededPackages.json | 6 ++++++ types/base-x/base-x-tests.ts | 10 ---------- types/base-x/index.d.ts | 21 --------------------- types/base-x/tsconfig.json | 23 ----------------------- types/base-x/tslint.json | 3 --- types/base-x/v1/base-x-tests.ts | 12 ------------ types/base-x/v1/index.d.ts | 21 --------------------- types/base-x/v1/tsconfig.json | 28 ---------------------------- types/base-x/v1/tslint.json | 3 --- types/bs58/package.json | 6 ++++++ types/bs58/v3/package.json | 6 ++++++ types/bs58/v3/tsconfig.json | 3 --- 12 files changed, 18 insertions(+), 124 deletions(-) delete mode 100644 types/base-x/base-x-tests.ts delete mode 100644 types/base-x/index.d.ts delete mode 100644 types/base-x/tsconfig.json delete mode 100644 types/base-x/tslint.json delete mode 100644 types/base-x/v1/base-x-tests.ts delete mode 100644 types/base-x/v1/index.d.ts delete mode 100644 types/base-x/v1/tsconfig.json delete mode 100644 types/base-x/v1/tslint.json create mode 100644 types/bs58/package.json create mode 100644 types/bs58/v3/package.json diff --git a/notNeededPackages.json b/notNeededPackages.json index aff3c18563..0cce8e1c66 100644 --- a/notNeededPackages.json +++ b/notNeededPackages.json @@ -258,6 +258,12 @@ "sourceRepoURL": "http://www.babylonjs.com/", "asOfVersion": "2.4.1" }, + { + "libraryName": "base-x", + "typingsPackageName": "base-x", + "sourceRepoURL": "https://github.com/cryptocoinjs/base-x", + "asOfVersion": "3.0.6" + }, { "libraryName": "baconjs", "typingsPackageName": "baconjs", diff --git a/types/base-x/base-x-tests.ts b/types/base-x/base-x-tests.ts deleted file mode 100644 index 7f50a98e54..0000000000 --- a/types/base-x/base-x-tests.ts +++ /dev/null @@ -1,10 +0,0 @@ -import * as baseX from 'base-x'; - -const BASE58 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'; -const bs58 = baseX(BASE58); - -const decoded = bs58.decode('5Kd3NBUAdUnhyzenEwVLy9pBKxSwXvE9FMPyR4UKZvpe6E3AgLr'); -decoded; // $ExpectType Buffer -bs58.decodeUnsafe('5Kd3NBUAdUnhyzenEwVLy9pBKxSwXvE9FMPyR4UKZvpe6E3AgLr'); // $ExpectType Buffer | undefined - -bs58.encode(decoded); // $ExpectType string diff --git a/types/base-x/index.d.ts b/types/base-x/index.d.ts deleted file mode 100644 index 1b8fa16cee..0000000000 --- a/types/base-x/index.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -// Type definitions for base-x 3.0 -// Project: https://github.com/cryptocoinjs/base-x -// Definitions by: Ilya Mochalov -// BendingBender -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -/// - -import { Buffer } from 'buffer'; - -export = baseX; - -declare function baseX(ALPHABET: string): baseX.BaseConverter; - -declare namespace baseX { - interface BaseConverter { - encode(buffer: Buffer): string; - decodeUnsafe(string: string): Buffer | undefined; - decode(string: string): Buffer; - } -} diff --git a/types/base-x/tsconfig.json b/types/base-x/tsconfig.json deleted file mode 100644 index 6f491037d2..0000000000 --- a/types/base-x/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "baseUrl": "../", - "typeRoots": [ - "../" - ], - "types": [], - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts", - "base-x-tests.ts" - ] -} diff --git a/types/base-x/tslint.json b/types/base-x/tslint.json deleted file mode 100644 index f93cf8562a..0000000000 --- a/types/base-x/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "dtslint/dt.json" -} diff --git a/types/base-x/v1/base-x-tests.ts b/types/base-x/v1/base-x-tests.ts deleted file mode 100644 index 3af01f8ca0..0000000000 --- a/types/base-x/v1/base-x-tests.ts +++ /dev/null @@ -1,12 +0,0 @@ -import * as basex from 'base-x'; - -const bs16 = basex('0123456789ABCDEF'); - -{ - let encoded: string; - - encoded = bs16.encode([255]); - encoded = bs16.encode({0: 255, length: 1}); -} - -const decoded: number[] = bs16.decode('FF'); diff --git a/types/base-x/v1/index.d.ts b/types/base-x/v1/index.d.ts deleted file mode 100644 index 379eeb8182..0000000000 --- a/types/base-x/v1/index.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -// Type definitions for base-x 1.0 -// Project: https://github.com/cryptocoinjs/base-x -// Definitions by: Ilya Mochalov -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -declare var BaseX: BaseX.Base; -export = BaseX; - -declare namespace BaseX { - interface EncodeBuffer { - [index: number]: number; - length: number; - } - - interface BaseConverter { - encode: (buffer: EncodeBuffer) => string; - decode: (string: string) => number[]; - } - - type Base = (ALPHABET: string) => BaseConverter; -} diff --git a/types/base-x/v1/tsconfig.json b/types/base-x/v1/tsconfig.json deleted file mode 100644 index b48e3e2932..0000000000 --- a/types/base-x/v1/tsconfig.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": false, - "strictFunctionTypes": true, - "baseUrl": "../../", - "typeRoots": [ - "../../" - ], - "paths": { - "base-x": [ - "base-x/v1" - ] - }, - "types": [], - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts", - "base-x-tests.ts" - ] -} diff --git a/types/base-x/v1/tslint.json b/types/base-x/v1/tslint.json deleted file mode 100644 index f93cf8562a..0000000000 --- a/types/base-x/v1/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "dtslint/dt.json" -} diff --git a/types/bs58/package.json b/types/bs58/package.json new file mode 100644 index 0000000000..968f5bc9fe --- /dev/null +++ b/types/bs58/package.json @@ -0,0 +1,6 @@ +{ + "private": true, + "dependencies": { + "base-x": "^3.0.6" + } +} diff --git a/types/bs58/v3/package.json b/types/bs58/v3/package.json new file mode 100644 index 0000000000..ab190a1507 --- /dev/null +++ b/types/bs58/v3/package.json @@ -0,0 +1,6 @@ +{ + "private": true, + "dependencies": { + "@types/base-x": "^1.0.30" + } +} diff --git a/types/bs58/v3/tsconfig.json b/types/bs58/v3/tsconfig.json index e7f77ce6b4..0944cc129c 100644 --- a/types/bs58/v3/tsconfig.json +++ b/types/bs58/v3/tsconfig.json @@ -15,9 +15,6 @@ "paths": { "bs58": [ "bs58/v3" - ], - "base-x": [ - "base-x/v1" ] }, "types": [],