Merge branch 'master' into feat/3704-angular-artifact-groups

Author: the-ult

packages/core/src/generators/imports.test.ts

@@ -143,6 +143,36 @@ export type MyError = Error;
 
       expect(dep).toBe("import {\n  schema$Value\n} from '../models';\n");
     });
+
+    // Regression for #3695: an aliased import is referenced by its alias only
+    // (rendered `name as alias`), so a bare occurrence of the pre-alias name in
+    // generated code (e.g. a path param `z` colliding with `z as zod`) must not
+    // pull the dependency in.
+    it('does not add an aliased import when only its pre-alias name appears', () => {
+      const dep = addDependency({
+        implementation: 'export const getUrl = (z: string) => `/${z}`;',
+        dependency: 'zod',
+        projectName: undefined,
+        hasSchemaDir: true,
+        isAllowSyntheticDefaultImports: true,
+        exports: [{ name: 'z', alias: 'zod', values: true }],
+      });
+
+      expect(dep).toBeUndefined();
+    });
+
+    it('adds an aliased import when its alias appears', () => {
+      const dep = addDependency({
+        implementation: 'const schema = zod.string();',
+        dependency: 'zod',
+        projectName: undefined,
+        hasSchemaDir: true,
+        isAllowSyntheticDefaultImports: true,
+        exports: [{ name: 'z', alias: 'zod', values: true }],
+      });
+
+      expect(dep).toBe("import {\n  z as zod\n} from 'zod';\n");
+    });
   });
 
   // `oneMore` is set only by the tags-split writer (split-tags-mode.ts),

packages/core/src/generators/imports.ts

@@ -242,16 +242,20 @@ export function addDependency({
   isAllowSyntheticDefaultImports,
 }: AddDependencyOptions) {
   const toAdds = exports.filter((e) => {
-    const searchWords = [e.alias, e.name]
-      .filter((p): p is string => Boolean(p?.length))
-      .map((part) => escapeRegExp(part))
-      .join('|');
+    // An aliased import is rendered as `name as alias`, so the alias is the only
+    // binding in scope; the pre-alias name never appears as a reference. Match on
+    // the alias when present (otherwise the name) to avoid false positives such as
+    // a path param `z` colliding with `z as zod` (#3695).
+    const identifier = e.alias?.length ? e.alias : e.name;
 
-    if (!searchWords) {
+    if (!identifier) {
       return false;
     }
 
-    const pattern = new RegExp(String.raw`\b(${searchWords})\b`, 'g');
+    const pattern = new RegExp(
+      String.raw`\b(${escapeRegExp(identifier)})\b`,
+      'g',
+    );
 
     return implementation.match(pattern);
   });

tests/__snapshots__/fetch/issue-3695/endpoints.ts

@@ -0,0 +1,34 @@
+/**
+ * Generated by orval v8.20.0 🍺
+ * Do not edit manually.
+ * Issue 3695 - path parameter named `z` must not pull in the zod import
+ * OpenAPI spec version: 1.0.0
+ */
+export type getZResponse200 = {
+  data: void;
+  status: 200;
+};
+
+export type getZResponseSuccess = getZResponse200 & {
+  headers: Headers;
+};
+export type getZResponse = getZResponseSuccess;
+
+export const getGetZUrl = (z: string) => {
+  return `/${z}`;
+};
+
+export const getZ = async (
+  z: string,
+  options?: RequestInit,
+): Promise<getZResponse> => {
+  const res = await fetch(getGetZUrl(z), {
+    ...options,
+    method: 'GET',
+  });
+
+  const body = [204, 205, 304].includes(res.status) ? null : await res.text();
+
+  const data: getZResponse['data'] = body ? JSON.parse(body) : undefined;
+  return { data, status: res.status, headers: res.headers } as getZResponse;
+};

tests/api-generation.spec.ts

@@ -1115,6 +1115,20 @@ test('fetch issue-3663 combines required from a constraint-only allOf overlay',
   expect(barInlineType).toMatch(/Required<Pick<[\s\S]*?'id' \| 'name'/);
 });
 
+test('fetch issue-3695 does not import zod for a path parameter named `z`', async () => {
+  // The fetch client imports zod as `import { z as zod } from 'zod'`. A path
+  // parameter named exactly `z` must not be mistaken for a zod usage and pull
+  // the (otherwise unused) zod import into the client. See #3695.
+  const content = await readFile(
+    generated('fetch', 'issue-3695', 'endpoints.ts'),
+    'utf8',
+  );
+
+  expect(content).not.toContain("from 'zod'");
+  // The parameter itself is still generated as a normal string argument.
+  expect(content).toContain('z: string');
+});
+
 test('zod override.zod.version pins the output target independently of the installed zod', async () => {
   // `tests` installs Zod 4, so installed-version detection would emit Zod 4 for
   // both. These two clients generate from the SAME petstore spec but pin

tests/configs/fetch.config.ts

@@ -913,4 +913,15 @@ export default defineConfig({
       target: '../specifications/issue-3663.yaml',
     },
   },
+  'issue-3695': {
+    output: {
+      target: '../generated/fetch/issue-3695/endpoints.ts',
+      client: 'fetch',
+      clean: true,
+      formatter: 'prettier',
+    },
+    input: {
+      target: '../specifications/issue-3695.yaml',
+    },
+  },
 });

tests/specifications/issue-3695.yaml

@@ -0,0 +1,20 @@
+openapi: 3.1.0
+info:
+  title: Issue 3695 - path parameter named `z` must not pull in the zod import
+  version: 1.0.0
+paths:
+  # The fetch client imports zod as `import { z as zod } from 'zod'`. A path
+  # parameter named exactly `z` used to collide with the pre-alias name `z`,
+  # forcing an unused zod import into the generated client. See #3695.
+  /{z}:
+    get:
+      operationId: getZ
+      parameters:
+        - name: z
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: ok