Merge pull request #167 from Jenesius/issue_156

Issue 156

Author: Jenesius

docs/guide/utils.md

@@ -46,7 +46,7 @@ export default class AvailabilityEvent extends FormEvent{
      * текущая доступность для целевого объекта.
      * */
     static GetAvailability(state: FormAvailability, name: string, defaultAvailability: boolean = true) {
-        const nearestName = findNearestNameFromArray(name, Object.keys(state));
+        const nearestName = findNearestNameFromArray( Object.keys(state), name);
         return nearestName ? state[nearestName] : defaultAvailability;
     }
 

docs/ru/guide/utils.md

@@ -256,10 +256,8 @@ export default class Form extends EventEmitter implements FormDependence {
             const extendName = concatName(options.executedFrom, options.target)
             const extendValues = extendName ? {[extendName]: values} : values;
 
-            console.log('EXTEND VALUES', extendValues)
             bypassObject(extendValues)
             .forEach(point => {
-                console.log(extendValues, point, '++')
                 if (this.checkFieldChange(point.name))
                     this.acceptChanges(point.name)
             })
@@ -717,7 +715,7 @@ export default class Form extends EventEmitter implements FormDependence {
 
         notOptimizeNames
         .forEach(key => {
-            const nearestAvailability = findNearestPrefixFromArray(key, notOptimizeNames);
+            const nearestAvailability = findNearestPrefixFromArray(notOptimizeNames, key);
             if (!nearestAvailability && this.#availabilities[key] === this.isAvailable) return  delete this.#availabilities[key];
 
             if (nearestAvailability) {
@@ -747,7 +745,7 @@ export default class Form extends EventEmitter implements FormDependence {
      * */
     checkFieldDisable(fieldName: string): boolean {
         if (this.parent) return this.parent.checkFieldDisable(concatName(this.name, fieldName));
-        const nearestName = findNearestNameFromArray(fieldName, Object.keys(this.#availabilities));
+        const nearestName = findNearestNameFromArray(Object.keys(this.#availabilities), fieldName);
         if (!nearestName) return this.disabled;
 
         return !this.#availabilities[nearestName];

src/classes/AvailabilityEvent.ts

@@ -53,7 +53,7 @@ export function compareDifference(oldValue: unknown, newValue: unknown): Compare
  * результирующий объект(который предполагается): { coordinate: { x: 1, y: 2 } }
  * и в данном случае мы получаем, что у нас два изменения:
  * [
- *  { name: 'coordinate', newValue: { x: 1, y: 2 }, oldValue: { x: 1, y: 2 } },
+ *  { name: 'coordinate', newValue: { x: 1, y: 2 }, oldValue: { x: 1 } },
  *  { name: 'coordinate.y', newValue: 2, oldValue: undefined }
  * ]
  * */

src/classes/Form.ts

@@ -4,6 +4,7 @@ import isEmptyObject from "./is-empty-object";
 export default function copyObject<T>(object: T): T {
     const outputObject:any = {};
 
+    // Проверка на пустой объект добавлена на то, чтобы ссылка на объект не переносилась, а полноценно копировалась
     if (!isIterablePoint(object) && !isEmptyObject(object)) return object;
     Object.entries(object).forEach(([key, value]) => {
 

src/utils/compare-changes.ts

@@ -1,6 +1,6 @@
 import checkCompositeName from "./check-composite-name";
 
-export default function findNearestNameFromArray<T extends string>(name: string, array: T[]): T | undefined {
+export default function findNearestNameFromArray<T extends string>(array: T[], name: string): T | undefined {
 	let answer: T | undefined;
 
 	array.forEach(n => {

src/utils/copy-object.ts

@@ -1,6 +1,6 @@
 import isPrefixName from "./is-prefix-name";
 
-export default function findNearestPrefixFromArray<T extends string>(name: string, arrayPrefixes: T[]): T | undefined {
+export default function findNearestPrefixFromArray<T extends string>(arrayPrefixes: T[], name: string): T | undefined {
     let answer: T | undefined;
 
     arrayPrefixes.forEach(prefix => {

src/utils/find-nearest-name-from-array.ts

@@ -3,6 +3,7 @@
  * @example address.city.name address -> true
  * @example user.type.index user.type -> true
  * @example position.city.type city -> false
+ * @example name name -> false
  * */
 export default function isPrefixName(fieldName: string, prefix: string) {
     return (new RegExp(`^${prefix}\\.`)).test(fieldName);

src/utils/find-nearest-prefix-from-array.ts

@@ -6,9 +6,7 @@ import isEmptyObject from "./is-empty-object";
  * {a: {b: 1}}, {a: {c: 1}} => {a: {b: 1 , c: 1}}
  * */
 export default function mergeObjects(originalValues: Values, ...newValues: Values[]){
-	function set(o: any, k: string, v: any) {
-		o[k] = v;
-	}
+	function set(o: any, k: string, v: any) { o[k] = v; } // object/key/value
 
 	newValues.forEach(objectValue => {
 		for( const key in objectValue ) {
@@ -17,18 +15,14 @@ export default function mergeObjects(originalValues: Values, ...newValues: Value
 
 			if (!isIterablePoint(value) && !isEmptyObject(value)) set(originalValues, key, value);
 			else {
-				if (!originalValues.hasOwnProperty(key)) originalValues[key] = {};
-
 				// If current value is primitive we need to change it to object.
 				if (!isIterablePoint(originalValues[key])) originalValues[key] = {};
 
-
 				mergeObjects(originalValues[key], value);
 			}
 		}
 	})
 
-
 	return originalValues;
 }