@cms0/cms0 0.2.20 → 0.2.22

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 import { attachCms0ProvenanceRoot, enableCms0ProvenanceTracking, isCms0CanvasTransportEnabled, registerCms0CollectionItemIdentity, } from "@cms0/cms0/provenance";
 import { ensureBrowserSchemaDescriptorDevSubscription, getActiveSchemaDescriptor, invalidateBrowserSchemaDescriptorCache, resolveBrowserSchemaDescriptor, } from "@cms0/cms0/schema-descriptors";
-import { buildZodSchemasFromDescriptor, decodeTaggedUnionValue, getUnionBranchKeys, } from "@cms0/shared";
+import { buildZodSchemasFromDescriptor, decodeTaggedUnionValue, deriveAssetFilenameFromStorageKey, deriveAssetKindFromStorageKey, getAssetLogicalPath, getUnionBranchKeys, inferAssetKindFromFilename, normalizeAssetFilename, serializeGraphQueryOptions, } from "@cms0/shared";
 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 }.";
@@ -15,7 +15,7 @@ function normalizeAssetBaseUrl(baseUrl) {
     return trimmed.replace(/\/+$/, "");
 }
 function encodeFilenameForUrl(filename) {
-    const normalized = filename.replace(/\\/g, "/").replace(/^\/+/, "").trim();
+    const normalized = normalizeAssetFilename(filename);
     if (!normalized)
         return "";
     return normalized
@@ -24,11 +24,32 @@ function encodeFilenameForUrl(filename) {
         .map((segment) => encodeURIComponent(segment))
         .join("/");
 }
+function resolveAssetUrlSuffix(uploadsPath, asset) {
+    const storageKey = asset.storageKey?.trim();
+    const derivedSuffix = storageKey?.startsWith("uploads/")
+        ? storageKey.slice("uploads/".length)
+        : getAssetLogicalPath(asset.kind, asset.filename).slice("uploads/".length);
+    if (uploadsPath.endsWith("/uploads/images") ||
+        uploadsPath.endsWith("/uploads/videos") ||
+        uploadsPath.endsWith("/uploads/files")) {
+        return encodeFilenameForUrl(asset.filename);
+    }
+    if (uploadsPath !== "/uploads" && !uploadsPath.endsWith("/uploads")) {
+        return encodeFilenameForUrl(asset.filename);
+    }
+    return encodeFilenameForUrl(derivedSuffix);
+}
 function buildAssetUrlBuilder(apiBaseUrl, assetOptions) {
     const uploadsPath = normalizeUploadsPath(assetOptions?.uploadsPath);
+    const customResolver = assetOptions?.resolveUrl;
     const explicitBaseUrl = normalizeAssetBaseUrl(assetOptions?.baseUrl);
     if (explicitBaseUrl) {
-        return (filename) => `${explicitBaseUrl}${uploadsPath}/${encodeFilenameForUrl(filename)}`;
+        return (asset) => {
+            const customUrl = customResolver?.(asset)?.trim();
+            if (customUrl)
+                return customUrl;
+            return `${explicitBaseUrl}${uploadsPath}/${resolveAssetUrlSuffix(uploadsPath, asset)}`;
+        };
     }
     let inferredBaseUrl = "";
     try {
@@ -37,13 +58,21 @@ function buildAssetUrlBuilder(apiBaseUrl, assetOptions) {
     catch {
         inferredBaseUrl = "";
     }
-    return (filename) => `${inferredBaseUrl}${uploadsPath}/${encodeFilenameForUrl(filename)}`;
+    return (asset) => {
+        const customUrl = customResolver?.(asset)?.trim();
+        if (customUrl)
+            return customUrl;
+        return `${inferredBaseUrl}${uploadsPath}/${resolveAssetUrlSuffix(uploadsPath, asset)}`;
+    };
 }
 function maybeAttachAssetUrl(value, assetUrlBuilder) {
     if (!value || typeof value !== "object" || Array.isArray(value))
         return value;
     const source = value;
-    const filename = typeof source.filename === "string" ? source.filename.trim() : "";
+    const storageKey = typeof source.storageKey === "string" ? source.storageKey.trim() : "";
+    const filename = typeof source.filename === "string" && source.filename.trim().length > 0
+        ? source.filename.trim()
+        : deriveAssetFilenameFromStorageKey(storageKey) ?? "";
     if (!filename)
         return value;
     const isAssetShape = typeof source.mimeType === "string" ||
@@ -57,9 +86,17 @@ function maybeAttachAssetUrl(value, assetUrlBuilder) {
     const existingUrl = typeof source.url === "string" && source.url.trim().length > 0
         ? source.url
         : null;
+    const kind = deriveAssetKindFromStorageKey(storageKey) ?? inferAssetKindFromFilename(filename);
     return {
         ...source,
-        url: existingUrl ?? assetUrlBuilder(filename),
+        filename,
+        ...(storageKey ? { storageKey } : {}),
+        url: existingUrl ??
+            assetUrlBuilder({
+                filename,
+                kind,
+                ...(storageKey ? { storageKey } : {}),
+            }),
     };
 }
 async function mapWithConcurrency(items, concurrency, mapper) {
@@ -85,7 +122,9 @@ async function mapWithConcurrency(items, concurrency, mapper) {
 function extractId(value) {
     if (typeof value === "string" && value.length > 0)
         return value;
-    if (value && typeof value === "object" && typeof value.id === "string") {
+    if (value &&
+        typeof value === "object" &&
+        typeof value.id === "string") {
         return value.id;
     }
     return null;
@@ -175,7 +214,9 @@ function isUnionDescriptor(desc) {
     return desc.kind === "union" && Array.isArray(desc.anyOf);
 }
 function isScalarDescriptor(desc) {
-    return isPrimitiveDescriptor(desc) || isEnumDescriptor(desc) || isUnionDescriptor(desc);
+    return (isPrimitiveDescriptor(desc) ||
+        isEnumDescriptor(desc) ||
+        isUnionDescriptor(desc));
 }
 function isModelRefDescriptor(desc) {
     return desc.kind === "modelRef";
@@ -189,7 +230,10 @@ function isArrayDescriptor(desc) {
 function attachIdIfObject(value, id) {
     if (!id)
         return value;
-    if (value && typeof value === "object" && !Array.isArray(value) && !value.id) {
+    if (value &&
+        typeof value === "object" &&
+        !Array.isArray(value) &&
+        !value.id) {
         return { ...value, id };
     }
     return value;
@@ -321,11 +365,13 @@ function toPlainText(value) {
     return "";
 }
 function coerceRichTextValue(value) {
-    const source = value && typeof value === "object" ? 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 normalizedValue = source.value !== undefined ? source.value : (value ?? {});
     const html = typeof source.html === "string"
         ? source.html
         : typeof nested?.html === "string"
@@ -340,8 +386,12 @@ 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)
+    const record = source && typeof source === "object"
+        ? source
+        : {};
+    const localesSource = record.locales &&
+        typeof record.locales === "object" &&
+        !Array.isArray(record.locales)
         ? record.locales
         : {};
     const locales = {};
@@ -413,8 +463,11 @@ function coerceCustomTypeValue(descriptor, value, options) {
         return value;
     if (customType === "RichText")
         return coerceRichTextValue(value);
-    if (customType === "File" || customType === "Image" || customType === "Video") {
-        return maybeAttachAssetUrl(value, options?.assetUrlBuilder ?? ((filename) => filename));
+    if (customType === "File" ||
+        customType === "Image" ||
+        customType === "Video") {
+        return maybeAttachAssetUrl(value, options?.assetUrlBuilder ??
+            ((asset) => asset.storageKey ?? asset.filename));
     }
     if (customType === "LocalizedString") {
         return coerceLocalizedStringValue(value, options?.locale, options?.defaultLocale);
@@ -489,7 +542,10 @@ function decodeUnionValueFromRawField(descriptor, raw) {
     if (direct) {
         return { ...direct, rowId: extractId(raw) };
     }
-    if (raw && typeof raw === "object" && !Array.isArray(raw) && "value" in raw) {
+    if (raw &&
+        typeof raw === "object" &&
+        !Array.isArray(raw) &&
+        "value" in raw) {
         const nested = decodeUnionEnvelope(descriptor, raw.value);
         if (nested) {
             return { ...nested, rowId: extractId(raw) };
@@ -507,17 +563,22 @@ function ensureCollectionEnvelope(data, path) {
             total: Number(data.total ?? data.items.length ?? 0),
         };
     }
+    if (data && typeof data === "object" && Array.isArray(data.data)) {
+        const pagination = data.pagination;
+        return {
+            items: data.data,
+            total: Number((pagination && typeof pagination === "object"
+                ? pagination.total
+                : undefined) ?? data.data.length ?? 0),
+        };
+    }
     throw new Error(`${COLLECTION_SHAPE_ERROR} Path: '${path}'.`);
 }
 async function readCanvasModelRefCollectionIdentities(path, descriptor, context) {
     const cache = context.canvasModelRefCollectionIdentityCache;
     if (!cache)
         return null;
-    const cacheKey = [
-        path,
-        descriptor.model,
-        context.options.locale ?? "",
-    ].join("::");
+    const cacheKey = [path, descriptor.model, context.options.locale ?? ""].join("::");
     const existing = cache.get(cacheKey);
     if (existing) {
         return existing;
@@ -576,7 +637,7 @@ async function normalizeModelRef(modelName, id, context, trail, isCollectionItem
     nextTrail.add(nodeKey);
     const promise = (async () => {
         const modelPath = `models/${modelName}/${id}`;
-        const resolvedModelPath = `_resolved/models/${encodeURIComponent(modelName)}/${encodeURIComponent(id)}`;
+        const resolvedModelPath = `_graph/models/${encodeURIComponent(modelName)}/${encodeURIComponent(id)}`;
         const rawModel = inlineModel ??
             (await (async () => {
                 const query = {
@@ -665,7 +726,9 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
                 : await context.requestJson(childPath, {
                     query: {
                         raw: 1,
-                        ...(context.options.locale ? { locale: context.options.locale } : {}),
+                        ...(context.options.locale
+                            ? { locale: context.options.locale }
+                            : {}),
                     },
                 });
             const normalizedChild = await normalizeArrayField(propertyDescriptor, childPath, childRaw, context, trail, inlineChildRaw !== undefined, childProjectionPathTokens);
@@ -688,7 +751,9 @@ async function normalizeObjectField(descriptor, path, raw, context, trail, isCol
                 : await context.requestJson(childPath, {
                     query: {
                         raw: 1,
-                        ...(context.options.locale ? { locale: context.options.locale } : {}),
+                        ...(context.options.locale
+                            ? { locale: context.options.locale }
+                            : {}),
                     },
                 });
             const normalizedChild = await normalizeObjectField(propertyDescriptor, childPath, childRaw, context, trail, false, childProjectionPathTokens);
@@ -722,11 +787,15 @@ async function normalizeArrayField(descriptor, path, raw, context, trail, inline
             }
             const id = extractId(row);
             const valueWithId = attachIdForScalarDescriptor(itemDescriptor, normalizedValue, id);
-            const isObjectValue = valueWithId && typeof valueWithId === "object" && !Array.isArray(valueWithId);
+            const isObjectValue = valueWithId &&
+                typeof valueWithId === "object" &&
+                !Array.isArray(valueWithId);
             if (!id) {
                 return valueWithId;
             }
-            return isObjectValue ? { id, ...valueWithId } : { id, value: valueWithId };
+            return isObjectValue
+                ? { id, ...valueWithId }
+                : { id, value: valueWithId };
         });
     }
     if (isModelRefDescriptor(itemDescriptor)) {
@@ -759,9 +828,7 @@ async function normalizeArrayField(descriptor, path, raw, context, trail, inline
     if (isObjectDescriptor(itemDescriptor)) {
         return mapWithConcurrency(envelope.items, context.options.modelNormalizationConcurrency, async (row) => {
             const rowId = extractId(row);
-            const rowPath = rowId
-                ? `${path}/${encodeURIComponent(rowId)}`
-                : path;
+            const rowPath = rowId ? `${path}/${encodeURIComponent(rowId)}` : path;
             return normalizeObjectField(itemDescriptor, rowPath, row, context, trail, true, projectionPathTokens);
         });
     }
@@ -927,7 +994,7 @@ function createResourceRegistry(descriptor) {
     };
 }
 function normalizeBaseUrl(baseUrl) {
-    const cleaned = baseUrl?.trim().replace(/\/$/, "") ?? "";
+    const cleaned = baseUrl?.trim().replace(/\/+$/, "") ?? "";
     if (!cleaned) {
         throw new Error("cms0: apiConfig.baseUrl is required to consume API resources.");
     }
@@ -940,28 +1007,39 @@ function resolveIncludeIdMode(includeId, globalIncludeId) {
 function shouldIncludeObjectId(mode, _isCollectionItem) {
     return mode === "all";
 }
-function buildSearchParams(query) {
+function isPlainObject(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function appendQueryValue(params, key, rawValue) {
+    if (rawValue === undefined || rawValue === null)
+        return;
+    if (Array.isArray(rawValue)) {
+        const values = rawValue.filter((value) => value !== undefined && value !== null);
+        if (values.length === 0)
+            return;
+        if (key.endsWith(".fields") ||
+            key.endsWith(".exclude") ||
+            key === "fields" ||
+            key === "exclude") {
+            params.set(key, values.map(String).join(","));
+            return;
+        }
+        values.forEach((value) => params.append(key, String(value)));
+        return;
+    }
+    params.set(key, String(rawValue));
+}
+function buildSearchParams(query, graph) {
     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;
+    if (query) {
+        for (const [key, rawValue] of Object.entries(query)) {
+            appendQueryValue(params, key, rawValue);
         }
-        params.set(key, String(rawValue));
     }
+    const graphParams = serializeGraphQueryOptions(graph);
+    graphParams.forEach((value, key) => params.set(key, value));
     return params;
 }
-function isPlainObject(value) {
-    return !!value && typeof value === "object" && !Array.isArray(value);
-}
 function cloneValue(value) {
     if (Array.isArray(value)) {
         return value.map((item) => cloneValue(item));
@@ -1109,8 +1187,73 @@ function applyFieldProjection(value, fields, exclude) {
     }
     return projected;
 }
+function escapeGraphPointerToken(token) {
+    return String(token).replace(/~/g, "~0").replace(/\//g, "~1");
+}
+function buildGraphPointerPath(path) {
+    return path.length === 0
+        ? "/"
+        : `/${path.map((token) => escapeGraphPointerToken(token)).join("/")}`;
+}
+function buildProjectionPath(path) {
+    return path
+        .filter((token) => typeof token === "string")
+        .map((token) => String(token))
+        .join(".");
+}
+function readValueAtPath(value, path) {
+    let current = value;
+    for (const token of path) {
+        if (Array.isArray(current)) {
+            const index = Number(token);
+            if (!Number.isInteger(index) || index < 0)
+                return undefined;
+            current = current[index];
+            continue;
+        }
+        if (!isPlainObject(current))
+            return undefined;
+        current = current[String(token)];
+    }
+    return current;
+}
+function buildSetOpsFromPatch(value, path = []) {
+    if (value === undefined)
+        return [];
+    if (Array.isArray(value) || !isPlainObject(value)) {
+        return [{ op: "set", path: buildGraphPointerPath(path), value }];
+    }
+    const entries = Object.entries(value).filter(([, child]) => child !== undefined);
+    if (!entries.length) {
+        return path.length
+            ? [{ op: "set", path: buildGraphPointerPath(path), value }]
+            : [];
+    }
+    return entries.flatMap(([key, child]) => buildSetOpsFromPatch(child, [...path, key]));
+}
+function getModelObjectDescriptor(descriptor, modelName) {
+    const model = descriptor.models?.[modelName];
+    if (!model)
+        return undefined;
+    return asModelObjectDescriptor(modelName, descriptor);
+}
+function getDescriptorChild(descriptor, field, key) {
+    if (!field)
+        return undefined;
+    if (isModelRefDescriptor(field)) {
+        const model = getModelObjectDescriptor(descriptor, field.model);
+        return getDescriptorChild(descriptor, model, key);
+    }
+    if (isArrayDescriptor(field)) {
+        return getDescriptorChild(descriptor, field.items, key);
+    }
+    if (isObjectDescriptor(field)) {
+        return field.properties[key];
+    }
+    return undefined;
+}
 async function requestJson(baseUrl, apiKey, path, options) {
-    const params = buildSearchParams(options?.query);
+    const params = buildSearchParams(options?.query, options?.graph);
     const url = `${baseUrl}/${path}${params.toString() ? `?${params.toString()}` : ""}`;
     const response = await fetch(url, {
         method: "GET",
@@ -1124,6 +1267,34 @@ async function requestJson(baseUrl, apiKey, path, options) {
     }
     return response.json();
 }
+async function request(baseUrl, apiKey, method, path, body, options) {
+    const params = buildSearchParams(options?.query, options?.graph);
+    const url = `${baseUrl}/${path}${params.toString() ? `?${params.toString()}` : ""}`;
+    const headers = {
+        ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
+    };
+    if (body !== undefined) {
+        headers["content-type"] = "application/json";
+    }
+    const response = await fetch(url, {
+        method,
+        signal: options?.signal,
+        headers,
+        ...(body !== undefined ? { body: JSON.stringify(body) } : {}),
+    });
+    if (!response.ok) {
+        throw new Error(`Request failed for '${path}' with status ${response.status}: ${response.statusText}`);
+    }
+    const text = await response.text();
+    if (!text)
+        return undefined;
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return text;
+    }
+}
 function validateResult(resource, result, descriptor, includeIdMode, zodSchemas, modelZodSchemas) {
     if (includeIdMode === "all")
         return;
@@ -1166,13 +1337,13 @@ function attachResourceProvenanceWithOptions(resource, value, options) {
     enableCms0ProvenanceTracking(true);
     const rootId = resource.kind === "root"
         ? resource.key
-        : resource.modelName ?? resource.key;
+        : (resource.modelName ?? resource.key);
     return attachCms0ProvenanceRoot(value, rootId, options);
 }
 async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options, byId, provenanceOptions) {
     const responseMode = options?.response ?? "normalized";
     const includeIdMode = resolveIncludeIdMode(options?.includeId, globalIncludeId);
-    const resolveModelRefs = options?.resolveModelRefs !== false;
+    const resolveModelRefs = options?.graph?.resolveModelRefs !== false;
     const includeProjectionPaths = normalizeProjectionPaths(options?.fields);
     const excludeProjectionPaths = normalizeProjectionPaths(options?.exclude);
     const shouldValidateFullResult = includeProjectionPaths.length === 0 && excludeProjectionPaths.length === 0;
@@ -1180,18 +1351,20 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
         (typeof options?.query?.locale === "string"
             ? options.query.locale
             : undefined);
-    const locale = requestedLocale ??
-        (responseMode === "normalized" ? "all" : undefined);
+    const locale = requestedLocale ?? (responseMode === "normalized" ? "all" : undefined);
     const query = {
         ...(options?.query ?? {}),
     };
-    if (options?.fields !== undefined && query.fields === undefined) {
-        query.fields = Array.isArray(options.fields)
+    const graphQuery = {
+        ...options?.graph,
+    };
+    if (options?.fields !== undefined && graphQuery.fields === undefined) {
+        graphQuery.fields = Array.isArray(options.fields)
             ? options.fields.join(",")
             : options.fields;
     }
-    if (options?.exclude !== undefined && query.exclude === undefined) {
-        query.exclude = Array.isArray(options.exclude)
+    if (options?.exclude !== undefined && graphQuery.exclude === undefined) {
+        graphQuery.exclude = Array.isArray(options.exclude)
             ? options.exclude.join(",")
             : options.exclude;
     }
@@ -1199,8 +1372,8 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
     if (shouldNormalize && query.raw === undefined) {
         query.raw = 1;
     }
-    if (locale && query.locale === undefined) {
-        query.locale = locale;
+    if (locale && graphQuery.locale === undefined) {
+        graphQuery.locale = locale;
     }
     const useResolvedEndpoint = shouldNormalize &&
         !byId &&
@@ -1208,20 +1381,25 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
         !resource.isCollection &&
         isObjectDescriptor(resource.descriptor) &&
         resolveModelRefs;
-    if (useResolvedEndpoint && query.resolveModelRefs === undefined) {
-        query.resolveModelRefs = 1;
+    if (useResolvedEndpoint &&
+        graphQuery.resolveModelRefs === undefined) {
+        graphQuery.resolveModelRefs = true;
+    }
+    if (useResolvedEndpoint && graphQuery.pageSize === undefined) {
+        graphQuery.pageSize = "full";
     }
     const normalizePath = byId
         ? `${resource.path}/${encodeURIComponent(byId)}`
         : resource.path;
     const requestPath = useResolvedEndpoint
-        ? `_resolved/${encodeURIComponent(resource.key)}`
+        ? `_graph/${encodeURIComponent(resource.key)}`
         : normalizePath;
     let rawData;
     if (useResolvedEndpoint) {
         try {
             rawData = await requestJson(baseUrl, apiKey, requestPath, {
                 query,
+                graph: graphQuery,
                 signal: options?.signal,
             });
         }
@@ -1229,6 +1407,7 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
             try {
                 rawData = await requestJson(baseUrl, apiKey, normalizePath, {
                     query,
+                    graph: graphQuery,
                     signal: options?.signal,
                 });
             }
@@ -1240,6 +1419,7 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
     else {
         rawData = await requestJson(baseUrl, apiKey, requestPath, {
             query,
+            graph: graphQuery,
             signal: options?.signal,
         });
     }
@@ -1304,6 +1484,80 @@ async function runResource(resource, descriptor, baseUrl, apiKey, defaultLocale,
     }
     return attachResourceProvenanceWithOptions(resource, applyFieldProjection(normalized, options?.fields, options?.exclude), provenanceOptions);
 }
+function createConcreteGraphAccessor(input, path = [], fieldDescriptor = input.entry.descriptor) {
+    const read = async (options) => {
+        const projectionPath = buildProjectionPath(path);
+        const value = await runResource(input.entry, input.descriptor, input.baseUrl, input.apiKey, input.defaultLocale, input.assetUrlBuilder, input.zodSchemas, input.modelZodSchemas, input.globalIncludeId, input.sharedModelInflightCache, projectionPath
+            ? {
+                ...options,
+                fields: options?.fields === undefined ? projectionPath : options.fields,
+            }
+            : options);
+        return projectionPath ? readValueAtPath(value, path) : value;
+    };
+    const mutate = async (ops) => {
+        if (!ops.length)
+            return;
+        await request(input.baseUrl, input.apiKey, "POST", `_graph/${input.entry.path}/_mutate`, { ops });
+    };
+    const update = async (value) => {
+        await mutate(buildSetOpsFromPatch(value, path));
+    };
+    const set = async (value) => {
+        await mutate([{ op: "set", path: buildGraphPointerPath(path), value }]);
+    };
+    const fieldFn = read;
+    return new Proxy(fieldFn, {
+        get(target, property, receiver) {
+            if (typeof property !== "string") {
+                return Reflect.get(target, property, receiver);
+            }
+            if (property === "then")
+                return undefined;
+            if (property === "update")
+                return update;
+            if (property === "set")
+                return set;
+            if (property === "delete") {
+                return async () => {
+                    await mutate([{ op: "delete", path: buildGraphPointerPath(path) }]);
+                };
+            }
+            if (property === "append") {
+                return async (value) => {
+                    await mutate([
+                        {
+                            op: "insert",
+                            path: buildGraphPointerPath([...path, "-"]),
+                            value,
+                        },
+                    ]);
+                };
+            }
+            if (property === "insert") {
+                return async (index, value) => {
+                    await mutate([
+                        {
+                            op: "insert",
+                            path: buildGraphPointerPath([...path, index]),
+                            value,
+                        },
+                    ]);
+                };
+            }
+            if (property === "at") {
+                return (index) => createConcreteGraphAccessor(input, [...path, index], isArrayDescriptor(fieldDescriptor)
+                    ? fieldDescriptor.items
+                    : fieldDescriptor);
+            }
+            const childDescriptor = getDescriptorChild(input.descriptor, fieldDescriptor, property);
+            if (childDescriptor) {
+                return createConcreteGraphAccessor(input, [...path, property], childDescriptor);
+            }
+            return Reflect.get(target, property, receiver);
+        },
+    });
+}
 export function createCmsClient(descriptor, config) {
     const baseUrl = normalizeBaseUrl(config.apiConfig?.baseUrl);
     const apiKey = config.apiConfig?.key;
@@ -1316,7 +1570,20 @@ export function createCmsClient(descriptor, config) {
     const sharedModelInflightCache = new Map();
     const buildModelAccessor = (entry) => {
         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);
+        accessor.byId = (async (id, options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options, id));
+        accessor.list = async (options) => accessor(options);
+        accessor.get = async (id, options) => accessor.byId(id, options);
+        accessor.create = async (value) => {
+            const response = await request(baseUrl, apiKey, "POST", entry.path, value);
+            return response;
+        };
+        accessor.update = async (id, value) => {
+            const response = await request(baseUrl, apiKey, "POST", `_graph/${entry.path}/${encodeURIComponent(id)}/_mutate`, { ops: buildSetOpsFromPatch(value) });
+            return response;
+        };
+        accessor.delete = async (id) => {
+            await request(baseUrl, apiKey, "DELETE", `${entry.path}?id=${encodeURIComponent(id)}`);
+        };
         return accessor;
     };
     const modelsProxy = new Proxy({}, {
@@ -1380,7 +1647,18 @@ export function createCmsClient(descriptor, config) {
             if (!entry) {
                 unknownKeyError(property, rootKeys, []);
             }
-            return async (options) => runResource(entry, descriptor, baseUrl, apiKey, config.defaultLocale, assetUrlBuilder, zodSchemas, modelZodSchemas, globalIncludeId, sharedModelInflightCache, options);
+            return createConcreteGraphAccessor({
+                apiKey,
+                assetUrlBuilder,
+                baseUrl,
+                defaultLocale: config.defaultLocale,
+                descriptor,
+                entry,
+                globalIncludeId,
+                modelZodSchemas,
+                sharedModelInflightCache,
+                zodSchemas,
+            });
         },
     });
     return rootProxy;
@@ -1422,6 +1700,50 @@ function createLazyBrowserCmsClient(config) {
             throw error;
         }
     };
+    const getNestedAccessor = (client, rootProperty, path) => {
+        let current = client[rootProperty];
+        for (const token of path) {
+            current =
+                typeof token === "number" ? current.at(token) : current[String(token)];
+        }
+        return current;
+    };
+    const functionMemberNames = new Set([
+        "apply",
+        "bind",
+        "call",
+        "hasOwnProperty",
+        "isPrototypeOf",
+        "propertyIsEnumerable",
+        "toLocaleString",
+        "toString",
+        "valueOf",
+    ]);
+    const buildLazyGraphAccessor = (rootProperty, path = []) => {
+        const accessor = (async (options) => runBrowserAccessor((client) => getNestedAccessor(client, rootProperty, path)(options)));
+        return new Proxy(accessor, {
+            get(target, property, receiver) {
+                if (typeof property !== "string") {
+                    return Reflect.get(target, property, receiver);
+                }
+                if (property === "then")
+                    return undefined;
+                if (functionMemberNames.has(property)) {
+                    return Reflect.get(target, property, receiver);
+                }
+                if (property === "update" || property === "set" || property === "delete") {
+                    return (...args) => runBrowserAccessor((client) => getNestedAccessor(client, rootProperty, path)[property](...args));
+                }
+                if (property === "append" || property === "insert") {
+                    return (...args) => runBrowserAccessor((client) => getNestedAccessor(client, rootProperty, path)[property](...args));
+                }
+                if (property === "at") {
+                    return (index) => buildLazyGraphAccessor(rootProperty, [...path, index]);
+                }
+                return buildLazyGraphAccessor(rootProperty, [...path, property]);
+            },
+        });
+    };
     const buildModelAccessor = (property) => {
         const accessor = (async (options) => {
             return runBrowserAccessor((client) => client.models[property](options));
@@ -1429,6 +1751,21 @@ function createLazyBrowserCmsClient(config) {
         accessor.byId = async (id, options) => {
             return runBrowserAccessor((client) => client.models[property].byId(id, options));
         };
+        accessor.list = async (options) => {
+            return runBrowserAccessor((client) => client.models[property].list(options));
+        };
+        accessor.get = async (id, options) => {
+            return runBrowserAccessor((client) => client.models[property].get(id, options));
+        };
+        accessor.create = async (value) => {
+            return runBrowserAccessor((client) => client.models[property].create(value));
+        };
+        accessor.update = async (id, value) => {
+            return runBrowserAccessor((client) => client.models[property].update(id, value));
+        };
+        accessor.delete = async (id) => {
+            return runBrowserAccessor((client) => client.models[property].delete(id));
+        };
         return accessor;
     };
     const modelsProxy = new Proxy({}, {
@@ -1459,9 +1796,7 @@ function createLazyBrowserCmsClient(config) {
             if (Reflect.has(target, property)) {
                 return Reflect.get(target, property, receiver);
             }
-            return async (options) => {
-                return runBrowserAccessor((client) => client[property](options));
-            };
+            return buildLazyGraphAccessor(property);
         },
     });
     return rootProxy;