@cratis/arc 18.7.9 → 18.7.11

package/dist/esm/validation/RuleBuilderExtensions.d.ts

@@ -5,6 +5,8 @@ export declare function minLength<T>(this: RuleBuilder<T, string>, length: numbe
 export declare function maxLength<T>(this: RuleBuilder<T, string>, length: number): RuleBuilder<T, string>;
 export declare function length<T>(this: RuleBuilder<T, string>, min: number, max: number): RuleBuilder<T, string>;
 export declare function emailAddress<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string>;
+export declare function phone<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string>;
+export declare function url<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string>;
 export declare function matches<T>(this: RuleBuilder<T, string>, pattern: RegExp, errorMessage?: string): RuleBuilder<T, string>;
 export declare function greaterThan<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number>;
 export declare function greaterThanOrEqual<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number>;
@@ -18,6 +20,8 @@ declare module './RuleBuilder' {
         maxLength(length: number): RuleBuilder<T, TProperty>;
         length(min: number, max: number): RuleBuilder<T, TProperty>;
         emailAddress(): RuleBuilder<T, TProperty>;
+        phone(): RuleBuilder<T, TProperty>;
+        url(): RuleBuilder<T, TProperty>;
         matches(pattern: RegExp, errorMessage?: string): RuleBuilder<T, TProperty>;
         greaterThan(threshold: number): RuleBuilder<T, TProperty>;
         greaterThanOrEqual(threshold: number): RuleBuilder<T, TProperty>;

package/dist/esm/validation/RuleBuilderExtensions.d.ts.map

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

package/dist/esm/validation/RuleBuilderExtensions.js

@@ -2,6 +2,8 @@ import { RuleBuilder } from './RuleBuilder.js';
 import { NotEmptyRule, NotNullRule } from './rules/NotEmptyRule.js';
 import { MinLengthRule, MaxLengthRule, LengthRule } from './rules/LengthRules.js';
 import { EmailRule } from './rules/EmailRule.js';
+import { PhoneRule } from './rules/PhoneRule.js';
+import { UrlRule } from './rules/UrlRule.js';
 import { RegexRule } from './rules/RegexRule.js';
 import { GreaterThanRule, GreaterThanOrEqualRule, LessThanRule, LessThanOrEqualRule } from './rules/ComparisonRules.js';
 
@@ -29,6 +31,14 @@ function emailAddress() {
     const propertyAccessor = this._propertyAccessor;
     return this.addRule(new EmailRule(propertyAccessor));
 }
+function phone() {
+    const propertyAccessor = this._propertyAccessor;
+    return this.addRule(new PhoneRule(propertyAccessor));
+}
+function url() {
+    const propertyAccessor = this._propertyAccessor;
+    return this.addRule(new UrlRule(propertyAccessor));
+}
 function matches(pattern, errorMessage) {
     const propertyAccessor = this._propertyAccessor;
     return this.addRule(new RegexRule(propertyAccessor, pattern, errorMessage));
@@ -55,11 +65,13 @@ RuleBuilder.prototype.minLength = minLength;
 RuleBuilder.prototype.maxLength = maxLength;
 RuleBuilder.prototype.length = length;
 RuleBuilder.prototype.emailAddress = emailAddress;
+RuleBuilder.prototype.phone = phone;
+RuleBuilder.prototype.url = url;
 RuleBuilder.prototype.matches = matches;
 RuleBuilder.prototype.greaterThan = greaterThan;
 RuleBuilder.prototype.greaterThanOrEqual = greaterThanOrEqual;
 RuleBuilder.prototype.lessThan = lessThan;
 RuleBuilder.prototype.lessThanOrEqual = lessThanOrEqual;
 
-export { emailAddress, greaterThan, greaterThanOrEqual, length, lessThan, lessThanOrEqual, matches, maxLength, minLength, notEmpty, notNull };
+export { emailAddress, greaterThan, greaterThanOrEqual, length, lessThan, lessThanOrEqual, matches, maxLength, minLength, notEmpty, notNull, phone, url };
 //# sourceMappingURL=RuleBuilderExtensions.js.map

package/dist/esm/validation/RuleBuilderExtensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"RuleBuilderExtensions.js","sources":["../../../validation/RuleBuilderExtensions.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 { RuleBuilder } from './RuleBuilder';\nimport { NotEmptyRule, NotNullRule } from './rules/NotEmptyRule';\nimport { MinLengthRule, MaxLengthRule, LengthRule } from './rules/LengthRules';\nimport { EmailRule } from './rules/EmailRule';\nimport { RegexRule } from './rules/RegexRule';\nimport { GreaterThanRule, GreaterThanOrEqualRule, LessThanRule, LessThanOrEqualRule } from './rules/ComparisonRules';\n\n/**\n * Extension methods for {@link RuleBuilder} to add validation rules in a fluent manner.\n */\n\n/**\n * Add a rule that the property must not be empty (not null, undefined, empty string, or empty array).\n * @template T The type being validated.\n * @template TProperty The type of the property.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function notEmpty<T, TProperty>(this: RuleBuilder<T, TProperty>): RuleBuilder<T, TProperty> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => TProperty })._propertyAccessor;\n    return this.addRule(new NotEmptyRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the property must not be null or undefined.\n * @template T The type being validated.\n * @template TProperty The type of the property.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function notNull<T, TProperty>(this: RuleBuilder<T, TProperty>): RuleBuilder<T, TProperty> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => TProperty })._propertyAccessor;\n    return this.addRule(new NotNullRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the string property must have at least the specified length.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param length The minimum length.\n * @returns The rule builder for chaining.\n */\nexport function minLength<T>(this: RuleBuilder<T, string>, length: number): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new MinLengthRule<T>(propertyAccessor, length));\n}\n\n/**\n * Add a rule that the string property must have at most the specified length.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param length The maximum length.\n * @returns The rule builder for chaining.\n */\nexport function maxLength<T>(this: RuleBuilder<T, string>, length: number): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new MaxLengthRule<T>(propertyAccessor, length));\n}\n\n/**\n * Add a rule that the string property must have a length between min and max.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param min The minimum length.\n * @param max The maximum length.\n * @returns The rule builder for chaining.\n */\nexport function length<T>(this: RuleBuilder<T, string>, min: number, max: number): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new LengthRule<T>(propertyAccessor, min, max));\n}\n\n/**\n * Add a rule that the string property must be a valid email address.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function emailAddress<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new EmailRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the string property must match the specified regular expression.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param pattern The regular expression pattern.\n * @param errorMessage Optional error message.\n * @returns The rule builder for chaining.\n */\nexport function matches<T>(this: RuleBuilder<T, string>, pattern: RegExp, errorMessage?: string): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new RegexRule<T>(propertyAccessor, pattern, errorMessage));\n}\n\n/**\n * Add a rule that the number property must be greater than the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function greaterThan<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new GreaterThanRule<T>(propertyAccessor, threshold));\n}\n\n/**\n * Add a rule that the number property must be greater than or equal to the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function greaterThanOrEqual<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new GreaterThanOrEqualRule<T>(propertyAccessor, threshold));\n}\n\n/**\n * Add a rule that the number property must be less than the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function lessThan<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new LessThanRule<T>(propertyAccessor, threshold));\n}\n\n/**\n * Add a rule that the number property must be less than or equal to the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function lessThanOrEqual<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new LessThanOrEqualRule<T>(propertyAccessor, threshold));\n}\n\n// Add the extension methods to the RuleBuilder prototype\nRuleBuilder.prototype.notEmpty = notEmpty;\nRuleBuilder.prototype.notNull = notNull;\n(RuleBuilder.prototype as unknown as { minLength: typeof minLength }).minLength = minLength;\n(RuleBuilder.prototype as unknown as { maxLength: typeof maxLength }).maxLength = maxLength;\n(RuleBuilder.prototype as unknown as { length: typeof length }).length = length;\n(RuleBuilder.prototype as unknown as { emailAddress: typeof emailAddress }).emailAddress = emailAddress;\n(RuleBuilder.prototype as unknown as { matches: typeof matches }).matches = matches;\n(RuleBuilder.prototype as unknown as { greaterThan: typeof greaterThan }).greaterThan = greaterThan;\n(RuleBuilder.prototype as unknown as { greaterThanOrEqual: typeof greaterThanOrEqual }).greaterThanOrEqual = greaterThanOrEqual;\n(RuleBuilder.prototype as unknown as { lessThan: typeof lessThan }).lessThan = lessThan;\n(RuleBuilder.prototype as unknown as { lessThanOrEqual: typeof lessThanOrEqual }).lessThanOrEqual = lessThanOrEqual;\n\n// Extend the RuleBuilder interface to include these methods\ndeclare module './RuleBuilder' {\n    interface RuleBuilder<T, TProperty> {\n        notEmpty(): RuleBuilder<T, TProperty>;\n        notNull(): RuleBuilder<T, TProperty>;\n        minLength(length: number): RuleBuilder<T, TProperty>;\n        maxLength(length: number): RuleBuilder<T, TProperty>;\n        length(min: number, max: number): RuleBuilder<T, TProperty>;\n        emailAddress(): RuleBuilder<T, TProperty>;\n        matches(pattern: RegExp, errorMessage?: string): RuleBuilder<T, TProperty>;\n        greaterThan(threshold: number): RuleBuilder<T, TProperty>;\n        greaterThanOrEqual(threshold: number): RuleBuilder<T, TProperty>;\n        lessThan(threshold: number): RuleBuilder<T, TProperty>;\n        lessThanOrEqual(threshold: number): RuleBuilder<T, TProperty>;\n    }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"RuleBuilderExtensions.js","sources":["../../../validation/RuleBuilderExtensions.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 { RuleBuilder } from './RuleBuilder';\nimport { NotEmptyRule, NotNullRule } from './rules/NotEmptyRule';\nimport { MinLengthRule, MaxLengthRule, LengthRule } from './rules/LengthRules';\nimport { EmailRule } from './rules/EmailRule';\nimport { PhoneRule } from './rules/PhoneRule';\nimport { UrlRule } from './rules/UrlRule';\nimport { RegexRule } from './rules/RegexRule';\nimport { GreaterThanRule, GreaterThanOrEqualRule, LessThanRule, LessThanOrEqualRule } from './rules/ComparisonRules';\n\n/**\n * Extension methods for {@link RuleBuilder} to add validation rules in a fluent manner.\n */\n\n/**\n * Add a rule that the property must not be empty (not null, undefined, empty string, or empty array).\n * @template T The type being validated.\n * @template TProperty The type of the property.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function notEmpty<T, TProperty>(this: RuleBuilder<T, TProperty>): RuleBuilder<T, TProperty> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => TProperty })._propertyAccessor;\n    return this.addRule(new NotEmptyRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the property must not be null or undefined.\n * @template T The type being validated.\n * @template TProperty The type of the property.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function notNull<T, TProperty>(this: RuleBuilder<T, TProperty>): RuleBuilder<T, TProperty> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => TProperty })._propertyAccessor;\n    return this.addRule(new NotNullRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the string property must have at least the specified length.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param length The minimum length.\n * @returns The rule builder for chaining.\n */\nexport function minLength<T>(this: RuleBuilder<T, string>, length: number): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new MinLengthRule<T>(propertyAccessor, length));\n}\n\n/**\n * Add a rule that the string property must have at most the specified length.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param length The maximum length.\n * @returns The rule builder for chaining.\n */\nexport function maxLength<T>(this: RuleBuilder<T, string>, length: number): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new MaxLengthRule<T>(propertyAccessor, length));\n}\n\n/**\n * Add a rule that the string property must have a length between min and max.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param min The minimum length.\n * @param max The maximum length.\n * @returns The rule builder for chaining.\n */\nexport function length<T>(this: RuleBuilder<T, string>, min: number, max: number): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new LengthRule<T>(propertyAccessor, min, max));\n}\n\n/**\n * Add a rule that the string property must be a valid email address.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function emailAddress<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new EmailRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the string property must be a valid phone number.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function phone<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new PhoneRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the string property must be a valid URL.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @returns The rule builder for chaining.\n */\nexport function url<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new UrlRule<T>(propertyAccessor));\n}\n\n/**\n * Add a rule that the string property must match the specified regular expression.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param pattern The regular expression pattern.\n * @param errorMessage Optional error message.\n * @returns The rule builder for chaining.\n */\nexport function matches<T>(this: RuleBuilder<T, string>, pattern: RegExp, errorMessage?: string): RuleBuilder<T, string> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;\n    return this.addRule(new RegexRule<T>(propertyAccessor, pattern, errorMessage));\n}\n\n/**\n * Add a rule that the number property must be greater than the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function greaterThan<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new GreaterThanRule<T>(propertyAccessor, threshold));\n}\n\n/**\n * Add a rule that the number property must be greater than or equal to the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function greaterThanOrEqual<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new GreaterThanOrEqualRule<T>(propertyAccessor, threshold));\n}\n\n/**\n * Add a rule that the number property must be less than the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function lessThan<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new LessThanRule<T>(propertyAccessor, threshold));\n}\n\n/**\n * Add a rule that the number property must be less than or equal to the specified value.\n * @template T The type being validated.\n * @param this The rule builder instance.\n * @param threshold The value to compare against.\n * @returns The rule builder for chaining.\n */\nexport function lessThanOrEqual<T>(this: RuleBuilder<T, number>, threshold: number): RuleBuilder<T, number> {\n    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => number })._propertyAccessor;\n    return this.addRule(new LessThanOrEqualRule<T>(propertyAccessor, threshold));\n}\n\n// Add the extension methods to the RuleBuilder prototype\nRuleBuilder.prototype.notEmpty = notEmpty;\nRuleBuilder.prototype.notNull = notNull;\n(RuleBuilder.prototype as unknown as { minLength: typeof minLength }).minLength = minLength;\n(RuleBuilder.prototype as unknown as { maxLength: typeof maxLength }).maxLength = maxLength;\n(RuleBuilder.prototype as unknown as { length: typeof length }).length = length;\n(RuleBuilder.prototype as unknown as { emailAddress: typeof emailAddress }).emailAddress = emailAddress;\n(RuleBuilder.prototype as unknown as { phone: typeof phone }).phone = phone;\n(RuleBuilder.prototype as unknown as { url: typeof url }).url = url;\n(RuleBuilder.prototype as unknown as { matches: typeof matches }).matches = matches;\n(RuleBuilder.prototype as unknown as { greaterThan: typeof greaterThan }).greaterThan = greaterThan;\n(RuleBuilder.prototype as unknown as { greaterThanOrEqual: typeof greaterThanOrEqual }).greaterThanOrEqual = greaterThanOrEqual;\n(RuleBuilder.prototype as unknown as { lessThan: typeof lessThan }).lessThan = lessThan;\n(RuleBuilder.prototype as unknown as { lessThanOrEqual: typeof lessThanOrEqual }).lessThanOrEqual = lessThanOrEqual;\n\n// Extend the RuleBuilder interface to include these methods\ndeclare module './RuleBuilder' {\n    interface RuleBuilder<T, TProperty> {\n        notEmpty(): RuleBuilder<T, TProperty>;\n        notNull(): RuleBuilder<T, TProperty>;\n        minLength(length: number): RuleBuilder<T, TProperty>;\n        maxLength(length: number): RuleBuilder<T, TProperty>;\n        length(min: number, max: number): RuleBuilder<T, TProperty>;\n        emailAddress(): RuleBuilder<T, TProperty>;\n        phone(): RuleBuilder<T, TProperty>;\n        url(): RuleBuilder<T, TProperty>;\n        matches(pattern: RegExp, errorMessage?: string): RuleBuilder<T, TProperty>;\n        greaterThan(threshold: number): RuleBuilder<T, TProperty>;\n        greaterThanOrEqual(threshold: number): RuleBuilder<T, TProperty>;\n        lessThan(threshold: number): RuleBuilder<T, TProperty>;\n        lessThanOrEqual(threshold: number): RuleBuilder<T, TProperty>;\n    }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/validation/index.js

