Restore circular references

Author: hsubox76

packages/storage/compat/index.ts

@@ -21,7 +21,7 @@ import { StringFormat } from '../src/implementation/string';
 import { TaskEvent, TaskState } from '../src/implementation/taskenums';
 
 import { XhrIoPool } from '../src/implementation/xhriopool';
-import { ReferenceCompat as Reference, ReferenceCompat } from './reference';
+import { ReferenceCompat } from './reference';
 import { StorageServiceCompat } from './service';
 import { StorageService } from '../src/service';
 import * as types from '@firebase/storage-types';
@@ -51,8 +51,7 @@ function factory(
   // of creating a new one.
   const storageServiceCompat: StorageServiceCompat = new StorageServiceCompat(
     app,
-    new StorageService(app, authProvider, new XhrIoPool(), url),
-    ref => new ReferenceCompat(ref, storageServiceCompat)
+    new StorageService(app, authProvider, new XhrIoPool(), url)
   );
   return storageServiceCompat;
 }
@@ -64,7 +63,7 @@ export function registerStorage(instance: _FirebaseNamespace): void {
     TaskEvent,
     StringFormat,
     Storage: StorageService,
-    Reference
+    Reference: ReferenceCompat
   };
   instance.INTERNAL.registerComponent(
     new Component(STORAGE_TYPE, factory, ComponentType.PUBLIC)

packages/storage/compat/list.ts

@@ -18,19 +18,23 @@
 import * as types from '@firebase/storage-types';
 import { ListResult } from '../src/list';
 import { ReferenceCompat } from './reference';
-import { Reference } from '../src/reference';
+import { StorageServiceCompat } from './service';
 
 export class ListResultCompat implements types.ListResult {
   constructor(
     private readonly _delegate: ListResult,
-    private _referenceConverter: (ref: Reference) => ReferenceCompat
+    private readonly _service: StorageServiceCompat
   ) {}
 
   get prefixes(): ReferenceCompat[] {
-    return this._delegate.prefixes.map(v => this._referenceConverter(v));
+    return this._delegate.prefixes.map(
+      ref => new ReferenceCompat(ref, this._service)
+    );
   }
   get items(): ReferenceCompat[] {
-    return this._delegate.items.map(v => this._referenceConverter(v));
+    return this._delegate.items.map(
+      ref => new ReferenceCompat(ref, this._service)
+    );
   }
   get nextPageToken(): string | null {
     return this._delegate.nextPageToken || null;

packages/storage/compat/reference.ts

@@ -139,8 +139,7 @@ export class ReferenceCompat implements types.Reference {
    */
   listAll(): Promise<types.ListResult> {
     return listAll(this._delegate).then(
-      r =>
-        new ListResultCompat(r, ref => new ReferenceCompat(ref, this.storage))
+      r => new ListResultCompat(r, this.storage)
     );
   }
 
@@ -165,8 +164,7 @@ export class ReferenceCompat implements types.Reference {
    */
   list(options?: ListOptions | null): Promise<types.ListResult> {
     return list(this._delegate, options).then(
-      r =>
-        new ListResultCompat(r, ref => new ReferenceCompat(ref, this.storage))
+      r => new ListResultCompat(r, this.storage)
     );
   }
 

packages/storage/compat/service.ts

@@ -19,7 +19,6 @@ import * as types from '@firebase/storage-types';
 import { StorageService, isUrl, ref } from '../src/service';
 import { Location } from '../src/implementation/location';
 import { ReferenceCompat } from './reference';
-import { Reference } from '../src/reference';
 import { invalidArgument } from '../src/implementation/error';
 import { FirebaseApp } from '@firebase/app-types';
 
@@ -28,11 +27,7 @@ import { FirebaseApp } from '@firebase/app-types';
  * @param opt_url gs:// url to a custom Storage Bucket
  */
 export class StorageServiceCompat implements types.FirebaseStorage {
-  constructor(
-    public app: FirebaseApp,
-    readonly _delegate: StorageService,
-    private _referenceConverter: (ref: Reference) => ReferenceCompat
-  ) {}
+  constructor(public app: FirebaseApp, readonly _delegate: StorageService) {}
 
   INTERNAL = {
     /**
@@ -61,7 +56,7 @@ export class StorageServiceCompat implements types.FirebaseStorage {
         'ref() expected a child path but got a URL, use refFromURL instead.'
       );
     }
-    return this._referenceConverter(ref(this._delegate, path));
+    return new ReferenceCompat(ref(this._delegate, path), this);
   }
 
   /**
@@ -81,7 +76,7 @@ export class StorageServiceCompat implements types.FirebaseStorage {
         'refFromUrl() expected a valid full URL but got an invalid one.'
       );
     }
-    return this._referenceConverter(ref(this._delegate, url));
+    return new ReferenceCompat(ref(this._delegate, url), this);
   }
 
   setMaxUploadRetryTime(time: number): void {

packages/storage/test/unit/reference.compat.test.ts

@@ -37,8 +37,7 @@ function makeFakeService(
 ): StorageServiceCompat {
   const storageServiceCompat: StorageServiceCompat = new StorageServiceCompat(
     app,
-    new StorageService(app, authProvider, testShared.makePool(sendHook)),
-    ref => new ReferenceCompat(ref, storageServiceCompat)
+    new StorageService(app, authProvider, testShared.makePool(sendHook))
   );
   return storageServiceCompat;
 }
@@ -51,8 +50,7 @@ function makeStorage(url: string): ReferenceCompat {
   );
   const storageServiceCompat: StorageServiceCompat = new StorageServiceCompat(
     {} as FirebaseApp,
-    service,
-    ref => new ReferenceCompat(ref, storageServiceCompat)
+    service
   );
   return new ReferenceCompat(new Reference(service, url), storageServiceCompat);
 }

packages/storage/test/unit/service.compat.test.ts

@@ -22,7 +22,6 @@ import * as testShared from './testshared';
 import { DEFAULT_HOST } from '../../src/implementation/constants';
 import { FirebaseStorageError } from '../../src/implementation/error';
 import { StorageService } from '../../src/service';
-import { ReferenceCompat } from '../../compat/reference';
 import { FirebaseApp } from '@firebase/app-types';
 import { Provider } from '@firebase/component';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
@@ -44,8 +43,7 @@ function makeService(
 ): StorageServiceCompat {
   const storageServiceCompat: StorageServiceCompat = new StorageServiceCompat(
     app,
-    new StorageService(app, authProvider, pool, url),
-    ref => new ReferenceCompat(ref, storageServiceCompat)
+    new StorageService(app, authProvider, pool, url)
   );
   return storageServiceCompat;
 }