chayns-api 3.0.0-beta.4 → 3.1.0-beta.0

package/dist/cjs/host/ChaynsHost.js

@@ -8,11 +8,13 @@ var _reactCompilerRuntime = require("react-compiler-runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _HostIframe = _interopRequireDefault(require("./iframe/HostIframe"));
 var _ModuleHost = _interopRequireDefault(require("./module/ModuleHost"));
+var _HistoryLayerContext = require("../contexts/HistoryLayerContext");
+var _rootLayer = require("../utils/history/rootLayer");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const subscribeToHydration = () => () => {};
 const ChaynsHost = t0 => {
-  const $ = (0, _reactCompilerRuntime.c)(38);
+  const $ = (0, _reactCompilerRuntime.c)(53);
   const {
     type,
     iFrameProps,
@@ -34,24 +36,51 @@ const ChaynsHost = t0 => {
     environment,
     preventStagingReplacement,
     dialog,
-    styleSettings
+    styleSettings,
+    historyLayer,
+    historyChildId,
+    isHistoryDisabled: t3
   } = t0;
   const iFrameRef = t1 === undefined ? undefined : t1;
   const loadingComponent = t2 === undefined ? undefined : t2;
+  const isHistoryDisabled = t3 === undefined ? true : t3;
   const isInitiallyVisible = type !== "client-module" && (type !== "server-module" || !!(system !== null && system !== void 0 && system.serverUrl));
   const isHydrated = (0, _react.useSyncExternalStore)(subscribeToHydration, _temp, _temp2);
   const isVisible = (0, _react.useDeferredValue)(isInitiallyVisible || isHydrated);
   if (!isVisible) {
     return null;
   }
+  let t4;
+  if ($[0] !== historyLayer) {
+    t4 = historyLayer !== null && historyLayer !== void 0 ? historyLayer : (0, _rootLayer.getOrInitRootChaynsHistoryLayer)().rootLayer;
+    $[0] = historyLayer;
+    $[1] = t4;
+  } else {
+    t4 = $[1];
+  }
+  const resolvedLayer = t4;
+  let layer;
+  if (!isHistoryDisabled) {
+    let t5;
+    if ($[2] !== historyChildId || $[3] !== resolvedLayer) {
+      var _resolvedLayer$getChi;
+      t5 = historyChildId ? (_resolvedLayer$getChi = resolvedLayer.getChildLayer(historyChildId)) !== null && _resolvedLayer$getChi !== void 0 ? _resolvedLayer$getChi : resolvedLayer.createChildLayer(historyChildId) : resolvedLayer;
+      $[2] = historyChildId;
+      $[3] = resolvedLayer;
+      $[4] = t5;
+    } else {
+      t5 = $[4];
+    }
+    layer = t5;
+  }
   switch (type) {
     case "client-iframe":
     case "server-iframe":
       {
-        const t3 = type === "server-iframe";
-        let t4;
-        if ($[0] !== currentPage || $[1] !== customData || $[2] !== customFunctions || $[3] !== device || $[4] !== dialog || $[5] !== environment || $[6] !== functions || $[7] !== iFrameProps || $[8] !== iFrameRef || $[9] !== isAdminModeActive || $[10] !== language || $[11] !== pages || $[12] !== parameters || $[13] !== preventStagingReplacement || $[14] !== site || $[15] !== src || $[16] !== styleSettings || $[17] !== t3 || $[18] !== user) {
-          t4 = _react.default.createElement(_HostIframe.default, {
+        const t5 = type === "server-iframe";
+        let t6;
+        if ($[5] !== currentPage || $[6] !== customData || $[7] !== customFunctions || $[8] !== device || $[9] !== dialog || $[10] !== environment || $[11] !== functions || $[12] !== iFrameProps || $[13] !== iFrameRef || $[14] !== isAdminModeActive || $[15] !== isHistoryDisabled || $[16] !== language || $[17] !== layer || $[18] !== pages || $[19] !== parameters || $[20] !== preventStagingReplacement || $[21] !== site || $[22] !== src || $[23] !== styleSettings || $[24] !== t5 || $[25] !== user) {
+          t6 = _react.default.createElement(_HostIframe.default, {
             iFrameRef: iFrameRef,
             iFrameProps: iFrameProps,
             pages: pages,
@@ -63,46 +92,61 @@ const ChaynsHost = t0 => {
             functions: functions,
             customFunctions: customFunctions,
             src: src,
-            postForm: t3,
+            postForm: t5,
             language: language,
             parameters: parameters,
             environment: environment,
             customData: customData,
             preventStagingReplacement: preventStagingReplacement,
             dialog: dialog,
-            styleSettings: styleSettings
+            styleSettings: styleSettings,
+            historyLayer: layer,
+            isHistoryDisabled: isHistoryDisabled
           });
-          $[0] = currentPage;
-          $[1] = customData;
-          $[2] = customFunctions;
-          $[3] = device;
-          $[4] = dialog;
-          $[5] = environment;
-          $[6] = functions;
-          $[7] = iFrameProps;
-          $[8] = iFrameRef;
-          $[9] = isAdminModeActive;
-          $[10] = language;
-          $[11] = pages;
-          $[12] = parameters;
-          $[13] = preventStagingReplacement;
-          $[14] = site;
-          $[15] = src;
-          $[16] = styleSettings;
-          $[17] = t3;
-          $[18] = user;
-          $[19] = t4;
+          $[5] = currentPage;
+          $[6] = customData;
+          $[7] = customFunctions;
+          $[8] = device;
+          $[9] = dialog;
+          $[10] = environment;
+          $[11] = functions;
+          $[12] = iFrameProps;
+          $[13] = iFrameRef;
+          $[14] = isAdminModeActive;
+          $[15] = isHistoryDisabled;
+          $[16] = language;
+          $[17] = layer;
+          $[18] = pages;
+          $[19] = parameters;
+          $[20] = preventStagingReplacement;
+          $[21] = site;
+          $[22] = src;
+          $[23] = styleSettings;
+          $[24] = t5;
+          $[25] = user;
+          $[26] = t6;
+        } else {
+          t6 = $[26];
+        }
+        let t7;
+        if ($[27] !== resolvedLayer || $[28] !== t6) {
+          t7 = _react.default.createElement(_HistoryLayerContext.ChaynsHistoryLayerProvider, {
+            layer: resolvedLayer
+          }, t6);
+          $[27] = resolvedLayer;
+          $[28] = t6;
+          $[29] = t7;
         } else {
-          t4 = $[19];
+          t7 = $[29];
         }
-        return t4;
+        return t7;
       }
     case "client-module":
     case "server-module":
       {
-        let t3;
-        if ($[20] !== currentPage || $[21] !== customData || $[22] !== customFunctions || $[23] !== device || $[24] !== dialog || $[25] !== environment || $[26] !== functions || $[27] !== isAdminModeActive || $[28] !== language || $[29] !== loadingComponent || $[30] !== pages || $[31] !== parameters || $[32] !== preventStagingReplacement || $[33] !== site || $[34] !== styleSettings || $[35] !== system || $[36] !== user) {
-          t3 = _react.default.createElement(_ModuleHost.default, {
+        let t5;
+        if ($[30] !== currentPage || $[31] !== customData || $[32] !== customFunctions || $[33] !== device || $[34] !== dialog || $[35] !== environment || $[36] !== functions || $[37] !== isAdminModeActive || $[38] !== isHistoryDisabled || $[39] !== language || $[40] !== layer || $[41] !== loadingComponent || $[42] !== pages || $[43] !== parameters || $[44] !== preventStagingReplacement || $[45] !== site || $[46] !== styleSettings || $[47] !== system || $[48] !== user) {
+          t5 = _react.default.createElement(_ModuleHost.default, {
             system: system,
             pages: pages,
             isAdminModeActive: isAdminModeActive,
@@ -119,30 +163,45 @@ const ChaynsHost = t0 => {
             environment: environment,
             preventStagingReplacement: preventStagingReplacement,
             dialog: dialog,
-            styleSettings: styleSettings
+            styleSettings: styleSettings,
+            historyLayer: layer,
+            isHistoryDisabled: isHistoryDisabled
           });
-          $[20] = currentPage;
-          $[21] = customData;
-          $[22] = customFunctions;
-          $[23] = device;
-          $[24] = dialog;
-          $[25] = environment;
-          $[26] = functions;
-          $[27] = isAdminModeActive;
-          $[28] = language;
-          $[29] = loadingComponent;
-          $[30] = pages;
-          $[31] = parameters;
-          $[32] = preventStagingReplacement;
-          $[33] = site;
-          $[34] = styleSettings;
-          $[35] = system;
-          $[36] = user;
-          $[37] = t3;
+          $[30] = currentPage;
+          $[31] = customData;
+          $[32] = customFunctions;
+          $[33] = device;
+          $[34] = dialog;
+          $[35] = environment;
+          $[36] = functions;
+          $[37] = isAdminModeActive;
+          $[38] = isHistoryDisabled;
+          $[39] = language;
+          $[40] = layer;
+          $[41] = loadingComponent;
+          $[42] = pages;
+          $[43] = parameters;
+          $[44] = preventStagingReplacement;
+          $[45] = site;
+          $[46] = styleSettings;
+          $[47] = system;
+          $[48] = user;
+          $[49] = t5;
+        } else {
+          t5 = $[49];
+        }
+        let t6;
+        if ($[50] !== resolvedLayer || $[51] !== t5) {
+          t6 = _react.default.createElement(_HistoryLayerContext.ChaynsHistoryLayerProvider, {
+            layer: resolvedLayer
+          }, t5);
+          $[50] = resolvedLayer;
+          $[51] = t5;
+          $[52] = t6;
         } else {
-          t3 = $[37];
+          t6 = $[52];
         }
-        return t3;
+        return t6;
       }
     default:
       {

package/dist/cjs/host/iframe/HostIframe.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var comlink = _interopRequireWildcard(require("comlink"));
-var _postIframeForm = _interopRequireDefault(require("../../util/postIframeForm"));
+var _postIframeForm = _interopRequireDefault(require("../../utils/postIframeForm"));
 var _useUpdateData = _interopRequireDefault(require("./utils/useUpdateData"));
-var _url = require("../../util/url");
-var _transferNestedFunctions = require("../../util/transferNestedFunctions");
+var _url = require("../../utils/url");
+var _transferNestedFunctions = require("../../utils/transferNestedFunctions");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
@@ -32,13 +32,17 @@ const HostIframe = ({
   customData,
   preventStagingReplacement,
   dialog,
-  styleSettings
+  styleSettings,
+  historyLayer,
+  isHistoryDisabled
 }) => {
   const eventTarget = (0, _react.useRef)();
   const ref = (0, _react.useRef)();
   const currentDataRef = (0, _react.useRef)();
   const customFunctionsRef = (0, _react.useRef)();
   customFunctionsRef.current = customFunctions;
+  const historyLayerRef = (0, _react.useRef)(undefined);
+  historyLayerRef.current = historyLayer;
   if (!eventTarget.current) {
     eventTarget.current = global.document ? document.createElement('div') : undefined;
   }
@@ -50,6 +54,7 @@ const HostIframe = ({
   const initialData = {
     site,
     isAdminModeActive,
+    isHistoryDisabled,
     pages,
     currentPage,
     device,
@@ -95,7 +100,66 @@ const HostIframe = ({
           addDataListener: cb => {
             if (eventTarget.current) eventTarget.current.addEventListener('data_update', e => e.detail && cb(e.detail));
           },
-          getInitialData: () => currentDataRef.current
+          getInitialData: () => currentDataRef.current,
+          history: historyLayerRef.current ? {
+            getInitialState: () => {
+              const l = historyLayerRef.current;
+              if (!l) return null;
+              return {
+                id: l.id,
+                depth: l.depth,
+                segments: l.getRoute(),
+                params: l.getParams(),
+                hash: l.getHash(),
+                state: l.getState(),
+                activeChildId: l.getActiveChildId(),
+                segmentCount: l.getSegmentCount()
+              };
+            },
+            setRoute: (route, opts) => {
+              var _historyLayerRef$curr;
+              return (_historyLayerRef$curr = historyLayerRef.current) === null || _historyLayerRef$curr === void 0 ? void 0 : _historyLayerRef$curr.setRoute(route, opts);
+            },
+            setParams: (params, opts) => {
+              var _historyLayerRef$curr2;
+              return (_historyLayerRef$curr2 = historyLayerRef.current) === null || _historyLayerRef$curr2 === void 0 ? void 0 : _historyLayerRef$curr2.setParams(params, opts);
+            },
+            setHash: (hash, opts) => {
+              var _historyLayerRef$curr3;
+              return (_historyLayerRef$curr3 = historyLayerRef.current) === null || _historyLayerRef$curr3 === void 0 ? void 0 : _historyLayerRef$curr3.setHash(hash, opts);
+            },
+            setState: (state, opts) => {
+              var _historyLayerRef$curr4;
+              return (_historyLayerRef$curr4 = historyLayerRef.current) === null || _historyLayerRef$curr4 === void 0 ? void 0 : _historyLayerRef$curr4.setState(state, opts);
+            },
+            navigate: opts => {
+              var _historyLayerRef$curr5;
+              return (_historyLayerRef$curr5 = historyLayerRef.current) === null || _historyLayerRef$curr5 === void 0 ? void 0 : _historyLayerRef$curr5.navigate(opts);
+            },
+            setActiveChild: (id, init) => {
+              var _historyLayerRef$curr6;
+              return (_historyLayerRef$curr6 = historyLayerRef.current) === null || _historyLayerRef$curr6 === void 0 ? void 0 : _historyLayerRef$curr6.setActiveChild(id, init);
+            },
+            setSegmentCount: n => {
+              var _historyLayerRef$curr7;
+              return (_historyLayerRef$curr7 = historyLayerRef.current) === null || _historyLayerRef$curr7 === void 0 ? void 0 : _historyLayerRef$curr7.setSegmentCount(n);
+            },
+            addChangeListener: callback => {
+              var _historyLayerRef$curr8, _historyLayerRef$curr9;
+              const unsub = (_historyLayerRef$curr8 = (_historyLayerRef$curr9 = historyLayerRef.current) === null || _historyLayerRef$curr9 === void 0 ? void 0 : _historyLayerRef$curr9.addEventListener('change', callback)) !== null && _historyLayerRef$curr8 !== void 0 ? _historyLayerRef$curr8 : () => {};
+              return comlink.proxy(unsub);
+            },
+            addPopstateListener: callback => {
+              var _historyLayerRef$curr0, _historyLayerRef$curr1;
+              const unsub = (_historyLayerRef$curr0 = (_historyLayerRef$curr1 = historyLayerRef.current) === null || _historyLayerRef$curr1 === void 0 ? void 0 : _historyLayerRef$curr1.addEventListener('popstate', callback)) !== null && _historyLayerRef$curr0 !== void 0 ? _historyLayerRef$curr0 : () => {};
+              return comlink.proxy(unsub);
+            },
+            addBlock: (callback, opts) => {
+              var _historyLayerRef$curr10, _historyLayerRef$curr11;
+              const unsub = (_historyLayerRef$curr10 = (_historyLayerRef$curr11 = historyLayerRef.current) === null || _historyLayerRef$curr11 === void 0 ? void 0 : _historyLayerRef$curr11.addBlock(callback, opts)) !== null && _historyLayerRef$curr10 !== void 0 ? _historyLayerRef$curr10 : () => {};
+              return comlink.proxy(unsub);
+            }
+          } : undefined
         }
       };
       comlink.expose(obj, comlink.windowEndpoint(ref.current.contentWindow));
@@ -106,6 +170,7 @@ const HostIframe = ({
     }
     return undefined;
   }, []);
+  (0, _useUpdateData.default)(eventTarget.current, 'isHistoryDisabled', isHistoryDisabled);
   (0, _useUpdateData.default)(eventTarget.current, 'isAdminModeActive', isAdminModeActive);
   (0, _useUpdateData.default)(eventTarget.current, 'user', user);
   (0, _useUpdateData.default)(eventTarget.current, 'site', site);

package/dist/cjs/host/module/ModuleHost.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactCompilerRuntime = require("react-compiler-runtime");
 var _react = _interopRequireWildcard(require("react"));
-var _moduleContext = require("../../constants/moduleContext");
+var _moduleContext = require("../../contexts/moduleContext");
 var _loadComponent = _interopRequireDefault(require("./utils/loadComponent"));
-var _url = require("../../util/url");
+var _url = require("../../utils/url");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const System = ({
@@ -32,7 +32,7 @@ const System = ({
   }, _react.default.createElement(Component, props));
 };
 const ModuleHost = t0 => {
-  const $ = (0, _reactCompilerRuntime.c)(34);
+  const $ = (0, _reactCompilerRuntime.c)(36);
   const {
     system,
     children: t1,
@@ -50,14 +50,17 @@ const ModuleHost = t0 => {
     dialog,
     environment,
     preventStagingReplacement,
-    styleSettings
+    styleSettings,
+    historyLayer,
+    isHistoryDisabled
   } = t0;
   const children = t1 === undefined ? null : t1;
   let result;
-  if ($[0] !== currentPage || $[1] !== customData || $[2] !== device || $[3] !== dialog || $[4] !== environment || $[5] !== isAdminModeActive || $[6] !== language || $[7] !== pages || $[8] !== parameters || $[9] !== site || $[10] !== styleSettings || $[11] !== user) {
+  if ($[0] !== currentPage || $[1] !== customData || $[2] !== device || $[3] !== dialog || $[4] !== environment || $[5] !== isAdminModeActive || $[6] !== isHistoryDisabled || $[7] !== language || $[8] !== pages || $[9] !== parameters || $[10] !== site || $[11] !== styleSettings || $[12] !== user) {
     result = {
       site,
       isAdminModeActive,
+      isHistoryDisabled,
       pages,
       currentPage,
       device,
@@ -79,49 +82,50 @@ const ModuleHost = t0 => {
     $[3] = dialog;
     $[4] = environment;
     $[5] = isAdminModeActive;
-    $[6] = language;
-    $[7] = pages;
-    $[8] = parameters;
-    $[9] = site;
-    $[10] = styleSettings;
-    $[11] = user;
-    $[12] = result;
+    $[6] = isHistoryDisabled;
+    $[7] = language;
+    $[8] = pages;
+    $[9] = parameters;
+    $[10] = site;
+    $[11] = styleSettings;
+    $[12] = user;
+    $[13] = result;
   } else {
-    result = $[12];
+    result = $[13];
   }
   const data = result;
   let t2;
-  if ($[13] === Symbol.for("react.memo_cache_sentinel")) {
+  if ($[14] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = _react.default.createElement("div", {
       className: "module-css"
     });
-    $[13] = t2;
+    $[14] = t2;
   } else {
-    t2 = $[13];
+    t2 = $[14];
   }
   const t3 = system.scope;
   let t4;
-  if ($[14] !== environment.buildEnvironment || $[15] !== preventStagingReplacement || $[16] !== system.url) {
+  if ($[15] !== environment.buildEnvironment || $[16] !== preventStagingReplacement || $[17] !== system.url) {
     t4 = (0, _url.replaceStagingUrl)(preventStagingReplacement, system.url, environment.buildEnvironment);
-    $[14] = environment.buildEnvironment;
-    $[15] = preventStagingReplacement;
-    $[16] = system.url;
-    $[17] = t4;
+    $[15] = environment.buildEnvironment;
+    $[16] = preventStagingReplacement;
+    $[17] = system.url;
+    $[18] = t4;
   } else {
-    t4 = $[17];
+    t4 = $[18];
   }
   let t5;
-  if ($[18] !== environment.buildEnvironment || $[19] !== preventStagingReplacement || $[20] !== system.serverUrl) {
+  if ($[19] !== environment.buildEnvironment || $[20] !== preventStagingReplacement || $[21] !== system.serverUrl) {
     t5 = (0, _url.replaceStagingUrl)(preventStagingReplacement, system.serverUrl, environment.buildEnvironment);
-    $[18] = environment.buildEnvironment;
-    $[19] = preventStagingReplacement;
-    $[20] = system.serverUrl;
-    $[21] = t5;
+    $[19] = environment.buildEnvironment;
+    $[20] = preventStagingReplacement;
+    $[21] = system.serverUrl;
+    $[22] = t5;
   } else {
-    t5 = $[21];
+    t5 = $[22];
   }
   let t6;
-  if ($[22] !== system.module || $[23] !== system.preventSingleton || $[24] !== system.scope || $[25] !== t4 || $[26] !== t5) {
+  if ($[23] !== system.module || $[24] !== system.preventSingleton || $[25] !== system.scope || $[26] !== t4 || $[27] !== t5) {
     t6 = {
       scope: t3,
       url: t4,
@@ -129,33 +133,35 @@ const ModuleHost = t0 => {
       module: system.module,
       preventSingleton: system.preventSingleton
     };
-    $[22] = system.module;
-    $[23] = system.preventSingleton;
-    $[24] = system.scope;
-    $[25] = t4;
-    $[26] = t5;
-    $[27] = t6;
+    $[23] = system.module;
+    $[24] = system.preventSingleton;
+    $[25] = system.scope;
+    $[26] = t4;
+    $[27] = t5;
+    $[28] = t6;
   } else {
-    t6 = $[27];
+    t6 = $[28];
   }
   let t7;
-  if ($[28] !== children || $[29] !== customFunctions || $[30] !== data || $[31] !== functions || $[32] !== t6) {
+  if ($[29] !== children || $[30] !== customFunctions || $[31] !== data || $[32] !== functions || $[33] !== historyLayer || $[34] !== t6) {
     t7 = _react.default.createElement(_react.default.Fragment, null, t2, _react.default.createElement(System, {
       system: t6,
       data: data,
       functions: functions,
       customFunctions: customFunctions,
       fallback: children,
+      historyLayer: historyLayer,
       isModule: true
     }));
-    $[28] = children;
-    $[29] = customFunctions;
-    $[30] = data;
-    $[31] = functions;
-    $[32] = t6;
-    $[33] = t7;
+    $[29] = children;
+    $[30] = customFunctions;
+    $[31] = data;
+    $[32] = functions;
+    $[33] = historyLayer;
+    $[34] = t6;
+    $[35] = t7;
   } else {
-    t7 = $[33];
+    t7 = $[35];
   }
   return t7;
 };