@redocly/client-generator 0.3.8 → 0.4.0

package/lib/generators/python/operations.js

@@ -0,0 +1,108 @@
+// The `operations` stage: one typed request method per operation (sync and async),
+// with the optional `_with_headers` envelope variant.
+import { isMultipartBody, jsonSuccessSchema, sseResponse, uniqueIdentifiers, } from '@redocly/client-generator';
+import { envelopeHeaderSpecs } from "./descriptor.js";
+import { METHOD_ARG_SLOTS, naming, PY } from "./naming.js";
+import { pythonType } from "./types.js";
+export function writeMethod(printer, op, ident, errorMode, isAsync, dateType, model, envelope = false) {
+    // Every parameter is a separate argument, so path and query names share one namespace
+    // with the slots this method declares itself. `uniqueIdentifiers` moves a repeat aside
+    // (`id`, `id_2`) — a description may legally use one name in two locations, and a
+    // signature that declared it twice would not even parse.
+    const argNames = uniqueIdentifiers([...op.pathParams, ...op.queryParams].map((param) => param.name), { style: 'snake', reserved: PY, taken: METHOD_ARG_SLOTS });
+    const pathArgs = op.pathParams.map((param, index) => ({ param, python: argNames[index] }));
+    const queryArgs = op.queryParams.map((param, index) => ({
+        param,
+        python: argNames[op.pathParams.length + index],
+    }));
+    const positional = pathArgs.map(({ param, python }) => `${python}: ${pythonType(param.schema, dateType)}`);
+    const bodyArg = op.requestBody ? [`body: ${pythonType(op.requestBody.schema, dateType)}`] : [];
+    const kwargs = [
+        ...queryArgs.map(({ param, python }) => {
+            const annotation = pythonType(param.schema, dateType);
+            const optional = annotation.startsWith('Optional[') ? annotation : `Optional[${annotation}]`;
+            return `${python}: ${optional} = None`;
+        }),
+        'headers: Optional[Dict[str, str]] = None',
+        'timeout: Optional[float] = None',
+        'retry: Optional[Dict[str, Any]] = None',
+        'idempotency_key: Any = None',
+    ];
+    const success = jsonSuccessSchema(op);
+    const sse = sseResponse(op);
+    const returns = envelope
+        ? `Envelope[${success === undefined ? 'None' : pythonType(success, dateType)}]`
+        : sse !== undefined
+            ? `${isAsync ? 'AsyncIterator' : 'Iterator'}[ServerSentEvent]`
+            : errorMode === 'result'
+                ? 'Result'
+                : success === undefined
+                    ? 'None'
+                    : pythonType(success, dateType);
+    // Streaming methods are plain defs returning an (async) iterator — an `async def`
+    // would force awaiting the call before iterating it.
+    const prefix = isAsync && sse === undefined ? 'async def' : 'def';
+    const awaitKw = isAsync ? 'await ' : '';
+    const sendFn = isAsync ? 'send_async' : 'send';
+    const signature = ['self', ...positional, ...bodyArg, '*', ...kwargs].join(', ');
+    const defName = envelope ? `${ident}_with_headers` : ident;
+    printer.block(`${prefix} ${defName}(${signature}) -> ${returns}:`, () => {
+        printer.doc(envelope
+            ? `Like ${ident}(), returning an Envelope with the declared response headers.`
+            : op.summary);
+        printer.line(`op = _OPERATIONS["${ident}"]`);
+        printer.line('auth_headers, auth_query = resolve_auth(op.get("security") or [], self._auth)');
+        printer.line('params: Dict[str, Any] = dict(auth_query)');
+        for (const { param, python } of queryArgs) {
+            printer.block(`if ${python} is not None:`, () => {
+                printer.line(`params[${naming.string(param.name)}] = encode(${python})`);
+            });
+        }
+        const pathDict = pathArgs
+            .map(({ param, python }) => `${naming.string(param.name)}: ${python}`)
+            .join(', ');
+        printer.line(`url = build_url(self._server_url, op["path"], {${pathDict}})`);
+        if (sse !== undefined) {
+            const dataKind = sse.schema !== undefined && sse.schema.kind !== 'unknown' ? 'json' : 'text';
+            printer.block('def _open(extra_headers: Dict[str, str]):', () => {
+                printer.line('return self._http.stream(op["method"], url, ' +
+                    'headers={**auth_headers, **(headers or {}), **extra_headers}, params=params, timeout=timeout)');
+            });
+            printer.line(`return ${isAsync ? 'aiter_sse' : 'iter_sse'}(_open, data_kind="${dataKind}")`);
+            return;
+        }
+        if (isMultipartBody(op))
+            printer.line('form_data, form_files = to_multipart(body)');
+        const bodyKw = op.requestBody
+            ? isMultipartBody(op)
+                ? ', data=form_data, files=form_files'
+                : ', json_body=encode(body)'
+            : '';
+        printer.line(`response = ${awaitKw}${sendFn}(self._http, self._config, op, url, method=op["method"], ` +
+            `headers={**auth_headers, **(headers or {})}, params=params${bodyKw}, ` +
+            'timeout=timeout, retry=retry, idempotency_key=idempotency_key)');
+        const decoded = success === undefined
+            ? 'None'
+            : `decode(${pythonType(success, dateType)}, _safe_json(response))`;
+        if (envelope) {
+            printer.block('if not response.is_success:', () => {
+                printer.line('raise ApiError(url, response.status_code, response.reason_phrase, _safe_json(response))');
+            });
+            printer.line(`return Envelope(data=${decoded}, headers=read_envelope_headers(response, ${envelopeHeaderSpecs(op, model)}), response=response)`);
+        }
+        else if (errorMode === 'result') {
+            printer.block('if not response.is_success:', () => {
+                printer.line('return Result(data=None, error=_safe_json(response), response=response)');
+            });
+            printer.line(`return Result(data=${decoded}, error=None, response=response)`);
+        }
+        else {
+            printer.block('if not response.is_success:', () => {
+                printer.line('raise ApiError(url, response.status_code, response.reason_phrase, _safe_json(response))');
+            });
+            printer.line(success === undefined ? 'return None' : `return ${decoded}`);
+        }
+    });
+    printer.blank();
+}
+//# sourceMappingURL=operations.js.map

