diagramo 0.1.0 → 0.2.0

package/LICENSE

@@ -1,4 +1,7 @@
-UNLICENSED
+A **Software License for Non-Commercial Use Only** grants the user permission to install and use the software solely for personal, educational, research, or other non-commercial purposes. Under this license, the software may not be used directly or indirectly for commercial advantage, monetary compensation, business operations, or any activity intended to generate revenue.
 
-All rights reserved.
-Replace this file with your intended license before publishing.
+Permitted uses typically include personal projects, academic work, learning, experimentation, or other activities that do not involve commercial gain. The license does not transfer ownership of the software to the user; all rights, title, and intellectual property remain with the original developer or copyright holder.
+
+Prohibited uses include, but are not limited to, using the software within a business environment, providing paid services using the software, incorporating the software into commercial products or services, or otherwise using the software in connection with revenue-generating activities unless a separate commercial license has been obtained.
+
+By using the software, the user agrees to comply with the terms of this non-commercial license. Any commercial use requires prior written permission or the purchase of an appropriate commercial license from the software owner.

package/README.md

@@ -4,8 +4,10 @@ Diagramo renders Surface, Core, and NCF S-expression diagrams into SVG.
 
 This package includes:
 
-- `dist/diagramo.js`: ESM library entry for npm consumers
-- `dist/diagramo.browser.js`: standalone browser bundle for drop-in static pages
+- `src/diagramo.js`: editable source module
+- `src/browser-entry.js`: browser-global auto-render entry
+- `dist/diagramo.js`: npm ESM entry
+- `dist/diagramo.browser.js`: standalone browser bundle for static pages
 
 ## Install
 
@@ -13,7 +15,27 @@ This package includes:
 npm install diagramo
 ```
 
-This package declares `d3` and `d3-dag` as runtime dependencies.
+## Dev Demo
+
+clone repo then enter root project repo
+
+```bash
+python -m http.server
+```
+
+## Publishable package layout
+
+Edit `src/diagramo.js`, then regenerate the browser bundle with:
+
+```bash
+npm install
+npm run build
+```
+
+That command:
+
+- copies `src/diagramo.js` to `dist/diagramo.js`
+- bundles `src/browser-entry.js` to `dist/diagramo.browser.js`
 
 ## ESM usage
 
@@ -43,7 +65,7 @@ renderSource(`(program (X) (-> f X Y))`, host, { zoom: false, height: 320 });
 
 ## Static page drop-in
 
-After you publish the package, you can use the browser bundle from a CDN:
+After publishing, you can use the browser bundle from a CDN:
 
 ```html
 <pre class="diagramo">
@@ -66,6 +88,7 @@ The browser bundle auto-renders `pre.diagramo` elements on page load.
 - source `<pre>` elements are replaced with rendered hosts
 - labels default to IDs in Surface shorthand
 - `(-> f A B)` synthesizes missing nodes `A` and `B`
+- the host auto-grows to avoid clipping labels and arrowheads
 
 ### Data attributes
 
@@ -102,19 +125,11 @@ The standalone browser bundle exposes `window.Diagramo` with:
 - `renderAll`
 - `autoRender`
 
-Example:
-
-```html
-<script>
-  window.Diagramo.renderAll();
-</script>
-```
-
 ## API
 
 ### `compileSource(source, mode = "auto")`
 
-Compiles source text into:
+Returns:
 
 ```js
 {
@@ -159,13 +174,12 @@ Returns:
 (-> f A B)       ; arrow f from A to B, label "f", synthesize A/B if needed
 ```
 
-## Notes before publishing
-
-- The package name `diagramo` may already be taken on npm. Change `name` in `package.json` if needed.
-- The package is marked `UNLICENSED`. Replace the license field and `LICENSE` file with your intended license before publishing.
-
 ## Files
 
+- `src/diagramo.js`
+- `src/browser-entry.js`
+- `scripts/build.mjs`
 - `dist/diagramo.js`
 - `dist/diagramo.browser.js`
 - `examples/static-page.html`
+

package/dist/diagramo.browser.js

