a little bit of typing changes

Author: toptobes

src/data-api/collection.ts

@@ -1418,10 +1418,12 @@ export class Collection<Schema extends SomeDoc = SomeDoc> {
    * console.log(options.vector);
    * ```
    *
+   * @param options - The options for this operation.
+   *
    * @return The options that the collection was created with (i.e. the `vector` and `indexing` operations).
    */
-  async options(): Promise<CollectionOptions<SomeDoc>> {
-    const results = await this._db.listCollections({ nameOnly: false });
+  async options(options?: WithTimeout): Promise<CollectionOptions<SomeDoc>> {
+    const results = await this._db.listCollections({ nameOnly: false, maxTimeMS: options?.maxTimeMS });
 
     const collection = results.find((c) => c.name === this.collectionName);
 

src/data-api/db.ts

@@ -28,6 +28,7 @@ import { AstraDbAdmin, mkDbAdmin } from '@/src/devops/astra-db-admin';
 import { AdminSpawnOptions, DbSpawnOptions, RootClientOptsWithToken } from '@/src/client';
 import { RunCommandOptions } from '@/src/data-api/types/collections/command';
 import { WithTimeout } from '@/src/common/types';
+import { DropCollectionOptions } from '@/src/data-api/types/collections/drop-collection';
 
 /**
  * @internal
@@ -206,8 +207,8 @@ export class Db implements Disposable {
    *
    * @throws Error - if the database is not an Astra database.
    */
-  public async info(): Promise<DatabaseInfo> {
-    return await this.admin().info().then(i => i.info);
+  public async info(options?: WithTimeout): Promise<DatabaseInfo> {
+    return await this.admin().info(options).then(i => i.info);
   }
 
   /**
@@ -341,7 +342,7 @@ export class Db implements Disposable {
    *
    * @remarks Use with caution. Have steel-toe boots on. Don't say I didn't warn you.
    */
-  public async dropCollection(name: string, options?: WithTimeout & WithNamespace): Promise<boolean> {
+  public async dropCollection(name: string, options?: DropCollectionOptions): Promise<boolean> {
     const command = {
       deleteCollection: { name },
     };

src/data-api/types/collections/command.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { WithNamespace } from '@/src/data-api';
+import { WithTimeout } from '@/src/common';
 
 /**
  * Options for executing some arbitrary command.
@@ -22,7 +23,7 @@ import { WithNamespace } from '@/src/data-api';
  *
  * @see Db.command
  */
-export interface RunCommandOptions extends WithNamespace {
+export interface RunCommandOptions extends WithNamespace, WithTimeout {
   /**
    * The collection to run the command on. If not provided, the command is run on the database.
    */

src/data-api/types/collections/drop-collection.ts

@@ -0,0 +1,26 @@
+// Copyright DataStax, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { WithNamespace } from '@/src/data-api';
+import { WithTimeout } from '@/src/common/types';
+
+/**
+ * Options for dropping a collection.
+ *
+ * @field namespace - Overrides the namespace for the collection.
+ * @field maxTimeMS - The maximum time to allow the operation to run.
+ *
+ * @see Db.dropCollection
+ */
+export interface DropCollectionOptions extends WithTimeout, WithNamespace {}

src/data-api/types/index.ts

@@ -16,6 +16,7 @@ export * from './collections/collections-common';
 export * from './collections/collection-options';
 export * from './collections/create-collection';
 export * from './collections/list-collection';
+export * from './collections/drop-collection';
 export * from './collections/command';
 export * from './delete/delete-many';
 export * from './delete/delete-one';

src/devops/types/admin/list-databases.ts

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { DatabaseCloudProvider, DatabaseStatus, } from '@/src/devops/types';
-
 import { WithTimeout } from '@/src/common/types';
 
 export type DatabaseStatusFilter = DatabaseStatus | 'ALL' | 'NONTERMINATED';