@merkur/plugin-component 0.36.0 → 0.37.9

package/helpers.d.ts

@@ -0,0 +1,31 @@
+import { Widget } from '@merkur/core';
+import {
+  ViewFactory,
+  ViewFactorySlotType,
+  ViewType,
+} from '@merkur/plugin-component';
+export type MapViewArgs = {
+  View: ViewType;
+  ErrorView?: ViewType;
+  containerSelector: string;
+  container: Element | null;
+  isSlot: boolean;
+  slot?: Record<
+    string,
+    {
+      isSlot: boolean;
+      containerSelector?: string;
+      container?: Element;
+    } & ViewFactorySlotType
+  >;
+};
+/**
+ * Utility function to iterate thorugh views returned from
+ * view factory and call callback function with view arguments
+ * on each them.
+ */
+export declare function mapViews<T>(
+  widget: Widget,
+  viewFactory: ViewFactory,
+  callback: (viewArgs: MapViewArgs) => T,
+): Promise<void[]>;

package/lib/helpers.cjs

@@ -6,45 +6,59 @@
  * on each them.
  */
 async function mapViews(widget, viewFactory, callback) {
-    if (widget.$in.component.resolvedViews.has(viewFactory)) {
-        return mapResolvedViews(widget.$in.component.resolvedViews.get(viewFactory) ?? [], callback);
-    }
-    const { containerSelector } = widget;
-    const { View, ErrorView, slot = {} } = await viewFactory(widget);
-    // Add additional slot information to slot views
-    const slots = Object.keys(widget.slot ?? {}).reduce((acc, cur) => {
-        acc[cur] = {
-            ...slot[cur],
-            isSlot: true,
-            containerSelector: widget.slot[cur]?.containerSelector,
-            container: widget.slot[cur]?.container,
-        };
-        return acc;
-    }, {});
-    const views = [
-        {
-            View,
-            ErrorView,
-            containerSelector,
-            isSlot: false,
-            container: widget.container,
-        },
-        ...Object.values(slots),
-    ];
-    widget.$in.component.resolvedViews.set(viewFactory, views);
-    return mapResolvedViews(views, callback);
+  if (widget.$in.component.resolvedViews.has(viewFactory)) {
+    return mapResolvedViews(
+      widget.$in.component.resolvedViews.get(viewFactory) ?? [],
+      callback,
+    );
+  }
+
+  const { containerSelector } = widget;
+  const { View, ErrorView, slot = {} } = await viewFactory(widget);
+
+  // Add additional slot information to slot views
+  const slots = Object.keys(widget.slot ?? {}).reduce((acc, cur) => {
+    acc[cur] = {
+      ...slot[cur],
+      isSlot: true,
+      containerSelector: widget.slot[cur]?.containerSelector,
+      container: widget.slot[cur]?.container,
+    };
+
+    return acc;
+  }, {});
+
+  const views = [
+    {
+      View,
+      ErrorView,
+      containerSelector,
+      isSlot: false,
+      container: widget.container,
+    },
+    ...Object.values(slots),
+  ];
+
+  widget.$in.component.resolvedViews.set(viewFactory, views);
+
+  return mapResolvedViews(views, callback);
 }
+
 function mapResolvedViews(views, callback) {
-    return views.map(({ View, containerSelector, isSlot, container }) => {
-        callback({
-            View,
-            isSlot,
-            containerSelector,
-            container: (containerSelector && document?.querySelector(containerSelector)) ||
-                container ||
-                null,
-        });
-    });
+  return views.map(
+    ({ View, ErrorView, containerSelector, isSlot, container }) => {
+      callback({
+        View,
+        ErrorView,
+        isSlot,
+        containerSelector,
+        container:
+          (containerSelector && document?.querySelector(containerSelector)) ||
+          container ||
+          null,
+      });
+    },
+  );
 }
 
 exports.mapViews = mapViews;

package/lib/helpers.es9.cjs

