@sap/cds 6.4.0 → 6.5.0

package/bin/build/provider/mtx-extension/index.js

@@ -1,5 +1,7 @@
 const path = require('path')
+const fs = require('fs')
 const cds = require('../../cds')
+
 const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
 const { FOLDER_GEN } = require('../../constants')
 const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
@@ -13,47 +15,48 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
     }
 
     async build() {
+        const { src, dest } = this.task
+        const destExt = path.join(dest, 'ext')
+
+        await this.copy(path.join(src, 'package.json')).to(path.join(destExt, 'package.json'))
+
+        // copy handlers
+        const folders = [path.join(src, cds.env.folders.srv, 'handlers')]
+        await this.copyNativeContent(src, destExt, res => {
+            if (fs.statSync(res).isDirectory()) {
+                return folders.some(folder => folder.startsWith(res))
+            }
+            if (folders.includes(path.dirname(res)) && /\.js$/.test(res)) {
+                return true
+            }
+        })
+
         const model = await this.model()
-        if (!model) {
-            return
-        }
-        const allFiles = []
-        const destExt = path.join(this.task.dest, 'ext')
-
-        const packageJson = path.join(destExt, 'package.json')
-        await this.copy(path.join(this.task.src, 'package.json')).to(packageJson)
-        allFiles.push(packageJson)
-
-        // extension CSN using parsed format
-        const options = { ...this.options(), flavor: 'parsed' }
-        const extCsn = await cds.load(this.resolveModel(), options)
-        if (extCsn.requires) {
-            extCsn.requires.length = 0
-        }
-        const csnFile = path.join(destExt, 'extension.csn')
-        await this.compileToJson(extCsn, csnFile)
-        allFiles.push(csnFile)
-
-        // static i18n folder name as runtime does not use the CDS config of the extension project
-        const i18n = await this.collectLanguageBundles(extCsn, path.join(destExt, 'i18n'))
-        if (i18n) {
-            allFiles.push(i18n.file)
-        }
+        if (model) {
+            // extension CSN using parsed format
+            const options = { ...this.options(), flavor: 'parsed' }
+            const extCsn = await cds.load(this.resolveModel(), options)
+            if (extCsn.requires) {
+                extCsn.requires.length = 0
+            }
+            await this.compileToJson(extCsn, path.join(destExt, 'extension.csn'))
+
+            await this.collectLanguageBundles(extCsn, path.join(destExt, 'i18n'))
 
-        const files = Object.keys(await cds.deploy.resources(model))
-        if (files.length > 0) {
-            const dataDest = path.join(destExt, 'data')
-            await Promise.all(
-                files
-                    .filter(file => /\.csv$/.test(file))
-                    .map(csv => {
-                        const csvFile = path.join(dataDest, path.basename(csv))
-                        allFiles.push(csvFile)
-                        return this.copy(csv).to(csvFile)
-                    })
-            )
+            const files = Object.keys(await cds.deploy.resources(model))
+            if (files.length > 0) {
+                const dataDest = path.join(destExt, 'data')
+                await Promise.all(
+                    files
+                        .filter(file => /\.csv$/.test(file))
+                        .map(csv => {
+                            return this.copy(csv).to(path.join(dataDest, path.basename(csv)))
+                        })
+                )
+            }
         }
-        await new ResourcesTarBuilder(this).writeTarFile(allFiles, destExt, path.join(this.task.dest, 'extension.tgz'))
+        // add all resources contained in the 'ext' folder
+        await new ResourcesTarBuilder(this).writeTarFile(path.join(this.task.dest, 'extension.tgz'), destExt)
     }
 }
 module.exports = MtxExtensionModuleBuilder

package/bin/build/util.js

@@ -187,6 +187,22 @@ function flatten(modelPaths) {
     }, [])
 }
 
