okno 1.0.0-alpha.20 → 1.0.0-alpha.21

package/dist/runtime/wrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap.d.ts","sourceRoot":"","sources":["../../src/runtime/wrap.ts"],"names":[],"mappings":"AAyGA;;;;;GAKG;AACH,wBAAgB,cAAc,CAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAChD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,CA2L5E;AAoDD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC9B,OAAO,CA4BT;AAiBD,MAAM,WAAW,mBAAmB;IACnC,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACnC,cAAc;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,8DAA8D;IAC9D,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;kFAG8E;IAC9E,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;IACpC;;kEAE8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AAsGD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CA6DtE;AA6DD;2EAC2E;AAC3E,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C"}
+{"version":3,"file":"wrap.d.ts","sourceRoot":"","sources":["../../src/runtime/wrap.ts"],"names":[],"mappings":"AAyGA;;;;;GAKG;AACH,wBAAgB,cAAc,CAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAChD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,CA2L5E;AAoDD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC9B,OAAO,CA8BT;AAiBD,MAAM,WAAW,mBAAmB;IACnC,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAA;IACnC,cAAc;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,8DAA8D;IAC9D,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;kFAG8E;IAC9E,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;IACpC;;kEAE8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AAsGD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CA6DtE;AA6DD;2EAC2E;AAC3E,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C"}

package/dist/runtime/wrap.js

@@ -1,13 +1,13 @@
 const y = /* @__PURE__ */ new Map();
