@cms0/cms0 0.2.3 → 0.2.4

package/dist/esm/index.js

@@ -1,9 +1,6 @@
 import { schemaDescriptor } from "@cms0/cms0/schema-descriptors";
 import { buildZodSchemasFromDescriptor, } from "@cms0/shared";
-const DEFAULT_REQUEST_CONCURRENCY = 6;
-const DEFAULT_REQUEST_RETRIES = 3;
-const DEFAULT_REQUEST_RETRY_BASE_MS = 250;
-const DEFAULT_REQUEST_RETRY_MAX_MS = 4000;
+import { getCustomInlineTypeMetadata } from "./custom-types/registry.js";
 const DEFAULT_MODEL_NORMALIZATION_CONCURRENCY = 8;
 const COLLECTION_SHAPE_ERROR = "Invalid collection response. Expected array or { items, total }.";
 function normalizeUploadsPath(uploadsPath) {
@@ -64,310 +61,6 @@ function maybeAttachAssetUrl(value, assetUrlBuilder) {
         url: existingUrl ?? assetUrlBuilder(filename),
     };
 }
-function toPlainText(value) {
-    if (typeof value === "string")
-        return value;
-    if (typeof value === "number" || typeof value === "boolean")
-        return String(value);
-    if (!value || typeof value !== "object")
-        return "";
-    const node = value;
-    if (typeof node.text === "string")
-        return node.text;
-    if ("value" in node)
-        return toPlainText(node.value);
-    if (Array.isArray(node.content)) {
-        return node.content
-            .map((child) => toPlainText(child))
-            .filter(Boolean)
-            .join(" ")
-            .trim();
-    }
-    return "";
-}
-function coerceRichTextValue(value) {
-    const source = value && typeof value === "object" ? value : {};
-    const nested = source.value && typeof source.value === "object"
-        ? source.value
-        : null;
-    const normalizedValue = source.value !== undefined ? source.value : value ?? {};
-    const html = typeof source.html === "string"
-        ? source.html
-        : typeof nested?.html === "string"
-            ? nested.html
-            : "";
-    return {
-        value: normalizedValue ?? {},
-        html,
-    };
-}
-function normalizeLocaleTag(value) {
-    return typeof value === "string" ? value.trim() : "";
-}
-function normalizeLocalizedMap(source, normalizeValue) {
-    const record = source && typeof source === "object" ? source : {};
-    const localesSource = record.locales && typeof record.locales === "object" && !Array.isArray(record.locales)
-        ? record.locales
-        : {};
-    const locales = {};
-    for (const [locale, raw] of Object.entries(localesSource)) {
-        const localeKey = normalizeLocaleTag(locale);
-        if (!localeKey)
-            continue;
-        locales[localeKey] = normalizeValue(raw);
-    }
-    const explicitDefault = normalizeLocaleTag(record.defaultLocale);
-    const firstLocale = Object.keys(locales)[0] ?? "";
-    const defaultLocale = explicitDefault || firstLocale;
-    return { defaultLocale, locales };
-}
-function projectLocalizedByLocale(localized, locale) {
-    if (!locale || locale === "all")
-        return localized;
-    const requested = normalizeLocaleTag(locale);
-    if (!requested)
-        return localized;
-    const requestedValue = localized.locales[requested];
-    if (requestedValue === undefined) {
-        return {
-            defaultLocale: requested,
-            locales: {},
-        };
-    }
-    return {
-        defaultLocale: requested,
-        locales: {
-            [requested]: requestedValue,
-        },
-    };
-}
-function coerceLocalizedStringValue(value, locale, defaultLocale) {
-    const normalized = normalizeLocalizedMap(value, (entry) => toPlainText(entry));
-    if (!normalized.defaultLocale && defaultLocale) {
-        normalized.defaultLocale = defaultLocale;
-    }
-    return projectLocalizedByLocale(normalized, locale);
-}
-function coerceLocalizedRichTextValue(value, locale, defaultLocale) {
-    const normalized = normalizeLocalizedMap(value, (entry) => coerceRichTextValue(entry));
-    if (!normalized.defaultLocale && defaultLocale) {
-        normalized.defaultLocale = defaultLocale;
-    }
-    return projectLocalizedByLocale(normalized, locale);
-}
-function coerceCustomTypeValue(descriptor, value, options) {
-    const customType = descriptor.customType;
-    if (!customType)
-        return value;
-    if (customType === "RichText")
-        return coerceRichTextValue(value);
-    if (customType === "File" || customType === "Image" || customType === "Video") {
-        return maybeAttachAssetUrl(value, options?.assetUrlBuilder ?? ((filename) => filename));
-    }
-    if (customType === "LocalizedString") {
-        return coerceLocalizedStringValue(value, options?.locale, options?.defaultLocale);
-    }
-    if (customType === "LocalizedRichText") {
-        return coerceLocalizedRichTextValue(value, options?.locale, options?.defaultLocale);
-    }
-    return value;
-}
-function isPrimitiveDescriptor(desc) {
-    return desc.kind === "primitive";
-}
-function isModelRefDescriptor(desc) {
-    return desc.kind === "modelRef";
-}
-function isObjectDescriptor(desc) {
-    return desc.type === "object" && !!desc.properties;
-}
-function isArrayDescriptor(desc) {
-    return desc.type === "array" && !!desc.items;
-}
-function asModelObjectDescriptor(modelName, descriptor) {
-    const model = descriptor.models?.[modelName];
-    if (!model) {
-        throw new Error(`Unknown model '${modelName}' in schema descriptor.`);
-    }
-    return {
-        type: "object",
-        properties: model.properties,
-        optional: false,
-        nullable: false,
-    };
-}
-function normalizeBaseUrl(baseUrl) {
-    const cleaned = baseUrl?.trim().replace(/\/$/, "") ?? "";
-    if (!cleaned) {
-        throw new Error("cms0: apiConfig.baseUrl is required to consume API resources.");
-    }
-    return cleaned;
-}
-function resolveIncludeIdMode(includeId) {
-    if (includeId === true)
-        return "all";
-    if (includeId === false)
-        return "none";
-    return "collections";
-}
-function shouldIncludeObjectId(mode, isCollectionItem) {
-    if (mode === "all")
-        return true;
-    if (mode === "collections")
-        return isCollectionItem;
-    return false;
-}
-function buildSearchParams(query) {
-    const params = new URLSearchParams();
-    if (!query)
-        return params;
-    for (const [key, rawValue] of Object.entries(query)) {
-        if (rawValue === undefined || rawValue === null)
-            continue;
-        if (Array.isArray(rawValue)) {
-            rawValue.forEach((value) => {
-                if (value === undefined || value === null)
-                    return;
-                params.append(key, String(value));
-            });
-            continue;
-        }
-        params.set(key, String(rawValue));
-    }
-    return params;
-}
-function ensureCollectionEnvelope(data, path) {
-    if (Array.isArray(data)) {
-        return { items: data, total: data.length };
-    }
-    if (data && typeof data === "object" && Array.isArray(data.items)) {
-        return {
-            items: data.items,
-            total: Number(data.total ?? data.items.length ?? 0),
-        };
-    }
-    throw new Error(`${COLLECTION_SHAPE_ERROR} Path: '${path}'.`);
-}
-function clampInteger(value, fallback, minimum) {
-    if (!Number.isFinite(value))
-        return fallback;
-    const normalized = Math.floor(value);
-    return normalized >= minimum ? normalized : fallback;
-}
-function normalizeRequestOptions(options) {
-    const concurrency = clampInteger(options?.concurrency, DEFAULT_REQUEST_CONCURRENCY, 1);
-    const retries = clampInteger(options?.retries, DEFAULT_REQUEST_RETRIES, 0);
-    const baseDelayMs = clampInteger(options?.retryBaseMs, DEFAULT_REQUEST_RETRY_BASE_MS, 1);
-    const maxDelayCandidate = clampInteger(options?.retryMaxMs, DEFAULT_REQUEST_RETRY_MAX_MS, 1);
-    const maxDelayMs = Math.max(maxDelayCandidate, baseDelayMs);
-    const modelNormalizationConcurrency = Math.max(concurrency, DEFAULT_MODEL_NORMALIZATION_CONCURRENCY);
-    return {
-        concurrency,
-        retry: {
-            retries,
-            baseDelayMs,
-            maxDelayMs,
-        },
-        modelNormalizationConcurrency,
-    };
-}
-function createAbortError() {
-    const error = new Error("The operation was aborted.");
-    error.name = "AbortError";
-    return error;
-}
-function isAbortError(error) {
-    return !!error && typeof error === "object" && error.name === "AbortError";
-}
-function waitForDelay(ms, signal) {
-    if (!Number.isFinite(ms) || ms <= 0) {
-        if (signal?.aborted)
-            return Promise.reject(createAbortError());
-        return Promise.resolve();
-    }
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(createAbortError());
-            return;
-        }
-        const timer = setTimeout(() => {
-            signal?.removeEventListener("abort", onAbort);
-            resolve();
-        }, ms);
-        function onAbort() {
-            clearTimeout(timer);
-            signal?.removeEventListener("abort", onAbort);
-            reject(createAbortError());
-        }
-        signal?.addEventListener("abort", onAbort, { once: true });
-    });
-}
-function parseRetryAfterMs(retryAfterValue) {
-    if (!retryAfterValue)
-        return null;
-    const value = retryAfterValue.trim();
-    if (!value)
-        return null;
-    const seconds = Number(value);
-    if (Number.isFinite(seconds)) {
-        return Math.max(0, Math.round(seconds * 1000));
-    }
-    const at = Date.parse(value);
-    if (Number.isNaN(at))
-        return null;
-    return Math.max(0, at - Date.now());
-}
-function shouldRetryStatus(status) {
-    return status === 429 || (status >= 500 && status <= 599);
-}
-function createRequestScheduler(maxConcurrency) {
-    let active = 0;
-    const queue = [];
-    const pump = () => {
-        while (active < maxConcurrency && queue.length > 0) {
-            const next = queue.shift();
-            if (!next)
-                continue;
-            next();
-        }
-    };
-    return (task, signal) => new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(createAbortError());
-            return;
-        }
-        let queued = true;
-        let settled = false;
-        const run = () => {
-            if (settled)
-                return;
-            queued = false;
-            active += 1;
-            Promise.resolve()
-                .then(task)
-                .then(resolve, reject)
-                .finally(() => {
-                settled = true;
-                active = Math.max(0, active - 1);
-                signal?.removeEventListener("abort", onAbort);
-                pump();
-            });
-        };
-        const onAbort = () => {
-            if (!queued || settled)
-                return;
-            settled = true;
-            const index = queue.indexOf(run);
-            if (index >= 0) {
-                queue.splice(index, 1);
-            }
-            reject(createAbortError());
-        };
-        signal?.addEventListener("abort", onAbort, { once: true });
-        queue.push(run);
-        pump();
-    });
-}
 async function mapWithConcurrency(items, concurrency, mapper) {
     if (items.length === 0)
         return [];
@@ -449,6 +142,43 @@ function extractModelRefId(raw, modelName, options) {
     }
     return null;
 }
