@tscircuit/core 0.0.864 → 0.0.866

package/dist/index.js

@@ -609,16 +609,19 @@ var cssSelectPrimitiveComponentAdapterOnlySubcircuits = {
 };
 
 // lib/components/base-components/PrimitiveComponent/preprocessSelector.ts
-var preprocessSelector = (selector) => {
+var buildPlusMinusNetErrorMessage = (selector, component) => {
+  const netName = selector.split("net.")[1]?.split(/[ >]/)[0] ?? selector;
+  const componentName = component?.componentName ?? "Unknown component";
+  return `Net names cannot contain "+" or "-" (component "${componentName}" received "${netName}" via "${selector}"). Try using underscores instead, e.g. VCC_P`;
+};
+var preprocessSelector = (selector, component) => {
   if (/net\.[^\s>]*\./.test(selector)) {
     throw new Error(
       'Net names cannot contain a period, try using "sel.net..." to autocomplete with conventional net names, e.g. V3_3'
     );
   }
   if (/net\.[^\s>]*[+-]/.test(selector)) {
-    throw new Error(
-      'Net names cannot contain "+" or "-", try using underscores instead, e.g. VCC_P'
-    );
+    throw new Error(buildPlusMinusNetErrorMessage(selector, component));
   }
   if (/net\.[0-9]/.test(selector)) {
     const match = selector.match(/net\.([^ >]+)/);
@@ -1166,7 +1169,7 @@ var PrimitiveComponent2 = class extends Renderable {
     if (this._cachedSelectAllQueries.has(selectorRaw)) {
       return this._cachedSelectAllQueries.get(selectorRaw);
     }
-    const selector = preprocessSelector(selectorRaw);
+    const selector = preprocessSelector(selectorRaw, this);
     const result = selectAll(
       selector,
       this,
@@ -1190,7 +1193,7 @@ var PrimitiveComponent2 = class extends Renderable {
     if (this._cachedSelectOneQueries.has(selectorRaw)) {
       return this._cachedSelectOneQueries.get(selectorRaw);
     }
-    const selector = preprocessSelector(selectorRaw);
+    const selector = preprocessSelector(selectorRaw, this);
     if (options?.port) {
       options.type = "port";
     }
@@ -1649,7 +1652,9 @@ import { autoroute } from "@tscircuit/infgrid-ijump-astar";
 var netProps = z4.object({
   name: z4.string().refine(
     (val) => !/[+-]/.test(val),
-    'Net names cannot contain "+" or "-", try using underscores instead, e.g. VCC_P'
+    (val) => ({
+      message: `Net names cannot contain "+" or "-" (component "Net" received "${val}"). Try using underscores instead, e.g. VCC_P`
+    })
   )
 });
 var Net = class extends PrimitiveComponent2 {
@@ -1840,9 +1845,9 @@ var createNetsFromProps = (component, props) => {
         );
       }
       if (/net\.[^\s>]*[+-]/.test(prop)) {
-        throw new Error(
-          'Net names cannot contain "+" or "-", try using underscores instead, e.g. VCC_P'
-        );
+        const netName = prop.split("net.")[1];
+        const message = `Net names cannot contain "+" or "-" (component "${component.componentName}" received "${netName}" via "${prop}"). Try using underscores instead, e.g. VCC_P`;
+        throw new Error(message);
       }
       if (/net\.[0-9]/.test(prop)) {
         const netName = prop.split("net.")[1];
@@ -15923,6 +15928,61 @@ function inflateSourceDiode(sourceElm, inflatorContext) {
   }
 }
 
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceTrace.ts
+var getSelectorPath = (component, db) => {
+  const path_parts = [];
+  let currentGroupId = component.source_group_id;
+  while (currentGroupId) {
+    const group = db.source_group.get(currentGroupId);
+    if (!group) break;
+    path_parts.unshift(`.${group.name}`);
+    currentGroupId = group.parent_source_group_id;
+  }
+  path_parts.push(`.${component.name}`);
+  return path_parts.join(" > ");
+};
+function inflateSourceTrace(sourceTrace, inflatorContext) {
+  const { injectionDb, subcircuit } = inflatorContext;
+  const connectedSelectors = [];
+  for (const sourcePortId of sourceTrace.connected_source_port_ids) {
+    const sourcePort = injectionDb.source_port.get(sourcePortId);
+    if (!sourcePort) continue;
+    let selector;
+    if (sourcePort.source_component_id) {
+      const sourceComponent = injectionDb.source_component.get(
+        sourcePort.source_component_id
+      );
+      if (sourceComponent) {
+        const path = getSelectorPath(
+          {
+            name: sourceComponent.name,
+            source_group_id: sourceComponent.source_group_id
+          },
+          injectionDb
+        );
+        selector = `${path} > .${sourcePort.name}`;
+      }
+    } else {
+      selector = `.${sourcePort.name}`;
+    }
+    if (selector) {
+      connectedSelectors.push(selector);
+    }
+  }
+  for (const sourceNetId of sourceTrace.connected_source_net_ids) {
+    const sourceNet = injectionDb.source_net.get(sourceNetId);
+    if (sourceNet) {
+      connectedSelectors.push(`net.${sourceNet.name}`);
+    }
+  }
+  if (connectedSelectors.length < 2) return;
+  const trace = new Trace3({
+    path: connectedSelectors
+  });
+  trace.source_trace_id = sourceTrace.source_trace_id;
+  subcircuit.add(trace);
+}
+
 // lib/components/primitive-components/Group/Subcircuit/Subcircuit.ts
 var Subcircuit = class extends Group6 {
   constructor(props) {
@@ -15990,6 +16050,10 @@ var Subcircuit = class extends Group6 {
     for (const sourcePort of sourcePorts) {
       inflateSourcePort(sourcePort, inflationCtx);
     }
+    const sourceTraces = injectionDb.source_trace.list();
+    for (const sourceTrace of sourceTraces) {
+      inflateSourceTrace(sourceTrace, inflationCtx);
+    }
   }
 };
 
@@ -17839,7 +17903,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.863",
+  version: "0.0.865",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

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