@cms0/cms0 0.2.2 → 0.2.3

package/dist/cjs/index.cjs

@@ -4,6 +4,11 @@ exports.createCmsClient = createCmsClient;
 exports.cms0 = cms0;
 const schema_descriptors_1 = require("@cms0/cms0/schema-descriptors");
 const shared_1 = require("@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;
+const DEFAULT_MODEL_NORMALIZATION_CONCURRENCY = 8;
 const COLLECTION_SHAPE_ERROR = "Invalid collection response. Expected array or { items, total }.";
 function normalizeUploadsPath(uploadsPath) {
     const raw = uploadsPath?.trim() || "/uploads";
@@ -247,6 +252,146 @@ function ensureCollectionEnvelope(data, path) {
     }
     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 [];
+    const limit = Math.max(1, Math.floor(concurrency));
+    if (limit >= items.length) {
+        return Promise.all(items.map((item, index) => mapper(item, index)));
+    }
+    const results = new Array(items.length);
+    let nextIndex = 0;
+    const workers = Array.from({ length: Math.min(limit, items.length) }, async () => {
+        while (true) {
+            const current = nextIndex++;
+            if (current >= items.length)
+                break;
+            results[current] = await mapper(items[current], current);
+        }
+    });
+    await Promise.all(workers);
+    return results;
+}
 function extractId(value) {
     if (typeof value === "string" && value.length > 0)
         return value;
@@ -308,6 +453,34 @@ function extractModelRefId(raw, modelName, options) {
     }
     return null;
 }
+function buildModelRefCacheKey(modelName, id, context, isCollectionItem) {
+    const locale = context.options.locale ?? "";
+    const defaultLocale = context.options.defaultLocale ?? "";
+    const includeIdMode = context.options.includeIdMode;
+    const refsMode = context.options.resolveModelRefs ? "resolve" : "ids";
+    const collectionFlag = isCollectionItem ? "collection" : "single";
+    return [
+        modelName,
+        id,
+        locale,
+        defaultLocale,
+        includeIdMode,
+        refsMode,
+        collectionFlag,
+    ].join("|");
+}
+function extractInlineModelObject(raw, modelDescriptor) {
+    if (!raw || typeof raw !== "object" || Array.isArray(raw))
+        return null;
+    if (!isObjectDescriptor(modelDescriptor))
+        return null;
+    const source = raw;
+    const propertyKeys = Object.keys(modelDescriptor.properties ?? {});
+    const hasModelField = propertyKeys.some((key) => key in source);
+    if (!hasModelField)
+        return null;
+    return source;
+}
 function formatValidationError(name, error) {
     const payload = error && typeof error === "object" && "format" in error
         ? error.format()
@@ -356,12 +529,12 @@ function unknownKeyError(key, roots, models) {
         : "";
     throw new Error(`Unknown schema key '${key}'. ${rootsText}${modelsText}.${suggestionText}`);
 }
-async function normalizeModelRef(modelName, id, context, trail, isCollectionItem) {
+async function normalizeModelRef(modelName, id, context, trail, isCollectionItem, inlineValue) {
     if (!id)
         return null;
     if (!context.options.resolveModelRefs)
         return id;
-    const nodeKey = `${modelName}:${id}`;
+    const nodeKey = buildModelRefCacheKey(modelName, id, context, isCollectionItem);
     if (trail.has(nodeKey)) {
         return shouldIncludeObjectId(context.options.includeIdMode, isCollectionItem)
             ? { id }
@@ -371,25 +544,37 @@ async function normalizeModelRef(modelName, id, context, trail, isCollectionItem
     if (!modelDescriptor) {
         return id;
     }
+    const inlineModel = extractInlineModelObject(inlineValue, modelDescriptor);
     const cached = context.modelCache.get(nodeKey);
     if (cached) {
         return cached;
     }
+    const sharedInflight = context.sharedModelInflightCache.get(nodeKey);
+    if (sharedInflight) {
+        context.modelCache.set(nodeKey, sharedInflight);
+        return sharedInflight;
+    }
     const nextTrail = new Set(trail);
     nextTrail.add(nodeKey);
     const promise = (async () => {
-        const rawModel = await context.requestJson(`models/${modelName}/${id}`, {
-            query: {
-                raw: 1,
-                ...(context.options.locale ? { locale: context.options.locale } : {}),
-            },
-        });
+        const rawModel = inlineModel ??
+            (await context.requestJson(`models/${modelName}/${id}`, {
+                query: {
+                    raw: 1,
+                    ...(context.options.locale ? { locale: context.options.locale } : {}),
+                },
+            }));
         return normalizeField(modelDescriptor, `models/${modelName}/${encodeURIComponent(id)}`, rawModel, context, nextTrail, isCollectionItem);
-    })().catch((error) => {
+    })();
+    context.modelCache.set(nodeKey, promise);
+    context.sharedModelInflightCache.set(nodeKey, promise);
+    promise
+        .then(() => undefined, () => {
         context.modelCache.delete(nodeKey);
-        throw error;
+    })
+        .finally(() => {
+        context.sharedModelInflightCache.delete(nodeKey);
     });
-    context.modelCache.set(nodeKey, promise);
     return promise;
 }
 function missingModelRefValue(descriptor) {
@@ -412,10 +597,19 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
             continue;
         }
         if (isModelRefDescriptor(propertyDescriptor)) {
-            const refId = extractModelRefId(source, propertyDescriptor.model, {
-                propertyName,
-                allowObjectIdFallback: false,
-            });
+            const inlineValue = source[propertyName];
+            const inlineModelDescriptor = context.modelDescriptors.get(propertyDescriptor.model);
+            const inlineModel = inlineModelDescriptor
+                ? extractInlineModelObject(inlineValue, inlineModelDescriptor)
+                : null;
+            const refId = extractModelRefId(inlineValue, propertyDescriptor.model, {
+                allowObjectIdFallback: true,
+            }) ??
+                (inlineModel ? extractId(inlineModel) : null) ??
+                extractModelRefId(source, propertyDescriptor.model, {
+                    propertyName,
+                    allowObjectIdFallback: false,
+                });
             if (!refId) {
                 const missing = missingModelRefValue(propertyDescriptor);
                 if (missing !== undefined) {
@@ -423,7 +617,7 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
                 }
                 continue;
             }
-            output[propertyName] = await normalizeModelRef(propertyDescriptor.model, refId, context, trail, false);
+            output[propertyName] = await normalizeModelRef(propertyDescriptor.model, refId, context, trail, false, inlineValue);
             continue;
         }
         if (isArrayDescriptor(propertyDescriptor)) {
@@ -486,22 +680,25 @@ async function normalizeArrayField(descriptor, path, raw, context, trail) {
         });
     }
     if (isModelRefDescriptor(itemDescriptor)) {
-        const resolved = await Promise.all(envelope.items.map(async (row) => {
+        const inlineModelDescriptor = context.modelDescriptors.get(itemDescriptor.model);
+        return mapWithConcurrency(envelope.items, context.options.modelNormalizationConcurrency, async (row) => {
+            const inlineModel = inlineModelDescriptor
+                ? extractInlineModelObject(row, inlineModelDescriptor)
+                : null;
             const refId = extractModelRefId(row, itemDescriptor.model, {
                 allowObjectIdFallback: false,
-            });
-            return normalizeModelRef(itemDescriptor.model, refId, context, trail, true);
-        }));
-        return resolved;
+            }) ?? (inlineModel ? extractId(inlineModel) : null);
+            return normalizeModelRef(itemDescriptor.model, refId, context, trail, true, row);
+        });
     }
     if (isObjectDescriptor(itemDescriptor)) {
-        return Promise.all(envelope.items.map(async (row) => {
+        return mapWithConcurrency(envelope.items, context.options.modelNormalizationConcurrency, async (row) => {
             const rowId = extractId(row);
             const rowPath = rowId
                 ? `${path}/${encodeURIComponent(rowId)}`
                 : path;
             return normalizeObjectField(itemDescriptor, rowPath, row, context, trail, true);
-        }));
+        });
     }
     return envelope.items;
 }
@@ -517,11 +714,17 @@ async function normalizeField(descriptor, path, raw, context, trail, isCollectio
         });
     }
     if (isModelRefDescriptor(descriptor)) {
-        const refId = extractModelRefId(raw, descriptor.model);
+        const inlineModelDescriptor = context.modelDescriptors.get(descriptor.model);
+        const inlineModel = inlineModelDescriptor
+            ? extractInlineModelObject(raw, inlineModelDescriptor)
+            : null;
+        const refId = extractModelRefId(raw, descriptor.model, {
+            allowObjectIdFallback: true,
+        }) ?? (inlineModel ? extractId(inlineModel) : null);
         if (!refId) {
             return missingModelRefValue(descriptor);
         }
-        return normalizeModelRef(descriptor.model, refId, context, trail, isCollectionItem);
+        return normalizeModelRef(descriptor.model, refId, context, trail, isCollectionItem, raw);
     }
     if (isArrayDescriptor(descriptor)) {
         const normalized = await normalizeArrayField(descriptor, path, raw, context, trail);
@@ -576,20 +779,71 @@ function createResourceRegistry(descriptor) {
         modelsCaseInsensitive,
     };
 }