+/**
+ * Copy a file or directory. The directory can have contents.
+ * REVISIT: 'fs.promises.cp' replacement for nodejs 14
+ * @param src <String> Note that if src is a directory it will copy everything inside of this directory, not the entire directory itself.
+ * @param dest <String> Note that if src is a file, dest cannot be a directory.
+ */
+async function copy(src, dest) {
+    if ((await fs.promises.stat(src)).isDirectory()) {
+        const entries = await fs.promises.readdir(src)
+        return Promise.all(entries.map(async each => copy(path.join(src, each), path.join(dest, each))))
+    } else {
+        await fs.promises.mkdir(path.dirname(dest), { recursive: true })
+        return fs.promises.copyFile(src, dest)
+    }
+}
+
 class BuildMessage extends Error {
     constructor(message, severity = SEVERITY_ERROR) {
         super(message)
@@ -228,6 +244,7 @@ module.exports = {
     resolveRequiredSapModels,
     getDefaultModelOptions,
     flatten,
+    copy,
     BuildMessage,
     BuildError
 }

package/bin/deploy/to-hana/hdiDeployUtil.js

@@ -97,9 +97,15 @@ Add it either as a devDependency using 'npm install -D ${this.deployerName}' or
 
 
     async _npmSearchPaths(cwd) {
-        const npmRootCall = await execAsync('npm root -g');
-        const globalNodeModules = npmRootCall.stdout.toString().trim();
-        return [cwd, globalNodeModules, '@sap/hdi-deploy']
+        // REVISIT: we shouldn't have to rely on `npm` on the server
+        try {
+            const npmRootCall = await execAsync('npm root -g');
+            const globalNodeModules = npmRootCall.stdout.toString().trim();
+            return [cwd, globalNodeModules, '@sap/hdi-deploy']
+        } catch (error) {
+            if (/Command failed: npm.*not found/s.test(error.message)) return [cwd, '@sap/hdi-deploy']
+            else throw error
+        }
     }
 
 
@@ -107,10 +113,10 @@ Add it either as a devDependency using 'npm install -D ${this.deployerName}' or
         const hdiDeployLib = await this._getHdiDeployLib(dbDir);
         return new Promise((resolve, reject) => {
             const callbacks = {
-                stderrCB: error => console.error(error.toString())
+                stderrCB: error => LOG.error(error.toString())
             }
             if (LOG.level !== SILENT) {
-                callbacks.stdoutCB = (data) => console.log(data.toString());
+                callbacks.stdoutCB = (data) => LOG.log(data.toString());
             }
 
             hdiDeployLib.deploy(dbDir, env, (error, response) => {

package/bin/serve.js

@@ -6,7 +6,7 @@ module.exports = Object.assign ( serve, {
     flags: [
         '--project', '--projects',
         '--in-memory', '--in-memory?',
-        '--mocked', '--with-mocks', '--with-bindings',
+        '--mocked', '--with-mocks', '--with-bindings', '--resolve-bindings',
         '--watch',
     ],
     shortcuts: [ '-s', undefined, '-2', '-a', '-w', undefined, '-p' ],
@@ -98,6 +98,10 @@ module.exports = Object.assign ( serve, {
         All required services are bound automatically upon bootstrapping.
         Option *--with-mocks* subsumes this option.
 
+    *--resolve-bindings* (beta)
+
+        Resolve remote service bindings configured via *cds bind*.
+
     *--in-memory[?]*
 
         Automatically adds a transient in-memory database bootstrapped on
@@ -265,7 +269,7 @@ function _prepare_logging () { // NOSONAR
 
   // print info when we are finally on air
   cds.once ('listening', ({url})=>{
-    console.log()
+    LOG.info ()
     LOG.info ('server listening on',{url})
     _timer && console.timeEnd (_timer)
     if (process.stdin.isTTY) LOG.info (`[ terminate with ^C ]\n`)

package/common.cds

@@ -72,6 +72,13 @@ context sap.common {
     name  : localized String(255)  @title : '{i18n>Name}';
     descr : localized String(1000) @title : '{i18n>Description}';
   }
+
+  /*
+   * Aspect that is included by generated `.texts` entities for localized entities.
+   */
+  aspect TextsAspect {
+    key locale: Locale;
+  }
 }
 
 

package/lib/auth/index.js

@@ -1,6 +1,22 @@
 
+const cds = require ('../index'), { path, local } = cds.utils
+
+const _require = require; require = cds.lazified (module) // eslint-disable-line no-global-assign
+module.exports = Object.assign (auth_factory, {
+  mocked: require('./basic-auth'),
+  basic:  require('./basic-auth'),
+  dummy:  require('./dummy-auth'),
+  ias:    require('./ias-auth'),
+  jwt:    require('./jwt-auth'),
+  xsuaa:  require('./jwt-auth'),
+})
+require = _require // eslint-disable-line no-global-assign
+
+
+/**
+ * Constructs one of the above middlewares as configured
+ */
 function auth_factory (options) {
-  const cds = require ('../index'), { path, local } = cds.utils
   const o = { ...options, ...cds.requires.auth }
   let kind = o.kind || o.strategy
   let middleware = cds.auth[kind]
@@ -16,17 +32,3 @@ function auth_factory (options) {
   }
   return middleware(o)
 }
-
-const { lazified } = require('../lazy')
-const _require = require; require = lazified (module) // eslint-disable-line no-global-assign
-
-module.exports = lazified (Object.assign (auth_factory, {
-  mocked: require('./basic-auth'),
-  basic:  require('./basic-auth'),
-  dummy:  require('./dummy-auth'),
-  ias:    require('./ias-auth'),
-  jwt:    require('./jwt-auth'),
-  xsuaa:  require('./jwt-auth'),
-}))
-
-require = _require // eslint-disable-line no-global-assign

package/lib/auth/jwt-auth.js

@@ -26,6 +26,7 @@ module.exports = function jwt_auth(config) {
       const payload = req.tokenInfo.getPayload()
     
       let id = req.user.id
+      let _is_system, _is_internal
     
       let roles = payload.scope.map(s => s.replace(new RegExp(`^(${config.credentials.xsappname + '.'})`), ''))
       roles.push('identified-user')
@@ -36,8 +37,8 @@ module.exports = function jwt_auth(config) {
         const CLIENT = { client_credentials: 1, client_x509: 1 }
         if (payload.grant_type in CLIENT) {
           id = 'system'
-          roles.push('system-user')
-          if (req.tokenInfo.getClientId() === config.credentials.clientid) roles.push('internal-user')
+          _is_system = true
+          if (req.tokenInfo.getClientId() === config.credentials.clientid) _is_internal = true
         }
       }
 
@@ -49,7 +50,7 @@ module.exports = function jwt_auth(config) {
         attr.email = req.authInfo.getEmail()
       }
 
-      req.user = new cds.User({ id, roles, attr })
+      req.user = new cds.User({ id, roles, attr, _is_system, _is_internal })
       req.tenant = req.tokenInfo.getZoneId?.()
       next()
     })

package/lib/compile/for/lean_drafts.js

@@ -54,7 +54,7 @@ module.exports = function cds_compile_for_lean_drafts(csn, o) {
     for (const each in draft.elements) {
       const e = draft.elements[each]
       const newEl = Object.create(e)
-      if (e.isComposition || (e.isAssociation && e['@odata.draft.enclosed']) || e._isBacklink) {
+      if (e.isComposition || (e.isAssociation && e['@odata.draft.enclosed']) || e._isCompositionBacklink) {
         _redirect(newEl, draftEntity(e._target, model))
       }
       newEl.parent = draft

package/lib/compile/minify.js

@@ -35,10 +35,10 @@ module.exports = function cds_minify (csn, _roots) { // IMPORTANT: don't add cds
   }
   function _visit (d) {
     if (typeof d === 'string') {
-      if (cds.compiler.model.isInReservedNamespace(d)) return
-      else d = all[d]
+      d = all[d]
+      if (!d) return // builtins like cds.String
     } else if (d.ref) return d.ref.reduce((p,n) => {
-      let d = (p.elements || csn.definitions[p.target].elements)[n.id || n] // > n.id -> view with parameters
+      let d = (p.elements || all[p.target || p.type].elements)[n.id || n] // > n.id -> view with parameters
       if (d)  _visit(d)
       return d
     },{elements:all})

package/lib/core/index.js

@@ -26,6 +26,7 @@ const roots = _roots ({
 	Association: {type:'type'},
 	Composition: {type:'Association'},
 	service: {type:'context'},
+	$self: {}, //> to support polymorphic self links like in: action foo( self: [many] $self, ...)
 })
 
 /**

package/lib/dbs/cds-deploy.js

@@ -107,7 +107,7 @@ exports.exclude_external_entities_in = function (csn) { // NOSONAR
 
 function getSqls(db, csn, o, beforeCsn) {
   const schemaEvo = (db.options?.schema_evolution === 'auto' || o.schema_evolution === 'auto')
-  const creds = db.options?.credentials 
+  const creds = db.options?.credentials
   const in_memory = (creds?.url || creds?.database) === ':memory:';
   if (!in_memory && schemaEvo) {
     const { afterImage: afterCsn, drops, createsAndAlters: creas } = cds.compile.to.sql.delta (csn, o, beforeCsn);
@@ -134,7 +134,7 @@ exports.create = async function (db, csn=db.model, o) {
   const schemaEvo = (db.options?.schema_evolution === 'auto' || o.schema_evolution === 'auto')
   if(db.deploy && !schemaEvo) {
     // reset CSN state saved in db - if there is any
-    await db.run('DROP table if exists cds_Model;');
+    if(!o.dry) await db.run('DROP table if exists cds_Model;');
     return db.deploy(csn, o);
   }
 
@@ -176,20 +176,23 @@ exports.init = (db, csn=db.model, o, csvs, log=()=>{}) => db.run (async tx => {
 
   if (csvs) {
     const ccsn = cds.compile.for['nodejs'](csn) // compile to calculate keys for newly added entities
-    for(let [e,src] of Object.entries(csvs)) {
-      const q = INSERT_from_csv (e,src,schemaEvo); if (!q) continue
-      if (db.kind === 'better-sqlite') _add_missing_pks2(q)
-      q._target = ccsn.definitions[e]
-      inits.push (tx.run(q) .catch (e => {
-        throw Object.assign (e, { message: 'in cds.deploy(): ' + e.message +'\n'+ inspect(q) })
-      }))
+    for(let [file,src] of Object.entries(csvs)) {
+      const entity = _entity4(path.basename(file, '.csv'), csn)
+      if (entity?.name) {
+        const q = INSERT_from_csv (entity.name,src,schemaEvo); if (!q) continue
+        if (db.kind === 'better-sqlite') _add_missing_pks2(q)
+        q._target = ccsn.definitions[entity.name]
+        inits.push (tx.run(q) .catch (e => {
+          throw Object.assign (e, { message: 'in cds.deploy(): ' + e.message +'\n'+ inspect(q) })
+        }))
+      }
     }
   } else {
     for (let [file,e] of Object.entries(resources)) {
       if (e === '*') { // init.js/ts
         let x = await cds.utils._import(file);  if (!x) continue
         if (x.default)  x = x.default  // default ESM export
-        inits.push (!x.then && typeof x === 'function' ? x(db,csn) : x)
+        inits.push (!x.then && typeof x === 'function' ? x(tx,csn) : x)
         log (file)
       } else { // from .csv or .json
         const INSERT_into = _from_csv_or_json [path.extname(file)]

package/lib/env/cds-requires.js

@@ -131,7 +131,7 @@ const _databases = {
   },
   "better-sqlite": _compat_to_use({
     credentials: { url: ":memory:" },
-    impl: "@sap/cds-sqlite",
+    impl: "@cap-js/sqlite",
   }),
   "sql-mt": {
     '[development]': { kind: 'sqlite' },

package/lib/env/defaults.js

@@ -29,7 +29,11 @@ module.exports = {
     localized: true,
     assert_integrity: false,
     cds_tx_protection: true,
-    cds_tx_inheritance: true
+    cds_tx_inheritance: true,
+    lean_draft: false,
+    '[lean-draft]': {
+      lean_draft: true,
+    }
   },
 
   log: {

package/lib/env/schemas/cds-rc.json

@@ -246,8 +246,26 @@
           "description": "Shortcut to enable multitenancy."
         },
         "extensibility": {
-          "type": "boolean",
-          "description": "Shortcut to enable extensibility."
+          "oneOf": [
+            {
+              "type": "boolean",
+              "description": "Shortcut to enable extensibility."
+            },
+            {
+              "type": "object",
+              "description": "Extensibility configuration options.",
+              "properties": {
+                "tenantCheckInterval": {
+                  "type": "number",
+                  "description": "Time interval in ms to check for new extensions and refreshed models."
+                },
+                "evictionInterval": {
+                  "type": "number",
+                  "description": "Time interval in ms after which to evict models for inactive tenants."
+                }
+              }
+            }
+          ]
         },
         "toggles": {
           "type": "boolean",
@@ -264,7 +282,7 @@
             },
             {
               "type": "object",
-              "description": "Configuration options",
+              "description": "ModelProviderService configuration options.",
               "additionalProperties": true,
               "properties": {
                 "root": {
@@ -295,6 +313,37 @@
             },
             {
               "$ref": "#/$defs/servicePresetSidecar"
+            },
+            {
+              "type": "object",
+              "description": "DeploymentService configuration options.",
+              "properties": {
+                "hdi": {
+                  "type": "object",
+                  "description": "Bundles HDI-specific settings.",
+                  "properties": {
+                    "create": {
+                      "type": "object",
+                      "description": "HDI container provisioning parameters.",
+                      "properties": {
+                        "database_id": {
+                          "type": "string",
+                          "description": "HANA Cloud instance ID."
+                        },
+                        "additionalProperties": true
+                      }
+                    },
+                    "bind": {
+                      "type": "object",
+                      "description": "HDI container binding parameters."
+                    },
+                    "deploy": {
+                      "type": "object",
+                      "description": "HDI deployment parameters as defined on https://www.npmjs.com/package/@sap/hdi-deploy#supported-features"
+                    }
+                  }
+                }
+              }
             }
           ]
         },
@@ -303,6 +352,28 @@
           "oneOf": [
             {
               "$ref": "#/$defs/serviceActivation"
+            },
+            {
+              "type": "object",
+              "description": "SaasProvisioningService configuration options.",
+              "additionalProperties": true,
+              "properties": {
+                "jobs": {
+                  "type": "object",
+                  "description": "Configuration options for the built-in async job executor.",
+                  "properties": {
+                    "workerSize": {
+                      "type": "number",
+                      "description": "Number of workers running in parallel per database."
+                    },
+                    "clusterSize": {
+                      "type": "number",
+                      "description": "Number of databases executing parallel tasks."
+                    }
+                  },
+                  "additionalProperties": true
+                }
+              }
             }
           ]
         }

package/lib/lazy.js

@@ -9,7 +9,7 @@ const extend = (target) => ({
     for (let each of aspects) {
       for (let p of Reflect.ownKeys(each)) {
         if (p in excludes) continue
-        define (target,p, describe(each,p))
+        Reflect.defineProperty (target,p, Reflect.getOwnPropertyDescriptor(each,p))
       }
       if (is_class(target) && is_class(each)) {
         extend(target.prototype).with(each.prototype)
@@ -28,10 +28,10 @@ const _excludes = {
 const lazify = (o) => {
   if (o.constructor === module.constructor) return lazify_module(o)
   for (let p of Reflect.ownKeys(o)) {
-    const d = describe(o,p)
-    if (is_lazy(d.value)) define (o,p,{
-      set(v) { define (this,p,{value:v,__proto__:d}) },
-      get() { return this[p] = d.value(p,this) },
+    const d = Reflect.getOwnPropertyDescriptor(o,p)
+    if (is_lazy(d.value)) Reflect.defineProperty (o,p,{
+      set(v) { Reflect.defineProperty (this,p,{value:v,__proto__:d}) },
+      get() { return this[p] = d.value.call(this,p,this) },
       configurable: true,
     })
   }
@@ -45,9 +45,7 @@ const lazify_module = (module) => {
   return (id) => (lazy) => module.require(id)
 }
 
-const is_lazy = (x) => typeof x === 'function' && /^\(?lazy[,)\t =]/.test(x)
+const is_lazy = (x) => typeof x === 'function' && /^(function\s?)?\(?lazy[,)\t =]/.test(x)
 const is_class = (x) => typeof x === 'function' && x.prototype && /^class\b/.test(x)
-const describe = Reflect.getOwnPropertyDescriptor
-const define = Reflect.defineProperty
 
 module.exports = { extend, lazify, lazified:lazify }

package/lib/log/cds-error.js

@@ -47,9 +47,9 @@ exports.message = (strings,...values) => String.raw(strings,...values.map(_forma
  *     typeof x === 'string' || cds.error.expected `${{x}} to be a string`
  *     //> Error: Expected argument 'x' to be a string, but got: { foo: 'bar' }
  */
-exports.expected = ([,type], arg) => {
+const expected = exports.expected = ([,type], arg) => {
   const [ name, value ] = Object.entries(arg)[0]
-  return error `Expected argument '${name}'${type}, but got: ${require('util').inspect(value,{depth:11})}`
+  return error (`Expected argument '${name}'${type}, but got: ${require('util').inspect(value,{depth:11})}`, undefined, expected)
 }
 
 

package/lib/ql/Whereable.js

@@ -7,25 +7,33 @@ class Query extends require('./Query') {
   where(...x) { return this._where (x,'and','where') }
   and(...x) {  return this._where (x,'and') }
   or(...x) { return this._where (x,'or') }
-  _where (args, and_or, _clause) {
-    let pred = predicate4(args, _clause)
+  _where (args, and_or, _where) {
+    let pred = predicate4(args, _where)
     if (pred && pred.length > 0) {
       let _ = this[this.cmd]
-      if (!_clause) _clause = (
+      const clause = _where ?? (
         _.having ? 'having' :
         _.where ? 'where' :
         _.from?.on ? 'on' :
         error (`Invalid attempt to call '${this.cmd}.${and_or}()' before a prior call to '${this.cmd}.where()'`)
       )
-      if (_clause === 'on') _ = _.from
-      let left = Reflect.getOwnPropertyDescriptor(_,_clause)?.value
-      if (!left) {
+      if (clause === 'on') _ = _.from
+      let left = Reflect.getOwnPropertyDescriptor(_,clause)?.value
+      if (!left) { //> .where() called first time
+        // SELECT.from `X` .where `x or y` .and `z` -> SELECT from X where (x or y) and z
         if (pred.includes('or')) this._left_has_or = true
-        _[_clause] = pred
-      } else {
-        if (this._left_has_or && and_or === 'and') { left = [{xpr:left}]; delete this._left_has_or }
+        _[clause] = pred
+      } else { //> .where(), .and(), .or() called successively
+        if (_where) {
+          // SELECT.from `X` .where `x` .or `y` .where `z` -> SELECT from X where (x or y) and z
+          if (left.includes('or')) left = [{xpr:left}]
+        } else if (and_or === 'and') {
+          // SELECT.from `X` .where `x` .or `y` .and `z` -> SELECT from X where x or y and z
+          if (this._left_has_or) { left = [{xpr:left}]; delete this._left_has_or }
+        }
+        // SELECT.from `X` .where `x` .and `y or z` -> SELECT from X where x and (y or z)
         if (pred.includes('or')) pred = [{xpr:pred}]
-        _[_clause] = [ ...left, and_or, ...pred ]
+        _[clause] = [ ...left, and_or, ...pred ]
       }
     }
     return this
@@ -44,7 +52,10 @@ class Query extends require('./Query') {
 
 const predicate4 = (args, _clause) => {
   if (args.length === 0) return; /* else */ const x = args[0]
-  if (x.raw) return parse.CXL(...args).xpr
+  if (x.raw) {
+    let cxn = parse.CXL(...args)
+    return cxn.xpr ?? [cxn] //> the fallback is for single-item exprs like `1` or `ref`
+  }
   if (args.length === 1 && typeof x === 'object') {
     if (is_array(x)) return x
     if (is_cqn(x)) return args

package/lib/ql/cds-ql.js

@@ -1,4 +1,3 @@
-const cds = require('../index')
 const Query = require('./Query')
 require = path => { // eslint-disable-line no-global-assign
   const clazz = module.require (path); if (!clazz._api) return clazz
@@ -30,6 +29,7 @@ function _deprecated_srv_ql() { // eslint-disable-next-line no-console
 }
 
 module.exports._reset = ()=>{ // for strange tests only
+  const cds = require('../index')
   const _name = cds.env.sql.names === 'quoted' ? n =>`"${n}"` : n => n.replace(/[.:]/g,'_')
   Object.defineProperty (Query.prototype,'valueOf',{ configurable:1, value: function(cmd=this.cmd) {
     return `${cmd} ${_name(this._target.name)} `

package/lib/req/response.js

@@ -4,8 +4,8 @@ const cds = require ('../index')
  * Messages Collector, used for `req.errors` and `req.messages`
  */
 class Responses extends Array {
-  add (severity, code, message, target, args) { // NOSONAR
-    let e // be filled in below...
+  static get (severity, code, message, target, args) {
+   let e // be filled in below...
     if (typeof code === 'object') e = code; else {
       if (typeof code === 'number') e = { code }; else [ code, message, target, args, e ] = [ undefined, code, message, target, {} ]
       if (typeof message === 'object') e = Object.assign(message,e); else {
@@ -16,9 +16,14 @@ class Responses extends Array {
       }
     }
     if (!e.numericSeverity) e.numericSeverity = severity
-    this.push(e)
     return e
   }
+
+  add (...args) {
+    const response = Responses.get(...args)
+    this.push(response)
+    return response
+  }
 }
 
 class Errors extends Responses {