yamlover 0.3.24 → 0.3.25

package/dist/server.js

@@ -62375,7 +62375,8 @@ function resolveDocument(doc) {
     node.entries?.forEach((e3, i2) => {
       const seg = e3.key != null ? ":" + e3.key : "[" + i2 + "]";
       if (isPointer(e3.value)) {
-        const target = resolve(doc, chains, chain, e3.value, /* @__PURE__ */ new Set([e3.value]), keys);
+        const host = hasRelindex(e3.value) ? hostPositions(chain, i2) : void 0;
+        const target = resolve(doc, chains, chain, e3.value, /* @__PURE__ */ new Set([e3.value]), keys, host);
         out.push({ from: prefix + seg, holder: base, label: e3.key, pos: i2, raw: e3.value.raw, edge: e3.edge, target, ptr: e3.value, docRoot: dr });
       } else {
         walk(e3.value, dr);
@@ -62401,6 +62402,21 @@ function resolveDocument(doc) {
   walk(doc.root, ":");
   return out;
 }
+function hasRelindex(p2) {
+  return p2.steps.some((s2) => s2.sel === "relindex");
+}
+function hostPositions(chain, entryIdx) {
+  const pos = [];
+  for (let i2 = 1; i2 < chain.length; i2++) {
+    const idx = chain[i2 - 1].entries?.findIndex((e3) => e3.value === chain[i2]) ?? -1;
+    pos[i2] = idx >= 0 ? idx : void 0;
+  }
+  pos[chain.length] = entryIdx;
+  return pos;
+}
+function relRaw(k) {
+  return `[.${k === 0 ? "" : k > 0 ? "+" + k : k}]`;
+}
 function anchorKeyOf(a2) {
   return a2.ordinal ? null : lastKey(a2.path);
 }
@@ -62439,7 +62455,7 @@ function realizeAnchors(doc, chains) {
   }
   return { edges, keys };
 }
-function resolve(doc, chains, fromChain, ptr, visited, anchorKeys) {
+function resolve(doc, chains, fromChain, ptr, visited, anchorKeys, host) {
   const root = doc.root;
   let steps = ptr.steps;
   let chain;
@@ -62481,7 +62497,16 @@ function resolve(doc, chains, fromChain, ptr, visited, anchorKeys) {
     }
     const node = chain[chain.length - 1];
     if (node === void 0) return { kind: "unresolved", reason: "empty resolution scope" };
-    const entry = st.sel === "key" ? node.entries?.find((e3) => e3.key === st.name) : node.entries?.[st.n];
+    let idx;
+    if (st.sel === "key") idx = node.entries?.findIndex((e3) => e3.key === st.name) ?? -1;
+    else if (st.sel === "index") idx = st.n;
+    else {
+      const at = host?.[chain.length];
+      if (at === void 0) return { kind: "unresolved", reason: `relative index ${relRaw(st.k)} has no host frame at this depth (URIs.md \xA7Relative indexes)` };
+      idx = at + st.k;
+      if (idx < 0) return { kind: "unresolved", reason: `relative index ${relRaw(st.k)} out of range (position ${at})` };
+    }
+    const entry = idx >= 0 ? node.entries?.[idx] : void 0;
     if (!entry) {
       if (st.sel === "key") {
         const via = anchorKeys?.get(node)?.get(st.name);
@@ -62491,13 +62516,14 @@ function resolve(doc, chains, fromChain, ptr, visited, anchorKeys) {
         }
       }
       if (!node.entries) return isWorld ? external() : { kind: "unresolved", reason: "step into a node with no fields" };
-      return isWorld ? external() : { kind: "unresolved", reason: `no ${st.sel === "key" ? `key "${st.name}"` : `index [${st.n}]`}` };
+      return isWorld ? external() : { kind: "unresolved", reason: `no ${st.sel === "key" ? `key "${st.name}"` : st.sel === "index" ? `index [${st.n}]` : `entry at relative index ${relRaw(st.k)} (position ${idx})`}` };
     }
     if (isPointer(entry.value)) {
       if (visited.has(entry.value)) return { kind: "unresolved", reason: "pointer cycle" };
       const next = new Set(visited);
       next.add(entry.value);
-      const r2 = resolve(doc, chains, chain, entry.value, next, anchorKeys);
+      const innerHost = hasRelindex(entry.value) ? hostPositions(chain, idx) : void 0;
+      const r2 = resolve(doc, chains, chain, entry.value, next, anchorKeys, innerHost);
       if (r2.kind !== "node") return r2;
       chain = chains.get(r2.node) ?? [r2.node];
     } else {
@@ -63140,6 +63166,7 @@ function portionsToSteps(portions) {
 }
 function portionToSteps(p2) {
   if (p2 === "..") return [{ sel: "parent" }];
+  if (p2.startsWith("..") && p2[2] === "[") return [{ sel: "parent" }, ...indexGroups(p2.slice(2), p2, "portion")];
   let name = "";
   let i2 = 0;
   if (p2[0] === "'" || p2[0] === '"') {
@@ -63177,15 +63204,40 @@ function portionToSteps(p2) {
   }
   const steps = [];
   if (name !== "") steps.push({ sel: "key", name });
-  while (i2 < p2.length) {
-    if (p2[i2] !== "[") throw new SyntaxError(`pointer: malformed portion "${p2}"`);
+  if (i2 < p2.length) steps.push(...indexGroups(p2.slice(i2), p2, "portion"));
+  return steps;
+}
+function indexGroups(s2, whole, noun) {
+  const steps = [];
+  let i2 = 0;
+  while (i2 < s2.length) {
+    if (s2[i2] !== "[") throw new SyntaxError(`pointer: malformed ${noun} "${whole}"`);
     let j = i2 + 1;
+    if (s2[j] === ".") {
+      j++;
+      let k = 0;
+      if (s2[j] === "+" || s2[j] === "-") {
+        const sign = s2[j] === "-" ? -1 : 1;
+        j++;
+        let digits2 = "";
+        while (j < s2.length && s2[j] >= "0" && s2[j] <= "9") {
+          digits2 += s2[j];
+          j++;
+        }
+        if (digits2 === "") throw new SyntaxError(`pointer: malformed index in "${whole}"`);
+        k = sign * Number.parseInt(digits2, 10);
+      }
+      if (s2[j] !== "]") throw new SyntaxError(`pointer: malformed index in "${whole}"`);
+      steps.push({ sel: "relindex", k });
+      i2 = j + 1;
+      continue;
+    }
     let digits = "";
-    while (j < p2.length && p2[j] >= "0" && p2[j] <= "9") {
-      digits += p2[j];
+    while (j < s2.length && s2[j] >= "0" && s2[j] <= "9") {
+      digits += s2[j];
       j++;
     }
-    if (digits === "" || p2[j] !== "]") throw new SyntaxError(`pointer: malformed index in "${p2}"`);
+    if (digits === "" || s2[j] !== "]") throw new SyntaxError(`pointer: malformed index in "${whole}"`);
     steps.push({ sel: "index", n: Number.parseInt(digits, 10) });
     i2 = j + 1;
   }
@@ -63201,10 +63253,17 @@ function renderPointer(p2, opts = {}) {
   const sep2 = spaced ? ": " : ":";
   const toks = [];
   for (const st of p2.steps) {
-    if (st.sel === "parent") toks.push("..");
-    else if (st.sel === "key") toks.push(colonSegment(st.name));
-    else if (toks.length > 0 && !toks[toks.length - 1].endsWith("..")) toks[toks.length - 1] += `[${st.n}]`;
-    else toks.push(`[${st.n}]`);
+    if (st.sel === "parent") {
+      toks.push("..");
+      continue;
+    }
+    if (st.sel === "key") {
+      toks.push(colonSegment(st.name));
+      continue;
+    }
+    const t3 = st.sel === "index" ? `[${st.n}]` : `[.${st.k === 0 ? "" : (st.k > 0 ? "+" : "") + st.k}]`;
+    if (toks.length > 0 && (st.sel === "relindex" || !toks[toks.length - 1].endsWith(".."))) toks[toks.length - 1] += t3;
+    else toks.push(t3);
   }
   const body = toks.join(sep2);
   switch (p2.base.scope) {
@@ -63272,6 +63331,7 @@ function readUntilSlash(s2) {
 }
 function segToSteps(seg) {
   if (seg === "..") return [{ sel: "parent" }];
+  if (seg.startsWith("..") && seg[2] === "[") return [{ sel: "parent" }, ...indexGroups(seg.slice(2), seg, "segment")];
   let i2 = 0;
   let name = "";
   for (; i2 < seg.length; i2++) {
@@ -63286,18 +63346,7 @@ function segToSteps(seg) {
   }
   const steps = [];
   if (name !== "") steps.push({ sel: "key", name: unescape(name) });
-  while (i2 < seg.length) {
-    if (seg[i2] !== "[") throw new SyntaxError(`pointer: malformed segment "${seg}"`);
-    let j = i2 + 1;
-    let digits = "";
-    while (j < seg.length && seg[j] >= "0" && seg[j] <= "9") {
-      digits += seg[j];
-      j++;
-    }
-    if (digits === "" || seg[j] !== "]") throw new SyntaxError(`pointer: malformed index in "${seg}"`);
-    steps.push({ sel: "index", n: Number.parseInt(digits, 10) });
-    i2 = j + 1;
-  }
+  if (i2 < seg.length) steps.push(...indexGroups(seg.slice(i2), seg, "segment"));
   return steps;
 }
 function unescape(s2) {
@@ -63319,6 +63368,7 @@ function makeAnchor(body, fail, yaml = false) {
     body = body.slice(0, -2);
   }
   const path11 = parsePointer(body, yaml);
+  if (path11.steps.some((s2) => s2.sel === "relindex")) fail('an anchor may not claim a position \u2014 "[.\xB1k]" is link-only');
   if (!ordinal) {
     const last = path11.steps[path11.steps.length - 1];
     if (last === void 0) fail('an anchor path needs a key segment (or a trailing "[]" for ordinal membership)');
@@ -65028,7 +65078,7 @@ function applySchemas(root, defsRoot, builtinDefs) {
   const applyItems = (inst, items, depth) => {
     const { node: itemsNode } = resolveSchema(items);
     const anyOf = itemsNode ? field(itemsNode, "anyOf") : null;
-    const elems = (inst.entries ?? []).filter((e3) => e3.key == null && !isPointer(e3.value));
+    const elems = (inst.entries ?? []).filter((e3) => e3.key == null && !isPointer(e3.value) && !(e3.value.meta?.schema && isPointer(e3.value.meta.schema)));
     if (anyOf && !isPointer(anyOf) && anyOf.entries) {
       const branches = anyOf.entries.map((e3) => e3.value).map((b) => ({ ptr: b, ...resolveSchema(b) }));
       for (const e3 of elems) {
@@ -65471,7 +65521,8 @@ function nominalPath(doc, e3) {
       if (up === null) return null;
       p2 = up === ":" ? "" : up;
     } else if (st.sel === "key") p2 += ":" + st.name;
-    else p2 += "[" + st.n + "]";
+    else if (st.sel === "index") p2 += "[" + st.n + "]";
+    else return null;
   }
   return p2 === "" ? ":" : p2;
 }
@@ -65860,7 +65911,12 @@ function parsePortion(r2) {
   const test = parseValTest(r2);
   if (test !== null) return [test];
   const steps = parsePointer(r2).steps;
-  return steps.map((st) => st.sel === "key" ? { kind: "key", name: st.name } : st.sel === "index" ? { kind: "index", n: st.n } : { kind: "spine" });
+  return steps.map((st) => {
+    if (st.sel === "key") return { kind: "key", name: st.name };
+    if (st.sel === "index") return { kind: "index", n: st.n };
+    if (st.sel === "relindex") throw new SyntaxError('query: a relative index "[.\xB1k]" is a link step, not a query portion (URIs.md \xA7Relative indexes)');
+    return { kind: "spine" };
+  });
 }
 function parseValTest(r2) {
   const m = CMP.exec(r2);
@@ -67149,6 +67205,7 @@ function createHandlers(dataRoot, opts = {}) {
   return Object.assign(handler, {
     ready,
     close: () => {
+      if (closed) return;
       closed = true;
       stopWatch?.();
       for (const r2 of sseClients) r2.end();
@@ -67235,6 +67292,7 @@ function projectValue(dataRoot, s2, segs, depth, top) {
   if (k === "omni" || k === "mix") {
     const entries = kids.map((c3) => ({ key: c3.label, value: project(c3) }));
     const marker = { kind: k, entries };
+    if (row.format) marker.format = row.format;
     if (k === "omni") {
       marker.value = row.type === "blob" ? binaryValueMarker(segs, row) : wireScalar(row.value);
       if (typeof row.meta?.selfAt === "number") marker.selfAt = row.meta.selfAt;
@@ -67463,7 +67521,13 @@ function chapterOrderedChildren(s2, p2, format) {
   const bodyPos = /* @__PURE__ */ new Map();
   for (const e3 of s2.entries(p2)) if (e3.kind === "ref" && !bodyPos.has(e3.to)) bodyPos.set(e3.to, e3.pos ?? 0);
   if (bodyPos.size === 0) return kids;
-  const key = (c3) => bodyPos.get(c3.to) ?? c3.pos ?? 0;
+  const maxPos = Math.max(...bodyPos.values(), ...kids.map((c3) => c3.pos ?? 0));
+  const key = (c3) => {
+    const bp = bodyPos.get(c3.to);
+    if (bp != null) return bp;
+    if (c3.label != null) return maxPos + 1 + (c3.pos ?? 0);
+    return c3.pos ?? 0;
+  };
   return kids.map((c3, i2) => ({ c: c3, i: i2 })).sort((a2, b) => key(a2.c) - key(b.c) || a2.i - b.i).map((x2) => x2.c);
 }
 function labelFor(s2, p2, keyOrIdx) {
@@ -68057,7 +68121,7 @@ function chapterEntries(lines, r2) {
   if (r2.marker >= 0) {
     const raw = lines[r2.marker].replace(/^\s*/, "");
     if (raw === "-" || raw.startsWith("- ")) {
-      const inline = raw.replace(/^-\s*/, "");
+      const inline = raw.replace(/^-\s*/, "").replace(/^!!<[^>]*>\s*/, "");
       if (inline.trim()) starts.push({ key: /^-/.test(inline) ? null : inline.match(/^([^:\s]+):/)?.[1] ?? null, start: r2.marker, inline: true });
     }
   }
@@ -68297,6 +68361,76 @@ function setRootTag(lines, meta) {
   if (existing >= 0) lines[existing] = `!!<${meta}>`;
   else lines.splice(Math.max(at, 0), 0, `!!<${meta}>`);
 }
+function flowValueStart(raw, e3) {
+  let i2 = indentOf2(raw);
+  if (raw.startsWith("- ", i2)) i2 += 2;
+  while (raw[i2] === " ") i2++;
+  if (raw.startsWith("!!<", i2)) {
+    const gt = raw.indexOf(">", i2);
+    if (gt < 0) return -1;
+    i2 = gt + 1;
+    while (raw[i2] === " ") i2++;
+  }
+  if (e3.key !== null) {
+    const c3 = raw.indexOf(":", i2);
+    if (c3 < 0) return -1;
+    i2 = c3 + 1;
+    while (raw[i2] === " ") i2++;
+  }
+  return raw[i2] === "[" ? i2 : -1;
+}
+function scanFlowSeq(s2, open) {
+  let depth = 0;
+  let q = null;
+  const cells = [];
+  let cellStart = open + 1;
+  for (let j = open; j < s2.length; j++) {
+    const ch = s2[j];
+    if (q) {
+      if (ch === q) {
+        if (q === "'" && s2[j + 1] === "'") j++;
+        else q = null;
+      }
+      continue;
+    }
+    if (ch === "'" || ch === '"') q = ch;
+    else if (ch === "[") depth++;
+    else if (ch === "]") {
+      depth--;
+      if (depth === 0) {
+        if (j > open + 1 || s2.slice(open + 1, j).trim().length) cells.push({ start: cellStart, end: j });
+        return { close: j, cells };
+      }
+    } else if (ch === "," && depth === 1) {
+      cells.push({ start: cellStart, end: j });
+      cellStart = j + 1;
+    }
+  }
+  return null;
+}
+function flowCellToken(s2) {
+  const plain = s2.length > 0 && s2 === s2.trim() && !/[\s,[\]:#'"{}]/.test(s2) && !/^[*&\-|>!]/.test(s2);
+  return plain ? s2 : `'${s2.replace(/'/g, "''")}'`;
+}
+function editFlowRowCell(lines, row, cellIdx, op, valueSrc) {
+  const raw = lines[row.start];
+  const open = flowValueStart(raw, row);
+  if (open < 0) return false;
+  const scan2 = scanFlowSeq(raw, open);
+  if (!scan2) return false;
+  if (op !== "emplace" && op !== "replace") throw new Error(`a flow-row cell supports emplace/replace only (got \`${op}\`)`);
+  const payload = payloadFacets(valueSrc);
+  if (payload.scalar === void 0) throw new Error("a flow-row cell takes a scalar value");
+  const parsed = parseYamlover(payload.scalar, "cell").root;
+  if (parsed.kind !== "scalar") throw new Error("a flow-row cell takes a scalar value");
+  const text = String(parsed.value ?? "");
+  if (text.includes("\n")) throw new Error("a flow-row cell cannot hold multi-line text \u2014 rewrite the row in block form (TABLE.md)");
+  const cell = scan2.cells[cellIdx];
+  if (!cell) throw new Error(`no cell [${cellIdx}] in the flow row (${scan2.cells.length} cells)`);
+  const lead = cellIdx === 0 ? "" : " ";
+  lines[row.start] = raw.slice(0, cell.start) + lead + flowCellToken(text) + raw.slice(cell.end);
+  return true;
+}
 function editChapterSource(src, within, op, valueSrc, meta) {
   const lines = src.split("\n");
   if (within.length === 0) {
@@ -68310,6 +68444,14 @@ function editChapterSource(src, within, op, valueSrc, meta) {
     }
     throw new Error(`\`${op}\` at a document root needs a key or index target`);
   }
+  const last = within[within.length - 1];
+  if (within.length >= 2 && typeof last === "number") {
+    const parentR = reachChapter(lines, within.slice(0, -2));
+    const rowEntry = findEntry(lines, parentR, within[within.length - 2]);
+    if (rowEntry && !isContainerEntry(lines, rowEntry, parentR.indent + 2) && editFlowRowCell(lines, rowEntry, last, op, valueSrc)) {
+      return lines.join("\n");
+    }
+  }
   assignAt(lines, reachChapter(lines, within.slice(0, -1)), within[within.length - 1], op, valueSrc, meta);
   return lines.join("\n");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yamlover",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "description": "Browse a yamlover tree in the web: npx yamlover <root> serves a React SPA over a directory.",
   "type": "module",
   "license": "MIT",