@weave-js/core 0.10.0 → 0.12.0

package/lib/types.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-unused-vars
-const { EventEmitter2 } = require('eventemitter2')
+const { EventEmitter2: EventEmitter } = require('eventemitter2');
 
 /**
  * @typedef {import('stream').Stream} Stream
@@ -22,7 +22,7 @@ const { EventEmitter2 } = require('eventemitter2')
 /**
  * @callback CallActionFunctionDef - Action function definition
  * @param {string} actionName - Name of the action
- * @param {object} data - Payload
+ * @param {object} [data] - Payload
  * @param {ActionOptions} [options] - Action options
  * @return {Promise<any>} Promise - Result
  */
@@ -58,8 +58,8 @@ const { EventEmitter2 } = require('eventemitter2')
 /**
  * ActionInvoker
  * @typedef {object} ActionInvoker
- * @property {function(string, object, ActionOptions):Promise<any>} call - Service changed delegate
- * @property {function(string, object, ActionOptions):Promise<any>} call - Service changed delegate
+ * @property {function(string, object, ActionOptions):Promise<any>} call - Call a
+ * @property {function(string, object, ActionOptions):Promise<any>} multiCall - Service changed delegate
 */
 
 /**
@@ -76,7 +76,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {string} version - Weave version of the broker.
  * @property {ActionInvoker} actionInvoker - Action invoker
  * @property {EventBus} [eventBus] - Service event bus
- * @property {EventEmitter2} bus - Instance event bus
+ * @property {EventEmitter} bus - Instance event bus
  * @property {Broker} [broker] - Broker reference.
  * @property {BrokerOptions} options - options
  * @property {RuntimeInstanceState} state - Instance state
@@ -111,11 +111,11 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {function():Promise<any>} start - Start the broker.
  * @property {function():Promise<any>} stop - Stop the broker
  * @property {function(ServiceSchema):Service} createService - Create a new service with a service schema object.
- * @property {function():void} loadService - Load a service from a given path.
- * @property {function():void} loadServices - Load all services from a given directory.
+ * @property {function(string):void} loadService - Load a service from a given path.
+ * @property {function(string=, string=):void} loadServices - Load all services from a given directory.
  * @property {ContextFactory} contextFactory - contextFactory
  * @property {Logger} log - Logger instance
- * @property {function():Logger} createLogger - Create a new logger instace.
+ * @property {function(string, any):Logger} createLogger - Create a new logger instace.
  * @property {Cache} [cache] - Cache
  * @property {function():string} getUUID - Create a new from the UUID factory.
  * @property {Registry} registry - Service registry reference
@@ -127,12 +127,17 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {function(string, any, any=):Promise<any>} emit - Emit
  * @property {function(string, any, any=):Promise<any>} broadcast broadcast
  * @property {function(string, any, any=):Promise<any>} broadcastLocal broadcastLocal
- * @property {function(string):Promise<any>} waitForServices waitForServices
- * @property {Promise<PingResult>} ping ping
- * @property {function(Error)} handleError handleError
- * @property {void} fatalError fatalError
+ * @property {function(Array<string>|string):Promise<any>} waitForServices waitForServices
+ * @property {function(string, number=):Promise<PingResult>} ping ping
+ * @property {function(Error):void} handleError handleError
+ * @property {function():void} fatalError fatalError
 */
 
+/**
+ * Ping result
+ * @typedef {Object<string, number>} PingResult
+ */
+
 /**
  * Configuration object for weave service broker.
  * @typedef {Object} BulkheadOptions
@@ -151,12 +156,26 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {Array<Number>} defaultBuckets Default buckets for histograms.
 */
 
