Merge pull request #926 from transloadit/split-utils

Move single-use utils into their appropriate packages.

packages/@uppy/dashboard/src/FileItem.js

@@ -1,6 +1,6 @@
 const getFileNameAndExtension = require('@uppy/utils/lib/getFileNameAndExtension')
-const truncateString = require('@uppy/utils/lib/truncateString')
-const copyToClipboard = require('@uppy/utils/lib/copyToClipboard')
+const truncateString = require('./truncateString')
+const copyToClipboard = require('./copyToClipboard')
 const prettyBytes = require('prettier-bytes')
 const FileItemProgress = require('./FileItemProgress')
 const getFileTypeIcon = require('./getFileTypeIcon')

packages/@uppy/utils/src/getArrayBuffer.js

@@ -1,15 +0,0 @@
-module.exports = function getArrayBuffer (chunk) {
-  return new Promise(function (resolve, reject) {
-    var reader = new FileReader()
-    reader.addEventListener('load', function (e) {
-      // e.target.result is an ArrayBuffer
-      resolve(e.target.result)
-    })
-    reader.addEventListener('error', function (err) {
-      console.error('FileReader error' + err)
-      reject(err)
-    })
-    // file-type only needs the first 4100 bytes
-    reader.readAsArrayBuffer(chunk)
-  })
-}

packages/@uppy/utils/src/getArrayBuffer.test.js

@@ -1,30 +0,0 @@
-const getArrayBuffer = require('./getArrayBuffer')
-
-describe('getArrayBuffer', () => {
-  beforeEach(() => {
-    global.FileReader = class FileReader {
-      addEventListener (e, cb) {
-        if (e === 'load') {
-          this.loadCb = cb
-        }
-        if (e === 'error') {
-          this.errorCb = cb
-        }
-      }
-      readAsArrayBuffer (chunk) {
-        this.loadCb({ target: { result: new ArrayBuffer(8) } })
-      }
-      }
-  })
-
-  afterEach(() => {
-    global.FileReader = undefined
-  })
-
-  it('should return a promise that resolves with the specified chunk', () => {
-    return getArrayBuffer('abcde').then(buffer => {
-      expect(typeof buffer).toEqual('object')
-      expect(buffer.byteLength).toEqual(8)
-    })
-  })
-})

packages/@uppy/utils/src/runPromiseSequence.js

@@ -1,10 +0,0 @@
-/**
- * Runs an array of promise-returning functions in sequence.
- */
-module.exports = function runPromiseSequence (functions, ...args) {
-  let promise = Promise.resolve()
-  functions.forEach((func) => {
-    promise = promise.then(() => func(...args))
-  })
-  return promise
-}

packages/@uppy/utils/src/runPromiseSequence.test.js

@@ -1,15 +0,0 @@
-const runPromiseSequence = require('./runPromiseSequence')
-
-describe('runPromiseSequence', () => {
-  it('should run an array of promise-returning functions in sequence', () => {
-    const promiseFn1 = jest.fn().mockReturnValue(Promise.resolve)
-    const promiseFn2 = jest.fn().mockReturnValue(Promise.resolve)
-    const promiseFn3 = jest.fn().mockReturnValue(Promise.resolve)
-    return runPromiseSequence([promiseFn1, promiseFn2, promiseFn3])
-        .then(() => {
-          expect(promiseFn1.mock.calls.length).toEqual(1)
-          expect(promiseFn2.mock.calls.length).toEqual(1)
-          expect(promiseFn3.mock.calls.length).toEqual(1)
-        })
-  })
-})

packages/@uppy/utils/types/index.d.ts

@@ -17,10 +17,6 @@ declare module '@uppy/utils/lib/canvasToBlob' {
   export default function canvasToBlob(canvas: HTMLCanvasElement, type: string, quality?: number): Promise<Blob>;
 }
 
-declare module '@uppy/utils/lib/copyToClipboard' {
-  export default function copyToClipboard(text: string, fallbackMessage: string);
-}
-
 declare module '@uppy/utils/lib/dataURItoBlob' {
   export default function dataURItoBlob(dataURI: string, opts: { mimeType?: string, name?: string }): Blob;
 }
@@ -51,10 +47,6 @@ declare module '@uppy/utils/lib/generateFileID' {
   export default function generateFileID(file: object): string;
 }
 
-declare module '@uppy/utils/lib/getArrayBuffer' {
-  export default function getArrayBuffer(file: File): Promise<ArrayBuffer>;
-}
-
 declare module '@uppy/utils/lib/getBytesRemaining' {
   export default function getBytesRemaining(progress: { bytesTotal: number, bytesUploaded: number }): number;
 }
@@ -116,11 +108,6 @@ declare module '@uppy/utils/lib/prettyETA' {
   export default function prettyETA(seconds: number): string;
 }
 
-declare module '@uppy/utils/lib/runPromiseSequence' {
-  type Promiser = (...args: any[]) => Promise<void>;
-  export default function runPromiseSequence(functions: Promiser[], ...args: any[]): Promise<void>;
-}
-
 declare module '@uppy/utils/lib/secondsToTime' {
   export default function secondsToTime(seconds: number): string;
 }
@@ -132,7 +119,3 @@ declare module '@uppy/utils/lib/settle' {
 declare module '@uppy/utils/lib/toArray' {
   export default function toArray(list: any): Array;
 }
-
-declare module '@uppy/utils/lib/truncateString' {
-  export default function truncateString(input: string): string;
-}