From 1c09309c27547cd5fc5162f5047f1d05d8d5ca6f Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 19 May 2017 12:26:21 +0100 Subject: [PATCH 1/4] Exported SalesforceId and fixed typo --- types/jsforce/index.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts index 4c0f82b626..bf8f98b574 100644 --- a/types/jsforce/index.d.ts +++ b/types/jsforce/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for archiver 1.8 +// Type definitions for jsforce 1.8 // Project: https://github.com/jsforce/jsforce // Definitions by: Dolan Miu // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -12,3 +12,4 @@ export { Date } from './date-enum'; export { RecordResult } from './record-result'; export { Connection } from './connection'; export { SObject } from './salesforce-object'; +export { SalesforceId } from './salesforce-id'; From e48cabe2bff3350ba38f7f0d9ba8fb50a542ba16 Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 19 May 2017 12:43:33 +0100 Subject: [PATCH 2/4] Added upsert --- types/jsforce/salesforce-object.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts index ac2288fe33..96036376c1 100644 --- a/types/jsforce/salesforce-object.d.ts +++ b/types/jsforce/salesforce-object.d.ts @@ -12,7 +12,7 @@ export class SObject { update(options: SObjectCreateOptions, callback?: (err: Error, ret: any) => void): void; retrieve(ids: string | string[], callback?: (err: Error, ret: any) => void): void; retrieve(ids: string | string[], options?: Object, callback?: (err: Error, ret: any) => void): void; - // upsert(options: SObjectOptions): void; + upsert(records: Record | Record[], extIdField: SalesforceId, options: object, callback?: (err: Error, ret: RecordResult) => void): Promise; describeGlobal(callback: (err: Error, res: any) => void): void; describe$(callback: (err: Error, ret: DescribeSObjectResult) => void): void; describeGlobal$(callback: (err: Error, res: any) => void): void; From f58e431dfccd1564f959ebbe986cd111c97cad8b Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 19 May 2017 12:49:16 +0100 Subject: [PATCH 3/4] Fixed typo --- types/jsforce/salesforce-object.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts index 96036376c1..c416fcc115 100644 --- a/types/jsforce/salesforce-object.d.ts +++ b/types/jsforce/salesforce-object.d.ts @@ -12,7 +12,7 @@ export class SObject { update(options: SObjectCreateOptions, callback?: (err: Error, ret: any) => void): void; retrieve(ids: string | string[], callback?: (err: Error, ret: any) => void): void; retrieve(ids: string | string[], options?: Object, callback?: (err: Error, ret: any) => void): void; - upsert(records: Record | Record[], extIdField: SalesforceId, options: object, callback?: (err: Error, ret: RecordResult) => void): Promise; + upsert(records: Record | Record[], extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult) => void): Promise; describeGlobal(callback: (err: Error, res: any) => void): void; describe$(callback: (err: Error, ret: DescribeSObjectResult) => void): void; describeGlobal$(callback: (err: Error, res: any) => void): void; From f10061da3f143c2f62ae672ab93e91194cccce94 Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 19 May 2017 12:52:35 +0100 Subject: [PATCH 4/4] Used string instead of String Added upsertBulk --- types/jsforce/salesforce-object.d.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts index c416fcc115..12c9b97cf7 100644 --- a/types/jsforce/salesforce-object.d.ts +++ b/types/jsforce/salesforce-object.d.ts @@ -13,6 +13,7 @@ export class SObject { retrieve(ids: string | string[], callback?: (err: Error, ret: any) => void): void; retrieve(ids: string | string[], options?: Object, callback?: (err: Error, ret: any) => void): void; upsert(records: Record | Record[], extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult) => void): Promise; + upsertBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch; describeGlobal(callback: (err: Error, res: any) => void): void; describe$(callback: (err: Error, ret: DescribeSObjectResult) => void): void; describeGlobal$(callback: (err: Error, res: any) => void): void; @@ -30,18 +31,18 @@ export class SObject { compactLayouts(callback?: CompactLayoutInfo): Promise; count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise; create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise; - createBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch; + createBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch; del(ids: string | string[], callback?: (err: Error, ret: any) => void): void; destroy(ids: string | string[], callback?: (err: Error, ret: any) => void): void; delete(ids: string | string[], callback?: (err: Error, ret: any) => void): void; - deleteBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch; - destroyBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch; - destroyHardBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch; + deleteBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch; + destroyBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch; + destroyHardBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch; deleted(start: Date | string, end: Date | string, callback?: (info: DeletedRecordsInfo) => void): Promise; - deleteHardBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch; + deleteHardBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch; describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise; insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise; - insertBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch; + insertBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch; layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise; listview(id: string): ListView; listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise;