mirror of
https://github.com/lovell/sharp.git
synced 2025-07-09 10:30:15 +02:00
Ensure clone takes deep copy of options #4029
This commit is contained in:
parent
c5f318ed4d
commit
7bc74feb11
@ -14,6 +14,9 @@ Requires libvips v8.15.1
|
|||||||
[#4028](https://github.com/lovell/sharp/pull/4028)
|
[#4028](https://github.com/lovell/sharp/pull/4028)
|
||||||
[@yolopunk](https://github.com/yolopunk)
|
[@yolopunk](https://github.com/yolopunk)
|
||||||
|
|
||||||
|
* Ensure `clone` takes a deep copy of existing options.
|
||||||
|
[#4029](https://github.com/lovell/sharp/issues/4029)
|
||||||
|
|
||||||
### v0.33.2 - 12th January 2024
|
### v0.33.2 - 12th January 2024
|
||||||
|
|
||||||
* Upgrade to libvips v8.15.1 for upstream bug fixes.
|
* Upgrade to libvips v8.15.1 for upstream bug fixes.
|
||||||
|
@ -425,13 +425,16 @@ Object.setPrototypeOf(Sharp, stream.Duplex);
|
|||||||
function clone () {
|
function clone () {
|
||||||
// Clone existing options
|
// Clone existing options
|
||||||
const clone = this.constructor.call();
|
const clone = this.constructor.call();
|
||||||
clone.options = Object.assign({}, this.options);
|
const { debuglog, queueListener, ...options } = this.options;
|
||||||
|
clone.options = structuredClone(options);
|
||||||
|
clone.options.debuglog = debuglog;
|
||||||
|
clone.options.queueListener = queueListener;
|
||||||
// Pass 'finish' event to clone for Stream-based input
|
// Pass 'finish' event to clone for Stream-based input
|
||||||
if (this._isStreamInput()) {
|
if (this._isStreamInput()) {
|
||||||
this.on('finish', () => {
|
this.on('finish', () => {
|
||||||
// Clone inherits input data
|
// Clone inherits input data
|
||||||
this._flattenBufferIn();
|
this._flattenBufferIn();
|
||||||
clone.options.bufferIn = this.options.bufferIn;
|
clone.options.input.buffer = this.options.input.buffer;
|
||||||
clone.emit('finish');
|
clone.emit('finish');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -77,4 +77,26 @@ describe('Clone', function () {
|
|||||||
assert.strictEqual(0, original.listenerCount('finish'));
|
assert.strictEqual(0, original.listenerCount('finish'));
|
||||||
assert.strictEqual(0, clone.listenerCount('finish'));
|
assert.strictEqual(0, clone.listenerCount('finish'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('Ensure deep clone of properties, including arrays', async () => {
|
||||||
|
const alpha = await sharp({
|
||||||
|
create: { width: 320, height: 240, channels: 3, background: 'red' }
|
||||||
|
}).toColourspace('b-w').png().toBuffer();
|
||||||
|
|
||||||
|
const original = sharp();
|
||||||
|
const joiner = original.clone().joinChannel(alpha);
|
||||||
|
const negater = original.clone().negate();
|
||||||
|
|
||||||
|
fs.createReadStream(fixtures.inputJpg320x240).pipe(original);
|
||||||
|
const joined = await joiner.png({ effort: 1 }).toBuffer();
|
||||||
|
const negated = await negater.png({ effort: 1 }).toBuffer();
|
||||||
|
|
||||||
|
const joinedMetadata = await sharp(joined).metadata();
|
||||||
|
assert.strictEqual(joinedMetadata.channels, 4);
|
||||||
|
assert.strictEqual(joinedMetadata.hasAlpha, true);
|
||||||
|
|
||||||
|
const negatedMetadata = await sharp(negated).metadata();
|
||||||
|
assert.strictEqual(negatedMetadata.channels, 3);
|
||||||
|
assert.strictEqual(negatedMetadata.hasAlpha, false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user