+/**
+ * Configuration object for weave service broker.
+ * @typedef {Object} TracingErrorOptions
+ * @property {Array<string>} fields - Fields of errors, that should be included in spans.
+ * @property {Boolean} stackTrace - Include stacktrace in spans
+*/
+
 /**
  * Configuration object for weave service broker.
  * @typedef {Object} TracingOptions
  * @property {Boolean} enabled - Enable tracing middleware. (default = false)
  * @property {Number} samplingRate - Rate of traced actions. (default = 1.0)
  * @property {Array<String|Object>} collectors - Array of tracing collectors.
+ * @property {TracingErrorOptions} [errors] - Settings for tracing errors.
+*/
+
+/**
+ * Configuration object for weave service broker.
+ * @typedef {Object} CacheLockOptions
+ * @property {Boolean} [enabled=false] Enable cache lock. (default = false)
 */
 
 /**
@@ -165,6 +184,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {Boolean} enabled Enable cache middleware. (default = false)
  * @property {String | Object} adapter - Cache adapter. (default = memory (In Memory))
  * @property {number} [ttl=3000] - Cache item TTL.
+ * @property {CacheLockOptions} [lock] Cache lock options.
 */
 
 /**
@@ -184,6 +204,12 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {Number} retries Number of attempts before the action call gets rejected. (default = 5)
  */
 
+/**
+ * Configuration object for weave service broker.
+ * @typedef {Object} TransportStreamOptions
+ * @property {Boolean} handleBackpressure Handle stream backpressure. (default = true)
+*/
+
 /**
  * Configuration object for weave service broker.
  * @typedef {Object} TransportOptions
@@ -195,6 +221,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {Number} offlineNodeCheckInterval - Interval in milliseconds to check and remove not offline nodes. (default = 30000ms)
  * @property {Number} maxOfflineTime - Maximum time a node can be offline before it is removed from the registry. (default = 600000ms)
  * @property {Number} maxChunkSize - Maximum chunk size for streams. (default = 256 * 1024 Bits)
+ * @property {TransportStreamOptions} streams - Transport stream options.
  */
 
 /**
@@ -241,7 +268,6 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {RetryPolicyOptions} [retryPolicy] - Retry policy
  * @property {ValidatorOptions} [validatorOptions] Validator options.
  * @property {boolean} [validateActionParams] validateActionParams.
- * @property {boolean} [watchServices] watchServices.
  * @property {number} [waitForServiceInterval] waitForServiceInterval.
  * @property {function():string} [beforeRegisterMiddlewares] beforeRegisterMiddlewares.
  * @property {function(Runtime):string} [uuidFactory] uuidFactory.
@@ -264,26 +290,6 @@ const { EventEmitter2 } = require('eventemitter2')
  * @typedef {Object.<string, *>}
 */
 
-// Cache
-
-/**
- * Cache interface
- * @typedef Cache
- * @property {string} [name] name
- * @property {LoggerOptions} options options
- * @property {void} init init
- * @property {Logger} log log
- * @property {Promise<any>} set set
- * @property {Promise<any>} get get
- * @property {Promise<any>} remove remove
- * @property {Promise<any>} clear clear
- * @property {string} getCachingHash getCachingHash
- * @property {Middleware} createMiddleware createMiddleware
- * @property {Promise<any>} stop stop
-*/
-
-// Context
-
 /**
  * @export
  * @typedef ContextFactory
@@ -328,12 +334,12 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {number} stopTime stopTime
  * @property {any} [metrics] metrics
  * @property {function(any):void} setData - Set data object.
- * @property {function(string, any, ActionOptions):ContextPromise} call - Call a service action
- * @property {*} emit emit
+ * @property {CallActionFunctionDef} call - Call a service action
+ * @property {function(string, object):Promise<any>} emit emit
  * @property {Stream} [stream] - Stream
- * @property {*} broadcast broadcast
- * @property {*} startSpan startSpan
- * @property {*} finishSpan finishSpan
+ * @property {function(string, any):Promise<any>} broadcast Broadcast an event to all listener.
+ * @property {function():void} startSpan startSpan
+ * @property {function():void} finishSpan finishSpan
  * @property {function():Context} copy - Copy the current context.
  * @property {function(Stream):void} setStream - Set the context data stream.
  * @property {function(Endpoint):void} setEndpoint - Set data object.
@@ -350,9 +356,9 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {Promise<any>} get get
  * @property {Promise<any>} remove remove
  * @property {Promise<any>} clear clear
- * @property {string} getCachingHash getCachingHash
- * @property {Middleware} createMiddleware createMiddleware
- * @property {Promise<any>} stop stop
+ * @property {string} getCachingKey getCachingKey
+ * @property {function():Middleware} createMiddleware createMiddleware
+ * @property {function():Promise<any>} stop stop
 */
 
 // Transport