package/lib/generators/python/operations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../../src/generators/python/operations.ts"],"names":[],"mappings":"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"}

package/lib/generators/python/pagination.d.ts

@@ -0,0 +1,5 @@
+import { type DateType, type OperationModel } from '@redocly/client-generator';
+import type { PythonPrinter } from '@redocly/client-generator/printers/python';
+/** `<ident>_pages` / `<ident>_items` iterator methods for a paginated operation. */
+export declare function writePaginationWrappers(printer: PythonPrinter, op: OperationModel, ident: string, isAsync: boolean, itemType: string, dateType: DateType): void;
+//# sourceMappingURL=pagination.d.ts.map

package/lib/generators/python/pagination.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["../../../src/generators/python/pagination.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,cAAc,EAEpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAK/E,oFAAoF;AACpF,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,aAAa,EACtB,EAAE,EAAE,cAAc,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,GACjB,IAAI,CAqGN"}

package/lib/generators/python/pagination.js

@@ -0,0 +1,95 @@
+// The `pagination` stage: `<ident>_pages` / `<ident>_items` iterator methods for
+// paginated operations, sync and async.
+import { jsonSuccessSchema, uniqueIdentifiers, } from '@redocly/client-generator';
+import { METHOD_ARG_SLOTS, naming, PY } from "./naming.js";
+import { pythonType } from "./types.js";
+/** `<ident>_pages` / `<ident>_items` iterator methods for a paginated operation. */
+export function writePaginationWrappers(printer, op, ident, isAsync, itemType, dateType) {
+    const success = jsonSuccessSchema(op);
+    const pageType = success === undefined ? 'Any' : pythonType(success, dateType);
+    // The iterators take the same arguments as the operation itself, computed the same way,
+    // so a name the method moved aside (`id_2`) is the same name here — copying a call from
+    // one to the other has to keep working. Path values are substituted, not dropped.
+    const argNames = uniqueIdentifiers([...op.pathParams, ...op.queryParams].map((param) => param.name), { style: 'snake', reserved: PY, taken: METHOD_ARG_SLOTS });
+    const pathArgs = op.pathParams.map((param, index) => ({ param, python: argNames[index] }));
+    const queryArgs = op.queryParams.map((param, index) => ({
+        param,
+        python: argNames[op.pathParams.length + index],
+    }));
+    const positional = pathArgs.map(({ param, python }) => `${python}: ${pythonType(param.schema, dateType)}`);
+    const kwargs = [
+        ...queryArgs.map(({ param, python }) => {
+            const annotation = pythonType(param.schema, dateType);
+            const optional = annotation.startsWith('Optional[') ? annotation : `Optional[${annotation}]`;
+            return `${python}: ${optional} = None`;
+        }),
+        'headers: Optional[Dict[str, str]] = None',
+        'timeout: Optional[float] = None',
+        'retry: Optional[Dict[str, Any]] = None',
+    ];
+    const signature = ['self', ...positional, '*', ...kwargs].join(', ');
+    const iterType = isAsync ? 'AsyncIterator' : 'Iterator';
+    const pagesFn = isAsync ? 'aiter_pages' : 'iter_pages';
+    const itemsFn = isAsync ? 'aiter_items' : 'iter_items';
+    const writeCallClosure = () => {
+        printer.line('base: Dict[str, Any] = {}');
+        for (const { param, python } of queryArgs) {
+            printer.block(`if ${python} is not None:`, () => {
+                printer.line(`base[${naming.string(param.name)}] = encode(${python})`);
+            });
+        }
+        const prefix = isAsync ? 'async def' : 'def';
+        const awaitKw = isAsync ? 'await ' : '';
+        printer.block(`${prefix} _page(page_params: Dict[str, Any]) -> Tuple[Any, Any]:`, () => {
+            printer.line('auth_headers, auth_query = resolve_auth(op.get("security") or [], self._auth)');
+            const pathDict = pathArgs
+                .map(({ param, python }) => `${naming.string(param.name)}: ${python}`)
+                .join(', ');
+            printer.line(`url = build_url(self._server_url, op["path"], {${pathDict}})`);
+            printer.line(`response = ${awaitKw}${isAsync ? 'send_async' : 'send'}(self._http, self._config, op, url, method=op["method"], ` +
+                'headers={**auth_headers, **(headers or {})}, params={**page_params, **auth_query}, ' +
+                'timeout=timeout, retry=retry)');
+            printer.block('if not response.is_success:', () => {
+                printer.line('raise ApiError(url, response.status_code, response.reason_phrase, _safe_json(response))');
+            });
+            printer.line('return _safe_json(response), response');
+        });
+    };
+    // pages: raw page JSON decoded into the page model per page.
+    if (isAsync) {
+        printer.block(`async def ${ident}_pages(${signature}) -> ${iterType}[${pageType}]:`, () => {
+            printer.line(`op = _OPERATIONS["${ident}"]`);
+            writeCallClosure();
+            printer.block(`async for page in ${pagesFn}(_page, op["pagination"], base):`, () => {
+                printer.line(pageType === 'Any' ? 'yield page' : `yield decode(${pageType}, page)`);
+            });
+        });
+        printer.blank();
+        printer.block(`async def ${ident}_items(${signature}) -> ${iterType}[${itemType}]:`, () => {
+            printer.line(`op = _OPERATIONS["${ident}"]`);
+            writeCallClosure();
+            printer.block(`async for item in ${itemsFn}(_page, op["pagination"], base):`, () => {
+                printer.line(itemType === 'Any' ? 'yield item' : `yield decode(${itemType}, item)`);
+            });
+        });
+    }
+    else {
+        printer.block(`def ${ident}_pages(${signature}) -> ${iterType}[${pageType}]:`, () => {
+            printer.line(`op = _OPERATIONS["${ident}"]`);
+            writeCallClosure();
+            printer.line(pageType === 'Any'
+                ? `return ${pagesFn}(_page, op["pagination"], base)`
+                : `return (decode(${pageType}, page) for page in ${pagesFn}(_page, op["pagination"], base))`);
+        });
+        printer.blank();
+        printer.block(`def ${ident}_items(${signature}) -> ${iterType}[${itemType}]:`, () => {
+            printer.line(`op = _OPERATIONS["${ident}"]`);
+            writeCallClosure();
+            printer.line(itemType === 'Any'
+                ? `return ${itemsFn}(_page, op["pagination"], base)`
+                : `return (decode(${itemType}, item) for item in ${itemsFn}(_page, op["pagination"], base))`);
+        });
+    }
+    printer.blank();
+}
+//# sourceMappingURL=pagination.js.map

