@uppy/url: migrate to TS

transloadit · Mar 10, 2024 · 102d8f8 · 102d8f8
1 parent c352d27
commit 102d8f8
Show file tree

Hide file tree

Showing 13 changed files with 382 additions and 251 deletions.
diff --git a/packages/@uppy/provider-views/src/View.ts b/packages/@uppy/provider-views/src/View.ts
@@ -2,38 +2,12 @@ import type {
  UnknownProviderPlugin,
  UnknownSearchProviderPlugin,
 } from '@uppy/core/lib/Uppy'
-import type { Body, Meta } from '@uppy/utils/lib/UppyFile'
+import type { Body, Meta, TagFile } from '@uppy/utils/lib/UppyFile'
 import type { CompanionFile } from '@uppy/utils/lib/CompanionFile'
 import getFileType from '@uppy/utils/lib/getFileType'
 import isPreviewSupported from '@uppy/utils/lib/isPreviewSupported'
 import remoteFileObjToLocal from '@uppy/utils/lib/remoteFileObjToLocal'
 
-type TagFile<M extends Meta> = {
- id: string
- source: string
- data: Blob
- name: string
- type: string
- isRemote: boolean
- preview?: string
- meta: {
- authorName?: string
- authorUrl?: string
- relativePath?: string | null
- absolutePath?: string
- } & M
- remote: {
- companionUrl: string
- url: string
- body: {
- fileId: string
- }
- providerName: string
- provider: string
- requestClientId: string
- }
-}
-
 type PluginType = 'Provider' | 'SearchProvider'
 
 // Conditional type for selecting the plugin
@@ -155,7 +129,6 @@ export default class View<
  name: file.name || file.id,
  type: file.mimeType,
  isRemote: true,
- // @ts-expect-error meta is filled conditionally below
  data: file,
  // @ts-expect-error meta is filled conditionally below
  meta: {},
@@ -184,17 +157,17 @@ export default class View<
 
  if (file.author) {
  if (file.author.name != null)
- tagFile.meta.authorName = String(file.author.name)
- if (file.author.url) tagFile.meta.authorUrl = file.author.url
+ tagFile.meta!.authorName = String(file.author.name)
+ if (file.author.url) tagFile.meta!.authorUrl = file.author.url
  }
 
  // add relativePath similar to non-remote files: https://github.com/transloadit/uppy/pull/4486#issuecomment-1579203717
  if (file.relDirPath != null)
- tagFile.meta.relativePath =
+ tagFile.meta!.relativePath =
  file.relDirPath ? `${file.relDirPath}/${tagFile.name}` : null
  // and absolutePath (with leading slash) https://github.com/transloadit/uppy/pull/4537#issuecomment-1614236655
  if (file.absDirPath != null)
- tagFile.meta.absolutePath =
+ tagFile.meta!.absolutePath =
  file.absDirPath ?
  `/${file.absDirPath}/${tagFile.name}`
  : `/${tagFile.name}`

diff --git a/packages/@uppy/provider-views/src/index.ts b/packages/@uppy/provider-views/src/index.ts
@@ -2,4 +2,5 @@ export {
  default as ProviderViews,
  defaultPickerIcon,
 } from './ProviderView/index.ts'
+
 export { default as SearchProviderViews } from './SearchProviderView/index.ts'
diff --git a/packages/@uppy/url/.npmignore b/packages/@uppy/url/.npmignore
@@ -0,0 +1 @@
+tsconfig.*
diff --git a/packages/@uppy/url/src/Url.jsx b/packages/@uppy/url/src/Url.jsx