schematex 0.6.1 → 0.6.2

package/dist/{chunk-UWA5MWCI.js → chunk-JVAJ6ZLO.js}

@@ -1130,16 +1130,19 @@ function parseNetlist(body, title2) {
       ensureNet(net).anchors.push(`${id}.${pinOrder[p]}`);
     }
     pinMap[id] = pins;
+    const dirHint = (kv.dir ?? kv.orient ?? kv.direction)?.toLowerCase();
+    const explicitDir = dirHint === "right" || dirHint === "left" || dirHint === "up" || dirHint === "down" ? dirHint : void 0;
     const comp = {
       id,
       componentType: cType,
-      direction: "right",
+      direction: explicitDir ?? "right",
       label: kv.label ?? id,
       value: kv.value ?? valueFromTail,
-      attrs: {}
+      attrs: explicitDir ? { dirExplicit: "true" } : {}
     };
     for (const [k, v] of Object.entries(kv)) {
       if (k === "label" || k === "value" || k === "type") continue;
+      if (k === "dir" || k === "orient" || k === "direction") continue;
       comp.attrs[k] = v;
     }
     components.push(comp);
@@ -1667,11 +1670,11 @@ function layoutCircuit(ast) {
 }
 
 // src/diagrams/circuit/autolayout.ts
-var COL_W = 120;
-var ROW_H = 100;
-var RAIL_PAD = 60;
-var LEFT_MARGIN = 80;
-var TOP_MARGIN = 60;
+var COL_W = 96;
+var ROW_H = 80;
+var LEFT_MARGIN = 70;
+var TOP_MARGIN = 56;
+var SHUNT_OFFSET = 28;
 function isPowerSource(c) {
   return c.componentType === "voltage_source" || c.componentType === "current_source" || c.componentType === "ac_source" || c.componentType === "battery" || c.componentType === "vcc";
 }