package/lib/generators/python/pagination.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../src/generators/python/pagination.ts"],"names":[],"mappings":"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"}

package/lib/generators/python/types.d.ts

@@ -0,0 +1,4 @@
+import { type DateType, type SchemaModel } from '@redocly/client-generator';
+/** The Python type annotation for a schema (anonymous complex shapes collapse to Any-ish). */
+export declare function pythonType(schema: SchemaModel, dateType?: DateType): string;
+//# sourceMappingURL=types.d.ts.map

package/lib/generators/python/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generators/python/types.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,WAAW,EAEjB,MAAM,2BAA2B,CAAC;AAInC,8FAA8F;AAC9F,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,GAAE,QAAmB,GAAG,MAAM,CAqCrF"}

package/lib/generators/python/types.js

@@ -0,0 +1,45 @@
+// The `types` stage: schema → Python type annotation.
+import { isNullable, unwrapNullable, } from '@redocly/client-generator';
+import { className, naming } from "./naming.js";
+/** The Python type annotation for a schema (anonymous complex shapes collapse to Any-ish). */
+export function pythonType(schema, dateType = 'string') {
+    if (isNullable(schema)) {
+        return `Optional[${pythonType(unwrapNullable(schema), dateType)}]`;
+    }
+    switch (schema.kind) {
+        case 'scalar':
+            // `dateType: Date` annotates date/date-time as stdlib objects; `_decode.py`
+            // converts them from and to ISO strings on the wire.
+            if (dateType === 'Date' && schema.scalar === 'string') {
+                if (schema.metadata?.format === 'date-time')
+                    return 'datetime';
+                if (schema.metadata?.format === 'date')
+                    return 'date';
+            }
+            return { string: 'str', integer: 'int', number: 'float', boolean: 'bool' }[schema.scalar];
+        case 'array':
+            return `List[${pythonType(schema.items, dateType)}]`;
+        case 'record':
+            return `Dict[str, ${pythonType(schema.value, dateType)}]`;
+        case 'ref':
+            return className(schema.name);
+        case 'literal':
+            return `Literal[${naming.literal(schema.value)}]`;
+        case 'enum':
+            // Anonymous (inline) enums keep the wire scalar; only NAMED enums get classes.
+            return { string: 'str', integer: 'int', number: 'float', boolean: 'bool' }[schema.scalar];
+        case 'union':
+            return `Union[${schema.members.map((member) => pythonType(member, dateType)).join(', ')}]`;
+        case 'null':
+            return 'None';
+        case 'omit':
+            // Python has no Omit; the base class is the honest annotation (readOnly
+            // fields are server-managed and simply absent on requests).
+            return className(schema.base);
+        case 'object':
+        case 'intersection':
+        case 'unknown':
+            return 'Any';
+    }
+}
+//# sourceMappingURL=types.js.map

