From 18e3ce9627e5a5e5bbc75d232ade1ed52edb8d90 Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Mon, 1 May 2017 19:07:41 -0500
Subject: [PATCH] improve defination of ndarray (#16169)

* add weixin-app

* add wx

* add new line at end of file

* tslint wx and wx-app

* fixed test error

* change project name weixin

* rename

* weixin-app Add param this

* change discription of jweixin

* add some Event declaration

* change tslint config
extends dtslint/dt.json

* add defination of ccap, qr-image

* remove redundant jsdoc

* remove doc

* allow overloads

* inline some types

* fix tslint error

* ndarray
add tslint
export like a module style

* ndarray make ndarray as a interface
---
 types/ndarray/index.d.ts       | 54 ++++++++++++++++++----------------
 types/ndarray/ndarray-tests.ts |  3 +-
 types/ndarray/tslint.json      |  3 ++
 3 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 types/ndarray/tslint.json

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 <https://github.com/pawsong/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-type Data = Array<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 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"
+}