@bobbykim/manguito-cms-api 0.6.0 → 0.7.0

package/dist/index.js

@@ -38,7 +38,7 @@ function isColumnBacked(field) {
   if (col.junction) return false;
   return true;
 }
-function buildFieldKeyMap(pairs, allLabels, droppedKeys) {
+function buildFieldKeyMap(pairs, allLabels, droppedColumns, droppedLabels) {
   const labelToColumn = /* @__PURE__ */ new Map();
   const columnToLabel = /* @__PURE__ */ new Map();
   for (const { label, column } of pairs) {
@@ -46,7 +46,7 @@ function buildFieldKeyMap(pairs, allLabels, droppedKeys) {
     columnToLabel.set(column, label);
   }
   for (const { label, ownColumn } of allLabels) {
-    if (ownColumn === label) continue;
+    if (ownColumn !== void 0) continue;
     const columnOwner = columnToLabel.get(label);
     if (columnOwner !== void 0 && columnOwner !== label) {
       throw new Error(
@@ -55,23 +55,33 @@ function buildFieldKeyMap(pairs, allLabels, droppedKeys) {
     }
   }
   for (const label of labelToColumn.keys()) {
-    if (droppedKeys.has(label)) labelToColumn.delete(label);
+    if (droppedLabels.has(label)) labelToColumn.delete(label);
   }
   for (const column of columnToLabel.keys()) {
-    if (droppedKeys.has(column)) columnToLabel.delete(column);
+    if (droppedColumns.has(column)) columnToLabel.delete(column);
   }
   const diverges = [...labelToColumn].some(([label, column]) => label !== column);
-  function remap(input, lookup) {
+  function remap(input, lookup, dropped, droppedIfUnmapped) {
     const out = {};
     for (const key of Object.keys(input)) {
-      if (droppedKeys.has(key)) continue;
-      out[lookup.get(key) ?? key] = input[key];
+      const mapped = lookup.get(key);
+      if (mapped !== void 0) {
+        out[mapped] = input[key];
+        continue;
+      }
+      if (dropped.has(key) || droppedIfUnmapped?.has(key)) continue;
+      out[key] = input[key];
     }
     return out;
   }
   return {
-    toStorage: (input) => remap(input, labelToColumn),
-    toLabels: (row) => remap(row, columnToLabel),
+    // toStorage reads LABEL-keyed input: a live label maps and writes
+    // regardless of either drop set; an unmapped key is refused if it is
+    // EITHER the tombstone's own name (droppedLabels) or a raw, unexposed
+    // column (droppedColumns) — see remap's comment.
+    // toLabels reads COLUMN-keyed input, so it consults only droppedColumns.
+    toStorage: (input) => remap(input, labelToColumn, droppedLabels, droppedColumns),
+    toLabels: (row) => remap(row, columnToLabel, droppedColumns),
     columnFor: (label) => labelToColumn.get(label),
     labelFor: (column) => columnToLabel.get(column),
     labels: [...labelToColumn.keys()],
@@ -79,14 +89,15 @@ function buildFieldKeyMap(pairs, allLabels, droppedKeys) {
   };
 }
 function createFieldKeyMap(fields) {
-  const droppedKeys = /* @__PURE__ */ new Set();
+  const droppedColumns = /* @__PURE__ */ new Set();
+  const droppedLabels = /* @__PURE__ */ new Set();
   const pairs = [];
   for (const f of fields) {
     if (!isColumnBacked(f)) continue;
     pairs.push({ label: f.name, column: f.db_column.column_name });
     if (f.removed === true) {
-      droppedKeys.add(f.name);
-      droppedKeys.add(f.db_column.column_name);
+      droppedLabels.add(f.name);
+      droppedColumns.add(f.db_column.column_name);
     }
   }
   return buildFieldKeyMap(
@@ -97,30 +108,33 @@ function createFieldKeyMap(fields) {
       // forbids present-and-undefined.
       ...isColumnBacked(f) && { ownColumn: f.db_column.column_name }
     })),
-    droppedKeys
+    droppedColumns,
+    droppedLabels
   );
 }
 function createFieldKeyMapFromProjection(projectionType, allFields) {
   const pairs = projectionType.fields.map((f) => ({ label: f.exposed_as, column: f.column_name }));
-  const projected = new Set(pairs.map((p) => p.label));
-  const dropped = /* @__PURE__ */ new Set();
+  const projectedColumns = new Set(pairs.map((p) => p.column));
+  const projectedLabels = new Set(pairs.map((p) => p.label));
+  const droppedColumns = /* @__PURE__ */ new Set();
+  const droppedLabels = /* @__PURE__ */ new Set();
   for (const f of allFields) {
     if (!isColumnBacked(f)) continue;
-    dropped.add(f.name);
-    dropped.add(f.db_column.column_name);
+    if (!projectedColumns.has(f.db_column.column_name)) droppedColumns.add(f.db_column.column_name);
+    if (!projectedLabels.has(f.name)) droppedLabels.add(f.name);
   }
-  for (const p of pairs) dropped.delete(p.column);
-  for (const label of projected) dropped.delete(label);
   return buildFieldKeyMap(
     pairs,
     allFields.map((f) => ({
       label: f.name,
-      // See buildFieldKeyMap's collision check: this is what lets it tell a
-      // version exposing a field's own column under a new label (fine) from a
-      // label that reuses another field's column (not fine).
+      // See buildFieldKeyMap's collision check: `ownColumn` marks every
+      // column-backed field so the check skips it entirely — only a
+      // paragraph/junction/programmatic label (no column of its own) can
+      // still collide.
       ...isColumnBacked(f) && { ownColumn: f.db_column.column_name }
     })),
-    dropped
+    droppedColumns,
+    droppedLabels
   );
 }
 var init_field_keys = __esm({
@@ -299,9 +313,8 @@ function groupBy(items, key) {
   }
   return result;
 }
-function needsFkResolution(row, fkColumn, fieldName) {
-  if (fkColumn !== fieldName && !(fkColumn in row)) return false;
-  const current = row[fieldName];
+function needsFkResolution(row, fkColumn) {
+  const current = row[fkColumn];
   return !(typeof current === "object" && current !== null);
 }
 async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOnly = false) {
@@ -318,15 +331,11 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
       row[fieldName] = byParent[row["id"]] ?? [];
     }
   } else if (rel.type === "reference") {
-    const dropFk = rel.fk_column !== fieldName;
-    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column, fieldName));
+    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column));
     if (pending.length === 0) return;
     const fkValues = pending.map((r) => r[rel.fk_column]).filter(Boolean);
     if (fkValues.length === 0) {
-      for (const row of pending) {
-        row[fieldName] = null;
-        if (dropFk) delete row[rel.fk_column];
-      }
+      for (const row of pending) row[rel.fk_column] = null;
       return;
     }
     const unique = [...new Set(fkValues)];
@@ -343,8 +352,7 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     }
     for (const row of pending) {
       const fkVal = row[rel.fk_column];
-      row[fieldName] = fkVal ? cache.get(`${rel.table}:${fkVal}`) ?? null : null;
-      if (dropFk) delete row[rel.fk_column];
+      row[rel.fk_column] = fkVal ? cache.get(`${rel.table}:${fkVal}`) ?? null : null;
     }
   } else if (rel.type === "junction") {
     const parentIds = batch.map((r) => r["id"]);
@@ -372,15 +380,11 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
       row[fieldName] = jEntries.map((jr) => cache.get(`${rel.table}:${jr[rel.right_column]}`)).filter(Boolean);
     }
   } else if (rel.type === "media") {
-    const dropFk = rel.fk_column !== fieldName;
-    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column, fieldName));
+    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column));
     if (pending.length === 0) return;
     const fkValues = pending.map((r) => r[rel.fk_column]).filter(Boolean);
     if (fkValues.length === 0) {
-      for (const row of pending) {
-        row[fieldName] = null;
-        if (dropFk) delete row[rel.fk_column];
-      }
+      for (const row of pending) row[rel.fk_column] = null;
       return;
     }
     const unique = [...new Set(fkValues)];