package/lib/generators/python/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/generators/python/types.ts"],"names":[],"mappings":"AAAA,sDAAsD;AAEtD,OAAO,EAEL,UAAU,EAEV,cAAc,GACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEhD,8FAA8F;AAC9F,MAAM,UAAU,UAAU,CAAC,MAAmB,EAAE,WAAqB,QAAQ;IAC3E,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,OAAO,YAAY,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC;IACrE,CAAC;IACD,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,QAAQ;YACX,4EAA4E;YAC5E,qDAAqD;YACrD,IAAI,QAAQ,KAAK,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACtD,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,KAAK,WAAW;oBAAE,OAAO,UAAU,CAAC;gBAC/D,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM;oBAAE,OAAO,MAAM,CAAC;YACxD,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5F,KAAK,OAAO;YACV,OAAO,QAAQ,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;QACvD,KAAK,QAAQ;YACX,OAAO,aAAa,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;QAC5D,KAAK,KAAK;YACR,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChC,KAAK,SAAS;YACZ,OAAO,WAAW,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;QACpD,KAAK,MAAM;YACT,+EAA+E;YAC/E,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5F,KAAK,OAAO;YACV,OAAO,SAAS,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAC7F,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB,KAAK,MAAM;YACT,wEAAwE;YACxE,4DAA4D;YAC5D,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChC,KAAK,QAAQ,CAAC;QACd,KAAK,cAAc,CAAC;QACpB,KAAK,SAAS;YACZ,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC"}

