Introduce @tus/utils to simplify building/publishing

tus · Jan 29, 2024 · ef6c269 · ef6c269
1 parent 436b4a8
commit ef6c269
Show file tree

Hide file tree

Showing 63 changed files with 348 additions and 215 deletions.
diff --git a/packages/file-store/configstores/FileConfigstore.ts b/packages/file-store/configstores/FileConfigstore.ts
diff --git a/packages/file-store/configstores/MemoryConfigstore.ts b/packages/file-store/configstores/MemoryConfigstore.ts
diff --git a/packages/file-store/configstores/RedisConfigstore.ts b/packages/file-store/configstores/RedisConfigstore.ts
diff --git a/packages/file-store/configstores/Types.ts b/packages/file-store/configstores/Types.ts
diff --git a/packages/file-store/configstores/index.ts b/packages/file-store/configstores/index.ts
@@ -1,4 +1,6 @@
-export {FileConfigstore} from './FileConfigstore'
-export {MemoryConfigstore} from './MemoryConfigstore'
-export {RedisConfigstore} from './RedisConfigstore'
-export {Configstore} from './Types'
+export {
+  FileKvStore as FileConfigstore,
+  MemoryKvStore as MemoryConfigstore,
+  RedisKvStore as RedisConfigstore,
+  KvStore as Configstore,
+} from '@tus/utils'
diff --git a/packages/file-store/index.ts b/packages/file-store/index.ts
@@ -8,7 +8,7 @@ import http from 'node:http'
 import debug from 'debug'
 
 import {Configstore, FileConfigstore} from './configstores'
-import {DataStore, Upload, ERRORS} from '@tus/server'
+import {DataStore, Upload, ERRORS} from '@tus/utils'
 
 export * from './configstores'
 

diff --git a/packages/file-store/package.json b/packages/file-store/package.json
@@ -21,10 +21,10 @@
     "test": "mocha test.ts --exit --extension ts --require ts-node/register"
   },
   "dependencies": {
+    "@tus/utils": "workspace:*",
     "debug": "^4.3.4"
   },
   "devDependencies": {
-    "@tus/server": "workspace:^",
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.11.5",
@@ -34,9 +34,6 @@
     "should": "^13.2.3",
     "typescript": "^5.3.3"
   },
-  "peerDependencies": {
-    "@tus/server": "workspace:^"
-  },
   "optionalDependencies": {
     "@redis/client": "^1.5.13"
   },

diff --git a/packages/file-store/test.ts b/packages/file-store/test.ts
@@ -8,7 +8,7 @@ import path from 'node:path'
 import sinon from 'sinon'
 
 import {FileStore, FileConfigstore} from './'
-import {Upload} from '@tus/server'
+import {Upload} from '@tus/utils'
 
 import * as shared from '../../test/stores.test'
 

diff --git a/packages/gcs-store/index.ts b/packages/gcs-store/index.ts
@@ -3,8 +3,7 @@ import stream from 'node:stream'
 import http from 'node:http'
 import debug from 'debug'
 
-import {ERRORS, TUS_RESUMABLE} from '@tus/server'
-import {Upload, DataStore} from '@tus/server'
+import {ERRORS, TUS_RESUMABLE, Upload, DataStore} from '@tus/utils'
 
 const log = debug('tus-node-server:stores:gcsstore')
 

diff --git a/packages/gcs-store/package.json b/packages/gcs-store/package.json
@@ -21,6 +21,7 @@
     "test": "mocha test.ts --timeout 30000 --exit --extension ts --require ts-node/register"
   },
   "dependencies": {
+    "@tus/utils": "workspace:*",
     "debug": "^4.3.4"
   },
   "devDependencies": {
@@ -36,8 +37,7 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@google-cloud/storage": "*",
-    "@tus/server": "workspace:^"
+    "@google-cloud/storage": "*"
   },
   "engines": {
     "node": ">=16"

diff --git a/packages/s3-store/index.ts b/packages/s3-store/index.ts
@@ -15,7 +15,7 @@ import {
   TUS_RESUMABLE,
   KvStore,
   MemoryKvStore,
-} from '@tus/server'
+} from '@tus/utils'
 
 const log = debug('tus-node-server:stores:s3store')
 

