@tscircuit/core 0.0.1941 → 0.0.1943

package/dist/index.d.ts

@@ -99218,6 +99218,8 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | "inner7" | "inner8";
             }>, "many">>;
             warningOnly: zod.ZodOptional<zod.ZodBoolean>;
+            allowTraces: zod.ZodOptional<zod.ZodBoolean>;
+            allowPlacements: zod.ZodOptional<zod.ZodBoolean>;
             excludeRefs: zod.ZodOptional<zod.ZodArray<zod.ZodString, "many">>;
         }, "strip", zod.ZodTypeAny, {
             shape: "circle";
@@ -99255,6 +99257,8 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
             pcbRelative?: boolean | undefined;
             relative?: boolean | undefined;
             warningOnly?: boolean | undefined;
+            allowTraces?: boolean | undefined;
+            allowPlacements?: boolean | undefined;
             excludeRefs?: string[] | undefined;
         }, {
             shape: "circle";
@@ -99296,6 +99300,8 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
             pcbRelative?: boolean | undefined;
             relative?: boolean | undefined;
             warningOnly?: boolean | undefined;
+            allowTraces?: boolean | undefined;
+            allowPlacements?: boolean | undefined;
             excludeRefs?: string[] | undefined;
         }>, zod.ZodObject<{
             pcbX: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>]>>;
@@ -99376,6 +99382,8 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | "inner7" | "inner8";
             }>, "many">>;
             warningOnly: zod.ZodOptional<zod.ZodBoolean>;
+            allowTraces: zod.ZodOptional<zod.ZodBoolean>;
+            allowPlacements: zod.ZodOptional<zod.ZodBoolean>;
             excludeRefs: zod.ZodOptional<zod.ZodArray<zod.ZodString, "many">>;
         }, "strip", zod.ZodTypeAny, {
             shape: "rect";
@@ -99415,6 +99423,8 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
             pcbRelative?: boolean | undefined;
             relative?: boolean | undefined;
             warningOnly?: boolean | undefined;
+            allowTraces?: boolean | undefined;
+            allowPlacements?: boolean | undefined;
             excludeRefs?: string[] | undefined;
         }, {
             shape: "rect";
@@ -99458,6 +99468,8 @@ declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {
             pcbRelative?: boolean | undefined;
             relative?: boolean | undefined;
             warningOnly?: boolean | undefined;
+            allowTraces?: boolean | undefined;
+            allowPlacements?: boolean | undefined;
             excludeRefs?: string[] | undefined;
         }>]>;
     };

package/dist/index.js

@@ -2544,6 +2544,7 @@ var Net = class extends PrimitiveComponent2 {
       member_source_group_ids: [],
       is_ground: isGround,
       is_power: isPositiveVoltageSource,
+      trace_width: props.nominalTraceWidth,
       // @ts-ignore
       is_positive_voltage_source: isPositiveVoltageSource
     });