package/lib/generators/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/generators/resolve.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEvE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,kDAAkD;IAClD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gFAAgF;IAChF,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,yGAAyG;IACzG,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC,mGAAmG;IACnG,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAe7B"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/generators/resolve.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEvE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,kDAAkD;IAClD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gFAAgF;IAChF,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,yGAAyG;IACzG,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC,mGAAmG;IACnG,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAkC7B"}

package/lib/generators/resolve.js

@@ -4,31 +4,82 @@
 // already-registered custom name is dynamically `import()`ed (a standard Node ESM dynamic import), its
 // default (or `generator`) export validated, and registered under its declared name. Built-ins are
 // seeded fresh per call (see `builtinGenerators`), so registration never mutates the built-in table.
-import { isAbsoluteUrl, isPlainObject } from '@redocly/openapi-core';
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+import { isAbsoluteUrl, isPlainObject, logger } from '@redocly/openapi-core';
 import { isAbsolute, resolve as resolvePath } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { NotSupportedError } from '../errors.js';
-import { builtinGenerators } from './index.js';
+import { GENERATOR_VERSION, satisfiesGeneratorRange } from './compatibility.js';
+import { BUILTIN_META } from './meta.js';
 /**
  * Build the run list + registry for a `generators` selection. Each entry is, in order of preference,
  * a built-in name, an already-registered custom name, or an import specifier (path or package).
  */
 export async function resolveGenerators(entries, options = {}) {
-    const registry = builtinGenerators();
+    // Built-ins are loaded lazily through BUILTIN_META so a selection without a
+    // TypeScript-emitting generator never loads the `typescript` package.
+    const registry = new Map();
     for (const custom of options.customGenerators ?? [])
         register(registry, custom);
-    const selected = [];
+    // Load every selected entry first: an import specifier's declared name and `requires`
+    // are only known once it is imported, and an ejected generator carries the same
+    // `requires` as the built-in it replaces.
+    const names = [];
     for (const entry of entries) {
-        if (registry.has(entry)) {
-            selected.push(entry);
-            continue;
-        }
-        const custom = await importGenerator(entry, options.configDir ?? process.cwd());
-        register(registry, custom);
-        selected.push(custom.name);
+        names.push(await loadEntry(entry, registry, options.configDir));
     }
+    // A prerequisite is pulled in rather than demanded: selecting `cli` should give a
+    // working CLI without the user knowing which other generators provide its parts.
+    const selected = [];
+    const visiting = new Set();
+    const add = async (name) => {
+        if (selected.includes(name) || visiting.has(name))
+            return;
+        visiting.add(name);
+        for (const required of registry.get(name).requires ?? []) {
+            // Only pull in a prerequisite we know how to load — an already-registered
+            // generator or a built-in. Anything else stays the user's problem and is
+            // reported by `validateSelection`.
+            if (registry.has(required) || required in BUILTIN_META) {
+                await add(await loadEntry(required, registry, options.configDir));
+            }
+        }
+        visiting.delete(name);
+        selected.push(name);
+    };
+    for (const name of names)
+        await add(name);
     return { selected, registry };
 }
