working

Author: baileympearson

src/collection.ts

@@ -11,7 +11,7 @@ import {
   type ListSearchIndexesOptions
 } from './cursor/list_search_indexes_cursor';
 import type { Db } from './db';
-import { MongoInvalidArgumentError, MongoOperationTimeoutError } from './error';
+import { MongoAPIError, MongoInvalidArgumentError, MongoOperationTimeoutError } from './error';
 import type { MongoClient, PkFactory } from './mongo_client';
 import type {
   Abortable,
@@ -67,9 +67,7 @@ import {
   type InsertOneOptions,
   type InsertOneResult
 } from './operations/insert';
-import { IsCappedOperation } from './operations/is_capped';
 import type { Hint, OperationOptions } from './operations/operation';
-import { OptionsOperation } from './operations/options_operation';
 import { RenameOperation, type RenameOptions } from './operations/rename';
 import {
   CreateSearchIndexesOperation,
@@ -557,10 +555,16 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async options(options?: OperationOptions): Promise<Document> {
-    return await executeOperation(
-      this.client,
-      new OptionsOperation(this as TODO_NODE_3286, resolveOptions(this, options))
-    );
+    options = resolveOptions(this, options);
+    const [collection] = await this.s.db
+      .listCollections({ name: this.collectionName }, { ...options, nameOnly: false })
+      .toArray();
+
+    if (collection == null || collection.options == null) {
+      throw new MongoAPIError(`collection ${this.namespace} not found`);
+    }
+
+    return collection.options;
   }
 
   /**
@@ -569,10 +573,8 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async isCapped(options?: OperationOptions): Promise<boolean> {
-    return await executeOperation(
-      this.client,
-      new IsCappedOperation(this as TODO_NODE_3286, resolveOptions(this, options))
-    );
+    const collectionOptions = await this.options(options);
+    return Boolean(collectionOptions?.isCapped);
   }
 
   /**

src/db.ts

@@ -10,7 +10,6 @@ import { MongoInvalidArgumentError } from './error';
 import type { MongoClient, PkFactory } from './mongo_client';
 import type { Abortable, TODO_NODE_3286 } from './mongo_types';
 import type { AggregateOptions } from './operations/aggregate';
-import { CollectionsOperation } from './operations/collections';
 import {
   CreateCollectionOperation,
   type CreateCollectionOptions
@@ -360,13 +359,13 @@ export class Db {
   ): ListCollectionsCursor<CollectionInfo>;
   listCollections<
     T extends Pick<CollectionInfo, 'name' | 'type'> | CollectionInfo =
-      | Pick<CollectionInfo, 'name' | 'type'>
-      | CollectionInfo
+    | Pick<CollectionInfo, 'name' | 'type'>
+    | CollectionInfo
   >(filter?: Document, options?: ListCollectionsOptions & Abortable): ListCollectionsCursor<T>;
   listCollections<
     T extends Pick<CollectionInfo, 'name' | 'type'> | CollectionInfo =
-      | Pick<CollectionInfo, 'name' | 'type'>
-      | CollectionInfo
+    | Pick<CollectionInfo, 'name' | 'type'>
+    | CollectionInfo
   >(
     filter: Document = {},
     options: ListCollectionsOptions & Abortable = {}
@@ -435,10 +434,15 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async collections(options?: ListCollectionsOptions): Promise<Collection[]> {
-    return await executeOperation(
-      this.client,
-      new CollectionsOperation(this, resolveOptions(this, options))
-    );
+    options = resolveOptions(this, options);
+    const documents = await this.listCollections({}, { ...options, nameOnly: true }).toArray();
+
+    return documents
+      .filter(
+        // Filter collections removing any illegal ones
+        ({ name }) => !name.includes('$')
+      )
+      .map(({ name }) => new Collection(this, name, this.s.options));
   }
 
   /**

src/operations/collections.ts

@@ -43,11 +43,6 @@ describe('abstract operation', function () {
         subclassType: mongodb.BulkWriteOperation,
         correctCommandName: 'bulkWrite'
       },
-      {
-        subclassCreator: () => new mongodb.CollectionsOperation(db, {}),
-        subclassType: mongodb.CollectionsOperation,
-        correctCommandName: 'listCollections'
-      },
       {
         subclassCreator: () => new mongodb.CountOperation(collection.fullNamespace, { a: 1 }, {}),
         subclassType: mongodb.CountOperation,
@@ -166,11 +161,6 @@ describe('abstract operation', function () {
         subclassType: mongodb.InsertManyOperation,
         correctCommandName: 'insert'
       },
-      {
-        subclassCreator: () => new mongodb.IsCappedOperation(collection, {}),
-        subclassType: mongodb.IsCappedOperation,
-        correctCommandName: 'listCollections'
-      },
       {
         subclassCreator: () =>
           new mongodb.KillCursorsOperation(
@@ -192,11 +182,6 @@ describe('abstract operation', function () {
         subclassType: mongodb.ListDatabasesOperation,
         correctCommandName: 'listDatabases'
       },
-      {
-        subclassCreator: () => new mongodb.OptionsOperation(collection, {}),
-        subclassType: mongodb.OptionsOperation,
-        correctCommandName: 'listCollections'
-      },
       {
         subclassCreator: () => new mongodb.ProfilingLevelOperation(db, {}),
         subclassType: mongodb.ProfilingLevelOperation,

src/operations/is_capped.ts

@@ -167,7 +167,6 @@ export * from '../src/operations/bulk_write';
 export * from '../src/operations/client_bulk_write/command_builder';
 export * from '../src/operations/client_bulk_write/common';
 export * from '../src/operations/client_bulk_write/results_merger';
-export * from '../src/operations/collections';
 export * from '../src/operations/command';
 export * from '../src/operations/count';
 export * from '../src/operations/create_collection';
@@ -181,12 +180,10 @@ export * from '../src/operations/find_and_modify';
 export * from '../src/operations/get_more';
 export * from '../src/operations/indexes';
 export * from '../src/operations/insert';
-export * from '../src/operations/is_capped';
 export * from '../src/operations/kill_cursors';
 export * from '../src/operations/list_collections';
 export * from '../src/operations/list_databases';
 export * from '../src/operations/operation';
-export * from '../src/operations/options_operation';
 export * from '../src/operations/profiling_level';
 export * from '../src/operations/remove_user';
 export * from '../src/operations/rename';