diff --git a/packages/s3-store/package.json b/packages/s3-store/package.json
@@ -22,10 +22,10 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.490.0",
+    "@tus/utils": "workspace:*",
     "debug": "^4.3.4"
   },
   "devDependencies": {
-    "@tus/server": "workspace:^",
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.11.5",
@@ -35,9 +35,6 @@
     "should": "^13.2.3",
     "typescript": "^5.3.3"
   },
-  "peerDependencies": {
-    "@tus/server": "workspace:^"
-  },
   "engines": {
     "node": ">=16"
   }

diff --git a/packages/s3-store/test.ts b/packages/s3-store/test.ts
@@ -7,7 +7,7 @@ import sinon from 'sinon'
 
 import {S3Store} from './'
 import * as shared from '../../test/stores.test'
-import {Upload, Uid} from '@tus/server'
+import {Upload, Uid} from '@tus/utils'
 
 const fixturesPath = path.resolve('../', '../', 'test', 'fixtures')
 const storePath = path.resolve('../', '../', 'test', 'output')

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -21,6 +21,7 @@
     "test": "mocha --timeout 40000 --exit --extension ts --require ts-node/register"
   },
   "dependencies": {
+    "@tus/utils": "workspace:*",
     "debug": "^4.3.4"
   },
   "devDependencies": {

diff --git a/packages/server/src/handlers/BaseHandler.ts b/packages/server/src/handlers/BaseHandler.ts
@@ -1,13 +1,11 @@
 import EventEmitter from 'node:events'
 
 import type {ServerOptions} from '../types'
-import type {DataStore, CancellationContext} from '../models'
+import type {DataStore, CancellationContext} from '@tus/utils'
 import type http from 'node:http'
-import {Upload} from '../models'
-import {ERRORS} from '../constants'
+import {ERRORS, Upload, StreamLimiter} from '@tus/utils'
 import stream from 'node:stream/promises'
 import {addAbortSignal, PassThrough} from 'stream'
-import {StreamLimiter} from '../models/StreamLimiter'
 
 const reExtractFileID = /([^/]+)\/?$/
 const reForwardedHost = /host="?([^";]+)/

diff --git a/packages/server/src/handlers/DeleteHandler.ts b/packages/server/src/handlers/DeleteHandler.ts
@@ -1,6 +1,5 @@
 import {BaseHandler} from './BaseHandler'
-import {ERRORS, EVENTS} from '../constants'
-import {CancellationContext} from '../models'
+import {ERRORS, EVENTS, CancellationContext} from '@tus/utils'
 
 import type http from 'node:http'
 

diff --git a/packages/server/src/handlers/GetHandler.ts b/packages/server/src/handlers/GetHandler.ts
@@ -1,7 +1,7 @@
 import stream from 'node:stream'
 
 import {BaseHandler} from './BaseHandler'
-import {ERRORS} from '../constants'
+import {ERRORS} from '@tus/utils'
 
 import type http from 'node:http'
 import type {RouteHandler} from '../types'

diff --git a/packages/server/src/handlers/HeadHandler.ts b/packages/server/src/handlers/HeadHandler.ts
@@ -1,7 +1,6 @@
 import {BaseHandler} from './BaseHandler'
 
-import {ERRORS} from '../constants'
-import {Metadata, Upload, CancellationContext} from '../models'
+import {ERRORS, Metadata, Upload, CancellationContext} from '@tus/utils'
 
 import type http from 'node:http'
 

diff --git a/packages/server/src/handlers/OptionsHandler.ts b/packages/server/src/handlers/OptionsHandler.ts
@@ -1,5 +1,5 @@
 import {BaseHandler} from './BaseHandler'