@@ -6,47 +6,57 @@
  * on each them.
  */
 async function mapViews(widget, viewFactory, callback) {
-    var _a, _b;
-    if (widget.$in.component.resolvedViews.has(viewFactory)) {
-        return mapResolvedViews((_a = widget.$in.component.resolvedViews.get(viewFactory)) !== null && _a !== void 0 ? _a : [], callback);
-    }
-    const { containerSelector } = widget;
-    const { View, ErrorView, slot = {} } = await viewFactory(widget);
-    // Add additional slot information to slot views
-    const slots = Object.keys((_b = widget.slot) !== null && _b !== void 0 ? _b : {}).reduce((acc, cur) => {
-        var _a, _b;
-        acc[cur] = {
-            ...slot[cur],
-            isSlot: true,
-            containerSelector: (_a = widget.slot[cur]) === null || _a === void 0 ? void 0 : _a.containerSelector,
-            container: (_b = widget.slot[cur]) === null || _b === void 0 ? void 0 : _b.container,
-        };
-        return acc;
-    }, {});
-    const views = [
-        {
-            View,
-            ErrorView,
-            containerSelector,
-            isSlot: false,
-            container: widget.container,
-        },
-        ...Object.values(slots),
-    ];
-    widget.$in.component.resolvedViews.set(viewFactory, views);
-    return mapResolvedViews(views, callback);
+  var _widget$slot;
+  if (widget.$in.component.resolvedViews.has(viewFactory)) {
+    var _widget$$in$component;
+    return mapResolvedViews((_widget$$in$component = widget.$in.component.resolvedViews.get(viewFactory)) !== null && _widget$$in$component !== void 0 ? _widget$$in$component : [], callback);
+  }
+  const {
+    containerSelector
+  } = widget;
+  const {
+    View,
+    ErrorView,
+    slot = {}
+  } = await viewFactory(widget);
+
+  // Add additional slot information to slot views
+  const slots = Object.keys((_widget$slot = widget.slot) !== null && _widget$slot !== void 0 ? _widget$slot : {}).reduce((acc, cur) => {
+    var _widget$slot$cur, _widget$slot$cur2;
+    acc[cur] = {
+      ...slot[cur],
+      isSlot: true,
+      containerSelector: (_widget$slot$cur = widget.slot[cur]) === null || _widget$slot$cur === void 0 ? void 0 : _widget$slot$cur.containerSelector,
+      container: (_widget$slot$cur2 = widget.slot[cur]) === null || _widget$slot$cur2 === void 0 ? void 0 : _widget$slot$cur2.container
+    };
+    return acc;
+  }, {});
+  const views = [{
+    View,
+    ErrorView,
+    containerSelector,
+    isSlot: false,
+    container: widget.container
+  }, ...Object.values(slots)];
+  widget.$in.component.resolvedViews.set(viewFactory, views);
+  return mapResolvedViews(views, callback);
 }
 function mapResolvedViews(views, callback) {
-    return views.map(({ View, containerSelector, isSlot, container }) => {
-        callback({
-            View,
-            isSlot,
-            containerSelector,
-            container: (containerSelector && (document === null || document === void 0 ? void 0 : document.querySelector(containerSelector))) ||
-                container ||
-                null,
-        });
+  return views.map(({
+    View,
+    ErrorView,
+    containerSelector,
+    isSlot,
+    container
+  }) => {
+    var _document;
+    callback({
+      View,
+      ErrorView,
+      isSlot,
+      containerSelector,
+      container: containerSelector && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector(containerSelector)) || container || null
     });
+  });
 }
-
 exports.mapViews = mapViews;

package/lib/helpers.es9.mjs

@@ -4,47 +4,57 @@
  * on each them.
  */
 async function mapViews(widget, viewFactory, callback) {
-    var _a, _b;
-    if (widget.$in.component.resolvedViews.has(viewFactory)) {
-        return mapResolvedViews((_a = widget.$in.component.resolvedViews.get(viewFactory)) !== null && _a !== void 0 ? _a : [], callback);
-    }
-    const { containerSelector } = widget;
-    const { View, ErrorView, slot = {} } = await viewFactory(widget);
-    // Add additional slot information to slot views
-    const slots = Object.keys((_b = widget.slot) !== null && _b !== void 0 ? _b : {}).reduce((acc, cur) => {
-        var _a, _b;
-        acc[cur] = {
-            ...slot[cur],
-            isSlot: true,
-            containerSelector: (_a = widget.slot[cur]) === null || _a === void 0 ? void 0 : _a.containerSelector,
-            container: (_b = widget.slot[cur]) === null || _b === void 0 ? void 0 : _b.container,
-        };
-        return acc;
-    }, {});
-    const views = [
-        {
-            View,
-            ErrorView,
-            containerSelector,
-            isSlot: false,
-            container: widget.container,
-        },
-        ...Object.values(slots),
-    ];
-    widget.$in.component.resolvedViews.set(viewFactory, views);
-    return mapResolvedViews(views, callback);
+  var _widget$slot;
+  if (widget.$in.component.resolvedViews.has(viewFactory)) {
+    var _widget$$in$component;
+    return mapResolvedViews((_widget$$in$component = widget.$in.component.resolvedViews.get(viewFactory)) !== null && _widget$$in$component !== void 0 ? _widget$$in$component : [], callback);
+  }
+  const {
+    containerSelector
+  } = widget;
+  const {
+    View,
+    ErrorView,
+    slot = {}
+  } = await viewFactory(widget);
+
+  // Add additional slot information to slot views
+  const slots = Object.keys((_widget$slot = widget.slot) !== null && _widget$slot !== void 0 ? _widget$slot : {}).reduce((acc, cur) => {
+    var _widget$slot$cur, _widget$slot$cur2;
+    acc[cur] = {
+      ...slot[cur],
+      isSlot: true,
+      containerSelector: (_widget$slot$cur = widget.slot[cur]) === null || _widget$slot$cur === void 0 ? void 0 : _widget$slot$cur.containerSelector,
+      container: (_widget$slot$cur2 = widget.slot[cur]) === null || _widget$slot$cur2 === void 0 ? void 0 : _widget$slot$cur2.container
+    };
+    return acc;
+  }, {});
+  const views = [{
+    View,
+    ErrorView,
+    containerSelector,
+    isSlot: false,
+    container: widget.container
+  }, ...Object.values(slots)];
+  widget.$in.component.resolvedViews.set(viewFactory, views);
+  return mapResolvedViews(views, callback);
 }
 function mapResolvedViews(views, callback) {
-    return views.map(({ View, containerSelector, isSlot, container }) => {
-        callback({
-            View,
-            isSlot,
-            containerSelector,
-            container: (containerSelector && (document === null || document === void 0 ? void 0 : document.querySelector(containerSelector))) ||
-                container ||
-                null,
-        });
+  return views.map(({
+    View,
+    ErrorView,
+    containerSelector,
+    isSlot,
+    container
+  }) => {
+    var _document;
+    callback({
+      View,
+      ErrorView,
+      isSlot,
+      containerSelector,
+      container: containerSelector && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector(containerSelector)) || container || null
     });
+  });
 }
-
 export { mapViews };

package/lib/helpers.js

@@ -6,45 +6,59 @@
  * on each them.
  */
 async function mapViews(widget, viewFactory, callback) {
-    if (widget.$in.component.resolvedViews.has(viewFactory)) {
-        return mapResolvedViews(widget.$in.component.resolvedViews.get(viewFactory) ?? [], callback);
-    }
-    const { containerSelector } = widget;
-    const { View, ErrorView, slot = {} } = await viewFactory(widget);
-    // Add additional slot information to slot views
-    const slots = Object.keys(widget.slot ?? {}).reduce((acc, cur) => {
-        acc[cur] = {
-            ...slot[cur],
-            isSlot: true,
-            containerSelector: widget.slot[cur]?.containerSelector,
-            container: widget.slot[cur]?.container,
-        };
-        return acc;
-    }, {});
-    const views = [
-        {
-            View,
-            ErrorView,
-            containerSelector,
-            isSlot: false,
-            container: widget.container,
-        },
-        ...Object.values(slots),
-    ];
-    widget.$in.component.resolvedViews.set(viewFactory, views);
-    return mapResolvedViews(views, callback);
+  if (widget.$in.component.resolvedViews.has(viewFactory)) {
+    return mapResolvedViews(
+      widget.$in.component.resolvedViews.get(viewFactory) ?? [],
+      callback,
+    );
+  }
+
+  const { containerSelector } = widget;
+  const { View, ErrorView, slot = {} } = await viewFactory(widget);
+
+  // Add additional slot information to slot views
+  const slots = Object.keys(widget.slot ?? {}).reduce((acc, cur) => {
+    acc[cur] = {
+      ...slot[cur],
+      isSlot: true,
+      containerSelector: widget.slot[cur]?.containerSelector,
+      container: widget.slot[cur]?.container,
+    };
+
+    return acc;
+  }, {});
+
+  const views = [
+    {
+      View,
+      ErrorView,
+      containerSelector,
+      isSlot: false,
+      container: widget.container,
+    },
+    ...Object.values(slots),
+  ];
+
+  widget.$in.component.resolvedViews.set(viewFactory, views);
+
+  return mapResolvedViews(views, callback);
 }
+
 function mapResolvedViews(views, callback) {
-    return views.map(({ View, containerSelector, isSlot, container }) => {
-        callback({
-            View,
-            isSlot,
-            containerSelector,
-            container: (containerSelector && document?.querySelector(containerSelector)) ||
-                container ||
-                null,
-        });
-    });
+  return views.map(
+    ({ View, ErrorView, containerSelector, isSlot, container }) => {
+      callback({
+        View,
+        ErrorView,
+        isSlot,
+        containerSelector,
+        container:
+          (containerSelector && document?.querySelector(containerSelector)) ||
+          container ||
+          null,
+      });
+    },
+  );
 }
 
 exports.mapViews = mapViews;

package/lib/helpers.mjs

@@ -4,45 +4,59 @@
  * on each them.
  */
 async function mapViews(widget, viewFactory, callback) {
-    if (widget.$in.component.resolvedViews.has(viewFactory)) {
-        return mapResolvedViews(widget.$in.component.resolvedViews.get(viewFactory) ?? [], callback);
-    }
-    const { containerSelector } = widget;
-    const { View, ErrorView, slot = {} } = await viewFactory(widget);
-    // Add additional slot information to slot views
-    const slots = Object.keys(widget.slot ?? {}).reduce((acc, cur) => {
-        acc[cur] = {
-            ...slot[cur],
-            isSlot: true,
-            containerSelector: widget.slot[cur]?.containerSelector,
-            container: widget.slot[cur]?.container,
-        };
-        return acc;
-    }, {});
-    const views = [
-        {
-            View,
-            ErrorView,
-            containerSelector,
-            isSlot: false,
-            container: widget.container,
-        },
-        ...Object.values(slots),
-    ];
-    widget.$in.component.resolvedViews.set(viewFactory, views);
-    return mapResolvedViews(views, callback);
+  if (widget.$in.component.resolvedViews.has(viewFactory)) {
+    return mapResolvedViews(
+      widget.$in.component.resolvedViews.get(viewFactory) ?? [],
+      callback,
+    );
+  }
+
+  const { containerSelector } = widget;
+  const { View, ErrorView, slot = {} } = await viewFactory(widget);
+
+  // Add additional slot information to slot views
+  const slots = Object.keys(widget.slot ?? {}).reduce((acc, cur) => {
+    acc[cur] = {
+      ...slot[cur],
+      isSlot: true,
+      containerSelector: widget.slot[cur]?.containerSelector,
+      container: widget.slot[cur]?.container,
+    };
+
+    return acc;
+  }, {});
+
+  const views = [
+    {
+      View,
+      ErrorView,
+      containerSelector,
+      isSlot: false,
+      container: widget.container,
+    },
+    ...Object.values(slots),
+  ];
+
+  widget.$in.component.resolvedViews.set(viewFactory, views);
+
+  return mapResolvedViews(views, callback);
 }
+
 function mapResolvedViews(views, callback) {
-    return views.map(({ View, containerSelector, isSlot, container }) => {
-        callback({
-            View,
-            isSlot,
-            containerSelector,
-            container: (containerSelector && document?.querySelector(containerSelector)) ||
-                container ||
-                null,
-        });
-    });
+  return views.map(
+    ({ View, ErrorView, containerSelector, isSlot, container }) => {
+      callback({
+        View,
+        ErrorView,
+        isSlot,
+        containerSelector,
+        container:
+          (containerSelector && document?.querySelector(containerSelector)) ||
+          container ||
+          null,
+      });
+    },
+  );
 }
 
 export { mapViews };

package/lib/helpers.umd.js

@@ -0,0 +1 @@
+!function(e,r){if("function"==typeof define&&define.amd)define("@merkur/plugin-component",["exports"],r);else if("undefined"!=typeof exports)r(exports);else{var t={exports:{}};r(t.exports),e.Merkur=e.Merkur||{},e.Merkur.Plugin=e.Merkur.Plugin||{},e.Merkur.Plugin.Component=t.exports}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,(function(e){function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function t(e){return function(e){if(Array.isArray(e))return n(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,r){if(e){if("string"==typeof e)return n(e,r);var t={}.toString.call(e).slice(8,-1);return"Object"===t&&e.constructor&&(t=e.constructor.name),"Map"===t||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?n(e,r):void 0}}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function n(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=Array(r);t<r;t++)n[t]=e[t];return n}function o(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter((function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable}))),t.push.apply(t,n)}return t}function i(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?o(Object(t),!0).forEach((function(r){u(e,r,t[r])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):o(Object(t)).forEach((function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))}))}return e}function u(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=r(e)||!e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var o=n.call(e,t||"default");if("object"!=r(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==r(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function c(e,r,t,n,o,i,u){try{var c=e[i](u),l=c.value}catch(e){return void t(e)}c.done?r(l):Promise.resolve(l).then(n,o)}function l(){var e;return e=function*(e,r,n){var o,u;if(e.$in.component.resolvedViews.has(r))return a(null!==(u=e.$in.component.resolvedViews.get(r))&&void 0!==u?u:[],n);var c=e.containerSelector,l=yield r(e),f=l.View,s=l.ErrorView,p=l.slot,y=void 0===p?{}:p,v=Object.keys(null!==(o=e.slot)&&void 0!==o?o:{}).reduce((function(r,t){var n,o;return r[t]=i(i({},y[t]),{},{isSlot:!0,containerSelector:null===(n=e.slot[t])||void 0===n?void 0:n.containerSelector,container:null===(o=e.slot[t])||void 0===o?void 0:o.container}),r}),{}),b=[{View:f,ErrorView:s,containerSelector:c,isSlot:!1,container:e.container}].concat(t(Object.values(v)));return e.$in.component.resolvedViews.set(r,b),a(b,n)},l=function(){var r=this,t=arguments;return new Promise((function(n,o){var i=e.apply(r,t);function u(e){c(i,n,o,u,l,"next",e)}function l(e){c(i,n,o,u,l,"throw",e)}u(void 0)}))},l.apply(this,arguments)}function a(e,r){return e.map((function(e){var t,n=e.View,o=e.ErrorView,i=e.containerSelector,u=e.isSlot,c=e.container;r({View:n,ErrorView:o,isSlot:u,containerSelector:i,container:i&&(null===(t=document)||void 0===t?void 0:t.querySelector(i))||c||null})}))}Object.defineProperty(e,"__esModule",{value:!0}),e.mapViews=function(e,r,t){return l.apply(this,arguments)}}));

package/lib/index.umd.js

@@ -1 +1 @@
-function n(t){return n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n},n(t)}!function(n,t){if("function"==typeof define&&define.amd)define("@merkur/plugin-component",["exports","@merkur/core"],t);else if("undefined"!=typeof exports)t(exports,require("@merkur/core"));else{var e={exports:{}};t(e.exports,n.Merkur.Core),n.Merkur=n.Merkur||{},n.Merkur.Plugin=n.Merkur.Plugin||{},n.Merkur.Plugin.Component=e.exports}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,(function(t,e){Object.defineProperty(t,"__esModule",{value:!0}),t.componentPlugin=function(){return{setup:function(n,t){return y((function*(){var o=t.info,u=t.bootstrap,a=t.load,f=t.mount,l=t.unmount,p=t.update,m=s(t,r),v={info:o,bootstrap:u,load:a,mount:f,unmount:l,update:p};return n.$in.component={lifeCycle:v,isMounted:!1,isHydrated:!1,suspendedTasks:[],resolvedViews:new Map},(0,e.assignMissingKeys)(n,{info:function(n){var t=arguments;return y((function*(){for(var e=n.name,r=n.version,o=n.props,u=n.state,i=n.assets,a=n.containerSelector,f=t.length,l=new Array(f>1?f-1:0),s=1;s<f;s++)l[s-1]=t[s];return c({name:e,version:r,props:o,state:u,assets:i,containerSelector:a},(yield d(n,"info",l))||{})}))()},mount:function(n){var t=arguments;return y((function*(){for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];yield n.bootstrap.apply(n,r),yield n.load.apply(n,r);var u=yield d(n,"mount",r);n.$in.component.isMounted=!0;var a,f=function(n,t){var e="undefined"!=typeof Symbol&&n[Symbol.iterator]||n["@@iterator"];if(!e){if(Array.isArray(n)||(e=i(n))||t&&n&&"number"==typeof n.length){e&&(n=e);var r=0,o=function(){};return{s:o,n:function(){return r>=n.length?{done:!0}:{done:!1,value:n[r++]}},e:function(n){throw n},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var u,a=!0,f=!1;return{s:function(){e=e.call(n)},n:function(){var n=e.next();return a=n.done,n},e:function(n){f=!0,u=n},f:function(){try{a||null==e.return||e.return()}finally{if(f)throw u}}}}(n.$in.component.suspendedTasks);try{for(f.s();!(a=f.n()).done;){var c=a.value;yield c()}}catch(n){f.e(n)}finally{f.f()}return u}))()},unmount:function(n){var t=arguments;return y((function*(){n.$in.component.isMounted=!1,n.$in.component.isHydrated=!1;for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];return d(n,"unmount",r)}))()},bootstrap:function(n){var t=arguments;return y((function*(){for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];return d(n,"bootstrap",r)}))()},load:function(n){var t=arguments;return y((function*(){var e=n.$in,r=n.state;if(!1===e.component.isMounted&&!1===e.component.isHydrated&&r&&0!==Object.keys(r).length)e.component.isHydrated=!0;else{for(var o=t.length,u=new Array(o>1?o-1:0),i=1;i<o;i++)u[i-1]=t[i];n.state=yield d(n,"load",u)}}))()},update:function(n){var t=arguments;return y((function*(){for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];if(n.$in.component.isMounted)return d(n,"update",r);n.$in.component.suspendedTasks.push((function(){return n.update.apply(n,r)}))}))()},setState:function(n,t){return y((function*(){return n.state=c(c({},n.state),"function"==typeof t?t(n.state):t),n.update()}))()},setProps:function(n,t){return y((function*(){if(n.$in.component.isMounted)return n.props=c(c({},n.props),"function"==typeof t?t(n.props):t),yield n.load(),n.update();n.$in.component.suspendedTasks.push((function(){return n.setProps(t)}))}))()}},m),n=(0,e.setDefaultValueForUndefined)(n,["props","state"]),n=(0,e.setDefaultValueForUndefined)(n,["assets"],[]),n=(0,e.setDefaultValueForUndefined)(n,["containerSelector"],null)}))()},create:function(n){return n}}},t.createSlotFactory=function(n){return function(){var t=y((function*(t){return n(t)}));return function(n){return t.apply(this,arguments)}}()},t.createViewFactory=function(n){return function(){var t=y((function*(t){var e=yield n(t),r=e.slotFactories,u=s(e,o);if(!r)return c({},u);var i=(yield Promise.all(r.map((function(n){return n(t)})))).reduce((function(n,t){return n[t.name]=t,n}),{});return c(c({},u),{},{slot:i})}));return function(n){return t.apply(this,arguments)}}()};var r=["info","bootstrap","load","mount","unmount","update"],o=["slotFactories"];function u(n){return function(n){if(Array.isArray(n))return a(n)}(n)||function(n){if("undefined"!=typeof Symbol&&null!=n[Symbol.iterator]||null!=n["@@iterator"])return Array.from(n)}(n)||i(n)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function i(n,t){if(n){if("string"==typeof n)return a(n,t);var e=Object.prototype.toString.call(n).slice(8,-1);return"Object"===e&&n.constructor&&(e=n.constructor.name),"Map"===e||"Set"===e?Array.from(n):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?a(n,t):void 0}}function a(n,t){(null==t||t>n.length)&&(t=n.length);for(var e=0,r=new Array(t);e<t;e++)r[e]=n[e];return r}function f(n,t){var e=Object.keys(n);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(n);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(n,t).enumerable}))),e.push.apply(e,r)}return e}function c(n){for(var t=1;t<arguments.length;t++){var e=null!=arguments[t]?arguments[t]:{};t%2?f(Object(e),!0).forEach((function(t){l(n,t,e[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(e)):f(Object(e)).forEach((function(t){Object.defineProperty(n,t,Object.getOwnPropertyDescriptor(e,t))}))}return n}function l(t,e,r){var o;return o=function(t,e){if("object"!=n(t)||!t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var o=r.call(t,e||"default");if("object"!=n(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(e,"string"),(e="symbol"==n(o)?o:o+"")in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function s(n,t){if(null==n)return{};var e,r,o=function(n,t){if(null==n)return{};var e={};for(var r in n)if(Object.prototype.hasOwnProperty.call(n,r)){if(t.indexOf(r)>=0)continue;e[r]=n[r]}return e}(n,t);if(Object.getOwnPropertySymbols){var u=Object.getOwnPropertySymbols(n);for(r=0;r<u.length;r++)e=u[r],t.indexOf(e)>=0||Object.prototype.propertyIsEnumerable.call(n,e)&&(o[e]=n[e])}return o}function p(n,t,e,r,o,u,i){try{var a=n[u](i),f=a.value}catch(n){return void e(n)}a.done?t(f):Promise.resolve(f).then(r,o)}function y(n){return function(){var t=this,e=arguments;return new Promise((function(r,o){var u=n.apply(t,e);function i(n){p(u,r,o,i,a,"next",n)}function a(n){p(u,r,o,i,a,"throw",n)}i(void 0)}))}}function d(n,t,e){return m.apply(this,arguments)}function m(){return(m=y((function*(n,t,e){var r=n.$in.component.lifeCycle;if("function"==typeof r[t])return r[t].apply(r,[n].concat(u(e)))}))).apply(this,arguments)}}));
+function n(t){return n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n},n(t)}!function(n,t){if("function"==typeof define&&define.amd)define("@merkur/plugin-component",["exports","@merkur/core"],t);else if("undefined"!=typeof exports)t(exports,require("@merkur/core"));else{var e={exports:{}};t(e.exports,n.Merkur.Core),n.Merkur=n.Merkur||{},n.Merkur.Plugin=n.Merkur.Plugin||{},n.Merkur.Plugin.Component=e.exports}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,(function(t,e){Object.defineProperty(t,"__esModule",{value:!0}),t.componentPlugin=function(){return{setup:function(n,t){return y((function*(){var o=t.info,u=t.bootstrap,a=t.load,f=t.mount,l=t.unmount,p=t.update,m=s(t,r),v={info:o,bootstrap:u,load:a,mount:f,unmount:l,update:p};return n.$in.component={lifeCycle:v,isMounted:!1,isHydrated:!1,suspendedTasks:[],resolvedViews:new Map},(0,e.assignMissingKeys)(n,{info:function(n){var t=arguments;return y((function*(){for(var e=n.name,r=n.version,o=n.props,u=n.state,i=n.assets,a=n.containerSelector,f=t.length,l=new Array(f>1?f-1:0),s=1;s<f;s++)l[s-1]=t[s];return c({name:e,version:r,props:o,state:u,assets:i,containerSelector:a},(yield d(n,"info",l))||{})}))()},mount:function(n){var t=arguments;return y((function*(){for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];yield n.bootstrap.apply(n,r),yield n.load.apply(n,r);var u=yield d(n,"mount",r);n.$in.component.isMounted=!0;var a,f=function(n,t){var e="undefined"!=typeof Symbol&&n[Symbol.iterator]||n["@@iterator"];if(!e){if(Array.isArray(n)||(e=i(n))||t&&n&&"number"==typeof n.length){e&&(n=e);var r=0,o=function(){};return{s:o,n:function(){return r>=n.length?{done:!0}:{done:!1,value:n[r++]}},e:function(n){throw n},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var u,a=!0,f=!1;return{s:function(){e=e.call(n)},n:function(){var n=e.next();return a=n.done,n},e:function(n){f=!0,u=n},f:function(){try{a||null==e.return||e.return()}finally{if(f)throw u}}}}(n.$in.component.suspendedTasks);try{for(f.s();!(a=f.n()).done;){var c=a.value;yield c()}}catch(n){f.e(n)}finally{f.f()}return u}))()},unmount:function(n){var t=arguments;return y((function*(){n.$in.component.isMounted=!1,n.$in.component.isHydrated=!1;for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];return d(n,"unmount",r)}))()},bootstrap:function(n){var t=arguments;return y((function*(){for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];return d(n,"bootstrap",r)}))()},load:function(n){var t=arguments;return y((function*(){var e=n.$in,r=n.state;if(!1===e.component.isMounted&&!1===e.component.isHydrated&&r&&0!==Object.keys(r).length)e.component.isHydrated=!0;else{for(var o=t.length,u=new Array(o>1?o-1:0),i=1;i<o;i++)u[i-1]=t[i];n.state=yield d(n,"load",u)}}))()},update:function(n){var t=arguments;return y((function*(){for(var e=t.length,r=new Array(e>1?e-1:0),o=1;o<e;o++)r[o-1]=t[o];if(n.$in.component.isMounted)return d(n,"update",r);n.$in.component.suspendedTasks.push((function(){return n.update.apply(n,r)}))}))()},setState:function(n,t){return y((function*(){return n.state=c(c({},n.state),"function"==typeof t?t(n.state):t),n.update()}))()},setProps:function(n,t){return y((function*(){if(n.$in.component.isMounted)return n.props=c(c({},n.props),"function"==typeof t?t(n.props):t),yield n.load(),n.update();n.$in.component.suspendedTasks.push((function(){return n.setProps(t)}))}))()}},m),n=(0,e.setDefaultValueForUndefined)(n,["props","state"]),n=(0,e.setDefaultValueForUndefined)(n,["assets"],[]),n=(0,e.setDefaultValueForUndefined)(n,["containerSelector"],null)}))()},create:function(n){return n}}},t.createSlotFactory=function(n){return function(){var t=y((function*(t){return n(t)}));return function(n){return t.apply(this,arguments)}}()},t.createViewFactory=function(n){return function(){var t=y((function*(t){var e=yield n(t),r=e.slotFactories,u=s(e,o);if(!r)return c({},u);var i=(yield Promise.all(r.map((function(n){return n(t)})))).reduce((function(n,t){return n[t.name]=t,n}),{});return c(c({},u),{},{slot:i})}));return function(n){return t.apply(this,arguments)}}()};var r=["info","bootstrap","load","mount","unmount","update"],o=["slotFactories"];function u(n){return function(n){if(Array.isArray(n))return a(n)}(n)||function(n){if("undefined"!=typeof Symbol&&null!=n[Symbol.iterator]||null!=n["@@iterator"])return Array.from(n)}(n)||i(n)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function i(n,t){if(n){if("string"==typeof n)return a(n,t);var e={}.toString.call(n).slice(8,-1);return"Object"===e&&n.constructor&&(e=n.constructor.name),"Map"===e||"Set"===e?Array.from(n):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?a(n,t):void 0}}function a(n,t){(null==t||t>n.length)&&(t=n.length);for(var e=0,r=Array(t);e<t;e++)r[e]=n[e];return r}function f(n,t){var e=Object.keys(n);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(n);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(n,t).enumerable}))),e.push.apply(e,r)}return e}function c(n){for(var t=1;t<arguments.length;t++){var e=null!=arguments[t]?arguments[t]:{};t%2?f(Object(e),!0).forEach((function(t){l(n,t,e[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(e)):f(Object(e)).forEach((function(t){Object.defineProperty(n,t,Object.getOwnPropertyDescriptor(e,t))}))}return n}function l(t,e,r){return(e=function(t){var e=function(t,e){if("object"!=n(t)||!t)return t;var r=t[Symbol.toPrimitive];if(void 0!==r){var o=r.call(t,e||"default");if("object"!=n(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(t,"string");return"symbol"==n(e)?e:e+""}(e))in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}function s(n,t){if(null==n)return{};var e,r,o=function(n,t){if(null==n)return{};var e={};for(var r in n)if({}.hasOwnProperty.call(n,r)){if(t.includes(r))continue;e[r]=n[r]}return e}(n,t);if(Object.getOwnPropertySymbols){var u=Object.getOwnPropertySymbols(n);for(r=0;r<u.length;r++)e=u[r],t.includes(e)||{}.propertyIsEnumerable.call(n,e)&&(o[e]=n[e])}return o}function p(n,t,e,r,o,u,i){try{var a=n[u](i),f=a.value}catch(n){return void e(n)}a.done?t(f):Promise.resolve(f).then(r,o)}function y(n){return function(){var t=this,e=arguments;return new Promise((function(r,o){var u=n.apply(t,e);function i(n){p(u,r,o,i,a,"next",n)}function a(n){p(u,r,o,i,a,"throw",n)}i(void 0)}))}}function d(n,t,e){return m.apply(this,arguments)}function m(){return(m=y((function*(n,t,e){var r=n.$in.component.lifeCycle;if("function"==typeof r[t])return r[t].apply(r,[n].concat(u(e)))}))).apply(this,arguments)}}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/plugin-component",
-  "version": "0.36.0",
+  "version": "0.37.9",
   "description": "Merkur component plugin.",
   "main": "lib/index",
   "module": "lib/index",
@@ -14,7 +14,7 @@
       "require": "./lib/index.cjs"
     },
     "./helpers": {
-      "types": "./lib/helpers.d.ts",
+      "types": "./helpers.d.ts",
       "import": "./lib/helpers.mjs",
       "require": "./lib/helpers.cjs"
     },
@@ -61,10 +61,10 @@
   },
   "homepage": "https://merkur.js.org/",
   "devDependencies": {
-    "@merkur/core": "^0.36.0"
+    "@merkur/core": "^0.37.0"
   },
   "peerDependencies": {
     "@merkur/core": "*"
   },
-  "gitHead": "2471f91d8249ae75e49b2a0da8d0deb93062f014"
+  "gitHead": "b34f12de96fc03881297974ae83bcffa5b7440c2"
 }

package/rollup.config.mjs

@@ -2,22 +2,24 @@ import {
   createRollupESConfig,
   createRollupES9Config,
   createRollupUMDConfig,
-  createRollupTypescriptES9Config,
-  createRollupTypescriptConfig,
 } from '../../createRollupConfig.mjs';
 
 let esConfig = createRollupESConfig();
 let es9Config = createRollupES9Config();
 let umdConfig = createRollupUMDConfig();
 
+let helpersConfig = createRollupESConfig();
+let helpersES9Config = createRollupES9Config();
+let umdHelpersConfig = createRollupUMDConfig();
+helpersConfig.input = './src/helpers.js';
+helpersES9Config.input = './src/helpers.js';
+umdHelpersConfig.input = './src/helpers.js';
+
 export default [
   esConfig,
   es9Config,
   umdConfig,
-  createRollupTypescriptConfig({
-    input: './src/helpers.ts',
-  }),
-  createRollupTypescriptES9Config({
-    input: './src/helpers.ts',
-  }),
+  helpersConfig,
+  helpersES9Config,
+  umdHelpersConfig,
 ];

package/types.d.ts

@@ -22,7 +22,7 @@ export type MapViewArgs = {
 
 export type SSRMountResult = {
   html: string;
-  slot: Record<string, { name: string; html: string }>;
+  slot: Record<string, { name: string; html: string, containerSelector?: string }>;
 };
 
 export interface WidgetState {}
@@ -91,6 +91,7 @@ export interface ViewFactoryResult {
 
 export interface ViewFactorySlotType {
   name: string;
+  containerSelector?: string, 
   View: ViewType;
 }
 

package/lib/helpers.d.ts

@@ -1,20 +0,0 @@
-import { Widget } from '@merkur/core';
-import { ViewFactory, ViewFactorySlotType, ViewType } from '@merkur/plugin-component';
-export type MapViewArgs = {
-    View: ViewType;
-    ErrorView?: ViewType;
-    containerSelector: string;
-    container: Element | null;
-    isSlot: boolean;
-    slot?: Record<string, {
-        isSlot: boolean;
-        containerSelector?: string;
-        container?: Element;
-    } & ViewFactorySlotType>;
-};
-/**
- * Utility function to iterate thorugh views returned from
- * view factory and call callback function with view arguments
- * on each them.
- */
-export declare function mapViews<T>(widget: Widget, viewFactory: ViewFactory, callback: (viewArgs: MapViewArgs) => T): Promise<void[]>;

package/lib/helpers.es9.js

@@ -1,52 +0,0 @@
-'use strict';
-
-/**
- * Utility function to iterate thorugh views returned from
- * view factory and call callback function with view arguments
- * on each them.
- */
-async function mapViews(widget, viewFactory, callback) {
-    var _a, _b;
-    if (widget.$in.component.resolvedViews.has(viewFactory)) {
-        return mapResolvedViews((_a = widget.$in.component.resolvedViews.get(viewFactory)) !== null && _a !== void 0 ? _a : [], callback);
-    }
-    const { containerSelector } = widget;
-    const { View, ErrorView, slot = {} } = await viewFactory(widget);
-    // Add additional slot information to slot views
-    const slots = Object.keys((_b = widget.slot) !== null && _b !== void 0 ? _b : {}).reduce((acc, cur) => {
-        var _a, _b;
-        acc[cur] = {
-            ...slot[cur],
-            isSlot: true,
-            containerSelector: (_a = widget.slot[cur]) === null || _a === void 0 ? void 0 : _a.containerSelector,
-            container: (_b = widget.slot[cur]) === null || _b === void 0 ? void 0 : _b.container,
-        };
-        return acc;
-    }, {});
-    const views = [
-        {
-            View,
-            ErrorView,
-            containerSelector,
-            isSlot: false,
-            container: widget.container,
-        },
-        ...Object.values(slots),
-    ];
-    widget.$in.component.resolvedViews.set(viewFactory, views);
-    return mapResolvedViews(views, callback);
-}
-function mapResolvedViews(views, callback) {
-    return views.map(({ View, containerSelector, isSlot, container }) => {
-        callback({
-            View,
-            isSlot,
-            containerSelector,
-            container: (containerSelector && (document === null || document === void 0 ? void 0 : document.querySelector(containerSelector))) ||
-                container ||
-                null,
-        });
-    });
-}
-
-exports.mapViews = mapViews;