@@ -368,9 +374,9 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {PendingStore} pending pending
  * @property {Function} resolveConnect resolveConnect
  * @property {string} adapterName adapterName
- * @property {Promise<any>} connect connect
- * @property {Promise<any>} disconnect disconnect
- * @property {void} setReady setReady
+ * @property {function():Promise<any>} connect connect
+ * @property {function():Promise<any>} disconnect disconnect
+ * @property {function():Promise<any>} setReady setReady
  * @property {function(TransportMessage):Promise<any>} send send
  * @property {any} sendNodeInfo sendNodeInfo
  * @property {function():Promise<any>} sendPing sendPing
@@ -475,14 +481,14 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {Endpoint | WeaveError} getNextAvailableActionEndpoint getNextAvailableActionEndpoint
  * @property {function(ServiceActionCollectionListFilterParams=):Array<any>} getActionList getActionList
  * @property {function(string): void} deregisterServiceByNodeId deregisterServiceByNodeId
- * @property {function(string, number, nodeId):boolean} hasService hasService
+ * @property {function(string, number, string):boolean} hasService hasService
  * @property {function(string, string):Endpoint} getActionEndpointByNodeId getActionEndpointByNodeId
  * @property {function(string):EndpointCollection} getActionEndpoints getActionEndpoints
  * @property {function(ServiceAction):Endpoint} createPrivateActionEndpoint createPrivateActionEndpoint
  * @property {function(string):Endpoint} getLocalActionEndpoint getLocalActionEndpoint
- * @property {NodeInfo} getNodeInfo getNodeInfo
- * @property {NodeInfo} getLocalNodeInfo getLocalNodeInfo
- * @property {NodeInfo} generateLocalNodeInfo generateLocalNodeInfo
+ * @property {function():NodeInfo} getNodeInfo getNodeInfo
+ * @property {function():NodeInfo} getLocalNodeInfo getLocalNodeInfo
+ * @property {function(Boolean=):NodeInfo} generateLocalNodeInfo generateLocalNodeInfo
  * @property {*} processNodeInfo processNodeInfo
  * @property {function(string, boolean):void} nodeDisconnected nodeDisconnected
  * @property {function(string):void} removeNode removeNode
@@ -507,6 +513,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {function():number} count count
  * @property {function(string):Endpoint} getByNodeId getByNodeId
  * @property {function(string):void} removeByNodeId removeByNodeId
+ * @property {function(string):Endpoint} endpointByNodeId Get endpoint by node ID.
  * @property {function():void} removeByService removeByService
 */
 
@@ -522,6 +529,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {number} lastHeartbeatTime lastHeartbeatTime
  * @property {number} offlineTime offlineTime
  * @property {boolean} isAvailable isAvailable
+ * @property {boolean} wasDisconnectedUnexpectedly Node was disconnected unexpectedly
  * @property {Array<ServiceItem>} services services
  * @property {number} sequence sequence
  * @property {Array<string>} [events] events
