@jcbuisson/express-x 1.0.10 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "",
   "type": "module",
   "main": "src/index.mjs",

package/src/index.mjs

@@ -21,30 +21,50 @@ function expressX(app) {
     */
    function createDatabaseService(name, { entity=name, client='prisma' }) {
       return createService(name, {
-         create: (data) => prisma[entity].create({
-            data,
-         }),
-
-         get: (id) => prisma[entity].findUnique({
-            where: {
-               id,
-            },
-         }),
-
-         patch: (id, data) => prisma[entity].update({
-            where: {
-               id,
-            },
-            data,
-         }),
-
-         remove: (id, data) => prisma[entity].delete({
-            where: {
-               id,
-            },
-         }),
-
-         find: (options) => prisma[entity].findMany(options),
+         create: (data) => {
+            if (isDebug) console.log('create', name, data)
+            return prisma[entity].create({
+               data,
+            })
+         },
+
+         get: (id) => {
+            if (isDebug) console.log('get', name, id)
+            return prisma[entity].findUnique({
+               where: {
+                  id,
+               },
+            })
+         },
+
+         patch: (id, data) => {
+            if (isDebug) console.log('patch', name, id, data)
+            return prisma[entity].update({
+               where: {
+                  id,
+               },
+               data,
+            })
+         },
+
+         remove: (id) => {
+            if (isDebug) console.log('remove', name, id)
+            return prisma[entity].delete({
+               where: {
+                  id,
+               },
+            })
+         },
+
+         find: (options) => {
+            if (isDebug) console.log('find', name, options)
+            return prisma[entity].findMany(options)
+         },
+
+         upsert: (options) => {
+            if (isDebug) console.log('upsert', name, options)
+            return prisma[entity].upsert(options)
+         },
       })
    }
 
@@ -59,7 +79,7 @@ function expressX(app) {
 
          // `context` is the context of execution (transport type, connection, app)
          // `args` is the list of arguments of the method
-         service['__' + methodName] = async (context, ...args) => {
+         const hookedMethod = async (context, ...args) => {
             context.args = args
 
             // if a hook or the method throws an error, it will be caught by `socket.on('client-request'`
@@ -85,8 +105,11 @@ function expressX(app) {
             return result
          }
 
+         // hooked version of method, used by client calls
+         service['__' + methodName] = hookedMethod
+
          // hooked version of method: `create`, etc., to be called from backend with no context
-         service[methodName] = method
+         service[methodName] = async (...args) => await hookedMethod({}, ...args)
 
          // un-hooked version of method: `_create`, etc., to be called from backend with no context
          service['_' + methodName] = method
@@ -216,7 +239,7 @@ function expressX(app) {
                         if (isDebug) console.log('service-event', name, action, channelName)
                         const connectionList = Object.values(connections).filter(cnx => cnx.channelNames.has(channelName))
                         for (const connection of connectionList) {
-                           if (isDebug) console.log('emit to', connection.id)
+                           if (isDebug) console.log('emit to', connection.id, name, action, result)
                            connection.socket.emit('service-event', {
                               name,
                               action,