version 3.2.1-beta.0

Author: antonmak1

src/core/components/each/each.ts

@@ -72,6 +72,7 @@ export class Each extends DataComponent {
   public importedDataName: string;
   public iteration: IterationFunctionType | undefined;
   public indexName: string;
+  public stackName: string;
   public isDataFunction: boolean;
   public isIteration: boolean;
 
@@ -91,12 +92,16 @@ export class Each extends DataComponent {
       : "importedData";
     this.iteration = options.iteration;
     this.indexName = options.indexName ? options.indexName : "index";
+    this.stackName = options.stackName ? options.stackName : "stack";
     this.isDataFunction = checkFunction(data);
     this.isIteration = this.iteration !== undefined;
     if (
       this.indexName === this.valueName ||
       this.indexName === this.importedDataName ||
-      this.valueName === this.importedDataName
+      this.valueName === this.importedDataName ||
+      this.stackName === this.importedDataName ||
+      this.stackName === this.indexName ||
+      this.stackName === this.valueName
     ) {
       createError("Name error");
     }
@@ -868,16 +873,14 @@ export class Each extends DataComponent {
             [this.functionName]: this.valueName
           };
           const setDataFunctions = () => {
-            if (this._isDataFunctions) {
-              const objDataFunctions = getDataFunctions(dataFunction);
-              renderFunctionsData(
-                updateFunction,
-                dataId,
-                objDataFunctions,
-                index,
-                currentComponent
-              );
-            }
+            const objDataFunctions = getDataFunctions(dataFunction);
+            renderFunctionsData(
+              updateFunction,
+              dataId,
+              objDataFunctions,
+              index,
+              currentComponent
+            );
           };
 
           const runRenderFunction = () => {
@@ -919,6 +922,7 @@ export class Each extends DataComponent {
             currentComponent.functions,
             this.valueName,
             this.importedDataName,
+            this.stackName,
             this.indexName,
             true
           );

src/core/functions/data/create-each-dynamic-node-component.ts

@@ -4,7 +4,8 @@ import {
   DynamicNodeComponentNodeType,
   ElementsType,
   ImportObjectType,
-  EachTemplateType
+  EachTemplateType,
+  ClearStackType
 } from "../../../types/types";
 
 export const createEachDynamicNodeComponentType = (
@@ -16,7 +17,7 @@ export const createEachDynamicNodeComponentType = (
   currentImport?: ImportObjectType,
   template?: EachTemplateType
 ): EachDynamicNodeComponentType => {
-  const DynamicNodeComponentType = {
+  const DynamicNodeComponentType: any = {
     id: dataId,
     import: currentImport,
     elements,
@@ -27,7 +28,26 @@ export const createEachDynamicNodeComponentType = (
     nodeNext,
     template,
     keys: [],
-    parentNode
+    parentNode,
+    eachStackValues: [],
+    stack: []
   };
+  const clearStack: ClearStackType = () => {
+    if (DynamicNodeComponentType.stack.length > 0) {
+      const { template } = DynamicNodeComponentType;
+      const { eachStackValues } = template;
+      for (let i = 0; i < DynamicNodeComponentType.stack.length; i++) {
+        const currentActiveStack = DynamicNodeComponentType.stack[i];
+        const currentNode = DynamicNodeComponentType.nodes[currentActiveStack];
+        // So far for the main element. The logic used for values ​​will be done later, but for the test only this test functionality is tried.
+        const el = currentNode.el;
+        const eachStack = currentNode.eachStack;
+        const currentEachStackValue = eachStackValues[0];
+        currentEachStackValue(el, eachStack, "");
+      }
+      DynamicNodeComponentType.stack = [];
+    }
+  };
+  DynamicNodeComponentType.clearStack = clearStack;
   return DynamicNodeComponentType;
 };

src/core/functions/data/create-element.ts

@@ -2,13 +2,16 @@
 import { EACH_INDEX_NAME } from "../../../config/config";
 import {
   DynamicEachDataType,
+  EachStackType,
   EachTemplateType,
   ExportDataType,
   ExportDynamicType,
+  GetStackType,
   ImportDataType,
   NodeNodesType,
   NodeType,
   RenderNodeFunctionType,
+  SetStackType,
   StackType
 } from "../../../types/types";
 
@@ -55,6 +58,47 @@ export const createElement = (
         eachValue
       )
     : null;
+  const eachStack = {};
+  const currentNode: NodeType = {
+    values: newValues,
+    ri: renderImport,
+    dataId,
+    nodes: newNodes,
+    stack,
+    el,
+    key,
+    eachStack
+  };
+  const getDefaultStack = () => {
+    return currentNode.eachStack!;
+  };
+  const updateStack = (attr = getDefaultStack()) => {
+    return attr;
+  };
+  const setStack: SetStackType = (attribute: any = updateStack) => {
+    const newStack = attribute(getDefaultStack());
+    if (currentComponent.stack.indexOf(eachIndex) === -1) {
+      currentComponent.stack.push(eachIndex);
+    }
+    const { template } = currentComponent;
+    const { eachStackValues } = template;
+    currentNode.eachStack = newStack;
+    // So far for the main element. The logic used for values ​​will be done later, but for the test only this test functionality is tried.
+    const el = currentNode.el;
+    const eachStack = currentNode.eachStack;
+    for (let i = 0; i < eachStackValues.length; i++) {
+      const currentEachStackValue = eachStackValues[i];
+      currentEachStackValue(el, eachStack);
+    }
+  };
+  const getStack: GetStackType = () => {
+    const eachObj: EachStackType = {
+      currentStack: getDefaultStack(),
+      clearStack: currentComponent.clearStack,
+      setStack
+    };
+    return eachObj;
+  };
   for (let i = 0; i < length; i++) {
     const templateNode = templateNodes[i];
     const { render, rootId } = templateNode;
@@ -70,17 +114,9 @@ export const createElement = (
       key,
       exportFunctions,
       currentExport,
-      eachValue
+      eachValue,
+      getStack
     );
   }
-  const currentNode: NodeType = {
-    values: newValues,
-    ri: renderImport,
-    dataId,
-    nodes: newNodes,
-    stack,
-    el,
-    key
-  };
   return { el: el as Element, currentNode };
 };

src/core/functions/parse/parse-key.ts

@@ -49,11 +49,13 @@ export const parseKey = (
   values?: ValuesType,
   valueName?: string,
   importedDataName?: string,
+  stackName?: string,
   indexName?: string,
   isClass?: boolean,
   isCondition?: boolean
 ): CurrentKeyType => {
-  const [renderedKey, isValue, isObj] = validateIsValue(renderKey(key), key);
+  const currentKey = renderKey(key);
+  const [renderedKey, isValue, isObj] = validateIsValue(currentKey, key);
   const originKey = (
     isObj ? (renderedKey as DynamicKeyObjectType).key : renderedKey
   ) as string;
@@ -67,6 +69,7 @@ export const parseKey = (
         currentObj,
         valueName,
         importedDataName,
+        stackName,
         indexName
       );
     } else {
@@ -89,6 +92,9 @@ export const parseKey = (
       if (isProperty) createError("Error properties");
       originType = 3;
       break;
+    case stackName:
+      originType = 4;
+      break;
   }
   const isValSingle = val?.length === 1;
   const keyObj: CurrentKeyType = {