WIP

Author: schmidt-sebastian

packages/storage/compat/list.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ *
+ * 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 * as types from '@firebase/storage-types';
+import {ListResult} from "../src/list";
+import {ReferenceCompat} from "./reference";
+
+
+export class ListResultCompat implements types.ListResult {
+  constructor(private readonly  delegate: ListResult) {
+  }
+  
+  prefixes = this.delegate.prefixes.map(v => ReferenceCompat.fromReference(v));
+  items = this.delegate.items.map(v => ReferenceCompat.fromReference(v));
+  nextPageToken = this.delegate.nextPageToken;
+  
+}

packages/storage/compat/reference.ts

@@ -38,17 +38,31 @@ import {
 } from '../src/implementation/args';
 import { Metadata } from '../src/metadata';
 import { StringFormat, formatValidator } from '../src/implementation/string';
-import { ListResult, ListOptions } from '../src/list';
+import {  ListOptions } from '../src/list';
 import { UploadTaskCompat } from './task';
+import {ListResultCompat} from "./list";
+import {Location} from "../src/implementation/location";
+import {StorageServiceCompat} from "./service";
 
 export class ReferenceCompat extends Reference implements types.Reference {
   static fromReference(ref: Reference): types.Reference {
     return new ReferenceCompat(ref.service, ref.location);
   }
+  
+  get root() :  any {
+    const location = new Location(this.location.bucket, '');
+    return new ReferenceCompat(this.service, location);
+  }
+
+  get storage(): any {
+    return StorageServiceCompat.fromService(this.service);
+  }
+  
   toString(): string {
     validate('toString', [], arguments);
     return super.toString();
   }
+  
   /**
    * @return A reference to the object obtained by
    *     appending childPath, removing any duplicate, beginning, or trailing
@@ -82,7 +96,7 @@ export class ReferenceCompat extends Reference implements types.Reference {
   put(
     data: Blob | Uint8Array | ArrayBuffer,
     metadata?: Metadata
-  ): UploadTaskCompat {
+  ): any {
     validate('put', [uploadDataSpec(), metadataSpec(true)], arguments);
     this.throwIfRoot_('put');
     return uploadBytes(this, data, metadata) as UploadTaskCompat;
@@ -98,7 +112,7 @@ export class ReferenceCompat extends Reference implements types.Reference {
     value: string,
     format: StringFormat = StringFormat.RAW,
     metadata?: Metadata
-  ): UploadTaskCompat {
+  ): any {
     validate(
       'putString',
       [stringSpec(), stringSpec(formatValidator, true), metadataSpec(true)],
@@ -124,9 +138,9 @@ export class ReferenceCompat extends Reference implements types.Reference {
    *      sub-directories and `items` contains references to objects in this
    *      folder. `nextPageToken` is never returned.
    */
-  listAll(): Promise<ListResult> {
+  listAll(): Promise<types.ListResult> {
     validate('listAll', [], arguments);
-    return listAll(this);
+    return listAll(this).then(r => new ListResultCompat(r));
   }
   /**
    * List items (files) and prefixes (folders) under this storage reference.
@@ -148,9 +162,9 @@ export class ReferenceCompat extends Reference implements types.Reference {
    *      contains references to objects in this folder. `nextPageToken`
    *      can be used to get the rest of the results.
    */
-  list(options?: ListOptions | null): Promise<ListResult> {
+  list(options?: ListOptions | null): Promise<types.ListResult> {
     validate('list', [listOptionSpec(true)], arguments);
-    return list(this, options);
+    return list(this, options).then(r => new ListResultCompat(r));
   }
 
   /**

packages/storage/compat/service.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import * as types from '@firebase/storage-types';
 import { StorageService, isUrl } from '../src/service';
 import { Location } from '../src/implementation/location';
 import { FirebaseApp } from '@firebase/app-types';
@@ -53,24 +54,29 @@ export function pathValidator(path: unknown): void {
  *
  * @struct
  */
-export class StorageServiceCompat extends StorageService {
+export class StorageServiceCompat extends StorageService implements types.FirebaseStorage {
   private readonly internals_: ServiceInternals;
 
   constructor(
-    app: FirebaseApp | null,
+    app: FirebaseApp,
     authProvider: Provider<FirebaseAuthInternalName>,
-    pool: XhrIoPool,
+  pool: XhrIoPool,
     url?: string
   ) {
     super(app, authProvider, pool, url);
     this.internals_ = new ServiceInternals(this);
   }
 
+
+  static fromService(service: StorageService) : StorageServiceCompat  {
+    return new StorageServiceCompat(service.app, service.authProvider_, service.pool_, service.url_);
+  }
+  
   /**
    * Returns a firebaseStorage.Reference for the given path in the default
    * bucket.
    */
-  ref(path?: string): ReferenceCompat {
+  ref(path?: string): types.Reference  {
     args.validate('ref', [args.stringSpec(pathValidator, true)], arguments);
 
     const reference = new ReferenceCompat(this, this.bucket_!);
@@ -85,7 +91,7 @@ export class StorageServiceCompat extends StorageService {
    * Returns a firebaseStorage.Reference object for the given absolute URL,
    * which must be a gs:// or http[s]:// URL.
    */
-  refFromURL(url: string): ReferenceCompat {
+  refFromURL(url: string): types.Reference {
     args.validate(
       'refFromURL',
       [args.stringSpec(urlValidator, false)],
@@ -114,13 +120,10 @@ export class StorageServiceCompat extends StorageService {
     this.maxOperationRetryTime_ = time;
   }
 
-  get app(): FirebaseApp | null {
-    return this.app_;
-  }
-
   get INTERNAL(): ServiceInternals {
     return this.internals_;
   }
+
 }
 
 /**

packages/storage/compat/task.ts

@@ -38,17 +38,19 @@ export class UploadTaskCompat extends UploadTask<UploadTaskSnapshotCompat>
   ) {
     super(refCompat_, blob, metadata);
   }
+  
   get snapshot(): UploadTaskSnapshotCompat {
     const externalState = taskStateFromInternalTaskState(this.state_);
     return new UploadTaskSnapshotCompat(
       this.transferred_,
       this.blob_.size(),
       externalState,
-      this.metadata_,
+      this.metadata_!, // VERIFY
       this,
       this.refCompat_
     );
   }
+  
   on(
     type: TaskEvent,
     nextOrObserver?:

packages/storage/compat/tasksnapshot.ts

@@ -14,17 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
+import * as types from '@firebase/storage-types';
 import { TaskState } from '../src/implementation/taskenums';
 import { Metadata } from '../src/metadata';
 import { ReferenceCompat } from './reference';
 import { UploadTaskCompat } from './task';
 
-export class UploadTaskSnapshotCompat {
+export class UploadTaskSnapshotCompat implements types.UploadTaskSnapshot{
   constructor(
     readonly bytesTransferred: number,
     readonly totalBytes: number,
     readonly state: TaskState,
-    readonly metadata: Metadata | null,
+    readonly metadata: Metadata,
     readonly task: UploadTaskCompat,
     readonly ref: ReferenceCompat
   ) {}

packages/storage/src/list.ts

@@ -14,18 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
+import * as types from '@firebase/storage-types';
 import { Reference } from './reference';
 
 /**
  * @fileoverview Documentation for ListOptions and ListResult format.
  */
-export interface ListOptions {
-  maxResults?: number | null;
-  pageToken?: string | null;
+export interface ListOptions extends types.ListOptions {
 }
 
-export interface ListResult {
-  prefixes: Reference[];
+export interface ListResult  {
+  prefixes: Reference[]; 
   items: Reference[];
-  nextPageToken?: string | null;
+  nextPageToken: string | null;
 }

packages/storage/src/metadata.ts

@@ -14,32 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import * as types from '@firebase/storage-types';
 import { Reference } from './reference';
 
 /**
  * @fileoverview Documentation for the metadata format.
  */
-interface Metadata {
-  bucket: string | undefined;
-  generation: string | undefined;
-  metageneration: string | undefined;
-  fullPath: string | undefined;
-  name: string | undefined;
-  size: number | undefined;
-  type: string | undefined;
-  timeCreated: string | undefined;
-  updated: string | undefined;
-  md5Hash: string | undefined;
-  cacheControl: string | undefined;
-  contentDisposition: string | undefined;
-  contentEncoding: string | undefined;
-  contentLanguage: string | undefined;
-  contentType: string | undefined;
-  downloadTokens: string[] | undefined;
-  customMetadata: { [key: string]: string } | undefined;
-  ref: Reference | undefined;
-
-  [prop: string]: unknown;
+interface Metadata extends types.FullMetadata {
 }
 
 export { Metadata };

packages/storage/src/service.ts

@@ -137,17 +137,11 @@ export function ref(
  * @struct
  */
 export class StorageService {
-  /**
-   * @internal
-   */
-  app_: FirebaseApp | null;
   /**
    * @internal
    */
   readonly bucket_: Location | null = null;
-  private readonly authProvider_: Provider<FirebaseAuthInternalName>;
-  private readonly appId_: string | null = null;
-  private readonly pool_: XhrIoPool;
+  protected readonly appId_: string | null = null;
   private readonly requests_: Set<Request<unknown>>;
   /**
    * @internal
@@ -157,21 +151,18 @@ export class StorageService {
   protected maxUploadRetryTime_: number;
 
   constructor(
-    app: FirebaseApp | null,
-    authProvider: Provider<FirebaseAuthInternalName>,
-    pool: XhrIoPool,
-    url?: string
+    readonly app: FirebaseApp,
+    readonly authProvider_: Provider<FirebaseAuthInternalName>,
+    readonly pool_: XhrIoPool,
+    readonly url_?: string
   ) {
-    this.app_ = app;
-    this.authProvider_ = authProvider;
     this.maxOperationRetryTime_ = constants.DEFAULT_MAX_OPERATION_RETRY_TIME;
     this.maxUploadRetryTime_ = constants.DEFAULT_MAX_UPLOAD_RETRY_TIME;
     this.requests_ = new Set();
-    this.pool_ = pool;
-    if (url != null) {
-      this.bucket_ = Location.makeFromBucketSpec(url);
+    if (url_ != null) {
+      this.bucket_ = Location.makeFromBucketSpec(url_);
     } else {
-      this.bucket_ = StorageService.extractBucket_(this.app_?.options);
+      this.bucket_ = StorageService.extractBucket_(this.app.options);
     }
   }
 
@@ -200,7 +191,6 @@ export class StorageService {
    */
   deleteApp(): void {
     this.deleted_ = true;
-    this.app_ = null;
     this.requests_.forEach(request => request.cancel());
     this.requests_.clear();
   }
@@ -259,8 +249,4 @@ export class StorageService {
   set maxOperationRetryTime(time: number) {
     this.maxOperationRetryTime_ = time;
   }
-
-  get app(): FirebaseApp | null {
-    return this.app_;
-  }
 }