@@ -534,7 +542,6 @@ const { EventEmitter2 } = require('eventemitter2')
 
 /**
  * Endpoint
- *
  * @typedef Endpoint
  * @property {Node} node node
  * @property {Service} service service
@@ -549,7 +556,7 @@ const { EventEmitter2 } = require('eventemitter2')
 /**
  * Event colleciton
  * @typedef EventCollection
- * @property {function(Node, Service, eventCollection):Endpoint} add add
+ * @property {function(Node, Service, EventCollection):Endpoint} add add
  * @property {Endpoint} get get
  * @property {function(string, Node):void} remove remove
  * @property {function(Service):void} removeByService removeByService
@@ -562,7 +569,8 @@ const { EventEmitter2 } = require('eventemitter2')
 
 /**
  * @typedef {object} NodeCollectionListFilterOptions
- * @property {boolean} [withServices=true] Output all services on an node.
+ * @property {boolean} [availableOnly=false] Git only available nodes.
+ * @property {boolean} [withServices=false] Output all services on an node.
 */
 
 /**
@@ -576,16 +584,16 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {boolean} has has
  * @property {function(string):Node} get get
  * @property {function(string):boolean} remove remove
- * @property {function(NodeCollectionListFilterOptions):Array<Node>} list list
+ * @property {function(NodeCollectionListFilterOptions=):Array<Node>} list list
  * @property {void} disconnected disconnected
  * @property {Array<Node>} toArray toArray
 */
 
 /**
  * @typedef {Object} ServiceActionCollectionListFilterParams
- * @property {boolean} [onlyLocals] Shows only local service actions
- * @property {boolean} [skipInternals] Shows only local service actions
- * @property {boolean} [withEndpoints] Shows only local service actions
+ * @property {boolean} [onlyLocals=false] Shows only local service actions
+ * @property {boolean} [skipInternals=false] Shows only local service actions
+ * @property {boolean} [withEndpoints=false] Shows only local service actions
  */
 
 /**
@@ -593,8 +601,8 @@ const { EventEmitter2 } = require('eventemitter2')
  * @typedef ServiceActionCollection
  * @property {*} add add
  * @property {function(string):EndpointCollection} get get
- * @property {function(service)} removeByService removeByService
- * @property {function(string, Node)} remove remove
+ * @property {function(Service):void} removeByService removeByService
+ * @property {function(string, Node):void} remove remove
  * @property {function(ServiceActionCollectionListFilterParams):Array<any>} list list
 */
 
@@ -618,11 +626,12 @@ const { EventEmitter2 } = require('eventemitter2')
 /**
  * @typedef {Object} ServiceCollectionListFilterParams
  * @property {boolean} [localOnly=false] Show only local services.
+ * @property {boolean} [availableOnly=false] Show only available services.
  * @property {boolean} [withActions=false] Include actions in result.
  * @property {boolean} [withEvents=false] Include events in result.
  * @property {boolean} [withNodeService=false] Include node service.
  * @property {boolean} [withSettings=false] Include service settings.
- */
+*/
 
 /**
  * Service collection
@@ -631,8 +640,8 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {function(Node,string, number, any):ServiceItem} add Add a new service to service collection.
  * @property {*} get get
  * @property {function(string, number, string):boolean} has has
- * @property {function(string, string, number):void} remove remove
- * @property {function(string):void} removeAllByNodeId removeAllByNodeId
+ * @property {function(string, string, number=):void} remove Remove endpoint by node ID, service name and version*.
+ * @property {function(string):void} removeAllByNodeId Remove all endpoints by node ID.
  * @property {*} registerAction registerAction
  * @property {function(string):EndpointCollection} tryFindActionsByActionName tryFindActionsByActionName
  * @property {function():Array<any>} getActionsList getActionsList
@@ -653,7 +662,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {function(Action):void} addAction addAction
  * @property {function(Event):void} addEvent addEvent
  * @property {function(string, number, string=): boolean} equals equals
- * @property {function(any)} update update
+ * @property {function(any):void} update update
 */
 
 /**
@@ -725,6 +734,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @property {void} timer timer
  * @property {Metric} getMetric getMetric
  * @property {any} list list
+ * @property {function():Promise<any>} stop list
 */
 
 // Midlewares
