@remkoj/optimizely-cms-api 6.0.0-pre8 → 6.0.0-rc.1

package/dist/client/client/{utils.d.ts → utils.gen.d.ts}

@@ -1,6 +1,6 @@
-import type { QuerySerializer, QuerySerializerOptions } from '../core/bodySerializer';
-import type { Client, ClientOptions, Config, RequestOptions } from './types';
-export declare const createQuerySerializer: <T = unknown>({ allowReserved, array, object, }?: QuerySerializerOptions) => (queryParams: T) => string;
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+export declare const createQuerySerializer: <T = unknown>({ parameters, ...args }?: QuerySerializerOptions) => (queryParams: T) => string;
 /**
  * Infers parseAs value from provided Content-Type header.
  */
@@ -9,37 +9,25 @@ export declare const setAuthParams: ({ security, ...options }: Pick<Required<Req
     headers: Headers;
 }) => Promise<void>;
 export declare const buildUrl: Client['buildUrl'];
-export declare const getUrl: ({ baseUrl, path, query, querySerializer, url: _url, }: {
-    baseUrl?: string;
-    path?: Record<string, unknown>;
-    query?: Record<string, unknown>;
-    querySerializer: QuerySerializer;
-    url: string;
-}) => string;
 export declare const mergeConfigs: (a: Config, b: Config) => Config;
 export declare const mergeHeaders: (...headers: Array<Required<Config>["headers"] | undefined>) => Headers;
 type ErrInterceptor<Err, Res, Req, Options> = (error: Err, response: Res, request: Req, options: Options) => Err | Promise<Err>;
 type ReqInterceptor<Req, Options> = (request: Req, options: Options) => Req | Promise<Req>;
 type ResInterceptor<Res, Req, Options> = (response: Res, request: Req, options: Options) => Res | Promise<Res>;
 declare class Interceptors<Interceptor> {
-    _fns: (Interceptor | null)[];
-    constructor();
+    fns: Array<Interceptor | null>;
     clear(): void;
-    getInterceptorIndex(id: number | Interceptor): number;
-    exists(id: number | Interceptor): boolean;
     eject(id: number | Interceptor): void;
-    update(id: number | Interceptor, fn: Interceptor): number | false | Interceptor;
+    exists(id: number | Interceptor): boolean;
+    getInterceptorIndex(id: number | Interceptor): number;
+    update(id: number | Interceptor, fn: Interceptor): number | Interceptor | false;
     use(fn: Interceptor): number;
 }
 export interface Middleware<Req, Res, Err, Options> {
-    error: Pick<Interceptors<ErrInterceptor<Err, Res, Req, Options>>, 'eject' | 'use'>;
-    request: Pick<Interceptors<ReqInterceptor<Req, Options>>, 'eject' | 'use'>;
-    response: Pick<Interceptors<ResInterceptor<Res, Req, Options>>, 'eject' | 'use'>;
-}
-export declare const createInterceptors: <Req, Res, Err, Options>() => {
     error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
     request: Interceptors<ReqInterceptor<Req, Options>>;
     response: Interceptors<ResInterceptor<Res, Req, Options>>;
-};
+}
+export declare const createInterceptors: <Req, Res, Err, Options>() => Middleware<Req, Res, Err, Options>;
 export declare const createConfig: <T extends ClientOptions = ClientOptions>(override?: Config<Omit<ClientOptions, keyof T> & T>) => Config<Omit<ClientOptions, keyof T> & T>;
 export {};

package/dist/client/client/{utils.js → utils.gen.js}

@@ -1,62 +1,12 @@
 "use strict";
