Fix for single element designs (#347)

Prevents pruning the top-level path in netlisting.
Previously the netlister would prune all the paths and the kicad netlist
generator would crash.

Also regenerate netlists.

Author: ducky64

electronics_abstract_parts/test_kicad_import_netlist.py

@@ -71,16 +71,19 @@ def test_netlist(self):
     self.assertIn(NetBlock('Package_TO_SOT_SMD:SOT-23', 'U1',
                            # expected value is wonky because netlisting combines part and value
                            'Sensor_Temperature:MCP9700AT-ETT', 'MCP9700AT-ETT',
-                           ['dut', 'U1'], ['U1'],
-                           ['electronics_model.KiCadSchematicBlock.KiCadBlackbox']),
+                           ['dut', 'U1'], ['dut', 'U1'],
+                           ['electronics_model.test_kicad_import_blackbox.KiCadBlackboxBlock',
+                            'electronics_model.KiCadSchematicBlock.KiCadBlackbox']),
                   net.blocks)
     self.assertIn(NetBlock('Symbol:Symbol_ESD-Logo_CopperTop', 'SYM1',
                            # expected value is wonky because netlisting combines part and value
                            'Graphic:SYM_ESD_Small', 'SYM_ESD_Small',
-                           ['dut', 'SYM1'], ['SYM1'],
-                           ['electronics_model.KiCadSchematicBlock.KiCadBlackbox']),
+                           ['dut', 'SYM1'], ['dut', 'SYM1'],
+                           ['electronics_model.test_kicad_import_blackbox.KiCadBlackboxBlock',
+                            'electronics_model.KiCadSchematicBlock.KiCadBlackbox']),
                   net.blocks)
     self.assertIn(NetBlock('Resistor_SMD:R_0603_1608Metric', 'R1', '', '',
-                           ['dut', 'res'], ['res'],
-                           ['electronics_abstract_parts.test_kicad_import_netlist.DummyResistor']),
+                           ['dut', 'res'], ['dut', 'res'],
+                           ['electronics_model.test_kicad_import_blackbox.KiCadBlackboxBlock',
+                            'electronics_abstract_parts.test_kicad_import_netlist.DummyResistor']),
                   net.blocks)

electronics_model/NetlistGenerator.py

@@ -79,7 +79,7 @@ def process_blocklike(self, path: TransformUtil.Path, block: Union[edgir.Link, e
       short_path = self.short_paths[path]
       class_path = self.class_paths[path]
 
-      if len(main_internal_blocks) == 1:
+      if len(main_internal_blocks) == 1 and short_path:  # never shorten top-level blocks
         name = list(main_internal_blocks.keys())[0]
         self.short_paths[path.append_block(name)] = short_path
         self.class_paths[path.append_block(name)] = class_path

electronics_model/test_netlist.py

@@ -24,8 +24,8 @@ class TestFakeSource(FootprintBlock):
   def __init__(self) -> None:
     super().__init__()
 
-    self.pos = self.Port(VoltageSource())
-    self.neg = self.Port(VoltageSource())
+    self.pos = self.Port(VoltageSource(), optional=True)
+    self.neg = self.Port(VoltageSource(), optional=True)
 
   def contents(self) -> None:
     super().contents()
@@ -63,6 +63,13 @@ def contents(self) -> None:
     )
 
 
+class TestSinglePart(Block):
+  def contents(self) -> None:
+    super().contents()
+
+    self.source = self.Block(TestFakeSource())
+
+
 class TestBasicCircuit(Block):
   def contents(self) -> None:
     super().contents()
@@ -182,6 +189,14 @@ def generate_net(design: Type[Block], refinements: Refinements = Refinements()):
     compiled.append_values(RefdesRefinementPass().run(compiled))
     return NetlistTransform(compiled).run()
 
+  def test_single_netlist(self) -> None:
+    net = self.generate_net(TestSinglePart)
+
+    # check that the top-level path element is never pruned, even when the design is one element
+    self.assertIn(NetBlock('Capacitor_SMD:C_0603_1608Metric', 'C1', '', '1uF',
+                           ['source'], ['source'],
+                           ['electronics_model.test_netlist.TestFakeSource']), net.blocks)
+
   def test_basic_netlist(self) -> None:
     net = self.generate_net(TestBasicCircuit)