From 99dee20f49bab5878ef91a69b34aa5a23d0cea97 Mon Sep 17 00:00:00 2001 From: Bastien Date: Tue, 11 Jul 2017 12:19:20 +0200 Subject: [PATCH 1/3] [spark-md5] Add types --- types/spark-md5/index.d.ts | 42 ++++++++++++++++++++++++++++++ types/spark-md5/spark-md5-tests.ts | 20 ++++++++++++++ types/spark-md5/tsconfig.json | 22 ++++++++++++++++ types/spark-md5/tslint.json | 1 + 4 files changed, 85 insertions(+) create mode 100644 types/spark-md5/index.d.ts create mode 100644 types/spark-md5/spark-md5-tests.ts create mode 100644 types/spark-md5/tsconfig.json create mode 100644 types/spark-md5/tslint.json diff --git a/types/spark-md5/index.d.ts b/types/spark-md5/index.d.ts new file mode 100644 index 0000000000..6f93e6a821 --- /dev/null +++ b/types/spark-md5/index.d.ts @@ -0,0 +1,42 @@ +// Type definitions for spark-md5 3.0 +// Project: https://github.com/satazor/js-spark-md5#readme +// Definitions by: My Self +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +interface State { + buff: Uint8Array; + length: number; + hash: number[]; +} + +interface IArrayBuffer extends ArrayBuffer {} + +declare class SparkMD5 { + constructor(); + append(str: string): SparkMD5; + appendBinary(contents: string): SparkMD5; + end (raw?: boolean): string; + reset (): SparkMD5; + getState(): State; + setState(state: State): State; + destroy(): void; + static hash(str: string, raw?: boolean): string + static hashBinary(content: string, raw?: boolean): string +} + +declare namespace SparkMD5 { + class ArrayBuffer { + constructor(); + append(str: string): ArrayBuffer; + end (raw?: boolean): string; + reset (): ArrayBuffer; + getState(): State; + setState(state: State): State; + destroy(): void; + static hash(arr: IArrayBuffer, raw?: boolean): string + } +} + +declare module "spark-md5" { + export = SparkMD5; +} diff --git a/types/spark-md5/spark-md5-tests.ts b/types/spark-md5/spark-md5-tests.ts new file mode 100644 index 0000000000..4b960eaa56 --- /dev/null +++ b/types/spark-md5/spark-md5-tests.ts @@ -0,0 +1,20 @@ +import * as SparkMD5 from "spark-md5"; + +SparkMD5.hash('Hi there'); +SparkMD5.hash('Hi there', true); +SparkMD5.hashBinary(""); + +var spark = new SparkMD5(); +spark.append('Hi'); +spark.append(' there'); +var hexHash = spark.end(); +var rawHash = spark.end(true); + +var sparkArr = new SparkMD5.ArrayBuffer(); +sparkArr.append('Hi'); +sparkArr.append(' there'); +var hexHash = sparkArr.end(); +var rawHash = sparkArr.end(true); + +const arr = new ArrayBuffer(8); +SparkMD5.ArrayBuffer.hash(arr); diff --git a/types/spark-md5/tsconfig.json b/types/spark-md5/tsconfig.json new file mode 100644 index 0000000000..7dabd9b1a8 --- /dev/null +++ b/types/spark-md5/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "spark-md5-tests.ts" + ] +} diff --git a/types/spark-md5/tslint.json b/types/spark-md5/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/spark-md5/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From 5dd4d38774f4551a2634198e7839161eaea446c1 Mon Sep 17 00:00:00 2001 From: Bastien Date: Tue, 11 Jul 2017 14:00:37 +0200 Subject: [PATCH 2/3] Fix lint errors --- types/spark-md5/index.d.ts | 24 ++++++++++++++---------- types/spark-md5/spark-md5-tests.ts | 12 ++++++------ types/spark-md5/tslint.json | 7 ++++++- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/types/spark-md5/index.d.ts b/types/spark-md5/index.d.ts index 6f93e6a821..f0bcec7131 100644 --- a/types/spark-md5/index.d.ts +++ b/types/spark-md5/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/satazor/js-spark-md5#readme // Definitions by: My Self // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 interface State { buff: Uint8Array; @@ -9,34 +10,37 @@ interface State { hash: number[]; } -interface IArrayBuffer extends ArrayBuffer {} +// copy of ArrayBuffer because of a conflict with the class SparkMD5.ArrayBuffer +interface ArrayBufferCopy extends ArrayBuffer {} declare class SparkMD5 { constructor(); append(str: string): SparkMD5; appendBinary(contents: string): SparkMD5; - end (raw?: boolean): string; - reset (): SparkMD5; + end(raw?: boolean): string; + reset(): SparkMD5; getState(): State; setState(state: State): State; destroy(): void; - static hash(str: string, raw?: boolean): string - static hashBinary(content: string, raw?: boolean): string + static hash(str: string, raw?: boolean): string; + static hashBinary(content: string, raw?: boolean): string; } declare namespace SparkMD5 { class ArrayBuffer { constructor(); append(str: string): ArrayBuffer; - end (raw?: boolean): string; - reset (): ArrayBuffer; + end(raw?: boolean): string; + reset(): ArrayBuffer; getState(): State; setState(state: State): State; destroy(): void; - static hash(arr: IArrayBuffer, raw?: boolean): string + static hash(arr: ArrayBufferCopy, raw?: boolean): string; } } -declare module "spark-md5" { +export = SparkMD5; + +/*declare module "spark-md5" { export = SparkMD5; -} +}*/ diff --git a/types/spark-md5/spark-md5-tests.ts b/types/spark-md5/spark-md5-tests.ts index 4b960eaa56..7cff5c461a 100644 --- a/types/spark-md5/spark-md5-tests.ts +++ b/types/spark-md5/spark-md5-tests.ts @@ -4,17 +4,17 @@ SparkMD5.hash('Hi there'); SparkMD5.hash('Hi there', true); SparkMD5.hashBinary(""); -var spark = new SparkMD5(); +let spark = new SparkMD5(); spark.append('Hi'); spark.append(' there'); -var hexHash = spark.end(); -var rawHash = spark.end(true); +let hexHash = spark.end(); +let rawHash = spark.end(true); -var sparkArr = new SparkMD5.ArrayBuffer(); +let sparkArr = new SparkMD5.ArrayBuffer(); sparkArr.append('Hi'); sparkArr.append(' there'); -var hexHash = sparkArr.end(); -var rawHash = sparkArr.end(true); +hexHash = sparkArr.end(); +rawHash = sparkArr.end(true); const arr = new ArrayBuffer(8); SparkMD5.ArrayBuffer.hash(arr); diff --git a/types/spark-md5/tslint.json b/types/spark-md5/tslint.json index 3db14f85ea..7caadb5ed8 100644 --- a/types/spark-md5/tslint.json +++ b/types/spark-md5/tslint.json @@ -1 +1,6 @@ -{ "extends": "dtslint/dt.json" } +{ + "extends": "dtslint/dt.json", + "rules": { + "no-empty-interface": false + } +} From 4dc0b7002c54d6a05fd32e152c1cabe46b0f6823 Mon Sep 17 00:00:00 2001 From: Bastien Date: Fri, 14 Jul 2017 09:48:59 +0200 Subject: [PATCH 3/3] remove comments and add name --- types/spark-md5/index.d.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/types/spark-md5/index.d.ts b/types/spark-md5/index.d.ts index f0bcec7131..f856d41e1c 100644 --- a/types/spark-md5/index.d.ts +++ b/types/spark-md5/index.d.ts @@ -1,6 +1,6 @@ // Type definitions for spark-md5 3.0 // Project: https://github.com/satazor/js-spark-md5#readme -// Definitions by: My Self +// Definitions by: Bastien Moulia // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 @@ -40,7 +40,3 @@ declare namespace SparkMD5 { } export = SparkMD5; - -/*declare module "spark-md5" { - export = SparkMD5; -}*/