@@ -4,7 +4,7 @@ export { ValidationResultSeverity } from './ValidationResultSeverity.js';
 export { PropertyValidator } from './PropertyValidator.js';
 export { PropertyRule } from './PropertyRule.js';
 export { RuleBuilder } from './RuleBuilder.js';
-export { emailAddress, greaterThan, greaterThanOrEqual, length, lessThan, lessThanOrEqual, matches, maxLength, minLength, notEmpty, notNull } from './RuleBuilderExtensions.js';
+export { emailAddress, greaterThan, greaterThanOrEqual, length, lessThan, lessThanOrEqual, matches, maxLength, minLength, notEmpty, notNull, phone, url } from './RuleBuilderExtensions.js';
 export { NotEmptyRule, NotNullRule } from './rules/NotEmptyRule.js';
 export { LengthRule, MaxLengthRule, MinLengthRule } from './rules/LengthRules.js';
 export { EmailRule } from './rules/EmailRule.js';

package/dist/esm/validation/rules/PhoneRule.d.ts

@@ -0,0 +1,7 @@
+import { PropertyRule } from '../PropertyRule';
+export declare class PhoneRule<T> extends PropertyRule<T, string> {
+    private static readonly phoneRegex;
+    constructor(propertyAccessor: (instance: T) => string);
+    protected isValid(value: string): boolean;
+}
+//# sourceMappingURL=PhoneRule.d.ts.map

