@preprio/toolkit 0.5.0-rc.5 → 0.5.0-rc.6

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.5";
+var VERSION = "0.5.0-rc.6";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -345,14 +345,14 @@ function indexSnapshot(data) {
   const index = /* @__PURE__ */ new Map();
   const visited = /* @__PURE__ */ new WeakSet();
   const path = [];
-  function walk(node) {
+  function walk2(node) {
     if (node === null || typeof node !== "object") return;
     if (visited.has(node)) return;
     visited.add(node);
     if (Array.isArray(node)) {
       for (let i = 0; i < node.length; i++) {
         path.push(i);
-        walk(node[i]);
+        walk2(node[i]);
         path.pop();
       }
       return;
@@ -370,11 +370,11 @@ function indexSnapshot(data) {
     for (const key in record) {
       if (!Object.prototype.hasOwnProperty.call(record, key)) continue;
       path.push(key);
-      walk(record[key]);
+      walk2(record[key]);
       path.pop();
     }
   }
-  walk(data);
+  walk2(data);
   return index;
 }
 
@@ -831,12 +831,12 @@ function resolveFields(selections, typename, doc, options) {
     }
   };
   const applies = (on, list) => conditionMatches(on, typename) || typename !== void 0 && typeConditions(list, doc).includes(typename);
-  const walk = (list, matched) => {
+  const walk2 = (list, matched) => {
     for (const s of list) {
       if (s.kind === "field") {
         add(matched ? exact : loose, s);
       } else if (s.kind === "inline") {
-        walk(s.selections, matched && applies(s.on, s.selections));
+        walk2(s.selections, matched && applies(s.on, s.selections));
       } else {
         const fragment = doc.fragments.get(s.name);
         if (!fragment) continue;
@@ -844,11 +844,11 @@ function resolveFields(selections, typename, doc, options) {
         if (walkedMatched.has(fragment)) continue;
         if (!asMatched && walkedLoose.has(fragment)) continue;
         (asMatched ? walkedMatched : walkedLoose).add(fragment);
-        walk(fragment.selections, asMatched);
+        walk2(fragment.selections, asMatched);
       }
     }
   };
-  walk(selections, true);
+  walk2(selections, true);
   if (!options.strict) {
     for (const [key, field] of loose) {
       if (!exact.has(key)) exact.set(key, field);
@@ -865,21 +865,21 @@ function typeConditions(selections, doc) {
   if (hit) return hit;
   const names = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
-  const walk = (list) => {
+  const walk2 = (list) => {
     for (const s of list) {
       if (s.kind === "inline") {
         if (s.on) names.add(s.on);
-        walk(s.selections);
+        walk2(s.selections);
       } else if (s.kind === "spread") {
         const fragment = doc.fragments.get(s.name);
         if (!fragment || seen.has(fragment)) continue;
         seen.add(fragment);
         names.add(fragment.on);
-        walk(fragment.selections);
+        walk2(fragment.selections);
       }
     }
   };
-  walk(selections);
+  walk2(selections);
   const conditions = [...names];
   conditionsCache.set(selections, conditions);
   return conditions;
@@ -1031,7 +1031,7 @@ function resolveTargets(root, doc, ownerPath, segments) {
   let current = root;
   const out = [];
   const plain = /* @__PURE__ */ new Set();
-  const walk = (node, sel, i, path) => {
+  const walk2 = (node, sel, i, path) => {
     if (i === segments.length) {
       out.push(path);
       return;
@@ -1041,10 +1041,10 @@ function resolveTargets(root, doc, ownerPath, segments) {
       if (INDEX_SEGMENT.test(segment)) {
         const position = Number(segment);
         if (position < node.length) {
-          walk(node[position], sel, i + 1, [...path, position]);
+          walk2(node[position], sel, i + 1, [...path, position]);
         }
       } else if (segment === "items") {
-        walk(node, sel, i + 1, path);
+        walk2(node, sel, i + 1, path);
       }
       return;
     }
@@ -1077,11 +1077,11 @@ function resolveTargets(root, doc, ownerPath, segments) {
           current = writeAtPath(current, fieldPath, value);
         }
       }
-      walk(value, field.selections, i + 1, fieldPath);
+      walk2(value, field.selections, i + 1, fieldPath);
     }
-    if (!matched && segment === "items") walk(node, sel, i + 1, path);
+    if (!matched && segment === "items") walk2(node, sel, i + 1, path);
   };
-  walk(owner, selections, 0, ownerPath);
+  walk2(owner, selections, 0, ownerPath);
   return { root: current, targets: out, plain };
 }
 var NON_ALPHANUMERIC = /[^a-z0-9]/gi;
@@ -1204,11 +1204,11 @@ function listKeysIn(result) {
     if (!byType) {
       byType = /* @__PURE__ */ new Map();
       const seen = /* @__PURE__ */ new WeakSet();
-      const walk = (node) => {
+      const walk2 = (node) => {
         if (node === null || typeof node !== "object" || seen.has(node)) return;
         seen.add(node);
         if (Array.isArray(node)) {
-          node.forEach(walk);
+          node.forEach(walk2);
           return;
         }
         const record = node;
@@ -1219,10 +1219,10 @@ function listKeysIn(result) {
             if (!keys) byType.set(type, keys = /* @__PURE__ */ new Set());
             keys.add(key);
           }
-          walk(value);
+          walk2(value);
         }
       };
-      walk(result);
+      walk2(result);
       listKeysCache.set(result, byType);
     }
     return byType.get(typename) ?? NO_KEYS;
@@ -1264,7 +1264,7 @@ function findEditLink(root) {
   if (linkCache.has(root)) return linkCache.get(root) ?? null;
   let found = null;
   const seen = /* @__PURE__ */ new WeakSet();
-  const walk = (node) => {
+  const walk2 = (node) => {
     if (found) return;
     if (typeof node === "string") {
       if (!(0, import_stega2.vercelStegaSplit)(node).encoded) return;
@@ -1279,13 +1279,108 @@ function findEditLink(root) {
     }
     if (node === null || typeof node !== "object" || seen.has(node)) return;
     seen.add(node);
-    for (const value of Object.values(node)) walk(value);
+    for (const value of Object.values(node)) walk2(value);
   };
-  walk(root);
+  walk2(root);
   linkCache.set(root, found);
   return found;
 }
 
+// src/core/live-preview/edit-links.ts
+var import_stega3 = require("@vercel/stega");
+var ENTRY_PARAM = "entry";
+var TOP_LEVEL_ENTRY = /^[A-Za-z0-9_]+\.\d+$/;
+function entryIdOf(element) {
+  if (!isRecord(element)) return void 0;
+  if (typeof element._id === "string") return element._id;
+  if (element.__typename !== "Assets" || !Array.isArray(element.items)) {
+    return void 0;
+  }
+  const first = element.items[0];
+  return isRecord(first) && typeof first._id === "string" ? first._id : void 0;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function annotate(value, ctx) {
+  if (!ctx.entryId) return value;
+  const { cleaned, encoded } = (0, import_stega3.vercelStegaSplit)(value);
+  if (!encoded) return value;
+  let payload;
+  try {
+    payload = (0, import_stega3.vercelStegaDecode)(encoded);
+  } catch {
+    return value;
+  }
+  if (typeof payload?.href !== "string") return value;
+  let url;
+  try {
+    url = new URL(payload.href);
+  } catch {
+    return value;
+  }
+  if (url.searchParams.has(ENTRY_PARAM)) return value;
+  url.searchParams.set(ENTRY_PARAM, ctx.entryId);
+  const itemId = decodeURIComponent(url.pathname.split("/").pop() ?? "");
+  if (!url.searchParams.has("field") && ctx.entryField && TOP_LEVEL_ENTRY.test(ctx.entryField) && itemId === ctx.entryOwnerId) {
+    url.searchParams.set("field", ctx.entryField);
+  }
+  return (0, import_stega3.vercelStegaCombine)(
+    cleaned,
+    { ...payload, href: url.toString() },
+    false
+  );
+}
+function walk(value, selections, ctx) {
+  if (typeof value === "string") return annotate(value, ctx);
+  if (Array.isArray(value)) {
+    let changed2 = false;
+    const next2 = value.map((element, index) => {
+      const path = [...ctx.path, String(index)];
+      const entryId = ctx.inAssets ? void 0 : entryIdOf(element);
+      const entry = entryId ? {
+        entryId,
+        entryField: ctx.ownerId ? path.join(".") : void 0,
+        entryOwnerId: ctx.ownerId,
+        inAssets: isRecord(element) && element._id === void 0
+      } : {};
+      const out = walk(element, selections, { ...ctx, ...entry, path });
+      if (out !== element) changed2 = true;
+      return out;
+    });
+    return changed2 ? next2 : value;
+  }
+  if (!isRecord(value)) return value;
+  const id = typeof value._id === "string" ? value._id : void 0;
+  const typename = typeof value.__typename === "string" ? value.__typename : void 0;
+  const fields = ctx.doc && selections ? collectFields(selections, typename, ctx.doc) : null;
+  let changed = false;
+  const next = {};
+  for (const [key, child] of Object.entries(value)) {
+    const field = fields?.get(key);
+    const name = field?.name ?? key;
+    const out = walk(child, field?.selections ?? null, {
+      ...ctx,
+      ownerId: id ?? ctx.ownerId,
+      path: id ? [name] : [...ctx.path, name]
+    });
+    if (out !== child) changed = true;
+    next[key] = out;
+  }
+  return changed ? next : value;
+}
+function annotateEditLinks(result, query, operationName) {
+  let doc = null;
+  if (query !== void 0) {
+    try {
+      doc = readQueryDocument(query, operationName);
+    } catch {
+      doc = null;
+    }
+  }
+  return walk(result, doc?.operation ?? null, { doc, path: [] });
+}
+
 // src/nextjs/server.ts
 var React = __toESM(require("react"), 1);
 
@@ -1526,9 +1621,10 @@ var getPreprLiveLog = cacheForRender(
 );
 async function normalizeQuery(query, result, options = {}) {
   if (!options.enabled) return result;
+  const annotated = annotateEditLinks(result, query, options.operationName);
   const log = await getPreprLiveLog();
-  if (!log.length) return result;
-  return applyPatchLog(query, result, log, options.operationName);
+  if (!log.length) return annotated;
+  return applyPatchLog(query, annotated, log, options.operationName);
 }
 
 // src/nextjs/index.ts

package/dist/nextjs/index.js

@@ -2,7 +2,7 @@
 import { NextResponse } from "next/server";
 
 // src/version.ts
-var VERSION = "0.5.0-rc.5";
+var VERSION = "0.5.0-rc.6";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -302,14 +302,14 @@ function indexSnapshot(data) {
   const index = /* @__PURE__ */ new Map();
   const visited = /* @__PURE__ */ new WeakSet();
   const path = [];
-  function walk(node) {
+  function walk2(node) {
     if (node === null || typeof node !== "object") return;
     if (visited.has(node)) return;
     visited.add(node);
     if (Array.isArray(node)) {
       for (let i = 0; i < node.length; i++) {
         path.push(i);
-        walk(node[i]);
+        walk2(node[i]);
         path.pop();
       }
       return;
@@ -327,11 +327,11 @@ function indexSnapshot(data) {
     for (const key in record) {
       if (!Object.prototype.hasOwnProperty.call(record, key)) continue;
       path.push(key);
-      walk(record[key]);
+      walk2(record[key]);
       path.pop();
     }
   }
-  walk(data);
+  walk2(data);
   return index;
 }
 
@@ -788,12 +788,12 @@ function resolveFields(selections, typename, doc, options) {
     }
   };
   const applies = (on, list) => conditionMatches(on, typename) || typename !== void 0 && typeConditions(list, doc).includes(typename);
-  const walk = (list, matched) => {
+  const walk2 = (list, matched) => {
     for (const s of list) {
       if (s.kind === "field") {
         add(matched ? exact : loose, s);
       } else if (s.kind === "inline") {
-        walk(s.selections, matched && applies(s.on, s.selections));
+        walk2(s.selections, matched && applies(s.on, s.selections));
       } else {
         const fragment = doc.fragments.get(s.name);
         if (!fragment) continue;
@@ -801,11 +801,11 @@ function resolveFields(selections, typename, doc, options) {
         if (walkedMatched.has(fragment)) continue;
         if (!asMatched && walkedLoose.has(fragment)) continue;
         (asMatched ? walkedMatched : walkedLoose).add(fragment);
-        walk(fragment.selections, asMatched);
+        walk2(fragment.selections, asMatched);
       }
     }
   };
-  walk(selections, true);
+  walk2(selections, true);
   if (!options.strict) {
     for (const [key, field] of loose) {
       if (!exact.has(key)) exact.set(key, field);
@@ -822,21 +822,21 @@ function typeConditions(selections, doc) {
   if (hit) return hit;
   const names = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
-  const walk = (list) => {
+  const walk2 = (list) => {
     for (const s of list) {
       if (s.kind === "inline") {
         if (s.on) names.add(s.on);
-        walk(s.selections);
+        walk2(s.selections);
       } else if (s.kind === "spread") {
         const fragment = doc.fragments.get(s.name);
         if (!fragment || seen.has(fragment)) continue;
         seen.add(fragment);
         names.add(fragment.on);
-        walk(fragment.selections);
+        walk2(fragment.selections);
       }
     }
   };
-  walk(selections);
+  walk2(selections);
   const conditions = [...names];
   conditionsCache.set(selections, conditions);
   return conditions;
@@ -988,7 +988,7 @@ function resolveTargets(root, doc, ownerPath, segments) {
   let current = root;
   const out = [];
   const plain = /* @__PURE__ */ new Set();
-  const walk = (node, sel, i, path) => {
+  const walk2 = (node, sel, i, path) => {
     if (i === segments.length) {
       out.push(path);
       return;
@@ -998,10 +998,10 @@ function resolveTargets(root, doc, ownerPath, segments) {
       if (INDEX_SEGMENT.test(segment)) {
         const position = Number(segment);
         if (position < node.length) {
-          walk(node[position], sel, i + 1, [...path, position]);
+          walk2(node[position], sel, i + 1, [...path, position]);
         }
       } else if (segment === "items") {
-        walk(node, sel, i + 1, path);
+        walk2(node, sel, i + 1, path);
       }
       return;
     }
@@ -1034,11 +1034,11 @@ function resolveTargets(root, doc, ownerPath, segments) {
           current = writeAtPath(current, fieldPath, value);
         }
       }
-      walk(value, field.selections, i + 1, fieldPath);
+      walk2(value, field.selections, i + 1, fieldPath);
     }
-    if (!matched && segment === "items") walk(node, sel, i + 1, path);
+    if (!matched && segment === "items") walk2(node, sel, i + 1, path);
   };
-  walk(owner, selections, 0, ownerPath);
+  walk2(owner, selections, 0, ownerPath);
   return { root: current, targets: out, plain };
 }
 var NON_ALPHANUMERIC = /[^a-z0-9]/gi;
@@ -1161,11 +1161,11 @@ function listKeysIn(result) {
     if (!byType) {
       byType = /* @__PURE__ */ new Map();
       const seen = /* @__PURE__ */ new WeakSet();
-      const walk = (node) => {
+      const walk2 = (node) => {
         if (node === null || typeof node !== "object" || seen.has(node)) return;
         seen.add(node);
         if (Array.isArray(node)) {
-          node.forEach(walk);
+          node.forEach(walk2);
           return;
         }
         const record = node;
@@ -1176,10 +1176,10 @@ function listKeysIn(result) {
             if (!keys) byType.set(type, keys = /* @__PURE__ */ new Set());
             keys.add(key);
           }
-          walk(value);
+          walk2(value);
         }
       };
-      walk(result);
+      walk2(result);
       listKeysCache.set(result, byType);
     }
     return byType.get(typename) ?? NO_KEYS;
@@ -1221,7 +1221,7 @@ function findEditLink(root) {
   if (linkCache.has(root)) return linkCache.get(root) ?? null;
   let found = null;
   const seen = /* @__PURE__ */ new WeakSet();
-  const walk = (node) => {
+  const walk2 = (node) => {
     if (found) return;
     if (typeof node === "string") {
       if (!vercelStegaSplit2(node).encoded) return;
@@ -1236,13 +1236,112 @@ function findEditLink(root) {
     }
     if (node === null || typeof node !== "object" || seen.has(node)) return;
     seen.add(node);
-    for (const value of Object.values(node)) walk(value);
+    for (const value of Object.values(node)) walk2(value);
   };
-  walk(root);
+  walk2(root);
   linkCache.set(root, found);
   return found;
 }
 
+// src/core/live-preview/edit-links.ts
+import {
+  vercelStegaCombine as vercelStegaCombine2,
+  vercelStegaDecode as vercelStegaDecode2,
+  vercelStegaSplit as vercelStegaSplit3
+} from "@vercel/stega";
+var ENTRY_PARAM = "entry";
+var TOP_LEVEL_ENTRY = /^[A-Za-z0-9_]+\.\d+$/;
+function entryIdOf(element) {
+  if (!isRecord(element)) return void 0;
+  if (typeof element._id === "string") return element._id;
+  if (element.__typename !== "Assets" || !Array.isArray(element.items)) {
+    return void 0;
+  }
+  const first = element.items[0];
+  return isRecord(first) && typeof first._id === "string" ? first._id : void 0;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function annotate(value, ctx) {
+  if (!ctx.entryId) return value;
+  const { cleaned, encoded } = vercelStegaSplit3(value);
+  if (!encoded) return value;
+  let payload;
+  try {
+    payload = vercelStegaDecode2(encoded);
+  } catch {
+    return value;
+  }
+  if (typeof payload?.href !== "string") return value;
+  let url;
+  try {
+    url = new URL(payload.href);
+  } catch {
+    return value;
+  }
+  if (url.searchParams.has(ENTRY_PARAM)) return value;
+  url.searchParams.set(ENTRY_PARAM, ctx.entryId);
+  const itemId = decodeURIComponent(url.pathname.split("/").pop() ?? "");
+  if (!url.searchParams.has("field") && ctx.entryField && TOP_LEVEL_ENTRY.test(ctx.entryField) && itemId === ctx.entryOwnerId) {
+    url.searchParams.set("field", ctx.entryField);
+  }
+  return vercelStegaCombine2(
+    cleaned,
+    { ...payload, href: url.toString() },
+    false
+  );
+}
+function walk(value, selections, ctx) {
+  if (typeof value === "string") return annotate(value, ctx);
+  if (Array.isArray(value)) {
+    let changed2 = false;
+    const next2 = value.map((element, index) => {
+      const path = [...ctx.path, String(index)];
+      const entryId = ctx.inAssets ? void 0 : entryIdOf(element);
+      const entry = entryId ? {
+        entryId,
+        entryField: ctx.ownerId ? path.join(".") : void 0,
+        entryOwnerId: ctx.ownerId,
+        inAssets: isRecord(element) && element._id === void 0
+      } : {};
+      const out = walk(element, selections, { ...ctx, ...entry, path });
+      if (out !== element) changed2 = true;
+      return out;
+    });
+    return changed2 ? next2 : value;
+  }
+  if (!isRecord(value)) return value;
+  const id = typeof value._id === "string" ? value._id : void 0;
+  const typename = typeof value.__typename === "string" ? value.__typename : void 0;
+  const fields = ctx.doc && selections ? collectFields(selections, typename, ctx.doc) : null;
+  let changed = false;
+  const next = {};
+  for (const [key, child] of Object.entries(value)) {
+    const field = fields?.get(key);
+    const name = field?.name ?? key;
+    const out = walk(child, field?.selections ?? null, {
+      ...ctx,
+      ownerId: id ?? ctx.ownerId,
+      path: id ? [name] : [...ctx.path, name]
+    });
+    if (out !== child) changed = true;
+    next[key] = out;
+  }
+  return changed ? next : value;
+}
+function annotateEditLinks(result, query, operationName) {
+  let doc = null;
+  if (query !== void 0) {
+    try {
+      doc = readQueryDocument(query, operationName);
+    } catch {
+      doc = null;
+    }
+  }
+  return walk(result, doc?.operation ?? null, { doc, path: [] });
+}
+
 // src/nextjs/server.ts
 import * as React from "react";
 
@@ -1483,9 +1582,10 @@ var getPreprLiveLog = cacheForRender(
 );
 async function normalizeQuery(query, result, options = {}) {
   if (!options.enabled) return result;
+  const annotated = annotateEditLinks(result, query, options.operationName);
   const log = await getPreprLiveLog();
-  if (!log.length) return result;
-  return applyPatchLog(query, result, log, options.operationName);
+  if (!log.length) return annotated;
+  return applyPatchLog(query, annotated, log, options.operationName);
 }
 
 // src/nextjs/index.ts

package/dist/nextjs/live-action.js

@@ -1,11 +1,11 @@
 "use server";
 import {
   isPreviewFromHeaders
-} from "../chunk-3X55JL52.js";
-import "../chunk-CMUFTCG3.js";
+} from "../chunk-KZIRM54F.js";
+import "../chunk-WHZNCYUS.js";
 import {
   parsePatchLog
-} from "../chunk-74KY5EAM.js";
+} from "../chunk-KD3GK6TO.js";
 import "../chunk-S3VT4UWM.js";
 
 // src/nextjs/live-action.ts

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-H4643QYF.js").then(
+  starting ?? (starting = import("../live-preview-DLXGXRE5.js").then(
     ({ createLiveBridge, createLiveStore }) => {
       const skipped = new Set(quarantined());
       const started = createLiveStore({