-async function requestJson(baseUrl, apiKey, path, options) {
+async function requestJson(baseUrl, apiKey, path, options, runtime) {
     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}` } : {}),
-        },
-    });
-    if (!response.ok) {
-        throw new Error(`Request failed for '${path}' with status ${response.status}: ${response.statusText}`);
+    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);
+        }
+    };
+    const useInflightDedup = !options?.signal && !!runtime;
+    if (!useInflightDedup || !runtime) {
+        return execute();
     }
-    return response.json();
+    const cached = runtime.inflightRequestCache.get(url);
+    if (cached)
+        return cached;
+    const promise = execute().finally(() => {
+        runtime.inflightRequestCache.delete(url);
+    });
+    runtime.inflightRequestCache.set(url, promise);
+    return promise;
 }
 function validateResult(resource, result, descriptor, includeIdMode, zodSchemas, modelZodSchemas) {
     if (includeIdMode === "all")
@@ -624,7 +878,7 @@ function validateResult(resource, result, descriptor, includeIdMode, zodSchemas,
         throw new Error(formatValidationError(modelName, parsed.error));
     }
 }
-async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options, byId) {
+async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options, byId) {
     const responseMode = options?.response ?? "normalized";
     const includeIdMode = resolveIncludeIdMode(options?.includeId);
     const resolveModelRefs = options?.resolveModelRefs !== false;
@@ -650,7 +904,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;
     }
@@ -662,15 +916,17 @@ 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,
         options: {
             includeIdMode,
             resolveModelRefs,
             locale,
             defaultLocale,
             assetUrlBuilder,
+            modelNormalizationConcurrency,
         },
     };
     if (resource.isCollection && !byId) {
@@ -706,9 +962,16 @@ function createCmsClient(descriptor, config) {
     const rootKeys = Array.from(registry.roots.keys());
     const modelKeys = Array.from(registry.models.keys());
     const { zodSchemas, modelZodSchemas } = (0, shared_1.buildZodSchemasFromDescriptor)(descriptor);
+    const requestOptions = normalizeRequestOptions(config.requests);
+    const requestRuntime = {
+        scheduler: createRequestScheduler(requestOptions.concurrency),
+        inflightRequestCache: new Map(),
+        retry: requestOptions.retry,
+    };
+    const sharedModelInflightCache = new Map();
     const buildModelAccessor = (entry) => {
-        const accessor = (async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options));
-        accessor.byId = async (id, options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options, id);
+        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);
         return accessor;
     };
     const modelsProxy = new Proxy({}, {
@@ -738,7 +1001,7 @@ function createCmsClient(descriptor, config) {
             if (!entry) {
                 unknownKeyError(property, rootKeys, []);
             }
-            return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options);
+            return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, requestOptions.modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options);
         },
     });
     return rootProxy;

package/dist/esm/index.js

@@ -1,5 +1,10 @@
 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;
+const DEFAULT_MODEL_NORMALIZATION_CONCURRENCY = 8;
 const COLLECTION_SHAPE_ERROR = "Invalid collection response. Expected array or { items, total }.";
 function normalizeUploadsPath(uploadsPath) {
     const raw = uploadsPath?.trim() || "/uploads";
@@ -243,6 +248,146 @@ function ensureCollectionEnvelope(data, path) {
     }
     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 [];
+    const limit = Math.max(1, Math.floor(concurrency));
+    if (limit >= items.length) {
+        return Promise.all(items.map((item, index) => mapper(item, index)));
+    }
+    const results = new Array(items.length);
+    let nextIndex = 0;
+    const workers = Array.from({ length: Math.min(limit, items.length) }, async () => {
+        while (true) {
+            const current = nextIndex++;
+            if (current >= items.length)
+                break;
+            results[current] = await mapper(items[current], current);
+        }
+    });
+    await Promise.all(workers);
+    return results;
+}
 function extractId(value) {
     if (typeof value === "string" && value.length > 0)
         return value;
@@ -304,6 +449,34 @@ function extractModelRefId(raw, modelName, options) {
     }
     return null;
 }
+function buildModelRefCacheKey(modelName, id, context, isCollectionItem) {
+    const locale = context.options.locale ?? "";
+    const defaultLocale = context.options.defaultLocale ?? "";
+    const includeIdMode = context.options.includeIdMode;
+    const refsMode = context.options.resolveModelRefs ? "resolve" : "ids";
+    const collectionFlag = isCollectionItem ? "collection" : "single";
+    return [
+        modelName,
+        id,
+        locale,
+        defaultLocale,
+        includeIdMode,
+        refsMode,
+        collectionFlag,
+    ].join("|");
+}
+function extractInlineModelObject(raw, modelDescriptor) {
+    if (!raw || typeof raw !== "object" || Array.isArray(raw))
+        return null;
+    if (!isObjectDescriptor(modelDescriptor))
+        return null;
+    const source = raw;
+    const propertyKeys = Object.keys(modelDescriptor.properties ?? {});
+    const hasModelField = propertyKeys.some((key) => key in source);
+    if (!hasModelField)
+        return null;
+    return source;
+}
 function formatValidationError(name, error) {
     const payload = error && typeof error === "object" && "format" in error
         ? error.format()
@@ -352,12 +525,12 @@ function unknownKeyError(key, roots, models) {
         : "";
     throw new Error(`Unknown schema key '${key}'. ${rootsText}${modelsText}.${suggestionText}`);
 }
-async function normalizeModelRef(modelName, id, context, trail, isCollectionItem) {
+async function normalizeModelRef(modelName, id, context, trail, isCollectionItem, inlineValue) {
     if (!id)
         return null;
     if (!context.options.resolveModelRefs)
         return id;
-    const nodeKey = `${modelName}:${id}`;
+    const nodeKey = buildModelRefCacheKey(modelName, id, context, isCollectionItem);
     if (trail.has(nodeKey)) {
         return shouldIncludeObjectId(context.options.includeIdMode, isCollectionItem)
             ? { id }
@@ -367,25 +540,37 @@ async function normalizeModelRef(modelName, id, context, trail, isCollectionItem
     if (!modelDescriptor) {
         return id;
     }
+    const inlineModel = extractInlineModelObject(inlineValue, modelDescriptor);
     const cached = context.modelCache.get(nodeKey);
     if (cached) {
         return cached;
     }
+    const sharedInflight = context.sharedModelInflightCache.get(nodeKey);
+    if (sharedInflight) {
+        context.modelCache.set(nodeKey, sharedInflight);
+        return sharedInflight;
+    }
     const nextTrail = new Set(trail);
     nextTrail.add(nodeKey);
     const promise = (async () => {
-        const rawModel = await context.requestJson(`models/${modelName}/${id}`, {
-            query: {
-                raw: 1,
-                ...(context.options.locale ? { locale: context.options.locale } : {}),
-            },
-        });
+        const rawModel = inlineModel ??
+            (await context.requestJson(`models/${modelName}/${id}`, {
+                query: {
+                    raw: 1,
+                    ...(context.options.locale ? { locale: context.options.locale } : {}),
+                },
+            }));
         return normalizeField(modelDescriptor, `models/${modelName}/${encodeURIComponent(id)}`, rawModel, context, nextTrail, isCollectionItem);
-    })().catch((error) => {
+    })();
+    context.modelCache.set(nodeKey, promise);
+    context.sharedModelInflightCache.set(nodeKey, promise);
+    promise
+        .then(() => undefined, () => {
         context.modelCache.delete(nodeKey);
-        throw error;
+    })
+        .finally(() => {
+        context.sharedModelInflightCache.delete(nodeKey);
     });
-    context.modelCache.set(nodeKey, promise);
     return promise;
 }
 function missingModelRefValue(descriptor) {
@@ -408,10 +593,19 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
             continue;
         }
         if (isModelRefDescriptor(propertyDescriptor)) {
-            const refId = extractModelRefId(source, propertyDescriptor.model, {
-                propertyName,
-                allowObjectIdFallback: false,
-            });
+            const inlineValue = source[propertyName];
+            const inlineModelDescriptor = context.modelDescriptors.get(propertyDescriptor.model);
+            const inlineModel = inlineModelDescriptor
+                ? extractInlineModelObject(inlineValue, inlineModelDescriptor)
+                : null;
+            const refId = extractModelRefId(inlineValue, propertyDescriptor.model, {
+                allowObjectIdFallback: true,
+            }) ??
+                (inlineModel ? extractId(inlineModel) : null) ??
+                extractModelRefId(source, propertyDescriptor.model, {
+                    propertyName,
+                    allowObjectIdFallback: false,
+                });
             if (!refId) {
                 const missing = missingModelRefValue(propertyDescriptor);
                 if (missing !== undefined) {
@@ -419,7 +613,7 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
                 }
                 continue;
             }
-            output[propertyName] = await normalizeModelRef(propertyDescriptor.model, refId, context, trail, false);
+            output[propertyName] = await normalizeModelRef(propertyDescriptor.model, refId, context, trail, false, inlineValue);
             continue;
         }
         if (isArrayDescriptor(propertyDescriptor)) {
@@ -482,22 +676,25 @@ async function normalizeArrayField(descriptor, path, raw, context, trail) {
         });
     }
     if (isModelRefDescriptor(itemDescriptor)) {
-        const resolved = await Promise.all(envelope.items.map(async (row) => {
+        const inlineModelDescriptor = context.modelDescriptors.get(itemDescriptor.model);
+        return mapWithConcurrency(envelope.items, context.options.modelNormalizationConcurrency, async (row) => {
+            const inlineModel = inlineModelDescriptor
+                ? extractInlineModelObject(row, inlineModelDescriptor)
+                : null;
             const refId = extractModelRefId(row, itemDescriptor.model, {
                 allowObjectIdFallback: false,
-            });
-            return normalizeModelRef(itemDescriptor.model, refId, context, trail, true);
-        }));
-        return resolved;
+            }) ?? (inlineModel ? extractId(inlineModel) : null);
+            return normalizeModelRef(itemDescriptor.model, refId, context, trail, true, row);
+        });
     }
     if (isObjectDescriptor(itemDescriptor)) {
-        return Promise.all(envelope.items.map(async (row) => {
+        return mapWithConcurrency(envelope.items, context.options.modelNormalizationConcurrency, async (row) => {
             const rowId = extractId(row);
             const rowPath = rowId
                 ? `${path}/${encodeURIComponent(rowId)}`
                 : path;
             return normalizeObjectField(itemDescriptor, rowPath, row, context, trail, true);
-        }));
+        });
     }
     return envelope.items;
 }
@@ -513,11 +710,17 @@ async function normalizeField(descriptor, path, raw, context, trail, isCollectio
         });
     }
     if (isModelRefDescriptor(descriptor)) {
-        const refId = extractModelRefId(raw, descriptor.model);
+        const inlineModelDescriptor = context.modelDescriptors.get(descriptor.model);
+        const inlineModel = inlineModelDescriptor
+            ? extractInlineModelObject(raw, inlineModelDescriptor)
+            : null;
+        const refId = extractModelRefId(raw, descriptor.model, {
+            allowObjectIdFallback: true,
+        }) ?? (inlineModel ? extractId(inlineModel) : null);
         if (!refId) {
             return missingModelRefValue(descriptor);
         }
-        return normalizeModelRef(descriptor.model, refId, context, trail, isCollectionItem);
+        return normalizeModelRef(descriptor.model, refId, context, trail, isCollectionItem, raw);
     }
     if (isArrayDescriptor(descriptor)) {
         const normalized = await normalizeArrayField(descriptor, path, raw, context, trail);
@@ -572,20 +775,71 @@ function createResourceRegistry(descriptor) {
         modelsCaseInsensitive,
     };
 }
-async function requestJson(baseUrl, apiKey, path, options) {
+async function requestJson(baseUrl, apiKey, path, options, runtime) {
     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}` } : {}),