+/**
+ * Load one entry — an already-registered name, a built-in name, or an import specifier —
+ * into the registry, and return the name it is registered under.
+ */
+async function loadEntry(entry, registry, configDir) {
+    if (registry.has(entry))
+        return entry;
+    const meta = BUILTIN_META[entry];
+    if (meta !== undefined) {
+        const { load, ...compatibility } = meta;
+        registry.set(entry, { ...compatibility, ...(await load()) });
+        return entry;
+    }
+    // Without this, the old name falls through to `import('sdk')` and fails with a
+    // module-load error that hides the rename.
+    if (entry === 'sdk') {
+        throw new NotSupportedError('The "sdk" generator is now named "typescript". Update the `generators` list or the --generator flag.');
+    }
+    const custom = await importGenerator(entry, configDir ?? process.cwd());
+    register(registry, custom);
+    return custom.name;
+}
 /** Validate a custom generator and add it under its name, rejecting collisions. */
 function register(registry, custom) {
     if (!isPlainObject(custom) ||
@@ -40,12 +91,35 @@ function register(registry, custom) {
     if (registry.has(custom.name)) {
         throw new NotSupportedError(`Generator name "${custom.name}" collides with an existing generator. Rename the custom generator.`);
     }
+    // The model and the helpers change under semver, so a declared range that excludes the
+    // running version means the generator and this CLI disagree on the contract.
+    if (custom.requiresGenerator !== undefined) {
+        const satisfied = satisfiesGeneratorRange(GENERATOR_VERSION, custom.requiresGenerator);
+        if (satisfied === undefined) {
+            throw new NotSupportedError(`Generator "${custom.name}" declares requiresGenerator "${custom.requiresGenerator}", which is not a range we read. Use ^1.2.0, ~1.2.0, >=1.2.0, or an exact version.`);
+        }
+        if (!satisfied) {
+            throw new NotSupportedError(`Generator "${custom.name}" needs @redocly/client-generator ${custom.requiresGenerator}; this CLI ships ${GENERATOR_VERSION}. ` +
+                'Upgrade @redocly/cli if the generator is newer, or update the generator — `redocly eject-generator <name> --update` for an ejected file, or upgrade its package.');
+        }
+    }
+    // A custom generator MAY take over a built-in name — that's how an ejected
+    // generator replaces its origin without a config rename. Announce the takeover.
+    if (custom.name in BUILTIN_META) {
+        logger.warn(`generate-client: custom generator "${custom.name}" takes over the built-in generator of the same name.\n`);
+    }
     registry.set(custom.name, {
         run: custom.run,
+        sample: custom.sample,
+        // `docs` and `notApplicable` are part of the contract the ejected files export —
+        // dropping either makes an ejected generator quietly do less than the built-in it
+        // replaced (`--docs` writes no page, ignored options stop warning).
+        docs: custom.docs,
+        notApplicable: custom.notApplicable,
+        options: custom.options,
         requires: custom.requires,
         errorModes: custom.errorModes,
         dateTypes: custom.dateTypes,
-        runtimes: custom.runtimes,
     });
 }
 /** Dynamically import a generator from a path (resolved against `configDir`) or package specifier. */
@@ -57,9 +131,14 @@ async function importGenerator(specifier, configDir) {
     }
     const isPath = specifier.startsWith('.') || isAbsolute(specifier);
     const target = isPath ? pathToFileURL(resolvePath(configDir, specifier)).href : specifier;
+    // An ejected generator is TypeScript source, run through Node's own type stripping —
+    // absent that, `import()` would die with ERR_UNKNOWN_FILE_EXTENSION deep in the loader.
+    if (isPath && specifier.endsWith('.ts') && !process.features.typescript) {
+        throw new NotSupportedError(`Generator "${specifier}" is TypeScript, which this Node cannot run directly — use Node 22.18, 23.6, or newer.`);
+    }
     let module;
     try {
-        module = (await import(target));
+        module = (await import(__rewriteRelativeImportExtension(target)));
     }
     catch (cause) {
         throw new NotSupportedError(`Could not load generator "${specifier}": ${cause.message}`);

package/lib/generators/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/generators/resolve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/generators/resolve.ts"],"names":[],"mappings":"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"}

package/lib/generators/{swr.d.ts → swr/index.d.ts}

@@ -1,10 +1,10 @@
-import type { Generator } from './types.js';
+import type { Generator } from '@redocly/client-generator';
 /**
  * The swr generator: a standalone `<stem>.swr.ts` module of SWR hooks wrapping the
  * sdk operation functions — `<op>Key` + `use<Op>` (`useSWR`) per query (GET/HEAD),
  * `use<Op>` (`useSWRMutation`) per mutation. It imports the operation functions +
  * their `<Op>Variables` types from the sdk entry (`./<stem>.js`), so it requires the
- * `sdk` generator and targets its throw-mode operation functions. `swr`/`swr/mutation`
+ * `typescript` generator and targets its throw-mode operation functions. `swr`/`swr/mutation`
  * are the consumer's peer; the sdk client stays dependency-free.
  *
  * Output-mode-agnostic: `./<stem>.js` resolves to the single-file client or the
@@ -12,4 +12,4 @@ import type { Generator } from './types.js';
  * no operations.
  */
 export declare const swrGenerator: Generator;
-//# sourceMappingURL=swr.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/lib/generators/swr/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/swr/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAK3D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,EAAE,SAO1B,CAAC"}

package/lib/generators/{swr.js → swr/index.js}

@@ -1,27 +1,24 @@
 import { join } from 'node:path';
-import { HEADER } from '../emitters/emit-options.js';
-import { renderSwrModule } from '../emitters/swr.js';
-import { anchor } from './anchor.js';
+import { renderSwrModule } from "./render.js";
 /**
  * The swr generator: a standalone `<stem>.swr.ts` module of SWR hooks wrapping the
  * sdk operation functions — `<op>Key` + `use<Op>` (`useSWR`) per query (GET/HEAD),
  * `use<Op>` (`useSWRMutation`) per mutation. It imports the operation functions +
  * their `<Op>Variables` types from the sdk entry (`./<stem>.js`), so it requires the
- * `sdk` generator and targets its throw-mode operation functions. `swr`/`swr/mutation`
+ * `typescript` generator and targets its throw-mode operation functions. `swr`/`swr/mutation`
  * are the consumer's peer; the sdk client stays dependency-free.
  *
  * Output-mode-agnostic: `./<stem>.js` resolves to the single-file client or the
  * multi-file barrel at the output anchor either way. Emits nothing when there are
  * no operations.
  */
-export const swrGenerator = ({ model, outputPath, emit }) => {
-    const { dir, stem } = anchor(outputPath);
+export const swrGenerator = ({ model, output, banner, emit }) => {
     const content = renderSwrModule(model, {
-        argsStyle: emit.argsStyle ?? 'flat',
-        sdkModule: `./${stem}.${emit.importExt ?? 'js'}`,
+        sdkModule: `./${output.stem}.${emit.importExt ?? 'js'}`,
     });
     if (content === '')
         return [];
-    return [{ path: join(dir, `${stem}.swr.ts`), content: `${HEADER}\n\n${content}` }];
+    const header = banner.map((line) => `// ${line}`).join('\n');
+    return [{ path: join(output.dir, `${output.stem}.swr.ts`), content: `${header}\n\n${content}` }];
 };
-//# sourceMappingURL=swr.js.map
+//# sourceMappingURL=index.js.map

package/lib/generators/swr/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generators/swr/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,YAAY,GAAc,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;IACzE,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE;QACrC,SAAS,EAAE,KAAK,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE;KACxD,CAAC,CAAC;IACH,IAAI,OAAO,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,OAAO,EAAE,EAAE,CAAC,CAAC;AACnG,CAAC,CAAC"}

package/lib/{emitters/swr.d.ts → generators/swr/render.d.ts}

@@ -1,10 +1,8 @@
-import type { ApiModel } from '../intermediate-representation/model.js';
+import type { ApiModel } from '@redocly/client-generator';
 export type SwrOptions = {
     /** Import specifier for the sdk entry the operation functions/types live in. */
     sdkModule: string;
-    /** How the sdk function takes its inputs — must match the generated client. */
-    argsStyle: 'flat' | 'grouped';
 };
 /** Render the full SWR module source. `''` when there are no wrappable operations. */
 export declare function renderSwrModule(model: ApiModel, opts: SwrOptions): string;
-//# sourceMappingURL=swr.d.ts.map
+//# sourceMappingURL=render.d.ts.map

package/lib/generators/swr/render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/generators/swr/render.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,2BAA2B,CAAC;AAW1E,MAAM,MAAM,UAAU,GAAG;IACvB,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;CAEnB,CAAC;AAEF,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM,CAYzE"}

package/lib/generators/swr/render.js

@@ -0,0 +1,57 @@
+// Emits an idiomatic SWR module wrapping the sdk operation functions. Per query
+// operation (GET/HEAD) a `<op>Key(vars)` tuple factory + a `use<Op>(vars, init?)`
+// hook returning `useSWR(key, fetcher)`; per mutation (everything else) a
+// `use<Op>()` hook returning `useSWRMutation(key, (key, { arg }) => <op>(arg))`.
+// The fetcher forwards args per the configured args style (grouped `<op>(vars, init)`
+// or flat `<op>(vars.petId, …, init)`) via the shared `operationSignature`, so the
+// call type-checks against the generated sdk.
+// `swr`/`swr/mutation` are the consumer's peer; the sdk stays dependency-free.
+// Source-text templates throughout.
+import { hasInputs, isQuery, sdkCallText, sdkNamedImportText, variablesName, wrappableOperations, } from '@redocly/client-generator/contracts/typescript';
+import { pascalCase } from '@redocly/client-generator/printers/typescript';
+/** Render the full SWR module source. `''` when there are no wrappable operations. */
+export function renderSwrModule(model, opts) {
+    const ops = wrappableOperations(model, 'swr');
+    if (ops.length === 0)
+        return '';
+    const hasQuery = ops.some(isQuery);
+    const hasMutation = ops.some((op) => !isQuery(op));
+    const blocks = [
+        ...(hasQuery ? ['import useSWR from "swr";'] : []),
+        ...(hasMutation ? ['import useSWRMutation from "swr/mutation";'] : []),
+        sdkNamedImportText(ops, opts.sdkModule, hasQuery),
+        ...ops.flatMap((op) => (isQuery(op) ? queryBlocks(op) : [mutationBlock(op)])),
+    ];
+    return blocks.join('\n\n');
+}
+/** An exported `function use<Op>(<params>) { return <expr>; }` declaration. */
+function hookBlock(op, params, expr) {
+    return `export function use${pascalCase(op.name)}(${params}) {\n    return ${expr};\n}`;
+}
+/** A query op's `<op>Key` factory + `use<Op>` hook calling `useSWR`. */
+function queryBlocks(op) {
+    const inputs = hasInputs(op);
+    const keyParams = inputs ? `vars: ${variablesName(op)}` : '';
+    const keyElements = inputs
+        ? `[${JSON.stringify(op.name)}, vars]`
+        : `[${JSON.stringify(op.name)}]`;
+    const key = `export const ${op.name}Key = (${keyParams}) => ${keyElements} as const;`;
+    const keyCall = `${op.name}Key(${inputs ? 'vars' : ''})`;
+    const useSwr = `useSWR(${keyCall}, () => ${sdkCallText(op, 'vars', true)})`;
+    // The throw-only `envelope` option is excluded — cached data must stay the plain body.
+    const params = inputs
+        ? `vars: ${variablesName(op)}, init?: Omit<RequestOptions, "envelope">`
+        : 'init?: Omit<RequestOptions, "envelope">';
+    return [key, hookBlock(op, params, useSwr)];
+}
+/** A mutation op's `use<Op>` hook calling `useSWRMutation`. */
+function mutationBlock(op) {
+    // `(_key: string, { arg }: { arg: <Op>Variables }) => <op>(…arg)` when the op has
+    // inputs; a no-arg `() => <op>()` when it has none (`arg` would be unused).
+    const trigger = hasInputs(op)
+        ? `(_key: string, { arg }: {\n        arg: ${variablesName(op)};\n    }) => ${sdkCallText(op, 'arg', false)}`
+        : `() => ${sdkCallText(op, 'arg', false)}`;
+    const useSwrMutation = `useSWRMutation(${JSON.stringify(op.name)}, ${trigger})`;
+    return hookBlock(op, '', useSwrMutation);
+}
+//# sourceMappingURL=render.js.map

package/lib/generators/swr/render.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/generators/swr/render.ts"],"names":[],"mappings":"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"}