@@ -734,7 +744,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * @export
  * @typedef MiddlewareHandler
  * @property {void} init init
- * @property {void} add add
+ * @property {function(Middleware)} add add
  * @property {any} wrapMethod wrapMethod
  * @property {any} wrapHandler wrapHandler
  * @property {any} callHandlersAsync callHandlersAsync
@@ -746,13 +756,27 @@ const { EventEmitter2 } = require('eventemitter2')
  * @typedef Middleware
  * @property {() => any} [created] created
  * @property {function(Broker):void} [started] started
- * @property {function(any, ServiceAction): any} [localAction] localAction
- * @property {(handler: any, action: ServiceAction) => any} [remoteAction] remoteAction
- * @property {function(any, ServiceAction): any} [localEvent] localEvent
- * @property {(next: Function) => MiddlewareEventDelegate} [emit] emit
- * @property {(next: Function) => MiddlewareEventDelegate} [broadcast] broadcast
- * @property {(next: Function) => MiddlewareEventDelegate} [broadcastLocal] broadcastLocal
- * @property {() => any} [brokerStopped] brokerStopped
+ * @property {function(Broker):void} [stopping] stopped
+ * @property {function(Broker):void} [createService] stopped
+ * @property {function(Broker):void} [loadService] stopped
+ * @property {function(Broker):void} [loadServices] stopped
+ * @property {function(Broker):void} [stopping] stopped
+ * @property {function(Broker):void} [ping] stopped
+ * @property {function(Broker):void} [call] stopped
+ * @property {function(Broker):void} [multiCall] stopped
+ * @property {function(Broker):void} [emit] stopped
+ * @property {function(Broker):void} [broadcast] stopped
+ * @property {function(Broker):void} [broadcastLocal] stopped
+ * @property {function(Broker):void} [serviceCreating] stopped
+ * @property {function(Broker):void} [serviceCreated] stopped
+ * @property {function(Broker):void} [serviceStopping] stopped
+ * @property {function(Broker):void} [serviceStopped] stopped
+ * @property {function(Broker):void} [localAction] stopped
+ * @property {function(Broker):void} [localEvent] stopped
+ * @property {function(Broker):void} [remoteAction] stopped
+ * @property {function(Broker):void} [remoteEvent] stopped
+ * @property {function(Broker):void} [transportSend] stopped
+ * @property {function(Broker):void} [transportMessageHandler] stopped
 */
 
 // Validator
@@ -768,7 +792,7 @@ const { EventEmitter2 } = require('eventemitter2')
  * Tracer instance
  * @typedef Tracer
  * @property {void} init init
- * @property {Promise<any>} stop stop
+ * @property {function():Promise<any>} stop stop
  * @property {boolean} shouldSample shouldSample
  * @property {function():void} invokeCollectorMethod invokeCollectorMethod
  * @property {function(string, object):Span} startSpan startSpan
@@ -823,4 +847,4 @@ const { EventEmitter2 } = require('eventemitter2')
  * @param {object} data - Payload
  */
 
-module.exports = {}
+module.exports = {};

package/lib/utils/index.js

@@ -1,5 +1,5 @@
 
 exports = {
   ...require('./options'),
-  ...require('./restore-error')
-}
+  ...require('./restoreError')
+};

package/lib/utils/options.js

