zlib: use modern class syntax for zstd classes

anonrig · targos · commit 8e6c1916014e · 2025-02-11T08:46:56.000+01:00
PR-URL: #56965 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jan Krems <jan.krems@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/zlib.js b/lib/zlib.js
@@ -830,45 +830,44 @@ const zstdDefaultOpts = {
 finishFlush: ZSTD_e_end,
 fullFlush: ZSTD_e_flush,
 };
-function Zstd(opts, mode, initParamsArray, maxParam) {
- assert(mode === ZSTD_COMPRESS || mode === ZSTD_DECOMPRESS);
-
- initParamsArray.fill(-1);
- if (opts?.params) {
- ObjectKeys(opts.params).forEach((origKey) => {
- const key = +origKey;
- if (NumberIsNaN(key) || key < 0 || key > maxParam ||
- (initParamsArray[key] | 0) !== -1) {
- throw new ERR_ZSTD_INVALID_PARAM(origKey);
- }
-
- const value = opts.params[origKey];
- if (typeof value !== 'number' && typeof value !== 'boolean') {
- throw new ERR_INVALID_ARG_TYPE('options.params[key]',
- 'number', opts.params[origKey]);
- }
- initParamsArray[key] = value;
- });
- }
-
- const handle = mode === ZSTD_COMPRESS ?
- new binding.ZstdCompress() : new binding.ZstdDecompress();
+class Zstd extends ZlibBase {
+ constructor(opts, mode, initParamsArray, maxParam) {
+ assert(mode === ZSTD_COMPRESS || mode === ZSTD_DECOMPRESS);
+
+ initParamsArray.fill(-1);
+ if (opts?.params) {
+ ObjectKeys(opts.params).forEach((origKey) => {
+ const key = +origKey;
+ if (NumberIsNaN(key) || key < 0 || key > maxParam ||
+ (initParamsArray[key] | 0) !== -1) {
+ throw new ERR_ZSTD_INVALID_PARAM(origKey);
+ }
+
+ const value = opts.params[origKey];
+ if (typeof value !== 'number' && typeof value !== 'boolean') {
+ throw new ERR_INVALID_ARG_TYPE('options.params[key]',
+ 'number', opts.params[origKey]);
+ }
+ initParamsArray[key] = value;
+ });
+ }
 
- const pledgedSrcSize = opts?.pledgedSrcSize ?? undefined;
+ const handle = mode === ZSTD_COMPRESS ?
+ new binding.ZstdCompress() : new binding.ZstdDecompress();
 
- this._writeState = new Uint32Array(2);
- handle.init(
- initParamsArray,
- pledgedSrcSize,
- this._writeState,
- processCallback,
- );
+ const pledgedSrcSize = opts?.pledgedSrcSize ?? undefined;
 
- ReflectApply(ZlibBase, this, [opts, mode, handle, zstdDefaultOpts]);
+ const writeState = new Uint32Array(2);
+ handle.init(
+ initParamsArray,
+ pledgedSrcSize,
+ writeState,
+ processCallback,
+ );
+ super(opts, mode, handle, zstdDefaultOpts);
+ this._writeState = writeState;
+ }
 }
-ObjectSetPrototypeOf(Zstd.prototype, ZlibBase.prototype);
-ObjectSetPrototypeOf(Zstd, ZlibBase);
-
 
 const kMaxZstdCParam = MathMax(...ObjectKeys(constants).map(
 (key) => (key.startsWith('ZSTD_c_') ?
@@ -878,16 +877,11 @@ const kMaxZstdCParam = MathMax(...ObjectKeys(constants).map(
 
 const zstdInitCParamsArray = new Uint32Array(kMaxZstdCParam + 1);
 
-function ZstdCompress(opts) {
- if (!(this instanceof ZstdCompress))
- return new ZstdCompress(opts);
-
- ReflectApply(Zstd, this,
- [opts, ZSTD_COMPRESS, zstdInitCParamsArray, kMaxZstdCParam]);
+class ZstdCompress extends Zstd {
+ constructor(opts) {
+ super(opts, ZSTD_COMPRESS, zstdInitCParamsArray, kMaxZstdCParam);
+ }
 }
-ObjectSetPrototypeOf(ZstdCompress.prototype, Zstd.prototype);
-ObjectSetPrototypeOf(ZstdCompress, Zstd);
-
 
 const kMaxZstdDParam = MathMax(...ObjectKeys(constants).map(
 (key) => (key.startsWith('ZSTD_d_') ?
@@ -897,16 +891,11 @@ const kMaxZstdDParam = MathMax(...ObjectKeys(constants).map(
 
 const zstdInitDParamsArray = new Uint32Array(kMaxZstdDParam + 1);
 
-function ZstdDecompress(opts) {
- if (!(this instanceof ZstdDecompress))
- return new ZstdDecompress(opts);
-
- ReflectApply(Zstd, this,
- [opts, ZSTD_DECOMPRESS, zstdInitDParamsArray, kMaxZstdDParam]);
+class ZstdDecompress extends Zstd {
+ constructor(opts) {
+ super(opts, ZSTD_DECOMPRESS, zstdInitDParamsArray, kMaxZstdDParam);
+ }
 }
-ObjectSetPrototypeOf(ZstdDecompress.prototype, Zstd.prototype);
-ObjectSetPrototypeOf(ZstdDecompress, Zstd);
-
 
 function createProperty(ctor) {
 return {
diff --git a/test/parallel/test-zlib-invalid-input.js b/test/parallel/test-zlib-invalid-input.js
@@ -40,7 +40,7 @@ const unzips = [
 zlib.Inflate(),
 zlib.InflateRaw(),
 zlib.BrotliDecompress(),
- zlib.ZstdDecompress(),
+ new zlib.ZstdDecompress(),
 ];
 
 nonStringInputs.forEach(common.mustCall((input) => {
diff --git a/test/parallel/test-zlib-zero-byte.js b/test/parallel/test-zlib-zero-byte.js
@@ -36,7 +36,7 @@ test('zlib should properly handle zero byte input', async () => {
 
 for (const [Compressor, expected] of compressors) {
 const { promise, resolve, reject } = Promise.withResolvers();
- const gz = Compressor();
+ const gz = new Compressor();
 const emptyBuffer = Buffer.alloc(0);
 let received = 0;
 gz.on('data', function(c) {

-Original file line number
+Diff line change
 finishFlush: ZSTD_e_end,
 fullFlush: ZSTD_e_flush,
 };
 -functionZstd(opts,mode,initParamsArray,maxParam){
 -assert(mode===ZSTD_COMPRESS||mode===ZSTD_DECOMPRESS);
+-
 -initParamsArray.fill(-1);
 -if(opts?.params){
 -ObjectKeys(opts.params).forEach((origKey)=>{
 -constkey=+origKey;
 -if(NumberIsNaN(key)||key<0||key>maxParam||
 -(initParamsArray[key]|0)!==-1){
 -thrownewERR_ZSTD_INVALID_PARAM(origKey);
 -}
+-
 -constvalue=opts.params[origKey];
 -if(typeofvalue!=='number'&&typeofvalue!=='boolean'){
 -thrownewERR_INVALID_ARG_TYPE('options.params[key]',
 -'number',opts.params[origKey]);
 -}
 -initParamsArray[key]=value;
 -});
 -}
+-
 -consthandle=mode===ZSTD_COMPRESS ?
 -newbinding.ZstdCompress() : newbinding.ZstdDecompress();
 +classZstdextendsZlibBase{
 +constructor(opts,mode,initParamsArray,maxParam){
 +assert(mode===ZSTD_COMPRESS||mode===ZSTD_DECOMPRESS);
++
 +initParamsArray.fill(-1);
 +if(opts?.params){
 +ObjectKeys(opts.params).forEach((origKey)=>{
 +constkey=+origKey;
 +if(NumberIsNaN(key)||key<0||key>maxParam||
 +(initParamsArray[key]|0)!==-1){
 +thrownewERR_ZSTD_INVALID_PARAM(origKey);
 +}
++
 +constvalue=opts.params[origKey];
 +if(typeofvalue!=='number'&&typeofvalue!=='boolean'){
 +thrownewERR_INVALID_ARG_TYPE('options.params[key]',
 +'number',opts.params[origKey]);
 +}
 +initParamsArray[key]=value;
 +});
 +}
 -constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
 +consthandle=mode===ZSTD_COMPRESS ?
 +newbinding.ZstdCompress() : newbinding.ZstdDecompress();
 -this._writeState=newUint32Array(2);
 -handle.init(
 -initParamsArray,
 -pledgedSrcSize,
 -this._writeState,
 -processCallback,
 -);
 +constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
 -ReflectApply(ZlibBase,this,[opts,mode,handle,zstdDefaultOpts]);
 +constwriteState=newUint32Array(2);
 +handle.init(
 +initParamsArray,
 +pledgedSrcSize,
 +writeState,
 +processCallback,
 +);
 +super(opts,mode,handle,zstdDefaultOpts);
 +this._writeState=writeState;
 +}
+}
 -ObjectSetPrototypeOf(Zstd.prototype,ZlibBase.prototype);
 -ObjectSetPrototypeOf(Zstd,ZlibBase);
+-
 constkMaxZstdCParam=MathMax(...ObjectKeys(constants).map(
 (key)=>(key.startsWith('ZSTD_c_') ?
 constzstdInitCParamsArray=newUint32Array(kMaxZstdCParam+1);
 -functionZstdCompress(opts){
 -if(!(thisinstanceofZstdCompress))
 -returnnewZstdCompress(opts);
+-
 -ReflectApply(Zstd,this,
 -[opts,ZSTD_COMPRESS,zstdInitCParamsArray,kMaxZstdCParam]);
 +classZstdCompressextendsZstd{
 +constructor(opts){
 +super(opts,ZSTD_COMPRESS,zstdInitCParamsArray,kMaxZstdCParam);
 +}
+}
 -ObjectSetPrototypeOf(ZstdCompress.prototype,Zstd.prototype);
 -ObjectSetPrototypeOf(ZstdCompress,Zstd);
+-
 constkMaxZstdDParam=MathMax(...ObjectKeys(constants).map(
 (key)=>(key.startsWith('ZSTD_d_') ?
 constzstdInitDParamsArray=newUint32Array(kMaxZstdDParam+1);
 -functionZstdDecompress(opts){
 -if(!(thisinstanceofZstdDecompress))
 -returnnewZstdDecompress(opts);
+-
 -ReflectApply(Zstd,this,
 -[opts,ZSTD_DECOMPRESS,zstdInitDParamsArray,kMaxZstdDParam]);
 +classZstdDecompressextendsZstd{
 +constructor(opts){
 +super(opts,ZSTD_DECOMPRESS,zstdInitDParamsArray,kMaxZstdDParam);
 +}
+}
 -ObjectSetPrototypeOf(ZstdDecompress.prototype,Zstd.prototype);
 -ObjectSetPrototypeOf(ZstdDecompress,Zstd);
+-
 functioncreateProperty(ctor){
 return{
-Original file line number
+Diff line change
 for(const[Compressor,expected]ofcompressors){
 const{ promise, resolve, reject }=Promise.withResolvers();
 -constgz=Compressor();
 +constgz=newCompressor();
 constemptyBuffer=Buffer.alloc(0);
 letreceived=0;
 gz.on('data',function(c){