Merge branch 'dev' into 5507-loadConfigAtStart
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
commit
fd1e6122e8
|
@ -1,6 +1,8 @@
|
|||
|
||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||
const UserError = require('vn-loopback/util/user-error');
|
||||
const utils = require('loopback/lib/utils');
|
||||
const {util} = require('webpack');
|
||||
|
||||
module.exports = function(Self) {
|
||||
Self.ParameterizedSQL = ParameterizedSQL;
|
||||
|
@ -164,23 +166,21 @@ module.exports = function(Self) {
|
|||
|
||||
function rewriteMethod(methodName) {
|
||||
const realMethod = this[methodName];
|
||||
return async(data, options, cb) => {
|
||||
if (options instanceof Function) {
|
||||
cb = options;
|
||||
options = null;
|
||||
}
|
||||
return function(...args) {
|
||||
let cb;
|
||||
const lastArg = args[args.length - 1];
|
||||
if (lastArg instanceof Function) {
|
||||
cb = lastArg;
|
||||
args.pop();
|
||||
} else
|
||||
cb = utils.createPromiseCallback();
|
||||
|
||||
try {
|
||||
const result = await realMethod.call(this, data, options);
|
||||
|
||||
if (cb) cb(null, result);
|
||||
else return result;
|
||||
} catch (err) {
|
||||
let myErr = replaceErr(err, replaceErrFunc);
|
||||
if (cb) cb(myErr);
|
||||
else
|
||||
throw myErr;
|
||||
}
|
||||
args.push(function(err, res) {
|
||||
if (err) err = replaceErr(err, replaceErrFunc);
|
||||
cb(err, res);
|
||||
});
|
||||
realMethod.apply(this, args);
|
||||
return cb.promise;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue