TODO.md

@@ -2,4 +2,4 @@
 
 Rewrite unit test.
 
-- [x] Rewrite unit test.
+- [] Rewrite unit test.

demo/camera.html

@@ -20,7 +20,7 @@
     var vConsole = new VConsole();
     console.log('Hello world');
     function main() {
-      var qr = new QrcodeDecoder.default();
+      var qr = new QrcodeDecoder();
       var video = document.querySelector('#video');
       var start = document.querySelector('#start');
       var stop = document.querySelector('#stop');

demo/image.html

@@ -30,7 +30,7 @@
   <script type="module">
     var vConsole = new VConsole();
     function main() {
-      var qr = new QrcodeDecoder.default();
+      var qr = new QrcodeDecoder();
 
       var btn1 = document.querySelector('button#decode1');
       var btn2 = document.querySelector('button#decode2');

demo/video.html

@@ -22,7 +22,7 @@
       var result = document.querySelector('#result');
       var start = document.querySelector('#start');
       var stop = document.querySelector('#stop');
-      var qr = new QrcodeDecoder.default();
+      var qr = new QrcodeDecoder();
 
       start.onclick = startScan;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qrcode-decoder",
-  "version": "0.3.4",
+  "version": "0.3.3",
   "description": "Tool for decoding qrcode",
   "main": "dist/index.js",
   "browser": "dist/index.min.js",
@@ -79,7 +79,7 @@
     "ts-node": "^8.4.1",
     "tslint": "^5.20.1",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.4.3"
+    "typescript": "^3.7.5"
   },
   "license": "MIT",
   "repository": {

src/index.ts

@@ -1,13 +1,12 @@
-import jsQR, { QRCode, Options } from 'jsqr';
+import { Options } from 'jsqr';
-
+import jsQR from 'jsqr';
-export type CodeResult = QRCode | null;
 
 const videoSize = {
   width: { min: 360, ideal: 720, max: 1080 },
   height: { min: 360, ideal: 720, max: 1080 },
 };
 
-export class QrcodeDecoder {
+class QrcodeDecoder {
   timerCapture: null | NodeJS.Timeout;
   canvasElem: null | HTMLCanvasElement;
   gCtx: null | CanvasRenderingContext2D;
@@ -101,10 +100,7 @@ export class QrcodeDecoder {
    *  inversionAttempts - (attemptBoth (default), dontInvert, onlyInvert, or invertFirst)
    *  refer to jsqr options: https://github.com/cozmo/jsQR
    */
-  async _captureToCanvas(
+  async _captureToCanvas(videoElem: HTMLVideoElement, options: Options) {
-    videoElem: HTMLVideoElement,
-    options: Options,
-  ): Promise<CodeResult> {
     if (this.timerCapture) {
       clearTimeout(this.timerCapture);
     }
@@ -146,7 +142,7 @@ export class QrcodeDecoder {
 
     const result = await proms();
 
-    return result as CodeResult;
+    return result;
   }
 
   /**
@@ -159,10 +155,7 @@ export class QrcodeDecoder {
    *  inversionAttempts - (attemptBoth (default), dontInvert, onlyInvert, or invertFirst)
    *  refer to jsqr options: https://github.com/cozmo/jsQR
    */
-  async decodeFromCamera(
+  async decodeFromCamera(videoElem: HTMLVideoElement, options: any = {}) {
-    videoElem: HTMLVideoElement,
-    options: any = {},
-  ): Promise<CodeResult> {
     const opts = {
       ...this.defaultOption,
       ...options,
@@ -204,8 +197,6 @@ export class QrcodeDecoder {
       const code = await this.decodeFromVideo(videoElem, opts);
       return code;
     }
-
-    return null;
   }
 
   /**
@@ -216,10 +207,7 @@ export class QrcodeDecoder {
    *  inversionAttempts - (attemptBoth (default), dontInvert, onlyInvert, or invertFirst)
    *  refer to jsqr options: https://github.com/cozmo/jsQR
    */
-  async decodeFromVideo(
+  async decodeFromVideo(videoElem: HTMLVideoElement, options = {}) {
-    videoElem: HTMLVideoElement,
-    options = {},
-  ): Promise<CodeResult> {
     const opts = {
       ...this.defaultOption,
       ...options,
@@ -243,7 +231,7 @@ export class QrcodeDecoder {
   async decodeFromImage(
     img: HTMLImageElement | string,
     options: { crossOrigin?: string } = {},
-  ): Promise<CodeResult> {
+  ) {
     let imgDom: HTMLImageElement | null = null;
     const opts = {
       ...this.defaultOption,
@@ -292,7 +280,7 @@ export class QrcodeDecoder {
       return code;
     }
 
-    return null;
+    return false;
   }
 
   /**

tsconfig.json

@@ -11,10 +11,7 @@
     "experimentalDecorators": true,
     "preserveConstEnums": true,
     "importHelpers": false,
-    "lib": [
+    "lib": ["esnext", "dom"],
-      "esnext",
-      "dom"
-    ],
     "module": "ESNext",
     "moduleResolution": "node",
     "sourceMap": false,