@amplifyup/sdk 0.1.63 → 0.1.65

package/dist/index.mjs

@@ -396,6 +396,16 @@ function isComposerPreview() {
 
 // src/field-envelope.ts
 var FIELDS_BRAND = Symbol("amplifyup.fields");
+var IDENTIFIER_KEYS = /* @__PURE__ */ new Set([
+  "id",
+  "_id",
+  "slug",
+  "key",
+  "_key",
+  "docId",
+  "_type",
+  "type"
+]);
 function isBrandedFields(value) {
   return !!value && typeof value === "object" && FIELDS_BRAND in value;
 }
@@ -413,25 +423,79 @@ function isFieldEnvelope(value) {
   const rec = value;
   return typeof rec.name === "string" && "value" in rec && !("url" in rec);
 }
-function isPortableImageShape(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
-  return "url" in value;
+function isPageResourceSentinel(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value) && typeof value.__amplifyupPageResource === "string";
 }
-function isEntryRefItem(value) {
+function isPortableImageShape(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  if ("url" in value) return true;
   const rec = value;
-  return typeof rec.id === "string" && rec.id.trim().length > 0 || typeof rec._id === "string" && rec._id.trim().length > 0 || typeof rec.docId === "string" && rec.docId.trim().length > 0;
+  return rec._type === "image" || rec.asset != null;
 }
-function isRepeaterArray(value) {
+function isIdentifierKey(key) {
+  return IDENTIFIER_KEYS.has(key);
+}
+function isRecordList(value) {
   if (!Array.isArray(value) || value.length === 0) return false;
   const sample = value.find((item) => item != null);
   if (sample === void 0) return false;
   if (typeof sample !== "object" || Array.isArray(sample)) return false;
   if (isPortableImageShape(sample)) return false;
-  if (isEntryRefItem(sample)) return false;
   if (sample.$$typeof) return false;
   return true;
 }
+function isFieldRef(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const rec = value;
+  return typeof rec.providerId === "string" && !!rec.providerId && typeof rec.entity === "string" && !!rec.entity && typeof rec.id === "string" && !!rec.id;
+}
+function isListOwner(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const rec = value;
+  return typeof rec.providerId === "string" && !!rec.providerId && typeof rec.entity === "string" && !!rec.entity;
+}
+function listOwnerFromConnection(conn) {
+  if (!conn || typeof conn !== "object") return void 0;
+  if (conn.mode === "query") {
+    const providerId = String(conn.spec?.providerId || "").trim();
+    const entity = String(conn.spec?.entity || "").trim();
+    return providerId && entity ? { providerId, entity } : void 0;
+  }
+  if (conn.mode === "item" || conn.mode === "items") {
+    const providerId = String(conn.providerId || "").trim();
+    const entity = String(conn.entity || "").trim();
+    return providerId && entity ? { providerId, entity } : void 0;
+  }
+  return void 0;
+}
+function listOwnerFromSpec(spec) {
+  const providerId = String(spec?.providerId || "").trim();
+  const entity = String(spec?.entity || "").trim();
+  return providerId && entity ? { providerId, entity } : void 0;
+}
+function isEnvelopeSources(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const rec = value;
+  return rec.connections != null || rec.reads != null;
+}
+function normalizeEnvelopeSources(sources) {
+  if (!sources) return {};
+  if (isEnvelopeSources(sources) && !("mode" in sources)) {
+    return sources;
+  }
+  return { connections: sources };
+}
+function listOwnerForField(fieldName, props, sources) {
+  const { connections, reads } = normalizeEnvelopeSources(sources);
+  const resourceName = reads?.[fieldName]?.resource || fieldName;
+  const fromConn = listOwnerFromConnection(connections?.[resourceName]);
+  if (fromConn) return fromConn;
+  const paging = props?.[`${fieldName}Pagination`];
+  if (paging && typeof paging === "object" && !Array.isArray(paging)) {
+    return listOwnerFromSpec(paging.spec);
+  }
+  return void 0;
+}
 function joinPath(prefix, key) {
   return prefix ? `${prefix}.${key}` : key;
 }
@@ -439,61 +503,105 @@ function emptyValue(raw) {
   if (raw === void 0) return null;
   return raw;
 }
-function toFieldEnvelopes(source, prefix = "") {
+function rowId(raw) {
+  const candidates = [raw.id, raw._id, raw.docId, raw.key, raw._key];
+  for (const c of candidates) {
+    if (typeof c === "string" && c.trim()) return c;
+  }
+  return "";
+}
+function withLeaf(envelope, scope) {
+  if (isFieldRef(scope?.ref)) envelope.ref = scope.ref;
+  else if (scope?.readOnly) envelope.readOnly = true;
+  return envelope;
+}
+function toFieldEnvelopes(source, prefix = "", scope) {
+  const ctx = isFieldRef(scope) ? { ref: scope } : scope || {};
   const input = source && typeof source === "object" && !Array.isArray(source) ? source : {};
   if (isBrandedFields(input)) {
     return input;
   }
   const out = {};
   for (const [key, raw] of Object.entries(input)) {
+    if (isIdentifierKey(key) && (typeof raw === "string" || raw == null)) {
+      out[key] = raw ?? "";
+      continue;
+    }
     const path = joinPath(prefix, key);
+    if (isPageResourceSentinel(raw)) {
+      out[key] = withLeaf({ value: raw, name: path }, ctx);
+      continue;
+    }
     if (isFieldEnvelope(raw)) {
       const inner = raw.value;
-      if (isRepeaterArray(inner)) {
+      if (isRecordList(inner)) {
+        const owner = ctx.owners?.(key);
         out[key] = {
-          value: envelopeRepeaterItems(inner, raw.name || path),
+          value: envelopeListRows(inner, owner),
           name: raw.name || path
         };
         continue;
       }
-      out[key] = { value: raw.value ?? null, name: raw.name || path };
+      out[key] = withLeaf(
+        { value: raw.value ?? null, name: raw.name || path },
+        raw.ref ? { ref: raw.ref } : ctx
+      );
       continue;
     }
-    if (isRepeaterArray(raw)) {
-      out[key] = { value: envelopeRepeaterItems(raw, path), name: path };
+    if (isRecordList(raw)) {
+      const owner = ctx.owners?.(key);
+      out[key] = { value: envelopeListRows(raw, owner), name: path };
       continue;
     }
     if (raw && typeof raw === "object" && !Array.isArray(raw) && !isPortableImageShape(raw) && !raw.$$typeof) {
-      out[key] = toFieldEnvelopes(raw, path);
+      out[key] = toFieldEnvelopes(raw, path, ctx);
       continue;
     }
-    out[key] = { value: emptyValue(raw), name: path };
+    out[key] = withLeaf({ value: emptyValue(raw), name: path }, ctx);
   }
   return brandFields(out);
 }
-function envelopeRepeaterItems(items, prefix) {
-  return items.map((item, i) => {
-    const path = joinPath(prefix, String(i));
-    if (isBrandedFields(item)) return item;
-    if (item && typeof item === "object" && !Array.isArray(item)) {
-      return toFieldEnvelopes(item, path);
-    }
-    return toFieldEnvelopes({}, path);
+function envelopeListRows(items, owner) {
+  return items.map((item) => envelopeListRow(item, owner));
+}
+function envelopeListRow(item, owner) {
+  if (isBrandedFields(item) && typeof item.id === "string") {
+    return item;
+  }
+  const raw = item && typeof item === "object" && !Array.isArray(item) ? item : {};
+  const id = rowId(raw);
+  const ref = isListOwner(owner) && id ? { providerId: owner.providerId, entity: owner.entity, id } : void 0;
+  const fields = toFieldEnvelopes(raw, "", {
+    ref,
+    readOnly: !ref
   });
+  const row = fields;
+  if (typeof row.id !== "string") {
+    row.id = id;
+  }
+  return row;
 }
-function attachFieldEnvelopes(props) {
+function attachFieldEnvelopes(props, sources) {
   const raw = props && typeof props === "object" ? { ...props } : {};
   if (isBrandedFields(raw.fields)) return raw;
   const { fields: existing, ...content } = raw;
   const source = existing && typeof existing === "object" && !isFieldEnvelope(existing) ? existing : content;
-  return { ...raw, fields: toFieldEnvelopes(source) };
+  return {
+    ...raw,
+    fields: toFieldEnvelopes(source, "", {
+      owners: (fieldName) => listOwnerForField(fieldName, source, sources)
+    })
+  };
 }
 function walkLayoutNodes(nodes) {
   if (!Array.isArray(nodes)) return;
   for (const node of nodes) {
     if (!node || typeof node !== "object") continue;
     const rec = node;
-    rec.props = attachFieldEnvelopes(rec.props);
+    rec.props = attachFieldEnvelopes(rec.props, {
+      connections: rec.resources,
+      reads: rec.reads
+    });
     for (const slot of rec.slots || []) {
       walkLayoutNodes(slot.children);
     }
@@ -760,7 +868,10 @@ async function fetchEdgeResolve(options) {
   return envelopeResolvedPayload(body);
 }
 function envelopeResolvedComponent(node) {
-  node.props = attachFieldEnvelopes(node.props);
+  node.props = attachFieldEnvelopes(node.props, {
+    connections: node.resources,
+    reads: node.reads
+  });
   if (!node.children) return;
   for (const kids of Object.values(node.children)) {
     for (const child of kids || []) envelopeResolvedComponent(child);
@@ -1019,7 +1130,7 @@ async function fetchEdgeQuery(options) {
 async function queryContent(options) {
   const target = resolveAmplifyUpTarget({ configTarget: options.target });
   const { edgeUrl } = resolveAmplifyUpUrls(target);
-  return fetchEdgeQuery({
+  const raw = await fetchEdgeQuery({
     edgeUrl,
     trackingId: options.trackingId,
     route: options.route,
@@ -1028,6 +1139,13 @@ async function queryContent(options) {
     fetch: options.fetch,
     signal: options.signal
   });
+  return {
+    ...raw,
+    results: envelopeListRows(
+      raw.results,
+      listOwnerFromSpec(options.spec)
+    )
+  };
 }
 function nextPageSpec(pagination) {
   return { ...pagination.spec, offset: pagination.nextOffset };