@ddd-ts/event-sourcing-firestore 0.0.0-fix-get-handler.3 → 0.0.0-fix-cba-firestore-projector.2
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.
|
@@ -170,7 +170,7 @@ declare const Task_base: import("@ddd-ts/shape").IDict<{
|
|
|
170
170
|
readonly revision: NumberConstructor;
|
|
171
171
|
readonly attempts: NumberConstructor;
|
|
172
172
|
readonly processed: BooleanConstructor;
|
|
173
|
-
|
|
173
|
+
readonly claimer: import("@ddd-ts/shape").IOptional<StringConstructor, typeof import("@ddd-ts/shape").Empty>;
|
|
174
174
|
/** @deprecated */ readonly claimedAt: import("@ddd-ts/shape").IOptional<typeof MicrosecondTimestamp, typeof import("@ddd-ts/shape").Empty>;
|
|
175
175
|
readonly claimsMetadata: Mapping<[{
|
|
176
176
|
claimedAt: typeof MicrosecondTimestamp;
|
|
@@ -180,6 +180,7 @@ declare const Task_base: import("@ddd-ts/shape").IDict<{
|
|
|
180
180
|
readonly lock: typeof Lock;
|
|
181
181
|
readonly skipAfter: NumberConstructor;
|
|
182
182
|
readonly remaining: NumberConstructor;
|
|
183
|
+
readonly hasRemaining: BooleanConstructor;
|
|
183
184
|
readonly isolateAfter: NumberConstructor;
|
|
184
185
|
readonly claimTimeout: NumberConstructor;
|
|
185
186
|
readonly lastUpdateTime: import("@ddd-ts/shape").IOptional<typeof MicrosecondTimestamp, typeof import("@ddd-ts/shape").Empty>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firestore.projector.d.ts","sourceRoot":"","sources":["../../src/projection/firestore.projector.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"firestore.projector.d.ts","sourceRoot":"","sources":["../../src/projection/firestore.projector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,KAAK,QAAQ,EACb,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,IAAI,EACJ,eAAe,EACf,qBAAqB,EACrB,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAmB,MAAM,eAAe,CAAC;AAC/E,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEL,SAAS,EAET,UAAU,EACX,MAAM,0BAA0B,CAAC;AAmBlC,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAChE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC/D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC/D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CACjE;AASD,UAAU,wBAAwB;IAChC,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,OAAO,EAAE;QACP,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,KAAK,GAAG;QAAE,SAAS,EAAE,oBAAoB,CAAA;KAAE,CAAC;IACtD;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC7E,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,6CAA6C;IAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACvC,6CAA6C;IAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACxC;AAED,qBAAa,kBAAkB;aAIX,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC;aAClC,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC;aACvC,KAAK,EAAE,mBAAmB;IACnC,MAAM,EAAE,wBAAwB;IANzC,QAAQ,UAAQ;gBAGE,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,EAClC,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EACvC,KAAK,EAAE,mBAAmB,EACnC,MAAM,GAAE,wBAUd;IAGH,OAAO,KAAK,MAAM,GAEjB;IAEM,OAAO;IAwBd,OAAO,CAAC,qBAAqB,CAGf;IACd,OAAO,CAAC,eAAe,CAAkC;IAMzD,OAAO,CAAC,cAAc,CAGR;IAEd,OAAO,CAAC,mBAAmB;IASrB,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,QAAQ,CAAC;YAmHlC,SAAS;YAwDT,SAAS;IAKjB,OAAO,CACX,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IAgEV,YAAY,CAAC,YAAY,EAAE,YAAY;YAK/B,gBAAgB;IAaxB,OAAO,CACX,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IAoCV,UAAU,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAkB3D;;;;OAIG;IACG,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,GAAE,MAAmB;IAMxE;;;;OAIG;IACG,aAAa,CACjB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO;IAQrC;;;;OAIG;IACG,OAAO,CAAC,YAAY,EAAE,YAAY;IAUxC;;;OAGG;IACG,OAAO,CACX,YAAY,EAAE,YAAY,EAC1B,IAAI,GAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAO;IAgBpC;;;;;;;;OAQG;IACG,IAAI,CACR,YAAY,EAAE,YAAY,EAC1B,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,IAAI,CAAA;KAAO;IAsBzC,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI;YAI3C,gBAAgB;YAsBhB,gBAAgB;YAKhB,cAAc;YAKd,UAAU;YAcV,aAAa;YA+Db,kBAAkB;CAyBjC;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAK9C;AAED,qBAAa,mBAAmB;IASX,EAAE,EAAE,SAAS;IARhC,SAAS,mDAA0B;IACnC,UAAU,EAAE,iBAAiB,CAAC,mBAAmB,CAAC;IAKlD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,UAA4B;gBAEzC,EAAE,EAAE,SAAS;IAMhC,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,uBAAuB;IAQzB,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;IA0BxD,KAAK,CACT,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;IA+Bf,IAAI,CAAC,YAAY,EAAE,YAAY;IA0B/B,WAAW,CAAC,YAAY,EAAE,YAAY;IAoDtC,OAAO,CACX,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAmBlB,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;IAmB7D;;;;;OAKG;IACG,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAgB5D,UAAU,CAAC,EAAE,EAAE,YAAY;IAI3B,KAAK,CAAC,EAAE,EAAE,YAAY;IAItB,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAInC,SAAS,CACb,SAAS,EAAE,SAAS,EACpB,EAAE,EAAE,YAAY,EAChB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,GAAE;QACP,WAAW,CAAC,EAAE,oBAAoB,CAAC;QACnC,WAAW,CAAC,EAAE,UAAU,CAAC;KACrB;IA6BF,aAAa,CAAC,EAAE,EAAE,YAAY;IA2B9B,OAAO,CACX,EAAE,EAAE,YAAY,EAChB,SAAS,GAAE,oBAAwD;IA6B/D,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,OAAO,EAAE,CAAA;KAAO;IAWzD,cAAc,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAS5D,KAAK,CACT,YAAY,EAAE,YAAY,EAC1B,SAAS,GAAE,OAA8C;IA8BrD,OAAO,CACX,YAAY,EAAE,YAAY,EAC1B,SAAS,GAAE,OAA8C;IAK3D;;;;;;;;;OASG;IACG,IAAI,CAAC,YAAY,EAAE,YAAY;CAuCtC;AAED,qBAAa,SAAU,SAAQ,OAAO;CAAG;;;;;;;;;IAavC,kBAAkB;;;;;;;;;;;;;;AAZpB,qBAAa,IAAI,CAAC,MAAM,SAAS,OAAO,CAAE,SAAQ,SA2BhD;IACQ,cAAc,EAAE,MAAM,SAAS,IAAI,GACvC,oBAAoB,GACpB,SAAS,CAAC;IAEd,IAAI,MAAM,WAOT;IAED,MAAM,CAAC,GAAG,CACR,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,GACA,IAAI,CAAC,KAAK,CAAC;IAsBd,IAAI,cAAc,uBAGjB;IAED,IAAI,YAAY,YAEf;IAED,IAAI,WAAW,YAEd;IAED,IAAI,UAAU,YAEb;IAED,IAAI,aAAa,YAEhB;IAED,YAAY;IAgBZ,MAAM,CAAC,6BAA6B,CAClC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,gBAAgB,CAAC,EACpD,SAAS,CAAC,EAAE,oBAAoB,GAC/B,IAAI,CAAC,IAAI,CAAC;IAYb,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;CA0DjC"}
|
|
@@ -442,7 +442,8 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
442
442
|
[`claimsMetadata.${claimer.serialize()}`]: { claimedAt: firebase_admin_firestore.FieldValue.serverTimestamp() },
|
|
443
443
|
claimIds: firebase_admin_firestore.FieldValue.arrayUnion(claimer.serialize()),
|
|
444
444
|
attempts: firebase_admin_firestore.FieldValue.increment(1),
|
|
445
|
-
remaining: firebase_admin_firestore.FieldValue.increment(-1)
|
|
445
|
+
remaining: firebase_admin_firestore.FieldValue.increment(-1),
|
|
446
|
+
hasRemaining: task.remaining > 1
|
|
446
447
|
}, { lastUpdateTime: this.microsecondsToTimestamp(task.lastUpdateTime) });
|
|
447
448
|
}
|
|
448
449
|
await batch.commit();
|
|
@@ -486,7 +487,7 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
486
487
|
return tasks;
|
|
487
488
|
}
|
|
488
489
|
async claimed(checkpointId, claimer) {
|
|
489
|
-
return (await this.queue(checkpointId).where("
|
|
490
|
+
return (await this.queue(checkpointId).where("claimer", "==", claimer.serialize()).orderBy("occurredAt", "asc").orderBy("revision", "asc").orderBy("ref", "asc").get()).docs.map((doc) => {
|
|
490
491
|
const data = this.converter.fromFirestoreSnapshot(doc);
|
|
491
492
|
const timestamp = doc.updateTime ? this.timestampToMicroseconds(doc.updateTime) : void 0;
|
|
492
493
|
return Task.deserializeWithLastUpdateTime(data, timestamp);
|
|
@@ -604,7 +605,8 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
604
605
|
claimTimeout: 0,
|
|
605
606
|
skipAfter: 0,
|
|
606
607
|
isolateAfter: 0,
|
|
607
|
-
lastUpdateTime: void 0
|
|
608
|
+
lastUpdateTime: void 0,
|
|
609
|
+
hasRemaining: true
|
|
608
610
|
});
|
|
609
611
|
await this.queued(checkpointId, blockerId).delete();
|
|
610
612
|
const serialized = task.serialize();
|
|
@@ -650,7 +652,8 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
650
652
|
claimTimeout: 0,
|
|
651
653
|
skipAfter: 0,
|
|
652
654
|
isolateAfter: 0,
|
|
653
|
-
lastUpdateTime: void 0
|
|
655
|
+
lastUpdateTime: void 0,
|
|
656
|
+
hasRemaining: true
|
|
654
657
|
});
|
|
655
658
|
try {
|
|
656
659
|
const serialized = task.serialize();
|
|
@@ -679,6 +682,7 @@ var Task = class Task extends (0, _ddd_ts_shape.Shape)({
|
|
|
679
682
|
lock: _ddd_ts_core.Lock,
|
|
680
683
|
skipAfter: Number,
|
|
681
684
|
remaining: Number,
|
|
685
|
+
hasRemaining: Boolean,
|
|
682
686
|
isolateAfter: Number,
|
|
683
687
|
claimTimeout: Number,
|
|
684
688
|
lastUpdateTime: (0, _ddd_ts_shape.Optional)(_ddd_ts_shape.MicrosecondTimestamp)
|
|
@@ -705,6 +709,7 @@ var Task = class Task extends (0, _ddd_ts_shape.Shape)({
|
|
|
705
709
|
skipAfter: config.skipAfter,
|
|
706
710
|
isolateAfter: config.isolateAfter,
|
|
707
711
|
remaining: config.skipAfter,
|
|
712
|
+
hasRemaining: config.skipAfter > 0,
|
|
708
713
|
ref: fact.ref,
|
|
709
714
|
revision: fact.revision,
|
|
710
715
|
occurredAt: fact.occurredAt,
|
|
@@ -738,7 +743,8 @@ var Task = class Task extends (0, _ddd_ts_shape.Shape)({
|
|
|
738
743
|
...data,
|
|
739
744
|
lastUpdateTime: timestamp,
|
|
740
745
|
claimIds: data.claimIds || [],
|
|
741
|
-
claimsMetadata: data.claimsMetadata || {}
|
|
746
|
+
claimsMetadata: data.claimsMetadata || {},
|
|
747
|
+
hasRemaining: data.hasRemaining ?? data.remaining > 0
|
|
742
748
|
});
|
|
743
749
|
}
|
|
744
750
|
static batch(tasks) {
|
|
@@ -441,7 +441,8 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
441
441
|
[`claimsMetadata.${claimer.serialize()}`]: { claimedAt: FieldValue.serverTimestamp() },
|
|
442
442
|
claimIds: FieldValue.arrayUnion(claimer.serialize()),
|
|
443
443
|
attempts: FieldValue.increment(1),
|
|
444
|
-
remaining: FieldValue.increment(-1)
|
|
444
|
+
remaining: FieldValue.increment(-1),
|
|
445
|
+
hasRemaining: task.remaining > 1
|
|
445
446
|
}, { lastUpdateTime: this.microsecondsToTimestamp(task.lastUpdateTime) });
|
|
446
447
|
}
|
|
447
448
|
await batch.commit();
|
|
@@ -485,7 +486,7 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
485
486
|
return tasks;
|
|
486
487
|
}
|
|
487
488
|
async claimed(checkpointId, claimer) {
|
|
488
|
-
return (await this.queue(checkpointId).where("
|
|
489
|
+
return (await this.queue(checkpointId).where("claimer", "==", claimer.serialize()).orderBy("occurredAt", "asc").orderBy("revision", "asc").orderBy("ref", "asc").get()).docs.map((doc) => {
|
|
489
490
|
const data = this.converter.fromFirestoreSnapshot(doc);
|
|
490
491
|
const timestamp = doc.updateTime ? this.timestampToMicroseconds(doc.updateTime) : void 0;
|
|
491
492
|
return Task.deserializeWithLastUpdateTime(data, timestamp);
|
|
@@ -603,7 +604,8 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
603
604
|
claimTimeout: 0,
|
|
604
605
|
skipAfter: 0,
|
|
605
606
|
isolateAfter: 0,
|
|
606
|
-
lastUpdateTime: void 0
|
|
607
|
+
lastUpdateTime: void 0,
|
|
608
|
+
hasRemaining: true
|
|
607
609
|
});
|
|
608
610
|
await this.queued(checkpointId, blockerId).delete();
|
|
609
611
|
const serialized = task.serialize();
|
|
@@ -649,7 +651,8 @@ var FirestoreQueueStore = class FirestoreQueueStore {
|
|
|
649
651
|
claimTimeout: 0,
|
|
650
652
|
skipAfter: 0,
|
|
651
653
|
isolateAfter: 0,
|
|
652
|
-
lastUpdateTime: void 0
|
|
654
|
+
lastUpdateTime: void 0,
|
|
655
|
+
hasRemaining: true
|
|
653
656
|
});
|
|
654
657
|
try {
|
|
655
658
|
const serialized = task.serialize();
|
|
@@ -678,6 +681,7 @@ var Task = class Task extends Shape({
|
|
|
678
681
|
lock: Lock,
|
|
679
682
|
skipAfter: Number,
|
|
680
683
|
remaining: Number,
|
|
684
|
+
hasRemaining: Boolean,
|
|
681
685
|
isolateAfter: Number,
|
|
682
686
|
claimTimeout: Number,
|
|
683
687
|
lastUpdateTime: Optional(MicrosecondTimestamp)
|
|
@@ -704,6 +708,7 @@ var Task = class Task extends Shape({
|
|
|
704
708
|
skipAfter: config.skipAfter,
|
|
705
709
|
isolateAfter: config.isolateAfter,
|
|
706
710
|
remaining: config.skipAfter,
|
|
711
|
+
hasRemaining: config.skipAfter > 0,
|
|
707
712
|
ref: fact.ref,
|
|
708
713
|
revision: fact.revision,
|
|
709
714
|
occurredAt: fact.occurredAt,
|
|
@@ -737,7 +742,8 @@ var Task = class Task extends Shape({
|
|
|
737
742
|
...data,
|
|
738
743
|
lastUpdateTime: timestamp,
|
|
739
744
|
claimIds: data.claimIds || [],
|
|
740
|
-
claimsMetadata: data.claimsMetadata || {}
|
|
745
|
+
claimsMetadata: data.claimsMetadata || {},
|
|
746
|
+
hasRemaining: data.hasRemaining ?? data.remaining > 0
|
|
741
747
|
});
|
|
742
748
|
}
|
|
743
749
|
static batch(tasks) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ddd-ts/event-sourcing-firestore",
|
|
3
|
-
"version": "0.0.0-fix-
|
|
3
|
+
"version": "0.0.0-fix-cba-firestore-projector.2",
|
|
4
4
|
"types": "dist/index.d.ts",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -10,19 +10,19 @@
|
|
|
10
10
|
"dist"
|
|
11
11
|
],
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@ddd-ts/core": "0.0.0-fix-
|
|
14
|
-
"@ddd-ts/shape": "0.0.0-fix-
|
|
15
|
-
"@ddd-ts/store-firestore": "0.0.0-fix-
|
|
16
|
-
"@ddd-ts/traits": "0.0.0-fix-
|
|
17
|
-
"@ddd-ts/types": "0.0.0-fix-
|
|
13
|
+
"@ddd-ts/core": "0.0.0-fix-cba-firestore-projector.2",
|
|
14
|
+
"@ddd-ts/shape": "0.0.0-fix-cba-firestore-projector.2",
|
|
15
|
+
"@ddd-ts/store-firestore": "0.0.0-fix-cba-firestore-projector.2",
|
|
16
|
+
"@ddd-ts/traits": "0.0.0-fix-cba-firestore-projector.2",
|
|
17
|
+
"@ddd-ts/types": "0.0.0-fix-cba-firestore-projector.2",
|
|
18
18
|
"@opentelemetry/api": "1.6.0",
|
|
19
19
|
"firebase-admin": "^13.2.0"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
|
-
"@ddd-ts/shape": "0.0.0-fix-
|
|
23
|
-
"@ddd-ts/tests": "0.0.0-fix-
|
|
24
|
-
"@ddd-ts/tools": "0.0.0-fix-
|
|
25
|
-
"@ddd-ts/types": "0.0.0-fix-
|
|
22
|
+
"@ddd-ts/shape": "0.0.0-fix-cba-firestore-projector.2",
|
|
23
|
+
"@ddd-ts/tests": "0.0.0-fix-cba-firestore-projector.2",
|
|
24
|
+
"@ddd-ts/tools": "0.0.0-fix-cba-firestore-projector.2",
|
|
25
|
+
"@ddd-ts/types": "0.0.0-fix-cba-firestore-projector.2",
|
|
26
26
|
"@types/jest": "^29.5.1"
|
|
27
27
|
},
|
|
28
28
|
"exports": {
|