Merge pull request #55 from KnorpelSenf/fix-upload-type

Fix type of task upload, allow using tasks from within jobs

Author: josiasmontag

lib/JobsResource.ts

@@ -16,7 +16,7 @@ export interface Job {
     tasks: JobTask[];
 }
 type NotPresentWhenInsideJob = 'job_id' | 'status'
-interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
+export interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
     name: string;
     status: JobTaskStatus;
 }

lib/TasksResource.ts

@@ -1,5 +1,6 @@
 import FormData, { Stream } from 'form-data';
 import CloudConvert from './CloudConvert';
+import { JobTask } from './JobsResource';
 
 export type TaskEvent = 'created' | 'updated' | 'finished' | 'failed';
 export type TaskStatus = 'waiting' | 'processing' | 'finished' | 'error';
@@ -359,7 +360,7 @@ export default class TasksResource {
         await this.cloudConvert.axios.delete('tasks/' + id);
     }
 
-    async upload(task: Task, stream: Stream): Promise<any> {
+    async upload(task: Task | JobTask, stream: Stream): Promise<any> {
 
         if (task.operation !== 'import/upload') {
             throw new Error('The task operation is not import/upload');