1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00

Tools: Implement "prefer-object-spread" eslint rule

This commit is contained in:
Laurent Cozic
2023-06-01 12:02:36 +01:00
parent 804d674d37
commit c89edd7b22
126 changed files with 588 additions and 909 deletions

View File

@@ -250,11 +250,9 @@ function shimInit(options = null) {
// destinationResourceId option. This method is indirectly tested in
// Api.test.ts.
shim.createResourceFromPath = async function(filePath, defaultProps = null, options = null) {
options = Object.assign({
resizeLargeImages: 'always', // 'always', 'ask' or 'never'
options = { resizeLargeImages: 'always', // 'always', 'ask' or 'never'
userSideValidation: false,
destinationResourceId: '',
}, options);
destinationResourceId: '', ...options };
const readChunk = require('read-chunk');
const imageType = require('image-type');
@@ -332,9 +330,7 @@ function shimInit(options = null) {
};
shim.attachFileToNoteBody = async function(noteBody, filePath, position = null, options = null) {
options = Object.assign({}, {
createFileURL: false,
}, options);
options = { createFileURL: false, ...options };
const { basename } = require('path');
const { escapeTitleText } = require('./markdownUtils').default;
@@ -371,9 +367,7 @@ function shimInit(options = null) {
const newBody = await shim.attachFileToNoteBody(note.body, filePath, position, options);
if (!newBody) return null;
const newNote = Object.assign({}, note, {
body: newBody,
});
const newNote = { ...note, body: newBody };
return Note.save(newNote);
};
@@ -570,9 +564,7 @@ function shimInit(options = null) {
shim.uploadBlob = async function(url, options) {
if (!options || !options.path) throw new Error('uploadBlob: source file path is missing');
const content = await fs.readFile(options.path);
options = Object.assign({}, options, {
body: content,
});
options = { ...options, body: content };
return shim.fetch(url, options);
};