@@ -1,3 +1,4 @@
+/* diagramo browser bundle */
 var DiagramoBundle = (() => {
   var __defProp = Object.defineProperty;
   var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -17,12 +18,29 @@ var DiagramoBundle = (() => {
   };
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // browser-entry.js
+  // src/browser-entry.js
   var browser_entry_exports = {};
   __export(browser_entry_exports, {
     default: () => browser_entry_default
   });
 
+  // src/diagramo.js
+  var diagramo_exports = {};
+  __export(diagramo_exports, {
+    Diagramo: () => Diagramo,
+    VERSION: () => VERSION,
+    autoRender: () => autoRender,
+    compileAst: () => compileAst,
+    compileSource: () => compileSource,
+    default: () => diagramo_default,
+    emitCoreDoc: () => emitCoreDoc,
+    emitNCFDoc: () => emitNCFDoc,
+    parseSexpr: () => parseSexpr,
+    renderAll: () => renderAll,
+    renderElement: () => renderElement,
+    renderSource: () => renderSource
+  });
+
   // node_modules/d3-dispatch/src/dispatch.js
   var noop = { value: () => {
   } };
@@ -5642,8 +5660,8 @@ var DiagramoBundle = (() => {
     throw D`invalid tweakFlip style: ${e}`;
   }
 
-  // dist/diagramo.js
-  var VERSION = "0.1.0";
+  // src/diagramo.js
+  var VERSION = "0.2.0";
   var RESERVED_HEADS = /* @__PURE__ */ new Set([
     "program",
     "root",
@@ -5676,7 +5694,8 @@ var DiagramoBundle = (() => {
   position: relative;
   display: block;
   width: 100%;
-  min-height: 240px;
+  height: var(--diagramo-height, 360px);
+  min-height: var(--diagramo-height, 360px);
   border-radius: 14px;
   border: 1px solid var(--diagramo-border);
   background: linear-gradient(180deg, rgba(17,19,26,0.98), rgba(15,17,23,0.98));
@@ -5733,7 +5752,8 @@ var DiagramoBundle = (() => {
     document.head.appendChild(style);
   }
   function tokenizeSexpr(src) {
-    src = String(src ?? "").replace(/;[^\n\r]*/g, "");
+    var _a;
+    src = String(src != null ? src : "").replace(/;[^\n\r]*/g, "");
     const tokens = [];
     let i = 0;
     while (i < src.length) {
@@ -5753,7 +5773,7 @@ var DiagramoBundle = (() => {
         while (j2 < src.length) {
           const ch = src[j2];
           if (ch === "\\") {
-            const nxt = src[j2 + 1] ?? "";
+            const nxt = (_a = src[j2 + 1]) != null ? _a : "";
             if (nxt === "n") out += "\n";
             else if (nxt === "t") out += "	";
             else out += nxt;
@@ -5806,7 +5826,7 @@ var DiagramoBundle = (() => {
   }
   function atomValue(x) {
     if (isList(x)) throw new Error("Expected atom, got list");
-    return typeof x === "object" && x ? String(x.value) : String(x ?? "");
+    return typeof x === "object" && x ? String(x.value) : String(x != null ? x : "");
   }
   function ensureAnyAtom(x, ctx) {
     if (isList(x)) throw new Error(`${ctx}: expected atom, got list`);
@@ -6110,6 +6130,7 @@ var DiagramoBundle = (() => {
     for (const item of doc.items || []) visit(item);
   }
   function validateCoreDoc(doc) {
+    var _a;
     const entities = /* @__PURE__ */ new Map();
     const parents = /* @__PURE__ */ new Map();
     const refs = [];
@@ -6133,7 +6154,7 @@ var DiagramoBundle = (() => {
       while (cur && cur !== doc.rootId) {
         if (seen.has(cur)) throw new Error(`Containment cycle involving ${id2}`);
         seen.add(cur);
-        cur = parents.get(cur) ?? doc.rootId;
+        cur = (_a = parents.get(cur)) != null ? _a : doc.rootId;
       }
     }
   }
@@ -6141,7 +6162,7 @@ var DiagramoBundle = (() => {
     const data = {};
     const classes = [...extraClasses];
     for (const [k, v] of Object.entries(attrs || {})) {
-      if (k === "class") classes.push(...String(v ?? "").trim().split(/\s+/).filter(Boolean));
+      if (k === "class") classes.push(...String(v != null ? v : "").trim().split(/\s+/).filter(Boolean));
       else data[k] = v;
     }
     return { data, classString: [...new Set(classes)].join(" ") };
@@ -6217,8 +6238,8 @@ var DiagramoBundle = (() => {
       if (headOf(item) === "nodes") nodesBlock = item;
       if (headOf(item) === "edges") edgesBlock = item;
     }
-    nodesBlock ||= [{ type: "sym", value: "nodes" }];
-    edgesBlock ||= [{ type: "sym", value: "edges" }];
+    nodesBlock || (nodesBlock = [{ type: "sym", value: "nodes" }]);
+    edgesBlock || (edgesBlock = [{ type: "sym", value: "edges" }]);
     const doc = { rootId: "__root__", nodes: [], edges: [] };
     for (const expr of nodesBlock.slice(1)) doc.nodes.push(parseNCFNode(expr));
     for (const expr of edgesBlock.slice(1)) doc.edges.push(parseNCFEdge(expr));
@@ -6246,7 +6267,7 @@ var DiagramoBundle = (() => {
   function printVal(v) {
     if (typeof v === "number") return String(v);
     if (typeof v === "boolean") return v ? "true" : "false";
-    const s = String(v ?? "");
+    const s = String(v != null ? v : "");
     return /^[^\s()";]+$/.test(s) ? s : JSON.stringify(s);
   }
   function emitAttr(attrs) {
@@ -6534,7 +6555,8 @@ var DiagramoBundle = (() => {
     return comps;
   }
   function gridPack(ids, sizes, opts = {}) {
-    const gapX = opts.gapX ?? 50, gapY = opts.gapY ?? 45, maxCols = opts.maxCols ?? 4;
+    var _a, _b, _c;
+    const gapX = (_a = opts.gapX) != null ? _a : 50, gapY = (_b = opts.gapY) != null ? _b : 45, maxCols = (_c = opts.maxCols) != null ? _c : 4;
     const pos = /* @__PURE__ */ new Map();
     let col = 0, y = 0, rowH = 0, x = 0;
     const sorted = [...ids].sort((a, b) => String(a).localeCompare(String(b)));
@@ -6570,10 +6592,11 @@ var DiagramoBundle = (() => {
     return { left, top, right, bottom };
   }
   function layoutWithD3Dag(ids, edges, sizes) {
+    var _a, _b, _c, _d;
     if (ids.length === 0) return /* @__PURE__ */ new Map();
     if (ids.length === 1) {
       const only = ids[0];
-      return /* @__PURE__ */ new Map([[only, { x: (sizes.get(only)?.w ?? 120) / 2, y: (sizes.get(only)?.h ?? 36) / 2 }]]);
+      return /* @__PURE__ */ new Map([[only, { x: ((_b = (_a = sizes.get(only)) == null ? void 0 : _a.w) != null ? _b : 120) / 2, y: ((_d = (_c = sizes.get(only)) == null ? void 0 : _c.h) != null ? _d : 36) / 2 }]]);
     }
     const comps = connectedComponents(ids, edges);
     const positions = /* @__PURE__ */ new Map();
@@ -6614,10 +6637,15 @@ var DiagramoBundle = (() => {
   }
   function createSvgShell(host, options) {
     host.classList.add("diagramo-host");
+    host.style.setProperty("--diagramo-height", `${options.height}px`);
+    host.style.height = `${options.height}px`;
     host.style.minHeight = `${options.height}px`;
     host.innerHTML = "";
     const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
     svg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
+    svg.setAttribute("width", "100%");
+    svg.setAttribute("height", "100%");
+    svg.setAttribute("preserveAspectRatio", "xMidYMid meet");
     const defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
     const marker = document.createElementNS("http://www.w3.org/2000/svg", "marker");
     marker.setAttribute("id", `diagramoArrowHead-${Math.random().toString(36).slice(2)}`);
@@ -6647,13 +6675,25 @@ var DiagramoBundle = (() => {
     statusEl.textContent = msg;
     statusEl.className = "diagramo-status" + (kind === "ok" ? " ok" : kind === "bad" ? " bad" : "");
   }
-  function fitToView(svgSel, zoomLayerSel, sceneSel, host, zoomBehavior, animate = false) {
-    const w = host.clientWidth || 800;
-    const h = host.clientHeight || 360;
+  function measuredSceneBBox(sceneSel) {
     const g = sceneSel.node();
-    if (!g) return;
+    if (!g) return null;
     const bbox = g.getBBox();
-    if (!(bbox.width > 0 && bbox.height > 0)) return;
+    if (!(bbox.width > 0 && bbox.height > 0)) return null;
+    const bleedX = 24;
+    const bleedY = 28;
+    return {
+      x: bbox.x - bleedX,
+      y: bbox.y - bleedY,
+      width: bbox.width + bleedX * 2,
+      height: bbox.height + bleedY * 2
+    };
+  }
+  function fitToView(svgSel, zoomLayerSel, sceneSel, host, zoomBehavior, animate = false, bboxOverride = null) {
+    const w = host.clientWidth || 800;
+    const h = host.clientHeight || 360;
+    const bbox = bboxOverride || measuredSceneBBox(sceneSel);
+    if (!bbox || !(bbox.width > 0 && bbox.height > 0)) return;
     const pad = 24;
     const scale = Math.min((w - pad * 2) / bbox.width, (h - pad * 2) / bbox.height);
     const tx = w / 2 - scale * (bbox.x + bbox.width / 2);
@@ -6667,6 +6707,7 @@ var DiagramoBundle = (() => {
     }
   }
   function renderNCFDocIntoHost(ncfDoc, host, options) {
+    var _a, _b;
     injectStyles();
     const warnings = [];
     const { svg, zoomLayer, scene, status, arrowHeadId } = createSvgShell(host, options);
@@ -6720,14 +6761,15 @@ var DiagramoBundle = (() => {
     for (const [p, kids] of childrenByParent.entries()) renderableChildrenByParent.set(p, kids.filter((k) => renderable.has(k)));
     for (const id2 of renderable) nodes[id2].isCompound = (renderableChildrenByParent.get(id2) || []).length > 0;
     function computeDepth(id2) {
+      var _a2, _b2, _c;
       let d = 0;
-      let cur = nodes[id2]?.parent ?? "__root__";
+      let cur = (_b2 = (_a2 = nodes[id2]) == null ? void 0 : _a2.parent) != null ? _b2 : "__root__";
       const guard = /* @__PURE__ */ new Set([id2]);
       while (cur && cur !== "__root__" && nodes[cur]) {
         if (guard.has(cur)) break;
         guard.add(cur);
         d++;
-        cur = nodes[cur].parent ?? "__root__";
+        cur = (_c = nodes[cur].parent) != null ? _c : "__root__";
       }
       return d;
     }
@@ -6735,10 +6777,11 @@ var DiagramoBundle = (() => {
     const measurer = document.createElement("canvas").getContext("2d");
     measurer.font = "12px system-ui, -apple-system, Segoe UI, Roboto, sans-serif";
     function measureLabel(s) {
-      return Math.ceil(measurer.measureText(String(s ?? "")).width);
+      return Math.ceil(measurer.measureText(String(s != null ? s : "")).width);
     }
     function nodeLabel(n) {
-      return n.data.label ?? n.data.name ?? n.data.title ?? n.id;
+      var _a2, _b2, _c;
+      return (_c = (_b2 = (_a2 = n.data.label) != null ? _a2 : n.data.name) != null ? _b2 : n.data.title) != null ? _c : n.id;
     }
     for (const id2 of renderable) {
       const n = nodes[id2];
@@ -6763,6 +6806,7 @@ var DiagramoBundle = (() => {
       }
     }
     function directChildUnder(parentId, nodeId) {
+      var _a2, _b2;
       if (!nodes[nodeId]) return null;
       let cur = nodeId, prev = null;
       const guard = /* @__PURE__ */ new Set();
@@ -6770,7 +6814,7 @@ var DiagramoBundle = (() => {
         if (guard.has(cur)) return null;
         guard.add(cur);
         prev = cur;
-        cur = nodes[cur]?.parent ?? "__root__";
+        cur = (_b2 = (_a2 = nodes[cur]) == null ? void 0 : _a2.parent) != null ? _b2 : "__root__";
         if (cur === "__root__" && parentId !== "__root__") return null;
       }
       return cur === parentId ? prev : null;
@@ -6804,17 +6848,18 @@ var DiagramoBundle = (() => {
     }
     const basePairsCache = /* @__PURE__ */ new Map();
     function arrowBasePairs(aid, stack = /* @__PURE__ */ new Set()) {
+      var _a2, _b2;
       if (basePairsCache.has(aid)) return basePairsCache.get(aid);
       if (stack.has(aid)) return /* @__PURE__ */ new Set();
       stack.add(aid);
       const out = /* @__PURE__ */ new Set();
       const w = arrowWiring.get(aid);
-      if (w?.fromId && w?.toId) {
+      if ((w == null ? void 0 : w.fromId) && (w == null ? void 0 : w.toId)) {
         const f = w.fromId, t = w.toId;
         if (renderable.has(f) && renderable.has(t)) out.add(unorderedKey(f, t));
         else {
-          if (nodes[f]?.isArrow) for (const k of arrowBasePairs(f, stack)) out.add(k);
-          if (nodes[t]?.isArrow) for (const k of arrowBasePairs(t, stack)) out.add(k);
+          if ((_a2 = nodes[f]) == null ? void 0 : _a2.isArrow) for (const k of arrowBasePairs(f, stack)) out.add(k);
+          if ((_b2 = nodes[t]) == null ? void 0 : _b2.isArrow) for (const k of arrowBasePairs(t, stack)) out.add(k);
         }
       }
       stack.delete(aid);
@@ -6824,9 +6869,9 @@ var DiagramoBundle = (() => {
     const scoreByPair = new Map(baseCountByPair);
     const bump = (k, amt = 1) => scoreByPair.set(k, (scoreByPair.get(k) || 0) + amt);
     for (const [mid, w] of arrowWiring.entries()) {
-      if (!w?.fromId || !w?.toId) continue;
-      if (nodes[w.fromId]?.isArrow) for (const k of arrowBasePairs(w.fromId)) bump(k, 1);
-      if (nodes[w.toId]?.isArrow) for (const k of arrowBasePairs(w.toId)) bump(k, 1);
+      if (!(w == null ? void 0 : w.fromId) || !(w == null ? void 0 : w.toId)) continue;
+      if ((_a = nodes[w.fromId]) == null ? void 0 : _a.isArrow) for (const k of arrowBasePairs(w.fromId)) bump(k, 1);
+      if ((_b = nodes[w.toId]) == null ? void 0 : _b.isArrow) for (const k of arrowBasePairs(w.toId)) bump(k, 1);
     }
     function extraSpacersForPairKey(k) {
       const base = baseCountByPair.get(k) || 0;
@@ -6957,51 +7002,54 @@ var DiagramoBundle = (() => {
     }
     function approxArrowCenter(aid) {
       const w = arrowWiring.get(aid);
-      if (w?.fromId && w?.toId && nodes[w.fromId] && nodes[w.toId]) return { x: (nodes[w.fromId].cx + nodes[w.toId].cx) / 2, y: (nodes[w.fromId].cy + nodes[w.toId].cy) / 2 };
+      if ((w == null ? void 0 : w.fromId) && (w == null ? void 0 : w.toId) && nodes[w.fromId] && nodes[w.toId]) return { x: (nodes[w.fromId].cx + nodes[w.toId].cx) / 2, y: (nodes[w.fromId].cy + nodes[w.toId].cy) / 2 };
       return { x: 0, y: 0 };
     }
     function endpointAnchor(endpointId2) {
+      var _a2, _b2;
       const n = nodes[endpointId2];
       if (!n) return { x: 0, y: 0, type: "missing" };
       if (n.isArrow) return { ...getArrowAnchor(endpointId2), type: "arrow" };
       if (renderable.has(endpointId2)) return { x: n.cx, y: n.cy, type: "node" };
-      return { x: n.cx ?? 0, y: n.cy ?? 0, type: "other" };
+      return { x: (_a2 = n.cx) != null ? _a2 : 0, y: (_b2 = n.cy) != null ? _b2 : 0, type: "other" };
     }
     function buildPathBetween(fromId, toId, opts) {
+      var _a2, _b2;
       const aA = endpointAnchor(fromId);
       const aB = endpointAnchor(toId);
       let start2 = { x: aA.x, y: aA.y }, end = { x: aB.x, y: aB.y };
       if (aA.type === "node") start2 = trimToRect(nodeRect(fromId), end);
       if (aB.type === "node") end = trimToRect(nodeRect(toId), start2);
-      const offset = opts.offset ?? 0;
+      const offset = (_a2 = opts.offset) != null ? _a2 : 0;
       if (opts.ortho) {
         start2 = { x: start2.x, y: start2.y + offset };
         end = { x: end.x, y: end.y + offset };
         const midX = (start2.x + end.x) / 2;
         return [start2, { x: midX, y: start2.y }, { x: midX, y: end.y }, end];
       }
-      const nrm = opts.baseNormal ?? unitNormal(start2, end);
+      const nrm = (_b2 = opts.baseNormal) != null ? _b2 : unitNormal(start2, end);
       start2 = { x: start2.x + nrm.x * offset, y: start2.y + nrm.y * offset };
       end = { x: end.x + nrm.x * offset, y: end.y + nrm.y * offset };
       return [start2, end];
     }
     function getArrowAnchor(aid) {
+      var _a2, _b2, _c, _d, _e2, _f, _g;
       if (arrowAnchor.has(aid)) return arrowAnchor.get(aid);
       if (arrowAnchorGuard.has(aid)) return approxArrowCenter(aid);
       arrowAnchorGuard.add(aid);
       const w = arrowWiring.get(aid);
-      if (!w?.fromId || !w?.toId) {
+      if (!(w == null ? void 0 : w.fromId) || !(w == null ? void 0 : w.toId)) {
         const fallback = approxArrowCenter(aid);
         arrowAnchor.set(aid, fallback);
         arrowAnchorGuard.delete(aid);
         return fallback;
       }
       const is1 = renderable.has(w.fromId) && renderable.has(w.toId);
-      const offset = is1 ? lanes.get(aid) ?? 0 : 0;
+      const offset = is1 ? (_a2 = lanes.get(aid)) != null ? _a2 : 0 : 0;
       const baseNormal = is1 ? baseNormalForPair(w.fromId, w.toId, nodes) : null;
       const points = buildPathBetween(w.fromId, w.toId, { ortho: is1 ? ortho : false, offset, baseNormal });
       const mid = polylineMidpoint(points);
-      const label = nodes[aid]?.data?.label ?? nodes[aid]?.data?.name ?? aid;
+      const label = (_g = (_f = (_c = (_b2 = nodes[aid]) == null ? void 0 : _b2.data) == null ? void 0 : _c.label) != null ? _f : (_e2 = (_d = nodes[aid]) == null ? void 0 : _d.data) == null ? void 0 : _e2.name) != null ? _g : aid;
       arrowPath.set(aid, { points: points.map((p) => ({ ...p })), mid, kind: is1 ? "m1" : "m2", label, laneOffset: offset, baseNormal, ctrl: null });
       arrowAnchor.set(aid, mid);
       arrowAnchorGuard.delete(aid);
@@ -7010,11 +7058,14 @@ var DiagramoBundle = (() => {
     for (const a of arrowsValid) getArrowAnchor(a.id);
     function bundleCurvesForM2() {
       const curveGap = 16, curveCap = 60;
-      const endpointKey = (id2) => nodes[id2]?.isArrow ? `a:${id2}` : `n:${id2}`;
+      const endpointKey = (id2) => {
+        var _a2;
+        return ((_a2 = nodes[id2]) == null ? void 0 : _a2.isArrow) ? `a:${id2}` : `n:${id2}`;
+      };
       const groups = /* @__PURE__ */ new Map();
       for (const aid of arrowsValid.filter((a) => !(renderable.has(a.from) && renderable.has(a.to))).map((a) => a.id).sort()) {
         const w = arrowWiring.get(aid);
-        if (!w?.fromId || !w?.toId) continue;
+        if (!(w == null ? void 0 : w.fromId) || !(w == null ? void 0 : w.toId)) continue;
         const pts = buildPathBetween(w.fromId, w.toId, { ortho: false, offset: 0, baseNormal: null });
         const A2 = pts[0], B = pts[pts.length - 1];
         const key = endpointKey(w.fromId) + "->" + endpointKey(w.toId);
@@ -7059,18 +7110,23 @@ var DiagramoBundle = (() => {
       });
     }
     const visibleEdges = arrowsValid.map((a) => {
+      var _a2, _b2;
       const p = arrowPath.get(a.id);
-      const kind = p?.kind || (renderable.has(a.from) && renderable.has(a.to) ? "m1" : "m2");
-      return { id: a.id, from: a.from, to: a.to, points: p?.points || [], ctrl: p?.ctrl || null, mid: p?.mid || approxArrowCenter(a.id), kind, label: p?.label || a.id, laneOffset: p?.laneOffset ?? 0, baseNormal: p?.baseNormal ?? null };
+      const kind = (p == null ? void 0 : p.kind) || (renderable.has(a.from) && renderable.has(a.to) ? "m1" : "m2");
+      return { id: a.id, from: a.from, to: a.to, points: (p == null ? void 0 : p.points) || [], ctrl: (p == null ? void 0 : p.ctrl) || null, mid: (p == null ? void 0 : p.mid) || approxArrowCenter(a.id), kind, label: (p == null ? void 0 : p.label) || a.id, laneOffset: (_a2 = p == null ? void 0 : p.laneOffset) != null ? _a2 : 0, baseNormal: (_b2 = p == null ? void 0 : p.baseNormal) != null ? _b2 : null };
     });
     visibleEdges.sort((a, b) => a.kind === b.kind ? 0 : a.kind === "m1" ? -1 : 1);
     const edgeLayer = scene.append("g").attr("class", "edgeLayer");
-    edgeLayer.selectAll("path").data(visibleEdges).join("path").attr("class", (d) => d.kind === "m2" ? "edge m2" : "edge").attr("marker-end", `url(#${arrowHeadId})`).attr("d", (d) => d.kind === "m2" && d.ctrl && (d.points?.length || 0) >= 2 ? quadToD(d.points[0], d.ctrl, d.points[d.points.length - 1]) : pathToD(d.points));
+    edgeLayer.selectAll("path").data(visibleEdges).join("path").attr("class", (d) => d.kind === "m2" ? "edge m2" : "edge").attr("marker-end", `url(#${arrowHeadId})`).attr("d", (d) => {
+      var _a2;
+      return d.kind === "m2" && d.ctrl && (((_a2 = d.points) == null ? void 0 : _a2.length) || 0) >= 2 ? quadToD(d.points[0], d.ctrl, d.points[d.points.length - 1]) : pathToD(d.points);
+    });
     function labelPos(d) {
+      var _a2;
       const pts = d.points || [];
       const chordNormal = pts.length >= 2 ? unitNormal(pts[0], pts[pts.length - 1]) : { x: 0, y: -1 };
       const nrm = d.kind === "m1" && d.baseNormal ? d.baseNormal : chordNormal;
-      const off = d.laneOffset ?? 0;
+      const off = (_a2 = d.laneOffset) != null ? _a2 : 0;
       const sign = off === 0 ? 1 : Math.sign(off);
       const mag = (d.kind === "m2" ? 18 : 14) + Math.min(10, Math.abs(off));
       return { x: d.mid.x + nrm.x * sign * mag, y: d.mid.y + nrm.y * sign * mag, nrm };
@@ -7083,7 +7139,16 @@ var DiagramoBundle = (() => {
     });
     nudgePoints(labelPoints, 16, 24);
     const labelById = new Map(labelPoints.map((p) => [p.id, p]));
-    edgeLayer.selectAll("text").data(visibleEdges).join("text").attr("class", "edgeLabel").attr("x", (d) => labelById.get(d.id)?.x ?? d.mid.x).attr("y", (d) => labelById.get(d.id)?.y ?? d.mid.y).text((d) => d.label ?? d.id);
+    edgeLayer.selectAll("text").data(visibleEdges).join("text").attr("class", "edgeLabel").attr("x", (d) => {
+      var _a2, _b2;
+      return (_b2 = (_a2 = labelById.get(d.id)) == null ? void 0 : _a2.x) != null ? _b2 : d.mid.x;
+    }).attr("y", (d) => {
+      var _a2, _b2;
+      return (_b2 = (_a2 = labelById.get(d.id)) == null ? void 0 : _a2.y) != null ? _b2 : d.mid.y;
+    }).text((d) => {
+      var _a2;
+      return (_a2 = d.label) != null ? _a2 : d.id;
+    });
     const compLayer = scene.append("g").attr("class", "compoundLayer");
     const compG = compLayer.selectAll("g.compound").data(allCompounds.map((id2) => nodes[id2])).join("g").attr("class", "compound").attr("transform", (d) => `translate(${d.cx - d.w / 2}, ${d.cy - d.h / 2})`);
     compG.append("rect").attr("class", "outer").attr("rx", 14).attr("ry", 14).attr("width", (d) => d.w).attr("height", (d) => d.h);
@@ -7097,10 +7162,11 @@ var DiagramoBundle = (() => {
     if (showGlyphs) {
       const glyphLayer = scene.append("g").attr("class", "glyphLayer");
       const glyphData = arrowNodes.map((aid) => {
+        var _a2, _b2, _c, _d;
         const p = arrowPath.get(aid);
         const mid = arrowAnchor.get(aid) || approxArrowCenter(aid);
-        const lbl = nodes[aid]?.data?.label ?? aid;
-        const nrm = p?.points?.length ? segmentAtHalf(p.points).nrm : { x: 0, y: -1 };
+        const lbl = (_c = (_b2 = (_a2 = nodes[aid]) == null ? void 0 : _a2.data) == null ? void 0 : _b2.label) != null ? _c : aid;
+        const nrm = ((_d = p == null ? void 0 : p.points) == null ? void 0 : _d.length) ? segmentAtHalf(p.points).nrm : { x: 0, y: -1 };
         const h = simpleHash(aid);
         const sgn = h & 1 ? 1 : -1;
         return { id: aid, x: mid.x, y: mid.y, label: lbl, dir: { x: nrm.x * sgn, y: nrm.y * sgn } };
@@ -7122,26 +7188,27 @@ var DiagramoBundle = (() => {
     return { svg, zoomLayer, scene, status, fit: () => fitToView(svg, zoomLayer, scene, host, zoomBehavior, true), arrowHeadId };
   }
   function normalizeRenderOptions(options = {}, el = null) {
-    const ds = el?.dataset || {};
+    var _a, _b, _c, _d;
+    const ds = (el == null ? void 0 : el.dataset) || {};
     const boolFrom = (a, b, fallback) => {
-      const v = a ?? b;
+      const v = a != null ? a : b;
       if (v === void 0 || v === null || v === "") return fallback;
       return !(v === false || v === "false" || v === "0" || v === "off" || v === "no");
     };
     const numFrom = (a, b, fallback) => {
-      const v = a ?? b;
+      const v = a != null ? a : b;
       const n = Number(v);
       return Number.isFinite(n) && n > 0 ? n : fallback;
     };
     return {
-      mode: options.mode ?? ds.diagramoMode ?? "auto",
+      mode: (_b = (_a = options.mode) != null ? _a : ds.diagramoMode) != null ? _b : "auto",
       zoom: boolFrom(options.zoom, ds.diagramoZoom, false),
       ortho: boolFrom(options.ortho, ds.diagramoOrtho, false),
       wiring: boolFrom(options.wiring, ds.diagramoWiring, false),
       glyphs: boolFrom(options.glyphs, ds.diagramoGlyphs, false),
       height: numFrom(options.height, ds.diagramoHeight, 360),
-      observeResize: options.observeResize ?? true,
-      replaceSource: options.replaceSource ?? true
+      observeResize: (_c = options.observeResize) != null ? _c : true,
+      replaceSource: (_d = options.replaceSource) != null ? _d : true
     };
   }
   function renderSource(source, host, options = {}) {
@@ -7155,8 +7222,9 @@ var DiagramoBundle = (() => {
     return { host, compiled, fit: view.fit, rerender: (nextOptions = {}) => renderSource(source, host, { ...opts, ...nextOptions }) };
   }
   function renderElement(el, options = {}) {
+    var _a, _b;
     if (!(el instanceof Element)) throw new Error("renderElement expects a DOM element");
-    const source = options.source ?? el.textContent ?? "";
+    const source = (_b = (_a = options.source) != null ? _a : el.textContent) != null ? _b : "";
     const opts = normalizeRenderOptions(options, el);
     let host = el;
     if (opts.replaceSource && el.tagName === "PRE") {
@@ -7197,20 +7265,13 @@ var DiagramoBundle = (() => {
     renderAll,
     autoRender
   };
+  var diagramo_default = Diagramo;
 
-  // browser-entry.js
+  // src/browser-entry.js
   var globalApi = {
-    version: VERSION,
-    parseSexpr,
-    compileAst,
-    compileSource,
-    emitCoreDoc,
-    emitNCFDoc,
-    renderSource,
-    renderElement,
-    renderAll,
-    autoRender,
-    Diagramo
+    ...diagramo_exports,
+    default: diagramo_default,
+    Diagramo: diagramo_default
   };
   if (typeof window !== "undefined") {
     window.Diagramo = globalApi;