@@ -1,4 +1,3 @@
-
 const {
   clone,
   compact,
@@ -7,108 +6,111 @@ const {
   flatten,
   wrapHandler,
   wrapInArray
-} = require('@weave-js/utils')
+} = require('@weave-js/utils');
 
 function mergeSettings (source, targetSchema) {
-  return defaultsDeep(source, targetSchema)
+  return defaultsDeep(source, targetSchema);
 }
 
 function mergeMeta (source, targetSchema) {
-  return defaultsDeep(source, targetSchema)
+  return defaultsDeep(source, targetSchema);
 }
 
 function mergeUniqueArrays (source, targetSchema) {
-  return compact(flatten([targetSchema, source]))
+  return compact(flatten([targetSchema, source]));
 }
 
 function mergeActions (source, targetSchema) {
   Object.keys(source).map(key => {
     // prevent action merge
     if (source[key] === false && targetSchema[key]) {
-      delete targetSchema[key]
-      return
+      delete targetSchema[key];
+      return;
     }
 
-    const sourceAction = wrapHandler(source[key])
-    const targetSchemaAction = wrapHandler(targetSchema[key])
+    const sourceAction = wrapHandler(source[key]);
+    const targetSchemaAction = wrapHandler(targetSchema[key]);
 
-    targetSchema[key] = deepMerge(sourceAction, targetSchemaAction)
-  })
+    targetSchema[key] = deepMerge(sourceAction, targetSchemaAction);
+  });
 
-  return targetSchema
+  return targetSchema;
 }
 
+// Merge events
 function mergeEvents (source, targetSchema) {
   Object.keys(source).map(key => {
-    const sourceEvent = wrapHandler(source[key])
-    const targetEvent = wrapHandler(targetSchema[key])
+    const sourceEvent = wrapHandler(source[key]);
+    const targetEvent = wrapHandler(targetSchema[key]);
 
-    let handler = compact(flatten([sourceEvent ? sourceEvent.handler : null, targetEvent ? targetEvent.handler : null]))
+    let handler = compact(flatten([sourceEvent ? sourceEvent.handler : null, targetEvent ? targetEvent.handler : null]));
     if (handler.length === 1) {
-      handler = handler[0]
+      handler = handler[0];
     }
 
-    targetSchema[key] = deepMerge(sourceEvent, targetEvent)
-    targetSchema[key].handler = handler
-  })
-  return targetSchema
+    targetSchema[key] = deepMerge(sourceEvent, targetEvent);
+    targetSchema[key].handler = handler;
+  });
+  return targetSchema;
 }
 
 function mergeMethods (source, targetSchema) {
-  return Object.assign(source, targetSchema)
+  return Object.assign(source, targetSchema);
 }
 
 function mergeActionHooks (source, target) {
   Object.keys(source).map(hookName => {
     if (!target[hookName]) {
-      target[hookName] = {}
+      target[hookName] = {};
     }
 
     Object.keys(source[hookName]).map(actionName => {
-      const sourceHookAction = wrapInArray(source[hookName][actionName])
-      const targetHookAction = wrapInArray(target[hookName][actionName])
-      target[hookName][actionName] = compact(flatten([sourceHookAction, targetHookAction]))
-    })
-  })
+      const sourceHookAction = wrapInArray(source[hookName][actionName]);
+      const targetHookAction = wrapInArray(target[hookName][actionName]);
+      target[hookName][actionName] = compact(flatten([sourceHookAction, targetHookAction]));
+    });
+  });
 
-  return target
+  return target;
 }
 
 function mergeLifecicleHooks (source, targetSchema) {
-  return compact(flatten([targetSchema, source]))
+  return compact(flatten([targetSchema, source]));
 }
 
