chayns-api 2.6.0-beta.2 → 2.6.0-beta.4

package/dist/esm/hooks/usePages.js

@@ -1,22 +1,20 @@
 import { moduleWrapper } from '../components/moduleWrapper';
 import { useValuesSelector } from './context';
-export const usePages = function () {
-  let {
-    siteId
-  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-    siteId: undefined
-  };
+export const usePages = ({
+  siteId
+} = {
+  siteId: undefined
+}) => {
   const pages = useValuesSelector(v => v.pages);
   if (siteId) {
     pages.filter(tapp => tapp.siteId === siteId);
   }
   return pages;
 };
-export const usePage = _ref => {
-  let {
-    id,
-    siteId
-  } = _ref;
+export const usePage = ({
+  id,
+  siteId
+}) => {
   const pages = useValuesSelector(v => v.pages);
   if (id) {
     var _pages$find;
@@ -24,15 +22,14 @@ export const usePage = _ref => {
   }
   return null;
 };
-export const getPage = function () {
+export const getPage = ({
+  id,
+  siteId
+} = {
+  id: null,
+  siteId: null
+}) => {
   var _pages$find3;
-  let {
-    id,
-    siteId
-  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-    id: null,
-    siteId: null
-  };
   const {
     pages,
     currentPage

package/dist/esm/hooks/windowMetricsListener.js

@@ -13,10 +13,9 @@ export const useWindowMetricsListener = () => {
     };
   }, []);
 };
-export const useWindowMetrics = function () {
-  let {
-    enabled = true
-  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+export const useWindowMetrics = ({
+  enabled = true
+} = {}) => {
   const [value, setValue] = useState({
     bottomBarHeight: 0,
     offsetTop: 0,

package/dist/esm/host/ChaynsHost.js

@@ -1,30 +1,29 @@
 import React, { startTransition, useEffect, useState } from 'react';
 import HostIframe from './iframe/HostIframe';
 import ModuleHost from './module/ModuleHost';
-const ChaynsHost = _ref => {
-  let {
-    type,
-    iFrameProps,
-    functions,
-    customFunctions,
-    src,
-    iFrameRef = undefined,
-    loadingComponent = undefined,
-    system,
-    pages,
-    language,
-    isAdminModeActive,
-    site,
-    user,
-    currentPage,
-    device,
-    parameters,
-    customData,
-    environment,
-    preventStagingReplacement,
-    dialog,
-    styleSettings
-  } = _ref;
+const ChaynsHost = ({
+  type,
+  iFrameProps,
+  functions,
+  customFunctions,
+  src,
+  iFrameRef = undefined,
+  loadingComponent = undefined,
+  system,
+  pages,
+  language,
+  isAdminModeActive,
+  site,
+  user,
+  currentPage,
+  device,
+  parameters,
+  customData,
+  environment,
+  preventStagingReplacement,
+  dialog,
+  styleSettings
+}) => {
   const [isVisible, setIsVisible] = useState(type !== 'client-module' && (type !== 'server-module' || !!(system !== null && system !== void 0 && system.serverUrl)));
   useEffect(() => {
     if (isVisible) return;

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

@@ -4,28 +4,27 @@ import * as comlink from 'comlink';
 import postIframeForm from '../../util/postIframeForm';
 import useUpdateData from './utils/useUpdateData';
 import { replaceStagingUrl } from "../../util/url";
-const HostIframe = _ref => {
-  let {
-    iFrameProps,
-    src,
-    postForm = false,
-    iFrameRef,
-    pages,
-    isAdminModeActive,
-    site,
-    user,
-    currentPage,
-    functions,
-    customFunctions,
-    device,
-    language,
-    parameters,
-    environment,
-    customData,
-    preventStagingReplacement,
-    dialog,
-    styleSettings
-  } = _ref;
+const HostIframe = ({
+  iFrameProps,
+  src,
+  postForm = false,
+  iFrameRef,
+  pages,
+  isAdminModeActive,
+  site,
+  user,
+  currentPage,
+  functions,
+  customFunctions,
+  device,
+  language,
+  parameters,
+  environment,
+  customData,
+  preventStagingReplacement,
+  dialog,
+  styleSettings
+}) => {
   const eventTarget = useRef();
   const ref = useRef();
   const currentDataRef = useRef();

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

@@ -2,12 +2,11 @@ import React, { useContext, useMemo } from 'react';
 import { ModuleContext } from '../../constants/moduleContext';
 import loadComponent from './utils/loadComponent';
 import { replaceStagingUrl } from "../../util/url";
-const System = _ref => {
-  let {
-    system,
-    fallback,
-    ...props
-  } = _ref;
+const System = ({
+  system,
+  fallback,
+  ...props
+}) => {
   const Component = useMemo(() => loadComponent(system.scope, system.module, globalThis.window ? system.url : system.serverUrl, undefined, system.preventSingleton), [system.scope, system.module, system.url, system.serverUrl, system.preventSingleton]);
   if (!globalThis.window) {
     var _system$scope, _moduleContext$_syste;
@@ -22,26 +21,25 @@ const System = _ref => {
     fallback: fallback || ''
   }, React.createElement(Component, props));
 };
-const ModuleHost = _ref2 => {
-  let {
-    system,
-    children = null,
-    functions,
-    customFunctions,
-    pages,
-    isAdminModeActive,
-    site,
-    user,
-    currentPage,
-    device,
-    language,
-    parameters,
-    customData,
-    dialog,
-    environment,
-    preventStagingReplacement,
-    styleSettings
-  } = _ref2;
+const ModuleHost = ({
+  system,
+  children = null,
+  functions,
+  customFunctions,
+  pages,
+  isAdminModeActive,
+  site,
+  user,
+  currentPage,
+  device,
+  language,
+  parameters,
+  customData,
+  dialog,
+  environment,
+  preventStagingReplacement,
+  styleSettings
+}) => {
   const data = useMemo(() => {
     const result = {
       site,

package/dist/esm/host/module/utils/loadComponent.js

@@ -1,17 +1,13 @@
 import React from "react";
-export const loadModule = function (scope, module, url) {
-  let preventSingleton = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  if (!globalThis.moduleFederationRuntime || !globalThis.moduleFederationScopes) {
+export const loadModule = (scope, module, url, preventSingleton = false) => {
+  if (!globalThis.moduleFederationScopes) {
     throw new Error('[chayns-api] moduleFederationSharing has not been initialized. Make sure to call initModuleFederationSharing.');
   }
-  const {
-    loadRemote,
-    registerRemotes
-  } = globalThis.moduleFederationRuntime;
   const {
     registeredScopes,
     moduleMap,
-    componentMap
+    componentMap,
+    getInstance
   } = globalThis.moduleFederationScopes;
   try {
     url = new URL(url).toString();
@@ -20,7 +16,7 @@ export const loadModule = function (scope, module, url) {
     if (scope in registeredScopes) {
       console.error(`[chayns-api] call registerRemote with force for scope ${scope}. url: ${url}`);
     }
-    registerRemotes([{
+    getInstance().registerRemotes([{
       shareScope: url.endsWith('v2.remoteEntry.js') || url.endsWith('mf-manifest.json') ? 'chayns-api' : 'default',
       name: scope,
       entry: url,
@@ -34,7 +30,7 @@ export const loadModule = function (scope, module, url) {
   }
   if (!(module in moduleMap[scope])) {
     const path = `${scope}/${module.replace(/^\.\//, '')}`;
-    const promise = loadRemote(path);
+    const promise = getInstance().loadRemote(path);
     promise.catch(e => {
       console.error("[chayns-api] Failed to load module", scope, url, e);
       registeredScopes[scope] = '';
@@ -43,22 +39,17 @@ export const loadModule = function (scope, module, url) {
   }
   return moduleMap[scope][module];
 };
-const loadComponent = function (scope, module, url) {
-  let skipCompatMode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  let preventSingleton = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+const loadComponent = (scope, module, url, skipCompatMode = false, preventSingleton = false) => {
   if (skipCompatMode) {
     console.warn('[chayns-api] skipCompatMode-option is deprecated and is set automatically now');
   }
-  if (!globalThis.moduleFederationRuntime || !globalThis.moduleFederationScopes) {
+  if (!globalThis.moduleFederationScopes) {
     throw new Error('[chayns-api] moduleFederationSharing has not been initialized. Make sure to call initModuleFederationSharing.');
   }
-  const {
-    loadShareSync,
-    getInstance
-  } = globalThis.moduleFederationRuntime;
   const {
     componentMap,
-    registeredScopes
+    registeredScopes,
+    getInstance
   } = globalThis.moduleFederationScopes;
   if (!componentMap[scope]) {
     componentMap[scope] = {};
@@ -69,21 +60,7 @@ const loadComponent = function (scope, module, url) {
       if (typeof Module.default === 'function') {
         return Module;
       }
-      const shareScopes = typeof getInstance === 'function' ? getInstance().shareScopeMap : await new Promise(resolve => {
-        loadShareSync('react', {
-          resolver: shareOptions => {
-            const optionsMap = shareOptions.reduce((p, e) => {
-              p[e.version] = e;
-              e.version;
-              return p;
-            }, {});
-            resolve({
-              'chayns-api': optionsMap
-            });
-            return shareOptions[0];
-          }
-        });
-      });
+      const shareScopes = getInstance().shareScopeMap;
       const sharedReact = (_shareScopes$chaynsA = shareScopes['chayns-api'].react) === null || _shareScopes$chaynsA === void 0 ? void 0 : _shareScopes$chaynsA[React.version];
       const matchReactVersion = sharedReact && sharedReact.useIn.includes(scope) && ((_sharedReact$lib = sharedReact.lib) === null || _sharedReact$lib === void 0 ? void 0 : _sharedReact$lib.call(sharedReact)) === React;
       if (!matchReactVersion || Module.default.environment !== 'production' || (Module.default.version || 1) < 2) {

package/dist/esm/plugins/TrustedDomainsPlugins.js

@@ -0,0 +1,25 @@
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class TrustedDomainsError extends Error {
+  constructor(entry) {
+    super('Remote entry ' + entry + ' is not in trusted domains');
+    _defineProperty(this, "name", 'TrustedDomainsError');
+  }
+}
+export const TrustedDomainsPlugin = (trustedDomains = []) => {
+  return {
+    name: 'trusted-domains',
+    beforeRequest(args) {
+      args.options.remotes.forEach(remote => {
+        if ('entry' in remote) {
+          const parsed = new URL(remote.entry);
+          if (!trustedDomains.some(domain => parsed.hostname.endsWith(domain))) {
+            throw new TrustedDomainsError(remote.entry);
+          }
+        }
+      });
+      return args;
+    }
+  };
+};

package/dist/esm/plugins/index.js

@@ -1 +1,2 @@
-export { SSRManifestPlugin } from './SSRManifestPlugin';
+export { SSRManifestPlugin } from './SSRManifestPlugin';
+export { TrustedDomainsPlugin } from './TrustedDomainsPlugins';

package/dist/esm/types/IChaynsReact.js

@@ -60,6 +60,7 @@ export let ScreenSize = function (ScreenSize) {
 export let AppFlavor = function (AppFlavor) {
   AppFlavor["None"] = "none";
   AppFlavor["Chayns"] = "chayns";
+  AppFlavor["Electron"] = "electron";
   return AppFlavor;
 }({});
 export let AccessMode = function (AccessMode) {
@@ -135,12 +136,6 @@ export let DesignSettingsUpdateCoverTypes = function (DesignSettingsUpdateCoverT
   DesignSettingsUpdateCoverTypes[DesignSettingsUpdateCoverTypes["None"] = 4] = "None";
   return DesignSettingsUpdateCoverTypes;
 }({});
-export let DesignSettingsUpdateColorSchemeMode = function (DesignSettingsUpdateColorSchemeMode) {
-  DesignSettingsUpdateColorSchemeMode[DesignSettingsUpdateColorSchemeMode["Normal"] = 0] = "Normal";
-  DesignSettingsUpdateColorSchemeMode[DesignSettingsUpdateColorSchemeMode["Dark"] = 1] = "Dark";
-  DesignSettingsUpdateColorSchemeMode[DesignSettingsUpdateColorSchemeMode["Bright"] = 2] = "Bright";
-  return DesignSettingsUpdateColorSchemeMode;
-}({});
 export let DesignSettingsUpdateTappViewModes = function (DesignSettingsUpdateTappViewModes) {
   DesignSettingsUpdateTappViewModes[DesignSettingsUpdateTappViewModes["Normal"] = 0] = "Normal";
   DesignSettingsUpdateTappViewModes[DesignSettingsUpdateTappViewModes["Exclusive"] = 1] = "Exclusive";
@@ -251,6 +246,7 @@ export let AppName = function (AppName) {
   AppName[AppName["Team"] = 8] = "Team";
   AppName[AppName["CityApp"] = 9] = "CityApp";
   AppName[AppName["ElectronChayns"] = 10] = "ElectronChayns";
+  AppName[AppName["ElectronTeam"] = 11] = "ElectronTeam";
   return AppName;
 }({});
 export let BrowserName = function (BrowserName) {

package/dist/esm/util/appStorage.js

@@ -7,8 +7,7 @@ export function isAppStorageAvailable() {
   }
   return ((_this$values$device$a2 = this.values.device.app) === null || _this$values$device$a2 === void 0 ? void 0 : _this$values$device$a2.appVersion) >= (['iOS', 'Mac OS'].includes(this.values.device.os) ? 1046 : 1033);
 }
-export function getAppStorageItem(storeName, key) {
-  let callbackPrefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'chaynsApiV5Callback';
+export function getAppStorageItem(storeName, key, callbackPrefix = 'chaynsApiV5Callback') {
   const callbackName = `${callbackPrefix}_${this.counter++}`;
   return new Promise(resolve => {
     window[callbackName] = (_key, _storeName, value) => {
@@ -31,8 +30,7 @@ export function getAppStorageItem(storeName, key) {
     }
   });
 }
-export function setAppStorageItem(storeName, key, value) {
-  let callbackPrefix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'chaynsApiV5Callback';
+export function setAppStorageItem(storeName, key, value, callbackPrefix = 'chaynsApiV5Callback') {
   const callbackName = `${callbackPrefix}_${this.counter++}`;
   return new Promise((resolve, reject) => {
     window[callbackName] = () => {
@@ -70,8 +68,7 @@ export function clearAppStorage(storeName) {
     window.chaynsWebViewStorage.chaynsDataErase(storeName);
   }
 }
-export async function addAppStorageListener(storeName, prefix, callback) {
-  let callbackPrefix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'chaynsApiV5Callback';
+export async function addAppStorageListener(storeName, prefix, callback, callbackPrefix = 'chaynsApiV5Callback') {
   const callbackName = `${callbackPrefix}_${this.counter++}`;
   const {
     shouldInitialize

package/dist/esm/util/deviceHelper.js

@@ -1,32 +1,44 @@
 import { UAParser } from 'ua-parser-js';
 import { AppFlavor, AppName, ScreenSize } from '../types/IChaynsReact';
-const getDeviceInfo = function (userAgent, acceptHeader) {
+const getDeviceInfo = (userAgent, acceptHeader, {
+  imei
+} = {}) => {
   var _match$groups, _match$groups2, _customMatch$groups, _browser$version$spli, _browser$version, _uaParser$getOS, _uaParser$getOS2, _uaParser$getOS3;
-  let {
-    imei
-  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   const uaParser = new UAParser(userAgent);
   let appName = AppName.Unknown;
-  const match = /(?:my)?chayns\/(?<version>\d+).*(?<siteId>\d{5}-\d{5})/i.exec(userAgent);
-  const customMatch = /\s(?<name>intercom|sidekick|team|cityApp|electron-chayns|electron-d3sc)\/(?<version>\d+)/i.exec(userAgent);
+  let appFlavor = AppFlavor.None;
+  const match = /(?:^|\s)(?:my)?chayns\/(?<version>\d+).*(?<siteId>\d{5}-\d{5})/i.exec(userAgent);
+  const customMatch = /\s(?<name>intercom|sidekick|team|cityApp|electron-chayns|electron-d3sc|electron-team)\/(?<version>\d+)/i.exec(userAgent);
   if (/\sintercom\/\d+/i.test(userAgent)) {
     appName = AppName.TobitChat;
+    appFlavor = AppFlavor.Chayns;
   } else if (/\ssidekick\/\d+/i.test(userAgent)) {
     appName = AppName.Sidekick;
+    appFlavor = AppFlavor.Chayns;
   } else if (/\steam\/\d+/i.test(userAgent)) {
     appName = AppName.Team;
+    appFlavor = AppFlavor.Chayns;
   } else if (/\scityApp\/\d+/i.test(userAgent)) {
     appName = AppName.CityApp;
+    appFlavor = AppFlavor.Chayns;
   } else if ((match === null || match === void 0 || (_match$groups = match.groups) === null || _match$groups === void 0 ? void 0 : _match$groups.siteId) === '60021-08989') {
     appName = AppName.Chayns;
+    appFlavor = AppFlavor.Chayns;
   } else if ((match === null || match === void 0 || (_match$groups2 = match.groups) === null || _match$groups2 === void 0 ? void 0 : _match$groups2.siteId) === '77892-10814') {
     appName = AppName.David;
+    appFlavor = AppFlavor.Chayns;
   } else if (match) {
     appName = AppName.Location;
+    appFlavor = AppFlavor.Chayns;
   } else if (/dface|h96pp|h96max|jabiru|chaynsterminal|wayter|odroidn2p|chayns-runtime-custom/i.test(userAgent)) {
     appName = AppName.ChaynsLauncher;
+    appFlavor = AppFlavor.Chayns;
   } else if (/electron-chayns|electron-d3sc/i.test(userAgent)) {
     appName = AppName.ElectronChayns;
+    appFlavor = AppFlavor.Electron;
+  } else if (/electron-team/i.test(userAgent)) {
+    appName = AppName.ElectronTeam;
+    appFlavor = AppFlavor.Electron;
   }
   let appVersion = match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN;
   if (customMatch !== null && customMatch !== void 0 && (_customMatch$groups = customMatch.groups) !== null && _customMatch$groups !== void 0 && _customMatch$groups.version) {
@@ -42,7 +54,7 @@ const getDeviceInfo = function (userAgent, acceptHeader) {
   };
   result.app = {
     name: appName,
-    flavor: appName === AppName.Unknown || appName === AppName.ElectronChayns ? AppFlavor.None : AppFlavor.Chayns,
+    flavor: appFlavor,
     version: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN,
     appVersion,
     callVersion: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN
@@ -56,7 +68,7 @@ const getDeviceInfo = function (userAgent, acceptHeader) {
     result.isTouch = getClientDeviceInfo().isTouch;
   } else {
     const screenSizeByUA = /mobi/i.test(userAgent) ? ScreenSize.SM : ScreenSize.XL;
-    result.screenSize = appName !== AppName.Unknown && appName !== AppName.ElectronChayns ? ScreenSize.XS : screenSizeByUA;
+    result.screenSize = appFlavor === AppFlavor.Chayns ? ScreenSize.XS : screenSizeByUA;
   }
   return result;
 };

package/dist/esm/util/initModuleFederationSharing.js

@@ -5,23 +5,18 @@ let ReactDOMClient;
 try {
   ReactDOMClient = require('react-dom/client');
 } catch (e) {}
-export const initModuleFederationSharing = _ref => {
-  let {
-    name,
-    plugins = []
-  } = _ref;
-  if (globalThis.moduleFederationRuntime) {
+export const initModuleFederationSharing = ({
+  name,
+  plugins = []
+}) => {
+  if (globalThis.moduleFederationScopes) {
     return;
   }
-  globalThis.moduleFederationRuntime = require('@module-federation/enhanced/runtime');
-  globalThis.moduleFederationScopes = {
-    registeredScopes: {},
-    moduleMap: {},
-    componentMap: {}
-  };
+  const runtime = require('@module-federation/enhanced/runtime');
+  globalThis.moduleFederationRuntime = runtime;
   const {
     init
-  } = globalThis.moduleFederationRuntime;
+  } = runtime;
   const shared = {
     react: {
       version: React.version,
@@ -41,10 +36,16 @@ export const initModuleFederationSharing = _ref => {
       lib: () => ReactDOMClient
     };
   }
-  init({
+  const instance = init({
     name: name !== null && name !== void 0 ? name : '',
     remotes: [],
     shared,
     plugins: [SequentialLoadPlugin(), ...plugins]
   });
+  globalThis.moduleFederationScopes = {
+    registeredScopes: {},
+    moduleMap: {},
+    componentMap: {},
+    getInstance: () => instance
+  };
 };

package/dist/esm/util/is.js

@@ -1,15 +1,14 @@
 import { getDevice } from '../calls';
-import { AppName } from '../types/IChaynsReact';
+import { AppFlavor } from '../types/IChaynsReact';
 export const isApp = () => {
-  var _getDevice$app$name, _getDevice$app;
-  return ((_getDevice$app$name = (_getDevice$app = getDevice().app) === null || _getDevice$app === void 0 ? void 0 : _getDevice$app.name) !== null && _getDevice$app$name !== void 0 ? _getDevice$app$name : AppName.Unknown) !== AppName.Unknown;
+  var _getDevice$app;
+  return ((_getDevice$app = getDevice().app) === null || _getDevice$app === void 0 ? void 0 : _getDevice$app.flavor) === AppFlavor.Chayns;
 };
-export const isAppCallSupported = _ref => {
+export const isAppCallSupported = ({
+  minAndroidVersion = 1,
+  minIOSVersion = 1
+}) => {
   var _device$app;
-  let {
-    minAndroidVersion = 1,
-    minIOSVersion = 1
-  } = _ref;
   if (!isApp()) return false;
   const device = getDevice();
   if (!((_device$app = device.app) !== null && _device$app !== void 0 && _device$app.callVersion) || isNaN(device.app.callVersion)) return false;
@@ -20,4 +19,8 @@ export const isAppCallSupported = _ref => {
     return device.app.callVersion >= minAndroidVersion;
   }
   return false;
+};
+export const isElectron = () => {
+  var _getDevice$app2;
+  return ((_getDevice$app2 = getDevice().app) === null || _getDevice$app2 === void 0 ? void 0 : _getDevice$app2.flavor) === AppFlavor.Electron;
 };

package/dist/esm/util/transferNestedFunctions.js

@@ -6,8 +6,7 @@ Comlink.transferHandlers.set("FUNCTION", {
   serialize(obj) {
     obj._functionKeys = [];
     const ports = [];
-    Object.entries(obj).forEach(_ref => {
-      let [k, v] = _ref;
+    Object.entries(obj).forEach(([k, v]) => {
       if (typeof v === 'function') {
         const {
           port1,