npm - @dravishek/number-validate - Versions diffs - 1.1.0 → 1.2.0 - Mend

@dravishek/number-validate 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/fesm2022/dravishek-number-validate.mjs +32 -10
package/fesm2022/dravishek-number-validate.mjs.map +1 -1
package/lib/adr-number-validate.directive.d.ts +6 -2
package/package.json +1 -1

package/fesm2022/dravishek-number-validate.mjs CHANGED Viewed

@@ -1,12 +1,16 @@
+import * as i1 from '@angular/common';
+import { DecimalPipe } from '@angular/common';
 import * as i0 from '@angular/core';
 import { input, HostListener, Optional, Directive } from '@angular/core';
-import * as i1 from '@angular/forms';
+import * as i2 from '@angular/forms';
 class AdrNumberValidateDirective {
     el;
+    decimalPipe;
     control;
-    constructor(el, control) {
+    constructor(el, decimalPipe, control) {
         this.el = el;
+        this.decimalPipe = decimalPipe;
         this.control = control;
     }
     /**
@@ -18,6 +22,10 @@ class AdrNumberValidateDirective {
     previousValue = '';
     onKeyDown = (event) => this.execute(this.el.nativeElement.value);
     onPaste = (event) => this.execute(this.el.nativeElement.value);
+    onFocus() {
+        const input = this.el.nativeElement;
+        input.value = input.value.replace(/,/g, '');
+    }
     ngDoCheck() {
         const currentValue = this.el.nativeElement.value;
         if (currentValue !== this.previousValue) {
@@ -65,9 +73,7 @@ class AdrNumberValidateDirective {
             const sign = signMatch[1]; // "-" or "+"
             const digitCount = +signMatch[2];
             // Enforce mandatory sign if specified
-            let signRegex = '';
-            const signRegexMap = { '-': '\\-', '+': '\\+?' };
-            signRegex = signRegexMap[sign] ?? '[-+]?';
+            const signRegexMap = { '-': '\\-', '+': '\\+?' }, signRegex = signRegexMap[sign] ?? '[-+]?';
             return { regex: `${signRegex}\\d`, prefix: digitCount };
         }
         return { regex: '[-+]?\\d', prefix: 0 };
@@ -84,12 +90,13 @@ class AdrNumberValidateDirective {
      * If the input does not meet the required sign rules or is invalid, it reverts to the previous value.
      * Otherwise, it patches the control value with the parsed number or the current string value,
      * preserving intermediate states and empty input.
+     * It also formats the input value with thousand separators when appropriate.
      *
      * @param oldValue - The previous valid value of the input, used to revert in case of invalid input.
      */
     execute(oldValue) {
         setTimeout(() => {
-            const inputElement = this.el.nativeElement, currentValue = inputElement.value, pattern = this.adrNumberValidate(), requiresNegative = pattern.startsWith('-'), requiresPositive = pattern.startsWith('+');
+            const inputElement = this.el.nativeElement, currentValue = inputElement.value.replace(/,/g, ''), pattern = this.adrNumberValidate(), requiresNegative = pattern.startsWith('-'), requiresPositive = pattern.startsWith('+');
             // Enforce sign rules:
             // - If negative is required, must start with '-'
             // - If positive is required, must NOT start with '-' (but '+' is optional)
@@ -108,6 +115,17 @@ class AdrNumberValidateDirective {
                 this.previousValue = currentValue;
                 const endsWithDot = currentValue.endsWith('.'), patchValue = currentValue === '' ? '' : (!endsWithDot && !isNaN(+currentValue)) ? +currentValue : currentValue;
                 this.control?.control?.patchValue(patchValue);
+                // Format view only if it's a valid number and not intermediate
+                if (!isIntermediate && !isNaN(+currentValue)) {
+                    const [intPart, decimalPart] = currentValue.split('.');
+                    const formatted = this.decimalPipe.transform(intPart, '1.0-0');
+                    inputElement.value = decimalPart
+                        ? `${formatted}.${decimalPart}`
+                        : formatted ?? '';
+                }
+                else {
+                    inputElement.value = currentValue;
+                }
             }
             else {
                 inputElement.value = oldValue;
@@ -115,16 +133,17 @@ class AdrNumberValidateDirective {
             }
         });
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: AdrNumberValidateDirective, deps: [{ token: i0.ElementRef }, { token: i1.NgControl, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "19.2.14", type: AdrNumberValidateDirective, isStandalone: true, selector: "[adrNumberValidate]", inputs: { adrNumberValidate: { classPropertyName: "adrNumberValidate", publicName: "adrNumberValidate", isSignal: true, isRequired: false, transformFunction: null } }, host: { listeners: { "keydown": "onKeyDown($event)", "paste": "onPaste($event)" } }, ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: AdrNumberValidateDirective, deps: [{ token: i0.ElementRef }, { token: i1.DecimalPipe }, { token: i2.NgControl, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "19.2.14", type: AdrNumberValidateDirective, isStandalone: true, selector: "[adrNumberValidate]", inputs: { adrNumberValidate: { classPropertyName: "adrNumberValidate", publicName: "adrNumberValidate", isSignal: true, isRequired: false, transformFunction: null } }, host: { listeners: { "keydown": "onKeyDown($event)", "paste": "onPaste($event)", "focus": "onFocus()" } }, providers: [DecimalPipe], ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: AdrNumberValidateDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[adrNumberValidate]',
-                    standalone: true
+                    standalone: true,
+                    providers: [DecimalPipe]
                 }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i1.NgControl, decorators: [{
+        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i1.DecimalPipe }, { type: i2.NgControl, decorators: [{
                     type: Optional
                 }] }], propDecorators: { onKeyDown: [{
                 type: HostListener,
@@ -132,6 +151,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
             }], onPaste: [{
                 type: HostListener,
                 args: ["paste", ["$event"]]
+            }], onFocus: [{
+                type: HostListener,
+                args: ['focus']
             }] } });
 /*

package/fesm2022/dravishek-number-validate.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dravishek-number-validate.mjs","sources":["../../../../projects/dravishek/number-validate/src/lib/adr-number-validate.directive.ts","../../../../projects/dravishek/number-validate/src/public-api.ts","../../../../projects/dravishek/number-validate/src/dravishek-number-validate.ts"],"sourcesContent":["import { Directive, DoCheck, ElementRef, HostListener, input, Optional } from '@angular/core';\r\nimport { NgControl } from '@angular/forms';\r\n\r\n@Directive({\r\n selector: '[adrNumberValidate]',\r\n standalone: true\r\n})\r\nexport class AdrNumberValidateDirective implements DoCheck {\r\n\r\n constructor(private el: ElementRef, @Optional() private control: NgControl) { }\r\n\r\n /*\r\n @description Value before the decimal point specifies the number of digits before decimal and value after the decimal specifies the number of digits after decimal.\r\n * Example: 7.3 (Before decimal 7 digits & 3 digits after decimal)\r\n * Possible type of patterns allowed: X, X.X\r\n /\r\n adrNumberValidate = input<string>('');\r\n private previousValue: string = '';\r\n\r\n @HostListener(\"keydown\", [\"$event\"])\r\n onKeyDown = (event: KeyboardEvent) => this.execute(this.el.nativeElement.value);\r\n\r\n @HostListener(\"paste\", [\"$event\"])\r\n onPaste = (event: ClipboardEvent) => this.execute(this.el.nativeElement.value);\r\n\r\n ngDoCheck(): void {\r\n const currentValue = this.el.nativeElement.value;\r\n if (currentValue !== this.previousValue) {\r\n this.execute(this.previousValue);\r\n this.previousValue = currentValue;\r\n }\r\n }\r\n\r\n /\r\n Validates the input string against a dynamically constructed regular expression\r\n * based on the ADR number format specification.\r\n \r\n The format is determined by splitting the result of `adrNumberValidate()` into\r\n * a prefix and scale. The prefix is used to extract the allowed sign and digit length,\r\n * while the scale determines the number of digits allowed after the decimal point.\r\n \r\n @param value - The input string to validate.\r\n * @returns A `RegExpMatchArray` if the input matches the constructed regular expression,\r\n * or `null` if it does not match.\r\n /\r\n private checkValue(value: string): RegExpMatchArray \| null {\r\n const [prefix, scale] = this.adrNumberValidate().split('.'), { regex, prefix: maxDigitsBeforeDecimal } = this.extractSignWithLength(prefix);\r\n let regExpString = `^(${regex}{1,${maxDigitsBeforeDecimal}})`;\r\n if (+scale > 0) {\r\n regExpString += `(\\\\.{1}[\\\\d]{0,${+scale}})?`;\r\n }\r\n const fullRegex = new RegExp(`${regExpString}$`);\r\n return value.match(fullRegex);\r\n }\r\n\r\n /\r\n Extracts the sign and digit length from a given prefix string and generates a corresponding regex pattern.\r\n \r\n The prefix should be in the format of an optional sign ('-' or '+') followed by one or more digits (e.g., \"-3\", \"+2\", \"5\").\r\n * The function returns an object containing:\r\n * - `regex`: A string representing the regex pattern for the sign and digit.\r\n * - `prefix`: The number of digits specified in the prefix.\r\n \r\n If the prefix does not match the expected format, a default regex pattern and prefix value are returned.\r\n \r\n @param prefix - The string containing an optional sign and digit count.\r\n * @returns An object with `regex` (string) and `prefix` (number) properties.\r\n /\r\n private extractSignWithLength(prefix: string) {\r\n const signMatch = prefix.match(/^([-+]?)(\\d+)$/);\r\n if (signMatch) {\r\n const sign = signMatch[1]; // \"-\" or \"+\"\r\n const digitCount = +signMatch[2];\r\n // Enforce mandatory sign if specified\r\n let signRegex = '';\r\n const signRegexMap: { [key: string]: string } = { '-': '\\\\-', '+': '\\\\+?' };\r\n signRegex = signRegexMap[sign] ?? '[-+]?';\r\n return { regex: `${signRegex}\\\\d`, prefix: digitCount };\r\n }\r\n return { regex: '[-+]?\\\\d', prefix: 0 };\r\n }\r\n\r\n /\r\n Handles input validation and value patching for ADR number fields.\r\n \r\n This method enforces sign rules based on the validation pattern:\r\n * - If a negative sign is required, the value must start with '-'.\r\n * - If a positive sign is required, the value must not start with '-'.\r\n * - If no sign is required, any value is allowed.\r\n \r\n The method allows intermediate input states (e.g., \"-\", \"-.\", \"-12.\") to support user typing.\r\n * If the input does not meet the required sign rules or is invalid, it reverts to the previous value.\r\n * Otherwise, it patches the control value with the parsed number or the current string value,\r\n * preserving intermediate states and empty input.\r\n \r\n @param oldValue - The previous valid value of the input, used to revert in case of invalid input.\r\n /\r\n private execute(oldValue: string) {\r\n setTimeout(() => {\r\n const inputElement = this.el.nativeElement as HTMLInputElement, currentValue: string = inputElement.value,\r\n pattern = this.adrNumberValidate(), requiresNegative = pattern.startsWith('-'), requiresPositive = pattern.startsWith('+');\r\n // Enforce sign rules:\r\n // - If negative is required, must start with '-'\r\n // - If positive is required, must NOT start with '-' (but '+' is optional)\r\n const hasRequiredSign =\r\n (!requiresNegative && !requiresPositive) \|\|\r\n (requiresNegative && currentValue.startsWith('-')) \|\|\r\n (requiresPositive && !currentValue.startsWith('-'));\r\n // If the sign is missing and required, reject immediately\r\n if (!hasRequiredSign && currentValue !== '') {\r\n this.control?.control?.patchValue(0);\r\n inputElement.value = '';\r\n return;\r\n }\r\n // Allow intermediate states like \"-\", \"-.\", \"-12.\", etc.\r\n const isIntermediate = /^-?$\|^\\.$\|^-?\\.$\|^-?\\d+\\.$\|^\\d+\\.$/.test(currentValue), isValid = this.checkValue(currentValue);\r\n if (currentValue === '' \|\| isValid \|\| isIntermediate) {\r\n this.previousValue = currentValue;\r\n const endsWithDot = currentValue.endsWith('.'),\r\n patchValue = currentValue === '' ? '' : (!endsWithDot && !isNaN(+currentValue)) ? +currentValue : currentValue;\r\n this.control?.control?.patchValue(patchValue);\r\n } else {\r\n inputElement.value = oldValue;\r\n this.control?.control?.patchValue(isNaN(+oldValue) ? oldValue : +oldValue);\r\n }\r\n });\r\n }\r\n}\r\n","/\r\n * Public API Surface of number-validate\r\n /\r\n\r\nexport from './lib/adr-number-validate.directive';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"dravishek-number-validate.mjs","sources":["../../../../projects/dravishek/number-validate/src/lib/adr-number-validate.directive.ts","../../../../projects/dravishek/number-validate/src/public-api.ts","../../../../projects/dravishek/number-validate/src/dravishek-number-validate.ts"],"sourcesContent":["import { DecimalPipe } from '@angular/common';\r\nimport { Directive, DoCheck, ElementRef, HostListener, input, Optional } from '@angular/core';\r\nimport { NgControl } from '@angular/forms';\r\n\r\n@Directive({\r\n selector: '[adrNumberValidate]',\r\n standalone: true,\r\n providers: [DecimalPipe]\r\n})\r\nexport class AdrNumberValidateDirective implements DoCheck {\r\n\r\n constructor(private el: ElementRef, private decimalPipe: DecimalPipe, @Optional() private control: NgControl) { }\r\n\r\n /*\r\n @description Value before the decimal point specifies the number of digits before decimal and value after the decimal specifies the number of digits after decimal.\r\n * Example: 7.3 (Before decimal 7 digits & 3 digits after decimal)\r\n * Possible type of patterns allowed: X, X.X\r\n /\r\n adrNumberValidate = input<string>('');\r\n private previousValue: string = '';\r\n\r\n @HostListener(\"keydown\", [\"$event\"])\r\n onKeyDown = (event: KeyboardEvent) => this.execute(this.el.nativeElement.value);\r\n\r\n @HostListener(\"paste\", [\"$event\"])\r\n onPaste = (event: ClipboardEvent) => this.execute(this.el.nativeElement.value);\r\n\r\n @HostListener('focus')\r\n onFocus() {\r\n const input = this.el.nativeElement as HTMLInputElement;\r\n input.value = input.value.replace(/,/g, '');\r\n }\r\n\r\n ngDoCheck(): void {\r\n const currentValue = this.el.nativeElement.value;\r\n if (currentValue !== this.previousValue) {\r\n this.execute(this.previousValue);\r\n this.previousValue = currentValue;\r\n }\r\n }\r\n\r\n /\r\n Validates the input string against a dynamically constructed regular expression\r\n * based on the ADR number format specification.\r\n \r\n The format is determined by splitting the result of `adrNumberValidate()` into\r\n * a prefix and scale. The prefix is used to extract the allowed sign and digit length,\r\n * while the scale determines the number of digits allowed after the decimal point.\r\n \r\n @param value - The input string to validate.\r\n * @returns A `RegExpMatchArray` if the input matches the constructed regular expression,\r\n * or `null` if it does not match.\r\n /\r\n private checkValue(value: string): RegExpMatchArray \| null {\r\n const [prefix, scale] = this.adrNumberValidate().split('.'), { regex, prefix: maxDigitsBeforeDecimal } = this.extractSignWithLength(prefix);\r\n let regExpString = `^(${regex}{1,${maxDigitsBeforeDecimal}})`;\r\n if (+scale > 0) {\r\n regExpString += `(\\\\.{1}[\\\\d]{0,${+scale}})?`;\r\n }\r\n const fullRegex = new RegExp(`${regExpString}$`);\r\n return value.match(fullRegex);\r\n }\r\n\r\n /\r\n Extracts the sign and digit length from a given prefix string and generates a corresponding regex pattern.\r\n \r\n The prefix should be in the format of an optional sign ('-' or '+') followed by one or more digits (e.g., \"-3\", \"+2\", \"5\").\r\n * The function returns an object containing:\r\n * - `regex`: A string representing the regex pattern for the sign and digit.\r\n * - `prefix`: The number of digits specified in the prefix.\r\n \r\n If the prefix does not match the expected format, a default regex pattern and prefix value are returned.\r\n \r\n @param prefix - The string containing an optional sign and digit count.\r\n * @returns An object with `regex` (string) and `prefix` (number) properties.\r\n /\r\n private extractSignWithLength(prefix: string) {\r\n const signMatch = prefix.match(/^([-+]?)(\\d+)$/);\r\n if (signMatch) {\r\n const sign = signMatch[1]; // \"-\" or \"+\"\r\n const digitCount = +signMatch[2];\r\n // Enforce mandatory sign if specified\r\n const signRegexMap: { [key: string]: string } = { '-': '\\\\-', '+': '\\\\+?' },\r\n signRegex = signRegexMap[sign] ?? '[-+]?';\r\n return { regex: `${signRegex}\\\\d`, prefix: digitCount };\r\n }\r\n return { regex: '[-+]?\\\\d', prefix: 0 };\r\n }\r\n\r\n /\r\n Handles input validation and value patching for ADR number fields.\r\n \r\n This method enforces sign rules based on the validation pattern:\r\n * - If a negative sign is required, the value must start with '-'.\r\n * - If a positive sign is required, the value must not start with '-'.\r\n * - If no sign is required, any value is allowed.\r\n \r\n The method allows intermediate input states (e.g., \"-\", \"-.\", \"-12.\") to support user typing.\r\n * If the input does not meet the required sign rules or is invalid, it reverts to the previous value.\r\n * Otherwise, it patches the control value with the parsed number or the current string value,\r\n * preserving intermediate states and empty input.\r\n * It also formats the input value with thousand separators when appropriate.\r\n \r\n @param oldValue - The previous valid value of the input, used to revert in case of invalid input.\r\n /\r\n private execute(oldValue: string) {\r\n setTimeout(() => {\r\n const inputElement = this.el.nativeElement as HTMLInputElement, currentValue: string = inputElement.value.replace(/,/g, ''),\r\n pattern = this.adrNumberValidate(), requiresNegative = pattern.startsWith('-'), requiresPositive = pattern.startsWith('+');\r\n // Enforce sign rules:\r\n // - If negative is required, must start with '-'\r\n // - If positive is required, must NOT start with '-' (but '+' is optional)\r\n const hasRequiredSign =\r\n (!requiresNegative && !requiresPositive) \|\|\r\n (requiresNegative && currentValue.startsWith('-')) \|\|\r\n (requiresPositive && !currentValue.startsWith('-'));\r\n // If the sign is missing and required, reject immediately\r\n if (!hasRequiredSign && currentValue !== '') {\r\n this.control?.control?.patchValue(0);\r\n inputElement.value = '';\r\n return;\r\n }\r\n // Allow intermediate states like \"-\", \"-.\", \"-12.\", etc.\r\n const isIntermediate = /^-?$\|^\\.$\|^-?\\.$\|^-?\\d+\\.$\|^\\d+\\.$/.test(currentValue), isValid = this.checkValue(currentValue);\r\n if (currentValue === '' \|\| isValid \|\| isIntermediate) {\r\n this.previousValue = currentValue;\r\n const endsWithDot = currentValue.endsWith('.'),\r\n patchValue = currentValue === '' ? '' : (!endsWithDot && !isNaN(+currentValue)) ? +currentValue : currentValue;\r\n this.control?.control?.patchValue(patchValue);\r\n // Format view only if it's a valid number and not intermediate\r\n if (!isIntermediate && !isNaN(+currentValue)) {\r\n const [intPart, decimalPart] = currentValue.split('.');\r\n const formatted = this.decimalPipe.transform(intPart, '1.0-0');\r\n inputElement.value = decimalPart\r\n ? `${formatted}.${decimalPart}`\r\n : formatted ?? '';\r\n } else {\r\n inputElement.value = currentValue;\r\n }\r\n } else {\r\n inputElement.value = oldValue;\r\n this.control?.control?.patchValue(isNaN(+oldValue) ? oldValue : +oldValue);\r\n }\r\n });\r\n }\r\n}\r\n","/\r\n * Public API Surface of number-validate\r\n /\r\n\r\nexport from './lib/adr-number-validate.directive';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":[],"mappings":"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"}

package/lib/adr-number-validate.directive.d.ts CHANGED Viewed

@@ -1,10 +1,12 @@
+import { DecimalPipe } from '@angular/common';
 import { DoCheck, ElementRef } from '@angular/core';
 import { NgControl } from '@angular/forms';
 import * as i0 from "@angular/core";
 export declare class AdrNumberValidateDirective implements DoCheck {
     private el;
+    private decimalPipe;
     private control;
-    constructor(el: ElementRef, control: NgControl);
+    constructor(el: ElementRef, decimalPipe: DecimalPipe, control: NgControl);
     /**
      * @description Value before the decimal point specifies the number of digits before decimal and value after the decimal specifies the number of digits after decimal.
      * Example: 7.3 (Before decimal 7 digits & 3 digits after decimal)
@@ -14,6 +16,7 @@ export declare class AdrNumberValidateDirective implements DoCheck {
     private previousValue;
     onKeyDown: (event: KeyboardEvent) => void;
     onPaste: (event: ClipboardEvent) => void;
+    onFocus(): void;
     ngDoCheck(): void;
     /**
      * Validates the input string against a dynamically constructed regular expression
@@ -54,10 +57,11 @@ export declare class AdrNumberValidateDirective implements DoCheck {
      * If the input does not meet the required sign rules or is invalid, it reverts to the previous value.
      * Otherwise, it patches the control value with the parsed number or the current string value,
      * preserving intermediate states and empty input.
+     * It also formats the input value with thousand separators when appropriate.
      *
      * @param oldValue - The previous valid value of the input, used to revert in case of invalid input.
      */
     private execute;
-    static ɵfac: i0.ɵɵFactoryDeclaration<AdrNumberValidateDirective, [null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AdrNumberValidateDirective, [null, null, { optional: true; }]>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<AdrNumberValidateDirective, "[adrNumberValidate]", never, { "adrNumberValidate": { "alias": "adrNumberValidate"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@dravishek/number-validate",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "keywords": [
     "angular",
     "javascript",