resolve merge conflicts

Author: quesurifn

.eslintrc.js

@@ -6,12 +6,13 @@ module.exports = {
     commonjs: true,
     es2020: true,
   },
+  extends: ['standard', 'plugin:prettier/recommended'],
   parserOptions: {
     ecmaVersion: 11,
     sourceType: 'module',
     ecmaFeatures: {
       modules: true,
-    },
+    }
   },
   extends: ['eslint:recommended', 'plugin:prettier/recommended'],
   rules: {},

package.json

@@ -74,7 +74,7 @@
     "jsdoc-to-markdown": "7.1.1",
     "mocha": "10.0.0",
     "mocha-esm": "1.1.1",
-    "prettier": "^2.8.0",
+    "prettier": "^2.8.1",
     "split": "1.0.1",
     "standard": "^17.0.0",
     "yarn": "1.22.19"

src/adapters/datasources/datasource-mongodb.js

@@ -191,7 +191,7 @@ export class DataSourceMongoDb extends DataSource {
       let objects = []
       const ctx = this
 
-      const upsert = async () => {
+      async function upsert() {
         const operations = objects.map(obj => {
           return {
             replaceOne: {

src/aegis.js

@@ -135,8 +135,6 @@ const router = {
 }
 
 function makeRoutes() {
-  router.adminRoute(getConfig, http)
-  router.userRoutes(getRoutes)
   router.autoRoutes(endpoint, 'get', liveUpdate, http)
   router.autoRoutes(endpoint, 'get', getModels, http)
   router.autoRoutes(endpoint, 'post', postModels, http)

src/domain/make-ports.js

@@ -68,16 +68,8 @@ function setPortTimeout(options) {
 
   // Retry the port on timeout
   const retry = async () => {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     // undo running
     if (model.compensate) return
->>>>>>> 1a3ba16255209b243b8d77032a27c83a376472f7
-=======
-    // undo running
-    if (model.compensate) return
->>>>>>> 29ccd6b6db2aa3bc99c3a1d2a5e5b263fc49bf79
     // Notify interested parties
     model.emit(portTimeout(model.getName(), portName), timerArgs)
     // Invoke optional custom handlerdw
@@ -86,15 +78,7 @@ function setPortTimeout(options) {
     await async(model[portName](...timerArgs.nextArg))
   }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-  const timerId = expired() ? null : setTimeout(retry, timeout)
-=======
   const timerId = setTimeout(retry, timeout)
->>>>>>> 1a3ba16255209b243b8d77032a27c83a376472f7
-=======
-  const timerId = setTimeout(retry, timeout)
->>>>>>> 29ccd6b6db2aa3bc99c3a1d2a5e5b263fc49bf79
 
   return {
     expired,
@@ -112,20 +96,12 @@ function setPortTimeout(options) {
 /**
  * @param {function({model:Model,port:string},{*})} cb
  */
-<<<<<<< HEAD
 function getPortCallback(cb) {
-=======
-function getPortCallback (cb) {
->>>>>>> 29ccd6b6db2aa3bc99c3a1d2a5e5b263fc49bf79
   if (typeof cb === 'function') return cb
   return portHandler
 }
 
-<<<<<<< HEAD
 function hydrate(broker, datasource, eventInfo) {
-=======
-function hydrate (broker, datasource, eventInfo) {
->>>>>>> 29ccd6b6db2aa3bc99c3a1d2a5e5b263fc49bf79
   const model = eventInfo.model
   const modelName = eventInfo.model.modelName
   if (!modelName) return eventInfo.model
@@ -145,24 +121,8 @@ function addPortListener(portName, portConf, broker, datasource) {
   if (portConf.consumesEvent) {
     const callback = getPortCallback(portConf.callback)
 
-<<<<<<< HEAD
-    async function listen (eventInfo) {
-      const model = hydrate(broker, datasource, eventInfo)
-
-      console.log(
-        `event ${eventInfo.eventName} fired: calling port ${portName}`,
-        eventInfo
-      )
-      // invoke this port
-      await async(model[portName](callback))
-    }
-<<<<<<< HEAD
-
-    broker.on(portConf.consumesEvent, listen)
-=======
     async function listen(eventInfo) {
       const model = hydrate(broker, datasource, eventInfo)
->>>>>>> 1a3ba16255209b243b8d77032a27c83a376472f7
 
       console.log(
         `event ${eventInfo.eventName} fired: calling port ${portName}`,
@@ -171,8 +131,6 @@ function addPortListener(portName, portConf, broker, datasource) {
       // invoke this port
       await async(model[portName](callback))
     }
-=======
->>>>>>> 29ccd6b6db2aa3bc99c3a1d2a5e5b263fc49bf79
     broker.on(portConf.consumesEvent, listen, { singleton: true })
     return true
   }
@@ -247,7 +205,7 @@ export default function makePorts(ports, adapters, broker, datasource) {
             portName,
             portConf,
             model: this,
-            args
+            args,
           })
 
           // call the inbound or oubound adapte
@@ -309,4 +267,4 @@ export default function makePorts(ports, adapters, broker, datasource) {
       }
     })
     .reduce((p, c) => ({ ...p, ...c }))
-}
+}

src/domain/model.js

@@ -116,20 +116,6 @@ const Model = (() => {
       .reduce((a, b) => ({ ...a, ...b }, {}))
   }
 
-  function approveChanges(changes, approvedChanges) {
-    return Object.entries(changes)
-      .filter(([k, v]) => approvedChanges.includes(k))
-      .map(([k, v]) => ({ [k]: v }))
-      .reduce((a, b) => ({ ...a, ...b }, {}))
-  }
-
-  function approveChanges(changes, approvedChanges) {
-    return Object.entries(changes)
-      .filter(([k, v]) => approvedChanges.includes(k))
-      .map(([k, v]) => ({ [k]: v }))
-      .reduce((a, b) => ({ ...a, ...b }, {}))
-  }
-
   const defaultOnUpdate = (model, changes) => ({ ...model, ...changes })
   const defaultOnDelete = model => withTimestamp('deleteTime')(model)
   const defaultValidate = (model, changes) => defaultOnUpdate(model, changes)

src/domain/use-cases/invoke-port.js

@@ -25,6 +25,8 @@ export default function makeInvokePort({
   threadpool,
   modelName,
   models,
+  context,
+  authorize = async x => await x(),
 } = {}) {
   //const inboundPorts = models.getModelSpec(modelName).getInboundPortFunctions()