@cms0/cms0 0.2.2 → 0.2.4

package/dist/cjs/index.cjs

@@ -4,6 +4,8 @@ exports.createCmsClient = createCmsClient;
 exports.cms0 = cms0;
 const schema_descriptors_1 = require("@cms0/cms0/schema-descriptors");
 const shared_1 = require("@cms0/shared");
+const registry_js_1 = require("./custom-types/registry.cjs");
+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";
@@ -63,6 +65,212 @@ function maybeAttachAssetUrl(value, assetUrlBuilder) {
         url: existingUrl ?? assetUrlBuilder(filename),
     };
 }
+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;
+    if (value && typeof value === "object" && typeof value.id === "string") {
+        return value.id;
+    }
+    return null;
+}
+function capitalize(input) {
+    return input ? input[0].toUpperCase() + input.slice(1) : input;
+}
+function lowerFirst(input) {
+    return input ? input[0].toLowerCase() + input.slice(1) : input;
+}
+function camelCaseModelIdKey(modelName) {
+    return `${lowerFirst(modelName)}Id`;
+}
+function snakeCaseModelIdKey(modelName) {
+    const snake = modelName
+        .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+        .replace(/\s+/g, "_")
+        .toLowerCase();
+    return `${snake}_id`;
+}
+function extractModelRefId(raw, modelName, options) {
+    if (typeof raw === "string")
+        return raw;
+    if (!raw || typeof raw !== "object")
+        return null;
+    const object = raw;
+    const prop = options?.propertyName ?? "";
+    const propertyCandidates = [
+        prop ? `${prop}Id` : "",
+        prop
+            ? `${prop.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase()}_id`
+            : "",
+    ].filter(Boolean);
+    const modelCandidates = [
+        camelCaseModelIdKey(modelName),
+        snakeCaseModelIdKey(modelName),
+    ];
+    // Prefer property-specific FKs (e.g., logoId) over model-level defaults
+    // (e.g., imageId) when multiple refs share the same model in one object row.
+    const candidates = Array.from(new Set([...propertyCandidates, ...modelCandidates, "value"]));
+    for (const key of candidates) {
+        const found = extractId(object[key]);
+        if (found)
+            return found;
+    }
+    const allowObjectIdFallback = options?.allowObjectIdFallback ?? true;
+    if (allowObjectIdFallback) {
+        const keys = Object.keys(object);
+        const hasOnlyId = keys.length === 1 && keys[0] === "id";
+        if (hasOnlyId) {
+            const byId = extractId(object);
+            if (byId)
+                return byId;
+        }
+    }
+    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 = (0, registry_js_1.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 ?? "";
+    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 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()
+        : error;
+    return `Invalid data received for '${name}': ${JSON.stringify(payload)}`;
+}
+function levenshtein(a, b) {
+    if (a === b)
+        return 0;
+    if (!a.length)
+        return b.length;
+    if (!b.length)
+        return a.length;
+    const rows = a.length + 1;
+    const cols = b.length + 1;
+    const matrix = Array.from({ length: rows }, () => new Array(cols).fill(0));
+    for (let i = 0; i < rows; i++)
+        matrix[i][0] = i;
+    for (let j = 0; j < cols; j++)
+        matrix[0][j] = j;
+    for (let i = 1; i < rows; i++) {
+        for (let j = 1; j < cols; j++) {
+            const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+            matrix[i][j] = Math.min(matrix[i - 1][j] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j - 1] + cost);
+        }
+    }
+    return matrix[rows - 1][cols - 1];
+}
+function unknownKeyError(key, roots, models) {
+    const candidates = [...roots, ...models];
+    const normalized = key.toLowerCase();
+    const suggestions = candidates
+        .map((candidate) => ({
+        candidate,
+        distance: levenshtein(normalized, candidate.toLowerCase()),
+    }))
+        .sort((a, b) => a.distance - b.distance)
+        .slice(0, 3)
+        .map((entry) => entry.candidate);
+    const suggestionText = suggestions.length
+        ? ` Did you mean: ${suggestions.join(", ")}?`
+        : "";
+    const rootsText = `Available roots: [${roots.join(", ")}]`;
+    const modelsText = models.length
+        ? `, models (under data.models.*): [${models.join(", ")}]`
+        : "";
+    throw new Error(`Unknown schema key '${key}'. ${rootsText}${modelsText}.${suggestionText}`);
+}
 function toPlainText(value) {
     if (typeof value === "string")
         return value;
@@ -171,70 +379,6 @@ function coerceCustomTypeValue(descriptor, value, options) {
     }
     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 };
@@ -247,121 +391,12 @@ function ensureCollectionEnvelope(data, path) {
     }
     throw new Error(`${COLLECTION_SHAPE_ERROR} Path: '${path}'.`);
 }
