@magek/core 0.0.6 → 0.0.8

package/dist/authorizer.js

@@ -31,5 +31,5 @@ class MagekAuthorizer {
 }
 exports.MagekAuthorizer = MagekAuthorizer;
 function userHasSomeRole(user, authorizedRoles) {
-    return authorizedRoles.some((roleClass) => { var _a; return (_a = user.roles) === null || _a === void 0 ? void 0 : _a.includes(roleClass.name); });
+    return authorizedRoles.some((roleClass) => user.roles?.includes(roleClass.name));
 }

package/dist/command-dispatcher.js

@@ -8,48 +8,54 @@ const filter_helpers_1 = require("./services/filter-helpers");
 const global_error_dispatcher_1 = require("./global-error-dispatcher");
 const schema_migrator_1 = require("./schema-migrator");
 const instrumentation_1 = require("./instrumentation");
-class MagekCommandDispatcher {
-    constructor(config) {
-        this.config = config;
-        this.globalErrorDispatcher = new global_error_dispatcher_1.MagekGlobalErrorDispatcher(config);
-    }
-    async dispatchCommand(commandEnvelope, context) {
-        const logger = (0, common_1.getLogger)(this.config, 'MagekCommandDispatcher#dispatchCommand');
-        logger.debug('Dispatching the following command envelope: ', commandEnvelope);
-        if (!commandEnvelope.version) {
-            throw new common_1.InvalidParameterError('The required command "version" was not present');
+let MagekCommandDispatcher = (() => {
+    let _instanceExtraInitializers = [];
+    let _dispatchCommand_decorators;
+    return class MagekCommandDispatcher {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _dispatchCommand_decorators = [(0, instrumentation_1.trace)(common_1.TraceActionTypes.COMMAND_HANDLER)];
+            tslib_1.__esDecorate(this, null, _dispatchCommand_decorators, { kind: "method", name: "dispatchCommand", static: false, private: false, access: { has: obj => "dispatchCommand" in obj, get: obj => obj.dispatchCommand }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
-        const commandMetadata = this.config.commandHandlers[commandEnvelope.typeName];
-        if (!commandMetadata) {
-            throw new common_1.NotFoundError(`Could not find a proper handler for ${commandEnvelope.typeName}`);
+        config = tslib_1.__runInitializers(this, _instanceExtraInitializers);
+        globalErrorDispatcher;
+        constructor(config) {
+            this.config = config;
+            this.globalErrorDispatcher = new global_error_dispatcher_1.MagekGlobalErrorDispatcher(config);
         }
-        await commandMetadata.authorizer(commandEnvelope.currentUser, commandEnvelope);
-        const commandClass = commandMetadata.class;
-        logger.debug('Found the following command:', commandClass.name);
-        const migratedCommandEnvelope = await new schema_migrator_1.SchemaMigrator(this.config).migrate(commandEnvelope);
-        let result;
-        const register = new common_1.Register(migratedCommandEnvelope.requestID, context.responseHeaders, register_handler_1.RegisterHandler.flush, migratedCommandEnvelope.currentUser, migratedCommandEnvelope.context);
-        try {
-            const commandInput = await (0, filter_helpers_1.applyBeforeFunctions)(migratedCommandEnvelope.value, commandMetadata.before, migratedCommandEnvelope.currentUser);
-            const commandInstance = (0, common_1.createInstance)(commandClass, commandInput);
-            logger.debug('Calling "handle" method on command: ', commandClass);
-            result = await commandClass.handle(commandInstance, register);
+        async dispatchCommand(commandEnvelope, context) {
+            const logger = (0, common_1.getLogger)(this.config, 'MagekCommandDispatcher#dispatchCommand');
+            logger.debug('Dispatching the following command envelope: ', commandEnvelope);
+            if (!commandEnvelope.version) {
+                throw new common_1.InvalidParameterError('The required command "version" was not present');
+            }
+            const commandMetadata = this.config.commandHandlers[commandEnvelope.typeName];
+            if (!commandMetadata) {
+                throw new common_1.NotFoundError(`Could not find a proper handler for ${commandEnvelope.typeName}`);
+            }
+            await commandMetadata.authorizer(commandEnvelope.currentUser, commandEnvelope);
+            const commandClass = commandMetadata.class;
+            logger.debug('Found the following command:', commandClass.name);
+            const migratedCommandEnvelope = await new schema_migrator_1.SchemaMigrator(this.config).migrate(commandEnvelope);
+            let result;
+            const register = new common_1.Register(migratedCommandEnvelope.requestID, context.responseHeaders, register_handler_1.RegisterHandler.flush, migratedCommandEnvelope.currentUser, migratedCommandEnvelope.context);
+            try {
+                const commandInput = await (0, filter_helpers_1.applyBeforeFunctions)(migratedCommandEnvelope.value, commandMetadata.before, migratedCommandEnvelope.currentUser);
+                const commandInstance = (0, common_1.createInstance)(commandClass, commandInput);
+                logger.debug('Calling "handle" method on command: ', commandClass);
+                result = await commandClass.handle(commandInstance, register);
+            }
+            catch (err) {
+                const e = err;
+                const error = await this.globalErrorDispatcher.dispatch(new common_1.CommandHandlerGlobalError(migratedCommandEnvelope, commandMetadata, e));
+                if (error)
+                    throw error;
+            }
+            logger.debug('Command dispatched with register: ', register);
+            await register_handler_1.RegisterHandler.handle(this.config, register);
+            return result;
         }
-        catch (err) {
-            const e = err;
-            const error = await this.globalErrorDispatcher.dispatch(new common_1.CommandHandlerGlobalError(migratedCommandEnvelope, commandMetadata, e));
-            if (error)
-                throw error;
-        }
-        logger.debug('Command dispatched with register: ', register);
-        await register_handler_1.RegisterHandler.handle(this.config, register);
-        return result;
-    }
-}
+    };
+})();
 exports.MagekCommandDispatcher = MagekCommandDispatcher;
-tslib_1.__decorate([
-    (0, instrumentation_1.Trace)(common_1.TraceActionTypes.COMMAND_HANDLER),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], MagekCommandDispatcher.prototype, "dispatchCommand", null);

package/dist/core-concepts/data-migration/entities/data-migration-entity.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagekDataMigrationEntity = void 0;
 const common_1 = require("@magek/common");
 class MagekDataMigrationEntity {
+    id;
+    status;
+    lastUpdated;
+    duration;
     constructor(id, status, lastUpdated, duration) {
         this.id = id;
         this.status = status;
@@ -16,9 +20,8 @@ class MagekDataMigrationEntity {
         return new MagekDataMigrationEntity(event.name, common_1.DataMigrationStatus.RUNNING, event.lastUpdated, duration);
     }
     static finished(event, currentDataMigration) {
-        var _a;
         const current = new Date();
-        if ((_a = currentDataMigration.duration) === null || _a === void 0 ? void 0 : _a.start) {
+        if (currentDataMigration.duration?.start) {
             const start = currentDataMigration.duration.start;
             const end = current.toISOString();
             const startTime = Date.parse(start);

package/dist/core-concepts/data-migration/events/data-migration-finished.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagekDataMigrationFinished = void 0;
 class MagekDataMigrationFinished {
+    name;
+    lastUpdated;
     constructor(name, lastUpdated) {
         this.name = name;
-        this.lastUpdated = lastUpdated !== null && lastUpdated !== void 0 ? lastUpdated : new Date().toISOString();
+        this.lastUpdated = lastUpdated ?? new Date().toISOString();
     }
     entityID() {
         return this.name;

package/dist/core-concepts/data-migration/events/data-migration-started.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagekDataMigrationStarted = void 0;
 class MagekDataMigrationStarted {
+    name;
+    lastUpdated;
     constructor(name, lastUpdated) {
         this.name = name;
-        this.lastUpdated = lastUpdated !== null && lastUpdated !== void 0 ? lastUpdated : new Date().toISOString();
+        this.lastUpdated = lastUpdated ?? new Date().toISOString();
     }
     entityID() {
         return this.name;

package/dist/core-concepts/data-migration/events/entity-migrated.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagekEntityMigrated = void 0;
 class MagekEntityMigrated {
+    oldEntityName;
+    oldEntityId;
+    newEntityName;
+    newEntity;
     constructor(oldEntityName, oldEntityId, newEntityName, newEntity) {
         this.oldEntityName = oldEntityName;
         this.oldEntityId = oldEntityId;

package/dist/core-concepts/touch-entity/events/entity-touched.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagekEntityTouched = void 0;
 class MagekEntityTouched {
+    entityName;
+    entityId;
     constructor(entityName, entityId) {
         this.entityName = entityName;
         this.entityId = entityId;

package/dist/data-migrations.js

@@ -10,64 +10,69 @@ const entity_migrated_1 = require("./core-concepts/data-migration/events/entity-
 const index_1 = require("./index");
 const data_migration_started_1 = require("./core-concepts/data-migration/events/data-migration-started");
 const instrumentation_1 = require("./instrumentation");
-class MagekDataMigrations {
-    static async run() {
-        const config = index_1.Magek.config;
-        const logger = (0, common_1.getLogger)(config, 'MagekDataMigrationDispatcher#dispatch');
-        let migrating = false;
-        const configuredMigrations = config.dataMigrationHandlers;
-        if (Object.keys(configuredMigrations).length === 0) {
-            logger.debug('No defined migrations found. Skipping...');
-            return false;
+let MagekDataMigrations = (() => {
+    let _staticExtraInitializers = [];
+    let _static_run_decorators;
+    return class MagekDataMigrations {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _static_run_decorators = [(0, instrumentation_1.trace)(common_1.TraceActionTypes.MIGRATION_RUN)];
+            tslib_1.__esDecorate(this, null, _static_run_decorators, { kind: "method", name: "run", static: true, private: false, access: { has: obj => "run" in obj, get: obj => obj.run }, metadata: _metadata }, null, _staticExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            tslib_1.__runInitializers(this, _staticExtraInitializers);
         }
-        const sortedConfiguredMigrations = MagekDataMigrations.sortConfiguredMigrations(configuredMigrations);
-        const eventStore = new event_store_1.EventStore(config);
-        for (const configuredMigration of Object.values(sortedConfiguredMigrations)) {
-            const migrationEntityForConfiguredMigration = await eventStore.fetchEntitySnapshot(data_migration_entity_1.MagekDataMigrationEntity.name, configuredMigration.class.name);
-            if (!migrationEntityForConfiguredMigration) {
-                logger.debug('Not found running or finished migrations for the DataMigration', configuredMigration);
-                migrating = true;
-                await MagekDataMigrations.migrate(configuredMigration);
+        static async run() {
+            const config = index_1.Magek.config;
+            const logger = (0, common_1.getLogger)(config, 'MagekDataMigrationDispatcher#dispatch');
+            let migrating = false;
+            const configuredMigrations = config.dataMigrationHandlers;
+            if (Object.keys(configuredMigrations).length === 0) {
+                logger.debug('No defined migrations found. Skipping...');
+                return false;
             }
-            else {
-                const dataMigrationEntity = migrationEntityForConfiguredMigration.value;
-                if (dataMigrationEntity.status === common_1.DataMigrationStatus.RUNNING) {
-                    logger.debug('Found running migrations for the DataMigration', configuredMigration);
+            const sortedConfiguredMigrations = MagekDataMigrations.sortConfiguredMigrations(configuredMigrations);
+            const eventStore = new event_store_1.EventStore(config);
+            for (const configuredMigration of Object.values(sortedConfiguredMigrations)) {
+                const migrationEntityForConfiguredMigration = await eventStore.fetchEntitySnapshot(data_migration_entity_1.MagekDataMigrationEntity.name, configuredMigration.class.name);
+                if (!migrationEntityForConfiguredMigration) {
+                    logger.debug('Not found running or finished migrations for the DataMigration', configuredMigration);
                     migrating = true;
+                    await MagekDataMigrations.migrate(configuredMigration);
+                }
+                else {
+                    const dataMigrationEntity = migrationEntityForConfiguredMigration.value;
+                    if (dataMigrationEntity.status === common_1.DataMigrationStatus.RUNNING) {
+                        logger.debug('Found running migrations for the DataMigration', configuredMigration);
+                        migrating = true;
+                    }
                 }
             }
+            return migrating;
+        }
+        static migrateEntity(oldEntityName, oldEntityId, newEntity) {
+            const requestID = common_1.UUID.generate();
+            const register = new common_1.Register(requestID, {}, register_handler_1.RegisterHandler.flush);
+            register.events(new entity_migrated_1.MagekEntityMigrated(oldEntityName, oldEntityId, newEntity.constructor.name, newEntity));
+            return register_handler_1.RegisterHandler.handle(index_1.Magek.config, register);
+        }
+        static sortConfiguredMigrations(configuredMigrations) {
+            return Object.values(configuredMigrations).sort((a, b) => {
+                return a.migrationOptions.order - b.migrationOptions.order;
+            });
+        }
+        static async migrate(migrationHandler) {
+            const startedRegister = new common_1.Register(common_1.UUID.generate(), {}, register_handler_1.RegisterHandler.flush);
+            await MagekDataMigrations.emitStarted(startedRegister, migrationHandler.class.name);
+            await register_handler_1.RegisterHandler.handle(index_1.Magek.config, startedRegister);
+            const finishedRegister = new common_1.Register(common_1.UUID.generate(), {}, register_handler_1.RegisterHandler.flush);
+            await migrationHandler.class.start(finishedRegister);
+            await register_handler_1.RegisterHandler.handle(index_1.Magek.config, finishedRegister);
+        }
+        static async emitStarted(register, configuredMigrationName) {
+            const logger = (0, common_1.getLogger)(index_1.Magek.config, 'MagekMigration#emitStarted');
+            logger.info('Migration started', configuredMigrationName);
+            register.events(new data_migration_started_1.MagekDataMigrationStarted(configuredMigrationName, new Date().toISOString()));
         }
-        return migrating;
-    }
-    static migrateEntity(oldEntityName, oldEntityId, newEntity) {
-        const requestID = common_1.UUID.generate();
-        const register = new common_1.Register(requestID, {}, register_handler_1.RegisterHandler.flush);
-        register.events(new entity_migrated_1.MagekEntityMigrated(oldEntityName, oldEntityId, newEntity.constructor.name, newEntity));
-        return register_handler_1.RegisterHandler.handle(index_1.Magek.config, register);
-    }
-    static sortConfiguredMigrations(configuredMigrations) {
-        return Object.values(configuredMigrations).sort((a, b) => {
-            return a.migrationOptions.order - b.migrationOptions.order;
-        });
-    }
-    static async migrate(migrationHandler) {
-        const startedRegister = new common_1.Register(common_1.UUID.generate(), {}, register_handler_1.RegisterHandler.flush);
-        await MagekDataMigrations.emitStarted(startedRegister, migrationHandler.class.name);
-        await register_handler_1.RegisterHandler.handle(index_1.Magek.config, startedRegister);
-        const finishedRegister = new common_1.Register(common_1.UUID.generate(), {}, register_handler_1.RegisterHandler.flush);
-        await migrationHandler.class.start(finishedRegister);
-        await register_handler_1.RegisterHandler.handle(index_1.Magek.config, finishedRegister);
-    }
-    static async emitStarted(register, configuredMigrationName) {
-        const logger = (0, common_1.getLogger)(index_1.Magek.config, 'MagekMigration#emitStarted');
-        logger.info('Migration started', configuredMigrationName);
-        register.events(new data_migration_started_1.MagekDataMigrationStarted(configuredMigrationName, new Date().toISOString()));
-    }
-}
+    };
+})();
 exports.MagekDataMigrations = MagekDataMigrations;
-tslib_1.__decorate([
-    (0, instrumentation_1.Trace)(common_1.TraceActionTypes.MIGRATION_RUN),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", Promise)
-], MagekDataMigrations, "run", null);

package/dist/decorators/command.d.ts

@@ -1,19 +1,12 @@
 import { CommandFilterHooks, CommandInterface, CommandRoleAccess } from '@magek/common';
-/**
- * Stage 3 class decorator context
- */
-interface Stage3ClassContext {
-    kind: 'class';
-    name: string | undefined;
-    metadata: Record<string | symbol, unknown>;
-    addInitializer?: (initializer: () => void) => void;
-}
+import { ClassDecoratorContext } from './decorator-utils';
 /**
  * Decorator to mark a class as a Magek Command.
  * Commands represent user intentions and trigger business logic.
  *
+ * Uses TC39 Stage 3 decorators.
+ *
  * @param attributes - Role access control and filter hooks configuration
  * @returns A class decorator function
  */
-export declare function Command(attributes: CommandRoleAccess & CommandFilterHooks): <TCommand>(commandClass: CommandInterface<TCommand>, context?: Stage3ClassContext) => void;
-export {};
+export declare function Command(attributes: CommandRoleAccess & CommandFilterHooks): <TCommand>(commandClass: CommandInterface<TCommand>, context: ClassDecoratorContext) => void;

package/dist/decorators/command.js

@@ -4,44 +4,36 @@ exports.Command = Command;
 const magek_1 = require("../magek");
 const metadata_1 = require("./metadata");
 const authorizer_1 = require("../authorizer");
-const stage3_utils_1 = require("./stage3-utils");
-/**
- * Type guard to detect Stage 3 class decorator context
- */
-function isStage3ClassContext(arg) {
-    return (arg !== null &&
-        typeof arg === 'object' &&
-        'kind' in arg &&
-        arg.kind === 'class' &&
-        'metadata' in arg);
-}
 /**
  * Decorator to mark a class as a Magek Command.
  * Commands represent user intentions and trigger business logic.
  *
+ * Uses TC39 Stage 3 decorators.
+ *
  * @param attributes - Role access control and filter hooks configuration
  * @returns A class decorator function
  */
 function Command(attributes) {
     return (commandClass, context) => {
-        // Transfer Stage 3 field metadata if applicable
-        if (isStage3ClassContext(context)) {
-            (0, stage3_utils_1.transferStage3FieldMetadata)(commandClass, context.metadata);
-        }
         magek_1.Magek.configureCurrentEnv((config) => {
-            var _a;
             if (config.commandHandlers[commandClass.name]) {
                 throw new Error(`A command called ${commandClass.name} is already registered.
         If you think that this is an error, try performing a clean build.`);
             }
-            const metadata = (0, metadata_1.getClassMetadata)(commandClass);
+            // Pass context.metadata because Symbol.metadata isn't attached to class yet during decorator execution
+            const metadata = (0, metadata_1.getClassMetadata)(commandClass, context.metadata);
             config.commandHandlers[commandClass.name] = {
                 class: commandClass,
                 authorizer: authorizer_1.MagekAuthorizer.build(attributes),
-                before: (_a = attributes.before) !== null && _a !== void 0 ? _a : [],
+                before: attributes.before ?? [],
                 properties: metadata.fields,
                 methods: metadata.methods,
             };
+            // Register non-exposed fields from context.metadata
+            const nonExposedFields = (0, metadata_1.getNonExposedFields)(context.metadata);
+            if (nonExposedFields.length > 0) {
+                config.nonExposedGraphQLMetadataKey[commandClass.name] = nonExposedFields;
+            }
         });
     };
 }

package/dist/decorators/data-migration.d.ts

@@ -1,9 +1,12 @@
 import { DataMigrationInterface, DataMigrationParameters } from '@magek/common';
+import { ClassDecoratorContext } from './decorator-types';
 /**
  * Decorator to mark a class as a Magek Data Migration.
  * Data migrations are background processes that update existing data in the database.
  *
+ * Uses TC39 Stage 3 decorators.
+ *
  * @param attributes - Migration configuration (e.g., execution order)
  * @returns A class decorator function
  */
-export declare function DataMigration(attributes: DataMigrationParameters): (dataMigrationClass: DataMigrationInterface) => void;
+export declare function DataMigration(attributes: DataMigrationParameters): (dataMigrationClass: DataMigrationInterface, context: ClassDecoratorContext) => void;

package/dist/decorators/data-migration.js

@@ -6,11 +6,13 @@ const magek_1 = require("../magek");
  * Decorator to mark a class as a Magek Data Migration.
  * Data migrations are background processes that update existing data in the database.
  *
+ * Uses TC39 Stage 3 decorators.
+ *
  * @param attributes - Migration configuration (e.g., execution order)
  * @returns A class decorator function
  */
 function DataMigration(attributes) {
-    return (migrationClass) => {
+    return (migrationClass, _context) => {
         magek_1.Magek.configureCurrentEnv((config) => {
             if (config.dataMigrationHandlers[migrationClass.name]) {
                 throw new Error(`A data migration called ${migrationClass.name} is already registered.

package/dist/decorators/decorator-types.d.ts

@@ -0,0 +1,50 @@
+/** Symbol used to store field metadata in decorator context.metadata */
+export declare const FIELDS_METADATA_KEY: unique symbol;
+/**
+ * Symbol.metadata - either the native one or TypeScript's polyfill.
+ * TypeScript uses Symbol.for('Symbol.metadata') when native isn't available.
+ */
+export declare const SYMBOL_METADATA: symbol;
+export type DecoratorMetadataObject = Record<string | symbol, unknown>;
+export interface ClassDecoratorContext {
+    kind: 'class';
+    name: string | undefined;
+    metadata?: DecoratorMetadataObject;
+    addInitializer?: (initializer: () => void) => void;
+}
+export interface FieldDecoratorContext {
+    kind: 'field';
+    name: string | symbol;
+    static: boolean;
+    private: boolean;
+    metadata?: DecoratorMetadataObject;
+    access?: {
+        get?: (object: any) => any;
+        set?: (object: any, value: any) => void;
+    };
+    addInitializer?: (initializer: () => void) => void;
+}
+export interface MethodDecoratorContext {
+    kind: 'method';
+    name: string | symbol;
+    static: boolean;
+    private: boolean;
+    metadata?: DecoratorMetadataObject;
+    access?: {
+        get?: (object: any) => any;
+        has?: (object: any) => boolean;
+    };
+    addInitializer?: (initializer: () => void) => void;
+}
+export interface GetterDecoratorContext {
+    kind: 'getter';
+    name: string | symbol;
+    static: boolean;
+    private: boolean;
+    metadata?: DecoratorMetadataObject;
+    access?: {
+        get?: (object: any) => any;
+        has?: (object: any) => boolean;
+    };
+    addInitializer?: (initializer: () => void) => void;
+}

package/dist/decorators/decorator-types.js

@@ -0,0 +1,11 @@
+"use strict";
+// ============ SYMBOLS ============
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SYMBOL_METADATA = exports.FIELDS_METADATA_KEY = void 0;
+/** Symbol used to store field metadata in decorator context.metadata */
+exports.FIELDS_METADATA_KEY = Symbol.for('magek:fields');
+/**
+ * Symbol.metadata - either the native one or TypeScript's polyfill.
+ * TypeScript uses Symbol.for('Symbol.metadata') when native isn't available.
+ */
+exports.SYMBOL_METADATA = Symbol.metadata ?? Symbol.for('Symbol.metadata');

package/dist/decorators/decorator-utils.d.ts

@@ -0,0 +1 @@
+export type { ClassDecoratorContext, FieldDecoratorContext, MethodDecoratorContext, GetterDecoratorContext, DecoratorMetadataObject, } from './decorator-types';

package/dist/decorators/decorator-utils.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/decorators/entity.d.ts

@@ -1,32 +1,24 @@
 import { Class, EntityInterface, EventInterface, EventStreamRoleAccess, AnyClass } from '@magek/common';
+import { ClassDecoratorContext, MethodDecoratorContext } from './decorator-utils';
 type EntityAttributes = EventStreamRoleAccess;
 type EntityDecoratorParam = AnyClass | EntityAttributes;
-type EntityDecoratorResult<TEntity, TParam> = TParam extends EntityAttributes ? (entityClass: Class<TEntity>) => void : void;
+type EntityDecoratorResult<TEntity, TParam> = TParam extends EntityAttributes ? (entityClass: Class<TEntity>, context: ClassDecoratorContext) => void : void;
 /**
  * Decorator to mark a class as a Magek Entity.
  * Entities represent the current state derived from events.
  *
  * @param classOrAttributes - Either the class itself or entity configuration attributes
+ * @param context - Decorator context (when used without parentheses)
  * @returns A class decorator function or void if used without parentheses
  */
-export declare function Entity<TEntity extends EntityInterface, TParam extends EntityDecoratorParam>(classOrAttributes: TParam): EntityDecoratorResult<TEntity, TParam>;
-/**
- * Stage 3 method decorator context
- */
-interface Stage3MethodContext {
-    kind: 'method';
-    name: string | symbol;
-    static: boolean;
-    private: boolean;
-    metadata: Record<string | symbol, unknown>;
-    addInitializer?: (initializer: () => void) => void;
-}
+export declare function Entity<TEntity extends EntityInterface, TParam extends EntityDecoratorParam>(classOrAttributes: TParam, context?: ClassDecoratorContext): EntityDecoratorResult<TEntity, TParam>;
 /**
  * Decorator to register an entity class method as a reducer function
  * for a specific event.
  *
+ * Uses TC39 Stage 3 decorators.
+ *
  * @param eventClass The event that this method will react to
  */
-export declare function Reduces<TEvent extends EventInterface>(eventClass: Class<TEvent>): <TEntity>(entityClassOrMethod: Class<TEntity> | Function, methodNameOrContext: string | Stage3MethodContext, methodDescriptor?: ReducerMethod<TEvent, TEntity>) => void;
-type ReducerMethod<TEvent, TEntity> = TypedPropertyDescriptor<(event: TEvent, entity: TEntity) => TEntity> | TypedPropertyDescriptor<(event: TEvent, entity?: TEntity) => TEntity>;
+export declare function reduces<TEvent extends EventInterface>(eventClass: Class<TEvent>): <TEntity>(entityClassOrMethod: Function, context: MethodDecoratorContext) => void;
 export {};

package/dist/decorators/entity.js

@@ -1,20 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = Entity;
-exports.Reduces = Reduces;
+exports.reduces = reduces;
 const magek_1 = require("../magek");
 const authorizer_1 = require("../authorizer");
+const metadata_1 = require("./metadata");
 /**
  * Decorator to mark a class as a Magek Entity.
  * Entities represent the current state derived from events.
  *
  * @param classOrAttributes - Either the class itself or entity configuration attributes
+ * @param context - Decorator context (when used without parentheses)
  * @returns A class decorator function or void if used without parentheses
  */
-function Entity(classOrAttributes) {
+function Entity(classOrAttributes, context) {
     let authorizeReadEvents;
     // This function will be either returned or executed, depending on the parameters passed to the decorator
-    const mainLogicFunction = (entityClass) => {
+    const mainLogicFunction = (entityClass, ctx) => {
         magek_1.Magek.configureCurrentEnv((config) => {
             if (config.entities[entityClass.name]) {
                 throw new Error(`An entity called ${entityClass.name} is already registered
@@ -34,56 +36,44 @@ function Entity(classOrAttributes) {
                 class: entityClass,
                 eventStreamAuthorizer,
             };
+            // Register non-exposed fields from context.metadata
+            const nonExposedFields = (0, metadata_1.getNonExposedFields)(ctx?.metadata);
+            if (nonExposedFields.length > 0) {
+                config.nonExposedGraphQLMetadataKey[entityClass.name] = nonExposedFields;
+            }
         });
     };
     if (isEntityAttributes(classOrAttributes)) {
         authorizeReadEvents = classOrAttributes.authorizeReadEvents;
-        return mainLogicFunction;
+        return ((entityClass, ctx) => {
+            mainLogicFunction(entityClass, ctx);
+        });
     }
-    return mainLogicFunction(classOrAttributes);
+    return mainLogicFunction(classOrAttributes, context);
 }
 function isEntityAttributes(param) {
     return 'authorizeReadEvents' in param;
 }
-/**
- * Type guard to detect Stage 3 method decorator context
- */
-function isStage3MethodContext(arg) {
-    return (arg !== null &&
-        typeof arg === 'object' &&
-        'kind' in arg &&
-        arg.kind === 'method' &&
-        'name' in arg);
-}
 /**
  * Decorator to register an entity class method as a reducer function
  * for a specific event.
  *
+ * Uses TC39 Stage 3 decorators.
+ *
  * @param eventClass The event that this method will react to
  */
-function Reduces(eventClass) {
-    return (entityClassOrMethod, methodNameOrContext, _methodDescriptor) => {
-        // Detect Stage 3 vs Legacy decorator
-        if (isStage3MethodContext(methodNameOrContext)) {
-            // Stage 3 decorator - use addInitializer to get the class
-            const context = methodNameOrContext;
-            if (context.addInitializer) {
-                context.addInitializer(function () {
-                    // For static methods, 'this' is the class itself
-                    // For instance methods, 'this' is an instance and we need this.constructor
-                    const targetClass = context.static ? this : this.constructor;
-                    registerReducer(eventClass.name, {
-                        class: targetClass,
-                        methodName: context.name.toString(),
-                    });
+function reduces(eventClass) {
+    return (_method, context) => {
+        // Stage 3 decorator - use addInitializer to get the class
+        if (context.addInitializer) {
+            context.addInitializer(function () {
+                // For static methods, 'this' is the class itself
+                // For instance methods, 'this' is an instance and we need this.constructor
+                const targetClass = context.static ? this : this.constructor;
+                registerReducer(eventClass.name, {
+                    class: targetClass,
+                    methodName: context.name.toString(),
                 });
-            }
-        }
-        else {
-            // Legacy decorator
-            registerReducer(eventClass.name, {
-                class: entityClassOrMethod,
-                methodName: methodNameOrContext,
             });
         }
     };