@cms0/cms0 0.2.5 → 0.2.7

package/dist/cjs/index.cjs

@@ -484,12 +484,19 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
         }
         if (isArrayDescriptor(propertyDescriptor)) {
             const childPath = `${path}/${propertyName}`;
-            const childRaw = await context.requestJson(childPath, {
-                query: {
-                    raw: 1,
-                    ...(context.options.locale ? { locale: context.options.locale } : {}),
-                },
-            });
+            const inlineChildRaw = source[propertyName];
+            if (inlineChildRaw === null) {
+                output[propertyName] = null;
+                continue;
+            }
+            const childRaw = inlineChildRaw !== undefined
+                ? inlineChildRaw
+                : await context.requestJson(childPath, {
+                    query: {
+                        raw: 1,
+                        ...(context.options.locale ? { locale: context.options.locale } : {}),
+                    },
+                });
             const normalizedChild = await normalizeArrayField(propertyDescriptor, childPath, childRaw, context, trail);
             output[propertyName] = coerceCustomTypeValue(propertyDescriptor, normalizedChild, {
                 locale: context.options.locale,
@@ -500,12 +507,19 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
         }
         if (isObjectDescriptor(propertyDescriptor)) {
             const childPath = `${path}/${propertyName}`;
-            const childRaw = await context.requestJson(childPath, {
-                query: {
-                    raw: 1,
-                    ...(context.options.locale ? { locale: context.options.locale } : {}),
-                },
-            });
+            const inlineChildRaw = source[propertyName];
+            if (inlineChildRaw === null) {
+                output[propertyName] = null;
+                continue;
+            }
+            const childRaw = inlineChildRaw !== undefined
+                ? inlineChildRaw
+                : await context.requestJson(childPath, {
+                    query: {
+                        raw: 1,
+                        ...(context.options.locale ? { locale: context.options.locale } : {}),
+                    },
+                });
             const normalizedChild = await normalizeObjectField(propertyDescriptor, childPath, childRaw, context, trail, false);
             output[propertyName] = coerceCustomTypeValue(propertyDescriptor, normalizedChild, {
                 locale: context.options.locale,
@@ -752,13 +766,47 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
     if (locale && query.locale === undefined) {
         query.locale = locale;
     }
-    const resourcePath = byId
+    const useResolvedEndpoint = shouldNormalize &&
+        !byId &&
+        resource.kind === "root" &&
+        !resource.isCollection &&
+        isObjectDescriptor(resource.descriptor) &&
+        resolveModelRefs;
+    if (useResolvedEndpoint && query.resolveModelRefs === undefined) {
+        query.resolveModelRefs = 1;
+    }
+    const normalizePath = byId
         ? `${resource.path}/${encodeURIComponent(byId)}`
         : resource.path;
-    const rawData = await requestJson(baseUrl, apiKey, resourcePath, {
-        query,
-        signal: options?.signal,
-    });
+    const requestPath = useResolvedEndpoint
+        ? `_resolved/${encodeURIComponent(resource.key)}`
+        : normalizePath;
+    let rawData;
+    if (useResolvedEndpoint) {
+        try {
+            rawData = await requestJson(baseUrl, apiKey, requestPath, {
+                query,
+                signal: options?.signal,
+            });
+        }
+        catch (resolvedError) {
+            try {
+                rawData = await requestJson(baseUrl, apiKey, normalizePath, {
+                    query,
+                    signal: options?.signal,
+                });
+            }
+            catch {
+                throw resolvedError;
+            }
+        }
+    }
+    else {
+        rawData = await requestJson(baseUrl, apiKey, requestPath, {
+            query,
+            signal: options?.signal,
+        });
+    }
     if (!shouldNormalize) {
         return rawData;
     }
@@ -804,7 +852,7 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
         validateResult(resource, normalizedItems, descriptor, includeIdMode, zodSchemas, modelZodSchemas);
         return normalizedItems;
     }
-    const normalized = await normalizeField(resource.descriptor, resourcePath, rawData, context, new Set(), false);
+    const normalized = await normalizeField(resource.descriptor, normalizePath, rawData, context, new Set(), false);
     validateResult(resource, normalized, descriptor, includeIdMode, zodSchemas, modelZodSchemas);
     return normalized;
 }
@@ -837,14 +885,25 @@ function createCmsClient(descriptor, config) {
             return buildModelAccessor(modelEntry);
         },
     });
-    const rootProxy = new Proxy({}, {
-        get(_target, property) {
-            if (typeof property !== "string")
-                return undefined;
+    const clientMeta = {
+        locales: config.locales ?? [],
+        defaultLocale: config.defaultLocale,
+        includeIdDefault: !!config.includeId,
+    };
+    const rootProxyTarget = {
+        models: modelsProxy,
+        meta: clientMeta,
+    };
+    const rootProxy = new Proxy(rootProxyTarget, {
+        get(target, property, receiver) {
+            if (typeof property !== "string") {
+                return Reflect.get(target, property, receiver);
+            }
             if (property === "then")
                 return undefined;
-            if (property === "models")
-                return modelsProxy;
+            if (Reflect.has(target, property)) {
+                return Reflect.get(target, property, receiver);
+            }
             const entry = registry.roots.get(property) ??
                 registry.rootsCaseInsensitive.get(property.toLowerCase());
             if (!entry) {
@@ -853,13 +912,7 @@ function createCmsClient(descriptor, config) {
             return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options);
         },
     });
-    const client = Object.assign(rootProxy, {
-        models: modelsProxy,
-        locales: config.locales ?? [],
-        defaultLocale: config.defaultLocale,
-        includeIdDefault: !!config.includeId,
-    });
-    return client;
+    return rootProxy;
 }
 function cms0(config) {
     return createCmsClient(schema_descriptors_1.schemaDescriptor, config);