improve name rules

Author: malcolm-kee

packages/openapi-ts-tests/faker/v9/__snapshots__/3.1.x/faker-locale/@faker-js/faker.gen.ts

@@ -369,6 +369,7 @@ export const fakePersonProfile = (options?: Options) => {
         last_name: f.person.lastName(),
         email: f.internet.email(),
         phone: f.phone.number(),
+        homePhone: f.phone.number(),
         age: f.number.int({ min: 1, max: 120 }),
         city: f.location.city(),
         postalCode: f.location.zipCode(),

packages/openapi-ts-tests/faker/v9/__snapshots__/3.1.x/faker-typed/@faker-js/faker.gen.ts

@@ -370,6 +370,7 @@ export const fakePersonProfile = (options?: Options): PersonProfile => {
         last_name: f.person.lastName(),
         email: f.internet.email(),
         phone: f.phone.number(),
+        homePhone: f.phone.number(),
         age: f.number.int({ min: 1, max: 120 }),
         city: f.location.city(),
         postalCode: f.location.zipCode(),

packages/openapi-ts-tests/faker/v9/__snapshots__/3.1.x/faker-typed/types.gen.ts

@@ -172,6 +172,7 @@ export type PersonProfile = {
     last_name: string;
     email: string;
     phone: string;
+    homePhone: string;
     age: number;
     city: string;
     postalCode: string;

packages/openapi-ts-tests/faker/v9/__snapshots__/3.1.x/faker/@faker-js/faker.gen.ts

@@ -368,6 +368,7 @@ export const fakePersonProfile = (options?: Options) => {
         last_name: f.person.lastName(),
         email: f.internet.email(),
         phone: f.phone.number(),
+        homePhone: f.phone.number(),
         age: f.number.int({ min: 1, max: 120 }),
         city: f.location.city(),
         postalCode: f.location.zipCode(),

packages/openapi-ts/src/plugins/@faker-js/faker/v10/toAst/nameRules.ts

@@ -121,6 +121,19 @@ const STRING_COMPOUND_RULES: Record<string, NameRule> = {
   'user.name': { fakerPath: ['person', 'fullName'] },
 };
 
+// ---------------------------------------------------------------------------
+// String suffix rules — checked after exact/compound matches.
+// Order matters: first match wins. Suffixes are matched against normalized names.
+// ---------------------------------------------------------------------------
+const STRING_SUFFIX_RULES: Array<{ rule: NameRule; suffix: string }> = [
+  { rule: { fakerPath: ['string', 'uuid'] }, suffix: 'id' },
+  { rule: { fakerPath: ['internet', 'email'] }, suffix: 'email' },
+  { rule: { fakerPath: ['internet', 'url'] }, suffix: 'url' },
+  { rule: { fakerPath: ['internet', 'password'] }, suffix: 'password' },
+  { rule: { fakerPath: ['internet', 'jwt'] }, suffix: 'token' },
+  { rule: { fakerPath: ['phone', 'number'] }, suffix: 'phone' },
+];
+
 // ---------------------------------------------------------------------------
 // Integer / number name rules (standalone).
 // ---------------------------------------------------------------------------
@@ -228,10 +241,17 @@ export function stringNameToExpression(
   nameInfo: PropertyNameInfo,
 ): Expression | undefined {
   const rule = lookupRule(nameInfo, STRING_NAME_RULES, STRING_COMPOUND_RULES);
-  if (!rule) {
-    return undefined;
+  if (rule) {
+    return buildFromRule(ctx, rule);
   }
-  return buildFromRule(ctx, rule);
+
+  const normalized = normalizeName(nameInfo.name);
+  const suffixRule = STRING_SUFFIX_RULES.find((r) => normalized.endsWith(r.suffix));
+  if (suffixRule) {
+    return buildFromRule(ctx, suffixRule.rule);
+  }
+
+  return undefined;
 }
 
 /**

specs/3.1.x/faker.yaml

@@ -508,6 +508,8 @@ components:
           type: string
         phone:
           type: string
+        homePhone:
+          type: string
         age:
           type: integer
         city:
@@ -537,6 +539,7 @@ components:
         - last_name
         - email
         - phone
+        - homePhone
         - age
         - city
         - postalCode