@@ -1700,56 +1703,87 @@ function extendBBox(bbox, pt) {
 }
 function layoutCircuitNetlist(ast) {
   const pinMap = ast.pinMap ?? {};
+  const isShunt = (c) => {
+    if (isPowerSource(c) || isGround(c)) return false;
+    const pins = pinMap[c.id];
+    if (!pins) return false;
+    const nets = Object.values(pins);
+    return nets.length === 2 && nets.filter((n) => n === "GND").length === 1;
+  };
   const powerComps = [];
   const groundComps = [];
+  const shuntComps = [];
   const middleComps = [];
   for (const c of ast.components) {
     if (isPowerSource(c)) powerComps.push(c);
     else if (isGround(c)) groundComps.push(c);
+    else if (isShunt(c)) shuntComps.push(c);
     else middleComps.push(c);
   }
-  const ranks = [];
-  const mainRank = [...powerComps, ...middleComps];
-  if (mainRank.length) ranks.push(mainRank);
-  if (groundComps.length) ranks.push(groundComps);
-  if (ranks.length === 0) ranks.push(ast.components);
+  const spine = [...powerComps, ...middleComps];
   const placed = /* @__PURE__ */ new Map();
   const items = [];
-  let maxCols = 0;
-  for (const rank of ranks) maxCols = Math.max(maxCols, rank.length);
-  for (let r = 0; r < ranks.length; r++) {
-    const rank = ranks[r];
-    const rowY = TOP_MARGIN + r * (ROW_H + RAIL_PAD);
-    const startX = LEFT_MARGIN + (maxCols - rank.length) * COL_W / 2;
-    for (let i = 0; i < rank.length; i++) {
-      const comp = rank[i];
-      const direction = defaultDirection(comp);
-      comp.direction = direction;
-      const rot = rotationOf(direction);
-      const sym = getSymbol(comp.componentType);
-      const x = startX + i * COL_W;
-      const y = rowY;
-      const worldAnchors = {};
-      if (sym) {
-        for (const [name, pt] of Object.entries(sym.anchors)) {
-          const rp = rotatePt(pt, rot);
-          worldAnchors[name] = { x: x + rp.x, y: y + rp.y };
-        }
-      } else {
-        worldAnchors.start = { x, y };
-        worldAnchors.end = { x: x + 30, y };
+  const place = (comp, x, y, fallbackDir) => {
+    const direction = comp.attrs?.dirExplicit === "true" ? comp.direction : fallbackDir ?? defaultDirection(comp);
+    comp.direction = direction;
+    const rot = rotationOf(direction);
+    const sym = getSymbol(comp.componentType);
+    const worldAnchors = {};
+    if (sym) {
+      for (const [name, pt] of Object.entries(sym.anchors)) {
+        const rp = rotatePt(pt, rot);
+        worldAnchors[name] = { x: x + rp.x, y: y + rp.y };
+      }
+    } else {
+      worldAnchors.start = { x, y };
+      worldAnchors.end = { x: x + 30, y };
+    }
+    const laid = {
+      component: comp,
+      x,
+      y,
+      rotation: rot,
+      length: sym?.length ?? 30,
+      anchors: worldAnchors
+    };
+    items.push(laid);
+    placed.set(comp.id, laid);
+    return laid;
+  };
+  if (spine.length === 0 && shuntComps.length === 0) {
+    ast.components.forEach(
+      (comp, i) => place(comp, LEFT_MARGIN + i * COL_W, TOP_MARGIN)
+    );
+  } else {
+    const spineY = TOP_MARGIN;
+    spine.forEach((comp, i) => place(comp, LEFT_MARGIN + i * COL_W, spineY));
+    const spinePinX = /* @__PURE__ */ new Map();
+    for (const comp of spine) {
+      const pins = pinMap[comp.id];
+      const laid = placed.get(comp.id);
+      if (!pins || !laid) continue;
+      for (const [pinName, net] of Object.entries(pins)) {
+        if (net === "GND") continue;
+        const a = laid.anchors[pinName];
+        if (a && !spinePinX.has(net)) spinePinX.set(net, a.x);
       }
-      const laid = {
-        component: comp,
-        x,
-        y,
-        rotation: rot,
-        length: sym?.length ?? 30,
-        anchors: worldAnchors
-      };
-      items.push(laid);
-      placed.set(comp.id, laid);
     }
+    const shuntY = spineY + ROW_H;
+    const sharedNode = /* @__PURE__ */ new Map();
+    shuntComps.forEach((comp, idx) => {
+      const pins = pinMap[comp.id];
+      const sigNet = Object.values(pins).find((n) => n !== "GND");
+      let x = (sigNet !== void 0 ? spinePinX.get(sigNet) : void 0) ?? LEFT_MARGIN + (spine.length + idx) * COL_W;
+      const used = sharedNode.get(x) ?? 0;
+      sharedNode.set(x, used + 1);
+      x += used * SHUNT_OFFSET;
+      place(comp, x, shuntY, "down");
+    });
+    const baseY = shuntComps.length ? shuntY : spineY;
+    const groundY = baseY + ROW_H;
+    const xs = items.map((it) => it.x);
+    const gx = xs.length ? (Math.min(...xs) + Math.max(...xs)) / 2 : LEFT_MARGIN;
+    groundComps.forEach((comp, i) => place(comp, gx + i * COL_W, groundY, "down"));
   }
   const netPins = /* @__PURE__ */ new Map();
   for (const comp of ast.components) {
@@ -2041,5 +2075,5 @@ var circuit = {
 };
 
 export { EXTRA_SYMBOLS, SYMBOLS, circuit, layoutCircuit, layoutCircuitNetlist, parseCircuit, parseNetlist, renderCircuit };
-//# sourceMappingURL=chunk-UWA5MWCI.js.map
-//# sourceMappingURL=chunk-UWA5MWCI.js.map
+//# sourceMappingURL=chunk-JVAJ6ZLO.js.map
+//# sourceMappingURL=chunk-JVAJ6ZLO.js.map