-import {ALLOWED_METHODS, MAX_AGE, HEADERS} from '../constants'
+import {ALLOWED_METHODS, MAX_AGE, HEADERS} from '@tus/utils'
 
 import type http from 'node:http'
 

diff --git a/packages/server/src/handlers/PatchHandler.ts b/packages/server/src/handlers/PatchHandler.ts
@@ -1,10 +1,9 @@
 import debug from 'debug'
 
 import {BaseHandler} from './BaseHandler'
-import {ERRORS, EVENTS} from '../constants'
 
 import type http from 'node:http'
-import {CancellationContext, Upload} from '../models'
+import {ERRORS, EVENTS, CancellationContext, Upload} from '@tus/utils'
 
 const log = debug('tus-node-server:handlers:patch')
 

diff --git a/packages/server/src/handlers/PostHandler.ts b/packages/server/src/handlers/PostHandler.ts
@@ -1,13 +1,19 @@
 import debug from 'debug'
 
 import {BaseHandler} from './BaseHandler'
-import {Upload, Uid, Metadata} from '../models'
+import {
+  Upload,
+  Uid,
+  Metadata,
+  EVENTS,
+  ERRORS,
+  DataStore,
+  CancellationContext,
+} from '@tus/utils'
 import {validateHeader} from '../validators/HeaderValidator'
-import {EVENTS, ERRORS} from '../constants'
 
 import type http from 'node:http'
 import type {ServerOptions, WithRequired} from '../types'
-import {DataStore, CancellationContext} from '../models'
 
 const log = debug('tus-node-server:handlers:post')
 

diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
@@ -1,6 +1,4 @@
 export {Server} from './server'
 export * from './types'
-export * from './models'
 export * from './lockers'
-export * from './constants'
-export * from './kvstores'
+export * from '@tus/utils'
diff --git a/packages/server/src/lockers/MemoryLocker.ts b/packages/server/src/lockers/MemoryLocker.ts
@@ -1,5 +1,4 @@
-import {ERRORS} from '../constants'
-import {Lock, Locker, RequestRelease} from '../models'
+import {ERRORS, Lock, Locker, RequestRelease} from '@tus/utils'
 
 /**
  * MemoryLocker is an implementation of the Locker interface that manages locks in memory.

diff --git a/packages/server/src/server.ts b/packages/server/src/server.ts
@@ -11,17 +11,11 @@ import {PostHandler} from './handlers/PostHandler'
 import {DeleteHandler} from './handlers/DeleteHandler'
 import {validateHeader} from './validators/HeaderValidator'
 
-import {
-  EVENTS,
-  ERRORS,
-  EXPOSED_HEADERS,
-  REQUEST_METHODS,
-  TUS_RESUMABLE,
-} from './constants'
+import {EVENTS, ERRORS, EXPOSED_HEADERS, REQUEST_METHODS, TUS_RESUMABLE} from '@tus/utils'
 
 import type stream from 'node:stream'
 import type {ServerOptions, RouteHandler, WithOptional} from './types'
-import type {DataStore, Upload, CancellationContext} from './models'
+import type {DataStore, Upload, CancellationContext} from '@tus/utils'
 import {MemoryLocker} from './lockers'
 
 type Handlers = {

diff --git a/packages/server/src/types.ts b/packages/server/src/types.ts
@@ -1,6 +1,6 @@
 import type http from 'node:http'
 
-import type {Locker, Upload} from './models'
+import type {Locker, Upload} from '@tus/utils'
 
 /**
  * Represents the configuration options for a server.

diff --git a/packages/server/src/validators/HeaderValidator.ts b/packages/server/src/validators/HeaderValidator.ts
@@ -1,5 +1,4 @@
-import {TUS_VERSION, TUS_RESUMABLE} from '../constants'
-import {Metadata} from '../models'
+import {TUS_VERSION, TUS_RESUMABLE, Metadata} from '@tus/utils'
 
 type validator = (value?: string) => boolean