@@ -394,8 +398,7 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     }
     for (const row of pending) {
       const fkVal = row[rel.fk_column];
-      row[fieldName] = fkVal ? cache.get(`media:${fkVal}`) ?? null : null;
-      if (dropFk) delete row[rel.fk_column];
+      row[rel.fk_column] = fkVal ? cache.get(`media:${fkVal}`) ?? null : null;
     }
   }
 }
@@ -677,29 +680,22 @@ function scalarFieldResolver(field, fallback) {
 function relationFieldResolver(typeName, schemaFieldName) {
   return (parent, _args, ctx) => ctx.loaders.load(typeName, schemaFieldName, parent);
 }
-function programmaticFieldResolver(typeName, schemaFieldName, mediaFields = [], fieldKeys) {
+function programmaticFieldResolver(typeName, schemaFieldName, mediaFieldNames = [], fieldKeys) {
   return async (parent, _args, ctx) => {
     let p = ctx.programmaticMemo.get(parent);
     if (!p) {
-      p = resolveProgrammaticRow(typeName, parent, ctx, mediaFields, fieldKeys);
+      p = resolveProgrammaticRow(typeName, parent, ctx, mediaFieldNames, fieldKeys);
       ctx.programmaticMemo.set(parent, p);
     }
     return (await p)[schemaFieldName];
   };
 }
-async function resolveProgrammaticRow(typeName, parent, ctx, mediaFields, fieldKeys) {
+async function resolveProgrammaticRow(typeName, parent, ctx, mediaFieldNames, fieldKeys) {
   const toLabels = (row) => fieldKeys ? fieldKeys.toLabels(row) : row;
-  if (mediaFields.length === 0) return ctx.resolver.resolveItem(typeName, toLabels(parent));
+  if (mediaFieldNames.length === 0) return ctx.resolver.resolveItem(typeName, toLabels(parent));
   const enriched = { ...parent };
-  await Promise.all(mediaFields.map((m) => ctx.loaders.load(typeName, m.name, enriched)));
-  return ctx.resolver.resolveItem(typeName, relabelMedia(toLabels(enriched), enriched, mediaFields));
-}
-function relabelMedia(record, enriched, mediaFields) {
-  for (const { name, exposedAs } of mediaFields) {
-    if (!(name in enriched)) continue;
-    record[exposedAs] = enriched[name];
-  }
-  return record;
+  await Promise.all(mediaFieldNames.map((name) => ctx.loaders.load(typeName, name, enriched)));
+  return ctx.resolver.resolveItem(typeName, toLabels(enriched));
 }
 function collectionResolver(typeName, nameMap, fieldKeys) {
   return async (_root, args, ctx) => {
@@ -757,7 +753,7 @@ var init_resolvers = __esm({
 });
 
 // src/graphql/schema.ts
-function buildGraphQLSchema(registry, fieldKeyMaps = {}, view) {
+function buildGraphQLSchema(registry, fieldKeyMaps = {}, view, programmaticKeyMaps = fieldKeyMaps) {
   const objectTypes = /* @__PURE__ */ new Map();
   const enumTypes = /* @__PURE__ */ new Map();
   for (const [name, enumType] of Object.entries(registry.enum_types)) {
@@ -821,9 +817,9 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}, view) {
   }
   function buildObjectType(machineName, type) {
     const visible = viewFieldsFor(machineName, type);
-    const mediaFields = visible.filter(
-      (v) => v.field.field_type === "image" || v.field.field_type === "video" || v.field.field_type === "file"
-    ).map((v) => ({ name: v.field.name, exposedAs: v.exposedAs }));
+    const mediaFieldNames = type.fields.filter(
+      (f) => f.removed !== true && (f.field_type === "image" || f.field_type === "video" || f.field_type === "file")
+    ).map((f) => f.name);
     return new import_graphql5.GraphQLObjectType({
       name: graphqlTypeName(machineName),
       fields: () => {
@@ -843,7 +839,7 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}, view) {
           const outType = outputTypeForField(field, vf.required);
           let resolve;
           if (field.field_type === "programmatic") {
-            resolve = programmaticFieldResolver(machineName, field.name, mediaFields, fieldKeyMaps[machineName]);
+            resolve = programmaticFieldResolver(machineName, field.name, mediaFieldNames, programmaticKeyMaps[machineName]);
           } else if (field.field_type === "reference" || field.field_type === "paragraph" || field.field_type === "image" || field.field_type === "video" || field.field_type === "file") {
             resolve = relationFieldResolver(machineName, field.name);
           } else {
@@ -888,7 +884,10 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}, view) {
   for (const [name, ct] of Object.entries(registry.content_types)) {
     const objType = objectTypes.get(name);
     const visible = viewFieldsFor(name, ct);
-    const nameMap = buildFieldNameMap(visible.map((v) => v.exposedAs));
+    const nameMap = buildFieldNameMap([
+      ...visible.map((v) => v.exposedAs),
+      ...ct.system_fields.map((s) => s.name)
+    ]);
     if (ct.only_one) {
       queryFields[singleQueryName(name)] = { type: objType, resolve: singletonResolver(name) };
       continue;
@@ -1076,7 +1075,8 @@ function createRelationLoaders(db, registry) {
         async (parents) => {
           const rows = parents;
           await resolveRelationField(db, rows, fieldName, rel, cache, true);
-          return rows.map((r) => r[fieldName]);
+          const resultKey = rel.type === "reference" || rel.type === "media" ? rel.fk_column : fieldName;
+          return rows.map((r) => r[resultKey]);
         },
         // Batch within a tick; do not memoize by parent identity (rows are mutated
         // and may recur across nesting levels).
@@ -1161,7 +1161,7 @@ function createGraphQLHandler(registry, repos, fieldKeyMaps, resolver, db, optio
       currentVersion: versioning.currentVersion
     });
   }
-  const schema = buildGraphQLSchema(registry, fieldKeyMaps, view);
+  const schema = buildGraphQLSchema(registry, fieldKeyMaps, view, versioning.currentFieldKeyMaps ?? fieldKeyMaps);
   const { plugins } = buildArmorPlugin({
     maxDepth: options.maxDepth,
     maxComplexity: options.maxComplexity
@@ -1817,18 +1817,21 @@ function createProgrammaticResolver(resolvers, options) {
 }
 
 // src/projector.ts
+init_field_keys();
 function isPlainRow(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v) && !(v instanceof Date);
 }
 var MEDIA_FIELD_TYPES = /* @__PURE__ */ new Set(["image", "video", "file"]);
-function nestedTargets(fields) {
+function nestedTargets(fields, map) {
   const out = [];
   for (const f of fields) {
     if (MEDIA_FIELD_TYPES.has(f.field_type)) continue;
     if (f.field_type !== "paragraph" && f.field_type !== "reference") continue;
     const ref = f.ui_component.ref;
     if (!ref) continue;
-    out.push({ label: f.name, target: ref });
+    const label = isColumnBacked(f) ? map.labelFor(f.db_column.column_name) : f.name;
+    if (label === void 0) continue;
+    out.push({ label, target: ref });
   }
   return out;
 }
@@ -1846,7 +1849,7 @@ function buildProjectors(registry, fieldKeyMaps, fallbacks) {
       const typeFallbacks = fallbacks?.[typeName];
       projectors[typeName] = {
         map,
-        nested: nestedTargets(type.fields),
+        nested: nestedTargets(type.fields, map),
         // Spread rather than assign: with exactOptionalPropertyTypes, an optional
         // property may be ABSENT but not present-and-undefined.
         ...typeFallbacks !== void 0 && { fallbacks: typeFallbacks }
@@ -1933,7 +1936,28 @@ function parseFilters(url, validFields, columnFor) {
 function isPublished(item) {
   return item["published"] === true;
 }
-function registerPublicContentRoutes(app, registry, repos, projectors, paths, listRateLimit, resolver) {
+function registerPublicContentRoutes(app, registry, repos, projectors, paths, listRateLimit, resolver, resolverProjectors) {
+  const forResolver = resolverProjectors ?? projectors;
+  function pickProgrammatic(resolved, names) {
+    const out = {};
+    for (const name of names) if (name in resolved) out[name] = resolved[name];
+    return out;
+  }
+  async function respondItem(row, typeName, programmatic) {
+    const data = projectRow(row, typeName, projectors);
+    if (!resolver?.hasSchema(typeName)) return data;
+    const resolved = await resolver.resolveItem(typeName, projectRow(row, typeName, forResolver));
+    return { ...data, ...pickProgrammatic(resolved, programmatic) };
+  }
+  async function respondList(rows, typeName, programmatic) {
+    const data = rows.map((row) => projectRow(row, typeName, projectors));
+    if (!resolver?.hasSchema(typeName)) return data;
+    const resolved = await resolver.resolveList(
+      typeName,
+      rows.map((row) => projectRow(row, typeName, forResolver))
+    );
+    return data.map((d, i) => ({ ...d, ...pickProgrammatic(resolved[i], programmatic) }));
+  }
   function registerListRoute(path, handler) {
     if (listRateLimit) {
       app.get(path, listRateLimit, handler);
@@ -1957,18 +1981,29 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
     return c.json({ ok: true, data });
   });
   for (const [typeName, contentType] of Object.entries(registry.content_types)) {
+    let translateInclude2 = function(requested) {
+      const include = [];
+      for (const field of requested) {
+        const registryName = includeNames.get(field);
+        if (registryName === void 0) return { ok: false, field };
+        include.push(registryName);
+      }
+      return { ok: true, include };
+    };
+    var translateInclude = translateInclude2;
     const basePath = contentType.default_base_path;
     const repo = repos[typeName];
     if (!repo) continue;
     const fieldKeys = projectors[typeName].map;
-    const relationFieldNames = /* @__PURE__ */ new Set();
+    const programmatic = contentType.fields.filter((f) => f.field_type === "programmatic").map((f) => f.name);
+    const includeNames = /* @__PURE__ */ new Map();
     for (const f of contentType.fields) {
       if (!RELATION_FIELD_TYPES.has(f.field_type)) continue;
       if (isColumnBacked(f)) {
         const label = fieldKeys.labelFor(f.db_column.column_name);
-        if (label !== void 0) relationFieldNames.add(label);
+        if (label !== void 0) includeNames.set(label, f.name);
       } else {
-        relationFieldNames.add(f.name);
+        includeNames.set(f.name, f.name);
       }
     }
     const filterableFieldNames = /* @__PURE__ */ new Set([
@@ -1987,8 +2022,11 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             404
           );
         }
-        let data = projectRow(result.data[0], typeName, projectors);
-        if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+        const data = await respondItem(
+          result.data[0],
+          typeName,
+          programmatic
+        );
         return c.json({ ok: true, data });
       });
     } else {
@@ -2045,21 +2083,20 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             400
           );
         }
-        const include = parseInclude(c.req.query("include"));
-        for (const field of include) {
-          if (!relationFieldNames.has(field)) {
-            return c.json(
-              {
-                ok: false,
-                error: {
-                  code: "INVALID_INCLUDE_FIELD",
-                  message: `'${field}' is not a valid relation field`
-                }
-              },
-              400
-            );
-          }
+        const translated = translateInclude2(parseInclude(c.req.query("include")));
+        if (!translated.ok) {
+          return c.json(
+            {
+              ok: false,
+              error: {
+                code: "INVALID_INCLUDE_FIELD",
+                message: `'${translated.field}' is not a valid relation field`
+              }
+            },
+            400
+          );
         }
+        const include = translated.include;
         const sortColumn = fieldKeys.labels.includes(sortBy) ? fieldKeys.columnFor(sortBy) : sortBy;
         const result = await repo.findMany({
           published_only: true,
@@ -2070,29 +2107,25 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
           filters: filtersResult.filters,
           include
         });
-        const labeled = result.data.map(
-          (row) => projectRow(row, typeName, projectors)
-        );
-        const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+        const data = await respondList(result.data, typeName, programmatic);
         return c.json({ ...result, data });
       });
       app.get(paths.item(basePath), async (c) => {
         const slug = c.req.param("slug");
-        const include = parseInclude(c.req.query("include"));
-        for (const field of include) {
-          if (!relationFieldNames.has(field)) {
-            return c.json(
-              {
-                ok: false,
-                error: {
-                  code: "INVALID_INCLUDE_FIELD",
-                  message: `'${field}' is not a valid relation field`
-                }
-              },
-              400
-            );
-          }
+        const translated = translateInclude2(parseInclude(c.req.query("include")));
+        if (!translated.ok) {
+          return c.json(
+            {
+              ok: false,
+              error: {
+                code: "INVALID_INCLUDE_FIELD",
+                message: `'${translated.field}' is not a valid relation field`
+              }
+            },
+            400
+          );
         }
+        const include = translated.include;
         const item = await repo.findBySlug(slug, include);
         if (!item || !isPublished(item)) {
           return c.json(
@@ -2103,15 +2136,15 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             404
           );
         }
-        let data = projectRow(item, typeName, projectors);
-        if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+        const data = await respondItem(item, typeName, programmatic);
         return c.json({ ok: true, data });
       });
     }
   }
-  for (const [typeName] of Object.entries(registry.taxonomy_types)) {
+  for (const [typeName, taxonomyType] of Object.entries(registry.taxonomy_types)) {
     const repo = repos[typeName];
     if (!repo) continue;
+    const programmatic = taxonomyType.fields.filter((f) => f.field_type === "programmatic").map((f) => f.name);
     registerListRoute(paths.taxonomyCollection(typeName), async (c) => {
       const pagination = parsePagination(c.req.query("page"), c.req.query("per_page"));
       if (!pagination.ok) {
@@ -2131,10 +2164,7 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
         page: pagination.page,
         per_page: pagination.per_page
       });
-      const labeled = result.data.map(
-        (row) => projectRow(row, typeName, projectors)
-      );
-      const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+      const data = await respondList(result.data, typeName, programmatic);
       return c.json({ ...result, data });
     });
     app.get(paths.taxonomyItem(typeName), async (c) => {
@@ -2149,8 +2179,7 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
           404
         );
       }
-      let data = projectRow(item, typeName, projectors);
-      if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+      const data = await respondItem(item, typeName, programmatic);
       return c.json({ ok: true, data });
     });
   }
@@ -3942,7 +3971,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 var import_drizzle_orm6 = require("drizzle-orm");
 var API_VERSION = (() => {
   try {
-    return "0.6.0";
+    return "0.7.0";
   } catch {
     return "0.0.0";
   }
@@ -4606,7 +4635,7 @@ function createCmsApp(options) {
         app.use(path, attachDeprecationHeaders);
       }
     }
-    registerPublicContentRoutes(app, registry, surface.repos, surface.projectors, surface.paths, listRateLimit, programmaticResolver);
+    registerPublicContentRoutes(app, registry, surface.repos, surface.projectors, surface.paths, listRateLimit, programmaticResolver, projectors);
   }
   if (options.versions !== void 0) {
     app.all(`${prefix}/:version/*`, async (c, next) => {
@@ -4672,7 +4701,8 @@ function createCmsApp(options) {
               endpoint: mount.path,
               currentVersion: model.current,
               ...projection !== void 0 && { projection },
-              ...currentProjection !== void 0 && { currentProjection }
+              ...currentProjection !== void 0 && { currentProjection },
+              currentFieldKeyMaps: fieldKeyMaps
             }
           );
         } catch (err) {