@@ -3166,7 +3167,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
         }
       }
     } else if (element.type === "pcb_keepout") {
-      if (element.warning_only) continue;
+      if (element.warning_only || element.allow_traces) continue;
       if (element.shape === "circle") {
         obstacles.push({
           componentId: pcbComponentId,
@@ -9042,6 +9043,8 @@ var Keepout = class extends PrimitiveComponent2 {
         layers,
         shape: "circle",
         ...pcbKeepoutExclusionProps,
+        ...props.allowTraces !== void 0 ? { allow_traces: props.allowTraces } : {},
+        ...props.allowPlacements !== void 0 ? { allow_placements: props.allowPlacements } : {},
         ...props.warningOnly !== void 0 ? { warning_only: props.warningOnly } : {},
         // @ts-ignore: no idea why this is triggering
         radius: props.radius,
@@ -9057,6 +9060,8 @@ var Keepout = class extends PrimitiveComponent2 {
         layers,
         shape: "rect",
         ...pcbKeepoutExclusionProps,
+        ...props.allowTraces !== void 0 ? { allow_traces: props.allowTraces } : {},
+        ...props.allowPlacements !== void 0 ? { allow_placements: props.allowPlacements } : {},
         ...props.warningOnly !== void 0 ? { warning_only: props.warningOnly } : {},
         ...isRotated90 ? { width: props.height, height: props.width } : { width: props.width, height: props.height },
         // @ts-ignore: no idea why this is triggering
@@ -11951,6 +11956,8 @@ var createComponentsFromCircuitJson = ({
       components.push(
         new Keepout({
           warningOnly: elm.warning_only,
+          allowTraces: elm.allow_traces,
+          allowPlacements: elm.allow_placements,
           layers: elm.layers.map((layer) => layer_ref2.parse(layer)),
           pcbX: elm.center.x,
           pcbY: elm.center.y,
@@ -11962,6 +11969,8 @@ var createComponentsFromCircuitJson = ({
       components.push(
         new Keepout({
           warningOnly: elm.warning_only,
+          allowTraces: elm.allow_traces,
+          allowPlacements: elm.allow_placements,
           layers: elm.layers.map((layer) => layer_ref2.parse(layer)),
           pcbX: elm.center.x,
           pcbY: elm.center.y,
@@ -54622,19 +54631,29 @@ var getSimpleRouteJsonFromCircuitJson = ({
       continue;
     }
     handledNetConnectivityKeys.add(netConnectivityKey);
-    const connectedSourceNetIds = source_nets.filter(
+    const connectedSourceNets = source_nets.filter(
       (sourceNet) => getSourceConnectivityKey(sourceNet.source_net_id) === netConnectivityKey
-    ).map((sourceNet) => sourceNet.source_net_id);
+    );
+    const connectedSourceNetIds = connectedSourceNets.map(
+      (sourceNet) => sourceNet.source_net_id
+    );
     const connectedSourceTraces = sourceTracesEligibleForNetConnections.filter(
       (st) => [st.source_trace_id, ...st.connected_source_net_ids ?? []].some(
         (id) => getSourceConnectivityKey(id) === netConnectivityKey
       )
     );
-    let nominalTraceWidthFromConnectedTraces;
+    let nominalTraceWidthForConnection;
+    for (const sourceNet of connectedSourceNets) {
+      if (sourceNet.trace_width === void 0) continue;
+      nominalTraceWidthForConnection = Math.max(
+        nominalTraceWidthForConnection ?? 0,
+        sourceNet.trace_width
+      );
+    }
     for (const sourceTrace of connectedSourceTraces) {
       if (sourceTrace.min_trace_thickness === void 0) continue;
-      nominalTraceWidthFromConnectedTraces = Math.max(
-        nominalTraceWidthFromConnectedTraces ?? 0,
+      nominalTraceWidthForConnection = Math.max(
+        nominalTraceWidthForConnection ?? 0,
         sourceTrace.min_trace_thickness
       );
     }
@@ -54651,8 +54670,8 @@ var getSimpleRouteJsonFromCircuitJson = ({
     }
     const connection = {
       name: net.source_net_id ?? sharedConnMap.getNetConnectedToId(net.source_net_id),
-      nominalTraceWidth: nominalTraceWidthFromConnectedTraces,
-      width: nominalTraceWidthFromConnectedTraces,
+      nominalTraceWidth: nominalTraceWidthForConnection,
+      width: nominalTraceWidthForConnection,
       pointsToConnect
     };
     if (pointsToConnect.length === 0) continue;
@@ -63408,7 +63427,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1940",
+  version: "0.0.1942",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -63444,7 +63463,7 @@ var package_default = {
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
     "@tscircuit/bus-lanes-solver": "github:tscircuit/bus-lanes-solver#0bc8d071241b18a3e7465a878881abe4998f6384",
     "@tscircuit/capacity-autorouter": "^0.0.913",
-    "@tscircuit/checks": "^0.0.202",
+    "@tscircuit/checks": "^0.0.203",
     "@tscircuit/circuit-json-util": "^0.0.114",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.54",
@@ -63462,7 +63481,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.661",
+    "@tscircuit/props": "^0.0.662",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.201",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -63478,7 +63497,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.494",
+    "circuit-json": "^0.0.495",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.128",
@@ -63541,8 +63560,8 @@ var package_default = {
   },
   overrides: {
     "@tscircuit/circuit-json-util": "^0.0.114",
-    "@tscircuit/props": "^0.0.661",
-    "circuit-json": "^0.0.494"
+    "@tscircuit/props": "^0.0.662",
+    "circuit-json": "^0.0.495"
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1941",
+  "version": "0.0.1943",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -37,7 +37,7 @@
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
     "@tscircuit/bus-lanes-solver": "github:tscircuit/bus-lanes-solver#0bc8d071241b18a3e7465a878881abe4998f6384",
     "@tscircuit/capacity-autorouter": "^0.0.913",
-    "@tscircuit/checks": "^0.0.202",
+    "@tscircuit/checks": "^0.0.203",
     "@tscircuit/circuit-json-util": "^0.0.114",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.54",
@@ -55,7 +55,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.661",
+    "@tscircuit/props": "^0.0.662",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.201",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -71,7 +71,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.494",
+    "circuit-json": "^0.0.495",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.128",
@@ -134,7 +134,7 @@
   },
   "overrides": {
     "@tscircuit/circuit-json-util": "^0.0.114",
-    "@tscircuit/props": "^0.0.661",
-    "circuit-json": "^0.0.494"
+    "@tscircuit/props": "^0.0.662",
+    "circuit-json": "^0.0.495"
   }
 }