@tscircuit/core 0.0.1026 → 0.0.1028

package/dist/index.d.ts

@@ -172,9 +172,9 @@ interface IIsolatedCircuit {
 interface IRootCircuit extends IIsolatedCircuit {
 }
 
-declare const orderedRenderPhases: readonly ["RenderIsolatedSubcircuits", "ReactSubtreesRender", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PanelBoardLayout", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SimulationSpiceEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PanelBoardLayout", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SimulationSpiceEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
-declare const renderPhaseIndexMap: Map<"RenderIsolatedSubcircuits" | "ReactSubtreesRender" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicTraceRender" | "SchematicReplaceNetLabelsWithSymbols" | "PanelBoardLayout" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbCopperPourRender" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "SimulationSpiceEngineRender", number>;
+declare const renderPhaseIndexMap: Map<"ReactSubtreesRender" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicTraceRender" | "SchematicReplaceNetLabelsWithSymbols" | "PanelBoardLayout" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbCopperPourRender" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "SimulationSpiceEngineRender", number>;
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
     initialized: boolean;
@@ -399,7 +399,7 @@ declare class IsolatedCircuit {
     _guessRootComponent(): void;
     render(): void;
     renderUntilSettled(): Promise<void>;
-    private _hasIncompleteAsyncEffects;
+    _hasIncompleteAsyncEffects(): boolean;
     _hasIncompleteAsyncEffectsForPhase(phase: RenderPhase): boolean;
     getCircuitJson(): AnyCircuitElement[];
     toJson(): AnyCircuitElement[];
@@ -1655,6 +1655,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _hasStartedAsyncAutorouting: boolean;
     _isInflatedFromCircuitJson: boolean;
     _isolatedCircuitJson: AnyCircuitElement[] | null;
+    _isolatedCircuit: IsolatedCircuit | null;
     get _isIsolatedSubcircuit(): boolean;
     _normalComponentNameMap: Map<string, NormalComponent[]> | null;
     /**
@@ -1687,8 +1688,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
         zodProps: Props;
         componentName: string;
     };
-    runRenderPhaseForChildren(phase: RenderPhase): void;
-    doInitialRenderIsolatedSubcircuits(): void;
+    runRenderCycle(): void;
     doInitialSourceGroupRender(): void;
     doInitialSourceRender(): void;
     doInitialSourceParentAttachment(): void;

package/dist/index.js

@@ -117,7 +117,6 @@ import { DefaultEventPriority } from "react-reconciler/constants.js";
 import Debug from "debug";
 var debug = Debug("tscircuit:renderable");
 var orderedRenderPhases = [
-  "RenderIsolatedSubcircuits",
   "ReactSubtreesRender",
   "InflateSubcircuitCircuitJson",
   "SourceNameDuplicateComponentRemoval",
@@ -173,7 +172,6 @@ var renderPhaseIndexMap = new Map(
   orderedRenderPhases.map((phase, index) => [phase, index])
 );
 var asyncPhaseDependencies = {
-  InflateSubcircuitCircuitJson: ["RenderIsolatedSubcircuits"],
   PcbFootprintLayout: ["PcbFootprintStringRender"],
   PcbComponentSizeCalculation: ["PcbFootprintStringRender"],
   PcbLayout: ["PcbFootprintStringRender"],
@@ -14662,7 +14660,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1025",
+  version: "0.0.1027",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -14725,7 +14723,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.62",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.33",
+    "circuit-json-to-spice": "^0.0.34",
     "circuit-to-svg": "^0.0.327",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
@@ -15033,26 +15031,28 @@ var IsolatedCircuit = class {
 
 // lib/components/primitive-components/Group/Group_doInitialRenderIsolatedSubcircuits.ts
 function Group_doInitialRenderIsolatedSubcircuits(group) {
-  if (!group._isIsolatedSubcircuit) return;
-  if (!group.root) return;
-  const parentRoot = group.root;
-  const isolatedCircuit = new IsolatedCircuit({
-    platform: {
-      ...parentRoot.platform,
-      pcbDisabled: parentRoot.pcbDisabled,
-      schematicDisabled: parentRoot.schematicDisabled
+  if (!group._isolatedCircuit) {
+    const parentRoot = group.root;
+    group._isolatedCircuit = new IsolatedCircuit({
+      platform: {
+        ...parentRoot.platform,
+        pcbDisabled: parentRoot.pcbDisabled,
+        schematicDisabled: parentRoot.schematicDisabled
+      }
+    });
+    for (const child of group.children) {
+      group._isolatedCircuit.add(child);
     }
-  });
-  const childrenSnapshot = [...group.children];
-  for (const child of childrenSnapshot) {
-    isolatedCircuit.add(child);
-  }
-  group._queueAsyncEffect("render-isolated-subcircuit", async () => {
-    await isolatedCircuit.renderUntilSettled();
-    group.children = [];
-    group._normalComponentNameMap = null;
-    group._isolatedCircuitJson = isolatedCircuit.getCircuitJson();
-  });
+  }
+  group._isolatedCircuit.render();
+  if (group._isolatedCircuit._hasIncompleteAsyncEffects()) {
+    return false;
+  }
+  group._isolatedCircuitJson = group._isolatedCircuit.getCircuitJson();
+  group.children = [];
+  group._normalComponentNameMap = null;
+  group._isolatedCircuit = null;
+  return true;
 }
 
 // lib/components/primitive-components/Group/Group.ts
@@ -15063,6 +15063,7 @@ var Group6 = class extends NormalComponent3 {
   _hasStartedAsyncAutorouting = false;
   _isInflatedFromCircuitJson = false;
   _isolatedCircuitJson = null;
+  _isolatedCircuit = null;
   get _isIsolatedSubcircuit() {
     return Boolean(this._parsedProps._subcircuitCachingEnabled);
   }
@@ -15102,12 +15103,13 @@ var Group6 = class extends NormalComponent3 {
       componentName: "Group"
     };
   }
-  runRenderPhaseForChildren(phase) {
-    if (this._isIsolatedSubcircuit && !this._isInflatedFromCircuitJson) return;
-    super.runRenderPhaseForChildren(phase);
-  }
-  doInitialRenderIsolatedSubcircuits() {
-    Group_doInitialRenderIsolatedSubcircuits(this);
+  runRenderCycle() {
+    if (!this._isIsolatedSubcircuit || !this.root) {
+      super.runRenderCycle();
+      return;
+    }
+    if (!Group_doInitialRenderIsolatedSubcircuits(this)) return;
+    super.runRenderCycle();
   }
   doInitialSourceGroupRender() {
     const { db } = this.root;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1026",
+  "version": "0.0.1028",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -64,7 +64,7 @@
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.62",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.33",
+    "circuit-json-to-spice": "^0.0.34",
     "circuit-to-svg": "^0.0.327",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",