chore: improvements and reverts

src/modules/helpers/eval.ts

@@ -137,7 +137,11 @@ function evalProcessFunction(
  * @param input The input string to parse.
  */
 function findParams(input: string): [continueIndex: number, params: unknown[]] {
-  let index = input.indexOf(')');
+  let index = input.indexOf(')', 1);
+  if (index === -1) {
+    throw new FakerError(`Missing closing parenthesis in '${input}'`);
+  }
+
   while (index !== -1) {
     const params = input.substring(1, index);
     try {
@@ -157,9 +161,9 @@ function findParams(input: string): [continueIndex: number, params: unknown[]] {
     index = input.indexOf(')', index + 1);
   }
 
-  throw new FakerError(
-    `Function parameters cannot be parsed as JSON or simple string: '${input}'`
-  );
+  index = input.lastIndexOf(')', 1);
+  const params = input.substring(1, index);
+  return [index, JSON.parse(`["${params}"]`) as unknown[]];
 }
 
 /**

src/modules/helpers/index.ts

@@ -1423,8 +1423,7 @@ export class HelpersModule extends SimpleHelpersModule {
     const method = token.replace('}}', '').replace('{{', '');
 
     const result = fakeEval(method, this.faker);
-    const stringified =
-      typeof result === 'object' ? JSON.stringify(result) : String(result);
+    const stringified = String(result);
 
     // Replace the found tag with the returned fake value
     // We cannot use string.replace here because the result might contain evaluated characters

test/modules/helpers.spec.ts

@@ -1030,16 +1030,30 @@ describe('helpers', () => {
           );
         });
 
+        it('does allow missing method name', () => {
+          const actual = faker.helpers.fake('{{location}}');
+          expect(actual).toBe('[object Object]');
+        });
+
         it('does not allow invalid method name', () => {
           expect(() => faker.helpers.fake('{{location.foo}}')).toThrow(
             new FakerError(`Cannot resolve expression 'location.foo'`)
           );
         });
 
-        it('does allow complex data', () => {
+        it('should support complex data', () => {
           const actual = faker.helpers.fake('{{science.unit}}');
+          expect(actual).toBe('[object Object]');
+        });
+
+        it('should support resolving a value in a complex object', () => {
+          const complex = faker.helpers.fake('{{airline.airline}}');
+          expect(complex).toBe('[object Object]');
+
+          const actual = faker.helpers.fake('{{airline.airline.iataCode}}');
+          expect(actual).toBeTypeOf('string');
           expect(
-            faker.definitions.science.unit.map((value) => JSON.stringify(value))
+            faker.definitions.airline.airline.map(({ iataCode }) => iataCode)
           ).toContain(actual);
         });
 
@@ -1136,17 +1150,6 @@ describe('helpers', () => {
         it('should not trim whitespace', () => {
           expect(faker.helpers.fake('   ---   ')).toBe('   ---   ');
         });
-
-        it('should support resolving a value in a complex object', () => {
-          const complex = faker.helpers.fake('{{airline.airline}}');
-          expect(complex).toMatch(/^{.+}$/i); // JSON string
-
-          const actual = faker.helpers.fake('{{airline.airline.iataCode}}');
-          expect(actual).toBeTypeOf('string');
-          expect(
-            faker.definitions.airline.airline.map(({ iataCode }) => iataCode)
-          ).toContain(actual);
-        });
       });
 
       describe('rangeToNumber()', () => {