Add common base class for all AD command variants

src/pygerber/gerberx3/ast/nodes/aperture/AD.py

@@ -0,0 +1,11 @@
+"""`pygerber.nodes.aperture.ADC` module contains definition of `AD` class."""
+
+from __future__ import annotations
+
+from pygerber.gerberx3.ast.nodes.base import Node
+
+
+class AD(Node):
+    """Common base class for all commands adding new apertures."""
+
+    aperture_identifier: str

src/pygerber/gerberx3/ast/nodes/aperture/ADC.py

@@ -6,7 +6,7 @@
 
 from pydantic import Field
 
-from pygerber.gerberx3.ast.nodes.base import Node
+from pygerber.gerberx3.ast.nodes.aperture.AD import AD
 from pygerber.gerberx3.ast.nodes.types import Double
 
 if TYPE_CHECKING:
@@ -15,10 +15,9 @@
     from pygerber.gerberx3.ast.visitor import AstVisitor
 
 
-class ADC(Node):
+class ADC(AD):
     """Represents AD Gerber extended command."""
 
-    aperture_identifier: str
     diameter: Double
     hole_diameter: Optional[Double] = Field(default=None)
 

src/pygerber/gerberx3/ast/nodes/aperture/ADO.py

@@ -6,7 +6,7 @@
 
 from pydantic import Field
 
-from pygerber.gerberx3.ast.nodes.base import Node
+from pygerber.gerberx3.ast.nodes.aperture.AD import AD
 from pygerber.gerberx3.ast.nodes.types import Double
 
 if TYPE_CHECKING:
@@ -15,10 +15,9 @@
     from pygerber.gerberx3.ast.visitor import AstVisitor
 
 
-class ADO(Node):
+class ADO(AD):
     """Represents AD obround Gerber extended command."""
 
-    aperture_identifier: str
     width: Double
     height: Double
     hole_diameter: Optional[Double] = Field(default=None)

src/pygerber/gerberx3/ast/nodes/aperture/ADP.py

@@ -6,7 +6,7 @@
 
 from pydantic import Field
 
-from pygerber.gerberx3.ast.nodes.base import Node
+from pygerber.gerberx3.ast.nodes.aperture.AD import AD
 from pygerber.gerberx3.ast.nodes.types import Double, Integer
 
 if TYPE_CHECKING:
@@ -15,10 +15,9 @@
     from pygerber.gerberx3.ast.visitor import AstVisitor
 
 
-class ADP(Node):
+class ADP(AD):
     """Represents AD polygon Gerber extended command."""
 
-    aperture_identifier: str
     outer_diameter: Double
     vertices: Integer
     rotation: Optional[Double] = Field(default=None)

src/pygerber/gerberx3/ast/nodes/aperture/ADR.py

@@ -6,7 +6,7 @@
 
 from pydantic import Field
 
-from pygerber.gerberx3.ast.nodes.base import Node
+from pygerber.gerberx3.ast.nodes.aperture.AD import AD
 from pygerber.gerberx3.ast.nodes.types import Double
 
 if TYPE_CHECKING:
@@ -15,10 +15,9 @@
     from pygerber.gerberx3.ast.visitor import AstVisitor
 
 
-class ADR(Node):
+class ADR(AD):
     """Represents AD rectangle Gerber extended command."""
 
-    aperture_identifier: str
     width: Double
     height: Double
     hole_diameter: Optional[Double] = Field(default=None)

src/pygerber/gerberx3/ast/nodes/aperture/ADmacro.py

@@ -6,7 +6,7 @@
 
 from pydantic import Field
 
-from pygerber.gerberx3.ast.nodes.base import Node
+from pygerber.gerberx3.ast.nodes.aperture.AD import AD
 from pygerber.gerberx3.ast.nodes.types import Double
 
 if TYPE_CHECKING:
@@ -15,10 +15,9 @@
     from pygerber.gerberx3.ast.visitor import AstVisitor
 
 
-class ADmacro(Node):
+class ADmacro(AD):
     """Represents AD macro Gerber extended command."""
 
-    aperture_identifier: str
     name: str
     params: Optional[List[Double]] = Field(default=None)
 

src/pygerber/gerberx3/ast/nodes/enums.py

@@ -138,7 +138,7 @@ class Mount(Enum):
 class Mirroring(Enum):
     """Mirroring enum."""
 
-    None_ = "N"
+    NONE = "N"
     X = "X"
     Y = "Y"
     XY = "XY"