@cratis/arc 18.5.0 → 18.7.0

package/commands/Command.ts

@@ -27,7 +27,9 @@ export abstract class Command<TCommandContent = object, TCommandResponse = objec
     private _origin: string;
     private _httpHeadersCallback: GetHttpHeaders;
     abstract readonly route: string;
-    abstract readonly validation: CommandValidator;
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    readonly validation?: CommandValidator<any>;
+    /* eslint-enable @typescript-eslint/no-explicit-any */
     abstract readonly propertyDescriptors: PropertyDescriptor[];
     abstract get requestParameters(): string[];
     abstract get properties(): string[];
@@ -70,6 +72,11 @@ export abstract class Command<TCommandContent = object, TCommandResponse = objec
 
     /** @inheritdoc */
     async execute(): Promise<CommandResult<TCommandResponse>> {
+        const clientValidationErrors = this.validation?.validate(this) || [];
+        if (clientValidationErrors.length > 0) {
+            return CommandResult.validationFailed(clientValidationErrors) as CommandResult<TCommandResponse>;
+        }
+
         const validationErrors = this.validateRequiredProperties();
         if (validationErrors.length > 0) {
             return CommandResult.validationFailed(validationErrors) as CommandResult<TCommandResponse>;
@@ -90,6 +97,16 @@ export abstract class Command<TCommandContent = object, TCommandResponse = objec
 
     /** @inheritdoc */
     async validate(): Promise<CommandResult<TCommandResponse>> {
+        const clientValidationErrors = this.validation?.validate(this) || [];
+        if (clientValidationErrors.length > 0) {
+            return CommandResult.validationFailed(clientValidationErrors) as CommandResult<TCommandResponse>;
+        }
+
+        const validationErrors = this.validateRequiredProperties();
+        if (validationErrors.length > 0) {
+            return CommandResult.validationFailed(validationErrors) as CommandResult<TCommandResponse>;
+        }
+
         const actualRoute = `${this.route}/validate`;
         return this.performRequest(actualRoute, 'Command validation endpoint not found at route', 'Error during validation call');
     }

package/commands/CommandValidator.ts

@@ -2,16 +2,18 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import { Validator } from '../validation/Validator';
-
-export type CommandPropertyValidators = { [key: string]: Validator; };
+import { ValidationResult } from '../validation/ValidationResult';
 
 /**
  * Represents the command validator
  */
-export abstract class CommandValidator {
-    abstract readonly properties: CommandPropertyValidators;
-
-    get isValid() {
-        return true;
+export abstract class CommandValidator<T = object> extends Validator<T> {
+    /**
+     * Validate the command.
+     * @param command The command to validate.
+     * @returns An array of validation results, empty if valid.
+     */
+    validate(command: T): ValidationResult[] {
+        return super.validate(command);
     }
 }

package/commands/for_Command/CommandWithRouteParams.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import { Command } from '../Command';
-import { CommandValidator } from '../CommandValidator';
 import { PropertyDescriptor } from '../../reflection/PropertyDescriptor';
 
 export interface ICommandWithRouteParams {
@@ -11,7 +10,6 @@ export interface ICommandWithRouteParams {
 }
 
 export class CommandWithRouteParams extends Command<ICommandWithRouteParams> implements ICommandWithRouteParams {
-    validation!: CommandValidator;
     route = '/api/items/{id}';
     propertyDescriptors: PropertyDescriptor[] = [
         new PropertyDescriptor('id', String),

package/commands/for_Command/SomeCommand.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import { Command } from '../Command';
-import { CommandValidator } from '../CommandValidator';
 import { PropertyDescriptor } from '../../reflection/PropertyDescriptor';
 
 export interface ISomeCommand {
@@ -10,7 +9,6 @@ export interface ISomeCommand {
 }
 
 export class SomeCommand extends Command<ISomeCommand> implements ISomeCommand {
-    validation!: CommandValidator;
     route = '';
     propertyDescriptors: PropertyDescriptor[] = [
         new PropertyDescriptor('someProperty', String)

package/commands/for_Command/given/a_command_with_validator.ts

@@ -0,0 +1,55 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { Command } from '../../Command';
+import { CommandValidator } from '../../CommandValidator';
+import { PropertyDescriptor } from '../../../reflection/PropertyDescriptor';
+import { createFetchHelper } from '../../../helpers/fetchHelper';
+import sinon from 'sinon';
+import '../../../validation/RuleBuilderExtensions';
+
+interface ITestCommand {
+    email: string;
+    age: number;
+}
+
+class TestCommandValidator extends CommandValidator<ITestCommand> {
+    constructor() {
+        super();
+        this.ruleFor(c => c.email).notEmpty().withMessage('Email is required');
+        this.ruleFor(c => c.age).greaterThanOrEqual(18).withMessage('Must be at least 18 years old');
+    }
+}
+
+class TestCommand extends Command<ITestCommand> {
+    readonly route: string = '/api/test-command';
+    readonly validation = new TestCommandValidator();
+    readonly propertyDescriptors: PropertyDescriptor[] = [];
+    
+    email: string = '';
+    age: number = 0;
+
+    constructor() {
+        super(Object, false);
+    }
+    
+    get requestParameters(): string[] {
+        return [];
+    }
+    
+    get properties(): string[] {
+        return ['email', 'age'];
+    }
+}
+
+export class a_command_with_validator {
+    command: TestCommand;
+    fetchStub: sinon.SinonStub;
+    fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
+
+    constructor() {
+        this.command = new TestCommand();
+        this.fetchHelper = createFetchHelper();
+        this.fetchStub = this.fetchHelper.stubFetch();
+    }
+}

package/commands/for_Command/when_executing/with_client_validation_failing.ts

@@ -0,0 +1,69 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { Command } from '../../Command';
+import { CommandValidator } from '../../CommandValidator';
+import { CommandResult } from '../../CommandResult';
+import { PropertyDescriptor } from '../../../reflection/PropertyDescriptor';
+import '../../../validation/RuleBuilderExtensions';
+
+class TestCommandValidator extends CommandValidator<{ name: string; age: number }> {
+    constructor() {
+        super();
+        this.ruleFor(c => c.name).notEmpty();
+        this.ruleFor(c => c.age).greaterThanOrEqual(18);
+    }
+}
+
+class TestCommand extends Command<{ name: string; age: number }, void> {
+    readonly route = '/test';
+    readonly validation = new TestCommandValidator();
+    readonly propertyDescriptors: PropertyDescriptor[] = [];
+    name = '';
+    age = 0;
+
+    constructor() {
+        super(Object, false);
+    }
+
+    get requestParameters(): string[] {
+        return [];
+    }
+
+    get properties(): string[] {
+        return ['name', 'age'];
+    }
+}
+
+describe("when executing with client validation failing", () => {
+    let command: TestCommand;
+    let result: CommandResult<void>;
+
+    beforeEach(async () => {
+        command = new TestCommand();
+        command.name = '';
+        command.age = 15;
+
+        result = await command.execute();
+    });
+
+    it("should_not_be_success", () => {
+        result.isSuccess.should.be.false;
+    });
+
+    it("should_not_be_valid", () => {
+        result.isValid.should.be.false;
+    });
+
+    it("should_have_validation_results", () => {
+        result.validationResults.should.not.be.empty;
+    });
+
+    it("should_have_error_for_name", () => {
+        result.validationResults.some(r => r.members.includes('name')).should.be.true;
+    });
+
+    it("should_have_error_for_age", () => {
+        result.validationResults.some(r => r.members.includes('age')).should.be.true;
+    });
+});

package/commands/for_Command/when_executing/with_client_validation_failure_and_custom_message.ts

@@ -0,0 +1,29 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { a_command_with_validator } from '../given/a_command_with_validator';
+import { given } from '../../../given';
+import { CommandResult } from '../../CommandResult';
+
+describe("when executing with client validation failure and custom message", given(a_command_with_validator, context => {
+    let result: CommandResult<object>;
+
+    beforeEach(async () => {
+        // Set invalid email (empty) but valid age
+        context.command.email = '';
+        context.command.age = 25; // Valid age to test only email validation
+        
+        // Execute should validate client-side and not call the server
+        result = await context.command.execute();
+    });
+
+    afterEach(() => {
+        context.fetchStub.restore();
+    });
+
+    it("should_not_call_server", () => context.fetchStub.called.should.be.false);
+    it("should_return_invalid_result", () => result.isValid.should.be.false);
+    it("should_have_validation_error", () => result.validationResults.length.should.equal(1));
+    it("should_have_custom_error_message", () => result.validationResults[0].message.should.equal('Email is required'));
+    it("should_have_error_for_email_property", () => result.validationResults[0].members[0].should.equal('email'));
+}));

package/commands/for_Command/when_executing/with_client_validation_passing.ts

@@ -0,0 +1,63 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { Command } from '../../Command';
+import { CommandValidator } from '../../CommandValidator';
+import { PropertyDescriptor } from '../../../reflection/PropertyDescriptor';
+import '../../../validation/RuleBuilderExtensions';
+import sinon from 'sinon';
+import { createFetchHelper } from '../../../helpers/fetchHelper';
+
+class TestCommandValidator extends CommandValidator<{ name: string }> {
+    constructor() {
+        super();
+        this.ruleFor(c => c.name).notEmpty();
+    }
+}
+
+class TestCommand extends Command<{ name: string }, void> {
+    readonly route = '/test';
+    readonly validation = new TestCommandValidator();
+    readonly propertyDescriptors: PropertyDescriptor[] = [];
+    name = '';
+
+    constructor() {
+        super(Object, false);
+    }
+
+    get requestParameters(): string[] {
+        return [];
+    }
+
+    get properties(): string[] {
+        return ['name'];
+    }
+}
+
+describe("when executing with client validation passing", () => {
+    let command: TestCommand;
+    let fetchStub: sinon.SinonStub;
+    let fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
+
+    beforeEach(() => {
+        command = new TestCommand();
+        command.setOrigin('http://localhost');
+        command.name = 'test';
+
+        fetchHelper = createFetchHelper();
+        fetchStub = fetchHelper.stubFetch();
+        fetchStub.resolves({
+            ok: true,
+            json: async () => ({ isSuccess: true, isValid: true })
+        } as Response);
+    });
+
+    afterEach(() => {
+        fetchHelper.restore();
+    });
+
+    it("should_call_server", async () => {
+        await command.execute();
+        fetchStub.should.have.been.called;
+    });
+});

package/commands/for_Command/when_executing/with_route_parameters.ts

@@ -9,6 +9,7 @@ import { given } from '../../../given';
 describe("when executing with route parameters", given(class {
     command: CommandWithRouteParams;
     fetchStub: sinon.SinonStub;
+    fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
 
     constructor() {
         this.command = new CommandWithRouteParams();

package/commands/for_Command/when_validating/with_client_validation_failure.ts

@@ -0,0 +1,26 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { a_command_with_validator } from '../given/a_command_with_validator';
+import { given } from '../../../given';
+import { CommandResult } from '../../CommandResult';
+
+describe("when validating with client validation failure", given(a_command_with_validator, context => {
+    let result: CommandResult<object>;
+
+    beforeEach(async () => {
+        context.command.email = '';
+        context.command.age = 25;
+        
+        result = await context.command.validate();
+    });
+
+    afterEach(() => {
+        context.fetchStub.restore();
+    });
+
+    it("should_not_call_server", () => context.fetchStub.called.should.be.false);
+    it("should_return_invalid_result", () => result.isValid.should.be.false);
+    it("should_have_validation_error", () => result.validationResults.length.should.equal(1));
+    it("should_have_error_for_email_property", () => result.validationResults[0].members[0].should.equal('email'));
+}));

package/commands/for_Command/when_validating/with_client_validation_passing.ts

@@ -0,0 +1,77 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { Command } from '../../Command';
+import { CommandValidator } from '../../CommandValidator';
+import { PropertyDescriptor } from '../../../reflection/PropertyDescriptor';
+import '../../../validation/RuleBuilderExtensions';
+import sinon from 'sinon';
+import { CommandResult } from '../../CommandResult';
+import { createFetchHelper } from '../../../helpers/fetchHelper';
+
+interface ITestCommand {
+    email: string;
+    age: number;
+}
+
+class TestCommandValidator extends CommandValidator<ITestCommand> {
+    constructor() {
+        super();
+        this.ruleFor(c => c.email).notEmpty().emailAddress();
+        this.ruleFor(c => c.age).greaterThanOrEqual(18);
+    }
+}
+
+class TestCommand extends Command<ITestCommand> {
+    readonly route = '/api/test';
+    readonly validation = new TestCommandValidator();
+    readonly propertyDescriptors: PropertyDescriptor[] = [];
+    email = '';
+    age = 0;
+
+    constructor() {
+        super(Object, false);
+    }
+
+    get requestParameters(): string[] {
+        return [];
+    }
+
+    get properties(): string[] {
+        return ['email', 'age'];
+    }
+}
+
+describe("when validating with client validation passing", () => {
+    let command: TestCommand;
+    let fetchStub: sinon.SinonStub;
+    let fetchHelper: { stubFetch: () => sinon.SinonStub; restore: () => void };
+    let result: CommandResult<object>;
+
+    beforeEach(async () => {
+        command = new TestCommand();
+        command.setOrigin('http://localhost');
+        command.email = 'test@example.com';
+        command.age = 25;
+
+        fetchHelper = createFetchHelper();
+        fetchStub = fetchHelper.stubFetch();
+        fetchStub.resolves({
+            ok: true,
+            json: async () => ({ isSuccess: true, isValid: true, validationResults: [] })
+        } as Response);
+
+        result = await command.validate();
+    });
+
+    afterEach(() => {
+        fetchHelper.restore();
+    });
+
+    it("should_call_server", () => fetchStub.calledOnce.should.be.true);
+    it("should_call_validation_endpoint", () => {
+        const url = fetchStub.getCall(0).args[0];
+        url.toString().should.contain('/api/test/validate');
+    });
+    it("should_return_valid_result", () => result.isValid.should.be.true);
+});

package/commands/for_Command/when_validating/with_required_property_missing.ts

@@ -0,0 +1,28 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { given } from '../../../given';
+import { CommandResult } from '../../CommandResult';
+import { a_command } from '../given/a_command';
+
+describe("when validating with required property missing", given(class extends a_command {
+    constructor() {
+        super();
+        this.command.someProperty = undefined as unknown as string;
+    }
+}, context => {
+    let result: CommandResult<object>;
+
+    beforeEach(async () => {
+        result = await context.command.validate();
+    });
+
+    afterEach(() => {
+        context.fetchStub.restore();
+    });
+
+    it("should_not_call_server", () => context.fetchStub.called.should.be.false);
+    it("should_return_invalid_result", () => result.isValid.should.be.false);
+    it("should_have_validation_error", () => result.validationResults.length.should.equal(1));
+    it("should_have_error_for_missing_property", () => result.validationResults[0].members[0].should.equal('someProperty'));
+}));

package/commands/for_CommandResult/when_chaining_callbacks/and_result_has_exceptions.ts

@@ -16,6 +16,7 @@ describe('when chaining callbacks and result has exceptions', () => {
             'Something is not right'
         ],
         exceptionStackTrace: 'Some stack trace',
+        authorizationFailureReason: '',
         response: {}
     }, Object, false);
 

package/commands/for_CommandResult/when_chaining_callbacks/and_result_is_invalid.ts

@@ -18,6 +18,7 @@ describe('when chaining callbacks and result is invalid', () => {
         ],
         exceptionMessages: [],
         exceptionStackTrace: '',
+        authorizationFailureReason: '',
         response: {}
     }, Object, false);
 

package/commands/for_CommandResult/when_chaining_callbacks/and_result_is_successful.ts

@@ -13,6 +13,7 @@ describe('when chaining callbacks and result is successful', () => {
         validationResults: [],
         exceptionMessages: [],
         exceptionStackTrace: '',
+        authorizationFailureReason: '',
         response: 'The ultimate response'
     }, Object, false);
 

package/commands/for_CommandResult/when_chaining_callbacks/and_result_is_unauthorized.ts

@@ -13,6 +13,7 @@ describe('when chaining callbacks and result is unauthorized', () => {
         validationResults: [],
         exceptionMessages: [],
         exceptionStackTrace: '',
+        authorizationFailureReason: '',
         response: {}
     }, Object, false);
 

package/dist/cjs/commands/Command.d.ts

@@ -12,7 +12,7 @@ export declare abstract class Command<TCommandContent = object, TCommandResponse
     private _origin;
     private _httpHeadersCallback;
     abstract readonly route: string;
-    abstract readonly validation: CommandValidator;
+    readonly validation?: CommandValidator<any>;
     abstract readonly propertyDescriptors: PropertyDescriptor[];
     abstract get requestParameters(): string[];
     abstract get properties(): string[];

package/dist/cjs/commands/Command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Command.d.ts","sourceRoot":"","sources":["../../../commands/Command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AAInE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAYtE,8BAAsB,OAAO,CAAC,eAAe,GAAG,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAE,YAAW,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAoBzH,QAAQ,CAAC,aAAa,EAAE,WAAW;IAAW,QAAQ,CAAC,yBAAyB,EAAE,OAAO;IAnBrG,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAC/C,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAC5D,QAAQ,KAAK,iBAAiB,IAAI,MAAM,EAAE,CAAC;IAC3C,QAAQ,KAAK,UAAU,IAAI,MAAM,EAAE,CAAC;IAEpC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAkB;gBAOf,aAAa,EAAE,WAAW,YAAS,EAAW,yBAAyB,EAAE,OAAO;IAQrG,eAAe,CAAC,YAAY,EAAE,MAAM;IAKpC,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKzC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK/B,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKhD,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAoBnD,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAK1D,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,0BAA0B;IAgBlC,OAAO,CAAC,YAAY;YAeN,cAAc;IA6B5B,KAAK,IAAI,IAAI;IASb,gBAAgB,CAAC,MAAM,EAAE,eAAe;IAWxC,iCAAiC;IAUjC,aAAa,IAAI,IAAI;IAOrB,IAAI,UAAU,YAEb;IAGD,eAAe,CAAC,QAAQ,EAAE,MAAM;IAehC,iBAAiB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM;IAO5D,OAAO,CAAC,gBAAgB;CAG3B"}
+{"version":3,"file":"Command.d.ts","sourceRoot":"","sources":["../../../commands/Command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AAInE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAYtE,8BAAsB,OAAO,CAAC,eAAe,GAAG,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAE,YAAW,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAsBzH,QAAQ,CAAC,aAAa,EAAE,WAAW;IAAW,QAAQ,CAAC,yBAAyB,EAAE,OAAO;IArBrG,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE5C,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAC5D,QAAQ,KAAK,iBAAiB,IAAI,MAAM,EAAE,CAAC;IAC3C,QAAQ,KAAK,UAAU,IAAI,MAAM,EAAE,CAAC;IAEpC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAkB;gBAOf,aAAa,EAAE,WAAW,YAAS,EAAW,yBAAyB,EAAE,OAAO;IAQrG,eAAe,CAAC,YAAY,EAAE,MAAM;IAKpC,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKzC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK/B,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKhD,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAyBnD,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAe1D,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,0BAA0B;IAgBlC,OAAO,CAAC,YAAY;YAeN,cAAc;IA6B5B,KAAK,IAAI,IAAI;IASb,gBAAgB,CAAC,MAAM,EAAE,eAAe;IAWxC,iCAAiC;IAUjC,aAAa,IAAI,IAAI;IAOrB,IAAI,UAAU,YAEb;IAGD,eAAe,CAAC,QAAQ,EAAE,MAAM;IAehC,iBAAiB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM;IAO5D,OAAO,CAAC,gBAAgB;CAG3B"}

package/dist/cjs/commands/Command.js

@@ -15,6 +15,7 @@ class Command {
     _apiBasePath;
     _origin;
     _httpHeadersCallback;
+    validation;
     _initialValues = {};
     _hasChanges = false;
     _callbacks = [];
@@ -39,6 +40,10 @@ class Command {
         this._httpHeadersCallback = callback;
     }
     async execute() {
+        const clientValidationErrors = this.validation?.validate(this) || [];
+        if (clientValidationErrors.length > 0) {
+            return CommandResult.CommandResult.validationFailed(clientValidationErrors);
+        }
         const validationErrors = this.validateRequiredProperties();
         if (validationErrors.length > 0) {
             return CommandResult.CommandResult.validationFailed(validationErrors);
@@ -54,6 +59,14 @@ class Command {
         return result;
     }
     async validate() {
+        const clientValidationErrors = this.validation?.validate(this) || [];
+        if (clientValidationErrors.length > 0) {
+            return CommandResult.CommandResult.validationFailed(clientValidationErrors);
+        }
+        const validationErrors = this.validateRequiredProperties();
+        if (validationErrors.length > 0) {
+            return CommandResult.CommandResult.validationFailed(validationErrors);
+        }
         const actualRoute = `${this.route}/validate`;
         return this.performRequest(actualRoute, 'Command validation endpoint not found at route', 'Error during validation call');
     }

package/dist/cjs/commands/Command.js.map

@@ -1 +1 @@
-{"version":3,"file":"Command.js","sources":["../../../commands/Command.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { ICommand, PropertyChanged } from './ICommand';\nimport { CommandResult } from \"./CommandResult\";\nimport { CommandValidator } from './CommandValidator';\nimport { Constructor, JsonSerializer } from '@cratis/fundamentals';\nimport { Globals } from '../Globals';\nimport { joinPaths } from '../joinPaths';\nimport { UrlHelpers } from '../UrlHelpers';\nimport { GetHttpHeaders } from '../GetHttpHeaders';\nimport { PropertyDescriptor } from '../reflection/PropertyDescriptor';\nimport { ValidationResult } from '../validation/ValidationResult';\nimport { ValidationResultSeverity } from '../validation/ValidationResultSeverity';\n\ntype Callback = {\n    callback: WeakRef<PropertyChanged>;\n    thisArg: WeakRef<object>;\n}\n\n/**\n * Represents an implementation of {@link ICommand} that works with HTTP fetch.\n */\nexport abstract class Command<TCommandContent = object, TCommandResponse = object> implements ICommand<TCommandContent, TCommandResponse> {\n    private _microservice: string;\n    private _apiBasePath: string;\n    private _origin: string;\n    private _httpHeadersCallback: GetHttpHeaders;\n    abstract readonly route: string;\n    abstract readonly validation: CommandValidator;\n    abstract readonly propertyDescriptors: PropertyDescriptor[];\n    abstract get requestParameters(): string[];\n    abstract get properties(): string[];\n\n    private _initialValues: object = {};\n    private _hasChanges = false;\n    private _callbacks: Callback[] = [];\n\n    /**\n     * Initializes a new instance of the {@link Command<,>} class.\n     * @param _responseType Type of response.\n     * @param _isResponseTypeEnumerable Whether or not the response type is enumerable.\n     */\n    constructor(readonly _responseType: Constructor = Object, readonly _isResponseTypeEnumerable: boolean) {\n        this._microservice = Globals.microservice ?? '';\n        this._apiBasePath = Globals.apiBasePath ?? '';\n        this._origin = Globals.origin ?? '';\n        this._httpHeadersCallback = () => ({});\n    }\n\n    /** @inheritdoc */\n    setMicroservice(microservice: string) {\n        this._microservice = microservice;\n    }\n\n    /** @inheritdoc */\n    setApiBasePath(apiBasePath: string): void {\n        this._apiBasePath = apiBasePath;\n    }\n\n    /** @inheritdoc */\n    setOrigin(origin: string): void {\n        this._origin = origin;\n    }\n\n    /** @inheritdoc */\n    setHttpHeadersCallback(callback: GetHttpHeaders): void {\n        this._httpHeadersCallback = callback;\n    }\n\n    /** @inheritdoc */\n    async execute(): Promise<CommandResult<TCommandResponse>> {\n        const validationErrors = this.validateRequiredProperties();\n        if (validationErrors.length > 0) {\n            return CommandResult.validationFailed(validationErrors) as CommandResult<TCommandResponse>;\n        }\n\n        let actualRoute = this.route;\n\n        if (this.requestParameters && this.requestParameters.length > 0) {\n            const payload = this.buildPayload();\n            const { route } = UrlHelpers.replaceRouteParameters(this.route, payload);\n            actualRoute = route;\n        }\n\n        const result = await this.performRequest(actualRoute, 'Command not found at route', 'Error during server call');\n        this.setInitialValuesFromCurrentValues();\n        return result;\n    }\n\n    /** @inheritdoc */\n    async validate(): Promise<CommandResult<TCommandResponse>> {\n        const actualRoute = `${this.route}/validate`;\n        return this.performRequest(actualRoute, 'Command validation endpoint not found at route', 'Error during validation call');\n    }\n\n    private buildPayload(): object {\n        const payload = {};\n        this.properties.forEach(property => {\n            payload[property] = this[property];\n        });\n        return payload;\n    }\n\n    private validateRequiredProperties(): ValidationResult[] {\n        const validationErrors: ValidationResult[] = [];\n        this.properties.forEach(property => {\n            const value = this[property];\n            if (value === undefined || value === null || value === '') {\n                validationErrors.push(new ValidationResult(\n                    ValidationResultSeverity.Error,\n                    `${property} is required`,\n                    [property],\n                    null\n                ));\n            }\n        });\n        return validationErrors;\n    }\n\n    private buildHeaders(): HeadersInit {\n        const customHeaders = this._httpHeadersCallback?.() ?? {};\n        const headers = {\n            ...customHeaders,\n            'Accept': 'application/json',\n            'Content-Type': 'application/json'\n        };\n\n        if (this._microservice?.length > 0) {\n            headers[Globals.microserviceHttpHeader] = this._microservice;\n        }\n\n        return headers;\n    }\n\n    private async performRequest(\n        route: string,\n        notFoundMessage: string,\n        errorMessage: string\n    ): Promise<CommandResult<TCommandResponse>> {\n        const payload = this.buildPayload();\n        const headers = this.buildHeaders();\n        const actualRoute = joinPaths(this._apiBasePath, route);\n        const url = UrlHelpers.createUrlFrom(this._origin, this._apiBasePath, actualRoute);\n\n        try {\n            const response = await fetch(url, {\n                method: 'POST',\n                headers,\n                body: JsonSerializer.serialize(payload)\n            });\n\n            if (response.status === 404) {\n                return CommandResult.failed([`${notFoundMessage} '${actualRoute}'`]) as CommandResult<TCommandResponse>;\n            }\n\n            const result = await response.json();\n            return new CommandResult(result, this._responseType, this._isResponseTypeEnumerable);\n        } catch (ex) {\n            return CommandResult.failed([`${errorMessage}: ${ex}`]) as CommandResult<TCommandResponse>;\n        }\n    }\n\n    /** @inheritdoc */\n    clear(): void {\n        this.properties.forEach(property => {\n            this[property] = undefined;\n        });\n        this._initialValues = {};\n        this._hasChanges = false;\n    }\n\n    /** @inheritdoc */\n    setInitialValues(values: TCommandContent) {\n        this.properties.forEach(property => {\n            if (Object.prototype.hasOwnProperty.call(values, property)) {\n                this._initialValues[property] = values[property];\n                this[property] = values[property];\n            }\n        });\n        this.updateHasChanges();\n    }\n\n    /** @inheritdoc */\n    setInitialValuesFromCurrentValues() {\n        this.properties.forEach(property => {\n            if (this[property]) {\n                this._initialValues[property] = this[property];\n            }\n        });\n        this.updateHasChanges();\n    }\n\n    /** @inheritdoc */\n    revertChanges(): void {\n        this.properties.forEach(property => {\n            this[property] = this._initialValues[property];\n        });\n    }\n\n    /** @inheritdoc */\n    get hasChanges() {\n        return this._hasChanges;\n    }\n\n    /** @inheritdoc */\n    propertyChanged(property: string) {\n        this.updateHasChanges();\n\n        this._callbacks.forEach(callbackContainer => {\n            const callback = callbackContainer.callback.deref();\n            const thisArg = callbackContainer.thisArg.deref();\n            if (callback && thisArg) {\n                callback.call(thisArg, property);\n            } else {\n                this._callbacks = this._callbacks.filter(_ => _.callback !== callbackContainer.callback);\n            }\n        });\n    }\n\n    /** @inheritdoc */\n    onPropertyChanged(callback: PropertyChanged, thisArg: object) {\n        this._callbacks.push({\n            callback: new WeakRef(callback),\n            thisArg: new WeakRef(thisArg)\n        });\n    }\n\n    private updateHasChanges() {\n        this._hasChanges = this.properties.some(property => this[property] !== this._initialValues[property]);\n    }\n}\n"],"names":["Globals","CommandResult","UrlHelpers","ValidationResult","ValidationResultSeverity","joinPaths","JsonSerializer"],"mappings":"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"}
+{"version":3,"file":"Command.js","sources":["../../../commands/Command.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { ICommand, PropertyChanged } from './ICommand';\nimport { CommandResult } from \"./CommandResult\";\nimport { CommandValidator } from './CommandValidator';\nimport { Constructor, JsonSerializer } from '@cratis/fundamentals';\nimport { Globals } from '../Globals';\nimport { joinPaths } from '../joinPaths';\nimport { UrlHelpers } from '../UrlHelpers';\nimport { GetHttpHeaders } from '../GetHttpHeaders';\nimport { PropertyDescriptor } from '../reflection/PropertyDescriptor';\nimport { ValidationResult } from '../validation/ValidationResult';\nimport { ValidationResultSeverity } from '../validation/ValidationResultSeverity';\n\ntype Callback = {\n    callback: WeakRef<PropertyChanged>;\n    thisArg: WeakRef<object>;\n}\n\n/**\n * Represents an implementation of {@link ICommand} that works with HTTP fetch.\n */\nexport abstract class Command<TCommandContent = object, TCommandResponse = object> implements ICommand<TCommandContent, TCommandResponse> {\n    private _microservice: string;\n    private _apiBasePath: string;\n    private _origin: string;\n    private _httpHeadersCallback: GetHttpHeaders;\n    abstract readonly route: string;\n    /* eslint-disable @typescript-eslint/no-explicit-any */\n    readonly validation?: CommandValidator<any>;\n    /* eslint-enable @typescript-eslint/no-explicit-any */\n    abstract readonly propertyDescriptors: PropertyDescriptor[];\n    abstract get requestParameters(): string[];\n    abstract get properties(): string[];\n\n    private _initialValues: object = {};\n    private _hasChanges = false;\n    private _callbacks: Callback[] = [];\n\n    /**\n     * Initializes a new instance of the {@link Command<,>} class.\n     * @param _responseType Type of response.\n     * @param _isResponseTypeEnumerable Whether or not the response type is enumerable.\n     */\n    constructor(readonly _responseType: Constructor = Object, readonly _isResponseTypeEnumerable: boolean) {\n        this._microservice = Globals.microservice ?? '';\n        this._apiBasePath = Globals.apiBasePath ?? '';\n        this._origin = Globals.origin ?? '';\n        this._httpHeadersCallback = () => ({});\n    }\n\n    /** @inheritdoc */\n    setMicroservice(microservice: string) {\n        this._microservice = microservice;\n    }\n\n    /** @inheritdoc */\n    setApiBasePath(apiBasePath: string): void {\n        this._apiBasePath = apiBasePath;\n    }\n\n    /** @inheritdoc */\n    setOrigin(origin: string): void {\n        this._origin = origin;\n    }\n\n    /** @inheritdoc */\n    setHttpHeadersCallback(callback: GetHttpHeaders): void {\n        this._httpHeadersCallback = callback;\n    }\n\n    /** @inheritdoc */\n    async execute(): Promise<CommandResult<TCommandResponse>> {\n        const clientValidationErrors = this.validation?.validate(this) || [];\n        if (clientValidationErrors.length > 0) {\n            return CommandResult.validationFailed(clientValidationErrors) as CommandResult<TCommandResponse>;\n        }\n\n        const validationErrors = this.validateRequiredProperties();\n        if (validationErrors.length > 0) {\n            return CommandResult.validationFailed(validationErrors) as CommandResult<TCommandResponse>;\n        }\n\n        let actualRoute = this.route;\n\n        if (this.requestParameters && this.requestParameters.length > 0) {\n            const payload = this.buildPayload();\n            const { route } = UrlHelpers.replaceRouteParameters(this.route, payload);\n            actualRoute = route;\n        }\n\n        const result = await this.performRequest(actualRoute, 'Command not found at route', 'Error during server call');\n        this.setInitialValuesFromCurrentValues();\n        return result;\n    }\n\n    /** @inheritdoc */\n    async validate(): Promise<CommandResult<TCommandResponse>> {\n        const clientValidationErrors = this.validation?.validate(this) || [];\n        if (clientValidationErrors.length > 0) {\n            return CommandResult.validationFailed(clientValidationErrors) as CommandResult<TCommandResponse>;\n        }\n\n        const validationErrors = this.validateRequiredProperties();\n        if (validationErrors.length > 0) {\n            return CommandResult.validationFailed(validationErrors) as CommandResult<TCommandResponse>;\n        }\n\n        const actualRoute = `${this.route}/validate`;\n        return this.performRequest(actualRoute, 'Command validation endpoint not found at route', 'Error during validation call');\n    }\n\n    private buildPayload(): object {\n        const payload = {};\n        this.properties.forEach(property => {\n            payload[property] = this[property];\n        });\n        return payload;\n    }\n\n    private validateRequiredProperties(): ValidationResult[] {\n        const validationErrors: ValidationResult[] = [];\n        this.properties.forEach(property => {\n            const value = this[property];\n            if (value === undefined || value === null || value === '') {\n                validationErrors.push(new ValidationResult(\n                    ValidationResultSeverity.Error,\n                    `${property} is required`,\n                    [property],\n                    null\n                ));\n            }\n        });\n        return validationErrors;\n    }\n\n    private buildHeaders(): HeadersInit {\n        const customHeaders = this._httpHeadersCallback?.() ?? {};\n        const headers = {\n            ...customHeaders,\n            'Accept': 'application/json',\n            'Content-Type': 'application/json'\n        };\n\n        if (this._microservice?.length > 0) {\n            headers[Globals.microserviceHttpHeader] = this._microservice;\n        }\n\n        return headers;\n    }\n\n    private async performRequest(\n        route: string,\n        notFoundMessage: string,\n        errorMessage: string\n    ): Promise<CommandResult<TCommandResponse>> {\n        const payload = this.buildPayload();\n        const headers = this.buildHeaders();\n        const actualRoute = joinPaths(this._apiBasePath, route);\n        const url = UrlHelpers.createUrlFrom(this._origin, this._apiBasePath, actualRoute);\n\n        try {\n            const response = await fetch(url, {\n                method: 'POST',\n                headers,\n                body: JsonSerializer.serialize(payload)\n            });\n\n            if (response.status === 404) {\n                return CommandResult.failed([`${notFoundMessage} '${actualRoute}'`]) as CommandResult<TCommandResponse>;\n            }\n\n            const result = await response.json();\n            return new CommandResult(result, this._responseType, this._isResponseTypeEnumerable);\n        } catch (ex) {\n            return CommandResult.failed([`${errorMessage}: ${ex}`]) as CommandResult<TCommandResponse>;\n        }\n    }\n\n    /** @inheritdoc */\n    clear(): void {\n        this.properties.forEach(property => {\n            this[property] = undefined;\n        });\n        this._initialValues = {};\n        this._hasChanges = false;\n    }\n\n    /** @inheritdoc */\n    setInitialValues(values: TCommandContent) {\n        this.properties.forEach(property => {\n            if (Object.prototype.hasOwnProperty.call(values, property)) {\n                this._initialValues[property] = values[property];\n                this[property] = values[property];\n            }\n        });\n        this.updateHasChanges();\n    }\n\n    /** @inheritdoc */\n    setInitialValuesFromCurrentValues() {\n        this.properties.forEach(property => {\n            if (this[property]) {\n                this._initialValues[property] = this[property];\n            }\n        });\n        this.updateHasChanges();\n    }\n\n    /** @inheritdoc */\n    revertChanges(): void {\n        this.properties.forEach(property => {\n            this[property] = this._initialValues[property];\n        });\n    }\n\n    /** @inheritdoc */\n    get hasChanges() {\n        return this._hasChanges;\n    }\n\n    /** @inheritdoc */\n    propertyChanged(property: string) {\n        this.updateHasChanges();\n\n        this._callbacks.forEach(callbackContainer => {\n            const callback = callbackContainer.callback.deref();\n            const thisArg = callbackContainer.thisArg.deref();\n            if (callback && thisArg) {\n                callback.call(thisArg, property);\n            } else {\n                this._callbacks = this._callbacks.filter(_ => _.callback !== callbackContainer.callback);\n            }\n        });\n    }\n\n    /** @inheritdoc */\n    onPropertyChanged(callback: PropertyChanged, thisArg: object) {\n        this._callbacks.push({\n            callback: new WeakRef(callback),\n            thisArg: new WeakRef(thisArg)\n        });\n    }\n\n    private updateHasChanges() {\n        this._hasChanges = this.properties.some(property => this[property] !== this._initialValues[property]);\n    }\n}\n"],"names":["Globals","CommandResult","UrlHelpers","ValidationResult","ValidationResultSeverity","joinPaths","JsonSerializer"],"mappings":"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"}

package/dist/cjs/commands/CommandValidator.d.ts

@@ -1,9 +1,6 @@
 import { Validator } from '../validation/Validator';
-export type CommandPropertyValidators = {
-    [key: string]: Validator;
-};
-export declare abstract class CommandValidator {
-    abstract readonly properties: CommandPropertyValidators;
-    get isValid(): boolean;
+import { ValidationResult } from '../validation/ValidationResult';
+export declare abstract class CommandValidator<T = object> extends Validator<T> {
+    validate(command: T): ValidationResult[];
 }
 //# sourceMappingURL=CommandValidator.d.ts.map

package/dist/cjs/commands/CommandValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandValidator.d.ts","sourceRoot":"","sources":["../../../commands/CommandValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,MAAM,MAAM,yBAAyB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CAAE,CAAC;AAKtE,8BAAsB,gBAAgB;IAClC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,yBAAyB,CAAC;IAExD,IAAI,OAAO,YAEV;CACJ"}
+{"version":3,"file":"CommandValidator.d.ts","sourceRoot":"","sources":["../../../commands/CommandValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAKlE,8BAAsB,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IAMnE,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,gBAAgB,EAAE;CAG3C"}