packages/components/upload/src/use-handlers.ts (1)

61-114: Use optional chaining for optional callback invocations to avoid runtime errors.

The non-null assertions on onChange, onError, onProgress, onSuccess, and onRemove assume these optional callbacks are always defined. While the component's current implementation provides NOOP defaults via withDefaults(), using optional chaining makes the code more defensive and safer if useHandlers is called elsewhere without guaranteed defaults.

Safer pattern with optional chaining

  const emitChange = (file: UploadFile) => {
-   nextTick(() => props.onChange!(file, uploadFiles.value))
+   nextTick(() => props.onChange?.(file, uploadFiles.value))
  }

  const handleError: UploadContentProps['onError'] = (err, rawFile) => {
    const file = getFile(rawFile)
    if (!file) return
    console.error(err)
    file.status = 'fail'
    removeFile(file)
-   props.onError!(err, file, uploadFiles.value)
+   props.onError?.(err, file, uploadFiles.value)
    emitChange(file)
  }

  const handleProgress: UploadContentProps['onProgress'] = (evt, rawFile) => {
    const file = getFile(rawFile)
    if (!file) return
-   props.onProgress!(evt, file, uploadFiles.value)
+   props.onProgress?.(evt, file, uploadFiles.value)
    file.status = 'uploading'
    file.percentage = Math.round(evt.percent)
  }

  const handleSuccess: UploadContentProps['onSuccess'] = (response, rawFile) => {
    const file = getFile(rawFile)
    if (!file) return
    file.status = 'success'
    file.response = response
-   props.onSuccess!(response, file, uploadFiles.value)
+   props.onSuccess?.(response, file, uploadFiles.value)
    emitChange(file)
  }

  const handleStart: UploadContentProps['onStart'] = (file) => {
    if (isNil(file.uid)) file.uid = genFileId()
    const uploadFile: UploadFile = {
      name: file.name,
      percentage: 0,
      status: 'ready',
      size: file.size,
      raw: file,
      uid: file.uid,
    }
    if (props.listType === 'picture-card' || props.listType === 'picture') {
      try {
        uploadFile.url = URL.createObjectURL(file)
      } catch (err: unknown) {
        debugWarn(SCOPE, (err as Error).message)
-       props.onError!(err as Error, uploadFile, uploadFiles.value)
+       props.onError?.(err as Error, uploadFile, uploadFiles.value)
      }
    }
    uploadFiles.value = [...uploadFiles.value, uploadFile]
    emitChange(uploadFile)
  }

  const handleRemove: UploadContentProps['onRemove'] = async (file): Promise<void> => {
    const uploadFile = file instanceof File ? getFile(file) : file
    if (!uploadFile) throwError(SCOPE, 'file to be removed not found')
    const doRemove = (file: UploadFile) => {
      abort(file)
      removeFile(file)
-     props.onRemove!(file, uploadFiles.value)
+     props.onRemove?.(file, uploadFiles.value)
      revokeFileObjectURL(file)
    }
    if (props.beforeRemove) {
      const before = await props.beforeRemove(uploadFile, uploadFiles.value)
      if (before !== false) doRemove(uploadFile)
    } else {
      doRemove(uploadFile)
    }
  }

  watch(
    () => props.listType,
    (val) => {
      if (val !== 'picture-card' && val !== 'picture') {
        return
      }
      uploadFiles.value = uploadFiles.value.map((file) => {
        const { raw, url } = file
        if (!url && raw) {
          try {
            file.url = URL.createObjectURL(raw)
          } catch (err: unknown) {
-           props.onError!(err as Error, file, uploadFiles.value)
+           props.onError?.(err as Error, file, uploadFiles.value)
          }
        }
        return file
      })
    }
  )

packages/components/upload/src/upload-content.vue (1)

45-89: Fix fileList default to include the as const type assertion for parity with uploadBaseProps.

The inline default for fileList is missing the as const assertion. In uploadBaseProps, it's defined as () => mutable([] as const), but in the component's withDefaults it's () => mutable([]). Align the two to maintain type consistency.

Current mismatch

uploadBaseProps (upload.ts:277):

fileList: {
  type: definePropType<UploadUserFile[]>(Array),
  default: () => mutable([] as const),
}

upload-content.vue (withDefaults):

fileList: () => mutable([]),

Should be:

fileList: () => mutable([] as const),