kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-05-31 11:07:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

@google-cloud/datastore: Remove unnecessary generics.

Browse Source
This commit is contained in:
Antoine Beauvais-Lacasse
2017-09-21 00:58:09 -04:00
parent 9f8b7e82f0
commit b267b756a7
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
types/google-cloud__datastore/google-cloud__datastore-tests.ts
View File

@@ -68,39 +68,41 @@ const complexQuery = ds.createQuery('special_namespace', kind)
.offset(10);
// Running queries:
const queryCallback: QueryCallback<TestEntity> = (err: Error, entities: TestEntity[]) => entities[0][Datastore.KEY];
const queryCallback: QueryCallback = (err: Error, entities: TestEntity[]) => entities[0][Datastore.KEY];
ds.runQuery<TestEntity>(query, queryCallback);
ds.runQuery<TestEntity>(query, options, queryCallback);
ds.runQuery(query, queryCallback);
ds.runQuery(query, options, queryCallback);
ds.runQuery(query, options);
const queryStream: NodeJS.ReadableStream = complexQuery.runStream();
const dsQueryStream: NodeJS.ReadableStream = ds.runQueryStream(complexQuery, options);
complexQuery.run()
.then((data: QueryResult<TestEntity>) => {
.then((data: QueryResult) => {
const {moreResults, endCursor} = data[1];
const frontEndResponse: any = {};
if (moreResults === Datastore.NO_MORE_RESULTS) {
switch (moreResults) {
case Datastore.NO_MORE_RESULTS:
frontEndResponse.nextPageCursor = null;
} else if (moreResults === Datastore.MORE_RESULTS_AFTER_CURSOR) {
frontEndResponse.nextPageCursor = endCursor;
} else if (moreResults === Datastore.MORE_RESULTS_AFTER_LIMIT) {
break;
case Datastore.MORE_RESULTS_AFTER_CURSOR:
case Datastore.MORE_RESULTS_AFTER_LIMIT:
frontEndResponse.nextPageCursor = endCursor;
}
});
query.run<TestEntity>((err: Error, entities: TestEntity[], info: QueryInfo) => {
query.run((err: Error, entities: TestEntity[], info: QueryInfo) => {
if (err) {
return;
}
const {moreResults, endCursor} = info;
const frontEndResponse: any = {entities};
if (moreResults === ds.NO_MORE_RESULTS) {
switch (moreResults) {
case ds.NO_MORE_RESULTS:
frontEndResponse.nextPageCursor = null;
} else if (moreResults === ds.MORE_RESULTS_AFTER_CURSOR) {
frontEndResponse.nextPageCursor = endCursor;
} else if (moreResults === ds.MORE_RESULTS_AFTER_LIMIT) {
break;
case ds.MORE_RESULTS_AFTER_CURSOR:
case ds.MORE_RESULTS_AFTER_LIMIT:
frontEndResponse.nextPageCursor = endCursor;
}
});
@@ -166,7 +168,7 @@ transaction.run((err, activeTx: DatastoreTransaction) => {
});
});
let promisedTxStart: Promise<TransactionResult> = ds.transaction().run();
const promisedTxStart: Promise<TransactionResult> = ds.transaction().run();
promisedTxStart.then((result: TransactionResult) => {
const activeTx: DatastoreTransaction = result[0];

24
types/google-cloud__datastore/index.d.ts vendored
View File

@@ -165,9 +165,9 @@ declare module '@google-cloud/datastore/query' {
offset(n: number): this;
run<T>(callback: QueryCallback<T>): void;
run<T>(options: QueryOptions, callback: QueryCallback<T>): void;
run(options?: QueryOptions): Promise<QueryResult<object>>;
run(callback: QueryCallback): void;
run(options: QueryOptions, callback: QueryCallback): void;
run(options?: QueryOptions): Promise<QueryResult>;
runStream(): NodeJS.ReadableStream;
}
@@ -188,8 +188,8 @@ declare module '@google-cloud/datastore/query' {
readonly moreResults: MoreResultsAfterCursor | MoreResultsAfterLimit | NoMoreResults;
}
type QueryCallback<T> = (err: Error, entities: T[], info: QueryInfo) => void;
type QueryResult<T> = [T[], QueryInfo];
type QueryCallback = (err: Error, entities: object[], info: QueryInfo) => void;
type QueryResult = [object[], QueryInfo];
}
declare module '@google-cloud/datastore/request' {
@@ -210,17 +210,17 @@ declare module '@google-cloud/datastore/request' {
delete(keyOrKeys: DatastoreKey | ReadonlyArray<DatastoreKey>, callback: CommitCallback): void;
delete(keyOrKeys: DatastoreKey | ReadonlyArray<DatastoreKey>): Promise<CommitResult> | void;
get<T>(key: DatastoreKey, options: QueryOptions, callback: GetCallback<T>): void;
get<T>(keys: ReadonlyArray<DatastoreKey>, options: QueryOptions, callback: GetCallback<T[]>): void;
get<T>(key: DatastoreKey, callback: GetCallback<T>): void;
get<T>(keys: ReadonlyArray<DatastoreKey>, callback: GetCallback<T[]>): void;
get(key: DatastoreKey, options: QueryOptions, callback: GetCallback<object>): void;
get(keys: ReadonlyArray<DatastoreKey>, options: QueryOptions, callback: GetCallback<object[]>): void;
get(key: DatastoreKey, callback: GetCallback<object>): void;
get(keys: ReadonlyArray<DatastoreKey>, callback: GetCallback<object[]>): void;
get(key: DatastoreKey, options?: QueryOptions): Promise<[object | undefined]>;
get(keys: ReadonlyArray<DatastoreKey>, options?: QueryOptions): Promise<[object[]]>;
runQuery<T>(query: Query, options: QueryOptions, callback: QueryCallback<T>): void;
runQuery<T>(query: Query, callback: QueryCallback<T>): void;
runQuery(query: Query, options?: QueryOptions): QueryResult<object>;
runQuery(query: Query, options: QueryOptions, callback: QueryCallback): void;
runQuery(query: Query, callback: QueryCallback): void;
runQuery(query: Query, options?: QueryOptions): QueryResult;
runQueryStream(query: Query, options?: QueryOptions): NodeJS.ReadableStream;