From e73a94c7ec0df9e22ce134cc0ee3afa17a756bf9 Mon Sep 17 00:00:00 2001
From: Clarence Ho <clarence@skywidesoft.com>
Date: Wed, 3 Jan 2018 02:46:44 +0800
Subject: [PATCH] Updated to Massive v4 (#22594)

* Updated to Massive v4

* Update tsconfig.json

* Remove white space
---
 types/massive/index.d.ts          |  2 +-
 types/massive/v3/index.d.ts       | 82 +++++++++++++++++++++++++++++++
 types/massive/v3/massive-tests.ts | 10 ++++
 types/massive/v3/tsconfig.json    | 26 ++++++++++
 types/massive/v3/tslint.json      |  1 +
 5 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 types/massive/v3/index.d.ts
 create mode 100644 types/massive/v3/massive-tests.ts
 create mode 100644 types/massive/v3/tsconfig.json
 create mode 100644 types/massive/v3/tslint.json

diff --git a/types/massive/index.d.ts b/types/massive/index.d.ts
index b7132ab910..39ec1c9b66 100644
--- a/types/massive/index.d.ts
+++ b/types/massive/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for massive 3.0
+// Type definitions for massive 4.0
 // Project: https://github.com/dmfay/massive-js.git
 // Definitions by: Pascal Birchler <https://github.com/swissspidy>
 //                 Clarence Ho <https://github.com/clarenceh>
diff --git a/types/massive/v3/index.d.ts b/types/massive/v3/index.d.ts
new file mode 100644
index 0000000000..b7132ab910
--- /dev/null
+++ b/types/massive/v3/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for massive 3.0
+// Project: https://github.com/dmfay/massive-js.git
+// Definitions by: Pascal Birchler <https://github.com/swissspidy>
+//                 Clarence Ho <https://github.com/clarenceh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+export = massive;
+
+declare function massive(
+  connection: massive.ConnectionInfo | string,
+  loaderConfig?: object,
+  driverConfig?: object): Promise<massive.Database>;
+
+declare namespace massive {
+  interface ConnectionInfo {
+    user?: string;
+    database?: string;
+    password?: string | null;
+    port?: number;
+    host?: string;
+    ssl?: boolean;
+    application_name?: string;
+    fallback_application_name?: boolean;
+  }
+
+  interface QueryOptions {
+    columns?: string[];
+    limit?: number;
+    offset?: number;
+    only?: boolean;
+    order?: string[];
+    orderBody?: boolean;
+    build?: boolean;
+    document?: boolean;
+    single?: boolean;
+    stream?: boolean;
+  }
+
+  interface SearchCriteria {
+    fields: string[];
+    term: string;
+  }
+
+  interface Table<T> {
+    find(criteria: object | {}, queryOptions?: QueryOptions): Promise<T[]>;
+    findOne(criteria: number | object, queryOptions?: QueryOptions): Promise<T>;
+    count(criteria: object): Promise<string>;
+    where(query: string, params: any[] | object): Promise<T[]>;
+    search(criteria: SearchCriteria, queryOptions?: QueryOptions): Promise<any>;
+    save(data: object): Promise<T>;
+    insert(data: object): Promise<T>;
+    insert(data: object[]): Promise<T[]>;
+    update(dataOrCriteria: object, changesMap?: object): Promise<T>;
+    update(dataOrCriteria: object[], changesMap?: object): Promise<T[]>;
+    destroy(criteria: object): Promise<T[]>;
+  }
+
+  interface Document {
+    countDoc(criteria: object): Promise<number>;
+    findDoc(criteria: number | string| object): Promise<object>;
+    searchDoc(criteria: SearchCriteria): Promise<object[]>;
+    saveDoc(doc: object): Promise<object>;
+    modify(docId: number | string, doc: object, fieldName?: string): Promise<object>;
+  }
+
+  interface Database {
+    attach(ctor: any, ...sources: any[]): Promise<any>;
+    detach(entity: string, collection: string): void;
+    reload(): void;
+    query(query: any, params: any, options: any): Promise<any>;
+    saveDoc(collectionName: string, doc: object): Promise<any>;
+    createDocumentTable(path: any): Promise<any>;
+    getObject(path: any, collection: any): object;
+    dropTable(table: string, options: any): void;
+    createSchema(schemaName: string): void;
+    dropSchema(schemaName: string, options: any): void;
+    run(query: string, params: any[] | object): Promise<object[]>;
+  }
+}
diff --git a/types/massive/v3/massive-tests.ts b/types/massive/v3/massive-tests.ts
new file mode 100644
index 0000000000..c201541a12
--- /dev/null
+++ b/types/massive/v3/massive-tests.ts
@@ -0,0 +1,10 @@
+import massive = require('massive');
+
+let dbconn: massive.Database;
+
+massive('postgres://app:password@localhost:5432/app').then(db => {
+    console.log(`DB connected successfully`);
+    dbconn = db;
+}).catch(err => {
+    console.error(`Error connecting DB`);
+});
diff --git a/types/massive/v3/tsconfig.json b/types/massive/v3/tsconfig.json
new file mode 100644
index 0000000000..ddfdc175d3
--- /dev/null
+++ b/types/massive/v3/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es2015"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+          "massive": [ "massive/v3" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "massive-tests.ts"
+    ]
+}
diff --git a/types/massive/v3/tslint.json b/types/massive/v3/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/massive/v3/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }