kisch 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kisch",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "",
   "repository": {
     "type": "git",

package/src/schematic/CompoundSymbol.js

@@ -4,10 +4,11 @@ export default class CompoundSymbol {
 		this.pins=[];
 
 		for (let symbol of symbols) {
-			for (let pin of symbol.pins) {
-				//console.log(pin.getNum());
+			let pinNums=symbol.getPinNums();
+			pinNums.sort();
 
-				this.pins.push(pin);
+			for (let pinNum of pinNums) {
+				this.pins.push(symbol.pin(pinNum));
 			}
 		}
 	}

package/src/schematic/Entity.js

@@ -5,15 +5,25 @@ class EntityPin {
 	constructor(sexpr, entity) {
 		this.sexpr=sexpr;
 		this.entity=entity;
+
+		//console.log("ctor pin num: "+this.sexpr[1]);
 	}
 
 	getNum() {
+		//console.log("pin num: "+this.sexpr[1]);
+
 		return this.sexpr[1];
 	}
 
 	initPoint() {
 		let librarySymbol=this.entity.getLibrarySymbol();
-		let librarySymbolPin=librarySymbol.getPin(Number(this.getNum()));
+		let librarySymbolPin;
+		if (isNaN(this.getNum()))
+			librarySymbolPin=librarySymbol.getPin(this.getNum());
+
+		else
+			librarySymbolPin=librarySymbol.getPin(Number(this.getNum()));
+
 		let pinAt=Point.from(librarySymbolPin.at);
 		let symbolAt=this.entity.getAt();
 		let symbolRot=this.entity.getRotation();
@@ -283,15 +293,28 @@ export default class Entity {
 		if (!num)
 			throw new Error("Pin numbers start at 1");
 
-		for (let p of this.pins)
+		for (let p of this.pins) {
+			//console.log("pin num: "+p.getNum());
+
 			if (p.getNum()==num)
 				return p;
+		}
+
+		throw new Error("Can't find pin: "+num);
 	}
 
 	getType() {
 		return this.type;
 	}
 
+	getPinNums() {
+		let nums=[];
+		for (let p of this.pins)
+			nums.push(p.getNum())
+
+		return nums;
+	}
+
 	getConnectionPoints() {
 		switch (this.getType()) {
 			case "wire":
@@ -304,8 +327,11 @@ export default class Entity {
 
 			case "symbol":
 				let p=[];
-				for (let i=1; i<=this.pins.length; i++)
-					p.push(this.pin(i).getPoint());
+				for (let num of this.getPinNums())
+					p.push(this.pin(num).getPoint());
+
+				/*for (let i=1; i<=this.pins.length; i++)
+					p.push(this.pin(i).getPoint());*/
 
 				return p;
 				break;
@@ -317,7 +343,7 @@ export default class Entity {
 
 	connect(...pins) {
 		if (this.getType()!="symbol")
-			throw new Error("can only connect sybols");
+			throw new Error("can only connect symbols");
 
 		if (pins.length!=this.pins.length)
 			throw new Error("pin count mismatch");

package/src/schematic/Schematic.js

@@ -44,10 +44,17 @@ export default class Schematic {
 				this.entities.push(e);
 			}
 
-			if (sexpCallName(o)=="uuid")
-				this.uuid=o[1];
+			if (sexpCallName(o)=="uuid") {
+				let cand=o[1];
+				if (isSym(cand))
+					cand=symName(cand);
+
+				//console.log(cand);
+				this.uuid=cand;
+			}
 		}
 
+		//console.log("loaded: "+this.uuid);
 		this.sexp=this.sexp.filter(o=>!["wire","label","symbol","uuid"].includes(sexpCallName(o)));
 	}
 
@@ -433,8 +440,14 @@ export default class Schematic {
 			]
 		]);
 
-		for (let i=1; i<=librarySymbol.pins.length; i++)
+		for (let p of librarySymbol.pins) {
+			expr.push([sym("pin"),p.number,[sym("uuid"),crypto.randomUUID()]]);
+		}
+
+		/*for (let i=1; i<=librarySymbol.pins.length; i++) {
+			//console.log("create pin: "+i);
 			expr.push([sym("pin"),String(i),[sym("uuid"),crypto.randomUUID()]]);
+		}*/
 
 		expr.push([sym("instances"),
 			[sym("project"),"",