@redocly/cli 2.65.1 → 2.66.1

package/lib/eject-assets/generators/python/models.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "python" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "python" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator python --update`.
@@ -12,6 +12,7 @@ import {
   enumValues,
   flattenAllOf,
   type PropertyModel,
+  type SchemaModel,
 } from '@redocly/client-generator';
 import { PythonPrinter } from '@redocly/client-generator/printers/python';
 
@@ -166,7 +167,7 @@ export function renderPythonModels(
   printer.blank();
   printer.blank();
 
-  const aliases: Array<() => void> = [];
+  const aliases = new Map<string, SchemaModel>();
   for (const { name, schema } of model.schemas) {
     const asEnum = enumValues(schema);
     if (asEnum !== undefined) {
@@ -198,27 +199,51 @@ export function renderPythonModels(
     }
     // Everything else (unions, scalar aliases, records) becomes a module-level alias,
     // emitted AFTER the classes it references so the assignment evaluates.
-    aliases.push(() => {
-      const cases = discriminatorCases(schema, model);
-      if (cases !== undefined) {
-        const table = cases.cases
-          .map((entry) => `${entry.value} -> ${className(entry.schemaName)}`)
-          .join(', ');
-        printer.line(`# Discriminated by "${cases.property}": ${table}`);
-      }
-      const field = unions.get(name);
-      const union =
-        field === undefined
-          ? pythonType(schema, dateType)
-          : `Annotated[${pythonType(schema, dateType)}, Field(discriminator=${naming.string(field)})]`;
-      printer.line(`${className(name)} = ${union}`);
-      printer.blank();
-    });
+    aliases.set(name, schema);
+  }
+  for (const [name, schema] of sortAliases(aliases)) {
+    const cases = discriminatorCases(schema, model);
+    if (cases !== undefined) {
+      const table = cases.cases
+        .map((entry) => `${entry.value} -> ${className(entry.schemaName)}`)
+        .join(', ');
+      printer.line(`# Discriminated by "${cases.property}": ${table}`);
+    }
+    const field = unions.get(name);
+    const union =
+      field === undefined
+        ? pythonType(schema, dateType)
+        : `Annotated[${pythonType(schema, dateType)}, Field(discriminator=${naming.string(field)})]`;
+    printer.line(`${className(name)} = ${union}`);
+    printer.blank();
   }
-  for (const emit of aliases) emit();
   return printer.toString();
 }
 
