Merge pull request #30 from SimplrJS/feature/normalizers-and-modifiers

Normalizers and modifiers.

Author: DovydasNavickas

packages/simplr-forms-core/package.json

@@ -4,7 +4,7 @@
   "description": "Shared simplr-forms logic.",
   "repository": "SimplrJS/simplr-forms",
   "homepage": "https://github.com/SimplrJS/simplr-forms",
-  "main": "main.js",
+  "main": "index.js",
   "types": "index.d.ts",
   "author": "simplrjs <[email protected]> (https://github.com/simplrjs)",
   "scripts": {

packages/simplr-forms-core/src/abstractions/base-field.ts

@@ -134,9 +134,9 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
      */
     protected get Value(): FieldValue {
         // If field is defined
-        if (this.state != null && this.state.Field != null) {
+        if (this.state != null && this.state.Value != null) {
             // Return its value
-            return (this.state.Field as FieldStateRecord).Value;
+            return this.state.Value;
         }
 
         // Return default value
@@ -157,7 +157,6 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
             const parser = this.props.parseValue as FieldParseValueCallback;
             return parser(value);
         }
-
         return ValueHelpers.ParseValue(
             React.Children.toArray(this.props.children) as Array<JSX.Element>,
             value
@@ -166,7 +165,7 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
 
     protected FormatValue(value: FieldValue): FieldValue {
         if (this.props.formatValue != null) {
-            const formatter = this.props.parseValue as FieldFormatValueCallback;
+            const formatter = this.props.formatValue as FieldFormatValueCallback;
             return formatter(value);
         }
 
@@ -177,8 +176,8 @@ export abstract class BaseField<TProps extends FieldProps, TState extends BaseFi
     }
 
     protected NormalizeValue(value: FieldValue): FieldValue {
-        if (this.props.formatValue != null) {
-            const normalizer = this.props.parseValue as FieldNormalizeValueCallback;
+        if (this.props.normalizeValue != null) {
+            const normalizer = this.props.normalizeValue as FieldNormalizeValueCallback;
             return normalizer(value);
         }
 

packages/simplr-forms-core/src/modifiers.ts

@@ -0,0 +1 @@
+export * from "./modifiers/index";

packages/simplr-forms-core/src/modifiers/base-modifier.ts

@@ -0,0 +1,14 @@
+import * as React from "react";
+import { Modifier } from "../contracts/value";
+import { FieldValue } from "../contracts/field";
+import { ValueOfType } from "../utils/value-helpers";
+
+export abstract class BaseModifier<TProps, TState> extends React.Component<TProps, TState> implements Modifier {
+    // Indentifier function
+    static SimplrFormsCoreModifier() { }
+    abstract Format(value: FieldValue): FieldValue;
+    abstract Parse(value: FieldValue): FieldValue;
+    render() {
+        return null;
+    }
+}

packages/simplr-forms-core/src/modifiers/currency.ts

@@ -0,0 +1,35 @@
+import { FieldValue } from "../contracts/field";
+import { ValueOfType } from "../utils/value-helpers";
+import { BaseModifier } from "./base-modifier";
+
+export interface CurrencyProps {
+    symbol: string;
+}
+
+const EMPTY_VALUE = "";
+
+export class CurrencyModifier extends BaseModifier<CurrencyProps, {}> {
+    private emptyFormattedValue = this.Format(EMPTY_VALUE);
+
+    Format(value: FieldValue): FieldValue {
+        value = value !== EMPTY_VALUE ? value : 0;
+        return `${value}${this.props.symbol}`;
+    }
+    Parse(value: FieldValue): FieldValue {
+        if (value === this.emptyFormattedValue) {
+            console.log(`Parser got an emptyFormattedValue.`);
+            return 0;
+        }
+        if (ValueOfType<string>(value, CurrencyModifier.name, "string")) {
+            const firstChar = value.substr(0, 1);
+            let negative = false;
+            if (firstChar === "-") {
+                negative = true;
+                value = value.substr(1);
+            }
+            const leadingMinus = negative ? "-" : "";
+            const numValue = Number(leadingMinus + value.replace(/[^0-9\.]+/g, ""));
+            return numValue;
+        }
+    }
+}

packages/simplr-forms-core/src/modifiers/index.ts

@@ -0,0 +1,3 @@
+export * from "./base-modifier";
+export * from "./currency";
+export * from "./numeric";

packages/simplr-forms-core/src/modifiers/numeric.ts

@@ -0,0 +1,15 @@
+import { FieldValue } from "../contracts/field";
+import { ValueOfType } from "../utils/value-helpers";
+import { BaseModifier } from "./base-modifier";
+
+export class NumericModifier extends BaseModifier<{}, {}> {
+    Format(value: FieldValue): FieldValue {
+        if (value == null) {
+            return "";
+        }
+        return value.toString();
+    }
+    Parse(value: FieldValue): FieldValue {
+        return value.replace(/[^0-9\.]+/g, "");
+    }
+}

packages/simplr-forms-core/src/normalizers.ts

@@ -0,0 +1 @@
+export * from "./normalizers/index";

packages/simplr-forms-core/src/normalizers/alphanumeric.ts

@@ -0,0 +1,22 @@
+import * as React from "react";
+import { FieldValue } from "../contracts/field";
+import { ValueOfType } from "../utils/value-helpers";
+import { BaseNormalizer } from "./base-normalizer";
+
+export interface AlphanumericProps {
+    allowSpaces?: boolean;
+}
+
+export class AlphanumericNormalizer extends BaseNormalizer<AlphanumericProps, {}> {
+    static defaultProps: AlphanumericProps = {
+        allowSpaces: true
+    };
+
+    Normalize(value: FieldValue): FieldValue {
+        if (ValueOfType<string>(value, AlphanumericNormalizer.name, "string")) {
+            const space = this.props.allowSpaces ? " " : "";
+            const regex = new RegExp(`[^0-9a-zA-Z${space}]`);
+            return value.replace(regex, "");
+        }
+    }
+}

packages/simplr-forms-core/src/normalizers/base-normalizer.ts

@@ -0,0 +1,13 @@
+import * as React from "react";
+import { Normalizer } from "../contracts/value";
+import { FieldValue } from "../contracts/field";
+import { ValueOfType } from "../utils/value-helpers";
+
+export abstract class BaseNormalizer<TProps, TState> extends React.Component<TProps, TState> implements Normalizer {
+    // Indentifier function
+    static SimplrFormsCoreNormalizer() { }
+    abstract Normalize(value: FieldValue): FieldValue;
+    render() {
+        return null;
+    }
+}