@modular-circuit/transpiler 0.0.106 → 0.0.108

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/build/converter/netlist_to_kicad/layout.d.ts +1 -0
  2. package/build/converter/netlist_to_kicad/layout.d.ts.map +1 -1
  3. package/build/converter/netlist_to_kicad/layout.js +13 -4
  4. package/package.json +3 -3
package/build/converter/netlist_to_kicad/layout.d.ts CHANGED
@@ -24,6 +24,7 @@ export interface BoxGeometry {
24
24
  export interface BlockSize {
25
25
  size: VECTOR2;
26
26
  bounding_size: VECTOR2;
27
+ factor: BlockLabelPadding;
27
28
  }
28
29
  export declare class Layout {
29
30
  private block_geo;
package/build/converter/netlist_to_kicad/layout.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAMvE,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;AAiBlC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAED,eAAO,MAAM,aAAa,QAAgB,CAAA;AAE1C,eAAO,MAAM,mBAAmB,QAAgB,CAAA;AAKhD,eAAO,MAAM,YAAY,QAAY,CAAA;AAErC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,IAAI,CAAA;IACT,YAAY,EAAE,IAAI,CAAA;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,OAAO,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;CACvB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,SAAS,CAAgC;IAEjD,OAAO,CAAC,GAAG,CAAY;IAEhB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB;IAIzC,QAAQ;IAmDrB,OAAO,CAAC,eAAe;CA4BxB"}
1
+ {"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAMvE,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;AAiBlC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAED,eAAO,MAAM,aAAa,QAAgB,CAAA;AAE1C,eAAO,MAAM,mBAAmB,QAAgB,CAAA;AAKhD,eAAO,MAAM,YAAY,QAAY,CAAA;AAErC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,IAAI,CAAA;IACT,YAAY,EAAE,IAAI,CAAA;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,OAAO,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,iBAAiB,CAAA;CAC1B;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,SAAS,CAAgC;IAEjD,OAAO,CAAC,GAAG,CAAY;IAEhB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB;IAIzC,QAAQ;IAmDrB,OAAO,CAAC,eAAe;CA0BxB"}
package/build/converter/netlist_to_kicad/layout.js CHANGED
@@ -1,3 +1,14 @@
1
+ var __assign = (this && this.__assign) || function () {
2
+ __assign = Object.assign || function(t) {
3
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
4
+ s = arguments[i];
5
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
6
+ t[p] = s[p];
7
+ }
8
+ return t;
9
+ };
10
+ return __assign.apply(this, arguments);
11
+ };
1
12
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
13
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
14
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -88,7 +99,7 @@ var Layout = /** @class */ (function () {
88
99
  this.elk = new ELK();
89
100
  }
90
101
  Layout.prototype.add_block = function (id, factor) {
91
- this.block_geo[id] = this.calc_block_size(factor);
102
+ this.block_geo[id] = __assign(__assign({}, this.calc_block_size(factor)), { factor: factor });
92
103
  };
93
104
  Layout.prototype.finalize = function () {
94
105
  return __awaiter(this, void 0, void 0, function () {
@@ -145,7 +156,7 @@ var Layout = /** @class */ (function () {
145
156
  child = _e.value;
146
157
  geo = this.block_geo[child.id];
147
158
  pos = {
148
- x: (_h = child.x) !== null && _h !== void 0 ? _h : 0,
159
+ x: ((_h = child.x) !== null && _h !== void 0 ? _h : 0) + geo.factor.outer.l_side,
149
160
  y: (_j = child.y) !== null && _j !== void 0 ? _j : 0,
150
161
  };
151
162
  bbox[child.id] = {
@@ -171,8 +182,6 @@ var Layout = /** @class */ (function () {
171
182
  var block_height = Math.floor(factor.total_pin_num / 2) * BLOCK_PIN_GAP + 2 * BLOCK_PIN_TB_MARGIN;
172
183
  var block_width = Math.max(MIN_BLOCK_WIDTH, factor.internal.l_side + factor.internal.r_side + INTERNAL_LABEL_MARGIN);
173
184
  var block_bounding_width = block_width + factor.outer.l_side + factor.outer.r_side + WIRE_PADDING * 4 + BLOCK_H_SPACE;
174
- if (factor.total_pin_num === 0)
175
- block_bounding_width += BLOCK_H_SPACE;
176
185
  var size = {
177
186
  x: block_width,
178
187
  y: block_height,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@modular-circuit/transpiler",
3
- "version": "0.0.106",
3
+ "version": "0.0.108",
4
4
  "description": "Intermediate representation of the modular circuit",
5
5
  "main": "./build/index.js",
6
6
  "files": [
@@ -28,9 +28,9 @@
28
28
  "js-base64": "^3.7.7",
29
29
  "jszip": "^3.10.1",
30
30
  "@modular-circuit/electronics-model": "0.0.54",
31
- "@modular-circuit/utils": "0.0.41",
31
+ "@modular-circuit/ir": "0.0.63",
32
32
  "@modular-circuit/perc": "0.0.61",
33
- "@modular-circuit/ir": "0.0.63"
33
+ "@modular-circuit/utils": "0.0.41"
34
34
  },
35
35
  "scripts": {
36
36
  "clean": "rimraf build",