package/dist/esm/validation/rules/PhoneRule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PhoneRule.d.ts","sourceRoot":"","sources":["../../../../validation/rules/PhoneRule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,qBAAa,SAAS,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAmB;gBAMzC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,MAAM;IAKrD,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAM5C"}

package/dist/esm/validation/rules/PhoneRule.js

@@ -0,0 +1,17 @@
+import { PropertyRule } from '../PropertyRule.js';
+
+class PhoneRule extends PropertyRule {
+    static phoneRegex = /^[\d\s()+-]+$/;
+    constructor(propertyAccessor) {
+        super(propertyAccessor, "'{PropertyName}' is not a valid phone number.");
+    }
+    isValid(value) {
+        if (value === null || value === undefined || value === '') {
+            return true;
+        }
+        return PhoneRule.phoneRegex.test(value);
+    }
+}
+
+export { PhoneRule };
+//# sourceMappingURL=PhoneRule.js.map

package/dist/esm/validation/rules/PhoneRule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PhoneRule.js","sources":["../../../../validation/rules/PhoneRule.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 { PropertyRule } from '../PropertyRule';\n\n/**\n * Validation rule that checks if a string matches a phone number pattern.\n * @template T The type being validated.\n */\nexport class PhoneRule<T> extends PropertyRule<T, string> {\n    private static readonly phoneRegex = /^[\\d\\s()+-]+$/;\n\n    /**\n     * Initializes a new instance of the {@link PhoneRule} class.\n     * @param propertyAccessor Function to access the property value from the instance.\n     */\n    constructor(propertyAccessor: (instance: T) => string) {\n        super(propertyAccessor, \"'{PropertyName}' is not a valid phone number.\");\n    }\n\n    /** @inheritdoc */\n    protected isValid(value: string): boolean {\n        if (value === null || value === undefined || value === '') {\n            return true; // Use NotNull/NotEmpty for null checks\n        }\n        return PhoneRule.phoneRegex.test(value);\n    }\n}\n"],"names":[],"mappings":";;AASM,MAAO,SAAa,SAAQ,YAAuB,CAAA;AAC7C,IAAA,OAAgB,UAAU,GAAG,eAAe;AAMpD,IAAA,WAAA,CAAY,gBAAyC,EAAA;AACjD,QAAA,KAAK,CAAC,gBAAgB,EAAE,+CAA+C,CAAC;IAC5E;AAGU,IAAA,OAAO,CAAC,KAAa,EAAA;AAC3B,QAAA,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,EAAE;AACvD,YAAA,OAAO,IAAI;QACf;QACA,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;IAC3C;;;;;"}

package/dist/esm/validation/rules/UrlRule.d.ts

@@ -0,0 +1,7 @@
+import { PropertyRule } from '../PropertyRule';
+export declare class UrlRule<T> extends PropertyRule<T, string> {
+    private static readonly urlRegex;
+    constructor(propertyAccessor: (instance: T) => string);
+    protected isValid(value: string): boolean;
+}
+//# sourceMappingURL=UrlRule.d.ts.map

package/dist/esm/validation/rules/UrlRule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UrlRule.d.ts","sourceRoot":"","sources":["../../../../validation/rules/UrlRule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,qBAAa,OAAO,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAqB;gBAMzC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,MAAM;IAKrD,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAM5C"}

package/dist/esm/validation/rules/UrlRule.js

@@ -0,0 +1,17 @@
+import { PropertyRule } from '../PropertyRule.js';
+
+class UrlRule extends PropertyRule {
+    static urlRegex = /^https?:\/\/.+/i;
+    constructor(propertyAccessor) {
+        super(propertyAccessor, "'{PropertyName}' is not a valid URL.");
+    }
+    isValid(value) {
+        if (value === null || value === undefined || value === '') {
+            return true;
+        }
+        return UrlRule.urlRegex.test(value);
+    }
+}
+
+export { UrlRule };
+//# sourceMappingURL=UrlRule.js.map

package/dist/esm/validation/rules/UrlRule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UrlRule.js","sources":["../../../../validation/rules/UrlRule.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 { PropertyRule } from '../PropertyRule';\n\n/**\n * Validation rule that checks if a string is a valid URL.\n * @template T The type being validated.\n */\nexport class UrlRule<T> extends PropertyRule<T, string> {\n    private static readonly urlRegex = /^https?:\\/\\/.+/i;\n\n    /**\n     * Initializes a new instance of the {@link UrlRule} class.\n     * @param propertyAccessor Function to access the property value from the instance.\n     */\n    constructor(propertyAccessor: (instance: T) => string) {\n        super(propertyAccessor, \"'{PropertyName}' is not a valid URL.\");\n    }\n\n    /** @inheritdoc */\n    protected isValid(value: string): boolean {\n        if (value === null || value === undefined || value === '') {\n            return true; // Use NotNull/NotEmpty for null checks\n        }\n        return UrlRule.urlRegex.test(value);\n    }\n}\n"],"names":[],"mappings":";;AASM,MAAO,OAAW,SAAQ,YAAuB,CAAA;AAC3C,IAAA,OAAgB,QAAQ,GAAG,iBAAiB;AAMpD,IAAA,WAAA,CAAY,gBAAyC,EAAA;AACjD,QAAA,KAAK,CAAC,gBAAgB,EAAE,sCAAsC,CAAC;IACnE;AAGU,IAAA,OAAO,CAAC,KAAa,EAAA;AAC3B,QAAA,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,EAAE;AACvD,YAAA,OAAO,IAAI;QACf;QACA,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;IACvC;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cratis/arc",
-    "version": "18.7.9",
+    "version": "18.7.11",
     "description": "",
     "author": "Cratis",
     "license": "MIT",

package/queries/ObservableQueryFor.ts

@@ -177,7 +177,9 @@ export abstract class ObservableQueryFor<TDataType, TParameters = object> implem
     }
 
     private validateArguments(args?: TParameters): boolean {
-        return ValidateRequestArguments(this.constructor.name, this.requiredRequestParameters, args as object);
+        const parameterValues = ParametersHelper.collectParameterValues(this);
+        const combinedArgs = { ...(args as object || {}), ...parameterValues };
+        return ValidateRequestArguments(this.constructor.name, this.requiredRequestParameters, combinedArgs as object);
     }
 
     private buildRoute(args?: TParameters): string {

package/validation/RuleBuilderExtensions.ts

@@ -5,6 +5,8 @@ import { RuleBuilder } from './RuleBuilder';
 import { NotEmptyRule, NotNullRule } from './rules/NotEmptyRule';
 import { MinLengthRule, MaxLengthRule, LengthRule } from './rules/LengthRules';
 import { EmailRule } from './rules/EmailRule';
+import { PhoneRule } from './rules/PhoneRule';
+import { UrlRule } from './rules/UrlRule';
 import { RegexRule } from './rules/RegexRule';
 import { GreaterThanRule, GreaterThanOrEqualRule, LessThanRule, LessThanOrEqualRule } from './rules/ComparisonRules';
 
@@ -84,6 +86,28 @@ export function emailAddress<T>(this: RuleBuilder<T, string>): RuleBuilder<T, st
     return this.addRule(new EmailRule<T>(propertyAccessor));
 }
 
+/**
+ * Add a rule that the string property must be a valid phone number.
+ * @template T The type being validated.
+ * @param this The rule builder instance.
+ * @returns The rule builder for chaining.
+ */
+export function phone<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string> {
+    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;
+    return this.addRule(new PhoneRule<T>(propertyAccessor));
+}
+
+/**
+ * Add a rule that the string property must be a valid URL.
+ * @template T The type being validated.
+ * @param this The rule builder instance.
+ * @returns The rule builder for chaining.
+ */
+export function url<T>(this: RuleBuilder<T, string>): RuleBuilder<T, string> {
+    const propertyAccessor = (this as unknown as { _propertyAccessor: (instance: T) => string })._propertyAccessor;
+    return this.addRule(new UrlRule<T>(propertyAccessor));
+}
+
 /**
  * Add a rule that the string property must match the specified regular expression.
  * @template T The type being validated.
@@ -152,6 +176,8 @@ RuleBuilder.prototype.notNull = notNull;
 (RuleBuilder.prototype as unknown as { maxLength: typeof maxLength }).maxLength = maxLength;
 (RuleBuilder.prototype as unknown as { length: typeof length }).length = length;
 (RuleBuilder.prototype as unknown as { emailAddress: typeof emailAddress }).emailAddress = emailAddress;
+(RuleBuilder.prototype as unknown as { phone: typeof phone }).phone = phone;
+(RuleBuilder.prototype as unknown as { url: typeof url }).url = url;
 (RuleBuilder.prototype as unknown as { matches: typeof matches }).matches = matches;
 (RuleBuilder.prototype as unknown as { greaterThan: typeof greaterThan }).greaterThan = greaterThan;
 (RuleBuilder.prototype as unknown as { greaterThanOrEqual: typeof greaterThanOrEqual }).greaterThanOrEqual = greaterThanOrEqual;
@@ -167,6 +193,8 @@ declare module './RuleBuilder' {
         maxLength(length: number): RuleBuilder<T, TProperty>;
         length(min: number, max: number): RuleBuilder<T, TProperty>;
         emailAddress(): RuleBuilder<T, TProperty>;
+        phone(): RuleBuilder<T, TProperty>;
+        url(): RuleBuilder<T, TProperty>;
         matches(pattern: RegExp, errorMessage?: string): RuleBuilder<T, TProperty>;
         greaterThan(threshold: number): RuleBuilder<T, TProperty>;
         greaterThanOrEqual(threshold: number): RuleBuilder<T, TProperty>;

package/validation/rules/PhoneRule.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 { PropertyRule } from '../PropertyRule';
+
+/**
+ * Validation rule that checks if a string matches a phone number pattern.
+ * @template T The type being validated.
+ */
+export class PhoneRule<T> extends PropertyRule<T, string> {
+    private static readonly phoneRegex = /^[\d\s()+-]+$/;
+
+    /**
+     * Initializes a new instance of the {@link PhoneRule} class.
+     * @param propertyAccessor Function to access the property value from the instance.
+     */
+    constructor(propertyAccessor: (instance: T) => string) {
+        super(propertyAccessor, "'{PropertyName}' is not a valid phone number.");
+    }
+
+    /** @inheritdoc */
+    protected isValid(value: string): boolean {
+        if (value === null || value === undefined || value === '') {
+            return true; // Use NotNull/NotEmpty for null checks
+        }
+        return PhoneRule.phoneRegex.test(value);
+    }
+}

package/validation/rules/UrlRule.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 { PropertyRule } from '../PropertyRule';
+
+/**
+ * Validation rule that checks if a string is a valid URL.
+ * @template T The type being validated.
+ */
+export class UrlRule<T> extends PropertyRule<T, string> {
+    private static readonly urlRegex = /^https?:\/\/.+/i;
+
+    /**
+     * Initializes a new instance of the {@link UrlRule} class.
+     * @param propertyAccessor Function to access the property value from the instance.
+     */
+    constructor(propertyAccessor: (instance: T) => string) {
+        super(propertyAccessor, "'{PropertyName}' is not a valid URL.");
+    }
+
+    /** @inheritdoc */
+    protected isValid(value: string): boolean {
+        if (value === null || value === undefined || value === '') {
+            return true; // Use NotNull/NotEmpty for null checks
+        }
+        return UrlRule.urlRegex.test(value);
+    }
+}