@aiao/rxdb 0.0.14 → 0.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/entity/EntityStatus.d.ts +2 -2
- package/dist/entity/EntityStatus.d.ts.map +1 -1
- package/dist/entity/metadata-options.interface.d.ts +1 -1
- package/dist/entity/metadata-options.interface.d.ts.map +1 -1
- package/dist/entity/proxy.d.ts +1 -2
- package/dist/entity/proxy.d.ts.map +1 -1
- package/dist/index.js +1122 -1012
- package/dist/query/entity_type_dependencies.d.ts.map +1 -1
- package/dist/repository/QueryCacheRepository.d.ts.map +1 -1
- package/dist/repository/QueryManager.d.ts.map +1 -1
- package/dist/rxdb-events.d.ts +32 -0
- package/dist/rxdb-events.d.ts.map +1 -1
- package/dist/rxdb-utils.d.ts.map +1 -1
- package/dist/version/VersionManager.d.ts +115 -85
- package/dist/version/VersionManager.d.ts.map +1 -1
- package/dist/version/VersionManager.interface.d.ts +39 -0
- package/dist/version/VersionManager.interface.d.ts.map +1 -1
- package/dist/version/VersionManager.utils.d.ts.map +1 -1
- package/dist/version/merge_branch.d.ts +22 -0
- package/dist/version/merge_branch.d.ts.map +1 -0
- package/dist/version.d.ts +1 -1
- package/package.json +2 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_type_dependencies.d.ts","sourceRoot":"","sources":["../../src/query/entity_type_dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"entity_type_dependencies.d.ts","sourceRoot":"","sources":["../../src/query/entity_type_dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AA0IlC;;;;;;;;;;;;;;;GAeG;AACH,QAAA,MAAM,6BAA6B,GAAI,CAAC,SAAS,UAAU,EACzD,MAAM,IAAI,EACV,OAAO,SAAS,CAAC,CAAC,CAAC,EACnB,YAAY,UAAU,EACtB,qBAAqB,GAAG,CAAC,UAAU,CAAC,SAiFrC,CAAC;AAEF,eAAe,6BAA6B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryCacheRepository.d.ts","sourceRoot":"","sources":["../../src/repository/QueryCacheRepository.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;
|
|
1
|
+
{"version":3,"file":"QueryCacheRepository.d.ts","sourceRoot":"","sources":["../../src/repository/QueryCacheRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryManager.d.ts","sourceRoot":"","sources":["../../src/repository/QueryManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"QueryManager.d.ts","sourceRoot":"","sources":["../../src/repository/QueryManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EAOL,+BAA+B,EAE/B,+BAA+B,EAC/B,+BAA+B,EAChC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,CACtE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAClB,QAAQ,EAAE,+BAA+B,CAAC,CAAC,CAAC,EAAE,KAC3C,IAAI,CAAC;AAEV,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,CACtE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAClB,QAAQ,EAAE,+BAA+B,CAAC,CAAC,CAAC,EAAE,KAC3C,IAAI,CAAC;AAEV,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,CACtE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAClB,QAAQ,EAAE,+BAA+B,CAAC,CAAC,CAAC,EAAE,KAC3C,IAAI,CAAC;AAEV,UAAU,iBAAiB,CAAC,CAAC,SAAS,UAAU,EAAE,EAAE;IAClD;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IACzB;;OAEG;IACH,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,EAAE,CAAC,CAAC;IACtD;;OAEG;IACH,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,WAAW,EAAE,CAAC;CAC/C;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,YAAY,CAAC,CAAC,SAAS,UAAU;;IAoB1C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI;IAC7B,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;IAV9C;;;;;;OAMG;gBAEkB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;IAO9C,OAAO;IAQP;;;;;;;;;;OAUG;IACI,UAAU,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;IAexF,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAIrE,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAIrE,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;CAyKtE"}
|
package/dist/rxdb-events.d.ts
CHANGED
|
@@ -27,6 +27,12 @@ export declare const SWITCH_BRANCH_BEGIN: "SWITCH_BRANCH_BEGIN";
|
|
|
27
27
|
export declare const SWITCH_BRANCH_COMMIT: "SWITCH_BRANCH_COMMIT";
|
|
28
28
|
/** 分支切换回滚事件类型 */
|
|
29
29
|
export declare const SWITCH_BRANCH_ROLLBACK: "SWITCH_BRANCH_ROLLBACK";
|
|
30
|
+
/** 分支合并开始事件类型 */
|
|
31
|
+
export declare const MERGE_BRANCH_BEGIN: "MERGE_BRANCH_BEGIN";
|
|
32
|
+
/** 分支合并提交事件类型 */
|
|
33
|
+
export declare const MERGE_BRANCH_COMMIT: "MERGE_BRANCH_COMMIT";
|
|
34
|
+
/** 分支合并回滚事件类型 */
|
|
35
|
+
export declare const MERGE_BRANCH_ROLLBACK: "MERGE_BRANCH_ROLLBACK";
|
|
30
36
|
/** 同步开始事件类型 */
|
|
31
37
|
export declare const SYNC_BEGIN_EVENT: "SYNC_BEGIN";
|
|
32
38
|
/** 同步完成事件类型 */
|
|
@@ -180,6 +186,29 @@ export declare class SwitchBranchCommitEvent extends SwitchBranchEventBase {
|
|
|
180
186
|
export declare class SwitchBranchRollbackEvent extends SwitchBranchEventBase {
|
|
181
187
|
type: "SWITCH_BRANCH_ROLLBACK";
|
|
182
188
|
}
|
|
189
|
+
export declare class MergeBranchEventBase {
|
|
190
|
+
/** 源分支名称 */
|
|
191
|
+
readonly sourceBranch: string;
|
|
192
|
+
/** 目标分支名称 */
|
|
193
|
+
readonly targetBranch: string;
|
|
194
|
+
constructor(
|
|
195
|
+
/** 源分支名称 */
|
|
196
|
+
sourceBranch: string,
|
|
197
|
+
/** 目标分支名称 */
|
|
198
|
+
targetBranch: string);
|
|
199
|
+
}
|
|
200
|
+
/** 分支合并开始事件 */
|
|
201
|
+
export declare class MergeBranchBeginEvent extends MergeBranchEventBase {
|
|
202
|
+
readonly type: "MERGE_BRANCH_BEGIN";
|
|
203
|
+
}
|
|
204
|
+
/** 分支合并提交事件 */
|
|
205
|
+
export declare class MergeBranchCommitEvent extends MergeBranchEventBase {
|
|
206
|
+
readonly type: "MERGE_BRANCH_COMMIT";
|
|
207
|
+
}
|
|
208
|
+
/** 分支合并回滚事件 */
|
|
209
|
+
export declare class MergeBranchRollbackEvent extends MergeBranchEventBase {
|
|
210
|
+
readonly type: "MERGE_BRANCH_ROLLBACK";
|
|
211
|
+
}
|
|
183
212
|
/**
|
|
184
213
|
* 同步方向
|
|
185
214
|
*/
|
|
@@ -372,6 +401,9 @@ export interface RxDBEventMap extends RxDBEntityEventMap {
|
|
|
372
401
|
[SWITCH_BRANCH_BEGIN]: SwitchBranchBeginEvent;
|
|
373
402
|
[SWITCH_BRANCH_COMMIT]: SwitchBranchCommitEvent;
|
|
374
403
|
[SWITCH_BRANCH_ROLLBACK]: SwitchBranchRollbackEvent;
|
|
404
|
+
[MERGE_BRANCH_BEGIN]: MergeBranchBeginEvent;
|
|
405
|
+
[MERGE_BRANCH_COMMIT]: MergeBranchCommitEvent;
|
|
406
|
+
[MERGE_BRANCH_ROLLBACK]: MergeBranchRollbackEvent;
|
|
375
407
|
[SYNC_BEGIN_EVENT]: SyncBeginEvent;
|
|
376
408
|
[SYNC_COMPLETE_EVENT]: SyncCompleteEvent;
|
|
377
409
|
[SYNC_ERROR_EVENT]: SyncErrorEvent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rxdb-events.d.ts","sourceRoot":"","sources":["../src/rxdb-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAM/E,kBAAkB;AAClB,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AACzD,iBAAiB;AACjB,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAC/D,iBAAiB;AACjB,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAC/D,iBAAiB;AACjB,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAE/D,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AAEjE,eAAe;AACf,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAe;AACf,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AACvD,eAAe;AACf,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,iBAAiB;AACjB,eAAO,MAAM,mBAAmB,EAAG,qBAA8B,CAAC;AAClE,iBAAiB;AACjB,eAAO,MAAM,oBAAoB,EAAG,sBAA+B,CAAC;AACpE,iBAAiB;AACjB,eAAO,MAAM,sBAAsB,EAAG,wBAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"rxdb-events.d.ts","sourceRoot":"","sources":["../src/rxdb-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAM/E,kBAAkB;AAClB,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AACzD,iBAAiB;AACjB,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAC/D,iBAAiB;AACjB,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAC/D,iBAAiB;AACjB,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAE/D,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AAEjE,eAAe;AACf,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAe;AACf,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AACvD,eAAe;AACf,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,iBAAiB;AACjB,eAAO,MAAM,mBAAmB,EAAG,qBAA8B,CAAC;AAClE,iBAAiB;AACjB,eAAO,MAAM,oBAAoB,EAAG,sBAA+B,CAAC;AACpE,iBAAiB;AACjB,eAAO,MAAM,sBAAsB,EAAG,wBAAiC,CAAC;AAExE,iBAAiB;AACjB,eAAO,MAAM,kBAAkB,EAAG,oBAA6B,CAAC;AAChE,iBAAiB;AACjB,eAAO,MAAM,mBAAmB,EAAG,qBAA8B,CAAC;AAClE,iBAAiB;AACjB,eAAO,MAAM,qBAAqB,EAAG,uBAAgC,CAAC;AAMtE,eAAe;AACf,eAAO,MAAM,gBAAgB,EAAG,YAAqB,CAAC;AACtD,eAAe;AACf,eAAO,MAAM,mBAAmB,EAAG,eAAwB,CAAC;AAC5D,eAAe;AACf,eAAO,MAAM,gBAAgB,EAAG,YAAqB,CAAC;AACtD,kBAAkB;AAClB,eAAO,MAAM,4BAA4B,EAAG,wBAAiC,CAAC;AAC9E,eAAe;AACf,eAAO,MAAM,uBAAuB,EAAG,mBAA4B,CAAC;AACpE,gBAAgB;AAChB,eAAO,MAAM,sBAAsB,EAAG,kBAA2B,CAAC;AAKlE,0BAA0B;AAC1B,eAAO,MAAM,2BAA2B,EAAG,uBAAgC,CAAC;AAC5E,0BAA0B;AAC1B,eAAO,MAAM,8BAA8B,EAAG,0BAAmC,CAAC;AAClF,0BAA0B;AAC1B,eAAO,MAAM,2BAA2B,EAAG,uBAAgC,CAAC;AAM5E;;GAEG;AACH,UAAU,4BAA4B,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IACtE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC7C,WAAW;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW;IACX,MAAM,EAAE,MAAM,CAAC;IACf,cAAc;IACd,EAAE,EAAE,gBAAgB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAClC,WAAW;IACX,UAAU,CAAC,EAAE,CAAC,CAAC;IACf,aAAa;IACb,QAAQ,EAAE,IAAI,CAAC;CAChB;AAMD,MAAM,WAAW,2BAA2B,CAC1C,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,4BAA4B,CAAC,CAAC,CAAC;IACvC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,YAAY,EAAE,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B,CAC9C,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,4BAA4B,CAAC,CAAC,CAAC;IACvC,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,YAAY,EAAE,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B,CAC9C,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,4BAA4B,CAAC,CAAC,CAAC;IACvC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,+BAA+B,CAC9C,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,4BAA4B,CAAC,CAAC,CAAC;IACvC,KAAK,EAAE,IAAI,CAAC;IACZ,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClD;AAED,wBAAwB;AACxB,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAClE,2BAA2B,CAAC,CAAC,CAAC,GAC9B,+BAA+B,CAAC,CAAC,CAAC,GAClC,+BAA+B,CAAC,CAAC,CAAC,GAClC,+BAA+B,CAAC,CAAC,CAAC,CAAC;AAMvC,MAAM,WAAW,gCAAgC,CAC/C,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,4BAA4B,CAAC,CAAC,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,gCAAgC,CAC/C,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,4BAA4B,CAAC,CAAC,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,gCAAgC,CAC/C,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,4BAA4B,CAAC,CAAC,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;CACjC;AAED,wBAAwB;AACxB,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IACnE,gCAAgC,CAAC,CAAC,CAAC,GACnC,gCAAgC,CAAC,CAAC,CAAC,GACnC,gCAAgC,CAAC,CAAC,CAAC,CAAC;AAMxC;;;;;GAKG;AACH,qBAAa,mBAAmB;aAEF,QAAQ,EAAE,2BAA2B,EAAE;IADnE,IAAI,SAA0B;gBACF,QAAQ,EAAE,2BAA2B,EAAE;CACpE;AAED;;;;GAIG;AACH,qBAAa,uBAAuB;aAEN,QAAQ,EAAE,+BAA+B,EAAE;IADvE,IAAI,SAA6B;gBACL,QAAQ,EAAE,+BAA+B,EAAE;CACxE;AAED;;;;GAIG;AACH,qBAAa,uBAAuB;aAEN,QAAQ,EAAE,+BAA+B,EAAE;IADvE,IAAI,SAA6B;gBACL,QAAQ,EAAE,+BAA+B,EAAE;CACxE;AAED;;;;GAIG;AACH,qBAAa,uBAAuB;aAEN,QAAQ,EAAE,+BAA+B,EAAE;IADvE,IAAI,SAA6B;gBACL,QAAQ,EAAE,+BAA+B,EAAE;CACxE;AAMD,eAAe;AACf,qBAAa,wBAAwB;aAEP,QAAQ,EAAE,gCAAgC,EAAE;IADxE,IAAI,SAA8B;gBACN,QAAQ,EAAE,gCAAgC,EAAE;CACzE;AAED,eAAe;AACf,qBAAa,wBAAwB;aAEP,QAAQ,EAAE,gCAAgC,EAAE;IADxE,IAAI,SAA8B;gBACN,QAAQ,EAAE,gCAAgC,EAAE;CACzE;AAED,eAAe;AACf,qBAAa,wBAAwB;aAEP,QAAQ,EAAE,gCAAgC,EAAE;IADxE,IAAI,SAA8B;gBACN,QAAQ,EAAE,gCAAgC,EAAE;CACzE;AAMD,aAAa;AACb,qBAAa,qBAAqB;IAChC,IAAI,SAAqB;CAC1B;AAED,aAAa;AACb,qBAAa,sBAAsB;IACjC,IAAI,SAAsB;CAC3B;AAED,aAAa;AACb,qBAAa,wBAAwB;IACnC,IAAI,SAAwB;CAC7B;AAKD,qBAAa,qBAAqB;IAE9B,WAAW;aACK,UAAU,EAAE,MAAM;;IADlC,WAAW;IACK,UAAU,EAAE,MAAM;CAErC;AAED,eAAe;AACf,qBAAa,sBAAuB,SAAQ,qBAAqB;IAC/D,IAAI,wBAAuB;CAC5B;AAED,eAAe;AACf,qBAAa,uBAAwB,SAAQ,qBAAqB;IAChE,IAAI,yBAAwB;CAC7B;AAED,eAAe;AACf,qBAAa,yBAA0B,SAAQ,qBAAqB;IAClE,IAAI,2BAA0B;CAC/B;AAKD,qBAAa,oBAAoB;IAE7B,YAAY;aACI,YAAY,EAAE,MAAM;IACpC,aAAa;aACG,YAAY,EAAE,MAAM;;IAHpC,YAAY;IACI,YAAY,EAAE,MAAM;IACpC,aAAa;IACG,YAAY,EAAE,MAAM;CAEvC;AAED,eAAe;AACf,qBAAa,qBAAsB,SAAQ,oBAAoB;IAC7D,QAAQ,CAAC,IAAI,uBAAsB;CACpC;AAED,eAAe;AACf,qBAAa,sBAAuB,SAAQ,oBAAoB;IAC9D,QAAQ,CAAC,IAAI,wBAAuB;CACrC;AAED,eAAe;AACf,qBAAa,wBAAyB,SAAQ,oBAAoB;IAChE,QAAQ,CAAC,IAAI,0BAAyB;CACvC;AAMD;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,MAAM,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,cAAc;IAIvB,WAAW;aACK,SAAS,EAAE,aAAa;IAJ1C,QAAQ,CAAC,IAAI,eAAoB;;IAG/B,WAAW;IACK,SAAS,EAAE,aAAa;CAE3C;AAED;;;;GAIG;AACH,qBAAa,iBAAiB;IAI1B,WAAW;aACK,SAAS,EAAE,aAAa;IACxC,WAAW;aACK,MAAM,EAAE,UAAU,GAAG,UAAU;IANjD,QAAQ,CAAC,IAAI,kBAAuB;;IAGlC,WAAW;IACK,SAAS,EAAE,aAAa;IACxC,WAAW;IACK,MAAM,EAAE,UAAU,GAAG,UAAU;CAElD;AAED;;;;GAIG;AACH,qBAAa,cAAc;IAIvB,WAAW;aACK,SAAS,EAAE,aAAa;IACxC,WAAW;aACK,KAAK,EAAE,KAAK;IAN9B,QAAQ,CAAC,IAAI,eAAoB;;IAG/B,WAAW;IACK,SAAS,EAAE,aAAa;IACxC,WAAW;IACK,KAAK,EAAE,KAAK;CAE/B;AAED;;;;GAIG;AACH,qBAAa,qBAAqB;IAI9B,cAAc;aACE,SAAS,EAAE,QAAQ,EAAE;IACrC,eAAe;aACC,QAAQ,EAAE,MAAM;IAChC,cAAc;aACE,QAAQ,EAAE,MAAM;IARlC,QAAQ,CAAC,IAAI,sBAA2B;;IAGtC,cAAc;IACE,SAAS,EAAE,QAAQ,EAAE;IACrC,eAAe;IACC,QAAQ,EAAE,MAAM;IAChC,cAAc;IACE,QAAQ,EAAE,MAAM;CAEnC;AAED;;;;GAIG;AACH,qBAAa,oBAAoB;IAI7B,eAAe;aACC,SAAS,EAAE,QAAQ,EAAE;IAJvC,QAAQ,CAAC,IAAI,qBAA0B;;IAGrC,eAAe;IACC,SAAS,EAAE,QAAQ,EAAE;CAExC;AAMD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/D;;;;GAIG;AACH,qBAAa,wBAAwB;IAIjC,WAAW;aACK,SAAS,EAAE,uBAAuB;IAClD,WAAW;aACK,SAAS,EAAE,MAAM;IACjC,WAAW;aACK,MAAM,EAAE,MAAM;IAC9B,eAAe;aACC,cAAc,EAAE,OAAO;IAVzC,QAAQ,CAAC,IAAI,0BAA+B;;IAG1C,WAAW;IACK,SAAS,EAAE,uBAAuB;IAClD,WAAW;IACK,SAAS,EAAE,MAAM;IACjC,WAAW;IACK,MAAM,EAAE,MAAM;IAC9B,eAAe;IACC,cAAc,EAAE,OAAO;CAE1C;AAED;;;;GAIG;AACH,qBAAa,2BAA2B;IAIpC,WAAW;aACK,SAAS,EAAE,uBAAuB;IAClD,WAAW;aACK,SAAS,EAAE,MAAM;IACjC,WAAW;aACK,MAAM,EAAE,MAAM;IAC9B,aAAa;aACG,MAAM,EAAE;QACtB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAfH,QAAQ,CAAC,IAAI,6BAAkC;;IAG7C,WAAW;IACK,SAAS,EAAE,uBAAuB;IAClD,WAAW;IACK,SAAS,EAAE,MAAM;IACjC,WAAW;IACK,MAAM,EAAE,MAAM;IAC9B,aAAa;IACG,MAAM,EAAE;QACtB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;CAEJ;AAED;;;;GAIG;AACH,qBAAa,wBAAwB;IAIjC,WAAW;aACK,SAAS,EAAE,uBAAuB;IAClD,WAAW;aACK,SAAS,EAAE,MAAM;IACjC,WAAW;aACK,MAAM,EAAE,MAAM;IAC9B,WAAW;aACK,KAAK,EAAE,KAAK;IAV9B,QAAQ,CAAC,IAAI,0BAA+B;;IAG1C,WAAW;IACK,SAAS,EAAE,uBAAuB;IAClD,WAAW;IACK,SAAS,EAAE,MAAM;IACjC,WAAW;IACK,MAAM,EAAE,MAAM;IAC9B,WAAW;IACK,KAAK,EAAE,KAAK;CAE/B;AAMD,oBAAoB;AACpB,MAAM,WAAW,kBAAkB;IACjC,CAAC,sBAAsB,CAAC,EAAE,mBAAmB,CAAC;IAC9C,CAAC,yBAAyB,CAAC,EAAE,uBAAuB,CAAC;IACrD,CAAC,yBAAyB,CAAC,EAAE,uBAAuB,CAAC;IACrD,CAAC,yBAAyB,CAAC,EAAE,uBAAuB,CAAC;IACrD,CAAC,0BAA0B,CAAC,EAAE,wBAAwB,CAAC;IACvD,CAAC,0BAA0B,CAAC,EAAE,wBAAwB,CAAC;IACvD,CAAC,0BAA0B,CAAC,EAAE,wBAAwB,CAAC;CACxD;AAED,oBAAoB;AACpB,MAAM,WAAW,YAAa,SAAQ,kBAAkB;IACtD,CAAC,iBAAiB,CAAC,EAAE,qBAAqB,CAAC;IAC3C,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IAC7C,CAAC,oBAAoB,CAAC,EAAE,wBAAwB,CAAC;IACjD,CAAC,mBAAmB,CAAC,EAAE,sBAAsB,CAAC;IAC9C,CAAC,oBAAoB,CAAC,EAAE,uBAAuB,CAAC;IAChD,CAAC,sBAAsB,CAAC,EAAE,yBAAyB,CAAC;IACpD,CAAC,kBAAkB,CAAC,EAAE,qBAAqB,CAAC;IAC5C,CAAC,mBAAmB,CAAC,EAAE,sBAAsB,CAAC;IAC9C,CAAC,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;IAClD,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC;IACnC,CAAC,mBAAmB,CAAC,EAAE,iBAAiB,CAAC;IACzC,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC;IACnC,CAAC,uBAAuB,CAAC,EAAE,qBAAqB,CAAC;IACjD,CAAC,sBAAsB,CAAC,EAAE,oBAAoB,CAAC;IAC/C,CAAC,2BAA2B,CAAC,EAAE,wBAAwB,CAAC;IACxD,CAAC,8BAA8B,CAAC,EAAE,2BAA2B,CAAC;IAC9D,CAAC,2BAA2B,CAAC,EAAE,wBAAwB,CAAC;CACzD;AAED,oBAAoB;AACpB,MAAM,MAAM,eAAe,GAAG,kBAAkB,CAAC,MAAM,kBAAkB,CAAC,CAAC;AAE3E,kBAAkB;AAClB,MAAM,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,YAAY,CAAC,CAAC"}
|
package/dist/rxdb-utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rxdb-utils.d.ts","sourceRoot":"","sources":["../src/rxdb-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"rxdb-utils.d.ts","sourceRoot":"","sources":["../src/rxdb-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAahE;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,UAAU,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,KAAG,cAGrF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,UAAU,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,cAAc,KAAG,UAGlG,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,UAAU,EAAE,QAAQ,YAAY,CAAC,CAAC,CAAC,KAAG,YAAY,CAAC,CAAC,CACnB,CAAC;AAE5E;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,UAAU,EAAE,QAAQ,YAAY,CAAC,CAAC,CAAC,YAAwC,CAAC;AAEnH;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,GAAI,YAAY,GAAG,EAAE,QAAQ,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,QAQnF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,IAAI,QAAsB,IAAI,CAAC"}
|
|
@@ -14,7 +14,7 @@ import { PullRepositoryOptions, PullRepositoryResult } from './pull-repository.j
|
|
|
14
14
|
import { PushRepositoryOptions, PushRepositoryResult } from './push-repository.js';
|
|
15
15
|
import { SyncRepositoryOptions, SyncRepositoryResult } from './sync-repository.js';
|
|
16
16
|
import { SortDirection } from './topological-sort.js';
|
|
17
|
-
import { HistoryScopeAPI, PullOptions, PullResult, PushOptions, PushResult, SyncResult } from './VersionManager.interface.js';
|
|
17
|
+
import { HistoryScopeAPI, MergeBranchOptions, MergeBranchResult, PullOptions, PullResult, PushOptions, PushResult, SyncResult } from './VersionManager.interface.js';
|
|
18
18
|
/**
|
|
19
19
|
* 版本管理器
|
|
20
20
|
*
|
|
@@ -130,73 +130,71 @@ export declare class VersionManager {
|
|
|
130
130
|
push?: PushOptions;
|
|
131
131
|
}): Promise<SyncResult>;
|
|
132
132
|
/**
|
|
133
|
-
*
|
|
133
|
+
* 拉取指定 Repository 的远程变更
|
|
134
134
|
*
|
|
135
|
-
*
|
|
136
|
-
* Supports cascade synchronization to automatically pull related entities.
|
|
135
|
+
* 提供实体类型级别的精细同步控制，支持级联同步以自动拉取关联实体。
|
|
137
136
|
*
|
|
138
|
-
* @param namespace -
|
|
139
|
-
* @param entity -
|
|
140
|
-
* @param options -
|
|
141
|
-
* @returns
|
|
137
|
+
* @param namespace - 实体命名空间（如 "public"）
|
|
138
|
+
* @param entity - 实体名称（如 "Todo"）
|
|
139
|
+
* @param options - 拉取选项
|
|
140
|
+
* @returns 拉取结果
|
|
142
141
|
*
|
|
143
142
|
* @example
|
|
144
143
|
* ```typescript
|
|
145
|
-
* //
|
|
144
|
+
* // 拉取 Todo 并级联拉取依赖
|
|
146
145
|
* const result = await rxdb.versionManager.pullRepository('public', 'Todo', {
|
|
147
|
-
* includeRelated: true //
|
|
146
|
+
* includeRelated: true // 默认：若 Todo 有外键则自动拉取 User
|
|
148
147
|
* });
|
|
149
148
|
*
|
|
150
|
-
* //
|
|
149
|
+
* // 不级联拉取
|
|
151
150
|
* const result = await rxdb.versionManager.pullRepository('public', 'Todo', {
|
|
152
|
-
* includeRelated: false //
|
|
151
|
+
* includeRelated: false // 仅拉取 Todo，可能引发外键错误
|
|
153
152
|
* });
|
|
154
153
|
* ```
|
|
155
154
|
*/
|
|
156
155
|
pullRepository(namespace: string, entity: string, options?: PullRepositoryOptions): Promise<PullRepositoryResult>;
|
|
157
156
|
/**
|
|
158
|
-
*
|
|
157
|
+
* 推送指定 Repository 的本地变更
|
|
159
158
|
*
|
|
160
|
-
*
|
|
161
|
-
* Supports cascade synchronization to automatically push dependent entities.
|
|
159
|
+
* 提供实体类型级别的精细同步控制，支持级联同步以自动推送依赖实体。
|
|
162
160
|
*
|
|
163
|
-
* @param namespace -
|
|
164
|
-
* @param entity -
|
|
165
|
-
* @param options -
|
|
166
|
-
* @returns
|
|
161
|
+
* @param namespace - 实体命名空间（如 "public"）
|
|
162
|
+
* @param entity - 实体名称（如 "User"）
|
|
163
|
+
* @param options - 推送选项
|
|
164
|
+
* @returns 推送结果
|
|
167
165
|
*
|
|
168
166
|
* @example
|
|
169
167
|
* ```typescript
|
|
170
|
-
* //
|
|
168
|
+
* // 推送 User 并级联推送依赖方
|
|
171
169
|
* const result = await rxdb.versionManager.pushRepository('public', 'User', {
|
|
172
|
-
* includeRelated: true //
|
|
170
|
+
* includeRelated: true // 默认：若 Post 引用 User 则自动推送 Post
|
|
173
171
|
* });
|
|
174
172
|
*
|
|
175
|
-
* //
|
|
173
|
+
* // 不级联推送
|
|
176
174
|
* const result = await rxdb.versionManager.pushRepository('public', 'User', {
|
|
177
|
-
* includeRelated: false //
|
|
175
|
+
* includeRelated: false // 仅推送 User，依赖数据可能不完整
|
|
178
176
|
* });
|
|
179
177
|
* ```
|
|
180
178
|
*/
|
|
181
179
|
pushRepository(namespace: string, entity: string, options?: PushRepositoryOptions): Promise<PushRepositoryResult>;
|
|
182
180
|
/**
|
|
183
|
-
*
|
|
181
|
+
* 同步指定 Repository（先 pull 再 push）
|
|
184
182
|
*
|
|
185
|
-
*
|
|
186
|
-
*
|
|
183
|
+
* 将单个 Repository 的 pull 和 push 合并为一次操作，保证正确的执行顺序。
|
|
184
|
+
* 推荐在需要确保特定实体类型数据一致性时使用。
|
|
187
185
|
*
|
|
188
|
-
* @param namespace -
|
|
189
|
-
* @param entity -
|
|
190
|
-
* @param options -
|
|
191
|
-
* @returns
|
|
186
|
+
* @param namespace - 实体命名空间（如 "public"）
|
|
187
|
+
* @param entity - 实体名称（如 "Todo"）
|
|
188
|
+
* @param options - 同步选项（分别配置 pull 和 push）
|
|
189
|
+
* @returns 同步结果（包含 pull 和 push 结果）
|
|
192
190
|
*
|
|
193
191
|
* @example
|
|
194
192
|
* ```typescript
|
|
195
|
-
* //
|
|
193
|
+
* // 基本用法
|
|
196
194
|
* const result = await rxdb.versionManager.syncRepository('public', 'Todo');
|
|
197
195
|
* console.log(`Pulled ${result.pullResult.pulled}, Pushed ${result.pushResult.pushed}`);
|
|
198
196
|
*
|
|
199
|
-
* //
|
|
197
|
+
* // 自定义 pull 和 push 选项
|
|
200
198
|
* const result = await rxdb.versionManager.syncRepository('public', 'Todo', {
|
|
201
199
|
* pull: { limit: 500, fetchAll: true },
|
|
202
200
|
* push: { batchSize: 100 }
|
|
@@ -229,67 +227,66 @@ export declare class VersionManager {
|
|
|
229
227
|
*/
|
|
230
228
|
cleanupExpired(namespace: string, entity: string, options?: CleanupExpiredOptions): Promise<CleanupExpiredResult>;
|
|
231
229
|
/**
|
|
232
|
-
*
|
|
230
|
+
* 检查远程是否有更新，不下载数据
|
|
233
231
|
*
|
|
234
|
-
*
|
|
235
|
-
*
|
|
236
|
-
* "N updates available" messages to save bandwidth and time.
|
|
232
|
+
* 仅查询远程有多少新变更，不实际拉取数据。
|
|
233
|
+
* 适用于显示「有 N 条远程更新」提示，节省带宽和时间。
|
|
237
234
|
*
|
|
238
|
-
* @param namespace -
|
|
239
|
-
* @param entity -
|
|
240
|
-
* @returns
|
|
235
|
+
* @param namespace - 实体命名空间（如 "public"）
|
|
236
|
+
* @param entity - 实体名称（如 "Todo"）
|
|
237
|
+
* @returns 更新检查结果
|
|
241
238
|
*
|
|
242
239
|
* @example
|
|
243
240
|
* ```typescript
|
|
244
|
-
* //
|
|
241
|
+
* // 检查 Todo 是否有远程更新
|
|
245
242
|
* const result = await rxdb.versionManager.checkRepositoryUpdates('public', 'Todo');
|
|
246
243
|
* if (result.hasUpdates) {
|
|
247
|
-
* console.log(
|
|
248
|
-
* //
|
|
244
|
+
* console.log(`有 ${result.pendingCount} 条更新可拉取`);
|
|
245
|
+
* // 用户点击「更新」按钮后再调用 pullRepository()
|
|
249
246
|
* }
|
|
250
247
|
* ```
|
|
251
248
|
*/
|
|
252
249
|
checkRepositoryUpdates(namespace: string, entity: string): Promise<CheckRepositoryUpdatesResult>;
|
|
253
250
|
/**
|
|
254
|
-
*
|
|
251
|
+
* 获取单个 Repository 的同步状态
|
|
255
252
|
*
|
|
256
|
-
*
|
|
257
|
-
* - syncType
|
|
258
|
-
* - pushableCount
|
|
259
|
-
* - pullableCount
|
|
260
|
-
* -
|
|
253
|
+
* 返回完整的同步状态信息，包括：
|
|
254
|
+
* - syncType（full/remote/local/disabled）
|
|
255
|
+
* - pushableCount（待推送的本地变更数）
|
|
256
|
+
* - pullableCount（可拉取的远程变更数）
|
|
257
|
+
* - 最近同步时间戳
|
|
261
258
|
*
|
|
262
|
-
* @param namespace -
|
|
263
|
-
* @param entity -
|
|
264
|
-
* @returns Repository
|
|
259
|
+
* @param namespace - 实体命名空间（如 "public"）
|
|
260
|
+
* @param entity - 实体名称（如 "Todo"）
|
|
261
|
+
* @returns Repository 同步状态
|
|
265
262
|
*
|
|
266
263
|
* @example
|
|
267
264
|
* ```typescript
|
|
268
265
|
* const status = await rxdb.versionManager.getRepositorySyncStatus('public', 'Todo');
|
|
269
|
-
* console.log(
|
|
270
|
-
* console.log(
|
|
266
|
+
* console.log(`同步类型: ${status.syncType}`);
|
|
267
|
+
* console.log(`待推送: ${status.pushableCount}，可拉取: ${status.pullableCount}`);
|
|
271
268
|
* ```
|
|
272
269
|
*/
|
|
273
270
|
getRepositorySyncStatus(namespace: string, entity: string): Promise<RepositorySyncStatus>;
|
|
274
271
|
/**
|
|
275
|
-
*
|
|
272
|
+
* 获取所有 Repository 的同步状态
|
|
276
273
|
*
|
|
277
|
-
*
|
|
274
|
+
* 返回所有已注册实体的状态，支持可选过滤。
|
|
278
275
|
*
|
|
279
|
-
* @param filter -
|
|
280
|
-
* @returns
|
|
276
|
+
* @param filter - 可选过滤条件
|
|
277
|
+
* @returns Repository 同步状态数组
|
|
281
278
|
*
|
|
282
279
|
* @example
|
|
283
280
|
* ```typescript
|
|
284
|
-
* //
|
|
281
|
+
* // 获取全部状态
|
|
285
282
|
* const statuses = await rxdb.versionManager.getAllRepositorySyncStatus();
|
|
286
283
|
*
|
|
287
|
-
* //
|
|
284
|
+
* // 仅获取有待处理变更的 Repository
|
|
288
285
|
* const pending = await rxdb.versionManager.getAllRepositorySyncStatus({
|
|
289
286
|
* hasPendingChanges: true
|
|
290
287
|
* });
|
|
291
288
|
*
|
|
292
|
-
* //
|
|
289
|
+
* // 仅获取已启用的全量同步 Repository
|
|
293
290
|
* const fullSync = await rxdb.versionManager.getAllRepositorySyncStatus({
|
|
294
291
|
* syncType: ['full'],
|
|
295
292
|
* enabled: true
|
|
@@ -298,21 +295,20 @@ export declare class VersionManager {
|
|
|
298
295
|
*/
|
|
299
296
|
getAllRepositorySyncStatus(filter?: GetAllRepositorySyncStatusFilter): Promise<RepositorySyncStatus[]>;
|
|
300
297
|
/**
|
|
301
|
-
*
|
|
298
|
+
* 批量同步多个 Repository
|
|
302
299
|
*
|
|
303
|
-
*
|
|
304
|
-
* sequential or concurrent execution.
|
|
300
|
+
* 在单次操作中同步多个 Repository，支持顺序或并发执行。
|
|
305
301
|
*
|
|
306
|
-
* @param options -
|
|
307
|
-
* @returns
|
|
302
|
+
* @param options - 批量同步选项
|
|
303
|
+
* @returns 批量同步结果（包含成功/失败计数）
|
|
308
304
|
*
|
|
309
305
|
* @example
|
|
310
306
|
* ```typescript
|
|
311
|
-
* //
|
|
307
|
+
* // 顺序同步所有已启用的 Repository
|
|
312
308
|
* const result = await rxdb.versionManager.bulkSync();
|
|
313
|
-
* console.log(
|
|
309
|
+
* console.log(`成功: ${result.succeeded}，失败: ${result.failed}`);
|
|
314
310
|
*
|
|
315
|
-
* //
|
|
311
|
+
* // 同步指定 Repository
|
|
316
312
|
* const result = await rxdb.versionManager.bulkSync({
|
|
317
313
|
* repositories: [
|
|
318
314
|
* { namespace: 'public', entity: 'Todo' },
|
|
@@ -320,17 +316,17 @@ export declare class VersionManager {
|
|
|
320
316
|
* ]
|
|
321
317
|
* });
|
|
322
318
|
*
|
|
323
|
-
* //
|
|
319
|
+
* // 并发模式仅 pull
|
|
324
320
|
* const result = await rxdb.versionManager.bulkSync({
|
|
325
321
|
* concurrent: true,
|
|
326
322
|
* concurrency: 3,
|
|
327
323
|
* push: false
|
|
328
324
|
* });
|
|
329
325
|
*
|
|
330
|
-
* //
|
|
326
|
+
* // 检查每项结果
|
|
331
327
|
* for (const item of result.results) {
|
|
332
328
|
* if (item.success) {
|
|
333
|
-
* console.log(`${item.repository.entity}:
|
|
329
|
+
* console.log(`${item.repository.entity}: 已拉取 ${item.result.pull?.pulled || 0} 条`);
|
|
334
330
|
* } else {
|
|
335
331
|
* console.error(`${item.repository.entity}: ${item.error.message}`);
|
|
336
332
|
* }
|
|
@@ -339,41 +335,40 @@ export declare class VersionManager {
|
|
|
339
335
|
*/
|
|
340
336
|
bulkSync(options?: BulkSyncOptions): Promise<BulkSyncResult>;
|
|
341
337
|
/**
|
|
342
|
-
*
|
|
338
|
+
* 获取所有 Repository 的依赖图
|
|
343
339
|
*
|
|
344
|
-
*
|
|
345
|
-
*
|
|
340
|
+
* 分析实体关系（MANY_TO_ONE、ONE_TO_ONE）以构建依赖图，
|
|
341
|
+
* 展示各 Repository 之间的依赖关系。
|
|
346
342
|
*
|
|
347
|
-
* @returns
|
|
343
|
+
* @returns 包含依赖关系的依赖图
|
|
348
344
|
*
|
|
349
345
|
* @example
|
|
350
346
|
* ```typescript
|
|
351
347
|
* const graph = rxdb.versionManager.getRepositoryDependencyGraph();
|
|
352
348
|
*
|
|
353
|
-
* //
|
|
349
|
+
* // 遍历依赖关系
|
|
354
350
|
* for (const [key, dep] of graph) {
|
|
355
|
-
* console.log(`${key}
|
|
356
|
-
* console.log(`${key}
|
|
351
|
+
* console.log(`${key} 依赖:`, dep.dependsOn);
|
|
352
|
+
* console.log(`${key} 被依赖:`, dep.requiredBy);
|
|
357
353
|
* }
|
|
358
354
|
* ```
|
|
359
355
|
*/
|
|
360
356
|
getRepositoryDependencyGraph(): DependencyGraph;
|
|
361
357
|
/**
|
|
362
|
-
*
|
|
358
|
+
* 根据依赖关系获取 Repository 的同步顺序
|
|
363
359
|
*
|
|
364
|
-
*
|
|
365
|
-
* repositories based on their dependencies.
|
|
360
|
+
* 通过拓扑排序确定基于依赖关系的正确同步顺序。
|
|
366
361
|
*
|
|
367
|
-
* @param direction -
|
|
368
|
-
* @returns
|
|
362
|
+
* @param direction - 排序方向：'pull'（父节点优先）或 'push'（子节点优先）
|
|
363
|
+
* @returns 有序的 Repository 列表
|
|
369
364
|
*
|
|
370
365
|
* @example
|
|
371
366
|
* ```typescript
|
|
372
|
-
* //
|
|
367
|
+
* // 获取 pull 顺序（父节点优先）
|
|
373
368
|
* const pullOrder = rxdb.versionManager.getRepositorySyncOrder('pull');
|
|
374
369
|
* // [User, Todo, Comment]
|
|
375
370
|
*
|
|
376
|
-
* //
|
|
371
|
+
* // 获取 push 顺序（子节点优先）
|
|
377
372
|
* const pushOrder = rxdb.versionManager.getRepositorySyncOrder('push');
|
|
378
373
|
* // [Comment, Todo, User]
|
|
379
374
|
* ```
|
|
@@ -389,6 +384,41 @@ export declare class VersionManager {
|
|
|
389
384
|
* 如果目标分支与当前分支相同，则直接返回，避免不必要的操作。
|
|
390
385
|
*/
|
|
391
386
|
switchBranch(branchId: string): Promise<void>;
|
|
387
|
+
/**
|
|
388
|
+
* 合并分支
|
|
389
|
+
*
|
|
390
|
+
* 将源分支的变更合并到当前激活分支（目标分支）。
|
|
391
|
+
*
|
|
392
|
+
* @param sourceBranchId - 源分支 ID
|
|
393
|
+
* @param options - 合并选项
|
|
394
|
+
* @returns 合并结果
|
|
395
|
+
*
|
|
396
|
+
* @remarks
|
|
397
|
+
* 支持两种策略：
|
|
398
|
+
* - `squash`（默认）：将源分支所有变更压缩为最小操作集后一次性应用，目标分支只产生一组变更记录
|
|
399
|
+
* - `normal`：逐条应用源分支变更，每条变更在目标分支产生独立的变更记录（保留历史细节）
|
|
400
|
+
*
|
|
401
|
+
* 合并后会清空 undo/redo 历史，因为合并操作不可逆。
|
|
402
|
+
* 可选通过 `deleteSource: true` 在合并后删除源分支。
|
|
403
|
+
*
|
|
404
|
+
* @example
|
|
405
|
+
* ```typescript
|
|
406
|
+
* // 压缩合并（默认）
|
|
407
|
+
* const result = await rxdb.versionManager.mergeBranch('feature-x');
|
|
408
|
+
* console.log(`Merged ${result.merged} changes`);
|
|
409
|
+
*
|
|
410
|
+
* // 普通合并
|
|
411
|
+
* const result = await rxdb.versionManager.mergeBranch('feature-x', {
|
|
412
|
+
* strategy: 'normal'
|
|
413
|
+
* });
|
|
414
|
+
*
|
|
415
|
+
* // 合并后删除源分支
|
|
416
|
+
* const result = await rxdb.versionManager.mergeBranch('feature-x', {
|
|
417
|
+
* deleteSource: true
|
|
418
|
+
* });
|
|
419
|
+
* ```
|
|
420
|
+
*/
|
|
421
|
+
mergeBranch(sourceBranchId: string, options?: MergeBranchOptions): Promise<MergeBranchResult>;
|
|
392
422
|
/**
|
|
393
423
|
* 获取特定作用域的历史记录 API
|
|
394
424
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VersionManager.d.ts","sourceRoot":"","sources":["../../src/version/VersionManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"VersionManager.d.ts","sourceRoot":"","sources":["../../src/version/VersionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -424,4 +424,43 @@ export interface SyncRepositoryResult {
|
|
|
424
424
|
*/
|
|
425
425
|
pushResult: PushRepositoryResult;
|
|
426
426
|
}
|
|
427
|
+
/**
|
|
428
|
+
* 合并策略
|
|
429
|
+
*
|
|
430
|
+
* - `squash`（默认）：将源分支所有变更压缩为目标分支的一组事务记录
|
|
431
|
+
* - `normal`：逐条复制源分支变更到目标分支
|
|
432
|
+
*/
|
|
433
|
+
export type MergeStrategy = 'squash' | 'normal';
|
|
434
|
+
/**
|
|
435
|
+
* 分支合并选项
|
|
436
|
+
*/
|
|
437
|
+
export interface MergeBranchOptions {
|
|
438
|
+
/**
|
|
439
|
+
* 合并策略
|
|
440
|
+
* @default 'squash'
|
|
441
|
+
*/
|
|
442
|
+
strategy?: MergeStrategy;
|
|
443
|
+
/**
|
|
444
|
+
* 合并后是否删除源分支
|
|
445
|
+
* @default false
|
|
446
|
+
*/
|
|
447
|
+
deleteSource?: boolean;
|
|
448
|
+
}
|
|
449
|
+
/**
|
|
450
|
+
* 分支合并结果
|
|
451
|
+
*/
|
|
452
|
+
export interface MergeBranchResult {
|
|
453
|
+
/**
|
|
454
|
+
* 合并的变更数量（应用到目标分支的实体操作数）
|
|
455
|
+
*/
|
|
456
|
+
merged: number;
|
|
457
|
+
/**
|
|
458
|
+
* 使用的合并策略
|
|
459
|
+
*/
|
|
460
|
+
strategy: MergeStrategy;
|
|
461
|
+
/**
|
|
462
|
+
* 源分支是否已删除
|
|
463
|
+
*/
|
|
464
|
+
sourceDeleted: boolean;
|
|
465
|
+
}
|
|
427
466
|
//# sourceMappingURL=VersionManager.interface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VersionManager.interface.d.ts","sourceRoot":"","sources":["../../src/version/VersionManager.interface.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"VersionManager.interface.d.ts","sourceRoot":"","sources":["../../src/version/VersionManager.interface.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VersionManager.utils.d.ts","sourceRoot":"","sources":["../../src/version/VersionManager.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,WAAW,EAAE,QAAQ,CAAC,WACN,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,WAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"VersionManager.utils.d.ts","sourceRoot":"","sources":["../../src/version/VersionManager.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,WAAW,EAAE,QAAQ,CAAC,WACN,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,WAAW,MAAM,KAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { MergeBranchOptions, MergeBranchResult } from './VersionManager.interface.js';
|
|
2
|
+
import { VersionManager } from './VersionManager.js';
|
|
3
|
+
/**
|
|
4
|
+
* 合并分支
|
|
5
|
+
*
|
|
6
|
+
* 将源分支的变更合并到当前激活分支（目标分支）。
|
|
7
|
+
*
|
|
8
|
+
* 支持两种策略：
|
|
9
|
+
* - `squash`（默认）：将源分支所有变更压缩为最小操作集后应用，过滤幽灵操作（源分支内
|
|
10
|
+
* INSERT 后又 DELETE 的实体不会影响目标分支）
|
|
11
|
+
* - `normal`：逐条应用源分支变更，每条变更在目标分支产生独立的变更记录，不过滤幽灵操作
|
|
12
|
+
*
|
|
13
|
+
* 合并后可选删除源分支。
|
|
14
|
+
*
|
|
15
|
+
* @param version - VersionManager 实例
|
|
16
|
+
* @param sourceBranchId - 源分支 ID
|
|
17
|
+
* @param currentBranchId - 当前激活分支 ID（由调用方提供，避免重复查询）
|
|
18
|
+
* @param options - 合并选项
|
|
19
|
+
* @returns 合并结果
|
|
20
|
+
*/
|
|
21
|
+
export declare const merge_branch: (version: VersionManager, sourceBranchId: string, currentBranchId: string, options?: MergeBranchOptions) => Promise<MergeBranchResult>;
|
|
22
|
+
//# sourceMappingURL=merge_branch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge_branch.d.ts","sourceRoot":"","sources":["../../src/version/merge_branch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAwB,MAAM,+BAA+B,CAAC;AAC5G,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,YAAY,GACvB,SAAS,cAAc,EACvB,gBAAgB,MAAM,EACtB,iBAAiB,MAAM,EACvB,UAAU,kBAAkB,KAC3B,OAAO,CAAC,iBAAiB,CAmG3B,CAAC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const RXDB_VERSION = "0.0.
|
|
1
|
+
export declare const RXDB_VERSION = "0.0.15";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|