merge-up-3.x

.github/workflows/build.yml

@@ -5,9 +5,9 @@ name: build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, 3.x ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, 3.x ]
 
 jobs:
   build:

CHANGES.md

@@ -1,10 +1,21 @@
+
 ## 4.0.0-rc.1 2022-06-19
 
 * Node >= 14
 * Remove Joi
 * Remove seneca-transport
 
 
+## 3.33.0 2023-11-05
+
+* Remove norma library, replace functionality with update gubu library.
+
+
+## 3.32.1 2023-09-16
+
+* Provide Seneca 4 act-err argument variants via `act-err-4` temporary event.
+
+
 ## 3.32.0 2023-06-29
 
 * Translation also operates on message add and sub.

DEV.md

@@ -0,0 +1,6 @@
+
+# Branches
+
+- 3.x: Version 3
+- master: Version 4
+

lib/act.ts

@@ -1,21 +1,33 @@
-/* Copyright © 2019-2022 Richard Rodger and other contributors, MIT License. */
+/* Copyright © 2019-2023 Richard Rodger and other contributors, MIT License. */
+
+import { Gubu, MakeArgu, Open, Skip, One, Empty } from 'gubu'
 
 
 import { Meta } from './meta'
 
 
 import {
-  build_message,
   inspect,
   noop,
   error,
   deep,
   msgstr,
   make_standard_err_log_entry,
   make_standard_act_log_entry,
+  parse_jsonic,
 } from './common'
 
 
+const Argu = MakeArgu('seneca')
+
+
+const ActArgu: any = Argu('act', {
+  props: One(Empty(String), Object),
+  moreprops: Skip(Object),
+  reply: Skip(Function),
+})
+
+
 // Perform an action and optionally return the result by callback.
 // The properties of the combined arguments are matched against known
 // patterns, and the most specific one wins.
@@ -24,7 +36,18 @@ exports.api_act = function() {
   const opts = instance.options()
 
   const spec =
-    build_message(instance, [...arguments], 'reply:f?', instance.fixedargs)
+    // build_message(instance, [...arguments], 'reply:f?', instance.fixedargs)
+    ActArgu(arguments)
+
+  spec.msg = Object.assign(
+    {},
+    spec.moreprops ? spec.moreprops : null,
+    'string' === typeof spec.props ?
+      parse_jsonic(spec.props, 'msg_jsonic_syntax') :
+      spec.props,
+    instance.fixedargs,
+  )
+
   const msg = spec.msg
   const reply = spec.reply
 
@@ -96,6 +119,20 @@ const intern = (module.exports.intern = {
           action_reply
         )
       } catch (e: any) {
+
+        // TODO: review, needs better test for when this actually happens
+        for (let intercept of instance.private$.intercept.act_error) {
+          intercept.call(instance, {
+            error: e,
+            execspec,
+            opts,
+            actctxt,
+            actmsg,
+            meta,
+            action_reply
+          })
+        }
+
         if (opts.error.capture.action && true !== e?.$$seneca_callback_error$$) {
           const ex = opts.error.identify(e) ? e : new Error(inspect(e))
           intern.handle_reply(opts, meta, actctxt, actmsg, ex)
@@ -299,6 +336,7 @@ const intern = (module.exports.intern = {
 
     const inwardres = act_instance.order.inward.execSync(actctxt, data)
 
+
     if (inwardres.err) {
       throw inwardres.err
     }
@@ -486,6 +524,9 @@ const intern = (module.exports.intern = {
 
     instance.emit('act-err', 'callback', msg, meta, err, data.res)
 
+    // Seneca 4 arguments
+    instance.emit('act-err-4', 'callback', msg, meta, err, data.res)
+
     if (opts.errhandler) {
       opts.errhandler.call(instance, err, err.meta$)
     }

lib/actions.ts

@@ -30,19 +30,24 @@ function on_point(this: any, msg: any, reply: any) {
   reply()
 }
 
-function cmd_ping(this: any, msg: any, reply: any) {
-  reply(this.ping())
+
+function cmd_ping(this: any, _msg: any, reply: any) {
+  let ping = this.ping()
+  reply(ping)
 }
 
-function action_seneca_fatal(this: any, msg: any, reply: any) {
+
+function action_seneca_fatal(this: any, _msg: any, reply: any) {
   reply()
 }
 
-function action_seneca_close(this: any, msg: any, reply: any) {
+
+function action_seneca_close(this: any, _msg: any, reply: any) {
   this.emit('close')
   reply()
 }
 
+
 function make_action_seneca_stats(private$: any) {
   return function action_seneca_stats(this: any, msg: any, reply: any) {
     msg = msg || {}