-exports.mergeSchemas = (mixin, targetSchema) => {
-  const mixinSchema = clone(mixin)
-  const resultSchema = clone(targetSchema)
+function mergeSchemas (mixin, targetSchema) {
+  const mixinSchema = clone(mixin);
+  const resultSchema = clone(targetSchema);
 
   Object.keys(resultSchema).forEach(key => {
     if (['name', 'version'].includes(key)) {
       // override value
-      mixinSchema[key] = resultSchema[key]
+      mixinSchema[key] = resultSchema[key];
     } else if (key === 'dependencies') {
-      mixinSchema[key] = mergeUniqueArrays(resultSchema[key], mixinSchema[key])
+      mixinSchema[key] = mergeUniqueArrays(resultSchema[key], mixinSchema[key]);
     } else if (key === 'mixins') {
-      mixinSchema[key] = mergeUniqueArrays(resultSchema[key], mixinSchema[key] || {})
+      mixinSchema[key] = mergeUniqueArrays(resultSchema[key], mixinSchema[key] || {});
     } else if (key === 'settings') {
-      mixinSchema[key] = mergeSettings(resultSchema[key], mixinSchema[key])
+      mixinSchema[key] = mergeSettings(resultSchema[key], mixinSchema[key]);
     } else if (key === 'meta') {
-      mixinSchema[key] = mergeMeta(resultSchema[key], mixinSchema[key])
+      mixinSchema[key] = mergeMeta(resultSchema[key], mixinSchema[key]);
     } else if (key === 'actions') {
-      mixinSchema[key] = mergeActions(resultSchema[key], mixinSchema[key] || {})
+      mixinSchema[key] = mergeActions(resultSchema[key], mixinSchema[key] || {});
     } else if (key === 'hooks') {
-      mixinSchema[key] = mergeActionHooks(resultSchema[key], mixinSchema[key] || {})
+      mixinSchema[key] = mergeActionHooks(resultSchema[key], mixinSchema[key] || {});
     } else if (key === 'events') {
-      mixinSchema[key] = mergeEvents(resultSchema[key], mixinSchema[key] || {})
+      mixinSchema[key] = mergeEvents(resultSchema[key], mixinSchema[key] || {});
     } else if (key === 'methods') {
-      mixinSchema[key] = mergeMethods(resultSchema[key], mixinSchema[key] || {})
+      mixinSchema[key] = mergeMethods(resultSchema[key], mixinSchema[key] || {});
     } else if (['afterSchemasMerged', 'created', 'started', 'stopped'].includes(key)) {
-      mixinSchema[key] = mergeLifecicleHooks(resultSchema[key], mixinSchema[key])
+      mixinSchema[key] = mergeLifecicleHooks(resultSchema[key], mixinSchema[key]);
     } else {
       // default action for properties
-      mixinSchema[key] = resultSchema[key]
+      mixinSchema[key] = resultSchema[key];
     }
-  })
+  });
 
-  return mixinSchema
+  return mixinSchema;
 }
+
+module.exports = { mergeSchemas };

package/lib/utils/{restore-error.js → restoreError.js}

@@ -1,12 +1,12 @@
-const errors = require('../new-errors')
+const errors = require('../errors');
 
 exports.restoreError = (error) => {
-  const ErrorClass = errors[error.name]
+  const ErrorClass = errors[error.name];
 
   if (ErrorClass) {
     switch (error.name) {
     case 'WeaveError':
-      return new ErrorClass(error.message, error.code, error.type, error.data)
+      return new ErrorClass(error.message, error.code, error.type, error.data);
     }
   }
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weave-js/core",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "The core package of weave",
   "keywords": [
     "Weave",
@@ -40,20 +40,14 @@
   "license": "MIT",
   "dependencies": {
     "@weave-js/errors": "^0.9.1",
-    "@weave-js/utils": "^0.9.1",
-    "@weave-js/validator": "^0.10.0",
-    "eventemitter2": "^6.4.4",
-    "glob": "^7.1.7",
-    "node-fetch": "^2.6.1"
-  },
-  "devDependencies": {
-    "eslint": "^7.30.0",
-    "jest": "^27.0.6",
-    "jest-cli": "^27.0.6"
+    "@weave-js/utils": "^0.11.0",
+    "@weave-js/validator": "^0.12.0",
+    "eventemitter2": "^6.4.5",
+    "glob": "^7.2.0"
   },
   "directories": {
     "lib": "lib",
     "test": "test"
   },
-  "gitHead": "1bb4b387d36d5f09ebdfc541ca677cf2b718dbac"
+  "gitHead": "406e96b1f3017cc1d22de6693f61a2265506c239"
 }