@@ -20,7 +20,6 @@ import {promisifyAll} from '@google-cloud/promisify';
2020import compressible = require( 'compressible' ) ;
2121import concat = require( 'concat-stream' ) ;
2222import * as crypto from 'crypto' ;
23- import * as duplexify from 'duplexify' ;
2423import * as extend from 'extend' ;
2524import * as fs from 'fs' ;
2625const hashStreamValidation = require ( 'hash-stream-validation' ) ;
@@ -42,7 +41,8 @@ import {teenyRequest} from 'teeny-request';
4241import { Storage } from './storage' ;
4342import { Bucket } from './bucket' ;
4443import { Acl } from './acl' ;
45- import { ResponseBody , ApiError } from '@google-cloud/common/build/src/util' ;
44+ import { ResponseBody , ApiError , Duplexify , DuplexifyConstructor } from '@google-cloud/common/build/src/util' ;
45+ const duplexify : DuplexifyConstructor = require ( 'duplexify' ) ;
4646import { normalize } from './util' ;
4747
4848export type GetExpirationDateResponse = [ Date ] ;
@@ -728,7 +728,6 @@ class File extends ServiceObject<File> {
728728 parent : bucket ,
729729 baseUrl : '/o' ,
730730 id : encodeURIComponent ( name ) ,
731- requestModule : teenyRequest as typeof r ,
732731 methods,
733732 } ) ;
734733
@@ -2916,8 +2915,8 @@ class File extends ServiceObject<File> {
29162915 *
29172916 * @private
29182917 */
2919- startResumableUpload_ (
2920- dup : duplexify . Duplexify , options : CreateResumableUploadOptions ) : void {
2918+ startResumableUpload_ ( dup : Duplexify , options : CreateResumableUploadOptions ) :
2919+ void {
29212920 options = Object . assign (
29222921 {
29232922 metadata : { } ,
@@ -2966,8 +2965,8 @@ class File extends ServiceObject<File> {
29662965 *
29672966 * @private
29682967 */
2969- startSimpleUpload_ (
2970- dup : duplexify . Duplexify , options ?: CreateResumableUploadOptions ) : void {
2968+ startSimpleUpload_ ( dup : Duplexify , options ?: CreateResumableUploadOptions ) :
2969+ void {
29712970 options = Object . assign (
29722971 {
29732972 metadata : { } ,
@@ -3002,7 +3001,7 @@ class File extends ServiceObject<File> {
30023001 }
30033002
30043003 util . makeWritableStream ( dup , {
3005- makeAuthenticatedRequest : reqOpts => {
3004+ makeAuthenticatedRequest : ( reqOpts : object ) => {
30063005 this . request ( reqOpts as DecorateRequestOptions , ( err , body , resp ) => {
30073006 if ( err ) {
30083007 dup . destroy ( err ) ;
@@ -3015,8 +3014,7 @@ class File extends ServiceObject<File> {
30153014 } ) ;
30163015 } ,
30173016 metadata : options . metadata ,
3018- request : reqOpts ,
3019- requestModule : teenyRequest as typeof r ,
3017+ request : reqOpts
30203018 } ) ;
30213019 }
30223020}
0 commit comments