+/** The aliases in emit order: an alias comes after the aliases it names. */
+export function sortAliases(aliases: Map<string, SchemaModel>): Array<[string, SchemaModel]> {
+  const order: Array<[string, SchemaModel]> = [];
+  const visited = new Set<string>();
+  const visit = (name: string): void => {
+    const schema = aliases.get(name);
+    if (schema === undefined || visited.has(name)) return;
+    visited.add(name);
+    for (const referenced of findReferencedNames(schema)) visit(referenced);
+    order.push([name, schema]);
+  };
+  for (const name of aliases.keys()) visit(name);
+  return order;
+}
+
+/** The named schemas an alias annotation names (objects render as `Any`). */
+function findReferencedNames(schema: SchemaModel): string[] {
+  if (schema.kind === 'ref') return [schema.name];
+  if (schema.kind === 'array') return findReferencedNames(schema.items);
+  if (schema.kind === 'record') return findReferencedNames(schema.value);
+  if (schema.kind === 'union') return schema.members.flatMap(findReferencedNames);
+  return [];
+}
+
 /**
  * `DISCRIMINATORS[Pet] = ("petType", {"cat": Cat, ...})` registration lines, which `decode`
  * dispatches through. A union whose annotation already carries the discriminator is left

package/lib/eject-assets/generators/python/naming.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "python" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "python" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator python --update`.

package/lib/eject-assets/generators/python/operations.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "python" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "python" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator python --update`.

package/lib/eject-assets/generators/python/pagination.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "python" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "python" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator python --update`.

package/lib/eject-assets/generators/python/types.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "python" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "python" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator python --update`.

package/lib/eject-assets/generators/swr/index.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "swr" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "swr" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator swr --update`.
@@ -33,5 +33,5 @@ export default {
   run: swrGenerator,
   requires: ["typescript"],
   errorModes: ["throw"],
-  requiresGenerator: '^0.7.3',
+  requiresGenerator: '^0.7.5',
 };

package/lib/eject-assets/generators/swr/render.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "swr" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "swr" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator swr --update`.

package/lib/eject-assets/generators/tanstack-query/index.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "tanstack-query" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "tanstack-query" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator tanstack-query --update`.
@@ -44,5 +44,5 @@ export default {
   run: tanstackQueryGenerator('react'),
   requires: ["typescript"],
   errorModes: ["throw"],
-  requiresGenerator: '^0.7.3',
+  requiresGenerator: '^0.7.5',
 };

package/lib/eject-assets/generators/tanstack-query/render.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "tanstack-query" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "tanstack-query" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator tanstack-query --update`.

package/lib/eject-assets/generators/transformers/index.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "transformers" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "transformers" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator transformers --update`.
@@ -42,5 +42,5 @@ export default {
   run: transformersGenerator,
   requires: ["typescript"],
   dateTypes: ["Date"],
-  requiresGenerator: '^0.7.3',
+  requiresGenerator: '^0.7.5',
 };

package/lib/eject-assets/generators/transformers/render.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "transformers" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "transformers" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator transformers --update`.

package/lib/eject-assets/generators/typescript/banner.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/client.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/descriptor.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/index.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.
@@ -123,5 +123,5 @@ export default {
   run: typescriptGenerator,
   sample: typescriptSample,
   docs: typescriptDocs,
-  requiresGenerator: '^0.7.3',
+  requiresGenerator: '^0.7.5',
 };

package/lib/eject-assets/generators/typescript/inline-runtime.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/operation-signature.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/operation-types.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/operations.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/response-headers.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/type-guards.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/typescript/types.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "typescript" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "typescript" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator typescript --update`.

package/lib/eject-assets/generators/zod/index.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "zod" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "zod" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator zod --update`.
@@ -28,5 +28,5 @@ export const zodGenerator: Generator = ({ model, output, banner }) => {
 export default {
   name: 'zod',
   run: zodGenerator,
-  requiresGenerator: '^0.7.3',
+  requiresGenerator: '^0.7.5',
 };

package/lib/eject-assets/generators/zod/schemas.ts

@@ -1,4 +1,4 @@
-// Ejected from @redocly/client-generator@0.7.3 — the built-in "zod" generator.
+// Ejected from @redocly/client-generator@0.7.5 — the built-in "zod" generator.
 // This file is yours: edit freely; the generated client stays machine-owned and is
 // rebuilt by `redocly generate-client`. Newer generator versions merge in with
 // `redocly eject-generator zod --update`.

package/lib/eject-assets/skills/php-generator/SKILL.md

@@ -41,7 +41,9 @@ extension — zero Composer dependencies. The namespace derives from the API tit
 - **Naming:** classes PascalCase, properties/methods camelCase via
   `identifierFor(..., RESERVED_WORDS.php)`; reserved words get a trailing underscore.
 - **Enums** are native backed enums (string/int); other scalars stay aliases.
-  **Discriminated unions** are `match`-based `unmarshalX(array $data)` dispatchers;
+  **Discriminated unions** are `match`-based `unmarshalX(array $data)` dispatchers.
+  Each arm hydrates its mapping target the way a property of that type does, so a
+  target with no class of its own (a plain `oneOf`) stays a raw array;
   **allOf** is flattened.
 - **Unions keep their types where PHP 8.1 can express them.** A union of scalars, enums,
   classes, or arrays becomes a native union type (`int|string`, `PromotionType|array`)

package/lib/eject-assets/skills/python-generator/SKILL.md

@@ -59,7 +59,8 @@ One self-contained `<stem>.py`: typed dataclass models, a sync `Client` and an a
 - **Naming:** fields/methods snake*case via `identifierFor(..., RESERVED_WORDS.python)`;
   reserved words get a trailing underscore (`class*`); `+1`/`-1`become`plus_1`/`minus_1`.
 - **Enums** are `class X(str, Enum)` with SCREAMING members; **unions** are `Union[...]`
-  aliases. A DISCRIMINATED union registers its dispatch table in the runtime's
+  aliases, emitted after the classes and the other aliases they name, because a
+  module-level assignment evaluates at import. A DISCRIMINATED union registers its dispatch table in the runtime's
   `DISCRIMINATORS` registry (`DISCRIMINATORS[Pet] = ("petType", {"cat": Cat, ...})`),
   and `decode()` routes through it — `isinstance` narrowing works on decoded members.
   Undiscriminated unions decode by trying each member in order (the first that