chore: update dependencies

BREAKING CHANGE:

Node.js 6 and 8 are no longer supported.

Author: targos

.travis.yml

@@ -1,7 +1,5 @@
 language: node_js
 node_js:
-  - 11
   - 10
-  - 8
-  - 6
+  - 12
 after_script: 'bash <(curl -s https://codecov.io/bash)'

package.json

@@ -21,14 +21,14 @@
   ],
   "scripts": {
     "clean": "rimraf lib lib-esm",
-    "eslint": "eslint src --ext ts --cache",
+    "eslint": "eslint src --ext ts",
     "eslint-fix": "npm run eslint -- --fix",
     "prepublishOnly": "npm run tsc",
     "test": "npm run test-coverage && npm run eslint",
     "test-coverage": "npm run test-only -- --coverage",
     "test-only": "jest",
     "tsc": "npm run clean && npm run tsc-cjs && npm run tsc-esm",
-    "tsc-cjs": "tsc",
+    "tsc-cjs": "tsc --project tsconfig.cjs.json",
     "tsc-esm": "tsc --project tsconfig.esm.json"
   },
   "repository": {
@@ -44,23 +44,33 @@
     "testEnvironment": "node"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.11",
-    "@typescript-eslint/eslint-plugin": "^1.5.0",
-    "@typescript-eslint/parser": "^1.5.0",
-    "eslint": "^5.15.3",
-    "eslint-config-cheminfo": "^1.20.1",
-    "eslint-config-cheminfo-typescript": "^3.0.0",
-    "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-jest": "^22.4.1",
-    "jest": "^24.5.0",
+    "@types/jest": "^24.0.19",
+    "@types/node": "^12.11.2",
+    "@typescript-eslint/eslint-plugin": "^2.5.0",
+    "@typescript-eslint/parser": "^2.5.0",
+    "eslint": "^6.5.1",
+    "eslint-config-cheminfo": "^2.0.3",
+    "eslint-config-cheminfo-typescript": "^4.1.1",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-jest": "^22.20.0",
+    "eslint-plugin-prettier": "^3.1.1",
+    "jest": "^24.9.0",
     "pngjs": "^3.4.0",
-    "rimraf": "^2.6.3",
-    "ts-jest": "^24.0.0",
-    "typescript": "^3.3.4000"
+    "prettier": "^1.18.2",
+    "rimraf": "^3.0.0",
+    "ts-jest": "^24.1.0",
+    "typescript": "^3.6.4"
   },
   "dependencies": {
     "@types/pako": "^1.0.1",
     "iobuffer": "^4.0.1",
     "pako": "^1.0.10"
+  },
+  "prettier": {
+    "arrowParens": "always",
+    "semi": true,
+    "singleQuote": true,
+    "tabWidth": 2,
+    "trailingComma": "all"
   }
 }

src/.npmignore

@@ -0,0 +1,2 @@
+__tests__
+.npmignore

src/PNGDecoder.ts

@@ -2,8 +2,20 @@ import { IOBuffer } from 'iobuffer';
 import { Inflate as Inflator } from 'pako';
 
 import { pngSignature, crc } from './common';
-import { IDecodedPNG, DecoderInputType, IPNGDecoderOptions, PNGDataArray, IndexedColors } from './types';
-import { ColorType, CompressionMethod, FilterMethod, InterlaceMethod } from './internalTypes';
+import {
+  IDecodedPNG,
+  DecoderInputType,
+  IPNGDecoderOptions,
+  PNGDataArray,
+  IndexedColors,
+  BitDepth,
+} from './types';
+import {
+  ColorType,
+  CompressionMethod,
+  FilterMethod,
+  InterlaceMethod,
+} from './internalTypes';
 
 const empty = new Uint8Array(0);
 const NULL = '\0';