+function isPrimitiveDescriptor(desc) {
+    return desc.kind === "primitive";
+}
+function isModelRefDescriptor(desc) {
+    return desc.kind === "modelRef";
+}
+function isObjectDescriptor(desc) {
+    return desc.type === "object" && !!desc.properties;
+}
+function isArrayDescriptor(desc) {
+    return desc.type === "array" && !!desc.items;
+}
+function attachIdIfObject(value, id) {
+    if (!id)
+        return value;
+    if (value && typeof value === "object" && !Array.isArray(value) && !value.id) {
+        return { ...value, id };
+    }
+    return value;
+}
+function attachIdForPrimitiveDescriptor(descriptor, value, id) {
+    const withId = attachIdIfObject(value, id);
+    if (!withId || typeof withId !== "object" || Array.isArray(withId)) {
+        return withId;
+    }
+    const customType = descriptor.customType;
+    if (typeof customType !== "string") {
+        return withId;
+    }
+    const metadata = getCustomInlineTypeMetadata(customType);
+    if (!metadata?.includeId?.mapLikeFields?.length) {
+        return withId;
+    }
+    // Map-like objects (e.g., locales) are data containers, not entity rows.
+    // Keep them untouched by id propagation.
+    return { ...withId };
+}
 function buildModelRefCacheKey(modelName, id, context, isCollectionItem) {
     const locale = context.options.locale ?? "";
     const defaultLocale = context.options.defaultLocale ?? "";
@@ -477,6 +207,18 @@ function extractInlineModelObject(raw, modelDescriptor) {
         return null;
     return source;
 }
+function asModelObjectDescriptor(modelName, descriptor) {
+    const model = descriptor.models?.[modelName];
+    if (!model) {
+        throw new Error(`Unknown model '${modelName}' in schema descriptor.`);
+    }
+    return {
+        type: "object",
+        properties: model.properties,
+        optional: false,
+        nullable: false,
+    };
+}
 function formatValidationError(name, error) {
     const payload = error && typeof error === "object" && "format" in error
         ? error.format()
@@ -525,6 +267,126 @@ function unknownKeyError(key, roots, models) {
         : "";
     throw new Error(`Unknown schema key '${key}'. ${rootsText}${modelsText}.${suggestionText}`);
 }
+function toPlainText(value) {
+    if (typeof value === "string")
+        return value;
+    if (typeof value === "number" || typeof value === "boolean")
+        return String(value);
+    if (!value || typeof value !== "object")
+        return "";
+    const node = value;
+    if (typeof node.text === "string")
+        return node.text;
+    if ("value" in node)
+        return toPlainText(node.value);
+    if (Array.isArray(node.content)) {
+        return node.content
+            .map((child) => toPlainText(child))
+            .filter(Boolean)
+            .join(" ")
+            .trim();
+    }
+    return "";
+}
+function coerceRichTextValue(value) {
+    const source = value && typeof value === "object" ? value : {};
+    const nested = source.value && typeof source.value === "object"
+        ? source.value
+        : null;
+    const normalizedValue = source.value !== undefined ? source.value : value ?? {};
+    const html = typeof source.html === "string"
+        ? source.html
+        : typeof nested?.html === "string"
+            ? nested.html
+            : "";
+    return {
+        value: normalizedValue ?? {},
+        html,
+    };
+}
+function normalizeLocaleTag(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+function normalizeLocalizedMap(source, normalizeValue) {
+    const record = source && typeof source === "object" ? source : {};
+    const localesSource = record.locales && typeof record.locales === "object" && !Array.isArray(record.locales)
+        ? record.locales
+        : {};
+    const locales = {};
+    for (const [locale, raw] of Object.entries(localesSource)) {
+        const localeKey = normalizeLocaleTag(locale);
+        if (!localeKey)
+            continue;
+        locales[localeKey] = normalizeValue(raw);
+    }
+    const explicitDefault = normalizeLocaleTag(record.defaultLocale);
+    const firstLocale = Object.keys(locales)[0] ?? "";
+    const defaultLocale = explicitDefault || firstLocale;
+    return { defaultLocale, locales };
+}
+function projectLocalizedByLocale(localized, locale) {
+    if (!locale || locale === "all")
+        return localized;
+    const requested = normalizeLocaleTag(locale);
+    if (!requested)
+        return localized;
+    const requestedValue = localized.locales[requested];
+    if (requestedValue === undefined) {
+        return {
+            defaultLocale: requested,
+            locales: {},
+        };
+    }
+    return {
+        defaultLocale: requested,
+        locales: {
+            [requested]: requestedValue,
+        },
+    };
+}
+function coerceLocalizedStringValue(value, locale, defaultLocale) {
+    const normalized = normalizeLocalizedMap(value, (entry) => toPlainText(entry));
+    if (!normalized.defaultLocale && defaultLocale) {
+        normalized.defaultLocale = defaultLocale;
+    }
+    return projectLocalizedByLocale(normalized, locale);
+}
+function coerceLocalizedRichTextValue(value, locale, defaultLocale) {
+    const normalized = normalizeLocalizedMap(value, (entry) => coerceRichTextValue(entry));
+    if (!normalized.defaultLocale && defaultLocale) {
+        normalized.defaultLocale = defaultLocale;
+    }
+    return projectLocalizedByLocale(normalized, locale);
+}
+function coerceCustomTypeValue(descriptor, value, options) {
+    const customType = descriptor.customType;
+    if (!customType)
+        return value;
+    if (customType === "RichText")
+        return coerceRichTextValue(value);
+    if (customType === "File" || customType === "Image" || customType === "Video") {
+        return maybeAttachAssetUrl(value, options?.assetUrlBuilder ?? ((filename) => filename));
+    }
+    if (customType === "LocalizedString") {
+        return coerceLocalizedStringValue(value, options?.locale, options?.defaultLocale);
+    }
+    if (customType === "LocalizedRichText") {
+        return coerceLocalizedRichTextValue(value, options?.locale, options?.defaultLocale);
+    }
+    return value;
+}
+function ensureCollectionEnvelope(data, path) {
+    if (Array.isArray(data)) {
+        return { items: data, total: data.length };
+    }
+    if (data && typeof data === "object" && Array.isArray(data.items)) {
+        return {
+            items: data.items,
+            total: Number(data.total ?? data.items.length ?? 0),
+        };
+    }
+    throw new Error(`${COLLECTION_SHAPE_ERROR} Path: '${path}'.`);
+}
 async function normalizeModelRef(modelName, id, context, trail, isCollectionItem, inlineValue) {
     if (!id)
         return null;
@@ -672,7 +534,12 @@ async function normalizeArrayField(descriptor, path, raw, context, trail) {
                 return value;
             }
             const id = extractId(row);
-            return id ? { id, value } : value;
+            const valueWithId = attachIdForPrimitiveDescriptor(itemDescriptor, value, id);
+            const isObjectValue = valueWithId && typeof valueWithId === "object" && !Array.isArray(valueWithId);
+            if (!id) {
+                return valueWithId;
+            }
+            return isObjectValue ? { id, ...valueWithId } : { id, value: valueWithId };
         });
     }
     if (isModelRefDescriptor(itemDescriptor)) {
@@ -703,11 +570,16 @@ async function normalizeField(descriptor, path, raw, context, trail, isCollectio
         const value = raw && typeof raw === "object" && "value" in raw
             ? raw.value
             : raw;
-        return coerceCustomTypeValue(descriptor, value, {
+        let coerced = coerceCustomTypeValue(descriptor, value, {
             locale: context.options.locale,
             defaultLocale: context.options.defaultLocale,
             assetUrlBuilder: context.options.assetUrlBuilder,
         });
+        if (shouldIncludeObjectId(context.options.includeIdMode, isCollectionItem)) {
+            const id = extractId(raw);
+            coerced = attachIdForPrimitiveDescriptor(descriptor, coerced, id);
+        }
+        return coerced;
     }
     if (isModelRefDescriptor(descriptor)) {
         const inlineModelDescriptor = context.modelDescriptors.get(descriptor.model);
@@ -775,71 +647,53 @@ function createResourceRegistry(descriptor) {
         modelsCaseInsensitive,
     };
 }
-async function requestJson(baseUrl, apiKey, path, options, runtime) {
-    const params = buildSearchParams(options?.query);
-    const url = `${baseUrl}/${path}${params.toString() ? `?${params.toString()}` : ""}`;
-    const execute = async () => {
-        const retry = runtime?.retry ?? {
-            retries: DEFAULT_REQUEST_RETRIES,
-            baseDelayMs: DEFAULT_REQUEST_RETRY_BASE_MS,
-            maxDelayMs: DEFAULT_REQUEST_RETRY_MAX_MS,
-        };
-        let attempt = 0;
-        while (true) {
-            let response;
-            try {
-                response = runtime?.scheduler
-                    ? await runtime.scheduler(() => fetch(url, {
-                        method: "GET",
-                        signal: options?.signal,
-                        headers: {
-                            ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
-                        },
-                    }), options?.signal)
-                    : await fetch(url, {
-                        method: "GET",
-                        signal: options?.signal,
-                        headers: {
-                            ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
-                        },
-                    });
-            }
-            catch (error) {
-                if (isAbortError(error))
-                    throw error;
-                if (attempt >= retry.retries)
-                    throw error;
-                const delayMs = Math.min(retry.baseDelayMs * 2 ** attempt, retry.maxDelayMs);
-                attempt += 1;
-                await waitForDelay(delayMs, options?.signal);
-                continue;
-            }
-            if (response.ok) {
-                return response.json();
-            }
-            const canRetry = shouldRetryStatus(response.status) && attempt < retry.retries;
-            if (!canRetry) {
-                throw new Error(`Request failed for '${path}' with status ${response.status}: ${response.statusText}`);
-            }
-            const retryAfterMs = parseRetryAfterMs(response.headers.get("retry-after"));
-            const fallbackDelay = Math.min(retry.baseDelayMs * 2 ** attempt, retry.maxDelayMs);
-            const delayMs = retryAfterMs ?? fallbackDelay;
-            attempt += 1;
-            await waitForDelay(delayMs, options?.signal);
+function normalizeBaseUrl(baseUrl) {
+    const cleaned = baseUrl?.trim().replace(/\/$/, "") ?? "";
+    if (!cleaned) {
+        throw new Error("cms0: apiConfig.baseUrl is required to consume API resources.");
+    }
+    return cleaned;
+}
+function resolveIncludeIdMode(includeId, globalIncludeId) {
+    const enabled = includeId ?? globalIncludeId ?? false;
+    return enabled ? "all" : "none";
+}
+function shouldIncludeObjectId(mode, _isCollectionItem) {
+    return mode === "all";
+}
+function buildSearchParams(query) {
+    const params = new URLSearchParams();
+    if (!query)
+        return params;
+    for (const [key, rawValue] of Object.entries(query)) {
+        if (rawValue === undefined || rawValue === null)
+            continue;
+        if (Array.isArray(rawValue)) {
+            rawValue.forEach((value) => {
+                if (value === undefined || value === null)
+                    return;
+                params.append(key, String(value));
+            });
+            continue;
         }
-    };
-    const useInflightDedup = !options?.signal && !!runtime;
-    if (!useInflightDedup || !runtime) {
-        return execute();
+        params.set(key, String(rawValue));
     }
-    const cached = runtime.inflightRequestCache.get(url);
-    if (cached)
-        return cached;
-    const promise = execute().finally(() => {
-        runtime.inflightRequestCache.delete(url);
+    return params;
+}
+async function requestJson(baseUrl, apiKey, path, options) {
+    const params = buildSearchParams(options?.query);
+    const url = `${baseUrl}/${path}${params.toString() ? `?${params.toString()}` : ""}`;
+    const response = await fetch(url, {
+        method: "GET",
+        signal: options?.signal,
+        headers: {
+            ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
+        },
     });
-    runtime.inflightRequestCache.set(url, promise);
-    return promise;
+    if (!response.ok) {
+        throw new Error(`Request failed for '${path}' with status ${response.status}: ${response.statusText}`);
+    }
+    return response.json();
 }
 function validateResult(resource, result, descriptor, includeIdMode, zodSchemas, modelZodSchemas) {
     if (includeIdMode === "all")
@@ -874,9 +728,9 @@ function validateResult(resource, result, descriptor, includeIdMode, zodSchemas,
         throw new Error(formatValidationError(modelName, parsed.error));
     }
 }
-async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options, byId) {
+async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options, byId) {
     const responseMode = options?.response ?? "normalized";
-    const includeIdMode = resolveIncludeIdMode(options?.includeId);
+    const includeIdMode = resolveIncludeIdMode(options?.includeId, globalIncludeId);
     const resolveModelRefs = options?.resolveModelRefs !== false;
     const requestedLocale = options?.locale ??
         (typeof options?.query?.locale === "string"
@@ -900,7 +754,7 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
     const rawData = await requestJson(baseUrl, apiKey, resourcePath, {
         query,
         signal: options?.signal,
-    }, requestRuntime);
+    });
     if (!shouldNormalize) {
         return rawData;
     }
@@ -912,7 +766,7 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
         requestJson: (path, requestOptions) => requestJson(baseUrl, apiKey, path, {
             ...requestOptions,
             signal: options?.signal,
-        }, requestRuntime),
+        }),
         modelDescriptors,
         modelCache: new Map(),
         sharedModelInflightCache,
@@ -922,7 +776,7 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
             locale,
             defaultLocale,
             assetUrlBuilder,
-            modelNormalizationConcurrency,
+            modelNormalizationConcurrency: DEFAULT_MODEL_NORMALIZATION_CONCURRENCY,
         },
     };
     if (resource.isCollection && !byId) {
@@ -958,16 +812,11 @@ export function createCmsClient(descriptor, config) {
     const rootKeys = Array.from(registry.roots.keys());
     const modelKeys = Array.from(registry.models.keys());
     const { zodSchemas, modelZodSchemas } = buildZodSchemasFromDescriptor(descriptor);
-    const requestOptions = normalizeRequestOptions(config.requests);
-    const requestRuntime = {
-        scheduler: createRequestScheduler(requestOptions.concurrency),
-        inflightRequestCache: new Map(),
-        retry: requestOptions.retry,
-    };
+    const globalIncludeId = !!config.includeId;
     const sharedModelInflightCache = new Map();
     const buildModelAccessor = (entry) => {
-        const accessor = (async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, requestOptions.modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options));
-        accessor.byId = async (id, options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, requestOptions.modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options, id);
+        const accessor = (async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options));
+        accessor.byId = async (id, options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options, id);
         return accessor;
     };
     const modelsProxy = new Proxy({}, {
@@ -997,10 +846,16 @@ export function createCmsClient(descriptor, config) {
             if (!entry) {
                 unknownKeyError(property, rootKeys, []);
             }
-            return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, requestOptions.modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options);
+            return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options);
         },
     });
-    return rootProxy;
+    const client = Object.assign(rootProxy, {
+        models: modelsProxy,
+        locales: config.locales ?? [],
+        defaultLocale: config.defaultLocale,
+        includeIdDefault: globalIncludeId,
+    });
+    return client;
 }
 /**
  * Initializes the CMS SDK for a given schema.