chayns-api 2.4.7-beta.0 → 2.4.7

package/dist/cjs/components/ChaynsProvider.js

@@ -39,8 +39,7 @@ const ChaynsProvider = ({
   functions,
   customFunctions,
   renderedByServer,
-  isModule,
-  preventOverrideSingleton
+  isModule
 }) => {
   var _customWrapper$curren, _customWrapper$curren2;
   const customWrapper = (0, _react.useRef)(null);
@@ -66,10 +65,7 @@ const ChaynsProvider = ({
         customWrapper.current = new _FrameWrapper.FrameWrapper();
       }
     }
-    _moduleWrapper.moduleWrapperList.push(customWrapper.current);
-    if (!preventOverrideSingleton || !_moduleWrapper.moduleWrapper.current) {
-      _moduleWrapper.moduleWrapper.current = customWrapper.current;
-    }
+    _moduleWrapper.moduleWrapper.current = customWrapper.current;
   }
   const [isInitialized, setIsInitialized] = (0, _react.useState)(!!((_customWrapper$curren = customWrapper.current) !== null && _customWrapper$curren !== void 0 && _customWrapper$curren.values));
   (0, _react.useEffect)(() => {
@@ -98,14 +94,11 @@ const ChaynsProvider = ({
       customWrapper.current.emitChange();
     }
   }, [customFunctions, isModule]);
-  (0, _react.useEffect)(() => () => {
-    const index = _moduleWrapper.moduleWrapperList.indexOf(customWrapper.current);
-    if (index > -1) {
-      _moduleWrapper.moduleWrapperList.splice(index, 1);
-    }
-    if (_moduleWrapper.moduleWrapper.current === customWrapper.current) {
-      _moduleWrapper.moduleWrapper.current = _moduleWrapper.moduleWrapperList[0];
-    }
+  (0, _react.useEffect)(() => {
+    (0, _moduleWrapper.addModuleWrapper)(customWrapper.current);
+    return () => {
+      (0, _moduleWrapper.removeModuleWrapper)(customWrapper.current);
+    };
   }, []);
   return _react.default.createElement(_react.default.Fragment, null, isInitialized && _react.default.createElement(_ChaynsContext.ChaynsContext.Provider, {
     value: customWrapper.current

package/dist/cjs/components/moduleWrapper.js

@@ -3,8 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.moduleWrapperList = exports.moduleWrapper = void 0;
-const moduleWrapperList = exports.moduleWrapperList = [];
+exports.removeModuleWrapper = exports.moduleWrapper = exports.addModuleWrapper = void 0;
+const moduleWrapperStack = [];
+let current = undefined;
 const moduleWrapper = exports.moduleWrapper = {
-  current: undefined
-};
+  get current() {
+    if (moduleWrapperStack.length === 0 && !current) {
+      throw new Error("No chayns api instance intialized");
+    }
+    return moduleWrapperStack.at(-1) || current;
+  },
+  set current(chayns) {
+    current = chayns;
+  }
+};
+const addModuleWrapper = chayns => {
+  moduleWrapperStack.push(chayns);
+};
+exports.addModuleWrapper = addModuleWrapper;
+const removeModuleWrapper = chayns => {
+  const index = moduleWrapperStack.indexOf(chayns);
+  if (index > -1) {
+    moduleWrapperStack.splice(index, 1);
+  }
+};
+exports.removeModuleWrapper = removeModuleWrapper;

package/dist/esm/components/ChaynsProvider.js

@@ -7,7 +7,7 @@ import { FrameWrapper } from '../wrapper/FrameWrapper';
 import { ModuleFederationWrapper } from '../wrapper/ModuleFederationWrapper';
 import { SsrWrapper } from '../wrapper/SsrWrapper';
 import { ChaynsContext } from './ChaynsContext';
-import { moduleWrapper, moduleWrapperList } from './moduleWrapper';
+import { addModuleWrapper, moduleWrapper, removeModuleWrapper } from './moduleWrapper';
 const isServer = typeof window === 'undefined';
 const InitialDataProvider = React.memo(_ref => {
   let {
@@ -33,8 +33,7 @@ const ChaynsProvider = _ref2 => {
     functions,
     customFunctions,
     renderedByServer,
-    isModule,
-    preventOverrideSingleton
+    isModule
   } = _ref2;
   const customWrapper = useRef(null);
   if (!customWrapper.current) {
@@ -59,10 +58,7 @@ const ChaynsProvider = _ref2 => {
         customWrapper.current = new FrameWrapper();
       }
     }
-    moduleWrapperList.push(customWrapper.current);
-    if (!preventOverrideSingleton || !moduleWrapper.current) {
-      moduleWrapper.current = customWrapper.current;
-    }
+    moduleWrapper.current = customWrapper.current;
   }
   const [isInitialized, setIsInitialized] = useState(!!((_customWrapper$curren = customWrapper.current) !== null && _customWrapper$curren !== void 0 && _customWrapper$curren.values));
   useEffect(() => {
@@ -92,14 +88,11 @@ const ChaynsProvider = _ref2 => {
       customWrapper.current.emitChange();
     }
   }, [customFunctions, isModule]);
-  useEffect(() => () => {
-    const index = moduleWrapperList.indexOf(customWrapper.current);
-    if (index > -1) {
-      moduleWrapperList.splice(index, 1);
-    }
-    if (moduleWrapper.current === customWrapper.current) {
-      moduleWrapper.current = moduleWrapperList[0];
-    }
+  useEffect(() => {
+    addModuleWrapper(customWrapper.current);
+    return () => {
+      removeModuleWrapper(customWrapper.current);
+    };
   }, []);
   return React.createElement(React.Fragment, null, isInitialized && React.createElement(ChaynsContext.Provider, {
     value: customWrapper.current

package/dist/esm/components/moduleWrapper.js

@@ -1,4 +1,22 @@
-export const moduleWrapperList = [];
+const moduleWrapperStack = [];
+let current = undefined;
 export const moduleWrapper = {
-  current: undefined
+  get current() {
+    if (moduleWrapperStack.length === 0 && !current) {
+      throw new Error("No chayns api instance intialized");
+    }
+    return moduleWrapperStack.at(-1) || current;
+  },
+  set current(chayns) {
+    current = chayns;
+  }
+};
+export const addModuleWrapper = chayns => {
+  moduleWrapperStack.push(chayns);
+};
+export const removeModuleWrapper = chayns => {
+  const index = moduleWrapperStack.indexOf(chayns);
+  if (index > -1) {
+    moduleWrapperStack.splice(index, 1);
+  }
 };

package/dist/types/components/ChaynsProvider.d.ts

@@ -7,7 +7,6 @@ type ChaynsProviderProps = {
     renderedByServer?: boolean;
     isModule?: boolean;
     children?: ReactNode;
-    preventOverrideSingleton?: boolean;
 };
 declare const ChaynsProvider: React.FC<ChaynsProviderProps>;
 export default ChaynsProvider;

package/dist/types/components/moduleWrapper.d.ts

@@ -1,5 +1,6 @@
 import { IChaynsReact } from '../types/IChaynsReact';
-export declare const moduleWrapperList: IChaynsReact[];
 export declare const moduleWrapper: {
     current: IChaynsReact;
 };
+export declare const addModuleWrapper: (chayns: IChaynsReact) => void;
+export declare const removeModuleWrapper: (chayns: IChaynsReact) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chayns-api",
-    "version": "2.4.7-beta.0",
+    "version": "2.4.7",
     "description": "new chayns api",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",