From 2196779681f0aee7a09f0032435c0659ae935532 Mon Sep 17 00:00:00 2001
From: Chung-Sheng Wu <chungsheng@google.com>
Date: Sun, 12 Dec 2021 22:25:26 +0800
Subject: [PATCH] Rename Zbar to ZbarInstance

Rename the file to better reflect its purpose. Also prevent it to be
conflict with zbar.js because github action artifact is case
insensitive.
---
 src/CppObject.ts                 | 6 +++---
 src/{ZBar.ts => ZBarInstance.ts} | 2 +-
 src/instance.ts                  | 6 +++---
 src/load-browser.ts              | 4 ++--
 src/load.ts                      | 4 ++--
 src/zbar.d.ts                    | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename src/{ZBar.ts => ZBarInstance.ts} (89%)

diff --git a/src/CppObject.ts b/src/CppObject.ts
index 24cef87..09a5521 100644
--- a/src/CppObject.ts
+++ b/src/CppObject.ts
@@ -1,10 +1,10 @@
-import ZBar from './ZBar';
+import ZBarInstance from './ZBarInstance';
 
 export class CppObject {
   protected ptr: number;
-  protected inst: ZBar;
+  protected inst: ZBarInstance;
 
-  protected constructor(ptr: number, inst: ZBar) {
+  protected constructor(ptr: number, inst: ZBarInstance) {
     this.ptr = ptr;
     this.inst = inst;
   }
diff --git a/src/ZBar.ts b/src/ZBarInstance.ts
similarity index 89%
rename from src/ZBar.ts
rename to src/ZBarInstance.ts
index 00d54c7..c94754a 100644
--- a/src/ZBar.ts
+++ b/src/ZBarInstance.ts
@@ -1,4 +1,4 @@
-export default interface ZBar extends Record<string, WebAssembly.ExportValue | ArrayBuffer> {
+export default interface ZBarInstance extends Record<string, WebAssembly.ExportValue | ArrayBuffer> {
   _malloc(size: number): number;
   _free(ptr: number): void;
 
diff --git a/src/instance.ts b/src/instance.ts
index f04e577..203519b 100644
--- a/src/instance.ts
+++ b/src/instance.ts
@@ -1,7 +1,7 @@
 import { loadWasmInstance } from './load';
-import ZBar from './ZBar';
+import ZBarInstance from './ZBarInstance';
 
-let inst: ZBar | null = null;
+let inst: ZBarInstance | null = null;
 
 let instPromise = (async () => {
   inst = await loadWasmInstance({});
@@ -11,6 +11,6 @@ let instPromise = (async () => {
   return inst;
 })();
 
-export const getInstance = async (): Promise<ZBar> => {
+export const getInstance = async (): Promise<ZBarInstance> => {
   return await instPromise;
 };
diff --git a/src/load-browser.ts b/src/load-browser.ts
index c19495d..27d9e08 100644
--- a/src/load-browser.ts
+++ b/src/load-browser.ts
@@ -7,7 +7,7 @@
  */
 // import wasmBinaryFile from './zbar.wasm';
 import wasmBinaryFileName from './zbar.wasm.bin';
-import ZBar from './ZBar';
+import ZBarInstance from './ZBarInstance';
 import instantiate from './zbar';
 
 // locateFile is used to override the file path to the path provided by
@@ -21,7 +21,7 @@ const locateFile = (file: string, _scriptDir: string) => {
 
 export const loadWasmInstance = async (
   importObj: any
-): Promise<ZBar | null> => {
+): Promise<ZBarInstance | null> => {
   importObj['locateFile'] = locateFile;
   return await instantiate(importObj);
 };
diff --git a/src/load.ts b/src/load.ts
index 0aadecb..aee191f 100644
--- a/src/load.ts
+++ b/src/load.ts
@@ -1,8 +1,8 @@
-import ZBar from './ZBar';
+import ZBarInstance from './ZBarInstance';
 import instantiate from './zbar';
 
 export const loadWasmInstance = async (
   importObj: any
-): Promise<ZBar | null> => {
+): Promise<ZBarInstance | null> => {
   return await instantiate(importObj);
 };
diff --git a/src/zbar.d.ts b/src/zbar.d.ts
index df8508e..d5199dd 100644
--- a/src/zbar.d.ts
+++ b/src/zbar.d.ts
@@ -1,3 +1,3 @@
-import ZBar from './ZBar';
-declare const instantiate: (importObj: any) => Promise<ZBar>;
+import ZBarInstance from './ZBarInstance';
+declare const instantiate: (importObj: any) => Promise<ZBarInstance>;
 export default instantiate;