Merge pull request #60 from roypeled/fix-broken-class-parser

Fix broken class parser
TypeStrong · Aug 20, 2024 · 6f88933 · 6f88933
2 parents 9ad1e29 + 4370c84
commit 6f88933
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typestrong/ts-mockito",
-  "version": "2.7.9",
+  "version": "2.7.11",
   "description": "Mocking library for TypeScript",
   "main": "lib/ts-mockito.js",
   "typings": "lib/ts-mockito",

diff --git a/src/utils/ObjectPropertyCodeRetriever.ts b/src/utils/ObjectPropertyCodeRetriever.ts
@@ -12,7 +12,8 @@ export class ObjectPropertyCodeRetriever {
                             descriptor?.set ? descriptor?.set.toString() : '',
                         ];
                     } else if (typeof object[prop] === 'function') {
-                        const fnStr = String(object[prop]);
+                        let fnStr = String(object[prop]);
+                        fnStr = fnStr.replace(/\[native code]/, '');
                         const gx = new RegExp(`^(async)?\\s{0,}\\*?${prop}`);
                         const isMethod = gx.test(fnStr);
                         return `

diff --git a/test/verification.spec.ts b/test/verification.spec.ts
@@ -818,6 +818,25 @@ cases.forEach(testData => {
                 }
             });
         });
+
+        describe("decorator + Proxy", () => {
+            function decorator<T extends object>(target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) {
+                const originalMethod = descriptor.value;
+                if (originalMethod !== undefined) {
+                    descriptor.value = new Proxy(originalMethod, {})
+                }
+            }
+
+            class TestClass {
+                @decorator
+                foo() {}
+            }
+
+            it("should mock", () => {
+                const mocked = mock(TestClass);
+                expect(mocked).toBeDefined();
+            });
+        });
     });
 });
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "experimentalDecorators": true,
     "outDir": "./lib",
     "module": "commonjs",
     "moduleResolution": "node",