@preprio/toolkit 0.5.0-rc.3 → 0.5.0-rc.4

package/dist/nextjs/index.cjs

@@ -49,7 +49,7 @@ module.exports = __toCommonJS(nextjs_exports);
 var import_server = require("next/server");
 
 // src/version.ts
-var VERSION = "0.5.0-rc.3";
+var VERSION = "0.5.0-rc.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -324,6 +324,20 @@ var UPPERCASE_BOUNDARY = /(.)(?=[A-Z])/g;
 function graphqlFieldName(apiId) {
   return apiId.replace(UPPERCASE_BOUNDARY, "$1_").toLowerCase();
 }
+var TEXT_BODY_FIELDS = [
+  { name: "body", plain: false },
+  { name: "html", plain: false },
+  { name: "text", plain: true }
+];
+var TAG_PATTERN = /<[^>]+>/g;
+function plainTextFromHtml(html) {
+  return html.replace(TAG_PATTERN, "");
+}
+function isTextEntry(record) {
+  const typename = record.__typename;
+  if (typeof typename === "string") return typename === "Text";
+  return "html" in record || "text" in record && "format" in record;
+}
 
 // src/core/live-preview/index-snapshot.ts
 var debug = createScopedLogger("live-preview");
@@ -461,7 +475,6 @@ function listKeysOf(entry) {
   }
   return keys;
 }
