@redocly/client-generator 0.0.0-snapshot.manual → 0.1.1

package/lib/intermediate-representation/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/intermediate-representation/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/intermediate-representation/model.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAErE;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;wFACoF;IACpF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uFAAuF;IACvF,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,UAAU,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GACvF;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GACtF;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,UAAU,EAAE,aAAa,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GAChG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GACvF;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GAC9E;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IACzC,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B,GACD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE,GACjE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;CAAE;AACtE;;;;;GAKG;GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B,CAAC;AAEN,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kFAAkF;IAClF,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,eAAe,GAAG,YAAY,CAAC;IACnE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC;IACpB;;;;OAIG;IACH,MAAM,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;IACnD;;;OAGG;IACH,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,yFAAyF;IACzF,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,mBAAmB,GAC3B;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;IACzE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,wGAAwG;IACxG,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;IACtC;;;;OAIG;IACH,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC;;;;OAIG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;IACrB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,eAAe,EAAE,mBAAmB,EAAE,CAAC;CACxC,CAAC;AAEF,6DAA6D;AAC7D,wBAAgB,aAAa,CAC3B,mBAAmB,EAAE;IAAE,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,EAAE,GACtD,cAAc,EAAE,CAElB"}

package/lib/intermediate-representation/normalize-swagger2.js

