fix: Fixed some search modules

wppconnect-team · Sep 17, 2021 · d739fba · d739fba
1 parent 7946eab
commit d739fba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/tools/extractWhatsappSource.ts b/src/tools/extractWhatsappSource.ts
@@ -17,11 +17,12 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
+import * as wpp from '../';
 import { getPage, WA_DIR } from './browser';
 
 declare global {
   interface Window {
-    WPP: any;
+    WPP: typeof wpp;
   }
 }
 

diff --git a/src/whatsapp/collections/Collection.ts b/src/whatsapp/collections/Collection.ts
@@ -108,5 +108,5 @@ exportModule(
   {
     Collection: 'default',
   },
-  (m) => m.default.toString().includes('Collection initialized without model!')
+  (m) => m.default.toString().includes('Collection initialized without model')
 );
diff --git a/src/whatsapp/exportModule.ts b/src/whatsapp/exportModule.ts
@@ -97,7 +97,7 @@ export function exportModule(
 export function exportProxyModel(exports: any, name: string) {
   const baseName = name.replace(/Model$/, '');
 
-  const names: string[] = [];
+  const names: string[] = [baseName];
 
   // ChatModel => "chat"
   names.push(baseName.replace(/^(\w)/, (l) => l.toLowerCase()));

diff --git a/src/whatsapp/models/ChatstateModel.ts b/src/whatsapp/models/ChatstateModel.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { exportProxyModel } from '../exportModule';
+import { exportModule } from '../exportModule';
 import { Wid } from '../misc';
 import {
   Model,
@@ -65,4 +65,10 @@ export declare class ChatstateModel extends Model {
   getCollection(): any;
 }
 
-exportProxyModel(exports, 'ChatstateModel');
+exportModule(
+  exports,
+  {
+    ChatstateModel: 'Chatstate',
+  },
+  (m) => m.Chatstate && m.ChatstateCollection
+);