-var TAG_PATTERN = /<[^>]+>/g;
 function buildText(entry, template) {
   const body = typeof entry.body === "string" ? entry.body : "";
   const full = {
@@ -469,7 +482,7 @@ function buildText(entry, template) {
     _id: entry._id,
     body,
     html: body,
-    text: body.replace(TAG_PATTERN, ""),
+    text: plainTextFromHtml(body),
     format: entry.format ?? null
   };
   if (!template) return full;
@@ -929,11 +942,13 @@ function applyPatch(root, index, patch, doc, result) {
   const segments = patch.field.split(".");
   if (segments.some((s) => !s || FORBIDDEN_SEGMENTS2.has(s))) return root;
   const targets = [];
+  const plain = /* @__PURE__ */ new Set();
   for (const ownerPath of ownerPaths) {
     if (doc) {
       const resolved = resolveTargets(root, doc, ownerPath, segments);
       root = resolved.root;
       targets.push(...resolved.targets);
+      resolved.plain.forEach((target) => plain.add(target));
     } else {
       targets.push([...ownerPath, ...segments.map(toPathSegment)]);
     }
@@ -947,7 +962,8 @@ function applyPatch(root, index, patch, doc, result) {
   }
   if (patch.type === "field") {
     for (const target of targets) {
-      let value = keepEditLink(readAtPath(root, target), patch.value);
+      const pushed = plain.has(target) && typeof patch.value === "string" ? plainTextFromHtml(patch.value) : patch.value;
+      let value = keepEditLink(readAtPath(root, target), pushed);
       if (patch.edit && typeof value === "string" && !(0, import_stega2.vercelStegaSplit)(value).encoded) {
         value = editLinksFor(result, patch.edit.item)?.encode(
           value,
@@ -1011,9 +1027,10 @@ function resolveTargets(root, doc, ownerPath, segments) {
     owner = owner[step];
   }
   const selections = selectionsAt(root, doc, ownerPath);
-  if (!selections) return { root, targets: [] };
+  if (!selections) return { root, targets: [], plain: /* @__PURE__ */ new Set() };
   let current = root;
   const out = [];
+  const plain = /* @__PURE__ */ new Set();
   const walk = (node, sel, i, path) => {
     if (i === segments.length) {
       out.push(path);
@@ -1034,12 +1051,15 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (node === null || typeof node !== "object") return;
     const record = node;
     const wanted = graphqlFieldName(segment);
+    const textBody = i === segments.length - 1 && segment === "body" && isTextEntry(record) ? TEXT_BODY_FIELDS : null;
     let matched = false;
     for (const field of collectFields(sel, typenameOf(node), doc).values()) {
-      if (field.name !== segment && field.name !== wanted) continue;
+      const alias = textBody?.find((f) => f.name === field.name);
+      if (field.name !== segment && field.name !== wanted && !alias) continue;
       if (!Object.prototype.hasOwnProperty.call(record, field.key)) continue;
       matched = true;
       const fieldPath = [...path, field.key];
+      if (alias?.plain) plain.add(fieldPath);
       let value = record[field.key];
       const next = segments[i + 1];
       if (value === null && field.selections.length && next !== void 0 && next !== "items" && !INDEX_SEGMENT.test(next)) {
@@ -1062,7 +1082,7 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (!matched && segment === "items") walk(node, sel, i + 1, path);
   };
   walk(owner, selections, 0, ownerPath);
-  return { root: current, targets: out };
+  return { root: current, targets: out, plain };
 }
 var NON_ALPHANUMERIC = /[^a-z0-9]/gi;
 var typeKey = (name) => name.replace(NON_ALPHANUMERIC, "").toLowerCase();

package/dist/nextjs/index.js

@@ -2,7 +2,7 @@
 import { NextResponse } from "next/server";
 
 // src/version.ts
-var VERSION = "0.5.0-rc.3";
+var VERSION = "0.5.0-rc.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -281,6 +281,20 @@ var UPPERCASE_BOUNDARY = /(.)(?=[A-Z])/g;
 function graphqlFieldName(apiId) {
   return apiId.replace(UPPERCASE_BOUNDARY, "$1_").toLowerCase();
 }
+var TEXT_BODY_FIELDS = [
+  { name: "body", plain: false },
+  { name: "html", plain: false },
+  { name: "text", plain: true }
+];
+var TAG_PATTERN = /<[^>]+>/g;
+function plainTextFromHtml(html) {
+  return html.replace(TAG_PATTERN, "");
+}
+function isTextEntry(record) {
+  const typename = record.__typename;
+  if (typeof typename === "string") return typename === "Text";
+  return "html" in record || "text" in record && "format" in record;
+}
 
 // src/core/live-preview/index-snapshot.ts
 var debug = createScopedLogger("live-preview");
@@ -418,7 +432,6 @@ function listKeysOf(entry) {
   }
   return keys;
 }
-var TAG_PATTERN = /<[^>]+>/g;
 function buildText(entry, template) {
   const body = typeof entry.body === "string" ? entry.body : "";
   const full = {
@@ -426,7 +439,7 @@ function buildText(entry, template) {
     _id: entry._id,
     body,
     html: body,
-    text: body.replace(TAG_PATTERN, ""),
+    text: plainTextFromHtml(body),
     format: entry.format ?? null
   };
   if (!template) return full;
@@ -886,11 +899,13 @@ function applyPatch(root, index, patch, doc, result) {
   const segments = patch.field.split(".");
   if (segments.some((s) => !s || FORBIDDEN_SEGMENTS2.has(s))) return root;
   const targets = [];
+  const plain = /* @__PURE__ */ new Set();
   for (const ownerPath of ownerPaths) {
     if (doc) {
       const resolved = resolveTargets(root, doc, ownerPath, segments);
       root = resolved.root;
       targets.push(...resolved.targets);
+      resolved.plain.forEach((target) => plain.add(target));
     } else {
       targets.push([...ownerPath, ...segments.map(toPathSegment)]);
     }
@@ -904,7 +919,8 @@ function applyPatch(root, index, patch, doc, result) {
   }
   if (patch.type === "field") {
     for (const target of targets) {
-      let value = keepEditLink(readAtPath(root, target), patch.value);
+      const pushed = plain.has(target) && typeof patch.value === "string" ? plainTextFromHtml(patch.value) : patch.value;
+      let value = keepEditLink(readAtPath(root, target), pushed);
       if (patch.edit && typeof value === "string" && !vercelStegaSplit2(value).encoded) {
         value = editLinksFor(result, patch.edit.item)?.encode(
           value,
@@ -968,9 +984,10 @@ function resolveTargets(root, doc, ownerPath, segments) {
     owner = owner[step];
   }
   const selections = selectionsAt(root, doc, ownerPath);
-  if (!selections) return { root, targets: [] };
+  if (!selections) return { root, targets: [], plain: /* @__PURE__ */ new Set() };
   let current = root;
   const out = [];
+  const plain = /* @__PURE__ */ new Set();
   const walk = (node, sel, i, path) => {
     if (i === segments.length) {
       out.push(path);
@@ -991,12 +1008,15 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (node === null || typeof node !== "object") return;
     const record = node;
     const wanted = graphqlFieldName(segment);
+    const textBody = i === segments.length - 1 && segment === "body" && isTextEntry(record) ? TEXT_BODY_FIELDS : null;
     let matched = false;
     for (const field of collectFields(sel, typenameOf(node), doc).values()) {
-      if (field.name !== segment && field.name !== wanted) continue;
+      const alias = textBody?.find((f) => f.name === field.name);
+      if (field.name !== segment && field.name !== wanted && !alias) continue;
       if (!Object.prototype.hasOwnProperty.call(record, field.key)) continue;
       matched = true;
       const fieldPath = [...path, field.key];
+      if (alias?.plain) plain.add(fieldPath);
       let value = record[field.key];
       const next = segments[i + 1];
       if (value === null && field.selections.length && next !== void 0 && next !== "items" && !INDEX_SEGMENT.test(next)) {
@@ -1019,7 +1039,7 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (!matched && segment === "items") walk(node, sel, i + 1, path);
   };
   walk(owner, selections, 0, ownerPath);
-  return { root: current, targets: out };
+  return { root: current, targets: out, plain };
 }
 var NON_ALPHANUMERIC = /[^a-z0-9]/gi;
 var typeKey = (name) => name.replace(NON_ALPHANUMERIC, "").toLowerCase();

package/dist/nextjs/live-action.js

@@ -1,11 +1,11 @@
 "use server";
 import {
   isPreviewFromHeaders
-} from "../chunk-SXUDBGLZ.js";
-import "../chunk-MDAV2FLM.js";
+} from "../chunk-AHBN6FQP.js";
+import "../chunk-46ISDRHT.js";
 import {
   parsePatchLog
-} from "../chunk-42Z2VW7G.js";
+} from "../chunk-74KY5EAM.js";
 import "../chunk-S3VT4UWM.js";
 
 // src/nextjs/live-action.ts

package/dist/nextjs/live.cjs

@@ -149,11 +149,25 @@ function fieldKeyIn(record, apiId) {
   const name = graphqlFieldName(apiId);
   return Object.prototype.hasOwnProperty.call(record, name) ? name : void 0;
 }
-var UPPERCASE_BOUNDARY;
+function plainTextFromHtml(html) {
+  return html.replace(TAG_PATTERN, "");
+}
+function isTextEntry(record) {
+  const typename = record.__typename;
+  if (typeof typename === "string") return typename === "Text";
+  return "html" in record || "text" in record && "format" in record;
+}
+var UPPERCASE_BOUNDARY, TEXT_BODY_FIELDS, TAG_PATTERN;
 var init_field_name = __esm({
   "src/core/live-preview/field-name.ts"() {
     "use strict";
     UPPERCASE_BOUNDARY = /(.)(?=[A-Z])/g;
+    TEXT_BODY_FIELDS = [
+      { name: "body", plain: false },
+      { name: "html", plain: false },
+      { name: "text", plain: true }
+    ];
+    TAG_PATTERN = /<[^>]+>/g;
   }
 });
 
@@ -213,13 +227,51 @@ function patchSnapshot(snapshot, index, itemId, field, value) {
   if (!paths?.length) return snapshot;
   let root = snapshot;
   let changed = false;
+  const markChanged = () => {
+    changed = true;
+  };
   for (const path of paths) {
-    root = patchAtPath(root, path, field, value, () => {
-      changed = true;
-    });
+    for (const [target, targetValue] of expandTextBody(
+      root,
+      path,
+      field,
+      value
+    )) {
+      root = patchAtPath(root, path, target, targetValue, markChanged);
+    }
   }
   return changed ? root : snapshot;
 }
+function expandTextBody(root, path, field, value) {
+  const segments = field.split(".");
+  if (segments[segments.length - 1] !== "body" || typeof value !== "string") {
+    return [[field, value]];
+  }
+  let node = root;
+  for (const step of path) {
+    node = node[step];
+  }
+  for (const segment of segments.slice(0, -1)) {
+    if (node === null || typeof node !== "object") return [[field, value]];
+    const record2 = node;
+    node = INDEX_SEGMENT.test(segment) ? record2[Number(segment)] : record2[fieldKeyIn(record2, segment) ?? segment];
+  }
+  if (node === null || typeof node !== "object" || Array.isArray(node)) {
+    return [[field, value]];
+  }
+  const record = node;
+  if (!isTextEntry(record)) return [[field, value]];
+  const prefix = segments.slice(0, -1);
+  const writes = [];
+  for (const { name, plain } of TEXT_BODY_FIELDS) {
+    if (!(name in record)) continue;
+    writes.push([
+      [...prefix, name].join("."),
+      plain ? plainTextFromHtml(value) : value
+    ]);
+  }
+  return writes.length ? writes : [[field, value]];
+}
 function patchAtPath(root, path, field, value, markChanged) {
   const segments = field.split(".");
   if (segments.some((s) => FORBIDDEN_SEGMENTS.has(s))) return root;
@@ -291,7 +343,7 @@ function buildText(entry, template) {
     _id: entry._id,
     body,
     html: body,
-    text: body.replace(TAG_PATTERN, ""),
+    text: plainTextFromHtml(body),
     format: entry.format ?? null
   };
   if (!template) return full;
@@ -369,7 +421,7 @@ function keepEditLink(current, value) {
   if (!encoded || (0, import_stega.vercelStegaSplit)(value).encoded) return value;
   return value + encoded;
 }
-var import_stega, INDEX_SEGMENT, FORBIDDEN_SEGMENTS, TAG_PATTERN;
+var import_stega, INDEX_SEGMENT, FORBIDDEN_SEGMENTS;
 var init_patch = __esm({
   "src/core/live-preview/patch.ts"() {
     "use strict";
@@ -377,7 +429,6 @@ var init_patch = __esm({
     init_field_name();
     INDEX_SEGMENT = /^\d+$/;
     FORBIDDEN_SEGMENTS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
-    TAG_PATTERN = /<[^>]+>/g;
   }
 });
 
@@ -1193,11 +1244,13 @@ function applyPatch(root, index, patch, doc, result) {
   const segments = patch.field.split(".");
   if (segments.some((s) => !s || FORBIDDEN_SEGMENTS2.has(s))) return root;
   const targets = [];
+  const plain = /* @__PURE__ */ new Set();
   for (const ownerPath of ownerPaths) {
     if (doc) {
       const resolved = resolveTargets(root, doc, ownerPath, segments);
       root = resolved.root;
       targets.push(...resolved.targets);
+      resolved.plain.forEach((target) => plain.add(target));
     } else {
       targets.push([...ownerPath, ...segments.map(toPathSegment)]);
     }
@@ -1211,7 +1264,8 @@ function applyPatch(root, index, patch, doc, result) {
   }
   if (patch.type === "field") {
     for (const target of targets) {
-      let value = keepEditLink(readAtPath(root, target), patch.value);
+      const pushed = plain.has(target) && typeof patch.value === "string" ? plainTextFromHtml(patch.value) : patch.value;
+      let value = keepEditLink(readAtPath(root, target), pushed);
       if (patch.edit && typeof value === "string" && !(0, import_stega2.vercelStegaSplit)(value).encoded) {
         value = editLinksFor(result, patch.edit.item)?.encode(
           value,
@@ -1275,9 +1329,10 @@ function resolveTargets(root, doc, ownerPath, segments) {
     owner = owner[step];
   }
   const selections = selectionsAt(root, doc, ownerPath);
-  if (!selections) return { root, targets: [] };
+  if (!selections) return { root, targets: [], plain: /* @__PURE__ */ new Set() };
   let current = root;
   const out = [];
+  const plain = /* @__PURE__ */ new Set();
   const walk = (node, sel, i, path) => {
     if (i === segments.length) {
       out.push(path);
@@ -1298,12 +1353,15 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (node === null || typeof node !== "object") return;
     const record = node;
     const wanted = graphqlFieldName(segment);
+    const textBody = i === segments.length - 1 && segment === "body" && isTextEntry(record) ? TEXT_BODY_FIELDS : null;
     let matched = false;
     for (const field of collectFields(sel, typenameOf(node), doc).values()) {
-      if (field.name !== segment && field.name !== wanted) continue;
+      const alias = textBody?.find((f) => f.name === field.name);
+      if (field.name !== segment && field.name !== wanted && !alias) continue;
       if (!Object.prototype.hasOwnProperty.call(record, field.key)) continue;
       matched = true;
       const fieldPath = [...path, field.key];
+      if (alias?.plain) plain.add(fieldPath);
       let value = record[field.key];
       const next = segments[i + 1];
       if (value === null && field.selections.length && next !== void 0 && next !== "items" && !INDEX_SEGMENT2.test(next)) {
@@ -1326,7 +1384,7 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (!matched && segment === "items") walk(node, sel, i + 1, path);
   };
   walk(owner, selections, 0, ownerPath);
-  return { root: current, targets: out };
+  return { root: current, targets: out, plain };
 }
 function resolveTypename(doc, selections, typename, typeName) {
   const known = typeConditions(selections, doc);

package/dist/nextjs/live.js

@@ -27,7 +27,7 @@ function isFramed() {
   return typeof window !== "undefined" && window.self !== window.top;
 }
 function startLive() {
-  starting ?? (starting = import("../live-preview-EADA3ZL4.js").then(
+  starting ?? (starting = import("../live-preview-H4643QYF.js").then(
     ({ createLiveBridge, createLiveStore }) => {
       const skipped = new Set(quarantined());
       const started = createLiveStore({

package/dist/nuxt/index.cjs

@@ -35,7 +35,7 @@ __export(nuxt_exports, {
 module.exports = __toCommonJS(nuxt_exports);
 
 // src/version.ts
-var VERSION = "0.5.0-rc.3";
+var VERSION = "0.5.0-rc.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";

package/dist/nuxt/index.js

@@ -1,5 +1,5 @@
 // src/version.ts
-var VERSION = "0.5.0-rc.3";
+var VERSION = "0.5.0-rc.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";

package/dist/nuxt/{live-preview-PTEC3GPC.js → live-preview-O2ZTJNW4.js}

@@ -112,6 +112,20 @@ function fieldKeyIn(record, apiId) {
   const name = graphqlFieldName(apiId);
   return Object.prototype.hasOwnProperty.call(record, name) ? name : void 0;
 }
+var TEXT_BODY_FIELDS = [
+  { name: "body", plain: false },
+  { name: "html", plain: false },
+  { name: "text", plain: true }
+];
+var TAG_PATTERN = /<[^>]+>/g;
+function plainTextFromHtml(html) {
+  return html.replace(TAG_PATTERN, "");
+}
+function isTextEntry(record) {
+  const typename = record.__typename;
+  if (typeof typename === "string") return typename === "Text";
+  return "html" in record || "text" in record && "format" in record;
+}
 
 // src/core/live-preview/patch.ts
 var INDEX_SEGMENT = /^\d+$/;
@@ -171,13 +185,51 @@ function patchSnapshot(snapshot, index, itemId, field, value) {
   if (!paths?.length) return snapshot;
   let root = snapshot;
   let changed = false;
+  const markChanged = () => {
+    changed = true;
+  };
   for (const path of paths) {
-    root = patchAtPath(root, path, field, value, () => {
-      changed = true;
-    });
+    for (const [target, targetValue] of expandTextBody(
+      root,
+      path,
+      field,
+      value
+    )) {
+      root = patchAtPath(root, path, target, targetValue, markChanged);
+    }
   }
   return changed ? root : snapshot;
 }
+function expandTextBody(root, path, field, value) {
+  const segments = field.split(".");
+  if (segments[segments.length - 1] !== "body" || typeof value !== "string") {
+    return [[field, value]];
+  }
+  let node = root;
+  for (const step of path) {
+    node = node[step];
+  }
+  for (const segment of segments.slice(0, -1)) {
+    if (node === null || typeof node !== "object") return [[field, value]];
+    const record2 = node;
+    node = INDEX_SEGMENT.test(segment) ? record2[Number(segment)] : record2[fieldKeyIn(record2, segment) ?? segment];
+  }
+  if (node === null || typeof node !== "object" || Array.isArray(node)) {
+    return [[field, value]];
+  }
+  const record = node;
+  if (!isTextEntry(record)) return [[field, value]];
+  const prefix = segments.slice(0, -1);
+  const writes = [];
+  for (const { name, plain } of TEXT_BODY_FIELDS) {
+    if (!(name in record)) continue;
+    writes.push([
+      [...prefix, name].join("."),
+      plain ? plainTextFromHtml(value) : value
+    ]);
+  }
+  return writes.length ? writes : [[field, value]];
+}
 function patchAtPath(root, path, field, value, markChanged) {
   const segments = field.split(".");
   if (segments.some((s) => FORBIDDEN_SEGMENTS.has(s))) return root;
@@ -242,7 +294,6 @@ function listKeysOf(entry) {
   }
   return keys;
 }
-var TAG_PATTERN = /<[^>]+>/g;
 function buildText(entry, template) {
   const body = typeof entry.body === "string" ? entry.body : "";
   const full = {
@@ -250,7 +301,7 @@ function buildText(entry, template) {
     _id: entry._id,
     body,
     html: body,
-    text: body.replace(TAG_PATTERN, ""),
+    text: plainTextFromHtml(body),
     format: entry.format ?? null
   };
   if (!template) return full;
@@ -1117,11 +1168,13 @@ function applyPatch(root, index, patch, doc, result) {
   const segments = patch.field.split(".");
   if (segments.some((s) => !s || FORBIDDEN_SEGMENTS2.has(s))) return root;
   const targets = [];
+  const plain = /* @__PURE__ */ new Set();
   for (const ownerPath of ownerPaths) {
     if (doc) {
       const resolved = resolveTargets(root, doc, ownerPath, segments);
       root = resolved.root;
       targets.push(...resolved.targets);
+      resolved.plain.forEach((target) => plain.add(target));
     } else {
       targets.push([...ownerPath, ...segments.map(toPathSegment)]);
     }
@@ -1135,7 +1188,8 @@ function applyPatch(root, index, patch, doc, result) {
   }
   if (patch.type === "field") {
     for (const target of targets) {
-      let value = keepEditLink(readAtPath(root, target), patch.value);
+      const pushed = plain.has(target) && typeof patch.value === "string" ? plainTextFromHtml(patch.value) : patch.value;
+      let value = keepEditLink(readAtPath(root, target), pushed);
       if (patch.edit && typeof value === "string" && !vercelStegaSplit2(value).encoded) {
         value = editLinksFor(result, patch.edit.item)?.encode(
           value,
@@ -1199,9 +1253,10 @@ function resolveTargets(root, doc, ownerPath, segments) {
     owner = owner[step];
   }
   const selections = selectionsAt(root, doc, ownerPath);
-  if (!selections) return { root, targets: [] };
+  if (!selections) return { root, targets: [], plain: /* @__PURE__ */ new Set() };
   let current = root;
   const out = [];
+  const plain = /* @__PURE__ */ new Set();
   const walk = (node, sel, i, path) => {
     if (i === segments.length) {
       out.push(path);
@@ -1222,12 +1277,15 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (node === null || typeof node !== "object") return;
     const record = node;
     const wanted = graphqlFieldName(segment);
+    const textBody = i === segments.length - 1 && segment === "body" && isTextEntry(record) ? TEXT_BODY_FIELDS : null;
     let matched = false;
     for (const field of collectFields(sel, typenameOf(node), doc).values()) {
-      if (field.name !== segment && field.name !== wanted) continue;
+      const alias = textBody?.find((f) => f.name === field.name);
+      if (field.name !== segment && field.name !== wanted && !alias) continue;
       if (!Object.prototype.hasOwnProperty.call(record, field.key)) continue;
       matched = true;
       const fieldPath = [...path, field.key];
+      if (alias?.plain) plain.add(fieldPath);
       let value = record[field.key];
       const next = segments[i + 1];
       if (value === null && field.selections.length && next !== void 0 && next !== "items" && !INDEX_SEGMENT2.test(next)) {
@@ -1250,7 +1308,7 @@ function resolveTargets(root, doc, ownerPath, segments) {
     if (!matched && segment === "items") walk(node, sel, i + 1, path);
   };
   walk(owner, selections, 0, ownerPath);
-  return { root: current, targets: out };
+  return { root: current, targets: out, plain };
 }
 var NON_ALPHANUMERIC = /[^a-z0-9]/gi;
 var typeKey = (name) => name.replace(NON_ALPHANUMERIC, "").toLowerCase();