hikoutei 0.5.8 → 0.5.9
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/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.d.ts +9 -1
- package/dist/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.d.ts.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.js +7 -2
- package/dist/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.js.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.d.ts.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.js +4 -2
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.js.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPolling.js +4 -4
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPolling.js.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.d.ts +2 -0
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.d.ts.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.js +1 -0
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.js.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.d.ts.map +1 -1
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.js +2 -0
- package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.js.map +1 -1
- package/dist/application/orm/persistence/flush/flushCoordinator.d.ts.map +1 -1
- package/dist/application/orm/persistence/flush/flushCoordinator.js +52 -2
- package/dist/application/orm/persistence/flush/flushCoordinator.js.map +1 -1
- package/dist/application/orm/persistence/lifecycle/entityLifecycle.d.ts +5 -1
- package/dist/application/orm/persistence/lifecycle/entityLifecycle.d.ts.map +1 -1
- package/dist/application/orm/persistence/lifecycle/entityLifecycle.js +13 -8
- package/dist/application/orm/persistence/lifecycle/entityLifecycle.js.map +1 -1
- package/dist/application/orm/persistence/support/contracts.d.ts +32 -0
- package/dist/application/orm/persistence/support/contracts.d.ts.map +1 -1
- package/dist/application/orm/persistence/support/contracts.js.map +1 -1
- package/dist/application/sync/inbound/autoSystemConflictResolution.d.ts +90 -15
- package/dist/application/sync/inbound/autoSystemConflictResolution.d.ts.map +1 -1
- package/dist/application/sync/inbound/autoSystemConflictResolution.js +412 -110
- package/dist/application/sync/inbound/autoSystemConflictResolution.js.map +1 -1
- package/dist/application/sync/service/SyncServiceBootstrap.d.ts.map +1 -1
- package/dist/application/sync/service/SyncServiceBootstrap.js +12 -1
- package/dist/application/sync/service/SyncServiceBootstrap.js.map +1 -1
- package/dist/application/sync/sheetsContract/conflictProjection.d.ts +19 -2
- package/dist/application/sync/sheetsContract/conflictProjection.d.ts.map +1 -1
- package/dist/application/sync/sheetsContract/conflictProjection.js +43 -6
- package/dist/application/sync/sheetsContract/conflictProjection.js.map +1 -1
- package/dist/domain/model/constants.d.ts +7 -0
- package/dist/domain/model/constants.d.ts.map +1 -1
- package/dist/domain/model/constants.js +5 -0
- package/dist/domain/model/constants.js.map +1 -1
- package/dist/domain/model/index.d.ts +2 -2
- package/dist/domain/model/index.d.ts.map +1 -1
- package/dist/domain/model/index.js +1 -1
- package/dist/domain/model/index.js.map +1 -1
- package/dist/domain/model/types.d.ts +14 -2
- package/dist/domain/model/types.d.ts.map +1 -1
- package/dist/infrastructure/storage/sqlite/migrateSchema.d.ts.map +1 -1
- package/dist/infrastructure/storage/sqlite/migrateSchema.js +16 -1
- package/dist/infrastructure/storage/sqlite/migrateSchema.js.map +1 -1
- package/dist/infrastructure/storage/sqlite/schema.d.ts +3 -1
- package/dist/infrastructure/storage/sqlite/schema.d.ts.map +1 -1
- package/dist/infrastructure/storage/sqlite/schema.js +8 -1
- package/dist/infrastructure/storage/sqlite/schema.js.map +1 -1
- package/dist/infrastructure/storage/sqlite/schemaTypes.d.ts +1 -1
- package/dist/infrastructure/storage/sqlite/schemaTypes.d.ts.map +1 -1
- package/dist/infrastructure/storage/state/mapped/mappedPersistenceSql.d.ts +28 -0
- package/dist/infrastructure/storage/state/mapped/mappedPersistenceSql.d.ts.map +1 -1
- package/dist/infrastructure/storage/state/mapped/mappedPersistenceSql.js +65 -1
- package/dist/infrastructure/storage/state/mapped/mappedPersistenceSql.js.map +1 -1
- package/dist/infrastructure/storage/state/observation/observationCanonical.d.ts.map +1 -1
- package/dist/infrastructure/storage/state/observation/observationCanonical.js +64 -3
- package/dist/infrastructure/storage/state/observation/observationCanonical.js.map +1 -1
- package/dist/infrastructure/storage/state/resolution/candidateEvidence.d.ts +48 -0
- package/dist/infrastructure/storage/state/resolution/candidateEvidence.d.ts.map +1 -0
- package/dist/infrastructure/storage/state/resolution/candidateEvidence.js +101 -0
- package/dist/infrastructure/storage/state/resolution/candidateEvidence.js.map +1 -0
- package/dist/infrastructure/storage/state/resolution/resolutionWriter.d.ts +35 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriter.d.ts.map +1 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriter.js +57 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriter.js.map +1 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriterContracts.d.ts +2 -0
- package/dist/infrastructure/storage/state/resolution/resolutionWriterContracts.d.ts.map +1 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.d.ts +19 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.d.ts.map +1 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.js +50 -1
- package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* setup before the application begins calling `em.persist()` and `em.flush()`.
|
|
7
7
|
*/
|
|
8
8
|
import { type TypedSheetsEntityMapping, type TypedSheetsEntityMappingRegistry } from "../../../../../application/orm/mapping/entityMapping.js";
|
|
9
|
-
import type { RegisteredTypedSheetsMappedProjection, TypedSheetsEntityWriterOptions } from "../../../../../application/orm/persistence/support/contracts.js";
|
|
9
|
+
import type { MappedFlushSyncHook, RegisteredTypedSheetsMappedProjection, TypedSheetsEntityWriterOptions } from "../../../../../application/orm/persistence/support/contracts.js";
|
|
10
10
|
import type { TypedSheetsOrm } from "../../../../../application/orm/api/TypedSheetsOrm.js";
|
|
11
11
|
import type { RegisteredSyncProjectionDefinition } from "../../../../../application/sync/sheetsContract/sheetsProvisioning.js";
|
|
12
12
|
import { type InitializeMikroOrmSqliteAdapterOptions, type MikroOrmSqliteAdapter } from "../storage/MikroOrmSqliteAdapter.js";
|
|
@@ -14,6 +14,14 @@ import { type InitializeMikroOrmSqliteAdapterOptions, type MikroOrmSqliteAdapter
|
|
|
14
14
|
export interface CreateMappedTypedSheetsOrmOptions {
|
|
15
15
|
readonly mappings: TypedSheetsEntityMappingRegistry | readonly TypedSheetsEntityMapping[];
|
|
16
16
|
readonly writer: TypedSheetsEntityWriterOptions;
|
|
17
|
+
/**
|
|
18
|
+
* Internal sync behavior injected into the mapped flush transaction.
|
|
19
|
+
*
|
|
20
|
+
* Never part of the root application contract; the sync service bootstrap
|
|
21
|
+
* supplies it so NEEDS_REBASE audits and implicit system-wins resolution
|
|
22
|
+
* stay atomic with entity/canonical/outbox writes.
|
|
23
|
+
*/
|
|
24
|
+
readonly syncFlushHook?: MappedFlushSyncHook;
|
|
17
25
|
}
|
|
18
26
|
/** Options for opening, migrating, registering, and mapping a dedicated SQLite runtime. */
|
|
19
27
|
export interface InitializeMappedTypedSheetsOrmOptions extends InitializeMikroOrmSqliteAdapterOptions, CreateMappedTypedSheetsOrmOptions {
|
package/dist/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmMappedTypedSheets.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,gCAAgC,EACtC,MAAM,yDAAyD,CAAC;AACjE,OAAO,KAAK,EACV,qCAAqC,EACrC,8BAA8B,EAC/B,MAAM,iEAAiE,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,sEAAsE,CAAC;AAI/H,OAAO,EAEL,KAAK,sCAAsC,EAC3C,KAAK,qBAAqB,EAC3B,MAAM,qCAAqC,CAAC;AAG7C,2FAA2F;AAC3F,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,GAAG,SAAS,wBAAwB,EAAE,CAAC;IAC1F,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"MikroOrmMappedTypedSheets.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,gCAAgC,EACtC,MAAM,yDAAyD,CAAC;AACjE,OAAO,KAAK,EACV,mBAAmB,EACnB,qCAAqC,EACrC,8BAA8B,EAC/B,MAAM,iEAAiE,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,sEAAsE,CAAC;AAI/H,OAAO,EAEL,KAAK,sCAAsC,EAC3C,KAAK,qBAAqB,EAC3B,MAAM,qCAAqC,CAAC;AAG7C,2FAA2F;AAC3F,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,GAAG,SAAS,wBAAwB,EAAE,CAAC;IAC1F,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,mBAAmB,CAAC;CAC9C;AAED,2FAA2F;AAC3F,MAAM,WAAW,qCACf,SAAQ,sCAAsC,EAAE,iCAAiC;IACjF;;;;;OAKG;IACH,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CACjC,WAAW,EAAE,SAAS,kCAAkC,EAAE,KACvD,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,kFAAkF;AAClF,MAAM,WAAW,mCAAmC;IAClD,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC;IACxC,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;IACpD,QAAQ,CAAC,aAAa,EAAE,SAAS,qCAAqC,EAAE,CAAC;CAC1E;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,iCAAiC,GACzC,cAAc,CAShB;AAED;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CACtD,OAAO,EAAE,qCAAqC,GAC7C,OAAO,CAAC,mCAAmC,CAAC,CA8B9C;AAED,mFAAmF;AACnF,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,qCAAqC,GAC7C,OAAO,CAAC,cAAc,CAAC,CAGzB"}
|
|
@@ -20,6 +20,7 @@ export function createMappedTypedSheetsOrm(storage, options) {
|
|
|
20
20
|
flushCoordinator: createMappedTypedSheetsFlushCoordinator({
|
|
21
21
|
mappings,
|
|
22
22
|
writer: options.writer,
|
|
23
|
+
...(options.syncFlushHook === undefined ? {} : { syncFlushHook: options.syncFlushHook }),
|
|
23
24
|
}),
|
|
24
25
|
});
|
|
25
26
|
}
|
|
@@ -31,7 +32,7 @@ export function createMappedTypedSheetsOrm(storage, options) {
|
|
|
31
32
|
* a process cannot mutate a spreadsheet merely by opening its local database.
|
|
32
33
|
*/
|
|
33
34
|
export async function initializeMappedTypedSheetsRuntime(options) {
|
|
34
|
-
const { mappings: mappingsInput, writer, onRegisteredProjections, ...adapterOptions } = options;
|
|
35
|
+
const { mappings: mappingsInput, writer, onRegisteredProjections, syncFlushHook, ...adapterOptions } = options;
|
|
35
36
|
const mappings = mappingRegistry(mappingsInput);
|
|
36
37
|
const storage = await initializeMikroOrmSqliteAdapter(adapterOptions);
|
|
37
38
|
try {
|
|
@@ -42,7 +43,11 @@ export async function initializeMappedTypedSheetsRuntime(options) {
|
|
|
42
43
|
}
|
|
43
44
|
return {
|
|
44
45
|
storage,
|
|
45
|
-
orm: createMappedTypedSheetsOrm(storage, {
|
|
46
|
+
orm: createMappedTypedSheetsOrm(storage, {
|
|
47
|
+
mappings,
|
|
48
|
+
writer,
|
|
49
|
+
...(syncFlushHook === undefined ? {} : { syncFlushHook }),
|
|
50
|
+
}),
|
|
46
51
|
mappings,
|
|
47
52
|
registrations,
|
|
48
53
|
};
|
package/dist/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmMappedTypedSheets.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,0CAA0C,EAC1C,iCAAiC,EACjC,uCAAuC,GACxC,MAAM,sEAAsE,CAAC;AAC9E,OAAO,EACL,sCAAsC,GAGvC,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"MikroOrmMappedTypedSheets.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/engine/MikroOrmMappedTypedSheets.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,0CAA0C,EAC1C,iCAAiC,EACjC,uCAAuC,GACxC,MAAM,sEAAsE,CAAC;AAC9E,OAAO,EACL,sCAAsC,GAGvC,MAAM,yDAAyD,CAAC;AAQjE,OAAO,EACL,oBAAoB,GACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,+BAA+B,GAGhC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,kCAAkC,EAAE,MAAM,oCAAoC,CAAC;AAsCxF;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACxC,OAA8B,EAC9B,OAA0C;IAE1C,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnD,OAAO,oBAAoB,CAAC,OAAO,EAAE;QACnC,gBAAgB,EAAE,uCAAuC,CAAC;YACxD,QAAQ;YACR,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;SACzF,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,OAA8C;IAE9C,MAAM,EACJ,QAAQ,EAAE,aAAa,EACvB,MAAM,EACN,uBAAuB,EACvB,aAAa,EACb,GAAG,cAAc,EAClB,GAAG,OAAO,CAAC;IACZ,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,+BAA+B,CAAC,cAAc,CAAC,CAAC;IACtE,IAAI,CAAC;QACH,MAAM,kCAAkC,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,MAAM,iCAAiC,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACzF,IAAI,uBAAuB,KAAK,SAAS,EAAE,CAAC;YAC1C,MAAM,uBAAuB,CAAC,0CAA0C,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO;YACL,OAAO;YACP,GAAG,EAAE,0BAA0B,CAAC,OAAO,EAAE;gBACvC,QAAQ;gBACR,MAAM;gBACN,GAAG,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC;aAC1D,CAAC;YACF,QAAQ;YACR,aAAa;SACd,CAAC;IACJ,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,OAA8C;IAE9C,MAAM,OAAO,GAAG,MAAM,kCAAkC,CAAC,OAAO,CAAC,CAAC;IAClE,OAAO,OAAO,CAAC,GAAG,CAAC;AACrB,CAAC;AAED,SAAS,eAAe,CACtB,KAA6E;IAE7E,IAAI,kBAAkB,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,sCAAsC,CAAC,KAAK,CAAC,CAAC;AACvD,CAAC"}
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmMappedObservation.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAML,KAAK,wBAAwB,EAC7B,KAAK,gCAAgC,EACtC,MAAM,yDAAyD,CAAC;AAYjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iEAAiE,CAAC;AAC7G,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,qCAAqC,CAAC;AAE7C,+FAA+F;AAC/F,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,GAAG,SAAS,wBAAwB,EAAE,CAAC;IAC1F,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAsB,oCAAoC,CACxD,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,wBAAwB,CAAC,
|
|
1
|
+
{"version":3,"file":"MikroOrmMappedObservation.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAML,KAAK,wBAAwB,EAC7B,KAAK,gCAAgC,EACtC,MAAM,yDAAyD,CAAC;AAYjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iEAAiE,CAAC;AAC7G,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,qCAAqC,CAAC;AAE7C,+FAA+F;AAC/F,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,GAAG,SAAS,wBAAwB,EAAE,CAAC;IAC1F,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAsB,oCAAoC,CACxD,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,wBAAwB,CAAC,CAmDnC"}
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.js
CHANGED
|
@@ -12,7 +12,7 @@ import { OBSERVATION_WRITE_RESULT_KINDS } from "../../../../../infrastructure/st
|
|
|
12
12
|
import { createTypedSheetsEntityMappingRegistry, decodeTypedSheetsEntityField, requireTypedSheetsEntityField, typedSheetsCanonicalEntityId, typedSheetsEntityIdFromCanonical, } from "../../../../../application/orm/mapping/entityMapping.js";
|
|
13
13
|
import { MAPPED_OBSERVATION_ENTITY_MUTATION_KINDS, planMappedObservationEntityMutation, } from "../../../../../application/orm/mapping/observationMapping.js";
|
|
14
14
|
import { TYPED_SHEETS_ORM_ERROR_CODES, TypedSheetsOrmError, } from "../../../../../application/orm/errors.js";
|
|
15
|
-
import {
|
|
15
|
+
import { planOpenConflictAuditEffectsWithSql, } from "../../../../../application/sync/inbound/autoSystemConflictResolution.js";
|
|
16
16
|
/**
|
|
17
17
|
* Persists a normalized observation and the matching MikroORM entity mutation
|
|
18
18
|
* in one SQLite transaction.
|
|
@@ -31,7 +31,9 @@ export async function persistMappedObservedRowWithMikroOrm(storage, options) {
|
|
|
31
31
|
const result = await persistObservedRowWithSql(sql, options.fence, options.input);
|
|
32
32
|
if (result.kind === OBSERVATION_WRITE_RESULT_KINDS.PERSISTED &&
|
|
33
33
|
result.conflictIds.length > 0) {
|
|
34
|
-
|
|
34
|
+
// A detection only persists the OPEN audit projection; zero resolution
|
|
35
|
+
// commands are created so polling and restart alone never resolve.
|
|
36
|
+
await planOpenConflictAuditEffectsWithSql(sql, options.fence, options.writer, mapping, result.conflictIds);
|
|
35
37
|
}
|
|
36
38
|
const canonical = options.input.canonical;
|
|
37
39
|
if (result.kind !== OBSERVATION_WRITE_RESULT_KINDS.PERSISTED ||
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmMappedObservation.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EACL,yBAAyB,GAK1B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,MAAM,iFAAiF,CAAC;AACjI,OAAO,EACL,sCAAsC,EACtC,4BAA4B,EAC5B,6BAA6B,EAC7B,4BAA4B,EAC5B,gCAAgC,GAGjC,MAAM,yDAAyD,CAAC;AACjE,OAAO,EACL,wCAAwC,EACxC,mCAAmC,GACpC,MAAM,8DAA8D,CAAC;AACtE,OAAO,EACL,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"MikroOrmMappedObservation.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmMappedObservation.ts"],"names":[],"mappings":"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"}
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPolling.js
CHANGED
|
@@ -132,7 +132,7 @@ export async function pollMappedUserInputWithMikroOrm(options) {
|
|
|
132
132
|
const persistenceStartedAt = Date.now();
|
|
133
133
|
const observedInputs = await persistPreparedRowsIfNeeded(options, state, prepared.preparedRows, prepared.invalidRows, fullAccumulators);
|
|
134
134
|
emitPollingTiming(timingSink, POLLING_TIMING_PHASES.PERSISTENCE, Date.now() - persistenceStartedAt);
|
|
135
|
-
await retryDeferredConflicts(options, mappings
|
|
135
|
+
await retryDeferredConflicts(options, mappings);
|
|
136
136
|
const report = createPollingReport(startedAt, accumulators, {
|
|
137
137
|
mode: MAPPED_USER_INPUT_POLL_MODES.ADAPTIVE,
|
|
138
138
|
safetyFullScan: false,
|
|
@@ -152,7 +152,7 @@ export async function pollMappedUserInputWithMikroOrm(options) {
|
|
|
152
152
|
const persistenceStartedAt = Date.now();
|
|
153
153
|
const observedInputs = await persistPreparedRowsIfNeeded(options, state, prepared.preparedRows, prepared.invalidRows, accumulators);
|
|
154
154
|
emitPollingTiming(timingSink, POLLING_TIMING_PHASES.PERSISTENCE, Date.now() - persistenceStartedAt);
|
|
155
|
-
await retryDeferredConflicts(options, mappings
|
|
155
|
+
await retryDeferredConflicts(options, mappings);
|
|
156
156
|
const report = createPollingReport(startedAt, accumulators, {
|
|
157
157
|
mode: MAPPED_USER_INPUT_POLL_MODES.FULL,
|
|
158
158
|
safetyFullScan: options.forceFull === true,
|
|
@@ -219,8 +219,8 @@ async function persistPreparedRowsIfNeeded(options, state, preparedRows, invalid
|
|
|
219
219
|
return persistPreparedRows(options.storage, writer, fence, state, preparedRows, accumulators);
|
|
220
220
|
}
|
|
221
221
|
/** Retries OPEN conflicts whose previous system-wins attempt was deferred. */
|
|
222
|
-
async function retryDeferredConflicts(options, mappings
|
|
223
|
-
await retryOpenMappedConflictsWithAdapter(options.storage, mappings, resolveTypedSheetsEntityWriterOptions(options.writer)
|
|
222
|
+
async function retryDeferredConflicts(options, mappings) {
|
|
223
|
+
await retryOpenMappedConflictsWithAdapter(options.storage, mappings, resolveTypedSheetsEntityWriterOptions(options.writer));
|
|
224
224
|
}
|
|
225
225
|
async function claimMappedInboundWriterLease(storage, writer) {
|
|
226
226
|
const now = writer.now();
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPolling.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmUserInputPolling.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPolling.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MikroOrmUserInputPolling.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPolling.ts"],"names":[],"mappings":"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"}
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.d.ts
CHANGED
|
@@ -42,6 +42,8 @@ export interface ConflictSqlRow {
|
|
|
42
42
|
readonly current_canonical_value: string;
|
|
43
43
|
readonly current_canonical_revision: number;
|
|
44
44
|
readonly candidate_epoch: number;
|
|
45
|
+
readonly candidate_visible_revision: number | null;
|
|
46
|
+
readonly candidate_visible_hash: string | null;
|
|
45
47
|
readonly status: string;
|
|
46
48
|
readonly resolution_command_id: string | null;
|
|
47
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmUserInputPollingSql.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MikroOrmUserInputPollingSql.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAQ1E,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,yDAAyD,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AAEvF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,4BAA4B,EAAE,MAAM,CAAC;IAC9C,QAAQ,CAAC,+BAA+B,EAAE,MAAM,CAAC;IACjD,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAC;IAC5C,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,GAAG,IAAI,CAAC;IACnD,QAAQ,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAC;IAC5C,QAAQ,CAAC,yBAAyB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC/C,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC9C,QAAQ,CAAC,YAAY,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACpD,QAAQ,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;CACjD;AAED,0EAA0E;AAC1E,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,SAAS,wBAAwB,EAAE,GAC5C,OAAO,CAAC,iBAAiB,CAAC,CA4D5B"}
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.js
CHANGED
|
@@ -30,6 +30,7 @@ export async function readMappedPollingRows(sql, mappings) {
|
|
|
30
30
|
row_binding_id, field_name, user_value, user_base_revision,
|
|
31
31
|
canonical_value_at_detection, canonical_revision_at_detection,
|
|
32
32
|
current_canonical_value, current_canonical_revision, candidate_epoch,
|
|
33
|
+
candidate_visible_revision, candidate_visible_hash,
|
|
33
34
|
status, resolution_command_id
|
|
34
35
|
FROM sync_conflict
|
|
35
36
|
WHERE row_binding_id IN (${placeholders(bindingIds)})
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmUserInputPollingSql.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAE1E,OAAO,EACL,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,gBAAgB,GACjB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EACL,kCAAkC,GAEnC,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"MikroOrmUserInputPollingSql.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingSql.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAE1E,OAAO,EACL,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,gBAAgB,GACjB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EACL,kCAAkC,GAEnC,MAAM,yDAAyD,CAAC;AAuEjE,0EAA0E;AAC1E,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAgB,EAChB,QAA6C;IAE7C,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;IAClF,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kCAAkC,CAC1F,OAAO,EACP,gBAAgB,CAAC,UAAU,CAC5B,CAAC,eAAe,CAAC,CAAC,CAAC;IACpB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B;;kCAE8B,YAAY,CAAC,eAAe,CAAC,GAAG,EAC9D,eAAe,CAChB,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACpD,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CACtD,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC;QACrC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,CACb;;6BAEuB,YAAY,CAAC,SAAS,CAAC,GAAG,EACjD,SAAS,CACV,CAAC;IACJ,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC;QACnC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,CACb;;6BAEuB,YAAY,CAAC,SAAS,CAAC,GAAG,EACjD,SAAS,CACV,CAAC;IACJ,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,GAAG,CAChC;;kCAE8B,YAAY,CAAC,eAAe,CAAC,GAAG,EAC9D,eAAe,CAChB,CAAC;IACF,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC;QACvC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,CACb;;;;;;;kCAO4B,YAAY,CAAC,UAAU,CAAC;2BAC/B,iBAAiB,CAAC,IAAI,OAAO,iBAAiB,CAAC,YAAY,IAAI,EACpF,UAAU,CACX,CAAC;IACJ,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,GAAG,CAC3B;;;sDAGkD,YAAY,CAAC,gBAAgB,CAAC,GAAG,EACnF,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,gBAAgB,CAAC,CACnD,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AAC1E,CAAC;AAED,SAAS,YAAY,CAAC,MAAyB;IAC7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IACvC,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,MAAM,CAAC,MAAyB;IACvC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmUserInputPollingState.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAE/E,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"MikroOrmUserInputPollingState.d.ts","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAE/E,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAUxC,OAAO,KAAK,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC1C,QAAQ,CAAC,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,kBAAkB,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAC7F,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC9D,QAAQ,CAAC,6BAA6B,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9G,QAAQ,CAAC,0BAA0B,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5F,QAAQ,CAAC,oCAAoC,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC;CACjH;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAClD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,YAAY,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,6EAA6E;AAC7E,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,SAAS,gBAAgB,EAAE,EACxC,UAAU,EAAE,SAAS,YAAY,EAAE,EACnC,SAAS,EAAE,SAAS,iBAAiB,EAAE,EACvC,eAAe,EAAE,SAAS,iBAAiB,EAAE,EAC7C,YAAY,EAAE,SAAS,cAAc,EAAE,EACvC,WAAW,EAAE,SAAS,kBAAkB,EAAE,GACzC,kBAAkB,CAQpB"}
|
package/dist/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/** Converts raw polling SQL rows into semantic lookup maps for observation. */
|
|
2
2
|
import { ROW_BINDING_STATES, } from "../../../../../domain/index.js";
|
|
3
3
|
import { parseNormalizedCell, requireConflictStatus, } from "../../../../../infrastructure/storage/state/resolution/resolutionWriterHelpers.js";
|
|
4
|
+
import { promoteCandidateVisibleEvidence } from "../../../../../infrastructure/storage/state/resolution/candidateEvidence.js";
|
|
4
5
|
import { TYPED_SHEETS_ORM_ERROR_CODES, TypedSheetsOrmError, } from "../../../../../application/orm/errors.js";
|
|
5
6
|
/** Builds all lookup maps consumed by snapshot inspection and evaluation. */
|
|
6
7
|
export function buildPollingState(bindingRows, entityRows, fieldRows, businessKeyRows, conflictRows, visibleRows) {
|
|
@@ -92,6 +93,7 @@ function buildConflicts(rows) {
|
|
|
92
93
|
currentCanonicalValue: parseNormalizedCell(row.current_canonical_value, `${row.conflict_id}.current_canonical_value`),
|
|
93
94
|
currentCanonicalRevision: row.current_canonical_revision,
|
|
94
95
|
candidateEpoch: row.candidate_epoch,
|
|
96
|
+
candidateVisibleEvidence: promoteCandidateVisibleEvidence(row.candidate_visible_revision, row.candidate_visible_hash, row.conflict_id),
|
|
95
97
|
status: requireConflictStatus(row.status),
|
|
96
98
|
resolutionCommandId: nullablePresence(row.resolution_command_id),
|
|
97
99
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MikroOrmUserInputPollingState.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MikroOrmUserInputPollingState.js","sourceRoot":"","sources":["../../../../../../src/adapter/persistence/providers/mikro-orm/observation/MikroOrmUserInputPollingState.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAE/E,OAAO,EACL,kBAAkB,GAInB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,mFAAmF,CAAC;AAC3F,OAAO,EAAE,+BAA+B,EAAE,MAAM,6EAA6E,CAAC;AAC9H,OAAO,EACL,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,0CAA0C,CAAC;AA6ClD,6EAA6E;AAC7E,MAAM,UAAU,iBAAiB,CAC/B,WAAwC,EACxC,UAAmC,EACnC,SAAuC,EACvC,eAA6C,EAC7C,YAAuC,EACvC,WAA0C;IAE1C,OAAO;QACL,kBAAkB,EAAE,gBAAgB,CAAC,WAAW,CAAC;QACjD,YAAY,EAAE,gBAAgB,CAAC,UAAU,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAC3E,6BAA6B,EAAE,qBAAqB,CAAC,eAAe,CAAC;QACrE,0BAA0B,EAAE,cAAc,CAAC,YAAY,CAAC;QACxD,oCAAoC,EAAE,qBAAqB,CAAC,WAAW,CAAC;KACzE,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAkC;IAElC,MAAM,cAAc,GAAG,IAAI,GAAG,EAA6C,CAAC;IAC5E,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QAC9D,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE;YACzB,KAAK,EAAE,mBAAmB,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACtF,aAAa,EAAE,GAAG,CAAC,cAAc;SAClC,CAAC,CAAC;QACH,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAS,gBAAgB,CACvB,IAA6B,EAC7B,cAA8E;IAE9E,MAAM,YAAY,GAAG,IAAI,GAAG,EAA6B,CAAC;IAC1D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAC3D,MAAM,IAAI,mBAAmB,CAC3B,4BAA4B,CAAC,sBAAsB,EACnD,oCAAoC,GAAG,CAAC,MAAM,GAAG,CAClD,CAAC;QACJ,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE;YAC9B,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,cAAc,EAAE,GAAG,CAAC,eAAe;YACnC,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,GAAG,EAAE;SACvD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAiC;IAEjC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA8C,CAAC;IACjF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,mBAAmB,CAC3B,4BAA4B,CAAC,sBAAsB,EACnD,8BAA8B,GAAG,CAAC,KAAK,GAAG,CAC3C,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAA0B;YACpC,YAAY,EAAE,GAAG,CAAC,cAAc;YAChC,cAAc,EAAE,GAAG,CAAC,gBAAgB;YACpC,eAAe,EAAE,GAAG,CAAC,gBAAgB;YACrC,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,cAAc,EAAE,GAAG,CAAC,eAAe;SACpC,CAAC;QACF,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;YAC7E,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACtC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,SAAS,qBAAqB,CAC5B,IAAkC;IAElC,MAAM,6BAA6B,GAAG,IAAI,GAAG,EAA4C,CAAC;IAC1F,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ;YAAE,SAAS;QACrC,MAAM,OAAO,GAAG,6BAA6B,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QACrF,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QACvD,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,6BAA6B,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,6BAA6B,CAAC;AACvC,CAAC;AAED,SAAS,cAAc,CACrB,IAA+B;IAE/B,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAAqC,CAAC;IAChF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,0BAA0B,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QAChF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE;YAC1B,UAAU,EAAE,GAAG,CAAC,WAAW;YAC3B,eAAe,EAAE,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACxD,OAAO,EAAE,GAAG,CAAC,QAAQ;YACrB,YAAY,EAAE,GAAG,CAAC,cAAc;YAChC,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,SAAS,EAAE,GAAG,CAAC,UAAU;YACzB,SAAS,EAAE,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,WAAW,aAAa,CAAC;YAC/E,gBAAgB,EAAE,GAAG,CAAC,kBAAkB;YACxC,yBAAyB,EAAE,mBAAmB,CAC5C,GAAG,CAAC,4BAA4B,EAChC,GAAG,GAAG,CAAC,WAAW,+BAA+B,CAClD;YACD,4BAA4B,EAAE,GAAG,CAAC,+BAA+B;YACjE,qBAAqB,EAAE,mBAAmB,CACxC,GAAG,CAAC,uBAAuB,EAC3B,GAAG,GAAG,CAAC,WAAW,0BAA0B,CAC7C;YACD,wBAAwB,EAAE,GAAG,CAAC,0BAA0B;YACxD,cAAc,EAAE,GAAG,CAAC,eAAe;YACnC,wBAAwB,EAAE,+BAA+B,CACvD,GAAG,CAAC,0BAA0B,EAC9B,GAAG,CAAC,sBAAsB,EAC1B,GAAG,CAAC,WAAW,CAChB;YACD,MAAM,EAAE,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC;YACzC,mBAAmB,EAAE,gBAAgB,CAAC,GAAG,CAAC,qBAAqB,CAAC;SACjE,CAAC,CAAC;QACH,0BAA0B,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,0BAA0B,CAAC;AACpC,CAAC;AAED,SAAS,qBAAqB,CAC5B,IAAmC;IAEnC,MAAM,oCAAoC,GAAG,IAAI,GAAG,EAA+C,CAAC;IACpG,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,oCAAoC,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QAC/F,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE;YAChC,oBAAoB,EAAE,GAAG,CAAC,uBAAuB;YACjD,wBAAwB,EAAE,GAAG,CAAC,0BAA0B;YACxD,uBAAuB,EAAE,GAAG,CAAC,yBAAyB;SACvD,CAAC,CAAC;QACH,oCAAoC,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,oCAAoC,CAAC;AAC9C,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa;IACtC,OAAO,KAAK,KAAK,kBAAkB,CAAC,SAAS;QAC3C,KAAK,KAAK,kBAAkB,CAAC,MAAM;QACnC,KAAK,KAAK,kBAAkB,CAAC,UAAU;QACvC,KAAK,KAAK,kBAAkB,CAAC,SAAS,CAAC;AAC3C,CAAC;AAED,SAAS,gBAAgB,CAAI,KAAe;IAC1C,OAAO,KAAK,KAAK,IAAI;QACnB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAiB,EAAE;QAC7B,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,KAAK,EAAE,CAAC;AAC1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flushCoordinator.d.ts","sourceRoot":"","sources":["../../../../../src/application/orm/persistence/flush/flushCoordinator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,oDAAoD,CAAC;AAC7G,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"flushCoordinator.d.ts","sourceRoot":"","sources":["../../../../../src/application/orm/persistence/flush/flushCoordinator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,oDAAoD,CAAC;AAC7G,OAAO,KAAK,EAAe,iBAAiB,EAAE,MAAM,kDAAkD,CAAC;AAIvG,OAAO,EAIL,KAAK,2BAA2B,EACjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAQL,KAAK,wBAAwB,EAC7B,KAAK,gCAAgC,EACtC,MAAM,gCAAgC,CAAC;AASxC,OAAO,EAGL,KAAK,8CAA8C,EAGnD,KAAK,qCAAqC,EAC1C,KAAK,qBAAqB,EAC1B,KAAK,8BAA8B,EACpC,MAAM,yBAAyB,CAAC;AAejC;;;;GAIG;AACH,wBAAgB,uCAAuC,CACrD,OAAO,EAAE,8CAA8C,GACtD,2BAA2B,CAiG7B;AAED;;;;;;GAMG;AACH,wBAAsB,iCAAiC,CACrD,OAAO,EAAE,iBAAiB,EAC1B,aAAa,EAAE,gCAAgC,GAAG,SAAS,wBAAwB,EAAE,EACrF,WAAW,EAAE,8BAA8B,GAC1C,OAAO,CAAC,SAAS,qCAAqC,EAAE,CAAC,CA4C3D;AAED,iFAAiF;AACjF,wBAAgB,0CAA0C,CACxD,aAAa,EAAE,SAAS,qCAAqC,EAAE,GAC9D,SAAS,kCAAkC,EAAE,CAO/C;AA6ED,sFAAsF;AACtF,wBAAgB,qCAAqC,CACnD,OAAO,EAAE,8BAA8B,GACtC,qBAAqB,CA2BvB"}
|
|
@@ -8,11 +8,16 @@ import { randomUUID } from "node:crypto";
|
|
|
8
8
|
import { EMPTY_STRING_LENGTH_ZERO, POSITIVE_SAFE_INTEGER_MINIMUM, } from "../../../../domain/index.js";
|
|
9
9
|
import { SYNC_TIMING_SCOPES } from "../../../sync/telemetry/syncTiming.js";
|
|
10
10
|
import { WRITER_LEASE_CLAIM_RESULT_KINDS, claimWriterLeaseWithSql, registerSyncSheetWithSql, } from "../../../../infrastructure/storage/index.js";
|
|
11
|
+
import { hasMappedRowActiveCandidateWithSql, } from "../../../../infrastructure/storage/state/mapped/mappedPersistenceSql.js";
|
|
11
12
|
import { TYPED_SHEETS_ENTITY_CHANGE_KINDS, } from "../../api/contracts.js";
|
|
12
|
-
import { createTypedSheetsEntityMappingRegistry, createTypedSheetsMappedProjectionDefinitions, typedSheetsEntityId, } from "../../mapping/entityMapping.js";
|
|
13
|
+
import { createTypedSheetsEntityMappingRegistry, createTypedSheetsMappedProjectionDefinitions, typedSheetsCanonicalEntityId, typedSheetsEntityAnchor, typedSheetsEntityId, typedSheetsEntityRowBindingId, } from "../../mapping/entityMapping.js";
|
|
14
|
+
import { requireTypedSheetsEntityProjection, } from "../../mapping/projection.js";
|
|
15
|
+
import { SYNC_PROJECTIONS } from "../../../sync/sheetsContract/constants.js";
|
|
13
16
|
import { TYPED_SHEETS_ORM_ERROR_CODES, TypedSheetsOrmError, } from "../../errors.js";
|
|
14
17
|
import { DEFAULT_MAPPED_WRITER_LEASE_DURATION_MS, DEFAULT_MAPPED_WRITER_ROLE, } from "../support/contracts.js";
|
|
15
18
|
import { applyMappedChange } from "../lifecycle/entityLifecycle.js";
|
|
19
|
+
import { existingCanonicalEntityId, } from "../support/canonicalState.js";
|
|
20
|
+
import { requireChangeEntityId, throwProjectionBlocked, } from "../support/helpers.js";
|
|
16
21
|
import { countsForPlans, emitTiming, operationKindsForCounts, } from "../support/timing.js";
|
|
17
22
|
/**
|
|
18
23
|
* Creates the built-in planner that makes `em.persist()` / `em.flush()` durable
|
|
@@ -22,6 +27,7 @@ import { countsForPlans, emitTiming, operationKindsForCounts, } from "../support
|
|
|
22
27
|
export function createMappedTypedSheetsFlushCoordinator(options) {
|
|
23
28
|
const mappings = mappingRegistry(options.mappings);
|
|
24
29
|
const writer = resolveTypedSheetsEntityWriterOptions(options.writer);
|
|
30
|
+
const syncFlushHook = options.syncFlushHook;
|
|
25
31
|
return {
|
|
26
32
|
async onFlush(context) {
|
|
27
33
|
const flushStartedAt = Date.now();
|
|
@@ -55,7 +61,33 @@ export function createMappedTypedSheetsFlushCoordinator(options) {
|
|
|
55
61
|
now,
|
|
56
62
|
};
|
|
57
63
|
for (const plan of plans) {
|
|
58
|
-
await
|
|
64
|
+
const hasActiveCandidate = await hasActiveRowCandidateWithSql(context.sql, plan);
|
|
65
|
+
if (plan.change.kind === TYPED_SHEETS_ENTITY_CHANGE_KINDS.DELETE &&
|
|
66
|
+
hasActiveCandidate) {
|
|
67
|
+
// Fail closed BEFORE any entity, canonical, or outbox change: a
|
|
68
|
+
// delete must never materialize over a live user candidate.
|
|
69
|
+
throwProjectionBlocked(plan.mapping, requireTypedSheetsEntityProjection(plan.mapping, SYNC_PROJECTIONS.USER_INPUT), "delete is blocked by an unresolved User_Input candidate");
|
|
70
|
+
}
|
|
71
|
+
const { commitId } = await applyMappedChange(context.sql, fence, writer, plan, {
|
|
72
|
+
suppressUserProjection: hasActiveCandidate &&
|
|
73
|
+
plan.change.kind === TYPED_SHEETS_ENTITY_CHANGE_KINDS.UPDATE,
|
|
74
|
+
});
|
|
75
|
+
if (syncFlushHook !== undefined) {
|
|
76
|
+
await syncFlushHook({
|
|
77
|
+
sql: context.sql,
|
|
78
|
+
fence,
|
|
79
|
+
writer,
|
|
80
|
+
plan: {
|
|
81
|
+
mapping: plan.mapping,
|
|
82
|
+
change: plan.change,
|
|
83
|
+
changedFields: plan.changedFields,
|
|
84
|
+
entityId: await planEntityId(context.sql, plan),
|
|
85
|
+
rowBindingId: typedSheetsEntityRowBindingId(plan.mapping, requireChangeEntityId(plan.mapping, plan.change)),
|
|
86
|
+
commitId,
|
|
87
|
+
suppressedUserProjection: hasActiveCandidate,
|
|
88
|
+
},
|
|
89
|
+
});
|
|
90
|
+
}
|
|
59
91
|
}
|
|
60
92
|
emitTiming(writer, {
|
|
61
93
|
scope: SYNC_TIMING_SCOPES.ORM_FLUSH,
|
|
@@ -120,6 +152,24 @@ export function registeredTypedSheetsProjectionDefinitions(registrations) {
|
|
|
120
152
|
entityIdForBusinessKey: mapping.canonicalEntityIdFor,
|
|
121
153
|
}));
|
|
122
154
|
}
|
|
155
|
+
/** Resolves and validates the entity identity for one mapped change plan. */
|
|
156
|
+
async function planEntityId(sql, plan) {
|
|
157
|
+
const mapping = plan.mapping;
|
|
158
|
+
const visibleEntityId = requireChangeEntityId(mapping, plan.change);
|
|
159
|
+
const proposedCanonicalEntityId = typedSheetsCanonicalEntityId(mapping, visibleEntityId);
|
|
160
|
+
const rowBindingId = typedSheetsEntityRowBindingId(mapping, visibleEntityId);
|
|
161
|
+
const anchor = typedSheetsEntityAnchor(mapping, visibleEntityId);
|
|
162
|
+
return plan.change.kind === TYPED_SHEETS_ENTITY_CHANGE_KINDS.CREATE
|
|
163
|
+
? proposedCanonicalEntityId
|
|
164
|
+
: await existingCanonicalEntityId(sql, mapping, rowBindingId, anchor) ?? proposedCanonicalEntityId;
|
|
165
|
+
}
|
|
166
|
+
/** Returns whether one mapped row carries an unresolved active candidate. */
|
|
167
|
+
async function hasActiveRowCandidateWithSql(sql, plan) {
|
|
168
|
+
const userProjection = plan.mapping.projections.find((projection) => projection.projection === SYNC_PROJECTIONS.USER_INPUT);
|
|
169
|
+
if (userProjection === undefined)
|
|
170
|
+
return false;
|
|
171
|
+
return hasMappedRowActiveCandidateWithSql(sql, userProjection.physicalSheetId, SYNC_PROJECTIONS.USER_INPUT, typedSheetsEntityRowBindingId(plan.mapping, requireChangeEntityId(plan.mapping, plan.change)));
|
|
172
|
+
}
|
|
123
173
|
function collectMappedChanges(mappings, changes) {
|
|
124
174
|
const plans = [];
|
|
125
175
|
for (const change of changes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flushCoordinator.js","sourceRoot":"","sources":["../../../../../src/application/orm/persistence/flush/flushCoordinator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EACL,+BAA+B,EAC/B,uBAAuB,EACvB,wBAAwB,GAEzB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EACL,gCAAgC,GAIjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sCAAsC,EACtC,4CAA4C,EAC5C,mBAAmB,
|
|
1
|
+
{"version":3,"file":"flushCoordinator.js","sourceRoot":"","sources":["../../../../../src/application/orm/persistence/flush/flushCoordinator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,9 @@ import type { SqlExecutor } from "../../../../adapter/persistence/contracts/sql.
|
|
|
8
8
|
import type { FencingContext } from "../support/contracts.js";
|
|
9
9
|
import type { ResolvedWriterOptions, MappedChangePlan } from "../support/contracts.js";
|
|
10
10
|
/** Applies one mapped change and emits append/update/delete phase timings. */
|
|
11
|
-
export declare function applyMappedChange(sql: SqlExecutor, fence: FencingContext, writer: ResolvedWriterOptions, plan: MappedChangePlan
|
|
11
|
+
export declare function applyMappedChange(sql: SqlExecutor, fence: FencingContext, writer: ResolvedWriterOptions, plan: MappedChangePlan, options?: {
|
|
12
|
+
readonly suppressUserProjection?: boolean;
|
|
13
|
+
}): Promise<{
|
|
14
|
+
readonly commitId: string;
|
|
15
|
+
}>;
|
|
12
16
|
//# sourceMappingURL=entityLifecycle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entityLifecycle.d.ts","sourceRoot":"","sources":["../../../../../src/application/orm/persistence/lifecycle/entityLifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAsBH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kDAAkD,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAA6C,MAAM,yBAAyB,CAAC;AACzG,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAgCvF,8EAA8E;AAC9E,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"entityLifecycle.d.ts","sourceRoot":"","sources":["../../../../../src/application/orm/persistence/lifecycle/entityLifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAsBH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kDAAkD,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAA6C,MAAM,yBAAyB,CAAC;AACzG,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAgCvF,8EAA8E;AAC9E,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,gBAAgB,EACtB,OAAO,GAAE;IAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC1D,OAAO,CAAC;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CA2ExC"}
|
|
@@ -16,7 +16,7 @@ import { identifiedValue, requireChangeEntityId, requireEncodedField, } from "..
|
|
|
16
16
|
import { presentValue } from "../../../../shared/state/index.js";
|
|
17
17
|
import { TYPED_SHEETS_ORM_ERROR_CODES, TypedSheetsOrmError, } from "../../errors.js";
|
|
18
18
|
/** Applies one mapped change and emits append/update/delete phase timings. */
|
|
19
|
-
export async function applyMappedChange(sql, fence, writer, plan) {
|
|
19
|
+
export async function applyMappedChange(sql, fence, writer, plan, options = {}) {
|
|
20
20
|
const changeStartedAt = Date.now();
|
|
21
21
|
const { mapping, change, changedFields } = plan;
|
|
22
22
|
const operationKind = timingOperationKind(change.kind);
|
|
@@ -37,14 +37,15 @@ export async function applyMappedChange(sql, fence, writer, plan) {
|
|
|
37
37
|
operationCounts: countsForOperationKind(operationKind),
|
|
38
38
|
});
|
|
39
39
|
const canonicalStartedAt = Date.now();
|
|
40
|
+
let commitId;
|
|
40
41
|
if (change.kind === TYPED_SHEETS_ENTITY_CHANGE_KINDS.CREATE) {
|
|
41
|
-
await createMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity);
|
|
42
|
+
commitId = await createMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, options);
|
|
42
43
|
}
|
|
43
44
|
else if (change.kind === TYPED_SHEETS_ENTITY_CHANGE_KINDS.UPDATE) {
|
|
44
|
-
await updateMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, changedFields);
|
|
45
|
+
commitId = await updateMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, changedFields, options);
|
|
45
46
|
}
|
|
46
47
|
else {
|
|
47
|
-
await deleteMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity);
|
|
48
|
+
commitId = await deleteMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity);
|
|
48
49
|
}
|
|
49
50
|
emitTiming(writer, {
|
|
50
51
|
scope: SYNC_TIMING_SCOPES.ORM_FLUSH,
|
|
@@ -60,11 +61,12 @@ export async function applyMappedChange(sql, fence, writer, plan) {
|
|
|
60
61
|
operationKinds: [operationKind],
|
|
61
62
|
operationCounts: countsForOperationKind(operationKind),
|
|
62
63
|
});
|
|
64
|
+
return { commitId };
|
|
63
65
|
}
|
|
64
|
-
async function createMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity) {
|
|
66
|
+
async function createMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, options) {
|
|
65
67
|
await insertActiveRowBinding(sql, mapping, rowBindingId, entityId, anchor);
|
|
66
68
|
const commitId = identifiedValue("commit", writer);
|
|
67
|
-
const effects = await projectionEffects(sql, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, TYPED_SHEETS_ENTITY_CHANGE_KINDS.CREATE, mapping.fields, commitId, POSITIVE_SAFE_INTEGER_MINIMUM);
|
|
69
|
+
const effects = await projectionEffects(sql, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, TYPED_SHEETS_ENTITY_CHANGE_KINDS.CREATE, mapping.fields, commitId, POSITIVE_SAFE_INTEGER_MINIMUM, { includeUserProjection: !options.suppressUserProjection });
|
|
68
70
|
const commit = {
|
|
69
71
|
kind: ROW_OPERATIONS.INSERT,
|
|
70
72
|
entityId,
|
|
@@ -79,8 +81,9 @@ async function createMappedEntity(sql, fence, writer, mapping, entityId, rowBind
|
|
|
79
81
|
};
|
|
80
82
|
await requireAppliedCanonicalCommit(sql, fence, commit);
|
|
81
83
|
await claimBusinessKey(sql, mapping, entityId, encodedEntity);
|
|
84
|
+
return commitId;
|
|
82
85
|
}
|
|
83
|
-
async function updateMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, changedFields) {
|
|
86
|
+
async function updateMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, changedFields, options) {
|
|
84
87
|
await requireActiveRowBinding(sql, mapping, rowBindingId, entityId, anchor);
|
|
85
88
|
const entityRevision = await requireActiveCanonicalEntityRevision(sql, mapping, entityId);
|
|
86
89
|
const fieldRevisions = await canonicalFieldRevisions(sql, entityId);
|
|
@@ -98,7 +101,7 @@ async function updateMappedEntity(sql, fence, writer, mapping, entityId, rowBind
|
|
|
98
101
|
});
|
|
99
102
|
const nextEntityRevision = entityRevision + 1;
|
|
100
103
|
const commitId = identifiedValue("commit", writer);
|
|
101
|
-
const effects = await projectionEffects(sql, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, TYPED_SHEETS_ENTITY_CHANGE_KINDS.UPDATE, changedFields, commitId, nextEntityRevision);
|
|
104
|
+
const effects = await projectionEffects(sql, writer, mapping, entityId, rowBindingId, anchor, encodedEntity, TYPED_SHEETS_ENTITY_CHANGE_KINDS.UPDATE, changedFields, commitId, nextEntityRevision, { includeUserProjection: !options.suppressUserProjection });
|
|
102
105
|
const commit = {
|
|
103
106
|
kind: ROW_OPERATIONS.UPDATE,
|
|
104
107
|
entityId,
|
|
@@ -110,6 +113,7 @@ async function updateMappedEntity(sql, fence, writer, mapping, entityId, rowBind
|
|
|
110
113
|
if (changedFields.some((field) => field.fieldName === mapping.businessKey.fieldName)) {
|
|
111
114
|
await rotateBusinessKey(sql, mapping, entityId, encodedEntity);
|
|
112
115
|
}
|
|
116
|
+
return commitId;
|
|
113
117
|
}
|
|
114
118
|
async function deleteMappedEntity(sql, fence, writer, mapping, entityId, rowBindingId, anchor, encodedEntity) {
|
|
115
119
|
await requireActiveRowBinding(sql, mapping, rowBindingId, entityId, anchor);
|
|
@@ -127,6 +131,7 @@ async function deleteMappedEntity(sql, fence, writer, mapping, entityId, rowBind
|
|
|
127
131
|
await requireAppliedCanonicalCommit(sql, fence, commit);
|
|
128
132
|
await tombstoneActiveRowBinding(sql, mapping, rowBindingId, entityId);
|
|
129
133
|
await retireEntityBusinessKeys(sql, mapping, entityId);
|
|
134
|
+
return commitId;
|
|
130
135
|
}
|
|
131
136
|
function acceptedSnapshotHash(entityId, fields) {
|
|
132
137
|
return presentValue(stableHash({
|