@tscircuit/core 0.0.1442 → 0.0.1444

package/dist/index.d.ts

@@ -153063,6 +153063,7 @@ declare class SymbolComponent extends PrimitiveComponent<typeof symbolProps> imp
 }
 
 declare class AnalogSimulation extends PrimitiveComponent<typeof analogSimulationProps> {
+    simulation_experiment_id: string | null;
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<{

package/dist/index.js

@@ -21628,7 +21628,36 @@ var insertNetLabelsForPortsMissingTrace = ({
     }
     const implicitPortLabelText = connectedSourcePortIdsForKey.map((sourcePortId) => getSourcePortNetLabelText(db, sourcePortId)).filter((label) => Boolean(label)).join("/");
     const directCrossSubcircuitConnectionLabelText = getDirectCrossSubcircuitConnectionLabelText(db, srcPortId);
+    const isConnectivityKeyFallback = !sourceNet?.name && !sourceNet?.source_net_id && !assignedPortNetLabelText && !directCrossSubcircuitConnectionLabelText && !implicitPortLabelText;
     const text = sourceNet?.name || sourceNet?.source_net_id || assignedPortNetLabelText || directCrossSubcircuitConnectionLabelText || implicitPortLabelText || connKey;
+    if (isConnectivityKeyFallback) {
+      const sourcePortComponent = connectedPortsForKey.find(
+        (port) => port.source_port_id === srcPortId
+      );
+      const collapsedGroup = sourcePortComponent?.parent;
+      if (sourcePortComponent?.isGroupPort() && collapsedGroup?._parsedProps?.showAsSchematicBox) {
+        const sourceTracesConnectedToPort = db.source_trace.list().filter(
+          (trace) => trace.connected_source_port_ids?.includes(srcPortId)
+        );
+        const isPortInsideCollapsedGroup = (port) => {
+          let parent = port.parent;
+          while (parent) {
+            if (parent === collapsedGroup) return true;
+            parent = parent.parent;
+          }
+          return false;
+        };
+        const allConnectionsAreInternal = sourceTracesConnectedToPort.length > 0 && sourceTracesConnectedToPort.every(
+          (trace) => (trace.connected_source_net_ids?.length ?? 0) === 0 && trace.connected_source_port_ids.filter((sourcePortId) => sourcePortId !== srcPortId).every((sourcePortId) => {
+            const connectedPort = connectedPortsForKey.find(
+              (port) => port.source_port_id === sourcePortId
+            );
+            return connectedPort ? isPortInsideCollapsedGroup(connectedPort) : false;
+          })
+        );
+        if (allConnectionsAreInternal) continue;
+      }
+    }
     const connectedPortCountForKey = Array.from(
       allSourceAndSchematicPortIdsInScope
     ).filter((portId) => {
@@ -22115,82 +22144,149 @@ var isVoltageGraph = (element) => element.type === "simulation_transient_voltage
 
 // lib/components/primitive-components/Group/Group_doInitialSimulationSpiceEngineRender.ts
 var debug11 = Debug13("tscircuit:core:Group_doInitialSimulationSpiceEngineRender");
+var getCircuitJsonForAnalogSimulation = ({
+  circuitJson,
+  simulationExperimentId,
+  voltageProbes,
+  ammeters
+}) => {
+  const voltageProbeIds = new Set(
+    voltageProbes.map((probe) => probe.simulation_voltage_probe_id).filter((id) => Boolean(id))
+  );
+  const currentProbeIds = new Set(
+    ammeters.map((ammeter) => ammeter.simulation_current_probe_id).filter((id) => Boolean(id))
+  );
+  return circuitJson.filter((element) => {
+    if (element.type === "simulation_experiment") {
+      return element.simulation_experiment_id === simulationExperimentId;
+    }
+    if (element.type === "simulation_voltage_probe") {
+      return voltageProbeIds.has(element.simulation_voltage_probe_id);
+    }
+    if (element.type === "simulation_current_probe") {
+      return currentProbeIds.has(element.simulation_current_probe_id);
+    }
+    if (element.type === "simulation_oscilloscope_trace") {
+      if (element.simulation_voltage_probe_id) {
+        return voltageProbeIds.has(element.simulation_voltage_probe_id);
+      }
+      if (element.simulation_current_probe_id) {
+        return currentProbeIds.has(element.simulation_current_probe_id);
+      }
+    }
+    if (element.type === "simulation_transient_voltage_graph" || element.type === "simulation_transient_current_graph" || element.type === "simulation_unknown_experiment_error") {
+      return false;
+    }
+    return true;
+  });
+};
 function Group_doInitialSimulationSpiceEngineRender(group) {
   if (!group.isSubcircuit) return;
   const { root } = group;
   if (!root) return;
   const analogSims = group.selectAll("analogsimulation");
   if (analogSims.length === 0) return;
-  const voltageProbes = group.selectAll("voltageprobe");
-  const ammeters = group.selectAll("ammeter");
   resetSimulationColorState();
   const spiceEngineMap = { ...root.platform?.spiceEngineMap };
   if (!spiceEngineMap.spicey) {
     spiceEngineMap.spicey = getSpiceyEngine();
   }
-  const circuitJson = root.db.toArray();
-  let spiceString;
-  let spiceNetlist;
-  try {
-    spiceNetlist = circuitJsonToSpice(circuitJson);
-    spiceString = spiceNetlist.toSpiceString();
-    debug11(`Generated SPICE string:
-${spiceString}`);
-  } catch (error) {
-    debug11(`Failed to convert circuit JSON to SPICE: ${error}`);
-    return;
-  }
-  const graphNameToProbe = /* @__PURE__ */ new Map();
-  for (const probe of voltageProbes) {
-    if (probe.finalProbeName) {
-      graphNameToProbe.set(probe.finalProbeName, probe);
+  for (const analogSim of analogSims) {
+    const simulationExperimentId = analogSim.simulation_experiment_id;
+    if (!simulationExperimentId) {
+      debug11("No simulation experiment id found, skipping simulation");
+      continue;
     }
-  }
-  const voltageProbesById = /* @__PURE__ */ new Map();
-  const graphDisplayOverridesByProbeId = /* @__PURE__ */ new Map();
-  for (const probe of voltageProbes) {
-    if (probe.simulation_voltage_probe_id) {
-      voltageProbesById.set(probe.simulation_voltage_probe_id, probe);
-      graphDisplayOverridesByProbeId.set(
-        probe.simulation_voltage_probe_id,
-        getVoltageProbeGraphDisplayOverrides(probe)
-      );
+    const simulationExperiment = root.db.simulation_experiment.get(
+      simulationExperimentId
+    );
+    if (!simulationExperiment) {
+      debug11("No simulation experiment found, skipping simulation");
+      continue;
     }
-  }
-  for (const ammeter of ammeters) {
-    if (ammeter.simulation_current_probe_id) {
-      graphDisplayOverridesByProbeId.set(
-        ammeter.simulation_current_probe_id,
-        getAmmeterGraphDisplayOverrides(ammeter)
-      );
+    const simulationScope = analogSim.getGroup() ?? group;
+    const voltageProbes = simulationScope.selectAll("voltageprobe");
+    const ammeters = simulationScope.selectAll("ammeter");
+    const circuitJson = getCircuitJsonForAnalogSimulation({
+      circuitJson: root.db.toArray(),
+      simulationExperimentId,
+      voltageProbes,
+      ammeters
+    });
+    let spiceString;
+    let spiceNetlist;
+    try {
+      spiceNetlist = circuitJsonToSpice(circuitJson);
+      spiceString = spiceNetlist.toSpiceString();
+      debug11(`Generated SPICE string:
+${spiceString}`);
+    } catch (error) {
+      debug11(`Failed to convert circuit JSON to SPICE: ${error}`);
+      root.db.simulation_unknown_experiment_error.insert({
+        simulation_experiment_id: simulationExperimentId,
+        error_type: "simulation_unknown_experiment_error",
+        message: error instanceof Error ? error.message : String(error)
+      });
+      continue;
     }
-  }
-  const currentProbesById = /* @__PURE__ */ new Map();
-  const currentProbesByName = /* @__PURE__ */ new Map();
-  for (const probe of root.db.simulation_current_probe.list()) {
-    currentProbesById.set(probe.simulation_current_probe_id, probe);
-    if (probe.name !== void 0) {
-      currentProbesByName.set(probe.name, probe);
+    const graphNameToProbe = /* @__PURE__ */ new Map();
+    const voltageProbesById = /* @__PURE__ */ new Map();
+    const graphDisplayOverridesByProbeId = /* @__PURE__ */ new Map();
+    for (const probe of voltageProbes) {
+      if (probe.finalProbeName) {
+        graphNameToProbe.set(probe.finalProbeName, probe);
+      }
+      if (probe.simulation_voltage_probe_id) {
+        voltageProbesById.set(probe.simulation_voltage_probe_id, probe);
+        graphDisplayOverridesByProbeId.set(
+          probe.simulation_voltage_probe_id,
+          getVoltageProbeGraphDisplayOverrides(probe)
+        );
+      }
     }
-  }
-  const orderedSimulationProbes = root.db.simulation_voltage_probe.list().filter((probe) => voltageProbesById.has(probe.simulation_voltage_probe_id));
-  const graphNamesFromNetlist = getTransientVoltageGraphNamesFromSpiceNetlist(spiceNetlist);
-  if (graphNamesFromNetlist.length === orderedSimulationProbes.length) {
-    for (const [index, simulationProbe] of orderedSimulationProbes.entries()) {
-      const probe = voltageProbesById.get(
-        simulationProbe.simulation_voltage_probe_id
-      );
-      const graphName = graphNamesFromNetlist[index];
-      if (probe && graphName) {
-        graphNameToProbe.set(graphName, probe);
+    for (const ammeter of ammeters) {
+      if (ammeter.simulation_current_probe_id) {
+        graphDisplayOverridesByProbeId.set(
+          ammeter.simulation_current_probe_id,
+          getAmmeterGraphDisplayOverrides(ammeter)
+        );
       }
     }
-  } else {
-    debug11(
-      `Skipping probe-to-graph order mapping because counts differ: probes=${orderedSimulationProbes.length} graphNames=${graphNamesFromNetlist.length}`
+    const scopedCurrentProbeIds = new Set(
+      ammeters.map((ammeter) => ammeter.simulation_current_probe_id).filter((id) => Boolean(id))
     );
-  }
-  for (const analogSim of analogSims) {
+    const currentProbesById = /* @__PURE__ */ new Map();
+    const currentProbesByName = /* @__PURE__ */ new Map();
+    for (const probe of root.db.simulation_current_probe.list().filter(
+      (probe2) => scopedCurrentProbeIds.has(probe2.simulation_current_probe_id)
+    )) {
+      currentProbesById.set(probe.simulation_current_probe_id, probe);
+      if (probe.name !== void 0) {
+        currentProbesByName.set(probe.name, probe);
+      }
+    }
+    const orderedSimulationProbes = root.db.simulation_voltage_probe.list().filter(
+      (probe) => voltageProbesById.has(probe.simulation_voltage_probe_id)
+    );
+    const graphNamesFromNetlist = getTransientVoltageGraphNamesFromSpiceNetlist(spiceNetlist);
+    if (graphNamesFromNetlist.length === orderedSimulationProbes.length) {
+      for (const [
+        index,
+        simulationProbe
+      ] of orderedSimulationProbes.entries()) {
+        const probe = voltageProbesById.get(
+          simulationProbe.simulation_voltage_probe_id
+        );
+        const graphName = graphNamesFromNetlist[index];
+        if (probe && graphName) {
+          graphNameToProbe.set(graphName, probe);
+        }
+      }
+    } else {
+      debug11(
+        `Skipping probe-to-graph order mapping because counts differ: probes=${orderedSimulationProbes.length} graphNames=${graphNamesFromNetlist.length}`
+      );
+    }
     const engineName = analogSim._parsedProps.spiceEngine ?? "spicey";
     const spiceEngine = spiceEngineMap[engineName];
     if (!spiceEngine) {
@@ -22200,7 +22296,7 @@ ${spiceString}`);
         )}`
       );
     }
-    const effectId = `spice-simulation-${engineName}-${analogSim.source_component_id}`;
+    const effectId = `spice-simulation-${engineName}-${simulationExperimentId}`;
     debug11(
       `Queueing simulation for spice engine: ${engineName} (id: ${effectId})`
     );
@@ -22211,11 +22307,6 @@ ${spiceString}`);
         debug11(
           `Simulation completed, received ${result.simulationResultCircuitJson.length} elements`
         );
-        const simulationExperiment = root.db.simulation_experiment.list()[0];
-        if (!simulationExperiment) {
-          debug11("No simulation experiment found, skipping result insertion");
-          return;
-        }
         const insertedVoltageGraphs = [];
         const insertedCurrentGraphs = [];
         for (const rawElement of result.simulationResultCircuitJson) {
@@ -22265,9 +22356,8 @@ ${spiceString}`);
         group._markDirty("SimulationSpiceEngineRender");
       } catch (error) {
         debug11(`Simulation failed for engine ${engineName}: ${error}`);
-        const simulationExperiment = root.db.simulation_experiment.list()[0];
         root.db.simulation_unknown_experiment_error.insert({
-          simulation_experiment_id: simulationExperiment?.simulation_experiment_id,
+          simulation_experiment_id: simulationExperimentId,
           error_type: "simulation_unknown_experiment_error",
           message: error instanceof Error ? error.message : String(error)
         });
@@ -22564,7 +22654,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1441",
+  version: "0.0.1443",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -32840,6 +32930,7 @@ var SchematicCell = class extends PrimitiveComponent2 {
 // lib/components/primitive-components/AnalogSimulation.ts
 import { analogSimulationProps } from "@tscircuit/props";
 var AnalogSimulation = class extends PrimitiveComponent2 {
+  simulation_experiment_id = null;
   get config() {
     return {
       componentName: "AnalogSimulation",
@@ -32851,7 +32942,7 @@ var AnalogSimulation = class extends PrimitiveComponent2 {
     const { duration, name, startTime, timePerStep, spiceOptions } = this._parsedProps;
     const durationMs = duration || 10;
     const timePerStepMs = timePerStep || 0.01;
-    db.simulation_experiment.insert({
+    const simulationExperiment = db.simulation_experiment.insert({
       name: name ?? "spice_transient_analysis",
       experiment_type: "spice_transient_analysis",
       end_time_ms: durationMs,
@@ -32859,6 +32950,7 @@ var AnalogSimulation = class extends PrimitiveComponent2 {
       time_per_step: timePerStepMs,
       spice_options: spiceOptions
     });
+    this.simulation_experiment_id = simulationExperiment.simulation_experiment_id;
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1442",
+  "version": "0.0.1444",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",