@@ -39,8 +39,9 @@ function buildComponents(doc) {
     const components = {};
     if (doc.definitions)
         components.schemas = doc.definitions;
-    if (doc.parameters)
-        components.parameters = doc.parameters;
+    if (doc.parameters) {
+        components.parameters = Object.fromEntries(Object.entries(doc.parameters).map(([name, param]) => [name, normalizeParameter(param)]));
+    }
     if (doc.responses)
         components.responses = normalizeResponses(doc.responses, undefined);
     const securityDefinitions = doc.securityDefinitions;
@@ -114,6 +115,12 @@ function normalizePaths(paths, rootConsumes, rootProduces) {
         const item = itemRaw;
         const newItem = {};
         for (const [key, value] of Object.entries(item)) {
+            if (key === 'parameters' && Array.isArray(value)) {
+                // Path-level parameters are shared by every operation and carry the same
+                // Swagger-2 inline-type shape as operation-level ones.
+                newItem.parameters = value.map(normalizeParameter);
+                continue;
+            }
             if (!isHttpMethod(key)) {
                 newItem[key] = value;
                 continue;
@@ -173,6 +180,11 @@ function normalizeOperation(operation, rootConsumes, rootProduces) {
 }
 /** A Swagger-2 simple parameter carries its schema inline; OAS3 nests it under `schema`. */
 function normalizeParameter(param) {
+    // A $ref passes through (deref'd later against the normalized components), and
+    // body/formData params keep their shape — the operation normalizer consumes them,
+    // and anywhere else the IR builder rejects those locations loudly.
+    if (param.$ref !== undefined || param.in === 'body' || param.in === 'formData')
+        return param;
     const base = {};
     const schema = {};
     for (const [key, value] of Object.entries(param)) {
@@ -182,6 +194,19 @@ function normalizeParameter(param) {
             schema[key] = value;
     }
     base.schema = schema;
+    delete base.collectionFormat;
+    // Swagger 2 array query params serialize per `collectionFormat`, defaulting to `csv`
+    // (comma-joined) — NOT the OAS3 default (`form` + `explode`, i.e. Swagger's `multi`).
+    // Map to the OAS3 style/explode the IR reads; `multi` needs no record (it IS the
+    // default), and `tsv` has no OAS3 equivalent, so it falls back to comma-joined.
+    if (param.in === 'query' && schema.type === 'array') {
+        const format = param.collectionFormat ?? 'csv';
+        if (format !== 'multi') {
+            base.style =
+                format === 'ssv' ? 'spaceDelimited' : format === 'pipes' ? 'pipeDelimited' : 'form';
+            base.explode = false;
+        }
+    }
     return base;
 }
 /** The schema half of a formData/simple param (everything except the param-level keys). */

package/lib/intermediate-representation/normalize-swagger2.js.map

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

package/lib/intermediate-representation/sanitize-identifiers.d.ts

@@ -16,6 +16,16 @@ import type { ApiModel } from './model.js';
  * build if any name still slips through — it should never fire after this pass.
  */
 export declare function sanitizeIdentifiers(model: ApiModel): void;
+/**
+ * Reject path parameters named after a request-args slot. The runtime routes path
+ * values as `args[param.name]` at the TOP level of the args object, next to the
+ * `params`/`body`/`headers`/`cookies` slots — a path parameter of the same name is
+ * irreducibly ambiguous there (the wire name is the routing key, so no rename can
+ * help), which silently misroutes the value. Failing generation with a spec-side fix
+ * beats emitting a client that drops it. `init` is fine: it is only a flat-sugar
+ * binding, and the signature emitter moves that binding aside.
+ */
+export declare function assertPathParamsAvoidArgSlots(model: ApiModel): void;
 /**
  * Throw if any declaration name is still not a safe identifier — a generator bug, not
  * bad input.

package/lib/intermediate-representation/sanitize-identifiers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize-identifiers.d.ts","sourceRoot":"","sources":["../../src/intermediate-representation/sanitize-identifiers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAA+B,MAAM,YAAY,CAAC;AAExE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAgDzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAa3D"}
+{"version":3,"file":"sanitize-identifiers.d.ts","sourceRoot":"","sources":["../../src/intermediate-representation/sanitize-identifiers.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAA+B,MAAM,YAAY,CAAC;AAExE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CA8DzD;AAsBD;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAYnE;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAa3D"}

package/lib/intermediate-representation/sanitize-identifiers.js

@@ -1,5 +1,9 @@
 import { logger } from '@redocly/openapi-core';
-import { isSafeIdentifier, uniqueIdent } from '../emitters/identifier.js';
+import { authSetterNames } from '../emitters/auth.js';
+import { isSafeIdentifier, sanitizeIdentifier } from '../emitters/identifier.js';
+import { reservedModuleNames } from '../emitters/reserved-names.js';
+import { pascalCase } from '../emitters/support.js';
+import { NotSupportedError } from '../errors.js';
 /**
  * Coerce every document-derived name that lands in a TypeScript *declaration*
  * slot — schema type names, operation (function) names — into a valid, unique JS
@@ -17,42 +21,56 @@ import { isSafeIdentifier, uniqueIdent } from '../emitters/identifier.js';
  * build if any name still slips through — it should never fire after this pass.
  */
 export function sanitizeIdentifiers(model) {
-    // Schema names share TypeScript's *type* namespace; operation names its *value*
-    // namespace. Keep separate `used` sets so a function and a type may share a name.
-    const schemaNames = new Set();
-    const renamed = new Map();
-    for (const schema of model.schemas) {
-        const safe = uniqueIdent(schema.name, schemaNames);
-        if (safe !== schema.name) {
-            renamed.set(schema.name, safe);
-            warnRename('schema', schema.name, safe);
-            schema.name = safe;
-        }
-    }
     // Security-scheme keys feed the apiKey setter name (`setApiKey<Key>`, built with a
     // first-char-only pascalCase) and the runtime's security-matching string literals.
     // Sanitize so the setter is a valid identifier, then rewrite each operation's
-    // `security` list with the same map so the literals still match.
+    // `security` list with the same map so the literals still match. Keys go first:
+    // the setter names seeded into the schema pass below derive from the final keys.
     const schemeKeys = new Set();
+    const schemePascals = new Set();
     const renamedKeys = new Map();
     for (const scheme of model.securitySchemes) {
-        const safe = uniqueIdent(scheme.key, schemeKeys);
+        const safe = uniquePascalIdent(scheme.key, schemeKeys, schemePascals);
         if (safe !== scheme.key) {
             renamedKeys.set(scheme.key, safe);
             warnRename('security scheme', scheme.key, safe);
             scheme.key = safe;
         }
     }
+    // Schema types land in the same module scope as everything the generator emits and
+    // embeds, so a schema may not reuse a reserved name (the runtime's `ApiError` class,
+    // a satellite import like msw's `http`, the `client` const, an auth setter, …). The
+    // rename is mode-independent — a `--runtime` flip must not change the generated
+    // type names.
+    const schemaNames = new Set([
+        ...reservedModuleNames(),
+        ...authSetterNames(model.securitySchemes),
+    ]);
+    const schemaPascals = new Set();
+    const renamed = new Map();
+    for (const schema of model.schemas) {
+        const safe = uniquePascalIdent(schema.name, schemaNames, schemaPascals);
+        if (safe !== schema.name) {
+            renamed.set(schema.name, safe);
+            warnRename('schema', schema.name, safe);
+            schema.name = safe;
+        }
+    }
     // A reference to a renamed schema/scheme must follow it; an unknown/dangling name is
     // still sanitized standalone so it can never carry an injection payload.
     const fixRef = (name) => renamed.get(name) ?? sanitizeRef(name);
     const fixKey = (key) => renamedKeys.get(key) ?? sanitizeRef(key);
     for (const schema of model.schemas)
         rewriteRefs(schema.schema, fixRef);
-    const operationNames = new Set();
+    // Operations become exported functions in the same module where schema types are
+    // used, so the two cannot share a name: the function's own `body: X` annotation
+    // would resolve to the function value, and the entry's `export *` would drop the
+    // shadowed type. Seeding with the schema names renames a colliding operation.
+    const operationNames = new Set(schemaNames);
+    const operationPascals = new Set();
     for (const service of model.services) {
         for (const op of service.operations) {
-            const safe = uniqueIdent(op.name, operationNames);
+            const safe = uniquePascalIdent(op.name, operationNames, operationPascals);
             if (safe !== op.name) {
                 warnRename('operation', op.name, safe);
                 op.specName = op.name;
@@ -63,6 +81,45 @@ export function sanitizeIdentifiers(model) {
         }
     }
 }
+/**
+ * `sanitizeIdentifier(name)` made unique within `used` AND distinct after the
+ * `pascalCase` mapping the emitters derive companion names with (`<Pascal>Schema`,
+ * `create<Pascal>`, `transform<Pascal>`, `<Pascal>Variables`, `setApiKey<Key>`).
+ * `pascalCase` changes only the first character, so case-distinct spec names
+ * (`pet` / `Pet`) would otherwise collapse to the same derived identifiers.
+ */
+function uniquePascalIdent(name, used, usedPascals) {
+    const base = sanitizeIdentifier(name);
+    let ident = base;
+    let suffix = 2;
+    while (used.has(ident) || usedPascals.has(pascalCase(ident)))
+        ident = `${base}_${suffix++}`;
+    used.add(ident);
+    usedPascals.add(pascalCase(ident));
+    return ident;
+}
+/** The request-args slot keys a path parameter's wire name may not reuse. */
+const ARG_SLOT_NAMES = ['params', 'body', 'headers', 'cookies'];
+/**
+ * Reject path parameters named after a request-args slot. The runtime routes path
+ * values as `args[param.name]` at the TOP level of the args object, next to the
+ * `params`/`body`/`headers`/`cookies` slots — a path parameter of the same name is
+ * irreducibly ambiguous there (the wire name is the routing key, so no rename can
+ * help), which silently misroutes the value. Failing generation with a spec-side fix
+ * beats emitting a client that drops it. `init` is fine: it is only a flat-sugar
+ * binding, and the signature emitter moves that binding aside.
+ */
+export function assertPathParamsAvoidArgSlots(model) {
+    for (const service of model.services) {
+        for (const op of service.operations) {
+            for (const param of op.pathParams) {
+                if (ARG_SLOT_NAMES.includes(param.name)) {
+                    throw new NotSupportedError(`Operation "${op.specName ?? op.name}": path parameter "${param.name}" collides with the "${param.name}" request-argument slot; rename the parameter in the API description.`);
+                }
+            }
+        }
+    }
+}
 /**
  * Throw if any declaration name is still not a safe identifier — a generator bug, not
  * bad input.
@@ -95,11 +152,11 @@ function unsafe(kind, name) {
 }
 /** Sanitize a ref/`omit` target that has no matching declaration (rare: a dangling $ref). */
 function sanitizeRef(name) {
-    // No uniqueness context here; a throwaway set yields a pure, deterministic sanitize.
-    return uniqueIdent(name, new Set());
+    // No uniqueness context here; a pure, deterministic sanitize is all that is needed.
+    return sanitizeIdentifier(name);
 }
 function warnRename(kind, from, to) {
-    logger.warn(`generate-client: ${kind} name ${JSON.stringify(from)} is not a valid TypeScript identifier; using ${JSON.stringify(to)}.\n`);
+    logger.warn(`generate-client: ${kind} name ${JSON.stringify(from)} collides with another name or is not a valid TypeScript identifier; using ${JSON.stringify(to)}.\n`);
 }
 /** Rewrite `ref`/`omit`/discriminator targets in a schema subtree via `fixRef` (mutates). */
 function rewriteRefs(schema, fixRef) {
@@ -142,6 +199,8 @@ function rewriteOperationRefs(op, fixRef) {
         rewriteRefs(p.schema, fixRef);
     for (const p of op.headerParams)
         rewriteRefs(p.schema, fixRef);
+    for (const p of op.cookieParams)
+        rewriteRefs(p.schema, fixRef);
     if (op.requestBody)
         rewriteRefs(op.requestBody.schema, fixRef);
     for (const r of [...op.successResponses, ...op.errorResponses]) {

package/lib/intermediate-representation/sanitize-identifiers.js.map

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

package/lib/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,MAAM,EAEZ,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAWhF"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,MAAM,EAGZ,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAmChF"}

package/lib/loader.js

@@ -1,10 +1,29 @@
-import { bundle, createConfig, detectSpec, } from '@redocly/openapi-core';
+import { BaseResolver, bundle, createConfig, detectSpec, lintDocument, } from '@redocly/openapi-core';
 export async function loadSpec(ref, config) {
     const cfg = config ?? (await createConfig({}));
     // We do NOT pass `dereference: true` — the IR builder needs `$ref` preserved so it can map
     // response/parameter schemas back to named `components.schemas` entries.
     // Validation (shape, OpenAPI version) is delegated to `bundle()`, which throws clear messages.
     const result = await bundle({ ref, config: cfg });
+    // `bundle()` reports unresolved $refs as problems instead of throwing, and runs NO
+    // validation rules — a structurally invalid document bundles with zero problems.
+    // Generating from either emits code that doesn't compile (or crashes the builder), so
+    // gate on both: the bundler's own problems plus a `struct` pass over the bundled
+    // document. The gate is deliberately independent of the user's lint config — their
+    // rules govern `redocly lint`, not whether the generator can trust its input.
+    const structConfig = await createConfig({ rules: { struct: 'error' } });
+    const structProblems = await lintDocument({
+        externalRefResolver: new BaseResolver(),
+        document: result.bundle,
+        config: structConfig,
+    });
+    const errors = [...result.problems, ...structProblems].filter((problem) => problem.severity === 'error');
+    if (errors.length > 0) {
+        const details = errors
+            .map((problem) => `- ${problem.message} (at ${problem.location?.[0]?.pointer ?? ref})`)
+            .join('\n');
+        throw new Error(`The API description has ${errors.length} error(s):\n${details}`);
+    }
     const parsed = result.bundle.parsed;
     return {
         document: parsed,

package/lib/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,YAAY,EACZ,UAAU,GAGX,MAAM,uBAAuB,CAAC;AAI/B,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAW,EAAE,MAAe;IACzD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,2FAA2F;IAC3F,yEAAyE;IACzE,+FAA+F;IAC/F,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,MAAmC;QAC7C,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC;KAC5B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,UAAU,EACV,YAAY,GAIb,MAAM,uBAAuB,CAAC;AAI/B,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAW,EAAE,MAAe;IACzD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,2FAA2F;IAC3F,yEAAyE;IACzE,+FAA+F;IAC/F,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAClD,mFAAmF;IACnF,iFAAiF;IACjF,sFAAsF;IACtF,iFAAiF;IACjF,mFAAmF;IACnF,8EAA8E;IAC9E,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC;QACxC,mBAAmB,EAAE,IAAI,YAAY,EAAE;QACvC,QAAQ,EAAE,MAAM,CAAC,MAAM;QACvB,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC,CAAC,MAAM,CAC3D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAC1C,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,MAAM;aACnB,GAAG,CACF,CAAC,OAA0B,EAAE,EAAE,CAC7B,KAAK,OAAO,CAAC,OAAO,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,GAAG,GAAG,CACvE;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,MAAM,eAAe,OAAO,EAAE,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,MAAmC;QAC7C,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC;KAC5B,CAAC;AACJ,CAAC"}

package/lib/plugin.d.ts

@@ -10,10 +10,4 @@ export type { CustomGenerator, GeneratedFile, Generator, GeneratorInput, Generat
 export type { ArgsStyle, ErrorMode } from './emitters/operations.js';
 export type { DateType } from './emitters/types.js';
 export type { ApiModel, NamedSchemaModel, OperationModel, ParamModel, PropertyModel, RequestBodyModel, ResponseBodyModel, ScalarKind, SchemaMetadata, SchemaModel, ServiceModel, } from './intermediate-representation/model.js';
-export { arrow, constArray, exportConstStatement, jsdoc, parseStatements, printNodes, printStatements, ts, } from './emitters/ts.js';
-export { operationSignature } from './emitters/operation-signature.js';
-export type { OperationSignature } from './emitters/operation-signature.js';
-export { schemaToTypeNode } from './emitters/types.js';
-export { pascalCase } from './emitters/support.js';
-export { safeIdent } from './emitters/identifier.js';
 //# sourceMappingURL=plugin.d.ts.map

package/lib/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAE3E;AAGD,YAAY,EACV,eAAe,EACf,aAAa,EACb,SAAS,EACT,cAAc,EACd,aAAa,EACb,UAAU,GACX,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrE,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,YAAY,EACV,QAAQ,EACR,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,wCAAwC,CAAC;AAGhD,OAAO,EACL,KAAK,EACL,UAAU,EACV,oBAAoB,EACpB,KAAK,EACL,eAAe,EACf,UAAU,EACV,eAAe,EACf,EAAE,GACH,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,YAAY,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAE3E;AAGD,YAAY,EACV,eAAe,EACf,aAAa,EACb,SAAS,EACT,cAAc,EACd,aAAa,EACb,UAAU,GACX,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrE,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,YAAY,EACV,QAAQ,EACR,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,wCAAwC,CAAC"}

package/lib/plugin.js

@@ -1,7 +1,7 @@
 // The custom-generator authoring API — the EXPERIMENTAL plugin surface, re-exported from the
 // package root (`@redocly/client-generator`).
 //
-// ⚠️ Experimental: this surface (the IR types and the codegen toolkit re-exported here) may change
+// ⚠️ Experimental: this surface (the IR types and the emit toolkit re-exported here) may change
 // between minor versions until it is stabilized. Pin your version if you depend on it.
 //
 // A custom generator is `(GeneratorInput) => GeneratedFile[]` plus a `name`; select it in
@@ -12,7 +12,9 @@
 // libraries are peers of the consumer's app, never of the client.
 //
 //   // my-generator.ts
-//   import { defineGenerator, ts, printStatements } from '@redocly/client-generator';
+//   import { defineGenerator } from '@redocly/client-generator';
+//   // AST toolkit, when string-building isn't enough:
+//   // import { ts, printStatements } from '@redocly/client-generator/generate';
 //   export default defineGenerator({
 //     name: 'route-map',
 //     requires: ['sdk'],
@@ -32,10 +34,7 @@
 export function defineGenerator(generator) {
     return generator;
 }
-// --- Codegen toolkit: build TypeScript the same way the built-in generators do -----------------
-export { arrow, constArray, exportConstStatement, jsdoc, parseStatements, printNodes, printStatements, ts, } from './emitters/ts.js';
-export { operationSignature } from './emitters/operation-signature.js';
-export { schemaToTypeNode } from './emitters/types.js';
-export { pascalCase } from './emitters/support.js';
-export { safeIdent } from './emitters/identifier.js';
+// The TypeScript-emitting toolkit (`ts`, `printStatements`, `operationSignature`, …) is
+// exported from `@redocly/client-generator/generate` — it loads `typescript`, which the
+// runtime-only package root must not reach statically.
 //# sourceMappingURL=plugin.js.map

package/lib/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,8CAA8C;AAC9C,EAAE;AACF,mGAAmG;AACnG,uFAAuF;AACvF,EAAE;AACF,0FAA0F;AAC1F,iGAAiG;AACjG,qGAAqG;AACrG,oGAAoG;AACpG,oGAAoG;AACpG,kEAAkE;AAClE,EAAE;AACF,uBAAuB;AACvB,sFAAsF;AACtF,qCAAqC;AACrC,yBAAyB;AACzB,yBAAyB;AACzB,mCAAmC;AACnC,mEAAmE;AACnE,6FAA6F;AAC7F,mEAAmE;AACnE,mFAAmF;AACnF,SAAS;AACT,QAAQ;AAIR;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,SAA0B;IACxD,OAAO,SAAS,CAAC;AACnB,CAAC;AA6BD,kGAAkG;AAClG,OAAO,EACL,KAAK,EACL,UAAU,EACV,oBAAoB,EACpB,KAAK,EACL,eAAe,EACf,UAAU,EACV,eAAe,EACf,EAAE,GACH,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,8CAA8C;AAC9C,EAAE;AACF,gGAAgG;AAChG,uFAAuF;AACvF,EAAE;AACF,0FAA0F;AAC1F,iGAAiG;AACjG,qGAAqG;AACrG,oGAAoG;AACpG,oGAAoG;AACpG,kEAAkE;AAClE,EAAE;AACF,uBAAuB;AACvB,iEAAiE;AACjE,uDAAuD;AACvD,iFAAiF;AACjF,qCAAqC;AACrC,yBAAyB;AACzB,yBAAyB;AACzB,mCAAmC;AACnC,mEAAmE;AACnE,6FAA6F;AAC7F,mEAAmE;AACnE,mFAAmF;AACnF,SAAS;AACT,QAAQ;AAIR;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,SAA0B;IACxD,OAAO,SAAS,CAAC;AACnB,CAAC;AA6BD,wFAAwF;AACxF,wFAAwF;AACxF,uDAAuD"}

package/lib/runtime/create-client.d.ts

@@ -17,13 +17,24 @@ export type Capabilities = SendCapabilities & {
     paginate?: {
         pages: (call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>, spec: PaginationSpec, args?: OperationArgs, init?: RequestOptions) => AsyncGenerator<unknown>;
         items: (call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>, spec: PaginationSpec, args?: OperationArgs, init?: RequestOptions) => AsyncGenerator<unknown>;
+        pagesByLink: (call: (args?: OperationArgs, init?: RequestOptions) => Promise<{
+            page: unknown;
+            linkHeader: string | null;
+            url: string;
+        }>, args?: OperationArgs, init?: RequestOptions) => AsyncGenerator<unknown>;
+        itemsByLink: (call: (args?: OperationArgs, init?: RequestOptions) => Promise<{
+            page: unknown;
+            linkHeader: string | null;
+            url: string;
+        }>, spec: PaginationSpec, args?: OperationArgs, init?: RequestOptions) => AsyncGenerator<unknown>;
     };
 };
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers`/`cookies` slots. */
 export type OperationArgs = {
     params?: Record<string, QueryValue>;
     body?: unknown;
     headers?: Record<string, unknown>;
+    cookies?: Record<string, unknown>;
 } & Record<string, unknown>;
 /**
  * Build a typed instance client over operation descriptors: one real bound method per

package/lib/runtime/create-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../../src/runtime/create-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyC,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACzF,OAAO,KAAK,EAEV,MAAM,EACN,YAAY,EAEZ,gBAAgB,EAChB,mBAAmB,EACnB,QAAQ,EACR,cAAc,EAEd,UAAU,EACV,cAAc,EACd,YAAY,EACZ,eAAe,EACf,UAAU,EAEX,MAAM,YAAY,CAAC;AAGpB;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,gBAAgB,GAAG;IAC5C,WAAW,CAAC,EAAE,CACZ,QAAQ,EAAE,SAAS,CAAC,SAAS,YAAY,EAAE,CAAC,EAAE,EAC9C,MAAM,EAAE,YAAY,KACjB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC,CAAC;IACjF,GAAG,CAAC,EAAE,CACJ,MAAM,EAAE,YAAY,EACpB,EAAE,EAAE,gBAAgB,EAGpB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,EACzD,QAAQ,EAAE,MAAM,GAAG,MAAM,KACtB,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,QAAQ,CAAC,EAAE;QACT,KAAK,EAAE,CACL,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,EACvE,IAAI,EAAE,cAAc,EACpB,IAAI,CAAC,EAAE,aAAa,EACpB,IAAI,CAAC,EAAE,cAAc,KAClB,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7B,KAAK,EAAE,CACL,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,EACvE,IAAI,EAAE,cAAc,EACpB,IAAI,CAAC,EAAE,aAAa,EACpB,IAAI,CAAC,EAAE,cAAc,KAClB,cAAc,CAAC,OAAO,CAAC,CAAC;KAC9B,CAAC;CACH,CAAC;AAEF,iGAAiG;AACjG,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACpC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAuK5B;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,SAAS,QAAQ,EACpB,EAAE,SAAS,MAAM,GAAG,MAAM,EAC1B,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,GAAG,SAAS,MAAM,GAAG,MAAM,EAE3B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC/C,OAAO,GAAE,YAAY,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAM,EAC3D,IAAI,GAAE,YAAiB,GACtB,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAoF9C"}
+{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../../src/runtime/create-client.ts"],"names":[],"mappings":"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"}