Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding Promise overload type to functions #221

Draft
wants to merge 9 commits into
base: dev
Choose a base branch
from
Draft

Adding Promise overload type to functions #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
45d6c92
Add promise overload to mobileSync
jpmonette Feb 17, 2021
5038fff
Add promise overload to oauth
jpmonette Feb 17, 2021
3cb6802
Add promise overload to smartStore
jpmonette Feb 17, 2021
fcc153b
Rename oauth overload types
jpmonette Feb 17, 2021
3ee0e46
Rename mobileSync overload types
jpmonette Feb 17, 2021
5e975a5
Add promise overload to net
jpmonette Feb 17, 2021
6a346c4
Ignore .DS_Store
jpmonette Feb 17, 2021
dfd0d57
Update sync up/down target types
jpmonette Feb 17, 2021
9e4872e
Export types from .ts file
jpmonette Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.circleci/fastlane/README.md
.circleci/fastlane/report.*
.circleci/test_output/
.DS_Store
dist
node_modules/
package-lock.json
yarn.lock
Podfile.lock
yarn.lock
216 changes: 100 additions & 116 deletions src/react.force.mobilesync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,19 @@
import { NativeModules } from "react-native";
import { exec as forceExec, ExecErrorCallback, ExecSuccessCallback } from "./react.force.common";
import { StoreConfig } from "./react.force.smartstore";
import { SyncDownTarget, SyncEvent, SyncMethod, SyncOptions, SyncStatus } from "./typings/mobilesync";
import {
CleanResyncGhosts,
DeleteSync,
GetSyncStatus,
ReSync,
SyncDown,
SyncDownTarget,
SyncEvent,
SyncMethod,
SyncOptions,
SyncStatus,
SyncUp,
} from "./typings/mobilesync";

const { MobileSyncReactBridge, SFMobileSyncReactBridge } = NativeModules;

Expand All @@ -48,70 +60,51 @@ const checkFirstArg = (arg: StoreConfig) => {
};

const exec = <T>(
successCB: ExecSuccessCallback<T>,
errorCB: ExecErrorCallback,
successCB: ExecSuccessCallback<T> | undefined,
errorCB: ExecErrorCallback | undefined,
methodName: SyncMethod,
args: Record<string, unknown>,
) => {
forceExec(
"SFMobileSyncReactBridge",
"MobileSyncReactBridge",
SFMobileSyncReactBridge,
MobileSyncReactBridge,
successCB,
errorCB,
methodName,
args,
);
};

type SyncDownOverload = {
(
storeConfig: StoreConfig,
target: SyncDownTarget,
soupName: string,
options: SyncOptions,
syncName: string,
successCB: ExecSuccessCallback<SyncEvent>,
errorCB: ExecErrorCallback,
): void;
(
storeConfig: StoreConfig,
target: SyncDownTarget,
soupName: string,
options: SyncOptions,
successCB: ExecSuccessCallback<SyncEvent>,
errorCB: ExecErrorCallback,
): void;
): Promise<T> | void => {
if (successCB && errorCB) {
forceExec(
"SFMobileSyncReactBridge",
"MobileSyncReactBridge",
SFMobileSyncReactBridge,
MobileSyncReactBridge,
successCB,
errorCB,
methodName,
args,
);
} else {
return new Promise((resolve, reject) => {
forceExec(
"SFMobileSyncReactBridge",
"MobileSyncReactBridge",
SFMobileSyncReactBridge,
MobileSyncReactBridge,
resolve,
reject,
methodName,
args,
);
});
}
};

