@tscircuit/core 0.0.833 → 0.0.834

package/dist/index.d.ts

@@ -13,7 +13,7 @@ import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbLayout", "PcbBoardAutoSize", "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", "SchematicPrimitiveRender", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbLayout", "PcbBoardAutoSize", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SimulationSpiceEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -19938,8 +19938,22 @@ declare class Footprint extends PrimitiveComponent<typeof footprintProps> {
     doInitialPcbFootprintLayout(): void;
 }
 
-declare class Subcircuit extends Group {
+declare class Subcircuit extends Group<typeof subcircuitProps> {
     constructor(props: z.input<typeof subcircuitProps>);
+    /**
+     * During this phase, we inflate the subcircuit circuit json into class
+     * instances
+     *
+     * When subcircuit's define circuitJson, it's basically the same as having
+     * a tree of components. All the data from circuit json has to be converted
+     * into props for the tree of components
+     *
+     * We do this in two phases:
+     * - Create the components
+     * - Create the groups
+     * - Add components to groups in the appropriate hierarchy
+     */
+    doInitialInflateSubcircuitCircuitJson(): void;
 }
 
 declare class Breakout extends Group<typeof breakoutProps> {

package/dist/index.js

@@ -107,6 +107,7 @@ import Debug from "debug";
 var debug = Debug("tscircuit:renderable");
 var orderedRenderPhases = [
   "ReactSubtreesRender",
+  "InflateSubcircuitCircuitJson",
   "SourceNameDuplicateComponentRemoval",
   "PcbFootprintStringRender",
   "InitializePortsFromChildren",
@@ -15464,15 +15465,73 @@ var PcbNoteDimension = class extends PrimitiveComponent2 {
   }
 };
 
-// lib/components/primitive-components/Group/Subcircuit.ts
+// lib/components/primitive-components/Group/Subcircuit/Subcircuit.ts
 import "@tscircuit/props";
+import { cju } from "@tscircuit/circuit-json-util";
+
+// lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceResistor.ts
+function inflateSourceResistor(sourceElm, context) {
+  const { injectionDb, subcircuit } = context;
+  const pcbElm = injectionDb.pcb_component.getWhere({
+    name: sourceElm.name
+  });
+  const cadElm = injectionDb.cad_component.getWhere({
+    name: sourceElm.name
+  });
+  const resistor = new Resistor({
+    name: sourceElm.name,
+    resistance: sourceElm.resistance,
+    footprint: cadElm?.footprinter_string
+  });
+  subcircuit.add(resistor);
+}
+
+// lib/components/primitive-components/Group/Subcircuit/Subcircuit.ts
 var Subcircuit = class extends Group6 {
   constructor(props) {
     super({
       ...props,
+      // @ts-ignore
       subcircuit: true
     });
   }
+  /**
+   * During this phase, we inflate the subcircuit circuit json into class
+   * instances
+   *
+   * When subcircuit's define circuitJson, it's basically the same as having
+   * a tree of components. All the data from circuit json has to be converted
+   * into props for the tree of components
+   *
+   * We do this in two phases:
+   * - Create the components
+   * - Create the groups
+   * - Add components to groups in the appropriate hierarchy
+   */
+  doInitialInflateSubcircuitCircuitJson() {
+    const { circuitJson, children } = this._parsedProps;
+    if (!circuitJson) return;
+    const { db } = this.root;
+    if (circuitJson && children?.length > 0) {
+      throw new Error("Subcircuit cannot have both circuitJson and children");
+    }
+    const sourceComponents = cju(circuitJson).source_component.list();
+    const inflationCtx = {
+      injectionDb: db,
+      subcircuit: this
+    };
+    for (const sourceComponent of sourceComponents) {
+      switch (sourceComponent.ftype) {
+        case "simple_resistor":
+          inflateSourceResistor(sourceComponent, inflationCtx);
+          break;
+        default:
+          throw new Error(
+            `No inflator implemented for source component ftype: "${sourceComponent.ftype}"`
+          );
+      }
+    }
+  }
 };
 
 // lib/components/primitive-components/Breakout/Breakout.ts
@@ -17485,7 +17544,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.832",
+  version: "0.0.833",
   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.833",
+  "version": "0.0.834",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",