@merkur/core 0.38.0 → 0.39.0

package/README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://merkur.js.org/docs/getting-started" title="Getting started">
-    <img src="https://raw.githubusercontent.com/mjancarik/merkur/master/images/merkur-illustration.png" width="100px" height="100px" alt="Merkur illustration"/>
+    <img src="https://raw.githubusercontent.com/mjancarik/merkur/master/images/merkur-logo.png" width="100px" height="100px" alt="Merkur illustration"/>
   </a>
 </p>
 

package/lib/index.cjs

@@ -14,66 +14,58 @@ function clone(object) {
     return object;
   }
 }
-
 function setDefaultValueForUndefined(object, keys, value = {}) {
-  let objectClone = { ...object };
-
-  keys.forEach((key) => {
+  let objectClone = {
+    ...object
+  };
+  keys.forEach(key => {
     objectClone[key] = objectClone[key] || clone(value);
   });
-
   return objectClone;
 }
-
 function bindWidgetToFunctions(widget, target) {
   target = target || widget;
-  Object.keys(target).forEach((key) => {
+  Object.keys(target).forEach(key => {
     if (isFunction(target[key])) {
       let originalFunction = target[key];
-
       target[key] = createBoundedFunction(widget, originalFunction);
     }
   });
 }
-
 function hookMethod(widget, path, handler) {
-  const { target, methodName } = parsePath(widget, path);
+  const {
+    target,
+    methodName
+  } = parsePath(widget, path);
   const originalFunction = createBoundedFunction(widget, target[methodName]);
-
   target[methodName] = function (widget, ...rest) {
     return handler(widget, originalFunction, ...rest);
   };
-
   return originalFunction;
 }
-
 function parsePath(widget, path = '') {
   const paths = path.split('.');
   const methodName = paths.pop();
   const target = paths.reduce((target, path) => target[path] || {}, widget);
-
   if (!isFunction(target[methodName])) {
-    throw new Error(
-      `Defined path '${path}' is incorrect. Check your widget structure.`,
-    );
+    throw new Error(`Defined path '${path}' is incorrect. Check your widget structure.`);
   }
-
-  return { target, methodName };
+  return {
+    target,
+    methodName
+  };
 }
-
 function isFunction(value) {
   return typeof value === 'function';
 }
-
 function assignMissingKeys(target, ...sources) {
-  sources.forEach((source) => {
-    Object.keys(source || {}).forEach((key) => {
+  sources.forEach(source => {
+    Object.keys(source || {}).forEach(key => {
       if (!(key in target)) {
         target[key] = source[key];
       }
     });
   });
-
   return target;
 }
 
@@ -83,7 +75,6 @@ async function callPluginMethod(widget, method, args) {
       widget = await plugin[method](widget, ...args);
     }
   }
-
   return widget;
 }
 
@@ -95,25 +86,12 @@ async function callPluginMethod(widget, method, args) {
 function defineWidget(widgetDefinition) {
   return widgetDefinition;
 }
-
 function setDefinitionDefaults(widgetDefinition) {
   return {
     ...widgetDefinition,
-    ...setDefaultValueForUndefined(
-      widgetDefinition,
-      ['containerSelector'],
-      null,
-    ),
-    ...setDefaultValueForUndefined(widgetDefinition, [
-      'slot',
-      '$dependencies',
-      '$external',
-    ]),
-    ...setDefaultValueForUndefined(
-      widgetDefinition,
-      ['setup', 'create'],
-      (widget) => widget,
-    ),
+    ...setDefaultValueForUndefined(widgetDefinition, ['containerSelector'], null),
+    ...setDefaultValueForUndefined(widgetDefinition, ['slot', '$dependencies', '$external']),
+    ...setDefaultValueForUndefined(widgetDefinition, ['setup', 'create'], widget => widget)
   };
 }
 
@@ -122,22 +100,20 @@ function setDefinitionDefaults(widgetDefinition) {
  */
 async function createMerkurWidget(widgetDefinition = {}) {
   const definition = setDefinitionDefaults(widgetDefinition);
-  const { setup, create } = definition;
-
+  const {
+    setup,
+    create
+  } = definition;
   let widget = {
     async setup(widget, ...rest) {
       widget = await callPluginMethod(widget, 'setup', rest);
-
       return setup(widget, ...rest);
     },
     async create(widget, ...rest) {
       widget = await callPluginMethod(widget, 'create', rest);
-
       return create(widget, ...rest);
     },
-    $plugins: (definition.$plugins || []).map((pluginFactory) =>
-      pluginFactory(),
-    ),
+    $plugins: (definition.$plugins || []).map(pluginFactory => pluginFactory())
   };
 
   // TODO refactoring
@@ -146,95 +122,76 @@ async function createMerkurWidget(widgetDefinition = {}) {
   widget.$dependencies = definition.$dependencies;
   widget.$external = definition.$external;
   widget.$in = {};
-
   delete definition.name;
   delete definition.version;
   delete definition.$dependencies;
   delete definition.$external;
   delete definition.$plugins;
-
   delete definition.setup;
   delete definition.create;
-
   widget = await widget.setup(widget, definition);
   widget = await widget.create(widget, definition);
-
   bindWidgetToFunctions(widget);
   Object.seal(widget);
-
   return widget;
 }
 
-function register({ name, version, createWidget }) {
+function register({
+  name,
+  version,
+  createWidget
+}) {
   const merkur = getMerkur();
-
   merkur.$in.widgetFactory[name + version] = createWidget;
 }
-
 function create(widgetProperties = {}) {
   const merkur = getMerkur();
-  const { name, version } = widgetProperties;
+  const {
+    name,
+    version
+  } = widgetProperties;
   const factory = merkur.$in.widgetFactory[name + version];
-
   if (!isFunction(factory)) {
-    throw new Error(
-      `The widget with defined name and version "${
-        name + version
-      }" is not defined.`,
-    );
+    throw new Error(`The widget with defined name and version "${name + version}" is not defined.`);
   }
-
   return factory(widgetProperties);
 }
-
-function createMerkur({ $plugins = [] } = {}) {
+function createMerkur({
+  $plugins = []
+} = {}) {
   const merkur = getMerkur();
-
-  $plugins.forEach((plugin) => {
+  $plugins.forEach(plugin => {
     if (plugin && isFunction(plugin.setup)) {
       plugin.setup(merkur);
     }
   });
-
   return merkur;
 }
-
 function removeMerkur() {
   const globalContext = getGlobalContext();
-
   delete globalContext.__merkur__;
 }
-
 function getMerkur() {
   const globalContext = getGlobalContext();
-
   if (!globalContext.__merkur__) {
     globalContext.__merkur__ = {
       $in: {
         widgets: [],
-        widgetFactory: {},
+        widgetFactory: {}
       },
       $external: {},
       $dependencies: {},
       isRegistered,
       register,
-      create,
+      create
     };
   }
-
   return globalContext.__merkur__;
 }
-
 function isRegistered(name) {
   const merkur = getMerkur();
-
-  return Boolean(
-    Object.keys(merkur.$in.widgetFactory).find((key) =>
-      new RegExp(`^${name}`).test(key),
-    ),
-  );
+  return Boolean(Object.keys(merkur.$in.widgetFactory).find(key => new RegExp(`^${name}`).test(key)));
 }
-
 function getGlobalContext() {
   if (typeof globalThis !== 'undefined') {
     return globalThis;
@@ -248,7 +205,6 @@ function getGlobalContext() {
   if (typeof global !== 'undefined') {
     return global;
   }
-
   return {};
 }
 

package/lib/index.js

@@ -14,66 +14,58 @@ function clone(object) {
     return object;
   }
 }
-
 function setDefaultValueForUndefined(object, keys, value = {}) {
-  let objectClone = { ...object };
-
-  keys.forEach((key) => {
+  let objectClone = {
+    ...object
+  };
+  keys.forEach(key => {
     objectClone[key] = objectClone[key] || clone(value);
   });
-
   return objectClone;
 }
-
 function bindWidgetToFunctions(widget, target) {
   target = target || widget;
-  Object.keys(target).forEach((key) => {
+  Object.keys(target).forEach(key => {
     if (isFunction(target[key])) {
       let originalFunction = target[key];
-
       target[key] = createBoundedFunction(widget, originalFunction);
     }
   });
 }
-
 function hookMethod(widget, path, handler) {
-  const { target, methodName } = parsePath(widget, path);
+  const {
+    target,
+    methodName
+  } = parsePath(widget, path);
   const originalFunction = createBoundedFunction(widget, target[methodName]);
-
   target[methodName] = function (widget, ...rest) {
     return handler(widget, originalFunction, ...rest);
   };
-
   return originalFunction;
 }
-
 function parsePath(widget, path = '') {
   const paths = path.split('.');
   const methodName = paths.pop();
   const target = paths.reduce((target, path) => target[path] || {}, widget);
-
   if (!isFunction(target[methodName])) {
-    throw new Error(
-      `Defined path '${path}' is incorrect. Check your widget structure.`,
-    );
+    throw new Error(`Defined path '${path}' is incorrect. Check your widget structure.`);
   }
-
-  return { target, methodName };
+  return {
+    target,
+    methodName
+  };
 }
-
 function isFunction(value) {
   return typeof value === 'function';
 }
-
 function assignMissingKeys(target, ...sources) {
-  sources.forEach((source) => {
-    Object.keys(source || {}).forEach((key) => {
+  sources.forEach(source => {
+    Object.keys(source || {}).forEach(key => {
       if (!(key in target)) {
         target[key] = source[key];
       }
     });
   });
-
   return target;
 }
 
@@ -83,7 +75,6 @@ async function callPluginMethod(widget, method, args) {
       widget = await plugin[method](widget, ...args);
     }
   }
-
   return widget;
 }
 
@@ -95,25 +86,12 @@ async function callPluginMethod(widget, method, args) {
 function defineWidget(widgetDefinition) {
   return widgetDefinition;
 }
-
 function setDefinitionDefaults(widgetDefinition) {
   return {
     ...widgetDefinition,
-    ...setDefaultValueForUndefined(
-      widgetDefinition,
-      ['containerSelector'],
-      null,
-    ),
-    ...setDefaultValueForUndefined(widgetDefinition, [
-      'slot',
-      '$dependencies',
-      '$external',
-    ]),
-    ...setDefaultValueForUndefined(
-      widgetDefinition,
-      ['setup', 'create'],
-      (widget) => widget,
-    ),
+    ...setDefaultValueForUndefined(widgetDefinition, ['containerSelector'], null),
+    ...setDefaultValueForUndefined(widgetDefinition, ['slot', '$dependencies', '$external']),
+    ...setDefaultValueForUndefined(widgetDefinition, ['setup', 'create'], widget => widget)
   };
 }
 
@@ -122,22 +100,20 @@ function setDefinitionDefaults(widgetDefinition) {
  */
 async function createMerkurWidget(widgetDefinition = {}) {
   const definition = setDefinitionDefaults(widgetDefinition);
-  const { setup, create } = definition;
-
+  const {
+    setup,
+    create
+  } = definition;
   let widget = {
     async setup(widget, ...rest) {
       widget = await callPluginMethod(widget, 'setup', rest);
-
       return setup(widget, ...rest);
     },
     async create(widget, ...rest) {
       widget = await callPluginMethod(widget, 'create', rest);
-
       return create(widget, ...rest);
     },
-    $plugins: (definition.$plugins || []).map((pluginFactory) =>
-      pluginFactory(),
-    ),
+    $plugins: (definition.$plugins || []).map(pluginFactory => pluginFactory())
   };
 
   // TODO refactoring
@@ -146,95 +122,76 @@ async function createMerkurWidget(widgetDefinition = {}) {
   widget.$dependencies = definition.$dependencies;
   widget.$external = definition.$external;
   widget.$in = {};
-
   delete definition.name;
   delete definition.version;
   delete definition.$dependencies;
   delete definition.$external;
   delete definition.$plugins;
-
   delete definition.setup;
   delete definition.create;
-
   widget = await widget.setup(widget, definition);
   widget = await widget.create(widget, definition);
-
   bindWidgetToFunctions(widget);
   Object.seal(widget);
-
   return widget;
 }
 
-function register({ name, version, createWidget }) {
+function register({
+  name,
+  version,
+  createWidget
+}) {
   const merkur = getMerkur();
-
   merkur.$in.widgetFactory[name + version] = createWidget;
 }
-
 function create(widgetProperties = {}) {
   const merkur = getMerkur();
-  const { name, version } = widgetProperties;
+  const {
+    name,
+    version
+  } = widgetProperties;
   const factory = merkur.$in.widgetFactory[name + version];
-
   if (!isFunction(factory)) {
-    throw new Error(
-      `The widget with defined name and version "${
-        name + version
-      }" is not defined.`,
-    );
+    throw new Error(`The widget with defined name and version "${name + version}" is not defined.`);
   }
-
   return factory(widgetProperties);
 }
-
-function createMerkur({ $plugins = [] } = {}) {
+function createMerkur({
+  $plugins = []
+} = {}) {
   const merkur = getMerkur();
-
-  $plugins.forEach((plugin) => {
+  $plugins.forEach(plugin => {
     if (plugin && isFunction(plugin.setup)) {
       plugin.setup(merkur);
     }
   });
-
   return merkur;
 }
-
 function removeMerkur() {
   const globalContext = getGlobalContext();
-
   delete globalContext.__merkur__;
 }
-
 function getMerkur() {
   const globalContext = getGlobalContext();
-
   if (!globalContext.__merkur__) {
     globalContext.__merkur__ = {
       $in: {
         widgets: [],
-        widgetFactory: {},
+        widgetFactory: {}
       },
       $external: {},
       $dependencies: {},
       isRegistered,
       register,
-      create,
+      create
     };
   }
-
   return globalContext.__merkur__;
 }
-
 function isRegistered(name) {
   const merkur = getMerkur();
-
-  return Boolean(
-    Object.keys(merkur.$in.widgetFactory).find((key) =>
-      new RegExp(`^${name}`).test(key),
-    ),
-  );
+  return Boolean(Object.keys(merkur.$in.widgetFactory).find(key => new RegExp(`^${name}`).test(key)));
 }
-
 function getGlobalContext() {
   if (typeof globalThis !== 'undefined') {
     return globalThis;
@@ -248,7 +205,6 @@ function getGlobalContext() {
   if (typeof global !== 'undefined') {
     return global;
   }
-
   return {};
 }
 

package/lib/index.mjs

@@ -12,66 +12,58 @@ function clone(object) {
     return object;
   }
 }
-
 function setDefaultValueForUndefined(object, keys, value = {}) {
-  let objectClone = { ...object };
-
-  keys.forEach((key) => {
+  let objectClone = {
+    ...object
+  };
+  keys.forEach(key => {
     objectClone[key] = objectClone[key] || clone(value);
   });
-
   return objectClone;
 }
-
 function bindWidgetToFunctions(widget, target) {
   target = target || widget;
-  Object.keys(target).forEach((key) => {
+  Object.keys(target).forEach(key => {
     if (isFunction(target[key])) {
       let originalFunction = target[key];
-
       target[key] = createBoundedFunction(widget, originalFunction);
     }
   });
 }
-
 function hookMethod(widget, path, handler) {
-  const { target, methodName } = parsePath(widget, path);
+  const {
+    target,
+    methodName
+  } = parsePath(widget, path);
   const originalFunction = createBoundedFunction(widget, target[methodName]);
-
   target[methodName] = function (widget, ...rest) {
     return handler(widget, originalFunction, ...rest);
   };
-
   return originalFunction;
 }
-
 function parsePath(widget, path = '') {
   const paths = path.split('.');
   const methodName = paths.pop();
   const target = paths.reduce((target, path) => target[path] || {}, widget);
-
   if (!isFunction(target[methodName])) {
-    throw new Error(
-      `Defined path '${path}' is incorrect. Check your widget structure.`,
-    );
+    throw new Error(`Defined path '${path}' is incorrect. Check your widget structure.`);
   }
-
-  return { target, methodName };
+  return {
+    target,
+    methodName
+  };
 }
-
 function isFunction(value) {
   return typeof value === 'function';
 }
-
 function assignMissingKeys(target, ...sources) {
-  sources.forEach((source) => {
-    Object.keys(source || {}).forEach((key) => {
+  sources.forEach(source => {
+    Object.keys(source || {}).forEach(key => {
       if (!(key in target)) {
         target[key] = source[key];
       }
     });
   });
-
   return target;
 }
 
@@ -81,7 +73,6 @@ async function callPluginMethod(widget, method, args) {
       widget = await plugin[method](widget, ...args);
     }
   }
-
   return widget;
 }
 
@@ -93,25 +84,12 @@ async function callPluginMethod(widget, method, args) {
 function defineWidget(widgetDefinition) {
   return widgetDefinition;
 }
-
 function setDefinitionDefaults(widgetDefinition) {
   return {
     ...widgetDefinition,
-    ...setDefaultValueForUndefined(
-      widgetDefinition,
-      ['containerSelector'],
-      null,
-    ),
-    ...setDefaultValueForUndefined(widgetDefinition, [
-      'slot',
-      '$dependencies',
-      '$external',
-    ]),
-    ...setDefaultValueForUndefined(
-      widgetDefinition,
-      ['setup', 'create'],
-      (widget) => widget,
-    ),
+    ...setDefaultValueForUndefined(widgetDefinition, ['containerSelector'], null),
+    ...setDefaultValueForUndefined(widgetDefinition, ['slot', '$dependencies', '$external']),
+    ...setDefaultValueForUndefined(widgetDefinition, ['setup', 'create'], widget => widget)
   };
 }
 
@@ -120,22 +98,20 @@ function setDefinitionDefaults(widgetDefinition) {
  */
 async function createMerkurWidget(widgetDefinition = {}) {
   const definition = setDefinitionDefaults(widgetDefinition);
-  const { setup, create } = definition;
-
+  const {
+    setup,
+    create
+  } = definition;
   let widget = {
     async setup(widget, ...rest) {
       widget = await callPluginMethod(widget, 'setup', rest);
-
       return setup(widget, ...rest);
     },
     async create(widget, ...rest) {
       widget = await callPluginMethod(widget, 'create', rest);
-
       return create(widget, ...rest);
     },
-    $plugins: (definition.$plugins || []).map((pluginFactory) =>
-      pluginFactory(),
-    ),
+    $plugins: (definition.$plugins || []).map(pluginFactory => pluginFactory())
   };
 
   // TODO refactoring
@@ -144,95 +120,76 @@ async function createMerkurWidget(widgetDefinition = {}) {
   widget.$dependencies = definition.$dependencies;
   widget.$external = definition.$external;
   widget.$in = {};
-
   delete definition.name;
   delete definition.version;
   delete definition.$dependencies;
   delete definition.$external;
   delete definition.$plugins;
-
   delete definition.setup;
   delete definition.create;
-
   widget = await widget.setup(widget, definition);
   widget = await widget.create(widget, definition);
-
   bindWidgetToFunctions(widget);
   Object.seal(widget);
-
   return widget;
 }
 
-function register({ name, version, createWidget }) {
+function register({
+  name,
+  version,
+  createWidget
+}) {
   const merkur = getMerkur();
-
   merkur.$in.widgetFactory[name + version] = createWidget;
 }
-
 function create(widgetProperties = {}) {
   const merkur = getMerkur();
-  const { name, version } = widgetProperties;
+  const {
+    name,
+    version
+  } = widgetProperties;
   const factory = merkur.$in.widgetFactory[name + version];
-
   if (!isFunction(factory)) {
-    throw new Error(
-      `The widget with defined name and version "${
-        name + version
-      }" is not defined.`,
-    );
+    throw new Error(`The widget with defined name and version "${name + version}" is not defined.`);
   }
-
   return factory(widgetProperties);
 }
-
-function createMerkur({ $plugins = [] } = {}) {
+function createMerkur({
+  $plugins = []
+} = {}) {
   const merkur = getMerkur();
-
-  $plugins.forEach((plugin) => {
+  $plugins.forEach(plugin => {
     if (plugin && isFunction(plugin.setup)) {
       plugin.setup(merkur);
     }
   });
-
   return merkur;
 }
-
 function removeMerkur() {
   const globalContext = getGlobalContext();
-
   delete globalContext.__merkur__;
 }
-
 function getMerkur() {
   const globalContext = getGlobalContext();
-
   if (!globalContext.__merkur__) {
     globalContext.__merkur__ = {
       $in: {
         widgets: [],
-        widgetFactory: {},
+        widgetFactory: {}
       },
       $external: {},
       $dependencies: {},
       isRegistered,
       register,
-      create,
+      create
     };
   }
-
   return globalContext.__merkur__;
 }
-
 function isRegistered(name) {
   const merkur = getMerkur();
-
-  return Boolean(
-    Object.keys(merkur.$in.widgetFactory).find((key) =>
-      new RegExp(`^${name}`).test(key),
-    ),
-  );
+  return Boolean(Object.keys(merkur.$in.widgetFactory).find(key => new RegExp(`^${name}`).test(key)));
 }
-
 function getGlobalContext() {
   if (typeof globalThis !== 'undefined') {
     return globalThis;
@@ -246,7 +203,6 @@ function getGlobalContext() {
   if (typeof global !== 'undefined') {
     return global;
   }
-
   return {};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/core",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "Merkur is tiny and extensible library for creating front-end microservices.",
   "main": "lib/index",
   "module": "lib/index",
@@ -26,8 +26,7 @@
     "preversion": "npm test",
     "test": "jest --no-watchman -c ./jest.config.js",
     "test:es:version": "es-check es11 ./lib/index.mjs --module && es-check es9 ./lib/index.es9.mjs --module && es-check es9 ./lib/index.es9.cjs --module",
-    "build": "rollup -c rollup.config.mjs",
-    "prepare": "npm run build"
+    "build": "rollup -c rollup.config.mjs"
   },
   "repository": {
     "type": "git",
@@ -53,5 +52,5 @@
     "access": "public"
   },
   "homepage": "https://merkur.js.org/",
-  "gitHead": "a6e379c0cb887898e34465dc3db9231feb68e6a5"
+  "gitHead": "8ad2c8b26246850ce6289502a8b05e882f80ce31"
 }

package/types.d.ts

@@ -1,6 +1,7 @@
 export interface BaseWidgetAsset {
   type: 'stylesheet' | 'script' | 'inlineStyle';
   optional?: boolean;
+  module?: boolean;
   test?: string;
   attr?: Record<string, string | boolean>;
 }