@cratis/chronicle 6.3.2 → 6.4.0

package/projections/modelBound/addFrom.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the addFrom property decorator. */
 export interface AddFromMetadata {
@@ -20,14 +21,14 @@ const METADATA_KEY = 'chronicle:projection:addFrom';
  * @param eventPropertyName - Optional event property name. Defaults to the property name.
  * @returns A property decorator.
  */
-export function addFrom(eventType: Function, eventPropertyName?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function addFrom(eventType: Function, eventPropertyName?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: AddFromMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
         const metadata: AddFromMetadata = { eventType, eventPropertyName };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -37,5 +38,5 @@ export function addFrom(eventType: Function, eventPropertyName?: string): Proper
  * @returns An array of addFrom metadata entries.
  */
 export function getAddFromMetadata(target: object, propertyKey: string): AddFromMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<AddFromMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/childrenFrom.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the childrenFrom property decorator. */
 export interface ChildrenFromMetadata {
@@ -31,14 +32,14 @@ export function childrenFrom(
     key?: string,
     identifiedBy?: string,
     parentKey?: string
-): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const propKey = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, propKey);
         const existing: ChildrenFromMetadata[] = Reflect.getMetadata(METADATA_KEY, target, propKey) ?? [];
         const metadata: ChildrenFromMetadata = { eventType, key, identifiedBy, parentKey };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, propKey);
-    };
+    });
 }
 
 /**
@@ -48,5 +49,5 @@ export function childrenFrom(
  * @returns An array of childrenFrom metadata entries.
  */
 export function getChildrenFromMetadata(target: object, propertyKey: string): ChildrenFromMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<ChildrenFromMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/clearWith.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChronicleClassOrPropertyDecorator, decorateClassOrProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the clearWith class or property decorator. */
 export interface ClearWithMetadata {
@@ -20,8 +21,8 @@ const PROPERTY_METADATA_KEY = 'chronicle:projection:clearWith:property';
  * @param eventType - The event constructor.
  * @returns A class and property decorator.
  */
-export function clearWith(eventType: Function): ClassDecorator & PropertyDecorator {
-    return (target: object, propertyKey?: string | symbol) => {
+export function clearWith(eventType: Function): ChronicleClassOrPropertyDecorator {
+    return decorateClassOrProperty((target: object, propertyKey?: string | symbol) => {
         if (propertyKey !== undefined) {
             const key = propertyKey.toString();
             TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
@@ -31,7 +32,7 @@ export function clearWith(eventType: Function): ClassDecorator & PropertyDecorat
             const existing: ClearWithMetadata[] = Reflect.getMetadata(CLASS_METADATA_KEY, target) ?? [];
             Reflect.defineMetadata(CLASS_METADATA_KEY, [...existing, { eventType }], target);
         }
-    };
+    });
 }
 
 /**
@@ -50,5 +51,5 @@ export function getClearWithClassMetadata(target: Function): ClearWithMetadata[]
  * @returns An array of clearWith metadata entries.
  */
 export function getClearWithPropertyMetadata(target: object, propertyKey: string): ClearWithMetadata[] {
-    return Reflect.getMetadata(PROPERTY_METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<ClearWithMetadata[]>(PROPERTY_METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/count.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the count property decorator. */
 export interface CountMetadata {
@@ -20,14 +21,14 @@ const METADATA_KEY = 'chronicle:projection:count';
  * @param constantKey - Optional constant key value.
  * @returns A property decorator.
  */
-export function count(eventType: Function, constantKey?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function count(eventType: Function, constantKey?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: CountMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
         const metadata: CountMetadata = { eventType, constantKey };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -37,5 +38,5 @@ export function count(eventType: Function, constantKey?: string): PropertyDecora
  * @returns An array of count metadata entries.
  */
 export function getCountMetadata(target: object, propertyKey: string): CountMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<CountMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/decorators.standard.spec.ts

@@ -0,0 +1,71 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { describe, expect, it } from 'vitest';
+import { addFrom, getAddFromMetadata } from './addFrom.js';
+import { childrenFrom, getChildrenFromMetadata } from './childrenFrom.js';
+import { clearWith, getClearWithPropertyMetadata } from './clearWith.js';
+import { count, getCountMetadata } from './count.js';
+import { decrement, getDecrementMetadata } from './decrement.js';
+import { fromAll, getFromAllMetadata } from './fromAll.js';
+import { fromEvery, getFromEveryMetadata } from './fromEvery.js';
+import { increment, getIncrementMetadata } from './increment.js';
+import { join, getJoinMetadata } from './join.js';
+import { isNested, nested } from './nested.js';
+import { isNoAutoMap, isPropertyNoAutoMap, noAutoMap } from './noAutoMap.js';
+import { getRemovedWithPropertyMetadata, removedWith } from './removedWith.js';
+import { getRemovedWithJoinPropertyMetadata, removedWithJoin } from './removedWithJoin.js';
+import { getSetFromContextMetadata, setFromContext } from './setFromContext.js';
+import { getSetFromMetadata, setFrom } from './setFrom.js';
+import { getSetValueMetadata, setValue } from './setValue.js';
+import { getSubtractFromMetadata, subtractFrom } from './subtractFrom.js';
+import { getTrackedJsonSchemaProperties, jsonSchemaProperty } from '../../schemas/jsonSchemaProperty.js';
+
+class Changed {}
+
+@noAutoMap
+class Mappings {
+    @addFrom(Changed) added!: number;
+    @childrenFrom(Changed) children!: object[];
+    @clearWith(Changed) cleared!: string;
+    @count(Changed) counted!: number;
+    @decrement(Changed) decremented!: number;
+    @fromAll() all!: string;
+    @fromEvery() every!: string;
+    @increment(Changed) incremented!: number;
+    @join(Changed) joined!: string;
+    @nested nestedValue!: object;
+    @noAutoMap excluded!: string;
+    @removedWith(Changed) removed!: string;
+    @removedWithJoin(Changed) removedJoin!: string;
+    @setFromContext(Changed) contextValue!: string;
+    @setFrom(Changed) set!: string;
+    @setValue(Changed, 'fixed') constant!: string;
+    @subtractFrom(Changed) subtracted!: number;
+    @jsonSchemaProperty() tracked!: string;
+}
+
+describe('standard model-bound decorators', () => {
+    it('stores class and property annotations without constructing an instance', () => {
+        const target = Mappings.prototype;
+        expect(isNoAutoMap(Mappings)).toBe(true);
+        expect(isPropertyNoAutoMap(target, 'excluded')).toBe(true);
+        expect(isNested(target, 'nestedValue')).toBe(true);
+        expect(getAddFromMetadata(target, 'added')).toHaveLength(1);
+        expect(getChildrenFromMetadata(target, 'children')).toHaveLength(1);
+        expect(getClearWithPropertyMetadata(target, 'cleared')).toHaveLength(1);
+        expect(getCountMetadata(target, 'counted')).toHaveLength(1);
+        expect(getDecrementMetadata(target, 'decremented')).toHaveLength(1);
+        expect(getFromAllMetadata(target, 'all')).toEqual({ property: undefined, contextProperty: undefined });
+        expect(getFromEveryMetadata(target, 'every')).toEqual({ property: undefined, contextProperty: undefined });
+        expect(getIncrementMetadata(target, 'incremented')).toHaveLength(1);
+        expect(getJoinMetadata(target, 'joined')).toHaveLength(1);
+        expect(getRemovedWithPropertyMetadata(target, 'removed')).toHaveLength(1);
+        expect(getRemovedWithJoinPropertyMetadata(target, 'removedJoin')).toHaveLength(1);
+        expect(getSetFromContextMetadata(target, 'contextValue')).toHaveLength(1);
+        expect(getSetFromMetadata(target, 'set')).toHaveLength(1);
+        expect(getSetValueMetadata(target, 'constant')).toEqual([{ eventType: Changed, value: 'fixed' }]);
+        expect(getSubtractFromMetadata(target, 'subtracted')).toHaveLength(1);
+        expect(getTrackedJsonSchemaProperties(Mappings)).toContain('tracked');
+    });
+});

package/projections/modelBound/decrement.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the decrement property decorator. */
 export interface DecrementMetadata {
@@ -20,14 +21,14 @@ const METADATA_KEY = 'chronicle:projection:decrement';
  * @param constantKey - Optional constant key value.
  * @returns A property decorator.
  */
-export function decrement(eventType: Function, constantKey?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function decrement(eventType: Function, constantKey?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: DecrementMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
         const metadata: DecrementMetadata = { eventType, constantKey };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -37,5 +38,5 @@ export function decrement(eventType: Function, constantKey?: string): PropertyDe
  * @returns An array of decrement metadata entries.
  */
 export function getDecrementMetadata(target: object, propertyKey: string): DecrementMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<DecrementMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/fromAll.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the fromAll property decorator. */
 export interface FromAllMetadata {
@@ -23,12 +24,12 @@ const METADATA_KEY = 'chronicle:projection:fromAll';
  * @param contextProperty - Optional event context property name.
  * @returns A property decorator.
  */
-export function fromAll(property?: string, contextProperty?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function fromAll(property?: string, contextProperty?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, propertyKey.toString());
         const metadata: FromAllMetadata = { property, contextProperty };
         Reflect.defineMetadata(METADATA_KEY, metadata, target, propertyKey.toString());
-    };
+    });
 }
 
 /**
@@ -38,5 +39,5 @@ export function fromAll(property?: string, contextProperty?: string): PropertyDe
  * @returns The fromAll metadata, or undefined if not decorated.
  */
 export function getFromAllMetadata(target: object, propertyKey: string): FromAllMetadata | undefined {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey);
+    return getPropertyMetadata<FromAllMetadata>(METADATA_KEY, target, propertyKey);
 }

package/projections/modelBound/fromEvery.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the fromEvery property decorator. */
 export interface FromEveryMetadata {
@@ -20,12 +21,12 @@ const METADATA_KEY = 'chronicle:projection:fromEvery';
  * @param contextProperty - Optional event context property name.
  * @returns A property decorator.
  */
-export function fromEvery(property?: string, contextProperty?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function fromEvery(property?: string, contextProperty?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, propertyKey.toString());
         const metadata: FromEveryMetadata = { property, contextProperty };
         Reflect.defineMetadata(METADATA_KEY, metadata, target, propertyKey.toString());
-    };
+    });
 }
 
 /**
@@ -35,5 +36,5 @@ export function fromEvery(property?: string, contextProperty?: string): Property
  * @returns The fromEvery metadata, or undefined if not decorated.
  */
 export function getFromEveryMetadata(target: object, propertyKey: string): FromEveryMetadata | undefined {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey);
+    return getPropertyMetadata<FromEveryMetadata>(METADATA_KEY, target, propertyKey);
 }

package/projections/modelBound/increment.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the increment property decorator. */
 export interface IncrementMetadata {
@@ -20,14 +21,14 @@ const METADATA_KEY = 'chronicle:projection:increment';
  * @param constantKey - Optional constant key value.
  * @returns A property decorator.
  */
-export function increment(eventType: Function, constantKey?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function increment(eventType: Function, constantKey?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: IncrementMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
         const metadata: IncrementMetadata = { eventType, constantKey };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -37,5 +38,5 @@ export function increment(eventType: Function, constantKey?: string): PropertyDe
  * @returns An array of increment metadata entries.
  */
 export function getIncrementMetadata(target: object, propertyKey: string): IncrementMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<IncrementMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/join.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the join property decorator. */
 export interface JoinMetadata {
@@ -23,14 +24,14 @@ const METADATA_KEY = 'chronicle:projection:join';
  * @param eventPropertyName - Optional event property name. Defaults to the property name.
  * @returns A property decorator.
  */
-export function join(eventType: Function, on?: string, eventPropertyName?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function join(eventType: Function, on?: string, eventPropertyName?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: JoinMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
         const metadata: JoinMetadata = { eventType, on, eventPropertyName };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -40,5 +41,5 @@ export function join(eventType: Function, on?: string, eventPropertyName?: strin
  * @returns An array of join metadata entries.
  */
 export function getJoinMetadata(target: object, propertyKey: string): JoinMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<JoinMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/nested.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { decorateProperty, hasPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 const METADATA_KEY = 'chronicle:projection:nested';
 
@@ -12,10 +13,16 @@ const METADATA_KEY = 'chronicle:projection:nested';
  * @param target - The class prototype.
  * @param propertyKey - The property name.
  */
-export function nested(target: object, propertyKey: string | symbol): void {
+const decorateNested = decorateProperty((target: object, propertyKey: string | symbol): void => {
     const key = propertyKey.toString();
     TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
     Reflect.defineMetadata(METADATA_KEY, true, target, key);
+});
+
+export function nested(target: object, propertyKey: string | symbol): void;
+export function nested(value: undefined, context: ClassFieldDecoratorContext): void;
+export function nested(target: object | undefined, propertyKeyOrContext: string | symbol | ClassFieldDecoratorContext): void {
+    decorateNested(target as undefined, propertyKeyOrContext as ClassFieldDecoratorContext);
 }
 
 /**
@@ -25,5 +32,5 @@ export function nested(target: object, propertyKey: string | symbol): void {
  * @returns True if the property is marked as nested; false otherwise.
  */
 export function isNested(target: object, propertyKey: string): boolean {
-    return Reflect.hasMetadata(METADATA_KEY, target, propertyKey);
+    return hasPropertyMetadata(METADATA_KEY, target, propertyKey);
 }

package/projections/modelBound/noAutoMap.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { decorateClassOrProperty, hasPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 const CLASS_METADATA_KEY = 'chronicle:projection:noAutoMap:class';
 const PROPERTY_METADATA_KEY = 'chronicle:projection:noAutoMap:property';
@@ -17,7 +18,7 @@ const PROPERTY_METADATA_KEY = 'chronicle:projection:noAutoMap:property';
  * @param target - The class constructor, or the class prototype when used on a property.
  * @param propertyKey - The property name, when used as a property decorator.
  */
-export function noAutoMap(target: object, propertyKey?: string | symbol): void {
+const decorateNoAutoMap = decorateClassOrProperty((target: object, propertyKey?: string | symbol): void => {
     if (propertyKey !== undefined) {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
@@ -25,6 +26,14 @@ export function noAutoMap(target: object, propertyKey?: string | symbol): void {
     } else {
         Reflect.defineMetadata(CLASS_METADATA_KEY, true, target as Function);
     }
+});
+
+export function noAutoMap(target: Function): void;
+export function noAutoMap(target: object, propertyKey: string | symbol): void;
+export function noAutoMap(value: Function, context: ClassDecoratorContext): void;
+export function noAutoMap(value: undefined, context: ClassFieldDecoratorContext): void;
+export function noAutoMap(target: object | undefined, propertyKeyOrContext?: string | symbol | ClassDecoratorContext | ClassFieldDecoratorContext): void {
+    decorateNoAutoMap(target as Function, propertyKeyOrContext as ClassDecoratorContext);
 }
 
 /**
@@ -43,5 +52,5 @@ export function isNoAutoMap(target: Function): boolean {
  * @returns True if the property is marked with {@link noAutoMap}; false otherwise.
  */
 export function isPropertyNoAutoMap(target: object, propertyKey: string): boolean {
-    return Reflect.hasMetadata(PROPERTY_METADATA_KEY, target, propertyKey);
+    return hasPropertyMetadata(PROPERTY_METADATA_KEY, target, propertyKey);
 }

package/projections/modelBound/removedWith.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChronicleClassOrPropertyDecorator, decorateClassOrProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the removedWith class or property decorator. */
 export interface RemovedWithMetadata {
@@ -26,8 +27,8 @@ const PROPERTY_METADATA_KEY = 'chronicle:projection:removedWith:property';
  * @param parentKey - Optional event property name used as the parent key (for children only).
  * @returns A class and property decorator.
  */
-export function removedWith(eventType: Function, key?: string, parentKey?: string): ClassDecorator & PropertyDecorator {
-    return (target: object, propertyKey?: string | symbol) => {
+export function removedWith(eventType: Function, key?: string, parentKey?: string): ChronicleClassOrPropertyDecorator {
+    return decorateClassOrProperty((target: object, propertyKey?: string | symbol) => {
         if (propertyKey !== undefined) {
             const propKey = propertyKey.toString();
             TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, propKey);
@@ -37,7 +38,7 @@ export function removedWith(eventType: Function, key?: string, parentKey?: strin
             const existing: RemovedWithMetadata[] = Reflect.getMetadata(CLASS_METADATA_KEY, target) ?? [];
             Reflect.defineMetadata(CLASS_METADATA_KEY, [...existing, { eventType, key, parentKey }], target);
         }
-    };
+    });
 }
 
 /**
@@ -56,5 +57,5 @@ export function getRemovedWithClassMetadata(target: Function): RemovedWithMetada
  * @returns An array of removedWith metadata entries.
  */
 export function getRemovedWithPropertyMetadata(target: object, propertyKey: string): RemovedWithMetadata[] {
-    return Reflect.getMetadata(PROPERTY_METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<RemovedWithMetadata[]>(PROPERTY_METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/removedWithJoin.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChronicleClassOrPropertyDecorator, decorateClassOrProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the removedWithJoin class or property decorator. */
 export interface RemovedWithJoinMetadata {
@@ -21,8 +22,8 @@ const PROPERTY_METADATA_KEY = 'chronicle:projection:removedWithJoin:property';
  * @param key - Optional event property name used as the key to identify the instance to remove.
  * @returns A class and property decorator.
  */
-export function removedWithJoin(eventType: Function, key?: string): ClassDecorator & PropertyDecorator {
-    return (target: object, propertyKey?: string | symbol) => {
+export function removedWithJoin(eventType: Function, key?: string): ChronicleClassOrPropertyDecorator {
+    return decorateClassOrProperty((target: object, propertyKey?: string | symbol) => {
         if (propertyKey !== undefined) {
             const propKey = propertyKey.toString();
             TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, propKey);
@@ -32,7 +33,7 @@ export function removedWithJoin(eventType: Function, key?: string): ClassDecorat
             const existing: RemovedWithJoinMetadata[] = Reflect.getMetadata(CLASS_METADATA_KEY, target) ?? [];
             Reflect.defineMetadata(CLASS_METADATA_KEY, [...existing, { eventType, key }], target);
         }
-    };
+    });
 }
 
 /**
@@ -51,5 +52,5 @@ export function getRemovedWithJoinClassMetadata(target: Function): RemovedWithJo
  * @returns An array of removedWithJoin metadata entries.
  */
 export function getRemovedWithJoinPropertyMetadata(target: object, propertyKey: string): RemovedWithJoinMetadata[] {
-    return Reflect.getMetadata(PROPERTY_METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<RemovedWithJoinMetadata[]>(PROPERTY_METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/setFrom.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the setFrom property decorator. */
 export interface SetFromMetadata {
@@ -20,14 +21,14 @@ const METADATA_KEY = 'chronicle:projection:setFrom';
  * @param eventPropertyName - Optional event property name. Defaults to the property name.
  * @returns A property decorator.
  */
-export function setFrom(eventType: Function, eventPropertyName?: string): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function setFrom(eventType: Function, eventPropertyName?: string): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: SetFromMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
         const metadata: SetFromMetadata = { eventType, eventPropertyName };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -37,5 +38,5 @@ export function setFrom(eventType: Function, eventPropertyName?: string): Proper
  * @returns An array of setFrom metadata entries.
  */
 export function getSetFromMetadata(target: object, propertyKey: string): SetFromMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<SetFromMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/setFromContext.ts

@@ -5,6 +5,7 @@ import 'reflect-metadata';
 import { PropertyAccessor, PropertyPathResolverProxyHandler } from '@cratis/fundamentals';
 import type { EventContext } from '../../events/index.js';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the setFromContext property decorator. */
 export interface SetFromContextMetadata {
@@ -22,13 +23,13 @@ const METADATA_KEY = 'chronicle:projection:setFromContext';
  * @param contextPropertyOrAccessor - Optional event context property name or property accessor. Defaults to the property name.
  * @returns A property decorator.
  */
-export function setFromContext(eventType: Function, contextPropertyName?: string): PropertyDecorator;
-export function setFromContext(eventType: Function, contextPropertyAccessor?: PropertyAccessor<EventContext>): PropertyDecorator;
+export function setFromContext(eventType: Function, contextPropertyName?: string): ChroniclePropertyDecorator;
+export function setFromContext(eventType: Function, contextPropertyAccessor?: PropertyAccessor<EventContext>): ChroniclePropertyDecorator;
 export function setFromContext(
     eventType: Function,
     contextPropertyOrAccessor?: string | PropertyAccessor<EventContext>
-): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: SetFromContextMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
@@ -45,7 +46,7 @@ export function setFromContext(
 
         const metadata: SetFromContextMetadata = { eventType, contextPropertyName };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -55,5 +56,5 @@ export function setFromContext(
  * @returns An array of setFromContext metadata entries.
  */
 export function getSetFromContextMetadata(target: object, propertyKey: string): SetFromContextMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<SetFromContextMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }

package/projections/modelBound/setValue.ts

@@ -3,6 +3,7 @@
 
 import 'reflect-metadata';
 import { TypeIntrospector } from '../../types/index.js';
+import { ChroniclePropertyDecorator, decorateProperty, getPropertyMetadata } from '../../types/propertyDecoratorMetadata.js';
 
 /** Metadata stored by the setValue property decorator. */
 export interface SetValueMetadata {
@@ -20,14 +21,14 @@ const METADATA_KEY = 'chronicle:projection:setValue';
  * @param value - The constant value to assign.
  * @returns A property decorator.
  */
-export function setValue(eventType: Function, value: unknown): PropertyDecorator {
-    return (target: object, propertyKey: string | symbol) => {
+export function setValue(eventType: Function, value: unknown): ChroniclePropertyDecorator {
+    return decorateProperty((target: object, propertyKey: string | symbol) => {
         const key = propertyKey.toString();
         TypeIntrospector.trackProperty((target as { constructor: Function }).constructor, key);
         const existing: SetValueMetadata[] = Reflect.getMetadata(METADATA_KEY, target, key) ?? [];
         const metadata: SetValueMetadata = { eventType, value };
         Reflect.defineMetadata(METADATA_KEY, [...existing, metadata], target, key);
-    };
+    });
 }
 
 /**
@@ -37,5 +38,5 @@ export function setValue(eventType: Function, value: unknown): PropertyDecorator
  * @returns An array of setValue metadata entries.
  */
 export function getSetValueMetadata(target: object, propertyKey: string): SetValueMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY, target, propertyKey) ?? [];
+    return getPropertyMetadata<SetValueMetadata[]>(METADATA_KEY, target, propertyKey) ?? [];
 }