@cratis/chronicle 6.6.0 → 6.7.1

package/dist/types/TypeDiscoverer.js

@@ -1,6 +1,17 @@
 // Copyright (c) Cratis. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 import path from 'path';
+import { DecoratorType } from './DecoratorType.js';
+import { TypeIntrospector } from './TypeIntrospector.js';
+import { hasPropertyMetadata } from './propertyDecoratorMetadata.js';
+const modelBoundPropertyKeys = [
+    'setFrom', 'setFromContext', 'setValue', 'addFrom', 'subtractFrom',
+    'increment', 'decrement', 'count', 'childrenFrom', 'join', 'fromEvery', 'fromAll'
+].map(name => `chronicle:projection:${name}`);
+/** Identifies models whose event mappings live on their properties rather than on @fromEvent. */
+export function hasModelBoundProperties(type) {
+    return TypeIntrospector.getTrackedProperties(type).some(property => modelBoundPropertyKeys.some(key => hasPropertyMetadata(key, type.prototype, property)));
+}
 /**
  * Encapsulates discovery and registry operations for decorator-based artifacts.
  */
@@ -27,7 +38,16 @@ export class TypeDiscoverer {
         const patterns = Array.isArray(pattern) ? pattern : [pattern];
         const files = await this._glob(patterns);
         for (const file of files) {
-            await this._importFile(path.resolve(file));
+            const module = await this._importFile(path.resolve(file));
+            if (module && typeof module === 'object') {
+                for (const type of Object.values(module)) {
+                    if (typeof type !== 'function' || !type.prototype)
+                        continue;
+                    if (hasModelBoundProperties(type)) {
+                        this.register(DecoratorType.ReadModel, type);
+                    }
+                }
+            }
         }
     }
     /**
@@ -39,7 +59,24 @@ export class TypeDiscoverer {
     register(decoratorType, type, name) {
         const discoveredName = name ?? type.name;
         const typesForDecorator = TypeDiscoverer._registeredTypes.get(decoratorType) ?? new Map();
-        typesForDecorator.set(discoveredName, type);
+        if (decoratorType === DecoratorType.ReadModel) {
+            const previous = Array.from(typesForDecorator).find(([, registered]) => registered === type);
+            if (previous && previous[0] !== discoveredName) {
+                // An explicit legacy registration overrides the type-name alias registered by an observer.
+                if (previous[0] !== type.name)
+                    return;
+                typesForDecorator.delete(previous[0]);
+            }
+        }
+        let key = discoveredName;
+        if (decoratorType === DecoratorType.ReadModel && typesForDecorator.has(key) && typesForDecorator.get(key) !== type &&
+            !(type.prototype instanceof typesForDecorator.get(key))) {
+            let suffix = 2;
+            while (typesForDecorator.has(`${discoveredName}#${suffix}`))
+                suffix++;
+            key = `${discoveredName}#${suffix}`;
+        }
+        typesForDecorator.set(key, type);
         TypeDiscoverer._registeredTypes.set(decoratorType, typesForDecorator);
     }
     /**

package/dist/types/TypeDiscoverer.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypeDiscoverer.js","sourceRoot":"","sources":["../../types/TypeDiscoverer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TypeDiscoverer.js","sourceRoot":"","sources":["../../types/TypeDiscoverer.ts"],"names":[],"mappings":"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"}

package/events/constructorRoundTrip.legacy.spec.ts

@@ -0,0 +1,47 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { ConceptAs, field, JsonSerializer } from '@cratis/fundamentals';
+import { describe, expect, it, vi } from 'vitest';
+import type { ChronicleConnection } from '../connection/index.js';
+import { EventSequence } from '../eventSequences/EventSequence.js';
+import { EventSequenceId } from '../eventSequences/EventSequenceId.js';
+import type { IUnitOfWorkManager } from '../transactions/IUnitOfWorkManager.js';
+import { eventType, getEventTypeMetadata } from './eventTypeDecorator.js';
+
+class TaskTitle extends ConceptAs<string> {
+    static readonly valueType = String;
+}
+class TaskDetails {
+    @field(String) description!: string;
+    constructor(description: string) { this.description = description; }
+}
+@eventType('constructor-legacy')
+class TaskCreated {
+    @field(TaskTitle) title: TaskTitle;
+    @field(TaskDetails) details: TaskDetails;
+    constructor(title: TaskTitle, details: TaskDetails) {
+        this.title = title;
+        this.details = details;
+    }
+}
+
+describe('when appending a legacy-decorator event with required constructor arguments', () => {
+    it('should serialize, generate schema and hydrate the event with its concept and nested object', async () => {
+        const append = vi.fn().mockResolvedValue({ Response: { SequenceNumber: 0n, ConstraintViolations: [], Errors: [] } });
+        const sequence = new EventSequence(EventSequenceId.eventLog, 'store', 'Default',
+            { eventSequences: { append } } as unknown as ChronicleConnection, {} as IUnitOfWorkManager);
+        const event = new TaskCreated(new TaskTitle('Write specs'), new TaskDetails('With constructors'));
+        await sequence.append('task-1', event);
+        const content = append.mock.calls[0][0].Content as string;
+        expect(JSON.parse(content)).toEqual({ title: 'Write specs', details: { description: 'With constructors' } });
+        expect(getEventTypeMetadata(TaskCreated)!.schema.properties?.title.type).toBe('string');
+        expect(getEventTypeMetadata(TaskCreated)!.schema.properties?.details.properties?.description.type).toBe('string');
+        const restored = JsonSerializer.deserialize(TaskCreated, content);
+        expect(restored).toBeInstanceOf(TaskCreated);
+        expect(restored.title).toBeInstanceOf(TaskTitle);
+        expect(restored.title.value).toBe('Write specs');
+        expect(restored.details).toBeInstanceOf(TaskDetails);
+        expect(restored.details.description).toBe('With constructors');
+    });
+});

package/events/constructorRoundTrip.standard.spec.ts

@@ -0,0 +1,47 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { ConceptAs, field, JsonSerializer } from '@cratis/fundamentals';
+import { describe, expect, it, vi } from 'vitest';
+import type { ChronicleConnection } from '../connection/index.js';
+import { EventSequence } from '../eventSequences/EventSequence.js';
+import { EventSequenceId } from '../eventSequences/EventSequenceId.js';
+import type { IUnitOfWorkManager } from '../transactions/IUnitOfWorkManager.js';
+import { eventType, getEventTypeMetadata } from './eventTypeDecorator.js';
+
+class TaskTitle extends ConceptAs<string> {
+    static readonly valueType = String;
+}
+class TaskDetails {
+    @field(String) description!: string;
+    constructor(description: string) { this.description = description; }
+}
+@eventType('constructor-standard')
+class TaskCreated {
+    @field(TaskTitle) title: TaskTitle;
+    @field(TaskDetails) details: TaskDetails;
+    constructor(title: TaskTitle, details: TaskDetails) {
+        this.title = title;
+        this.details = details;
+    }
+}
+
+describe('when appending a standard-decorator event with required constructor arguments', () => {
+    it('should serialize, generate schema and hydrate the event with its concept and nested object', async () => {
+        const append = vi.fn().mockResolvedValue({ Response: { SequenceNumber: 0n, ConstraintViolations: [], Errors: [] } });
+        const sequence = new EventSequence(EventSequenceId.eventLog, 'store', 'Default',
+            { eventSequences: { append } } as unknown as ChronicleConnection, {} as IUnitOfWorkManager);
+        const event = new TaskCreated(new TaskTitle('Write specs'), new TaskDetails('With constructors'));
+        await sequence.append('task-1', event);
+        const content = append.mock.calls[0][0].Content as string;
+        expect(JSON.parse(content)).toEqual({ title: 'Write specs', details: { description: 'With constructors' } });
+        expect(getEventTypeMetadata(TaskCreated)!.schema.properties?.title.type).toBe('string');
+        expect(getEventTypeMetadata(TaskCreated)!.schema.properties?.details.properties?.description.type).toBe('string');
+        const restored = JsonSerializer.deserialize(TaskCreated, content);
+        expect(restored).toBeInstanceOf(TaskCreated);
+        expect(restored.title).toBeInstanceOf(TaskTitle);
+        expect(restored.title.value).toBe('Write specs');
+        expect(restored.details).toBeInstanceOf(TaskDetails);
+        expect(restored.details.description).toBe('With constructors');
+    });
+});

package/events/eventTypeDecorator.ts

@@ -49,7 +49,12 @@ export interface EventTypeMetadata {
  * ```typescript
  * @eventType()
  * class EmployeeHired {
- *     constructor(readonly firstName: string, readonly lastName: string) {}
+ *     @field(String) firstName: string;
+ *     @field(String) lastName: string;
+ *     constructor(firstName: string, lastName: string) {
+ *         this.firstName = firstName;
+ *         this.lastName = lastName;
+ *     }
  * }
  * ```
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cratis/chronicle",
-    "version": "6.6.0",
+    "version": "6.7.1",
     "description": "Event sourcing for TypeScript and Node.js — the idiomatic client for Cratis Chronicle, the open-source event-sourcing database",
     "author": "Cratis",
     "license": "MIT",

package/projections/Projections.childrenAndNested.spec.ts

@@ -7,7 +7,6 @@ import { describe, expect, it, vi } from 'vitest';
 import { IClientArtifactsProvider } from '../artifacts/index.js';
 import { ChronicleConnection } from '../connection/index.js';
 import { eventType } from '../events/eventTypeDecorator.js';
-import { readModel } from '../readModels/readModel.js';
 import { childrenFrom } from './modelBound/childrenFrom.js';
 import { clearWith } from './modelBound/clearWith.js';
 import { fromEvent } from './modelBound/fromEvent.js';
@@ -86,7 +85,6 @@ field(OrderNote)(Order.prototype, 'note');
 clearWith(NoteCleared)(Order.prototype, 'note');
 childrenFrom(TagAdded)(Order.prototype, 'tags');
 fromEvent(OrderCreated)(Order);
-readModel()(Order);
 
 interface FromRecord {
     Key: { Id: string };

package/projections/Projections.modelBoundCompleteness.spec.ts

@@ -7,7 +7,6 @@ import { describe, expect, it, vi } from 'vitest';
 import { IClientArtifactsProvider } from '../artifacts/index.js';
 import { ChronicleConnection } from '../connection/index.js';
 import { eventType } from '../events/eventTypeDecorator.js';
-import { readModel } from '../readModels/readModel.js';
 import { clearWith } from './modelBound/clearWith.js';
 import { eventLog, eventSequence } from './modelBound/eventSequence.js';
 import { fromAll } from './modelBound/fromAll.js';
@@ -40,7 +39,6 @@ setFrom(MbWorkArrangementSet, 'location')(MbAssignmentSummary.prototype, 'locati
 noAutoMap(MbAssignmentSummary.prototype, 'location');
 setFrom(MbCandidateSubmitted, 'name')(MbAssignmentSummary.prototype, 'candidateName');
 fromEvent(MbWorkArrangementSet)(MbAssignmentSummary);
-readModel()(MbAssignmentSummary);
 
 class MbFullyExcluded {
     id!: string;
@@ -49,7 +47,6 @@ class MbFullyExcluded {
 setFrom(MbWorkArrangementSet, 'location')(MbFullyExcluded.prototype, 'location');
 fromEvent(MbWorkArrangementSet)(MbFullyExcluded);
 noAutoMap(MbFullyExcluded);
-readModel()(MbFullyExcluded);
 
 class MbProductRenamed {
     name!: string;
@@ -72,7 +69,6 @@ class MbProductVersion {
 fromAll('version')(MbProductVersion.prototype, 'version');
 fromEvent(MbProductRenamed)(MbProductVersion);
 fromEvent(MbProductPriceChanged)(MbProductVersion);
-readModel()(MbProductVersion);
 
 class MbOrderPlaced {
     amount!: number;
@@ -86,7 +82,6 @@ class MbOrderSummaryWithCustomSequence {
 setFrom(MbOrderPlaced, 'amount')(MbOrderSummaryWithCustomSequence.prototype, 'totalAmount');
 fromEvent(MbOrderPlaced)(MbOrderSummaryWithCustomSequence);
 eventSequence('custom-sequence')(MbOrderSummaryWithCustomSequence);
-readModel()(MbOrderSummaryWithCustomSequence);
 
 class MbLocalEvent {
     data!: string;
@@ -100,7 +95,6 @@ class MbLocalSnapshot {
 setFrom(MbLocalEvent, 'data')(MbLocalSnapshot.prototype, 'data');
 fromEvent(MbLocalEvent)(MbLocalSnapshot);
 eventLog(MbLocalSnapshot);
-readModel()(MbLocalSnapshot);
 
 class MbProjectNoted {
     note!: string;
@@ -117,7 +111,6 @@ class MbProjectNotes {
 setFrom(MbProjectNoted, 'note')(MbProjectNotes.prototype, 'note');
 clearWith(MbProjectNoteCleared)(MbProjectNotes.prototype, 'note');
 fromEvent(MbProjectNoted)(MbProjectNotes);
-readModel()(MbProjectNotes);
 
 interface BuiltFromEntry {
     Key: { Id: string };

package/projections/Projections.operationalSurface.spec.ts

@@ -7,7 +7,6 @@ import { IClientArtifactsProvider } from '../artifacts/index.js';
 import { ChronicleConnection } from '../connection/index.js';
 import { ObserverRunningState } from '../observation/ObserverRunningState.js';
 import { eventType } from '../events/eventTypeDecorator.js';
-import { readModel } from '../readModels/readModel.js';
 import { eventSequence } from './modelBound/eventSequence.js';
 import { fromEvent } from './modelBound/fromEvent.js';
 import { projection } from './declarative/projection.js';
@@ -30,17 +29,14 @@ class OpSummary {
 }
 fromEvent(OpStateChanged)(OpSummary);
 eventSequence('custom-op-sequence')(OpSummary);
-readModel()(OpSummary);
 
 class UndiscoveredSummary {
     id!: string;
 }
-readModel()(UndiscoveredSummary);
 
 class DeclarativeReadModel {
     id!: string;
 }
-readModel()(DeclarativeReadModel);
 
 class DeclarativeSummaryProjection implements IProjectionFor<DeclarativeReadModel> {
     // discover() never calls define() - only register() does - so a no-op body is sufficient here.

package/projections/Projections.spec.ts

@@ -6,7 +6,6 @@ import { describe, expect, it, vi } from 'vitest';
 import { IClientArtifactsProvider } from '../artifacts/index.js';
 import { ChronicleConnection } from '../connection/index.js';
 import { eventType } from '../events/eventTypeDecorator.js';
-import { readModel } from '../readModels/readModel.js';
 import { addFrom } from './modelBound/addFrom.js';
 import { count } from './modelBound/count.js';
 import { decrement } from './modelBound/decrement.js';
@@ -59,7 +58,6 @@ decrement(CounterDecremented)(Inventory.prototype, 'decrementedCount');
 count(ThingHappened)(Inventory.prototype, 'thingsHappenedCount');
 count(KeyedThingHappened, 'all-things')(Inventory.prototype, 'constantKeyedCount');
 fromEvent(ItemAdded)(Inventory);
-readModel()(Inventory);
 
 /**
  * Builds a {@link Projections} instance wired to capture the registration payload sent

package/projections/Projections.ts

@@ -18,7 +18,11 @@ import { FailedPartition } from '../observation/FailedPartition.js';
 import { FailedPartitions } from '../observation/FailedPartitions.js';
 import { toObserverRunningState } from '../observation/toObserverRunningState.js';
 import { getReadModelMetadata } from '../readModels/index.js';
+import { getReadModelId } from '../readModels/readModel.js';
+import { assertUniqueReadModelIds } from '../readModels/assertUniqueReadModelIds.js';
+import { JsonSchemaGenerator } from '../schemas/index.js';
 import { TypeIntrospector } from '../types/index.js';
+import { hasModelBoundProperties } from '../types/TypeDiscoverer.js';
 import { IProjections } from './IProjections.js';
 import { getProjectionMetadata } from './declarative/projection.js';
 import { ProjectionBuilderFor } from './declarative/ProjectionBuilderFor.js';
@@ -109,7 +113,7 @@ export class Projections implements IProjections {
         }
 
         for (const type of readModelTypes) {
-            if (!hasFromEventMetadata(type)) {
+            if (!hasFromEventMetadata(type) && !hasModelBoundProperties(type)) {
                 continue;
             }
 
@@ -136,6 +140,10 @@ export class Projections implements IProjections {
 
         this._logger.info('Registering projections', { declarativeCount: this._declarative.size, modelBoundCount: this._modelBound.size });
 
+        const inferred = this._clientArtifacts.projections
+            .map(type => getProjectionMetadata(type)?.readModelType)
+            .filter((type): type is Constructor => type !== undefined);
+        assertUniqueReadModelIds([...this._clientArtifacts.readModels, ...inferred]);
         const builtProjections: BuiltProjection[] = [
             ...Array.from(this._declarative.values()).map(type => this.buildDeclarativeDefinition(type)),
             ...Array.from(this._modelBound.values()).map(type => this.buildModelBoundDefinition(type))
@@ -349,7 +357,14 @@ export class Projections implements IProjections {
 
         for (const projection of projections) {
             const readModelIdentifier = projection.ReadModel;
-            if (!readModelIdentifier || byReadModel.has(readModelIdentifier)) {
+            if (!readModelIdentifier) {
+                continue;
+            }
+            const existing = byReadModel.get(readModelIdentifier);
+            if (existing) {
+                if (existing.ObserverIdentifier !== projection.Identifier) {
+                    throw new Error(`Read model id '${readModelIdentifier}' has multiple projections.`);
+                }
                 continue;
             }
 
@@ -380,14 +395,16 @@ export class Projections implements IProjections {
     }
 
     private getReadModelSchema(readModelIdentifier: string): string {
-        for (const type of this._clientArtifacts.readModels) {
+        const types = [
+            ...this._clientArtifacts.readModels,
+            ...this._clientArtifacts.projections
+                .map(projectionType => getProjectionMetadata(projectionType)?.readModelType)
+                .filter((type): type is Constructor => type !== undefined)
+        ];
+        for (const type of types) {
             const metadata = getReadModelMetadata(type);
-            if (!metadata) {
-                continue;
-            }
-
-            if (metadata.id.value === readModelIdentifier || type.name === readModelIdentifier) {
-                return JSON.stringify(metadata.schema);
+            if (getReadModelId(type) === readModelIdentifier) {
+                return JSON.stringify(metadata?.schema ?? JsonSchemaGenerator.generate(type));
             }
         }
 
@@ -409,8 +426,7 @@ export class Projections implements IProjections {
         if (explicitReadModelIdentifier === type.name) {
             // Use explicit readModelType from decorator if provided
             if (metadata.readModelType) {
-                const rm = getReadModelMetadata(metadata.readModelType);
-                definition.ReadModel = rm?.id.value ?? (metadata.readModelType as Function).name;
+                definition.ReadModel = getReadModelId(metadata.readModelType);
             } else {
                 const inferredReadModelIdentifier = this.inferReadModelIdentifier(builder.getMappedReadModelProperties());
                 if (inferredReadModelIdentifier) {
@@ -585,7 +601,7 @@ export class Projections implements IProjections {
                 }
             }
 
-            const memberNames = new Set(getReadModelMetadata(type)?.members.keys() ?? properties);
+            const memberNames = new Set(getReadModelMetadata(type)?.members.keys() ?? TypeIntrospector.getMembers(type).keys());
             const merged = mergeGlobalHandlers(type.name, memberNames, from, globalHandlers);
             const reclassified = reclassify(type.name, merged, join, enteringEventTypes, variantMetadata.key);
             from = reclassified.from;
@@ -651,13 +667,12 @@ export class Projections implements IProjections {
     }
 
     private resolveModelBoundMetadata(type: Constructor): ResolvedModelBoundMetadata | undefined {
-        const readModelMetadata = getReadModelMetadata(type);
-
-        if (readModelMetadata && hasFromEventMetadata(type)) {
+        if (hasFromEventMetadata(type) || hasModelBoundProperties(type)) {
+            const identifier = getReadModelId(type);
             return {
-                id: new ProjectionId(readModelMetadata.id.value),
+                id: new ProjectionId(identifier),
                 eventSequenceId: getEventSequenceMetadata(type),
-                readModelIdentifier: readModelMetadata.id.value
+                readModelIdentifier: identifier
             };
         }
 

package/projections/Projections.variants.spec.ts

@@ -6,7 +6,6 @@ import { describe, expect, it, vi } from 'vitest';
 import { IClientArtifactsProvider } from '../artifacts/index.js';
 import { ChronicleConnection } from '../connection/index.js';
 import { eventType } from '../events/eventTypeDecorator.js';
-import { readModel } from '../readModels/readModel.js';
 import { entersOn } from './modelBound/entersOn.js';
 import { fromEvent } from './modelBound/fromEvent.js';
 import { globalFor } from './modelBound/globalFor.js';
@@ -50,7 +49,6 @@ setFrom(IssueCreated, 'title')(BacklogItem.prototype, 'title');
 variantOf(WorkItem, 'id')(BacklogItem);
 entersOn(IssueCreated)(BacklogItem);
 fromEvent(IssueCreated)(BacklogItem);
-readModel()(BacklogItem);
 
 class PullRequestItem {
     id!: string;
@@ -64,7 +62,6 @@ variantOf(WorkItem, 'id')(PullRequestItem);
 entersOn(PullRequestCreated)(PullRequestItem);
 fromEvent(PullRequestCreated)(PullRequestItem);
 fromEvent(BuildCompleted)(PullRequestItem);
-readModel()(PullRequestItem);
 
 /** A shared handler with no entering event of its own - never registered as its own projection. */
 class TitleHandler {
@@ -81,7 +78,6 @@ class UndeclaredVariant {
 setFrom(IssueCreated, 'title')(UndeclaredVariant.prototype, 'title');
 variantOf(WorkItem, 'id')(UndeclaredVariant);
 fromEvent(IssueCreated)(UndeclaredVariant);
-readModel()(UndeclaredVariant);
 
 /** A separate identity, used to prove sibling cross-wiring stays scoped to one identity. */
 class OtherIdentity {}
@@ -92,7 +88,6 @@ class OtherVariant {
 variantOf(OtherIdentity, 'id')(OtherVariant);
 entersOn(IssueCreated)(OtherVariant);
 fromEvent(IssueCreated)(OtherVariant);
-readModel()(OtherVariant);
 
 interface CapturedDefinition {
     Identifier: string;

package/projections/modelBound/fromEvent.ts

@@ -4,6 +4,8 @@
 import 'reflect-metadata';
 import { FromEventMetadata } from './FromEventMetadata.js';
 import { FromEventOptions } from './FromEventOptions.js';
+import { DecoratorType, TypeDiscoverer } from '../../types/index.js';
+import type { Constructor } from '@cratis/fundamentals';
 
 const METADATA_KEY = 'chronicle:projection:fromEvent';
 
@@ -18,6 +20,7 @@ export function fromEvent(eventType: Function, options?: FromEventOptions): Clas
         const existing: FromEventMetadata[] = Reflect.getMetadata(METADATA_KEY, target) ?? [];
         const metadata: FromEventMetadata = { eventType, ...options };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target);
+        TypeDiscoverer.default.register(DecoratorType.ReadModel, target as Constructor);
     };
 }
 

package/readModels/MaterializedReadModels.spec.ts

@@ -7,7 +7,6 @@ import { describe, expect, it, vi } from 'vitest';
 import type { ChronicleConnection } from '../connection/index.js';
 import { pii } from '../compliance/pii.js';
 import { subject } from '../compliance/subject.js';
-import { readModel } from './readModel.js';
 import { MaterializedReadModels } from './MaterializedReadModels.js';
 
 // Decorators are applied as plain function calls (rather than `@decorator` syntax) so these
@@ -37,7 +36,6 @@ describe('MaterializedReadModels', () => {
         field(String)(Employee.prototype, 'ssn');
         pii()(Employee.prototype, 'ssn');
         subject()(Employee.prototype, 'personId');
-        readModel('EmployeeWithSubjectMaterialized')(Employee);
 
         it('should release using the decorated property as the subject', async () => {
             const json = JSON.stringify({ id: 'employee-1', personId: 'person-42', ssn: '123-45-6789' });
@@ -57,7 +55,6 @@ describe('MaterializedReadModels', () => {
         field(String)(Customer.prototype, 'id');
         field(String)(Customer.prototype, 'ssn');
         pii()(Customer.prototype, 'ssn');
-        readModel('CustomerWithIdOnlyMaterialized')(Customer);
 
         it('should fall back to the id property as the subject, unchanged from today', async () => {
             const json = JSON.stringify({ id: 'customer-7', ssn: '987-65-4321' });
@@ -75,7 +72,6 @@ describe('MaterializedReadModels', () => {
         }
         field(String)(Anonymous.prototype, 'ssn');
         pii()(Anonymous.prototype, 'ssn');
-        readModel('AnonymousMaterialized')(Anonymous);
 
         it('should fail closed without a subject', async () => {
             const json = JSON.stringify({ ssn: '000-00-0000' });
@@ -98,7 +94,6 @@ describe('MaterializedReadModels', () => {
         field(String)(PrivateCustomer.prototype, 'id');
         field(String)(PrivateCustomer.prototype, 'ssn');
         pii()(PrivateCustomer.prototype, 'ssn');
-        readModel('PrivateCustomer')(PrivateCustomer);
 
         it('should reject instead of returning encrypted content', async () => {
             const { readModels } = createMaterializedReadModels(

package/readModels/ReadModels.spec.ts

@@ -10,7 +10,6 @@ import { subject } from '../compliance/subject.js';
 import { pii } from '../compliance/pii.js';
 import { reducer } from '../reducers/reducer.js';
 import { fromEvent } from '../projections/modelBound/fromEvent.js';
-import { readModel } from './readModel.js';
 import { ReadModels } from './ReadModels.js';
 
 // Decorators are applied as plain function calls (rather than `@decorator` syntax) so these
@@ -49,7 +48,6 @@ describe('ReadModels', () => {
     describe('when no read model instance exists for a key', () => {
         class MissingModel { id = ''; }
         fromEvent(SomeEvent)(MissingModel);
-        readModel('MissingModel')(MissingModel);
 
         it('should retain the legacy prototype-only instance for getInstanceById', async () => {
             const { readModels, release } = createReadModels(MissingModel);
@@ -80,7 +78,6 @@ describe('ReadModels', () => {
         class ExistingModel { id = ''; }
         field(String)(ExistingModel.prototype, 'id');
         fromEvent(SomeEvent)(ExistingModel);
-        readModel('ExistingModel')(ExistingModel);
 
         it('should deserialize the model', async () => {
             const { readModels, getInstanceByKey } = createReadModels(ExistingModel);
@@ -99,7 +96,6 @@ describe('ReadModels', () => {
         field(String)(PrivateModel.prototype, 'id');
         field(String)(PrivateModel.prototype, 'ssn');
         pii()(PrivateModel.prototype, 'ssn');
-        readModel('PrivateInstanceModel')(PrivateModel);
         class PrivateReducer {}
         reducer('PrivateInstanceReducer', undefined, PrivateModel)(PrivateReducer);
 
@@ -124,7 +120,6 @@ describe('ReadModels', () => {
         field(String)(PrivateModel.prototype, 'id');
         field(String)(PrivateModel.prototype, 'ssn');
         pii()(PrivateModel.prototype, 'ssn');
-        readModel('PrivateReducerModel')(PrivateModel);
         class PrivateReducer {}
         reducer('PrivateReducer', undefined, PrivateModel)(PrivateReducer);
 
@@ -150,7 +145,6 @@ describe('ReadModels', () => {
         }
         subject()(Employee.prototype, 'personId');
         fromEvent(SomeEvent)(Employee);
-        readModel('EmployeeWithSubject')(Employee);
 
         it('should release using the decorated property as the subject', async () => {
             const { readModels, release } = createReadModels(Employee);
@@ -169,7 +163,6 @@ describe('ReadModels', () => {
             id = '';
         }
         fromEvent(SomeEvent)(Customer);
-        readModel('CustomerWithIdOnly')(Customer);
 
         it('should fall back to the id property as the subject, unchanged from today', async () => {
             const { readModels, release } = createReadModels(Customer);
@@ -187,7 +180,6 @@ describe('ReadModels', () => {
             name = '';
         }
         fromEvent(SomeEvent)(Anonymous);
-        readModel('AnonymousReadModel')(Anonymous);
 
         it('should throw, same as today', async () => {
             const { readModels } = createReadModels(Anonymous);
@@ -202,7 +194,6 @@ describe('ReadModels', () => {
             id = '';
         }
         fromEvent(SomeEvent)(Customer);
-        readModel('CustomerForReleaseMany')(Customer);
 
         it('should release each instance using its own resolved subject', async () => {
             const { readModels, release } = createReadModels(Customer);