-        },
-    });
-    if (!response.ok) {
-        throw new Error(`Request failed for '${path}' with status ${response.status}: ${response.statusText}`);
+    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);
+        }
+    };
+    const useInflightDedup = !options?.signal && !!runtime;
+    if (!useInflightDedup || !runtime) {
+        return execute();
     }
-    return response.json();
+    const cached = runtime.inflightRequestCache.get(url);
+    if (cached)
+        return cached;
+    const promise = execute().finally(() => {
+        runtime.inflightRequestCache.delete(url);
+    });
+    runtime.inflightRequestCache.set(url, promise);
+    return promise;
 }
 function validateResult(resource, result, descriptor, includeIdMode, zodSchemas, modelZodSchemas) {
     if (includeIdMode === "all")
@@ -620,7 +874,7 @@ function validateResult(resource, result, descriptor, includeIdMode, zodSchemas,
         throw new Error(formatValidationError(modelName, parsed.error));
     }
 }
-async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options, byId) {
+async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options, byId) {
     const responseMode = options?.response ?? "normalized";
     const includeIdMode = resolveIncludeIdMode(options?.includeId);
     const resolveModelRefs = options?.resolveModelRefs !== false;
@@ -646,7 +900,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;
     }
@@ -658,15 +912,17 @@ 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,
         options: {
             includeIdMode,
             resolveModelRefs,
             locale,
             defaultLocale,
             assetUrlBuilder,
+            modelNormalizationConcurrency,
         },
     };
     if (resource.isCollection && !byId) {
@@ -702,9 +958,16 @@ 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 sharedModelInflightCache = new Map();
     const buildModelAccessor = (entry) => {
-        const accessor = (async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options));
-        accessor.byId = async (id, options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options, id);
+        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);
         return accessor;
     };
     const modelsProxy = new Proxy({}, {
@@ -734,7 +997,7 @@ export function createCmsClient(descriptor, config) {
             if (!entry) {
                 unknownKeyError(property, rootKeys, []);
             }
-            return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, options);
+            return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, requestRuntime, sharedModelInflightCache, requestOptions.modelNormalizationConcurrency, zodSchemas, modelZodSchemas, options);
         },
     });
     return rootProxy;

package/dist/types/index.d.ts

@@ -10,6 +10,12 @@ export interface CmsAssetOptions {
     baseUrl?: string;
     uploadsPath?: string;
 }
+export interface CmsRequestOptions {
+    concurrency?: number;
+    retries?: number;
+    retryBaseMs?: number;
+    retryMaxMs?: number;
+}
 export interface CmsAccessorOptions {
     query?: CmsQuery;
     response?: CmsResponseMode;
@@ -70,6 +76,7 @@ export interface Cms0Options {
     locales?: string[];
     defaultLocale?: string;
     assets?: CmsAssetOptions;
+    requests?: CmsRequestOptions;
 }
 type PrimitiveValueFromDescriptor<TypeName extends string> = TypeName extends "string" ? string : TypeName extends "number" ? number : TypeName extends "boolean" ? boolean : any;
 type CustomTypeValueFromDescriptor<TypeName extends string> = TypeName extends "RichText" ? CmsRichText : TypeName extends "LocalizedString" ? CmsLocalizedString : TypeName extends "LocalizedRichText" ? CmsLocalizedRichText : never;

package/dist/types/index.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cms0/cms0",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "",
   "publishConfig": {
     "access": "restricted"