优化项目结构 (#504)

Author: yinxulai

package.json

@@ -31,6 +31,10 @@
     {
       "name": "winddies",
       "email": "[email protected]"
+    },
+    {
+      "name": "yinxulai",
+      "email": "[email protected]"
     }
   ],
   "devDependencies": {

src/__tests__/utils.test.ts

@@ -1,7 +1,8 @@
-import { getUploadUrl } from '../api'
-import { DEFAULT_CHUNK_SIZE, Config } from '../upload/base'
+import { DEFAULT_CHUNK_SIZE, Config } from '../upload'
 import { region } from '../config'
 
+import { getUploadUrl } from '.'
+
 jest.mock('../utils', () => ({
   request: () => Promise.resolve({
     data: {

src/__tests__/api.test.ts renamed to src/api/index.test.ts

@@ -1,7 +1,6 @@
-import * as utils from './utils'
-import { regionUphostMap } from './config'
-import { urlSafeBase64Encode } from './base64'
-import { Config, UploadInfo } from './upload'
+import * as utils from '../utils'
+import { regionUphostMap } from '../config'
+import { Config, UploadInfo } from '../upload'
 
 interface UpHosts {
   data: {
@@ -47,7 +46,7 @@ export async function getUploadUrl(config: UploadUrlConfig, token: string): Prom
  */
 function getBaseUrl(bucket: string, key: string | null | undefined, uploadInfo: UploadInfo) {
   const { url, id } = uploadInfo
-  return `${url}/buckets/${bucket}/objects/${key != null ? urlSafeBase64Encode(key) : '~'}/uploads/${id}`
+  return `${url}/buckets/${bucket}/objects/${key != null ? utils.urlSafeBase64Encode(key) : '~'}/uploads/${id}`
 }
 
 export interface InitPartsData {
@@ -69,7 +68,7 @@ export function initUploadParts(
   key: string | null | undefined,
   uploadUrl: string
 ): utils.Response<InitPartsData> {
-  const url = `${uploadUrl}/buckets/${bucket}/objects/${key != null ? urlSafeBase64Encode(key) : '~'}/uploads`
+  const url = `${uploadUrl}/buckets/${bucket}/objects/${key != null ? utils.urlSafeBase64Encode(key) : '~'}/uploads`
   return utils.request<InitPartsData>(
     url,
     {

src/api.ts renamed to src/api/index.ts

@@ -1,9 +1,10 @@
-import { imageView2, imageMogr2, watermark, imageInfo } from '../image'
-import { urlSafeBase64Encode } from '../base64'
+import { urlSafeBase64Encode } from '../utils'
+
+import { imageView2, imageMogr2, watermark } from '.'
 
 describe('image func test', () => {
-    const domain = 'http://otxza7yo2.bkt.clouddn.com'
-    const key = 'test.png'
+  const domain = 'http://otxza7yo2.bkt.clouddn.com'
+  const key = 'test.png'
 
   test('imageView2', () => {
     let m = {
@@ -41,7 +42,7 @@ describe('image func test', () => {
   })
 
   test('watermark', () => {
-    let m ={
+    let m = {
       fop: 'watermark',
       mode: 1,
       image: 'http://www.b1.qiniudn.com/images/logo-2.png',
@@ -56,7 +57,7 @@ describe('image func test', () => {
       '/dissolve/100/dx/100/dy/100'
     )
     m.mode = 3
-    expect(()=> {
+    expect(() => {
       watermark(m, key, domain)
     }).toThrow('mode is wrong')
   })

src/config.ts renamed to src/config/index.ts

@@ -1,5 +1,4 @@
-import { request } from './utils'
-import { urlSafeBase64Encode } from './base64'
+import { request, urlSafeBase64Encode } from '../utils'
 
 export interface ImageViewOptions {
   mode: number

src/__tests__/image.test.ts renamed to src/image/index.test.ts

@@ -1,57 +1,13 @@
-import createUploadManager, { Extra, Config, UploadOptions, UploadProgress } from './upload'
-import { Observable, IObserver } from './observable'
-import { CustomError } from './utils'
-import { UploadCompleteData } from './api'
-import compressImage from './compress'
-import Logger from './logger'
-
-/**
- * @param file 上传文件
- * @param key 目标文件名
- * @param token 上传凭证
- * @param putExtra 上传文件的相关资源信息配置
- * @param config 上传任务的配置
- * @returns 返回用于上传任务的可观察对象
- */
-function upload(
-  file: File,
-  key: string | null | undefined,
-  token: string,
-  putExtra?: Partial<Extra>,
-  config?: Partial<Config>
-): Observable<UploadProgress, CustomError, UploadCompleteData> {
-  const options: UploadOptions = {
-    file,
-    key,
-    token,
-    putExtra,
-    config
-  }
-
-  // 为每个任务创建单独的 Logger
-  const logger = new Logger(token, config?.disableStatisticsReport, config?.debugLogLevel)
-  return new Observable((observer: IObserver<UploadProgress, CustomError, UploadCompleteData>) => {
-    const manager = createUploadManager(options, {
-      onData: (data: UploadProgress) => observer.next(data),
-      onError: (err: CustomError) => observer.error(err),
-      onComplete: (res: any) => observer.complete(res)
-    }, logger)
-    manager.putFile()
-    return manager.stop.bind(manager)
-  })
-}
+export { imageMogr2, watermark, imageInfo, exif, pipeline } from './image'
+export { deleteUploadedChunks, getUploadUrl } from './api'
+export { default as upload } from './upload'
+export { region } from './config'
 
 export {
+  compressImage,
+  CompressResult,
+  urlSafeBase64Encode,
+  urlSafeBase64Decode,
   getHeadersForMkFile,
   getHeadersForChunkUpload
 } from './utils'
-
-export { urlSafeBase64Encode, urlSafeBase64Decode } from './base64'
-
-export { CompressResult } from './compress'
-
-export { deleteUploadedChunks, getUploadUrl } from './api'
-export { imageMogr2, watermark, imageInfo, exif, pipeline } from './image'
-export { region } from './config'
-
-export { upload, compressImage }

src/image.ts renamed to src/image/index.ts

@@ -29,7 +29,7 @@ afterAll(() => {
 })
 
 describe('test logger', () => {
-  test('test level', () => {
+  test('level', () => {
     const infoLogger = new Logger('', true, 'INFO')
     infoLogger.info('test1')
     expect(logMessage).toStrictEqual([`Qiniu-JS-SDK [INFO][1]: `, 'test1'])
@@ -78,7 +78,7 @@ describe('test logger', () => {
     expect(errorMessage).toStrictEqual([])
   })
 
-  test('test unique id', () => {
+  test('unique id', () => {
     // @ts-ignore
     const startId = Logger.id
     new Logger('', true, 'OFF')
@@ -88,7 +88,7 @@ describe('test logger', () => {
     expect(last.id).toStrictEqual(startId + 3)
   })
 
-  test('test report', () => {
+  test('report', () => {
     const logger1 = new Logger('', false, 'OFF')
     logger1.report(null as any)
     expect(isCallReport).toBeTruthy()

src/index.ts

@@ -61,7 +61,7 @@ describe('test report-v3', () => {
     size: 1
   }
 
-  test('test stringify send Data', () => {
+  test('stringify send Data', () => {
     reportV3('token', testData, 3)
     mockXHR.changeStatusAndState(0, 0)
     expect(mockXHR.sendData).toBe([
@@ -78,7 +78,7 @@ describe('test report-v3', () => {
     ].join(','))
   })
 
-  test('test retry', () => {
+  test('retry', () => {
     mockXHR.openCount = 0
     reportV3('token', testData)
     for (let index = 1; index <= 10; index++) {