@@ -28,9 +40,13 @@ export default class PNGDecoder extends IOBuffer {
     const { checkCrc = false } = options;
     this._checkCrc = checkCrc;
     this._inflator = new Inflator();
-    // @ts-ignore
     this._png = {
-      text: {}
+      width: -1,
+      height: -1,
+      channels: -1,
+      data: new Uint8Array(0),
+      depth: 1,
+      text: {},
     };
     this._end = false;
     this._hasPalette = false;
@@ -57,7 +73,7 @@ export default class PNGDecoder extends IOBuffer {
     for (let i = 0; i < pngSignature.length; i++) {
       if (this.readUint8() !== pngSignature[i]) {
         throw new Error(
-          `wrong PNG signature. Byte at ${i} should be ${pngSignature[i]}.`
+          `wrong PNG signature. Byte at ${i} should be ${pngSignature[i]}.`,
         );
       }
     }
@@ -103,13 +119,13 @@ export default class PNGDecoder extends IOBuffer {
         new Uint8Array(
           this.buffer,
           this.byteOffset + this.offset - crcLength - 4,
-          crcLength
+          crcLength,
         ),
-        crcLength
+        crcLength,
       ); // "- 4" because we already advanced by reading the CRC
       if (actualCrc !== expectedCrc) {
         throw new Error(
-          `CRC mismatch for chunk ${type}. Expected ${expectedCrc}, found ${actualCrc}`
+          `CRC mismatch for chunk ${type}. Expected ${expectedCrc}, found ${actualCrc}`,
         );
       }
     } else {
@@ -122,8 +138,7 @@ export default class PNGDecoder extends IOBuffer {
     const image = this._png;
     image.width = this.readUint32();
     image.height = this.readUint32();
-    // @ts-ignore
-    image.depth = this.readUint8();
+    image.depth = checkBitDepth(this.readUint8());
 
     const colorType: ColorType = this.readUint8();
     let channels: number;
@@ -151,7 +166,7 @@ export default class PNGDecoder extends IOBuffer {
     this._compressionMethod = this.readUint8();
     if (this._compressionMethod !== CompressionMethod.DEFLATE) {
       throw new Error(
-        `Unsupported compression method: ${this._compressionMethod}`
+        `Unsupported compression method: ${this._compressionMethod}`,
       );
     }
 
@@ -163,7 +178,7 @@ export default class PNGDecoder extends IOBuffer {
   private decodePLTE(length: number): void {
     if (length % 3 !== 0) {
       throw new RangeError(
-        `PLTE field length must be a multiple of 3. Got ${length}`
+        `PLTE field length must be a multiple of 3. Got ${length}`,
       );
     }
     const l = length / 3;
@@ -179,7 +194,7 @@ export default class PNGDecoder extends IOBuffer {
   private decodeIDAT(length: number): void {
     this._inflator.push(
       new Uint8Array(this.buffer, this.offset + this.byteOffset, length),
-      false
+      false,
     );
     this.skip(length);
   }
@@ -206,10 +221,10 @@ export default class PNGDecoder extends IOBuffer {
     this._inflator.push(empty, true);
     if (this._inflator.err) {
       throw new Error(
-        `Error while decompressing the data: ${this._inflator.err}`
+        `Error while decompressing the data: ${this._inflator.err}`,
       );
     }
-    var data = this._inflator.result;
+    const data = this._inflator.result;
 
     if (this._filterMethod !== FilterMethod.ADAPTIVE) {
       throw new Error(`Filter method ${this._filterMethod} not supported`);
@@ -219,7 +234,7 @@ export default class PNGDecoder extends IOBuffer {
       this.decodeInterlaceNull(data as Uint8Array);
     } else {
       throw new Error(
-        `Interlace method ${this._interlaceMethod} not supported`
+        `Interlace method ${this._interlaceMethod} not supported`,
       );
     }
   }
@@ -254,7 +269,7 @@ export default class PNGDecoder extends IOBuffer {
             newLine,
             prevLine,
             bytesPerLine,
-            bytesPerPixel
+            bytesPerPixel,
           );
           break;
         case 4:
@@ -263,7 +278,7 @@ export default class PNGDecoder extends IOBuffer {
             newLine,
             prevLine,
             bytesPerLine,
-            bytesPerPixel
+            bytesPerPixel,
           );
           break;
         default:
@@ -295,7 +310,7 @@ export default class PNGDecoder extends IOBuffer {
 function unfilterNone(
   currentLine: PNGDataArray,
   newLine: PNGDataArray,
-  bytesPerLine: number
+  bytesPerLine: number,
 ): void {
   for (let i = 0; i < bytesPerLine; i++) {
     newLine[i] = currentLine[i];
@@ -306,7 +321,7 @@ function unfilterSub(
   currentLine: PNGDataArray,
   newLine: PNGDataArray,
   bytesPerLine: number,
-  bytesPerPixel: number
+  bytesPerPixel: number,
 ): void {
   let i = 0;
   for (; i < bytesPerPixel; i++) {
@@ -322,7 +337,7 @@ function unfilterUp(
   currentLine: PNGDataArray,
   newLine: PNGDataArray,
   prevLine: PNGDataArray,
-  bytesPerLine: number
+  bytesPerLine: number,
 ): void {
   let i = 0;
   if (prevLine.length === 0) {
@@ -342,7 +357,7 @@ function unfilterAverage(
   newLine: PNGDataArray,
   prevLine: PNGDataArray,
   bytesPerLine: number,
-  bytesPerPixel: number
+  bytesPerPixel: number,
 ): void {
   let i = 0;
   if (prevLine.length === 0) {
@@ -369,7 +384,7 @@ function unfilterPaeth(
   newLine: PNGDataArray,
   prevLine: PNGDataArray,
   bytesPerLine: number,
-  bytesPerPixel: number
+  bytesPerPixel: number,
 ): void {
   let i = 0;
   if (prevLine.length === 0) {
@@ -389,7 +404,7 @@ function unfilterPaeth(
           paethPredictor(
             newLine[i - bytesPerPixel],
             prevLine[i],
-            prevLine[i - bytesPerPixel]
+            prevLine[i - bytesPerPixel],
           )) &
         0xff;
     }
@@ -409,3 +424,16 @@ function paethPredictor(a: number, b: number, c: number): number {
 function swap16(val: number): number {
   return ((val & 0xff) << 8) | ((val >> 8) & 0xff);
 }
+
+function checkBitDepth(value: number): BitDepth {
+  if (
+    value !== 1 &&
+    value !== 2 &&
+    value !== 4 &&
+    value !== 8 &&
+    value !== 16
+  ) {
+    throw new Error(`invalid bit depth: ${value}`);
+  }
+  return value;
+}

src/PNGEncoder.ts

@@ -8,17 +8,17 @@ import {
   IImageData,
   IDecodedPNG,
   PNGDataArray,
-  BitDepth
+  BitDepth,
 } from './types';
 import {
   ColorType,
   CompressionMethod,
   FilterMethod,
-  InterlaceMethod
+  InterlaceMethod,
 } from './internalTypes';
 
 const defaultZlibOptions: DeflateFunctionOptions = {
-  level: 3
+  level: 3,
 };
 
 export default class PNGEncoder extends IOBuffer {
@@ -28,11 +28,9 @@ export default class PNGEncoder extends IOBuffer {
 
   public constructor(data: IImageData, options: IPNGEncoderOptions = {}) {
     super();
-    // @ts-ignore
-    this._png = {};
     this._colorType = ColorType.UNKNOWN;
     this._zlibOptions = Object.assign({}, defaultZlibOptions, options.zlib);
-    this._checkData(data);
+    this._png = this._checkData(data);
     this.setBigEndian();
   }
 
@@ -107,22 +105,24 @@ export default class PNGEncoder extends IOBuffer {
     this.encodeIDAT(compressed);
   }
 
-  private _checkData(data: IImageData): void {
-    this._png.width = checkInteger(data.width, 'width');
-    this._png.height = checkInteger(data.height, 'height');
-    this._png.data = data.data;
+  private _checkData(data: IImageData): IDecodedPNG {
     const { colorType, channels, depth } = getColorType(data);
+    const png: IDecodedPNG = {
+      width: checkInteger(data.width, 'width'),
+      height: checkInteger(data.height, 'height'),
+      channels: channels,
+      data: data.data,
+      depth: depth,
+      text: {},
+    };
     this._colorType = colorType;
-    this._png.channels = channels;
-    this._png.depth = depth;
-    const expectedSize = this._png.width * this._png.height * channels;
-    if (this._png.data.length !== expectedSize) {
+    const expectedSize = png.width * png.height * channels;
+    if (png.data.length !== expectedSize) {
       throw new RangeError(
-        `wrong data size. Found ${
-          this._png.data.length
-        }, expected ${expectedSize}`
+        `wrong data size. Found ${png.data.length}, expected ${expectedSize}`,
       );
     }
+    return png;
   }
 
   private writeCrc(length: number): void {
@@ -131,10 +131,10 @@ export default class PNGEncoder extends IOBuffer {
         new Uint8Array(
           this.buffer,
           this.byteOffset + this.offset - length,
-          length
+          length,
         ),
-        length
-      )
+        length,
+      ),
     );
   }
 }
@@ -147,7 +147,7 @@ function checkInteger(value: number, name: string): number {
 }
 
 function getColorType(
-  data: IImageData
+  data: IImageData,
 ): { channels: number; depth: BitDepth; colorType: ColorType } {
   const { channels = 4, depth = 8 } = data;
   if (channels !== 4 && channels !== 3 && channels !== 2 && channels !== 1) {
@@ -181,7 +181,7 @@ function writeDataBytes(
   data: PNGDataArray,
   newData: IOBuffer,
   slotsPerLine: number,
-  offset: number
+  offset: number,
 ): number {
   for (let j = 0; j < slotsPerLine; j++) {
     newData.writeByte(data[offset++]);
@@ -193,7 +193,7 @@ function writeDataUint16(
   data: PNGDataArray,
   newData: IOBuffer,
   slotsPerLine: number,
-  offset: number
+  offset: number,
 ): number {
   for (let j = 0; j < slotsPerLine; j++) {
     newData.writeUint16(data[offset++]);