diff --git a/types/ndarray/index.d.ts b/types/ndarray/index.d.ts
index 52d86ff0c8..27f12fec24 100644
--- a/types/ndarray/index.d.ts
+++ b/types/ndarray/index.d.ts
@@ -1,34 +1,36 @@
-// Type definitions for ndarray v1.0.18
+// Type definitions for ndarray 1.0
// Project: https://github.com/scijs/ndarray
// Definitions by: Giff Song
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-type Data = Array | Int8Array | Int16Array | Int32Array |
- Uint8Array | Uint16Array | Uint32Array |
- Float32Array | Float64Array | Uint8ClampedArray;
-
-interface ndarray {
- data: Data;
- shape: number[];
- stride: number[];
- offset: number;
- dtype: 'int8' | 'int16' | 'int32' | 'uint8' | 'uint16' |'uint32' |
- 'float32' | 'float64' | 'array'| 'uint8_clamped' | 'buffer' | 'generic';
- size: number;
- order: number[];
- dimension: number;
- get(...args: number[]): number;
- set(...args: number[]): number;
- index(...args: number[]): number;
- lo(...args: number[]): ndarray;
- hi(...args: number[]): ndarray;
- step(...args: number[]): ndarray;
- transpose(...args: number[]): ndarray;
- pick(...args: number[]): ndarray;
-}
-
declare function ndarray(
- data: Data, shape?: number[], stride?: number[], offset?: number
+ data: Data, shape?: number[], stride?: number[], offset?: number
): ndarray;
+type Data = number[] | Int8Array | Int16Array | Int32Array |
+ Uint8Array | Uint16Array | Uint32Array |
+ Float32Array | Float64Array | Uint8ClampedArray;
+
+interface ndarray {
+ data: Data;
+ shape: number[];
+ stride: number[];
+ offset: number;
+ dtype: 'int8' | 'int16' | 'int32' | 'uint8' | 'uint16' | 'uint32' |
+ 'float32' | 'float64' | 'array' | 'uint8_clamped' | 'buffer' | 'generic';
+ size: number;
+ order: number[];
+ dimension: number;
+ get(...args: number[]): number;
+ set(...args: number[]): number;
+ index(...args: number[]): number;
+ lo(...args: number[]): ndarray;
+ hi(...args: number[]): ndarray;
+ step(...args: number[]): ndarray;
+ transpose(...args: number[]): ndarray;
+ pick(...args: number[]): ndarray;
+}
+
+declare namespace ndarray { }
+
export = ndarray;
diff --git a/types/ndarray/ndarray-tests.ts b/types/ndarray/ndarray-tests.ts
index a72a9acad5..899f43efd5 100644
--- a/types/ndarray/ndarray-tests.ts
+++ b/types/ndarray/ndarray-tests.ts
@@ -1,5 +1,4 @@
-
-import ndarray = require('ndarray');
+import * as ndarray from 'ndarray';
const data = new Int32Array(2 * 2 * 2 + 10);
const a = ndarray(data, [2, 2, 2], [1, 2, 4], 5);
diff --git a/types/ndarray/tslint.json b/types/ndarray/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/ndarray/tslint.json
@@ -0,0 +1,3 @@
+{
+ "extends": "dtslint/dt.json"
+}