You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by gl...@apache.org on 2020/02/27 16:10:05 UTC
[couchdb-nano] 11/12: merge master into axios branch
This is an automated email from the ASF dual-hosted git repository.
glynnbird pushed a commit to branch axios
in repository https://gitbox.apache.org/repos/asf/couchdb-nano.git
commit afc6dc6edf3e8a3e45b3f24819b07be1bd466783
Merge: 8344ea6 9994f85
Author: Glynn Bird <gl...@gmail.com>
AuthorDate: Thu Feb 27 15:53:37 2020 +0000
merge master into axios branch
lib/nano.d.ts | 85 +++++++++++++++++----------------------
lib/nano.js | 2 +-
package-lock.json | 21 +++-------
package.json | 12 +++---
scripts/run_couchdb_on_travis.sh | 9 +++--
scripts/stop_couchdb_on_travis.sh | 2 +-
test/notnocked.test.js | 2 +-
7 files changed, 57 insertions(+), 76 deletions(-)
diff --cc lib/nano.d.ts
index 3ecac47,3cecf38..a6e5496
--- a/lib/nano.d.ts
+++ b/lib/nano.d.ts
@@@ -16,12 -17,6 +16,12 @@@ declare function nano
): nano.ServerScope;
declare namespace nano {
+ interface requestDefaultsOptions {
+ timeout: number;
+ agent: any;
+ headers: object;
- };
++ }
+
interface Configuration {
url: string;
cookie?: string;
@@@ -101,12 -101,14 +106,14 @@@
// http://docs.couchdb.org/en/latest/api/database/compact.html#post--db-_compact
changes(name: string, params: DatabaseChangesParams, callback?: Callback<DatabaseChangesResponse>): Promise<DatabaseChangesResponse>;
// http://docs.couchdb.org/en/latest/api/database/changes.html#get--db-_changes
- changesAsStream(name: string): Request;
+ changesAsStream(name: string): NodeJS.ReadStream;
// http://docs.couchdb.org/en/latest/api/database/compact.html#post--db-_compact
- changesAsStream(name: string, params: DatabaseChangesParams): Request;
+ changesAsStream(name: string, params: DatabaseChangesParams): NodeJS.ReadStream;
- follow(source: string, callback?: Callback<any>): EventEmitter;
- follow(source: string, params: DatabaseScopeFollowUpdatesParams, callback?: Callback<any>): EventEmitter;
- followUpdates(params?: any, callback?: Callback<any>): EventEmitter;
+ follow(source: string, params?: DatabaseScopeFollowUpdatesParams): FollowEmitter;
+ follow(source: string, params: DatabaseScopeFollowUpdatesParams, callback: Callback<any>);
+ followUpdates(params?: any): FollowEmitter;
+ followUpdates(params: DatabaseScopeFollowUpdatesParams, callback: Callback<any>);
+ followUpdates(callback: Callback<any>);
// http://docs.couchdb.org/en/latest/api/server/common.html#get--_db_updates
updates(callback?: Callback<DatabaseUpdatesResponse>): Promise<DatabaseUpdatesResponse>;
// http://docs.couchdb.org/en/latest/api/server/common.html#get--_db_updates
@@@ -300,11 -312,11 +308,11 @@@
find(query: MangoQuery, callback?: Callback<MangoResponse<D>>): Promise <MangoResponse<D>>;
server: ServerScope;
//https://docs.couchdb.org/en/latest/partitioned-dbs/index.html
- partitionInfo(partitionKey: string, callback?: Callback<PartitionInfoResponse<D>>): Promise <PartitionInfoResponse>;
- partitionedList(partitionKey: string, params?: DocumentListParams, callback?: Callback<DocumentListResponse<D>>): Promise<DocumentListResponse<D>>;
- partitionedListAsStream(partitionKey: string, params?: DocumentListParams): NodeJS.ReadStream;
+ partitionInfo(partitionKey: string, callback?: Callback<PartitionInfoResponse>): Promise <PartitionInfoResponse>;
+ partitionedList(partitionKey: string, params?: DocumentFetchParams, callback?: Callback<DocumentListResponse<D>>): Promise<DocumentListResponse<D>>;
- partitionedListAsStream(partitionKey: string, params?: DocumentFetchParams): Request;
++ partitionedListAsStream(partitionKey: string, params?: DocumentFetchParams): NodeJS.ReadStream;
partitionedFind(partitionKey: string, query: MangoQuery, callback?: Callback<MangoResponse<D>>): Promise <MangoResponse<D>>;
- partitionedFindAsStream(partitionKey: string, query: MangoQuery): Request;
+ partitionedFindAsStream(partitionKey: string, query: MangoQuery): NodeJS.ReadStream;
partitionedViewpartitionedSearch<V>(
partitionKey: string,
designname: string,
diff --cc package.json
index 2ec5360,3f3802a..4065aa5
--- a/package.json
+++ b/package.json
@@@ -21,13 -21,13 +21,13 @@@
"cloudant-follow": "^0.18.2",
"debug": "^4.1.1",
"errs": "^0.3.2",
- "request": "^2.88.0"
+ "qs": "^6.9.1"
},
"devDependencies": {
- "async": "^2.6.2",
"jest": "^25.1.0",
"nock": "^11.7.2",
- "standard": "^14.3.1"
+ "standard": "^14.3.1",
+ "typescript": "^3.7.5"
},
"scripts": {
"standard": "standard --fix",