Skip to content

Commit 98f0758

Browse files
committed
0.11.1 - Export all 'SyncSettingsBuilder' interface
1 parent 4343fa1 commit 98f0758

File tree

3 files changed

+52
-48
lines changed

3 files changed

+52
-48
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
44

55

66
--------
7-
### [0.11.0](N/A) - 2021-06-12
7+
### [0.11.1](N/A) - 2021-08-06
8+
#### Changed
9+
* Export all SyncSettingsBuilder interfaces
10+
11+
12+
--------
13+
### [0.11.0](https://github.com/TeamworkGuy2/lokijs-collections-syncing/commit/4343fa18f68d09c2b43745bfd3723eaa1c099683) - 2021-06-12
814
#### Changed
915
* Update to TypeScript 4.3
1016

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lokijs-collections-syncing",
3-
"version": "0.11.0",
3+
"version": "0.11.1",
44
"description": "lokijs-collections syncing to and from a remote data source",
55
"author": "TeamworkGuy2",
66
"homepage": "https://github.com/TeamworkGuy2/lokijs-collections-syncing",

sync/SyncSettingsBuilder.ts

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @author TeamworkGuy2
2323
* @since 2016-3-7
2424
*/
25-
class SyncSettingsBuilder<E extends F, F, P, S, U, R> implements SettingsBuilder<E, F> {
25+
class SyncSettingsBuilder<E extends F, F, P, S, U, R> implements SyncSettingsBuilder.SettingsBuilder<E, F> {
2626
// sync settings
2727
localCollection!: DataCollection<E, F>;
2828
primaryKeys!: (keyof E & string)[];
@@ -112,7 +112,7 @@ class SyncSettingsBuilder<E extends F, F, P, S, U, R> implements SettingsBuilder
112112
copyObjectFunc: (item: E) => E,
113113
convertUrlToSyncDownFunc: (url: string) => (params: any) => PsPromise<any[], R>,
114114
convertUrlToSyncUpFunc: (url: string) => (params: any, items: any[]) => PsPromise<any, R>
115-
): SyncDownBuilderWithUrl<E, F> & SyncUpBuilderWithUrl<E, F> {
115+
): SyncSettingsBuilder.SyncDownBuilderWithUrl<E, F> & SyncSettingsBuilder.SyncUpBuilderWithUrl<E, F> {
116116

117117
var inst = new SyncSettingsBuilder<E, F, any, any, any, R>();
118118
inst.localCollection = localCollection;
@@ -132,7 +132,7 @@ class SyncSettingsBuilder<E extends F, F, P, S, U, R> implements SettingsBuilder
132132
hasPrimaryKeyCheckers: ((obj: E) => boolean) | ((obj: E) => boolean)[],
133133
findFilterFunc: (item: any) => any,
134134
copyObjectFunc: (item: E) => E
135-
): SyncDownBuilder<E, F> & SyncUpBuilder<E, F> {
135+
): SyncSettingsBuilder.SyncDownBuilder<E, F> & SyncSettingsBuilder.SyncUpBuilder<E, F> {
136136

137137
var inst = new SyncSettingsBuilder<E, F, any, any, any, R>();
138138
inst.localCollection = localCollection;
@@ -144,7 +144,7 @@ class SyncSettingsBuilder<E extends F, F, P, S, U, R> implements SettingsBuilder
144144
}
145145

146146

147-
public static fromSettingsObj<E extends F, F, S, R>(settings: SyncSettings<E, F, S, R>): SyncDownBuilder<E, F> & SyncUpBuilder<E, F> {
147+
public static fromSettingsObj<E extends F, F, S, R>(settings: SyncSettings<E, F, S, R>): SyncSettingsBuilder.SyncDownBuilder<E, F> & SyncSettingsBuilder.SyncUpBuilder<E, F> {
148148
var inst = new SyncSettingsBuilder<E, F, S, any, any, R>();
149149
inst.localCollection = settings.localCollection;
150150
inst.primaryKeys = settings.primaryKeys;
@@ -159,7 +159,7 @@ class SyncSettingsBuilder<E extends F, F, P, S, U, R> implements SettingsBuilder
159159
localCollection: DataCollection<E, F>,
160160
syncDownFunc: (params: P) => PsPromise<S[], R>,
161161
syncUpFunc: (params: P, items: S[]) => PsPromise<U, R>
162-
): { addFilterFuncs: (findFilterFunc: (item: S) => F) => BuilderEnd<E, F, P, S, U, R> } {
162+
): { addFilterFuncs: (findFilterFunc: (item: S) => F) => SyncSettingsBuilder.BuilderEnd<E, F, P, S, U, R> } {
163163

164164
var collModel = localCollection.getDataModel();
165165
var collFuncs = <DtoAllFuncs<E, S>>localCollection.getDataModelFuncs();
@@ -270,58 +270,56 @@ module SyncSettingsBuilder {
270270

271271
}
272272

273-
}
274-
275273

276-
// ==== interfaces for building sync settings ====
277-
interface SettingsBuilder<E extends F, F> {
278-
addSettings<S>(
279-
localCollection: DataCollection<E, F>,
280-
primaryKeys: string | string[],
281-
hasPrimaryKeyCheckers: ((obj: E) => boolean) | ((obj: E) => boolean)[],
282-
findFilterFunc: (item: S) => F,
283-
copyObjectFunc: (item: E) => E
284-
): SyncDownBuilder<E, F> & SyncUpBuilder<E, F>;
285-
}
274+
// ==== interfaces for building sync settings ====
275+
export interface SettingsBuilder<E extends F, F> {
276+
addSettings<S>(
277+
localCollection: DataCollection<E, F>,
278+
primaryKeys: string | string[],
279+
hasPrimaryKeyCheckers: ((obj: E) => boolean) | ((obj: E) => boolean)[],
280+
findFilterFunc: (item: S) => F,
281+
copyObjectFunc: (item: E) => E
282+
): SyncDownBuilder<E, F> & SyncUpBuilder<E, F>;
283+
}
286284

285+
export interface SyncDownBuilder<E extends F, F> {
286+
addSyncDownFunc<P, S, R>(syncDownFunc: (params: P) => PsPromise<S[], R>, toLocalObject: (item: S) => E): SyncDownAlreadyUpBuilder<E, F, P, S, R>;
287+
}
287288

288-
interface SyncDownBuilder<E extends F, F> {
289-
addSyncDownFunc<P, S, R>(syncDownFunc: (params: P) => PsPromise<S[], R>, toLocalObject: (item: S) => E): SyncDownAlreadyUpBuilder<E, F, P, S, R>;
290-
}
289+
export interface SyncDownBuilderWithUrl<E extends F, F> extends SyncDownBuilder<E, F> {
290+
addSyncDownUrl<P, S, R>(syncDownUrl: string, toLocalObject: (item: S) => E): SyncDownAlreadyUpBuilderWithUrl<E, F, P, S, R>;
291+
}
291292

292-
interface SyncDownBuilderWithUrl<E extends F, F> extends SyncDownBuilder<E, F> {
293-
addSyncDownUrl<P, S, R>(syncDownUrl: string, toLocalObject: (item: S) => E): SyncDownAlreadyUpBuilderWithUrl<E, F, P, S, R>;
294-
}
293+
export interface SyncUpBuilder<E extends F, F> {
294+
addSyncUpFunc<P, S, U, R>(syncUpFunc: (params: P, items: S[]) => PsPromise<U, R>, toSvcObject: (item: E) => S): SyncUpAlreadyDownBuilder<E, F, P, S, U, R>;
295+
}
295296

296-
interface SyncUpBuilder<E extends F, F> {
297-
addSyncUpFunc<P, S, U, R>(syncUpFunc: (params: P, items: S[]) => PsPromise<U, R>, toSvcObject: (item: E) => S): SyncUpAlreadyDownBuilder<E, F, P, S, U, R>;
298-
}
297+
export interface SyncUpBuilderWithUrl<E extends F, F> extends SyncUpBuilder<E, F> {
298+
addSyncUpUrl<P, S, U, R>(syncUpUrl: string, toSvcObject: (item: E) => S): SyncUpAlreadyDownBuilderWithUrl<E, F, P, S, U, R>;
299+
}
299300

300-
interface SyncUpBuilderWithUrl<E extends F, F> extends SyncUpBuilder<E, F> {
301-
addSyncUpUrl<P, S, U, R>(syncUpUrl: string, toSvcObject: (item: E) => S): SyncUpAlreadyDownBuilderWithUrl<E, F, P, S, U, R>;
302-
}
301+
export interface SyncUpAlreadyDownBuilder<E extends F, F, P, S, U, R> {
302+
addSyncDownFunc(syncDownFunc: (params: P) => PsPromise<S[], R>, toLocalObject: (item: S) => E): BuilderEnd<E, F, P, S, U, R>;
303+
build(): SyncSettingsUp<E, F, P, S, U, R>;
304+
}
303305

304-
interface SyncUpAlreadyDownBuilder<E extends F, F, P, S, U, R> {
305-
addSyncDownFunc(syncDownFunc: (params: P) => PsPromise<S[], R>, toLocalObject: (item: S) => E): BuilderEnd<E, F, P, S, U, R>;
306-
build(): SyncSettingsUp<E, F, P, S, U, R>;
307-
}
306+
export interface SyncUpAlreadyDownBuilderWithUrl<E extends F, F, P, S, U, R> extends SyncUpAlreadyDownBuilder<E, F, P, S, U, R> {
307+
addSyncDownUrl(syncDownUrl: string, toLocalObject: (item: S) => E): BuilderEnd<E, F, P, S, U, R>;
308+
}
308309

309-
interface SyncUpAlreadyDownBuilderWithUrl<E extends F, F, P, S, U, R> extends SyncUpAlreadyDownBuilder<E, F, P, S, U, R> {
310-
addSyncDownUrl(syncDownUrl: string, toLocalObject: (item: S) => E): BuilderEnd<E, F, P, S, U, R>;
311-
}
310+
export interface SyncDownAlreadyUpBuilder<E extends F, F, P, S, R> {
311+
addSyncUpFunc<U>(syncUpFunc: (params: P, items: S[]) => PsPromise<U, R>, toSvcObject: (item: E) => S): BuilderEnd<E, F, P, S, U, R>;
312+
build(): SyncSettingsDown<E, F, P, S, R>;
313+
}
312314

313-
interface SyncDownAlreadyUpBuilder<E extends F, F, P, S, R> {
314-
addSyncUpFunc<U>(syncUpFunc: (params: P, items: S[]) => PsPromise<U, R>, toSvcObject: (item: E) => S): BuilderEnd<E, F, P, S, U, R>;
315-
build(): SyncSettingsDown<E, F, P, S, R>;
316-
}
315+
export interface SyncDownAlreadyUpBuilderWithUrl<E extends F, F, P, S, R> extends SyncDownAlreadyUpBuilder<E, F, P, S, R> {
316+
addSyncUpUrl<U>(syncUpUrl: string, toSvcObject: (item: E) => S): BuilderEnd<E, F, P, S, U, R>;
317+
}
317318

318-
interface SyncDownAlreadyUpBuilderWithUrl<E extends F, F, P, S, R> extends SyncDownAlreadyUpBuilder<E, F, P, S, R> {
319-
addSyncUpUrl<U>(syncUpUrl: string, toSvcObject: (item: E) => S): BuilderEnd<E, F, P, S, U, R>;
320-
}
319+
export interface BuilderEnd<E extends F, F, P, S, U, R> extends SettingsBuilder<E, F>, SyncDownBuilder<E, F>, SyncUpBuilder<E, F> {
320+
build(): SyncSettingsUpDown<E, F, P, S, U, R>;
321+
}
321322

322-
interface BuilderEnd<E extends F, F, P, S, U, R> extends SettingsBuilder<E, F>, SyncDownBuilder<E, F>, SyncUpBuilder<E, F> {
323-
build(): SyncSettingsUpDown<E, F, P, S, U, R>;
324323
}
325324

326-
327325
export = SyncSettingsBuilder;

0 commit comments

Comments
 (0)