GetFieldId, GetFieldsGroupId and GetFieldsArrayId moved to helpers. (#84)

* GetFieldId, GetFieldsGroupId and GetFieldsArrayId moved to helpers.

* Main package.json scripts fixed.

Author: DovydasNavickas

package.json

@@ -3,11 +3,11 @@
   "private": true,
   "scripts": {
     "generate": "rush generate",
-    "tools-build": "npm run rush-tools run gulp-build -e simplr-mvdir",
-    "source-build": "npm run rush-tools run build -e simplr-mvdir",
-    "test": "npm run rush-tools run test-tsc -e simplr-mvdir",
+    "tools-build": "npm run rush-tools -- run gulp-build -e simplr-mvdir",
+    "source-build": "npm run rush-tools -- run build -e simplr-mvdir",
+    "test": "npm run rush-tools -- run test-tsc -e simplr-mvdir",
     "rush-tools": "ts-node ./tools/rush-tools.ts",
-    "publish": "npm run rush-tools publish"
+    "publish": "npm run rush-tools -- publish"
   },
   "devDependencies": {
     "@microsoft/rush": "^3.0.9",

packages/simplr-forms-dom/src/abstractions/base-dom-field.tsx

@@ -8,10 +8,7 @@ import {
 } from "../contracts/field";
 import { FormProps } from "../contracts/form";
 
-
-export interface BaseDomFieldState extends BaseFieldState {
-
-}
+export interface BaseDomFieldState extends BaseFieldState { }
 
 export abstract class BaseDomField<TProps extends DomFieldProps, TState extends BaseDomFieldState, TUnderlyingElement = any>
     extends BaseField<TProps, TState> {

packages/simplr-forms/src/abstractions/base-fields-array.ts

@@ -8,6 +8,7 @@ import { FieldsGroupChildContext } from "../contracts/fields-group";
 import { FieldContext } from "../contracts/field";
 import { FSHContainer } from "../stores/form-stores-handler";
 import { FormStore } from "../stores/form-store";
+import { FormStoreHelpers } from "../stores/form-store-helpers";
 import * as PropTypes from "prop-types";
 
 export class BaseFieldsArray<TProps extends FieldsArrayProps,
@@ -49,7 +50,7 @@ export class BaseFieldsArray<TProps extends FieldsArrayProps,
 
     componentWillMount() {
         const idBase = `${this.props.name}[${this.props.index}]`;
-        this.FieldsArrayId = this.FormStore.GetFieldsGroupId(idBase, this.context.FieldsGroupId);
+        this.FieldsArrayId = FormStoreHelpers.GetFieldsGroupId(idBase, this.context.FieldsGroupId);
         this.FormStore.RegisterFieldsArray(this.FieldsArrayId, this.props.name, this.props.index, this.context.FieldsGroupId);
     }
 

packages/simplr-forms/src/abstractions/base-fields-group.ts

@@ -9,6 +9,7 @@ import { FieldContext } from "../contracts/field";
 import { FSHContainer } from "../stores/form-stores-handler";
 import { FormStore } from "../stores/form-store";
 import * as PropTypes from "prop-types";
+import { FormStoreHelpers } from "../stores/form-store-helpers";
 
 export class BaseFieldsGroup<TProps extends FieldsGroupProps,
     TState extends FieldsGroupState>
@@ -48,7 +49,7 @@ export class BaseFieldsGroup<TProps extends FieldsGroupProps,
     }
 
     componentWillMount() {
-        this.FieldsGroupId = this.FormStore.GetFieldsGroupId(this.props.name, this.context.FieldsGroupId);
+        this.FieldsGroupId = FormStoreHelpers.GetFieldsGroupId(this.props.name, this.context.FieldsGroupId);
         this.FormStore.RegisterFieldsGroup(this.FieldsGroupId, this.props.name, this.context.FieldsGroupId);
     }
 

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

@@ -19,11 +19,11 @@ import {
 } from "../contracts/form";
 import { FormStore } from "../stores/form-store";
 import * as FormStoreActions from "../actions/form-store";
-// import { FieldsGroupContextProps } from "../contracts/fields-group";
 import { FSHContainer } from "../stores/form-stores-handler";
 import { FieldValidationType } from "../contracts/validation";
 import { FormStoreStateRecord } from "../contracts/form-store";
 import { ModifierValue } from "../contracts/value";
+import { FormStoreHelpers } from "../stores/form-store-helpers";
 
 export interface CoreFieldState {
     FormStoreState: FormStoreStateRecord;
@@ -75,7 +75,7 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co
     }
 
     protected get FieldId(): string {
-        return this.FormStore.GetFieldId(this.props.name, this.FieldsGroupId);
+        return FormStoreHelpers.GetFieldId(this.props.name, this.FieldsGroupId);
     }
 
     protected get FieldsGroupId(): string {

packages/simplr-forms/src/stores/form-store-helpers.ts

@@ -1,7 +1,38 @@
 import * as React from "react";
 import { FieldStorePropsRecord } from "../contracts/field";
 
+export const FIELDS_GROUP_SEPARATOR = ".";
+
 export class FormStoreHelpers {
+    /**
+     * Constructs field id from given fieldName and an optional fieldsGroupIdkds
+     *
+     * @param {string} fieldName
+     * @param {string} [fieldsGroupId]
+     * @returns Constructed field id
+     *
+     * @memberOf FormStore
+     */
+    public static GetFieldId(fieldName: string, fieldsGroupId?: string): string {
+        if (fieldsGroupId != null) {
+            return `${fieldsGroupId}${FIELDS_GROUP_SEPARATOR}${fieldName}`;
+        }
+
+        return fieldName;
+    }
+
+    public static GetFieldsGroupId(name: string, parentId?: string): string {
+        if (parentId != null) {
+            return `${parentId}${FIELDS_GROUP_SEPARATOR}${name}`;
+        }
+
+        return name;
+    }
+
+    public static GetFieldsArrayId(name: string, parentId?: string): string {
+        return this.GetFieldsGroupId(name, parentId);
+    }
+
     protected static ArrayUnique<T>(array: T[], concat: boolean = true): T[] {
         let result = concat ? array.concat() : array;
         for (var i = 0; i < result.length; ++i) {

packages/simplr-forms/src/stores/form-store.ts

@@ -33,8 +33,6 @@ import { ConstructFormError } from "../utils/form-error-helpers";
 import { FormError, FormErrorRecord, FormErrorOrigin } from "../contracts/error";
 import { ModifierValue } from "../contracts/value";
 
-export const FG_SEPARATOR = ".";
-
 export type Dictionary<TItem = any> = { [key: string]: TItem };
 
 export class FormStore extends ActionEmitter {
@@ -70,35 +68,6 @@ export class FormStore extends ActionEmitter {
      * ========================
      */
 
-    /**
-     * Constructs field id from given fieldName and an optional fieldsGroupIdkds
-     *
-     * @param {string} fieldName
-     * @param {string} [fieldsGroupId]
-     * @returns Constructed field id
-     *
-     * @memberOf FormStore
-     */
-    public GetFieldId(fieldName: string, fieldsGroupId?: string): string {
-        if (fieldsGroupId != null) {
-            return `${fieldsGroupId}${FG_SEPARATOR}${fieldName}`;
-        }
-
-        return fieldName;
-    }
-
-    public GetFieldsGroupId(name: string, parentId?: string): string {
-        if (parentId != null) {
-            return `${parentId}${FG_SEPARATOR}${name}`;
-        }
-
-        return name;
-    }
-
-    public GetFieldsArrayId(name: string, parentId?: string): string {
-        return this.GetFieldsGroupId(name, parentId);
-    }
-
     public RegisterField(
         fieldId: string,
         name: string,