export const syncDown: SyncDownOverload = (
export const syncDown: SyncDown = (
storeConfig: StoreConfig,
target: SyncDownTarget,
soupName: string,
options: SyncOptions,
x: string | ExecSuccessCallback<SyncEvent>,
y: ExecSuccessCallback<SyncEvent> | ExecErrorCallback,
z?: ExecErrorCallback,
): void => {
x?: any,
y?: any,
z?: any,
): any => {
storeConfig = checkFirstArg(storeConfig);
const { syncName, successCB, errorCB } = processOpts(x, y, z);

let syncName: string | undefined;
let successCB: ExecSuccessCallback<SyncEvent>;
let errorCB: ExecErrorCallback;

// syncName optional (new in 6.0)
if (typeof x === "function") {
syncName = undefined;
successCB = x;
errorCB = y as ExecErrorCallback;
} else {
syncName = x;
successCB = y as ExecSuccessCallback<SyncEvent>;
errorCB = z as ExecErrorCallback;
}

exec<SyncEvent>(successCB, errorCB, "syncDown", {
return exec<SyncEvent>(successCB, errorCB, "syncDown", {
target: target,
soupName: soupName,
options: options,
Expand All @@ -121,82 +114,50 @@ export const syncDown: SyncDownOverload = (
});
};

export const reSync = (
export const reSync: ReSync = (
storeConfig: StoreConfig,
syncIdOrName: string,
successCB: ExecSuccessCallback<SyncEvent>,
errorCB: ExecErrorCallback,
): void => {
successCB?: ExecSuccessCallback<SyncEvent>,
errorCB?: ExecErrorCallback,
): any => {
storeConfig = checkFirstArg(storeConfig);
exec(successCB, errorCB, "reSync", {

return exec(successCB, errorCB, "reSync", {
syncId: typeof syncIdOrName === "string" ? null : syncIdOrName,
syncName: typeof syncIdOrName === "string" ? syncIdOrName : null,
isGlobalStore: storeConfig.isGlobalStore,
storeName: storeConfig.storeName,
});
};

export const cleanResyncGhosts = (
export const cleanResyncGhosts: CleanResyncGhosts = (
storeConfig: StoreConfig,
syncId: string,
successCB: ExecSuccessCallback<unknown>,
errorCB: ExecErrorCallback,
): void => {
successCB?: ExecSuccessCallback<unknown>,
errorCB?: ExecErrorCallback,
): any => {
storeConfig = checkFirstArg(storeConfig);
exec(successCB, errorCB, "cleanResyncGhosts", {

return exec(successCB, errorCB, "cleanResyncGhosts", {
syncId: syncId,
isGlobalStore: storeConfig.isGlobalStore,
storeName: storeConfig.storeName,
});
};

type SyncUpOverload = {
(
storeConfig: StoreConfig,
target: SyncDownTarget,
soupName: string,
options: SyncOptions,
syncName: string,
successCB: ExecSuccessCallback<SyncEvent>,
errorCB: ExecErrorCallback,
): void;
(
storeConfig: StoreConfig,
target: SyncDownTarget,
soupName: string,
options: SyncOptions,
successCB: ExecSuccessCallback<SyncEvent>,
errorCB: ExecErrorCallback,
): void;
};

export const syncUp: SyncUpOverload = (
export const syncUp: SyncUp = (
storeConfig: StoreConfig,
target: SyncDownTarget,
soupName: string,
options: SyncOptions,
x: string | ExecSuccessCallback<SyncEvent>,
y: ExecSuccessCallback<SyncEvent> | ExecErrorCallback,
z?: ExecErrorCallback,
): void => {
x?: any,
y?: any,
z?: any,
): any => {
storeConfig = checkFirstArg(storeConfig);
const { syncName, successCB, errorCB } = processOpts(x, y, z);

let syncName: string | undefined;
let successCB: ExecSuccessCallback<SyncEvent>;
let errorCB: ExecErrorCallback;

// syncName optional (new in 6.0)
if (typeof x === "function") {
syncName = undefined;
successCB = x;
errorCB = y as ExecErrorCallback;
} else {
syncName = x;
successCB = y as ExecSuccessCallback<SyncEvent>;
errorCB = z as ExecErrorCallback;
}

exec(successCB, errorCB, "syncUp", {
return exec(successCB, errorCB, "syncUp", {
target: target,
soupName: soupName,
options: options,
Expand All @@ -206,29 +167,31 @@ export const syncUp: SyncUpOverload = (
});
};

export const getSyncStatus = (
export const getSyncStatus: GetSyncStatus = (
storeConfig: StoreConfig,
syncIdOrName: string,
successCB: ExecSuccessCallback<SyncStatus>,
errorCB: ExecErrorCallback,
): void => {
successCB?: ExecSuccessCallback<SyncStatus>,
errorCB?: ExecErrorCallback,
): any => {
storeConfig = checkFirstArg(storeConfig);
exec(successCB, errorCB, "getSyncStatus", {

return exec(successCB, errorCB, "getSyncStatus", {
syncId: typeof syncIdOrName === "string" ? null : syncIdOrName,
syncName: typeof syncIdOrName === "string" ? syncIdOrName : null,
isGlobalStore: storeConfig.isGlobalStore,
storeName: storeConfig.storeName,
});
};

export const deleteSync = (
export const deleteSync: DeleteSync = (
storeConfig: StoreConfig,
syncIdOrName: string,
successCB: ExecSuccessCallback<unknown>,
errorCB: ExecErrorCallback,
): void => {
successCB?: ExecSuccessCallback<unknown>,
errorCB?: ExecErrorCallback,
): any => {
storeConfig = checkFirstArg(storeConfig);
exec(successCB, errorCB, "deleteSync", {

return exec(successCB, errorCB, "deleteSync", {
syncId: typeof syncIdOrName === "string" ? null : syncIdOrName,
syncName: typeof syncIdOrName === "string" ? syncIdOrName : null,
isGlobalStore: storeConfig.isGlobalStore,
Expand All @@ -240,3 +203,24 @@ export const MERGE_MODE = {
OVERWRITE: "OVERWRITE",
LEAVE_IF_CHANGED: "LEAVE_IF_CHANGED",
};

const processOpts = (x: any, y: any, z: any) => {
let syncName: string | undefined;
let successCB: ExecSuccessCallback<SyncEvent> | undefined;
let errorCB: ExecErrorCallback | undefined;

// syncName optional (new in 6.0)
if (typeof x === "string") {
syncName = x;
}

if (typeof x === "function") {
successCB = x as ExecSuccessCallback<SyncEvent>;
errorCB = y as ExecErrorCallback;
} else if (typeof z === "function") {
successCB = y as ExecSuccessCallback<SyncEvent>;
errorCB = z as ExecErrorCallback;
}

return { syncName, successCB, errorCB };
};
Loading