From fc578735d7c9b5399f2464994bdf8f7044ed44f2 Mon Sep 17 00:00:00 2001 From: build-token <build-token> Date: Fri, 17 Mar 2023 03:17:08 +0000 Subject: [PATCH] publish: fix(deps): update cozy konnector packages generated from commit cb7cd0e7849f33aa0b5b91e483f84c6c36f7b235 --- index.js | 376 +++++++++++++++++++++++++++++++++------------------ package.json | 4 +- 2 files changed, 244 insertions(+), 136 deletions(-) diff --git a/index.js b/index.js index 8c18b08..847e561 100644 --- a/index.js +++ b/index.js @@ -462,6 +462,19 @@ module.exports = __webpack_require__(3)["default"]; /* 3 */ /***/ ((module, exports, __webpack_require__) => { +const _excluded = ["debug"], + _excluded2 = ["cheerio", "userAgent"]; + +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + +function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } + +function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } + /** * This is a function which returns an instance of * [request-promise](https://www.npmjs.com/package/request-promise) initialized with @@ -551,12 +564,14 @@ exports = module.exports = { DEFAULT_USER_AGENT }; -function requestFactory({ - debug, - ...options -} = { +function requestFactory(_ref = { debug: false }) { + let { + debug + } = _ref, + options = _objectWithoutProperties(_ref, _excluded); + const logFn = setDebugFunction(debug); debug && requestdebug(request, logFn); return request.defaults(getRequestOptions(mergeDefaultOptions(options))); @@ -629,39 +644,39 @@ function mergeDefaultOptions(options = {}) { options.json = false; } - return { ...defaultOptions, - ...options - }; + return _objectSpread(_objectSpread({}, defaultOptions), options); } function transformWithCheerio(body, response, resolveWithFullResponse) { const result = (__webpack_require__(255).load)(body); if (resolveWithFullResponse) { - return { ...response, + return _objectSpread(_objectSpread({}, response), {}, { body: result - }; + }); } return result; } -function getRequestOptions({ - cheerio, - userAgent, - ...options -}) { +function getRequestOptions(_ref2) { + let { + cheerio, + userAgent + } = _ref2, + options = _objectWithoutProperties(_ref2, _excluded2); + const userAgentOption = options.headers['User-Agent']; - return cheerio ? { ...options, + return cheerio ? _objectSpread(_objectSpread({}, options), {}, { transform: transformWithCheerio, - headers: { ...options.headers, + headers: _objectSpread(_objectSpread({}, options.headers), {}, { 'User-Agent': userAgentOption ? userAgentOption : userAgent === false ? undefined : DEFAULT_USER_AGENT - } - } : { ...options, - headers: { ...options.headers, + }) + }) : _objectSpread(_objectSpread({}, options), {}, { + headers: _objectSpread(_objectSpread({}, options.headers), {}, { 'User-Agent': userAgent ? DEFAULT_USER_AGENT : options.headers['User-Agent'] - } - }; + }) + }); } /***/ }), @@ -65486,6 +65501,12 @@ module.exports = noop; /* 460 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Small utilities helping to develop konnectors. * @@ -65617,7 +65638,7 @@ const findDuplicates = async (doctype, options) => { for (let key in groups) { const group = groups[key]; toKeep.push(group[0]); - toRemove.push.apply(toRemove, group.slice(1).map(doc => ({ ...doc, + toRemove.push.apply(toRemove, group.slice(1).map(doc => _objectSpread(_objectSpread({}, doc), {}, { original: group[0]._id }))); } @@ -150121,6 +150142,12 @@ module.exports = JSON.parse('{"com":{"tricount.expenses":"Expenses Tricount","sp /* 912 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /* global __WEBPACK_PROVIDED_MANIFEST__ */ /** @@ -150177,9 +150204,7 @@ function getCozyMetadata(data = {}) { } } - return { ...defaultData, - ...data - }; + return _objectSpread(_objectSpread({}, defaultData), data); } module.exports = { @@ -150192,6 +150217,12 @@ module.exports = { /* 913 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + const fs = __webpack_require__(149); const path = __webpack_require__(142); @@ -150313,11 +150344,11 @@ module.exports = { if (doctype === 'io.cozy.accounts') { const configPath = path.resolve('konnector-dev-config.json'); const config = JSON.parse(stripJsonComments(fs.readFileSync(configPath, 'utf8'))); - result = { - _id: id, - ...result, + result = _objectSpread(_objectSpread({ + _id: id + }, result), {}, { auth: config.fields - }; + }); if (!accountExists) { this.create(doctype, result); @@ -150404,9 +150435,7 @@ module.exports = { await renameFile(id, attrs.name); } - doc.attributes = { ...doc.attributes, - ...attrs - }; + doc.attributes = _objectSpread(_objectSpread({}, doc.attributes), attrs); db.get('io.cozy.files').updateById(id, doc).write(); } }, @@ -177608,6 +177637,12 @@ function yearsToQuarters(years) { /* 1275 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Bank transactions categorization * @@ -177689,10 +177724,10 @@ async function createCategorizer(options = {}) { } try { - localModel = await createLocalModel({ ...classifierOptions, + localModel = await createLocalModel(_objectSpread(_objectSpread({}, classifierOptions), {}, { pretrainedClassifier, customTransactionFetcher - }); + })); } catch (e) { log('warn', 'Failed to create local model:'); log('warn', e.message); @@ -177970,12 +178005,16 @@ module.exports = { /* 1280 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + const bayes = __webpack_require__(1281); function createClassifier(parameters, options) { - parameters.options = { ...parameters.options, - ...options - }; + parameters.options = _objectSpread(_objectSpread({}, parameters.options), options); const classifier = bayes.fromJson(parameters); return classifier; } @@ -183428,6 +183467,12 @@ module.exports = { /* 1287 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +const _excluded = ["pretrainedClassifier"]; + +function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } + +function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } + const { createClassifier } = __webpack_require__(1288); @@ -183455,9 +183500,10 @@ const log = logger.namespace('categorization/localModel/model'); async function createModel(options) { const { - pretrainedClassifier, - ...remainingOptions - } = options; + pretrainedClassifier + } = options, + remainingOptions = _objectWithoutProperties(options, _excluded); + let classifier; if (pretrainedClassifier) { @@ -183516,6 +183562,18 @@ module.exports = { /* 1288 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +const _excluded = ["customTransactionFetcher"]; + +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + +function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } + +function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } + const { fetchTransactionsWithManualCat } = __webpack_require__(1289); @@ -183645,9 +183703,10 @@ const reweightModel = classifier => { const createClassifier = async options => { const { - customTransactionFetcher, - ...remainingOptions - } = options; + customTransactionFetcher + } = options, + remainingOptions = _objectWithoutProperties(options, _excluded); + let transactions = []; if (!customTransactionFetcher) { @@ -183661,10 +183720,8 @@ const createClassifier = async options => { log('debug', `Fetched ${transactions.length} transactions`); log('debug', 'Instanciating a new classifier'); const uniqueCategories = getUniqueCategories(transactions); - const classifierOptions = getClassifierOptions(uniqueCategories?.length || 0); - const classifier = createLocalClassifier(transactions, { ...remainingOptions, - ...classifierOptions.initialization - }, classifierOptions.configuration); + const classifierOptions = getClassifierOptions((uniqueCategories === null || uniqueCategories === void 0 ? void 0 : uniqueCategories.length) || 0); + const classifier = createLocalClassifier(transactions, _objectSpread(_objectSpread({}, remainingOptions), classifierOptions.initialization), classifierOptions.configuration); log('debug', 'Reweighting model to lower the impact of amount in the prediction'); reweightModel(classifier); log('debug', 'Reweighting model to lower the impact of amount in the prediction'); @@ -183761,6 +183818,12 @@ module.exports = log; /* 1293 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + const cozy = __webpack_require__(461); const log = (__webpack_require__(330).namespace)('BaseKonnector'); @@ -184154,9 +184217,7 @@ class BaseKonnector { heartBeat: 5 * s, retry: false }; - options = { ...defaultParams, - ...options - }; + options = _objectSpread(_objectSpread({}, defaultParams), options); if (options.timeout) { log('warn', `The timeout option for waitForTwoFaCode is deprecated. Please use the endTime option now`); @@ -184225,11 +184286,10 @@ class BaseKonnector { saveBills(entries, fields, options) { - return saveBills(entries, fields, { + return saveBills(entries, fields, _objectSpread({ sourceAccount: this.accountId, - sourceAccountIdentifier: fields.login, - ...options - }); + sourceAccountIdentifier: fields.login + }, options)); } /** * This is saveFiles function from cozy-konnector-libs which automatically adds sourceAccount and @@ -184240,11 +184300,10 @@ class BaseKonnector { saveFiles(entries, fields, options) { - return saveFiles(entries, fields, { + return saveFiles(entries, fields, _objectSpread({ sourceAccount: this.accountId, - sourceAccountIdentifier: fields.login, - ...options - }); + sourceAccountIdentifier: fields.login + }, options)); } /** * This is updateOrCreate function from cozy-konnector-libs which automatically adds sourceAccount in @@ -184255,11 +184314,10 @@ class BaseKonnector { updateOrCreate(entries, doctype, matchingAttributes, options) { - return updateOrCreate(entries, doctype, matchingAttributes, { + return updateOrCreate(entries, doctype, matchingAttributes, _objectSpread({ sourceAccount: this.accountId, - sourceAccountIdentifier: get(options, 'fields.login'), - ...options - }); + sourceAccountIdentifier: get(options, 'fields.login') + }, options)); } /** * This is saveIdentity function from cozy-konnector-libs which automatically adds sourceAccount in @@ -184270,11 +184328,10 @@ class BaseKonnector { saveIdentity(contact, accountIdentifier, options = {}) { - return saveIdentity(contact, accountIdentifier, { + return saveIdentity(contact, accountIdentifier, _objectSpread({ sourceAccount: this.accountId, - sourceAccountIdentifier: accountIdentifier, - ...options - }); + sourceAccountIdentifier: accountIdentifier + }, options)); } /** * This is signin function from cozy-konnector-libs which automatically adds deactivateAutoSuccessfulLogin @@ -184631,6 +184688,12 @@ module.exports.manageContractsData = manageContractsData; /* 1295 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Saves the given files in the given folder via the Cozy API. * @@ -184796,9 +184859,9 @@ const saveFiles = async (entries, fields, options = {}) => { if (canBeSaved(entry)) { const folderPath = await getOrCreateDestinationPath(entry, saveOptions); - entry = await saveEntry(entry, { ...saveOptions, + entry = await saveEntry(entry, _objectSpread(_objectSpread({}, saveOptions), {}, { folderPath - }); + })); if (entry && entry._cozy_file_to_create) { savedFiles++; @@ -184990,19 +185053,14 @@ async function createFile(entry, options, method, fileId) { } } - createFileOptions = { ...createFileOptions, - ...entry.fileAttributes, - ...options.sourceAccountOptions - }; + createFileOptions = _objectSpread(_objectSpread(_objectSpread({}, createFileOptions), entry.fileAttributes), options.sourceAccountOptions); if (options.fileIdAttributes) { - createFileOptions = { ...createFileOptions, - ...{ - metadata: { ...createFileOptions.metadata, - fileIdAttributes: calculateFileKey(entry, options.fileIdAttributes) - } - } - }; + createFileOptions = _objectSpread(_objectSpread({}, createFileOptions), { + metadata: _objectSpread(_objectSpread({}, createFileOptions.metadata), {}, { + fileIdAttributes: calculateFileKey(entry, options.fileIdAttributes) + }) + }); } let toCreate; @@ -185012,9 +185070,9 @@ async function createFile(entry, options, method, fileId) { } else if (entry.fetchFile || options.fetchFile) { toCreate = await (entry.fetchFile || options.fetchFile)(entry); } else { - toCreate = downloadEntry(entry, { ...options, + toCreate = downloadEntry(entry, _objectSpread(_objectSpread({}, options), {}, { simple: false - }); + })); } let fileDocument; @@ -185268,9 +185326,7 @@ function getRequestOptions(entry, options) { defaultRequestOptions.jar = true; } - return { ...defaultRequestOptions, - ...entry.requestOptions - }; + return _objectSpread(_objectSpread({}, defaultRequestOptions), entry.requestOptions); } function attachFileToEntry(entry, fileDocument) { @@ -188839,6 +188895,12 @@ module.exports = { /* 1317 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Saves the data into the cozy blindly without check. * @@ -188891,13 +188953,14 @@ const addData = (entries, doctype, options = {}) => { return bluebird.mapSeries(entries, async entry => { log('debug', entry, 'Adding this entry'); - const metaEntry = { - cozyMetadata: getCozyMetadata({ ...entry.cozyMetadata, + + const metaEntry = _objectSpread({ + cozyMetadata: getCozyMetadata(_objectSpread(_objectSpread({}, entry.cozyMetadata), {}, { sourceAccount: options.sourceAccount, sourceAccountIdentifier: options.sourceAccountIdentifier - }), - ...entry - }; + })) + }, entry); + const dbEntry = await (metaEntry._id ? cozy.data.update(doctype, metaEntry, omit(metaEntry, '_rev')) : cozy.data.create(doctype, metaEntry)); // Also update the original entry _id to allow saveBills' // linkBankOperation entries to have an id @@ -188912,6 +188975,12 @@ module.exports = addData; /* 1318 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Finds links between bills and bank operations. * @@ -189052,8 +189121,7 @@ class Linker { } getOptions(opts = {}) { - const options = { ...opts - }; + const options = _objectSpread({}, opts); if (typeof options.identifiers === 'string') { options.identifiers = [options.identifiers.toLowerCase()]; @@ -189215,12 +189283,12 @@ class Linker { } combineBills(...bills) { - return { ...bills[0], + return _objectSpread(_objectSpread({}, bills[0]), {}, { _id: ['combined', ...bills.map(bill => bill._id)].join(':'), amount: sumBy(bills, bill => bill.amount), originalAmount: sumBy(bills, bill => bill.originalAmount), originalBills: bills - }; + }); } } @@ -190469,6 +190537,18 @@ module.exports = ( function () { /* 1337 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +const _excluded = ["url", "formSelector", "formData", "parse", "validate"]; + +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + +function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; } + +function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } + /** * Provides an handy method to log the user in, * on HTML form pages. On success, it resolves to a promise with a parsed body. @@ -190558,14 +190638,16 @@ const cheerio = __webpack_require__(255); */ -function signin({ - url, - formSelector, - formData = {}, - parse = 'cheerio', - validate = defaultValidate, - ...requestOpts -} = {}) { +function signin(_ref = {}) { + let { + url, + formSelector, + formData = {}, + parse = 'cheerio', + validate = defaultValidate + } = _ref, + requestOpts = _objectWithoutProperties(_ref, _excluded); + // Check for mandatory arguments if (url === undefined) { throw new Error('signin: `url` must be defined'); @@ -190575,11 +190657,10 @@ function signin({ throw new Error('signin: `formSelector` must be defined'); } - const rq = requestOpts.requestInstance || requestFactory({ + const rq = requestOpts.requestInstance || requestFactory(_objectSpread({ jar: true, - json: false, - ...requestOpts - }); + json: false + }, requestOpts)); const parseBody = getStrategy(parse); return rq({ uri: url, @@ -190651,8 +190732,7 @@ function submitForm(rq, uri, inputs, parseBody, referer) { return rq({ uri: uri, method: 'POST', - form: { ...inputs - }, + form: _objectSpread({}, inputs), transform: (body, response) => [response.statusCode, parseBody(body), response], headers: { Referer: referer @@ -190695,6 +190775,12 @@ module.exports = __webpack_require__(44); /* 1340 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Creates or updates the given entries according to if they already * exist in the cozy or not @@ -190732,13 +190818,13 @@ const { const updateOrCreate = (entries = [], doctype, matchingAttributes = [], options = {}) => { return cozy.data.findAll(doctype).then(existings => bluebird.mapSeries(entries, entry => { - const metaEntry = { - cozyMetadata: getCozyMetadata({ ...entry.cozyMetadata, + const metaEntry = _objectSpread({ + cozyMetadata: getCozyMetadata(_objectSpread(_objectSpread({}, entry.cozyMetadata), {}, { sourceAccount: options.sourceAccount, sourceAccountIdentifier: options.sourceAccountIdentifier - }), - ...entry - }; // try to find a corresponding existing element + })) + }, entry); // try to find a corresponding existing element + const toUpdate = existings.find(doc => matchingAttributes.reduce((isMatching, matchingAttribute) => isMatching && get(doc, matchingAttribute) === get(metaEntry, matchingAttribute), true)); @@ -190759,6 +190845,12 @@ module.exports = updateOrCreate; /* 1341 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Helper to set or merge io.cozy.identities * See https://github.com/cozy/cozy-doctypes/blob/master/docs/io.cozy.identities.md @@ -190861,22 +190953,22 @@ const saveIdentity = async (contactOrIdentity, accountIdentifier, options = {}) log('debug', 'Updating existing identity'); let newIdentity = existingIdentity[0]; newIdentity.contact = identity.contact; - await newClient.save({ ...newIdentity, + await newClient.save(_objectSpread(_objectSpread({}, newIdentity), {}, { _type: 'io.cozy.identities' - }); + })); } else { try { - await newClient.save({ ...identity, + await newClient.save(_objectSpread(_objectSpread({}, identity), {}, { _type: 'io.cozy.identities' - }); + })); } catch (e) { log('error', e); } } } else { - await updateOrCreate([identity], 'io.cozy.identities', ['identifier', 'cozyMetadata.createdByApp'], { ...options, + await updateOrCreate([identity], 'io.cozy.identities', ['identifier', 'cozyMetadata.createdByApp'], _objectSpread(_objectSpread({}, options), {}, { sourceAccountIdentifier: accountIdentifier - }); + })); } return; @@ -193957,6 +194049,12 @@ module.exports = { /* 1375 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + const log = (__webpack_require__(330).namespace)('CookieKonnector'); const BaseKonnector = __webpack_require__(1293); @@ -194056,9 +194154,9 @@ class CookieKonnector extends BaseKonnector { requestFactory(options) { this._jar = this._jar || requestFactory().jar(); - return requestFactory({ ...options, + return requestFactory(_objectSpread(_objectSpread({}, options), {}, { jar: this._jar - }); + })); } /** * Reset cookie session with a new empty session and save it to the associated account @@ -194122,9 +194220,9 @@ class CookieKonnector extends BaseKonnector { async saveSession(obj) { - const accountData = { ...this._account.data, + const accountData = _objectSpread(_objectSpread({}, this._account.data), {}, { auth: {} - }; + }); if (obj && obj.getCookieJar) { this._jar._jar = obj.getCookieJar(); @@ -194144,9 +194242,9 @@ class CookieKonnector extends BaseKonnector { async signin(options) { - const result = await super.signin({ ...options, + const result = await super.signin(_objectSpread(_objectSpread({}, options), {}, { requestInstance: this.request - }); + })); await this.saveSession(); return result; } @@ -194159,9 +194257,9 @@ class CookieKonnector extends BaseKonnector { saveFiles(entries, fields, options) { - return super.saveFiles(entries, fields, { ...options, + return super.saveFiles(entries, fields, _objectSpread(_objectSpread({}, options), {}, { requestInstance: this.request - }); + })); } /** * This is saveBills function from cozy-konnector-libs which is forced to use the current cookies @@ -194172,9 +194270,9 @@ class CookieKonnector extends BaseKonnector { saveBills(entries, fields, options) { - return super.saveBills(entries, fields, { ...options, + return super.saveBills(entries, fields, _objectSpread(_objectSpread({}, options), {}, { requestInstance: this.request - }); + })); } } @@ -194185,6 +194283,12 @@ module.exports = CookieKonnector; /* 1376 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + const { URL } = __webpack_require__(63); @@ -194323,12 +194427,12 @@ function htmlToPDF($, frag, $parent, opts) { htmlToPDF($, frag.table({ widths: [5 * pdf.cm, null], borderWidth: 1 - }), $el, { ...opts, + }), $el, _objectSpread(_objectSpread({}, opts), {}, { tableState: { tableWidth: 2, colRemaining: 2 } - }); + })); parentDL = null; break; @@ -194732,6 +194836,12 @@ module.exports = normalizeFilename; /* 1381 */ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + /** * Use every possible means to solve a captcha. At the moment, Anticaptcha web service is used if * any related secret key is found in COZY_PARAMETERS environment variable. @@ -194788,9 +194898,7 @@ const solveCaptcha = async (params = {}) => { type: 'recaptcha', timeout: DEFAULT_TIMEOUT }; - params = { ...defaultParams, - ...params - }; + params = _objectSpread(_objectSpread({}, defaultParams), params); const secrets = JSON.parse(process.env.COZY_PARAMETERS || '{}').secret; if (params.type === 'recaptcha') { @@ -240372,7 +240480,7 @@ var SpanStatus; (function (SpanStatus) { /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"name":"egl","version":"1.2.0","description":"","repository":{"type":"git","url":"git+https://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git"},"keywords":[],"author":"Grand Lyon","license":"AGPL-3.0","main":"./src/index.js","eslintConfig":{"extends":["cozy-app"]},"eslintIgnore":["build"],"husky":{"hooks":{"pre-commit":"yarn lint"}},"scripts":{"start":"node ./src/index.js","dev":"cozy-konnector-dev","standalone":"cozy-konnector-standalone","pretest":"npm run clean","test":"konitor testit .","check":"konitor check .","clean":"rm -rf ./data","build":"webpack","lint":"eslint --fix .","deploy":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build}","deploy-dev":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build-dev}","cozyPublish":"cozy-app-publish --token $REGISTRY_TOKEN --build-commit $(git rev-parse ${DEPLOY_BRANCH:-build})","travisDeployKey":"./bin/generate_travis_deploy_key"},"dependencies":{"@sentry/node":"7.30.0","@sentry/tracing":"7.30.0","cozy-konnector-libs":"5.2.0","moment":"^2.24.0","moment-timezone":"^0.5.26","axios":"1.2.2"},"devDependencies":{"@types/moment-timezone":"^0.5.30","copy-webpack-plugin":"6.1.1","cozy-app-publish":"0.25.0","cozy-jobs-cli":"2.0.2","cozy-konnector-build":"1.4.4","eslint":"5.16.0","eslint-config-cozy-app":"1.6.0","eslint-plugin-prettier":"3.0.1","git-directory-deploy":"1.5.1","husky":"4.3.0","konitor":"0.10.2","standard-version":"^9.5.0","svgo":"1.3.2","webpack":"5.75.0","webpack-cli":"5.0.1"}}'); +module.exports = JSON.parse('{"name":"egl","version":"1.2.0","description":"","repository":{"type":"git","url":"git+https://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git"},"keywords":[],"author":"Grand Lyon","license":"AGPL-3.0","main":"./src/index.js","eslintConfig":{"extends":["cozy-app"]},"eslintIgnore":["build"],"husky":{"hooks":{"pre-commit":"yarn lint"}},"scripts":{"start":"node ./src/index.js","dev":"cozy-konnector-dev","standalone":"cozy-konnector-standalone","pretest":"npm run clean","test":"konitor testit .","check":"konitor check .","clean":"rm -rf ./data","build":"webpack","lint":"eslint --fix .","deploy":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build}","deploy-dev":"git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build-dev}","cozyPublish":"cozy-app-publish --token $REGISTRY_TOKEN --build-commit $(git rev-parse ${DEPLOY_BRANCH:-build})","travisDeployKey":"./bin/generate_travis_deploy_key"},"dependencies":{"@sentry/node":"7.30.0","@sentry/tracing":"7.30.0","cozy-konnector-libs":"5.2.1","moment":"^2.24.0","moment-timezone":"^0.5.26","axios":"1.2.2"},"devDependencies":{"@types/moment-timezone":"^0.5.30","copy-webpack-plugin":"6.1.1","cozy-app-publish":"0.25.0","cozy-jobs-cli":"2.0.3","cozy-konnector-build":"1.4.4","eslint":"5.16.0","eslint-config-cozy-app":"1.6.0","eslint-plugin-prettier":"3.0.1","git-directory-deploy":"1.5.1","husky":"4.3.0","konitor":"0.10.2","standard-version":"^9.5.0","svgo":"1.3.2","webpack":"5.75.0","webpack-cli":"5.0.1"}}'); /***/ }), /* 1647 */ diff --git a/package.json b/package.json index 3c1eb44..ca5626c 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "dependencies": { "@sentry/node": "7.30.0", "@sentry/tracing": "7.30.0", - "cozy-konnector-libs": "5.2.0", + "cozy-konnector-libs": "5.2.1", "moment": "^2.24.0", "moment-timezone": "^0.5.26", "axios": "1.2.2" @@ -50,7 +50,7 @@ "@types/moment-timezone": "^0.5.30", "copy-webpack-plugin": "6.1.1", "cozy-app-publish": "0.25.0", - "cozy-jobs-cli": "2.0.2", + "cozy-jobs-cli": "2.0.3", "cozy-konnector-build": "1.4.4", "eslint": "5.16.0", "eslint-config-cozy-app": "1.6.0", -- GitLab