-let b = !1;
-function E() {
+let g = !1;
+function T() {
   const t = globalThis;
-  b || typeof t.document > "u" || (b = !0, t.document.addEventListener("okno:change", (r) => {
-    const { path: i, value: c } = r.detail;
-    y.get(i)?.forEach((n) => n(c));
+  g || typeof t.document > "u" || (g = !0, t.document.addEventListener("okno:change", (r) => {
+    const { path: i, value: s } = r.detail;
+    y.get(i)?.forEach((n) => n(s));
   }));
 }
-const j = /* @__PURE__ */ new Set([
+const E = /* @__PURE__ */ new Set([
   "src",
   "href",
   "alt",
@@ -20,90 +20,90 @@ const j = /* @__PURE__ */ new Set([
   "name",
   "value"
 ]);
-function O(t) {
+function j(t) {
   return t.replace(/[-_]+/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2").trim().replace(/^./, (r) => r.toUpperCase());
 }
-function v(t, r = "") {
+function b(t, r = "") {
   if (t == null) {
     if (!r) return "";
     const i = r.split(".").pop() ?? "";
-    return !i || j.has(i) ? "" : O(i);
+    return !i || E.has(i) ? "" : j(i);
   }
   return typeof t != "object" ? String(t) : m(t) ? t.text ?? "" : "";
 }
-function w(t) {
+function A(t) {
   return typeof t == "object" && t !== null && !Array.isArray(t) && "src" in t;
 }
 function m(t) {
   return typeof t == "object" && t !== null && !Array.isArray(t) && "url" in t && "text" in t && "external" in t;
 }
-function S(t, r) {
+function k(t, r) {
   if (r === void 0) return t;
   if (t === null || typeof t != "object" || Array.isArray(t) || r === null || typeof r != "object" || Array.isArray(r))
     return r;
   const i = { ...t };
-  for (const c of Object.keys(r))
-    i[c] = S(t[c], r[c]);
+  for (const s of Object.keys(r))
+    i[s] = k(t[s], r[s]);
   return i;
 }
-function z(t, r) {
+function q(t, r) {
   const i = { ...t };
-  for (const c of Object.keys(r))
-    i[c] = S(t, r[c]);
+  for (const s of Object.keys(r))
+    i[s] = k(t, r[s]);
   return i;
 }
-function _(t, r, i) {
-  const c = { __raw: t, __path: r, __slot: i };
-  return new Proxy(c, {
+function p(t, r, i) {
+  const s = { __raw: t, __path: r, __slot: i };
+  return new Proxy(s, {
     get(n, e) {
       if (e === "data-okno") return n.__path;
       if (e === "slot") return { "data-okno-item": n.__slot ?? n.__path };
       if (e === Symbol.toPrimitive || e === "toString" || e === "valueOf")
-        return () => v(n.__raw, n.__path);
+        return () => b(n.__raw, n.__path);
       if (e === Symbol.iterator) {
-        const u = v(n.__raw, n.__path);
+        const f = b(n.__raw, n.__path);
         return function* () {
-          yield u;
+          yield f;
         };
       }
       if (typeof e == "symbol") return;
       if (e === "toJSON") return () => n.__raw;
       if (e === "on")
-        return (u) => {
-          E();
-          const s = n.__path;
-          return y.has(s) || y.set(s, /* @__PURE__ */ new Set()), y.get(s).add(u), () => {
-            y.get(s)?.delete(u), y.get(s)?.size === 0 && y.delete(s);
+        return (f) => {
+          T();
+          const c = n.__path;
+          return y.has(c) || y.set(c, /* @__PURE__ */ new Set()), y.get(c).add(f), () => {
+            y.get(c)?.delete(f), y.get(c)?.size === 0 && y.delete(c);
           };
         };
       if (e === "locale")
-        return (u) => {
-          const s = n.__raw;
-          return u && s !== null && typeof s == "object" && !Array.isArray(s) && typeof s[u] == "object" && s[u] !== null ? _(
-            s[u],
+        return (f) => {
+          const c = n.__raw;
+          return f && c !== null && typeof c == "object" && !Array.isArray(c) && typeof c[f] == "object" && c[f] !== null ? p(
+            c[f],
             n.__path
-          ) : _(s, n.__path);
+          ) : p(c, n.__path);
         };
-      const o = n.__raw, f = n.__path ? `${n.__path}.${String(e)}` : String(e);
+      const o = n.__raw, a = n.__path ? `${n.__path}.${String(e)}` : String(e);
       if (m(o) && typeof e == "string") {
         if (e === "href") return o.url ?? "";
         if (e === "target" && o.external) return "_blank";
         if (e === "rel" && o.external) return "noopener noreferrer";
       }
       if (o != null && typeof o != "object") {
-        const u = o[e];
-        return u !== void 0 ? typeof u == "function" ? (...s) => u.apply(o, s) : u : _(null, f);
+        const f = o[e];
+        return f !== void 0 ? typeof f == "function" ? (...c) => f.apply(o, c) : f : p(null, a);
       }
       if (o != null && typeof o == "object" && !Array.isArray(o)) {
-        const u = o[String(e)];
-        return u == null ? _(null, f) : T(u, f);
+        const f = o[String(e)];
+        return f == null ? p(null, a) : $(f, a);
       }
-      return _(null, f);
+      return p(null, a);
     },
     // For spread: expose data-okno, plus all keys for file objects (src, alt, width, height, etc.)
     ownKeys(n) {
       const e = n.__raw;
-      return w(e) ? [...Object.keys(e), "data-okno"] : m(e) ? e.external ? ["href", "target", "rel", "data-okno"] : ["href", "data-okno"] : ["data-okno"];
+      return A(e) ? [...Object.keys(e), "data-okno"] : m(e) ? e.external ? ["href", "target", "rel", "data-okno"] : ["href", "data-okno"] : ["data-okno"];
     },
     getOwnPropertyDescriptor(n, e) {
       if (e === "data-okno")
@@ -113,7 +113,7 @@ function _(t, r, i) {
           configurable: !0
         };
       const o = n.__raw;
-      if (w(o) && typeof e == "string" && e in o)
+      if (A(o) && typeof e == "string" && e in o)
         return {
           value: o[e],
           enumerable: !0,
@@ -129,144 +129,146 @@ function _(t, r, i) {
     }
   });
 }
-function k(t) {
+function w(t) {
   return t !== null && typeof t == "object" && !Array.isArray(t) && "__oknoRef" in t;
 }
-function T(t, r, i) {
-  if (k(t)) {
-    const { path: c, data: n } = t.__oknoRef;
-    return _(n, c, i ?? c);
+function $(t, r, i) {
+  if (w(t)) {
+    const { path: s, data: n } = t.__oknoRef;
+    return p(n, s, i ?? s);
   }
   if (Array.isArray(t)) {
-    const c = t.map((n, e) => T(n, `${r}.${e}`, `${r}.${e}`));
-    return Object.defineProperty(c, "toJSON", {
-      value: () => t.map((n) => k(n) ? n.__oknoRef.data : n),
+    const s = t.map((n, e) => $(n, `${r}.${e}`, `${r}.${e}`));
+    return Object.defineProperty(s, "toJSON", {
+      value: () => t.map((n) => w(n) ? n.__oknoRef.data : n),
       enumerable: !1
-    }), c;
+    }), s;
   }
-  return _(t, r, i);
+  return p(t, r, i);
 }
-function B(t, r, i) {
+function z(t, r, i) {
   if (!t || typeof t != "object" || Array.isArray(t) || !r) return t;
-  const c = { ...t };
+  const s = { ...t };
   for (const n of Object.keys(r)) {
     const e = r[n];
     if (!e || e.type !== "reference" || typeof e.collection != "string") continue;
-    const o = i?.[e.collection] ?? i?.[e.collection.replace(/-/g, "_")] ?? [], f = (s) => {
-      if (typeof s != "string" || !s) return null;
-      const a = o.find((g) => {
-        const A = typeof g?.toJSON == "function" ? g.toJSON() : g;
-        return A && typeof A == "object" && A.slug === s;
-      });
-      if (!a) return null;
-      const l = typeof a.toJSON == "function" ? a.toJSON() : a;
-      return { __oknoRef: { path: `${e.collection}.${s}`, data: l } };
-    }, u = t[n];
-    c[n] = Array.isArray(u) ? u.map(f).filter(Boolean) : f(u);
+    const o = i?.[e.collection] ?? i?.[e.collection.replace(/-/g, "_")] ?? [], a = /* @__PURE__ */ new Map();
+    for (const u of o) {
+      const l = typeof u?.toJSON == "function" ? u.toJSON() : u;
+      l && typeof l == "object" && typeof l.slug == "string" && a.set(l.slug, u);
+    }
+    const f = (u) => {
+      if (typeof u != "string" || !u) return null;
+      const l = a.get(u);
+      if (!l) return null;
+      const S = typeof l.toJSON == "function" ? l.toJSON() : l;
+      return { __oknoRef: { path: `${e.collection}.${u}`, data: S } };
+    }, c = t[n];
+    s[n] = Array.isArray(c) ? c.map(f).filter(Boolean) : f(c);
   }
-  return c;
+  return s;
 }
-const p = "data-okno-item", h = "data-okno", x = [h, p];
-function d(t, r, i, c = x) {
+const _ = "data-okno-item", h = "data-okno", O = [h, _];
+function d(t, r, i, s = O) {
   if (r === i) return;
   const n = (e) => {
-    for (const o of c) {
-      const f = e.getAttribute(o);
-      f != null && (f === r ? e.setAttribute(o, i) : f.startsWith(r + ".") && e.setAttribute(o, i + f.slice(r.length)));
+    for (const o of s) {
+      const a = e.getAttribute(o);
+      a != null && (a === r ? e.setAttribute(o, i) : a.startsWith(r + ".") && e.setAttribute(o, i + a.slice(r.length)));
     }
   };
   n(t);
-  for (const e of c) t.querySelectorAll(`[${e}]`).forEach(n);
+  for (const e of s) t.querySelectorAll(`[${e}]`).forEach(n);
 }
-function L(t) {
+function x(t) {
   if (typeof document > "u") return [];
   const r = new RegExp(`^${t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.(\\d+)$`), i = /* @__PURE__ */ new Map();
-  document.querySelectorAll(`[${p}]`).forEach((n) => {
-    const e = n.getAttribute(p);
+  document.querySelectorAll(`[${_}]`).forEach((n) => {
+    const e = n.getAttribute(_);
     if (!e || !r.test(e) || !n.parentElement || !(n instanceof HTMLElement)) return;
     const o = i.get(n.parentElement) ?? [];
     o.push(n), i.set(n.parentElement, o);
   });
-  const c = (n) => Number(n.getAttribute(p).match(r)[1]);
+  const s = (n) => Number(n.getAttribute(_).match(r)[1]);
   return [...i.entries()].map(([n, e]) => ({
     parent: n,
-    wrappers: e.sort((o, f) => c(o) - c(f))
+    wrappers: e.sort((o, a) => s(o) - s(a))
   }));
 }
-function N(t) {
+function L(t) {
   t.querySelectorAll(`[${h}]`).forEach((r) => {
     r.children.length === 0 && (r.textContent = "");
   });
 }
-function R(t, r) {
+function M(t, r) {
   t.querySelectorAll(`[${h}]`).forEach((i) => {
-    const c = i.getAttribute(h);
-    c && c in r && i.children.length === 0 && (i.textContent = r[c] ?? "");
+    const s = i.getAttribute(h);
+    s && s in r && i.children.length === 0 && (i.textContent = r[s] ?? "");
   });
 }
-function M() {
+function N() {
   return typeof window < "u" && typeof window.matchMedia == "function" && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
 }
-function C(t) {
+function R(t) {
   const r = document;
-  return typeof r.startViewTransition != "function" || M() ? (t(), Promise.resolve()) : r.startViewTransition(t).finished.catch(() => {
+  return typeof r.startViewTransition != "function" || N() ? (t(), Promise.resolve()) : r.startViewTransition(t).finished.catch(() => {
   });
 }
-let H = 0;
-function I(t) {
+let C = 0;
+function H(t) {
   if (typeof document > "u" || !t?.list || !t.op) return;
-  const { list: r, op: i } = t, c = L(r);
-  if (i === "insert" && c.every((a) => a.wrappers.length === 0) || c.length === 0) return;
-  const n = [], e = (a) => {
-    a.style.viewTransitionName = `okno-vt-${++H}`, n.push(a);
+  const { list: r, op: i } = t, s = x(r);
+  if (i === "insert" && s.every((u) => u.wrappers.length === 0) || s.length === 0) return;
+  const n = [], e = (u) => {
+    u.style.viewTransitionName = `okno-vt-${++C}`, n.push(u);
   };
-  for (const a of c) for (const l of a.wrappers) e(l);
+  for (const u of s) for (const l of u.wrappers) e(l);
   const o = document.documentElement;
   o.classList.add("okno-vt-active");
-  const f = document.getElementById("okno-shadow-root"), u = f instanceof HTMLElement ? f.style.cssText : null;
-  f instanceof HTMLElement && (f.style.cssText = `${u};position:fixed;inset:0;pointer-events:none;view-transition-name:okno-editor`), C(() => {
-    for (const a of c)
-      i === "reorder" ? J(a, r, t.from, t.to) : i === "remove" ? V(a, r, t.index) : i === "insert" && q(a, r, t, e);
+  const a = document.getElementById("okno-shadow-root"), f = a instanceof HTMLElement ? a.style.cssText : null;
+  a instanceof HTMLElement && (a.style.cssText = `${f};position:fixed;inset:0;pointer-events:none;view-transition-name:okno-editor`), R(() => {
+    for (const u of s)
+      i === "reorder" ? I(u, r, t.from, t.to) : i === "remove" ? J(u, r, t.index) : i === "insert" && V(u, r, t, e);
   }).finally(() => {
-    for (const a of n) a.style.viewTransitionName = "";
-    o.classList.remove("okno-vt-active"), f instanceof HTMLElement && u !== null && (f.style.cssText = u);
+    for (const u of n) u.style.viewTransitionName = "";
+    o.classList.remove("okno-vt-active"), a instanceof HTMLElement && f !== null && (a.style.cssText = f);
   });
 }
-function J(t, r, i, c) {
+function I(t, r, i, s) {
   const n = t.wrappers, e = n.length;
-  if (i < 0 || i >= e || c < 0 || c >= e || i === c) return;
-  const o = n.slice(), [f] = o.splice(i, 1);
-  o.splice(c, 0, f);
-  const u = o.map((a) => a.getAttribute(p));
-  o.forEach((a, l) => d(a, u[l], `${r}.${l}`));
-  const s = n[e - 1].nextSibling;
-  for (const a of o) t.parent.insertBefore(a, s);
+  if (i < 0 || i >= e || s < 0 || s >= e || i === s) return;
+  const o = n.slice(), [a] = o.splice(i, 1);
+  o.splice(s, 0, a);
+  const f = o.map((u) => u.getAttribute(_));
+  o.forEach((u, l) => d(u, f[l], `${r}.${l}`));
+  const c = n[e - 1].nextSibling;
+  for (const u of o) t.parent.insertBefore(u, c);
 }
-function V(t, r, i) {
-  const c = t.wrappers;
-  if (!(i < 0 || i >= c.length)) {
-    c[i].remove();
-    for (let n = i + 1; n < c.length; n++) d(c[n], `${r}.${n}`, `${r}.${n - 1}`);
+function J(t, r, i) {
+  const s = t.wrappers;
+  if (!(i < 0 || i >= s.length)) {
+    s[i].remove();
+    for (let n = i + 1; n < s.length; n++) d(s[n], `${r}.${n}`, `${r}.${n - 1}`);
   }
 }
-function q(t, r, i, c) {
+function V(t, r, i, s) {
   const n = t.wrappers, e = n.length;
   if (e === 0) return;
-  const o = Math.max(0, Math.min(i.index ?? e, e)), f = o < e ? o : e - 1, u = n[f].getAttribute(p), s = n[f].cloneNode(!0);
+  const o = Math.max(0, Math.min(i.index ?? e, e)), a = o < e ? o : e - 1, f = n[a].getAttribute(_), c = n[a].cloneNode(!0);
   for (let l = e - 1; l >= o; l--) d(n[l], `${r}.${l}`, `${r}.${l + 1}`);
-  d(s, u, `${r}.${o}`), i.remap && d(s, i.remap.from, i.remap.to, [h]), i.values ? R(s, i.values) : N(s), s.style.viewTransitionName = "", c(s);
-  const a = o < e ? n[o] : n[e - 1].nextSibling;
-  t.parent.insertBefore(s, a);
+  d(c, f, `${r}.${o}`), i.remap && d(c, i.remap.from, i.remap.to, [h]), i.values ? M(c, i.values) : L(c), c.style.viewTransitionName = "", s(c);
+  const u = o < e ? n[o] : n[e - 1].nextSibling;
+  t.parent.insertBefore(c, u);
 }
-let $ = !1;
-function P() {
+let v = !1;
+function B() {
   const t = globalThis;
-  $ || typeof t.document > "u" || ($ = !0, t.document.addEventListener("okno:structure", (r) => I(r.detail)));
+  v || typeof t.document > "u" || (v = !0, t.document.addEventListener("okno:structure", (r) => H(r.detail)));
 }
 export {
-  I as __oknoApplyStructure,
-  P as __oknoInitStructure,
-  z as __oknoLocalize,
-  B as __oknoResolveRefs,
-  _ as __oknoWrap
+  H as __oknoApplyStructure,
+  B as __oknoInitStructure,
+  q as __oknoLocalize,
+  z as __oknoResolveRefs,
+  p as __oknoWrap
 };

package/package.json

@@ -2,7 +2,7 @@
 	"name": "okno",
 	"description": "Git-backed CMS with live editing for any Vite framework",
 	"author": "Gabriel Uhlíř",
-	"version": "1.0.0-alpha.20",
+	"version": "1.0.0-alpha.21",
 	"homepage": "https://okno.build",
 	"type": "module",
 	"types": "./dist/index.d.ts",
@@ -57,7 +57,7 @@
 		"acorn": "^8.11.3",
 		"bits-ui": "^2.18.0",
 		"runed": "^0.23.0",
-		"simple-git": "^3.28.0",
+		"simple-git": "^3.32.0",
 		"svelte": "^5.55.0",
 		"svelte-dnd-action": "^0.9.69"
 	},
@@ -73,7 +73,7 @@
 		"tailwindcss": "^4.0.0",
 		"tailwindcss-animate": "^1.0.7",
 		"typescript": "^5.9.2",
-		"vite": "^6.4.1"
+		"vite": "^6.4.3"
 	},
 	"peerDependencies": {
 		"svelte": "^5.0.0",

package/src/runtime/wrap.test.ts

@@ -0,0 +1,82 @@
+import { describe, expect, test } from "bun:test"
+import { __oknoResolveRefs } from "./wrap"
+
+describe("__oknoResolveRefs", () => {
+	test("single ref happy path", () => {
+		const raw = { author: "jane" }
+		const fields = { author: { type: "reference", collection: "authors" } }
+		const collections = { authors: [{ slug: "jane", name: "Jane" }] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.author).toEqual({
+			__oknoRef: { path: "authors.jane", data: { slug: "jane", name: "Jane" } },
+		})
+	})
+
+	test("array refs with a missing id filtered out", () => {
+		const raw = { authors: ["jane", "unknown"] }
+		const fields = { authors: { type: "reference", collection: "authors" } }
+		const collections = { authors: [{ slug: "jane", name: "Jane" }] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.authors).toHaveLength(1)
+		expect(result.authors[0].__oknoRef.path).toBe("authors.jane")
+	})
+
+	test("item with toJSON method — data is toJSON output, match by toJSON slug", () => {
+		const item = {
+			_raw: { slug: "bob", name: "Bob" },
+			toJSON() {
+				return this._raw
+			},
+		}
+		const raw = { author: "bob" }
+		const fields = { author: { type: "reference", collection: "people" } }
+		const collections = { people: [item] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.author.__oknoRef.data).toEqual({ slug: "bob", name: "Bob" })
+		expect(result.author.__oknoRef.path).toBe("people.bob")
+	})
+
+	test("dash/underscore fallback — def.collection dashed, collections key underscored", () => {
+		const raw = { post: "hello" }
+		const fields = { post: { type: "reference", collection: "blog-posts" } }
+		const collections = { blog_posts: [{ slug: "hello", title: "Hello World" }] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.post.__oknoRef.path).toBe("blog-posts.hello")
+		expect(result.post.__oknoRef.data).toEqual({ slug: "hello", title: "Hello World" })
+	})
+
+	test("non-reference field passes through untouched", () => {
+		const raw = { title: "Hello", author: "jane" }
+		const fields = {
+			title: { type: "text" },
+			author: { type: "reference", collection: "authors" },
+		}
+		const collections = { authors: [{ slug: "jane", name: "Jane" }] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.title).toBe("Hello")
+	})
+
+	test("null id returns null (single ref)", () => {
+		const raw = { author: null }
+		const fields = { author: { type: "reference", collection: "authors" } }
+		const collections = { authors: [{ slug: "jane", name: "Jane" }] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.author).toBeNull()
+	})
+
+	test("empty string id returns null", () => {
+		const raw = { author: "" }
+		const fields = { author: { type: "reference", collection: "authors" } }
+		const collections = { authors: [{ slug: "jane", name: "Jane" }] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.author).toBeNull()
+	})
+
+	test("unknown id returns null (single ref)", () => {
+		const raw = { author: "nobody" }
+		const fields = { author: { type: "reference", collection: "authors" } }
+		const collections = { authors: [{ slug: "jane", name: "Jane" }] }
+		const result = __oknoResolveRefs(raw, fields, collections) as any
+		expect(result.author).toBeNull()
+	})
+})

package/src/runtime/wrap.ts

@@ -392,12 +392,14 @@ export function __oknoResolveRefs(
 		const list: any[] =
 			collections?.[def.collection] ?? collections?.[def.collection.replace(/-/g, "_")] ?? []
 
+		const bySlug = new Map<string, any>()
+		for (const it of list) {
+			const r = typeof it?.toJSON === "function" ? it.toJSON() : it
+			if (r && typeof r === "object" && typeof r.slug === "string") bySlug.set(r.slug, it)
+		}
 		const resolve = (id: unknown): OknoRef | null => {
 			if (typeof id !== "string" || !id) return null
-			const item = list.find((it) => {
-				const r = typeof it?.toJSON === "function" ? it.toJSON() : it
-				return r && typeof r === "object" && r.slug === id
-			})
+			const item = bySlug.get(id)
 			if (!item) return null
 			const data = typeof item.toJSON === "function" ? item.toJSON() : item
 			return { __oknoRef: { path: `${def.collection}.${id}`, data } }