remove getters, make flatmodule attrs public

Author: nturley

built/FlatModule.js

@@ -23,15 +23,6 @@ var FlatModule = /** @class */ (function () {
         // populated by createWires
         this.wires = [];
     }
-    FlatModule.prototype.getNodes = function () {
-        return this.nodes;
-    };
-    FlatModule.prototype.getWires = function () {
-        return this.wires;
-    };
-    FlatModule.prototype.getName = function () {
-        return this.moduleName;
-    };
     // converts input ports with constant assignments to constant nodes
     FlatModule.prototype.addConstants = function () {
         // find the maximum signal number

built/drawModule.js

@@ -12,7 +12,7 @@ var WireDirection;
     WireDirection[WireDirection["Right"] = 3] = "Right";
 })(WireDirection || (WireDirection = {}));
 function drawModule(g, module) {
-    var nodes = module.getNodes().map(function (n) {
+    var nodes = module.nodes.map(function (n) {
         var kchild = _.find(g.children, function (c) { return c.id === n.Key; });
         return n.render(kchild);
     });

built/elkGraph.js

@@ -8,12 +8,12 @@ var ElkModel;
     ElkModel.edgeIndex = 0;
 })(ElkModel = exports.ElkModel || (exports.ElkModel = {}));
 function buildElkGraph(module) {
-    var children = module.getNodes().map(function (n) {
+    var children = module.nodes.map(function (n) {
         return n.buildElkChild();
     });
     ElkModel.edgeIndex = 0;
     ElkModel.dummyNum = 0;
-    var edges = _.flatMap(module.getWires(), function (w) {
+    var edges = _.flatMap(module.wires, function (w) {
         // at least one driver and at least one rider and no laterals
         if (w.drivers.length > 0 && w.riders.length > 0 && w.laterals.length === 0) {
             var ret = [];
@@ -92,7 +92,7 @@ function buildElkGraph(module) {
         return [];
     });
     return {
-        id: module.getName(),
+        id: module.moduleName,
         children: children,
         edges: edges,
     };

lib/FlatModule.ts

@@ -18,9 +18,9 @@ export interface Wire {
 }
 
 export class FlatModule {
-    private moduleName: string;
-    private nodes: Cell[];
-    private wires: Wire[];
+    public moduleName: string;
+    public nodes: Cell[];
+    public wires: Wire[];
 
     constructor(netlist: Yosys.Netlist) {
         this.moduleName = null;
@@ -41,18 +41,6 @@ export class FlatModule {
         this.wires = [];
     }
 
-    public getNodes(): Cell[] {
-        return this.nodes;
-    }
-
-    public getWires(): Wire[] {
-        return this.wires;
-    }
-
-    public getName(): string {
-        return this.moduleName;
-    }
-
     // converts input ports with constant assignments to constant nodes
     public addConstants(): void {
         // find the maximum signal number

lib/drawModule.ts

@@ -12,7 +12,7 @@ enum WireDirection {
 }
 
 export default function drawModule(g: ElkModel.Graph, module: FlatModule) {
-    const nodes: any[] = module.getNodes().map((n: Cell) => {
+    const nodes: any[] = module.nodes.map((n: Cell) => {
         const kchild: ElkModel.Cell = _.find(g.children, (c) => c.id === n.Key);
         return n.render(kchild);
     });

lib/elkGraph.ts

@@ -82,12 +82,12 @@ export namespace ElkModel {
     }
 }
 export function buildElkGraph(module: FlatModule): ElkModel.Graph {
-    const children: ElkModel.Cell[] = module.getNodes().map((n) => {
+    const children: ElkModel.Cell[] = module.nodes.map((n) => {
         return n.buildElkChild();
     });
     ElkModel.edgeIndex = 0;
     ElkModel.dummyNum = 0;
-    const edges: ElkModel.Edge[] = _.flatMap(module.getWires(), (w) => {
+    const edges: ElkModel.Edge[] = _.flatMap(module.wires, (w) => {
         // at least one driver and at least one rider and no laterals
         if (w.drivers.length > 0 && w.riders.length > 0 && w.laterals.length === 0) {
             const ret: ElkModel.Edge[] = [];
@@ -163,7 +163,7 @@ export function buildElkGraph(module: FlatModule): ElkModel.Graph {
         return [];
     });
     return {
-        id: module.getName(),
+        id: module.moduleName,
         children,
         edges,
     };

test/FlatModule.test.ts

@@ -28,9 +28,9 @@ function createFlatModule(testFile: string): FlatModule {
 test('split join', () => {
     const flatModule = createFlatModule('ports_splitjoin');
     // there are 5 external ports
-    const numStartNodes = flatModule.getNodes().length;
+    const numStartNodes = flatModule.nodes.length;
     flatModule.addSplitsJoins();
-    const nodes = flatModule.getNodes();
+    const nodes = flatModule.nodes;
     // should have 3 more nodes, one split, two joins
     expect(nodes.length - numStartNodes).toEqual(3);
     const splits = nodes.filter( (node: Cell) => node.Type === '$_split_');
@@ -50,7 +50,7 @@ test('split join', () => {
 test('create wires', () => {
     const flatModule = createFlatModule('hyperedges');
     flatModule.createWires();
-    const wires = flatModule.getWires();
+    const wires = flatModule.wires;
     expect(wires.length).toEqual(3);
     expect(wires.find((wire) => wire.drivers.length === 3)).toBeDefined();
     expect(wires.find((wire) => wire.riders.length === 3)).toBeDefined();