-function extractId(value) {
-    if (typeof value === "string" && value.length > 0)
-        return value;
-    if (value && typeof value === "object" && typeof value.id === "string") {
-        return value.id;
-    }
-    return null;
-}
-function capitalize(input) {
-    return input ? input[0].toUpperCase() + input.slice(1) : input;
-}
-function lowerFirst(input) {
-    return input ? input[0].toLowerCase() + input.slice(1) : input;
-}
-function camelCaseModelIdKey(modelName) {
-    return `${lowerFirst(modelName)}Id`;
-}
-function snakeCaseModelIdKey(modelName) {
-    const snake = modelName
-        .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
-        .replace(/\s+/g, "_")
-        .toLowerCase();
-    return `${snake}_id`;
-}
-function extractModelRefId(raw, modelName, options) {
-    if (typeof raw === "string")
-        return raw;
-    if (!raw || typeof raw !== "object")
-        return null;
-    const object = raw;
-    const prop = options?.propertyName ?? "";
-    const propertyCandidates = [
-        prop ? `${prop}Id` : "",
-        prop
-            ? `${prop.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase()}_id`
-            : "",
-    ].filter(Boolean);
-    const modelCandidates = [
-        camelCaseModelIdKey(modelName),
-        snakeCaseModelIdKey(modelName),
-    ];
-    // Prefer property-specific FKs (e.g., logoId) over model-level defaults
-    // (e.g., imageId) when multiple refs share the same model in one object row.
-    const candidates = Array.from(new Set([...propertyCandidates, ...modelCandidates, "value"]));
-    for (const key of candidates) {
-        const found = extractId(object[key]);
-        if (found)
-            return found;
-    }
-    const allowObjectIdFallback = options?.allowObjectIdFallback ?? true;
-    if (allowObjectIdFallback) {
-        const keys = Object.keys(object);
-        const hasOnlyId = keys.length === 1 && keys[0] === "id";
-        if (hasOnlyId) {
-            const byId = extractId(object);
-            if (byId)
-                return byId;
-        }
-    }
-    return null;
-}
-function formatValidationError(name, error) {
-    const payload = error && typeof error === "object" && "format" in error
-        ? error.format()
-        : error;
-    return `Invalid data received for '${name}': ${JSON.stringify(payload)}`;
-}
-function levenshtein(a, b) {
-    if (a === b)
-        return 0;
-    if (!a.length)
-        return b.length;
-    if (!b.length)
-        return a.length;
-    const rows = a.length + 1;
-    const cols = b.length + 1;
-    const matrix = Array.from({ length: rows }, () => new Array(cols).fill(0));
-    for (let i = 0; i < rows; i++)
-        matrix[i][0] = i;
-    for (let j = 0; j < cols; j++)
-        matrix[0][j] = j;
-    for (let i = 1; i < rows; i++) {
-        for (let j = 1; j < cols; j++) {
-            const cost = a[i - 1] === b[j - 1] ? 0 : 1;
-            matrix[i][j] = Math.min(matrix[i - 1][j] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j - 1] + cost);
-        }
-    }
-    return matrix[rows - 1][cols - 1];
-}
-function unknownKeyError(key, roots, models) {
-    const candidates = [...roots, ...models];
-    const normalized = key.toLowerCase();
-    const suggestions = candidates
-        .map((candidate) => ({
-        candidate,
-        distance: levenshtein(normalized, candidate.toLowerCase()),
-    }))
-        .sort((a, b) => a.distance - b.distance)
-        .slice(0, 3)
-        .map((entry) => entry.candidate);
-    const suggestionText = suggestions.length
-        ? ` Did you mean: ${suggestions.join(", ")}?`
-        : "";
-    const rootsText = `Available roots: [${roots.join(", ")}]`;
-    const modelsText = models.length
-        ? `, models (under data.models.*): [${models.join(", ")}]`
-        : "";
-    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 +406,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 +459,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 +479,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,26 +538,34 @@ 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)) {
-        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;
 }
@@ -510,18 +574,29 @@ 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 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,6 +651,39 @@ function createResourceRegistry(descriptor) {
         modelsCaseInsensitive,
     };
 }
+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;
+        }
+        params.set(key, String(rawValue));
+    }
+    return params;
+}
 async function requestJson(baseUrl, apiKey, path, options) {
     const params = buildSearchParams(options?.query);
     const url = `${baseUrl}/${path}${params.toString() ? `?${params.toString()}` : ""}`;
@@ -624,9 +732,9 @@ 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, 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"
@@ -665,12 +773,14 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
         }),
         modelDescriptors,
         modelCache: new Map(),
+        sharedModelInflightCache,
         options: {
             includeIdMode,
             resolveModelRefs,
             locale,
             defaultLocale,
             assetUrlBuilder,
+            modelNormalizationConcurrency: DEFAULT_MODEL_NORMALIZATION_CONCURRENCY,
         },
     };
     if (resource.isCollection && !byId) {
@@ -706,9 +816,11 @@ 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 globalIncludeId = !!config.includeId;
+    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, 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({}, {
@@ -738,10 +850,16 @@ 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, 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.

package/dist/esm/custom-types/registry.js

@@ -59,6 +59,15 @@ export const customInlineDescriptors = {
     LocalizedString: localizedStringDescriptor,
     LocalizedRichText: localizedRichTextDescriptor,
 };
+export const customInlineTypeMetadata = {
+    RichText: {},
+    LocalizedString: {
+        includeId: { mapLikeFields: ["locales"] },
+    },
+    LocalizedRichText: {
+        includeId: { mapLikeFields: ["locales"] },
+    },
+};
 export const customTypeDescriptors = {
     ...customModelDescriptors,
     ...customInlineDescriptors,
@@ -66,6 +75,9 @@ export const customTypeDescriptors = {
 export const customTypeNames = new Set(Object.keys(customTypeDescriptors));
 export const customModelTypeNames = new Set(Object.keys(customModelDescriptors));
 export const customInlineTypeNames = new Set(Object.keys(customInlineDescriptors));
+export function getCustomInlineTypeMetadata(name) {
+    return customInlineTypeMetadata[name];
+}
 export function resolveCustomTypeDependencies(names) {
     const resolved = new Set();
     const queue = Array.from(names);