+// This file is auto-generated by @hey-api/openapi-ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfig = exports.createInterceptors = exports.mergeHeaders = exports.mergeConfigs = exports.getUrl = exports.buildUrl = exports.setAuthParams = exports.getParseAs = exports.createQuerySerializer = void 0;
-const auth_1 = require("../core/auth");
-const bodySerializer_1 = require("../core/bodySerializer");
-const pathSerializer_1 = require("../core/pathSerializer");
-const PATH_PARAM_RE = /\{[^{}]+\}/g;
-const defaultPathSerializer = ({ path, url: _url }) => {
-    let url = _url;
-    const matches = _url.match(PATH_PARAM_RE);
-    if (matches) {
-        for (const match of matches) {
-            let explode = false;
-            let name = match.substring(1, match.length - 1);
-            let style = 'simple';
-            if (name.endsWith('*')) {
-                explode = true;
-                name = name.substring(0, name.length - 1);
-            }
-            if (name.startsWith('.')) {
-                name = name.substring(1);
-                style = 'label';
-            }
-            else if (name.startsWith(';')) {
-                name = name.substring(1);
-                style = 'matrix';
-            }
-            const value = path[name];
-            if (value === undefined || value === null) {
-                continue;
-            }
-            if (Array.isArray(value)) {
-                url = url.replace(match, (0, pathSerializer_1.serializeArrayParam)({ explode, name, style, value }));
-                continue;
-            }
-            if (typeof value === 'object') {
-                url = url.replace(match, (0, pathSerializer_1.serializeObjectParam)({
-                    explode,
-                    name,
-                    style,
-                    value: value,
-                    valueOnly: true,
-                }));
-                continue;
-            }
-            if (style === 'matrix') {
-                url = url.replace(match, `;${(0, pathSerializer_1.serializePrimitiveParam)({
-                    name,
-                    value: value,
-                })}`);
-                continue;
-            }
-            const replaceValue = encodeURIComponent(style === 'label' ? `.${value}` : value);
-            url = url.replace(match, replaceValue);
-        }
-    }
-    return url;
-};
-const createQuerySerializer = ({ allowReserved, array, object, } = {}) => {
+exports.createConfig = exports.createInterceptors = exports.mergeHeaders = exports.mergeConfigs = exports.buildUrl = exports.setAuthParams = exports.getParseAs = exports.createQuerySerializer = void 0;
+const auth_gen_1 = require("../core/auth.gen");
+const bodySerializer_gen_1 = require("../core/bodySerializer.gen");
+const pathSerializer_gen_1 = require("../core/pathSerializer.gen");
+const utils_gen_1 = require("../core/utils.gen");
+const createQuerySerializer = ({ parameters = {}, ...args } = {}) => {
     const querySerializer = (queryParams) => {
         const search = [];
         if (queryParams && typeof queryParams === 'object') {
@@ -65,33 +15,34 @@ const createQuerySerializer = ({ allowReserved, array, object, } = {}) => {
                 if (value === undefined || value === null) {
                     continue;
                 }
+                const options = parameters[name] || args;
                 if (Array.isArray(value)) {
-                    const serializedArray = (0, pathSerializer_1.serializeArrayParam)({
-                        allowReserved,
+                    const serializedArray = (0, pathSerializer_gen_1.serializeArrayParam)({
+                        allowReserved: options.allowReserved,
                         explode: true,
                         name,
                         style: 'form',
                         value,
-                        ...array,
+                        ...options.array,
                     });
                     if (serializedArray)
                         search.push(serializedArray);
                 }
                 else if (typeof value === 'object') {
-                    const serializedObject = (0, pathSerializer_1.serializeObjectParam)({
-                        allowReserved,
+                    const serializedObject = (0, pathSerializer_gen_1.serializeObjectParam)({
+                        allowReserved: options.allowReserved,
                         explode: true,
                         name,
                         style: 'deepObject',
                         value: value,
-                        ...object,
+                        ...options.object,
                     });
                     if (serializedObject)
                         search.push(serializedObject);
                 }
                 else {
-                    const serializedPrimitive = (0, pathSerializer_1.serializePrimitiveParam)({
-                        allowReserved,
+                    const serializedPrimitive = (0, pathSerializer_gen_1.serializePrimitiveParam)({
+                        allowReserved: options.allowReserved,
                         name,
                         value: value,
                     });
@@ -118,8 +69,7 @@ const getParseAs = (contentType) => {
     if (!cleanContent) {
         return;
     }
-    if (cleanContent.startsWith('application/json') ||
-        cleanContent.endsWith('+json')) {
+    if (cleanContent.startsWith('application/json') || cleanContent.endsWith('+json')) {
         return 'json';
     }
     if (cleanContent === 'multipart/form-data') {
@@ -134,9 +84,23 @@ const getParseAs = (contentType) => {
     return;
 };
 exports.getParseAs = getParseAs;
+const checkForExistence = (options, name) => {
+    if (!name) {
+        return false;
+    }
+    if (options.headers.has(name) ||
+        options.query?.[name] ||
+        options.headers.get('Cookie')?.includes(`${name}=`)) {
+        return true;
+    }
+    return false;
+};
 const setAuthParams = async ({ security, ...options }) => {
     for (const auth of security) {
-        const token = await (0, auth_1.getAuthToken)(auth, options.auth);
+        if (checkForExistence(options, auth.name)) {
+            continue;
+        }
+        const token = await (0, auth_gen_1.getAuthToken)(auth, options.auth);
         if (!token) {
             continue;
         }
@@ -156,39 +120,19 @@ const setAuthParams = async ({ security, ...options }) => {
                 options.headers.set(name, token);
                 break;
         }
-        return;
     }
 };
 exports.setAuthParams = setAuthParams;
-const buildUrl = (options) => {
-    const url = (0, exports.getUrl)({
-        baseUrl: options.baseUrl,
-        path: options.path,
-        query: options.query,
-        querySerializer: typeof options.querySerializer === 'function'
-            ? options.querySerializer
-            : (0, exports.createQuerySerializer)(options.querySerializer),
-        url: options.url,
-    });
-    return url;
-};
+const buildUrl = (options) => (0, utils_gen_1.getUrl)({
+    baseUrl: options.baseUrl,
+    path: options.path,
+    query: options.query,
+    querySerializer: typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : (0, exports.createQuerySerializer)(options.querySerializer),
+    url: options.url,
+});
 exports.buildUrl = buildUrl;
-const getUrl = ({ baseUrl, path, query, querySerializer, url: _url, }) => {
-    const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
-    let url = (baseUrl ?? '') + pathUrl;
-    if (path) {
-        url = defaultPathSerializer({ path, url });
-    }
-    let search = query ? querySerializer(query) : '';
-    if (search.startsWith('?')) {
-        search = search.substring(1);
-    }
-    if (search) {
-        url += `?${search}`;
-    }
-    return url;
-};
-exports.getUrl = getUrl;
 const mergeConfigs = (a, b) => {
     const config = { ...a, ...b };
     if (config.baseUrl?.endsWith('/')) {
@@ -198,13 +142,20 @@ const mergeConfigs = (a, b) => {
     return config;
 };
 exports.mergeConfigs = mergeConfigs;
+const headersEntries = (headers) => {
+    const entries = [];
+    headers.forEach((value, key) => {
+        entries.push([key, value]);
+    });
+    return entries;
+};
 const mergeHeaders = (...headers) => {
     const mergedHeaders = new Headers();
     for (const header of headers) {
-        if (!header || typeof header !== 'object') {
+        if (!header) {
             continue;
         }
-        const iterator = header instanceof Headers ? header.entries() : Object.entries(header);
+        const iterator = header instanceof Headers ? headersEntries(header) : Object.entries(header);
         for (const [key, value] of iterator) {
             if (value === null) {
                 mergedHeaders.delete(key);
@@ -225,47 +176,39 @@ const mergeHeaders = (...headers) => {
 };
 exports.mergeHeaders = mergeHeaders;
 class Interceptors {
-    _fns;
-    constructor() {
-        this._fns = [];
-    }
+    fns = [];
     clear() {
-        this._fns = [];
+        this.fns = [];
     }
-    getInterceptorIndex(id) {
-        if (typeof id === 'number') {
-            return this._fns[id] ? id : -1;
-        }
-        else {
-            return this._fns.indexOf(id);
+    eject(id) {
+        const index = this.getInterceptorIndex(id);
+        if (this.fns[index]) {
+            this.fns[index] = null;
         }
     }
     exists(id) {
         const index = this.getInterceptorIndex(id);
-        return !!this._fns[index];
+        return Boolean(this.fns[index]);
     }
-    eject(id) {
-        const index = this.getInterceptorIndex(id);
-        if (this._fns[index]) {
-            this._fns[index] = null;
+    getInterceptorIndex(id) {
+        if (typeof id === 'number') {
+            return this.fns[id] ? id : -1;
         }
+        return this.fns.indexOf(id);
     }
     update(id, fn) {
         const index = this.getInterceptorIndex(id);
-        if (this._fns[index]) {
-            this._fns[index] = fn;
+        if (this.fns[index]) {
+            this.fns[index] = fn;
             return id;
         }
-        else {
-            return false;
-        }
+        return false;
     }
     use(fn) {
-        this._fns = [...this._fns, fn];
-        return this._fns.length - 1;
+        this.fns.push(fn);
+        return this.fns.length - 1;
     }
 }
-// do not add `Middleware` as return type so we can use _fns internally
 const createInterceptors = () => ({
     error: new Interceptors(),
     request: new Interceptors(),
@@ -287,7 +230,7 @@ const defaultHeaders = {
     'Content-Type': 'application/json',
 };
 const createConfig = (override = {}) => ({
-    ...bodySerializer_1.jsonBodySerializer,
+    ...bodySerializer_gen_1.jsonBodySerializer,
     headers: defaultHeaders,
     parseAs: 'auto',
     querySerializer: defaultQuerySerializer,

package/dist/client/client.gen.d.ts

@@ -1,5 +1,5 @@
-import type { ClientOptions } from './types.gen';
-import { type Config, type ClientOptions as DefaultClientOptions } from './client';
+import { type ClientOptions, type Config } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
 /**
  * The `createClientConfig()` function will be called on client initialization
  * and the returned object will become the client's initial configuration.
@@ -8,5 +8,5 @@ import { type Config, type ClientOptions as DefaultClientOptions } from './clien
  * `setConfig()`. This is useful for example if you're using Next.js
  * to ensure your client always has the correct values.
  */
-export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
 export declare const client: import("./client").Client;

package/dist/client/client.gen.js

@@ -2,8 +2,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.client = void 0;
-const client_1 = require("./client");
 const client_config_1 = require("../client-config");
-exports.client = (0, client_1.createClient)((0, client_config_1.createClientConfig)((0, client_1.createConfig)({
-    baseUrl: '/_cms/preview2'
-})));
+const client_1 = require("./client");
+exports.client = (0, client_1.createClient)((0, client_config_1.createClientConfig)((0, client_1.createConfig)({ baseUrl: 'https://api.cms.optimizely.com/preview3' })));

package/dist/client/core/{auth.js → auth.gen.js}

@@ -1,4 +1,5 @@
 "use strict";
+// This file is auto-generated by @hey-api/openapi-ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAuthToken = void 0;
 const getAuthToken = async (auth, callback) => {

package/dist/client/core/bodySerializer.gen.d.ts

@@ -0,0 +1,25 @@
+import type { ArrayStyle, ObjectStyle, SerializerOptions } from './pathSerializer.gen';
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+export type BodySerializer = (body: unknown) => unknown;
+type QuerySerializerOptionsObject = {
+    allowReserved?: boolean;
+    array?: Partial<SerializerOptions<ArrayStyle>>;
+    object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+    /**
+     * Per-parameter serialization overrides. When provided, these settings
+     * override the global array/object settings for specific parameter names.
+     */
+    parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+export declare const formDataBodySerializer: {
+    bodySerializer: (body: unknown) => FormData;
+};
+export declare const jsonBodySerializer: {
+    bodySerializer: (body: unknown) => string;
+};
+export declare const urlSearchParamsBodySerializer: {
+    bodySerializer: (body: unknown) => string;
+};
+export {};

package/dist/client/core/{bodySerializer.js → bodySerializer.gen.js}

@@ -1,10 +1,14 @@
 "use strict";
+// This file is auto-generated by @hey-api/openapi-ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.urlSearchParamsBodySerializer = exports.jsonBodySerializer = exports.formDataBodySerializer = void 0;
 const serializeFormDataPair = (data, key, value) => {
     if (typeof value === 'string' || value instanceof Blob) {
         data.append(key, value);
     }
+    else if (value instanceof Date) {
+        data.append(key, value.toISOString());
+    }
     else {
         data.append(key, JSON.stringify(value));
     }
@@ -35,7 +39,7 @@ exports.formDataBodySerializer = {
     },
 };
 exports.jsonBodySerializer = {
-    bodySerializer: (body) => JSON.stringify(body, (_key, value) => typeof value === 'bigint' ? value.toString() : value),
+    bodySerializer: (body) => JSON.stringify(body, (_key, value) => (typeof value === 'bigint' ? value.toString() : value)),
 };
 exports.urlSearchParamsBodySerializer = {
     bodySerializer: (body) => {

package/dist/client/core/{params.d.ts → params.gen.d.ts}

@@ -1,12 +1,32 @@
 type Slot = 'body' | 'headers' | 'path' | 'query';
 export type Field = {
     in: Exclude<Slot, 'body'>;
+    /**
+     * Field name. This is the name we want the user to see and use.
+     */
     key: string;
+    /**
+     * Field mapped name. This is the name we want to use in the request.
+     * If omitted, we use the same value as `key`.
+     */
     map?: string;
 } | {
     in: Extract<Slot, 'body'>;
+    /**
+     * Key isn't required for bodies.
+     */
     key?: string;
     map?: string;
+} | {
+    /**
+     * Field name. This is the name we want the user to see and use.
+     */
+    key: string;
+    /**
+     * Field mapped name. This is the name we want to use in the request.
+     * If `in` is omitted, `map` aliases `key` to the transport layer.
+     */
+    map: Slot;
 };
 export interface Fields {
     allowExtra?: Partial<Record<Slot, boolean>>;

package/dist/client/core/{params.js → params.gen.js}

@@ -1,4 +1,5 @@
 "use strict";
+// This file is auto-generated by @hey-api/openapi-ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildClientParams = void 0;
 const extraPrefixesMap = {
@@ -21,6 +22,11 @@ const buildKeyMap = (fields, map) => {
                 });
             }
         }
+        else if ('key' in config) {
+            map.set(config.key, {
+                map: config.map,
+            });
+        }
         else if (config.args) {
             buildKeyMap(config.args, map);
         }
@@ -29,7 +35,7 @@ const buildKeyMap = (fields, map) => {
 };
 const stripEmptySlots = (params) => {
     for (const [slot, value] of Object.entries(params)) {
-        if (value && typeof value === 'object' && !Object.keys(value).length) {
+        if (value && typeof value === 'object' && !Array.isArray(value) && !Object.keys(value).length) {
             delete params[slot];
         }
     }
@@ -54,7 +60,9 @@ const buildClientParams = (args, fields) => {
             if (config.key) {
                 const field = map.get(config.key);
                 const name = field.map || config.key;
-                params[field.in][name] = arg;
+                if (field.in) {
+                    params[field.in][name] = arg;
+                }
             }
             else {
                 params.body = arg;
@@ -64,8 +72,13 @@ const buildClientParams = (args, fields) => {
             for (const [key, value] of Object.entries(arg ?? {})) {
                 const field = map.get(key);
                 if (field) {
-                    const name = field.map || key;
-                    params[field.in][name] = value;
+                    if (field.in) {
+                        const name = field.map || key;
+                        params[field.in][name] = value;
+                    }
+                    else {
+                        params[field.map] = value;
+                    }
                 }
                 else {
                     const extra = extraPrefixes.find(([prefix]) => key.startsWith(prefix));
@@ -73,8 +86,8 @@ const buildClientParams = (args, fields) => {
                         const [prefix, slot] = extra;
                         params[slot][key.slice(prefix.length)] = value;
                     }
-                    else {
-                        for (const [slot, allowed] of Object.entries(config.allowExtra ?? {})) {
+                    else if ('allowExtra' in config && config.allowExtra) {
+                        for (const [slot, allowed] of Object.entries(config.allowExtra)) {
                             if (allowed) {
                                 params[slot][key] = value;
                                 break;

package/dist/client/core/{pathSerializer.js → pathSerializer.gen.js}

@@ -1,4 +1,5 @@
 "use strict";
+// This file is auto-generated by @hey-api/openapi-ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeObjectParam = exports.serializePrimitiveParam = exports.serializeArrayParam = exports.separatorObjectExplode = exports.separatorArrayNoExplode = exports.separatorArrayExplode = void 0;
 const separatorArrayExplode = (style) => {
@@ -67,9 +68,7 @@ const serializeArrayParam = ({ allowReserved, explode, name, style, value, }) =>
         });
     })
         .join(separator);
-    return style === 'label' || style === 'matrix'
-        ? separator + joinedValues
-        : joinedValues;
+    return style === 'label' || style === 'matrix' ? separator + joinedValues : joinedValues;
 };
 exports.serializeArrayParam = serializeArrayParam;
 const serializePrimitiveParam = ({ allowReserved, name, value, }) => {
@@ -89,11 +88,7 @@ const serializeObjectParam = ({ allowReserved, explode, name, style, value, valu
     if (style !== 'deepObject' && !explode) {
         let values = [];
         Object.entries(value).forEach(([key, v]) => {
-            values = [
-                ...values,
-                key,
-                allowReserved ? v : encodeURIComponent(v),
-            ];
+            values = [...values, key, allowReserved ? v : encodeURIComponent(v)];
         });
         const joinedValues = values.join(',');
         switch (style) {
@@ -115,8 +110,6 @@ const serializeObjectParam = ({ allowReserved, explode, name, style, value, valu
         value: v,
     }))
         .join(separator);
-    return style === 'label' || style === 'matrix'
-        ? separator + joinedValues
-        : joinedValues;
+    return style === 'label' || style === 'matrix' ? separator + joinedValues : joinedValues;
 };
 exports.serializeObjectParam = serializeObjectParam;

package/dist/client/core/queryKeySerializer.gen.d.ts

@@ -0,0 +1,18 @@
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue = null | string | number | boolean | JsonValue[] | {
+    [key: string]: JsonValue;
+};
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export declare const queryKeyJsonReplacer: (_key: string, value: unknown) => {} | null | undefined;
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export declare const stringifyToJsonValue: (input: unknown) => JsonValue | undefined;
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export declare const serializeQueryKeyValue: (value: unknown) => JsonValue | undefined;