fix: sample size handling, build and release (#117)

* fix: sample size handling, build and release

* Development snapshot

Author: runk

src/encoding/ascii.test.ts

@@ -7,11 +7,3 @@ describe('ASCII', () => {
     ).toBe('ASCII');
   });
 });
-
-describe('ASCII', () => {
-  it('should return ASCII', () => {
-    expect(
-      chardet.detectFileSync(__dirname + '/../test/data/encodings/shortascii',  { sampleSize: 32 }),
-    ).toBe('ASCII');
-  });
-});

src/index.test.ts

@@ -53,6 +53,16 @@ describe('chardet', () => {
       const res = await chardet.detectFile(path, { sampleSize: 32, offset: 64 });
       expect(res).toBe('UTF-8');
     });
+
+    it('should work as expected with sampleSize larger than actual file size (1)', async () => {
+      const res = await chardet.detectFile(path, { sampleSize: 1024 * 1024 });
+      expect(res).toBe('UTF-8');
+    });
+
+    it('should work as expected with sampleSize larger than actual file size (2)', async () => {
+      const res = await chardet.detectFile(__dirname + '/test/data/encodings/koi8r', { sampleSize: 1024 * 1024 });
+      expect(res).toBe('KOI8-R');
+    });
   });
 
   describe('#detectFileSync', () => {

src/index.ts

@@ -103,27 +103,30 @@ export const detectFile = (
     let fd: any;
     const fs = loadFs();
 
-    const handler = (err: Error | null | undefined, buffer: Buffer) => {
+    const handler = (err: Error | null, buffer: Buffer | null) => {
       if (fd) {
         fs.closeSync(fd);
       }
 
       if (err) {
         reject(err);
-      } else {
+      } else if (buffer) {
         resolve(detect(buffer));
+      } else {
+        reject(new Error('No error and no buffer received'));
       }
     };
 
-    if (opts && opts.sampleSize) {
+    const sampleSize = opts?.sampleSize || 0;
+    if (sampleSize > 0) {
       fd = fs.openSync(filepath, 'r');
-      let sample = Buffer.allocUnsafe(opts.sampleSize);
+      let sample = Buffer.allocUnsafe(sampleSize);
 
-      fs.read(fd, sample, 0, opts.sampleSize, opts.offset, (err: NodeJS.ErrnoException | null, bytesRead: number, buffer: Buffer) => {
+      fs.read(fd, sample, 0, sampleSize, opts.offset, (err: NodeJS.ErrnoException | null, bytesRead: number) => {
         if (err) {
-          handler(err);
+          handler(err, null);
         } else {
-          if (bytesRead < opts.sampleSize!) {
+          if (bytesRead < sampleSize) {
             sample = sample.subarray(0, bytesRead);
           }
           handler(null, sample);