@mulmoclaude/shapescript-plugin 2.4.0 → 2.5.1

package/dist/{toThreeJS-OGEAi4zV.js → toThreeJS-DyLC4g1t.js}

@@ -7787,7 +7787,6 @@ var _c = (e) => typeof e == "object" && !!e && !Array.isArray(e), vc = {
 		});
 		for (let [e, t] of Object.entries({
 			pi: Math.PI,
-			tau: 2 * Math.PI,
 			true: !0,
 			false: !1
 		})) this.set(e, t);
@@ -8888,6 +8887,14 @@ var Qc = class {
 		if (e.type === a.IDENTIFIER || typeof e.value == "string") return this.advance();
 		throw new o(`Expected identifier but got ${e.type}`, e.line, e.column);
 	}
+	parseStatementLine() {
+		let e = this.parseNode();
+		return e && this.expectEndOfStatement(), e;
+	}
+	expectEndOfStatement() {
+		let e = this.current(), t = this.tokens[this.pos - 1];
+		if (!(!t || e.type === a.NEWLINE || e.type === a.RBRACE || e.type === a.EOF || e.line !== t.line)) throw new o(`Unexpected \`${String(e.value)}\` after a statement — ShapeScript takes one statement per line; start a new line here`, e.line, e.column);
+	}
 	skipNewlines() {
 		for (; this.current().type === a.NEWLINE;) this.advance();
 	}
@@ -9151,7 +9158,7 @@ var Qc = class {
 		let e = {};
 		for (; this.current().type !== a.RBRACE && this.current().type !== a.EOF;) {
 			if (this.skipNewlines(), !this.parseProperty(e)) return e;
-			this.skipNewlines();
+			this.expectEndOfStatement(), this.skipNewlines();
 		}
 		return e;
 	}
@@ -9192,7 +9199,7 @@ var Qc = class {
 			this.skipNewlines();
 			let e = [];
 			for (; this.current().type !== a.RBRACE && this.current().type !== a.EOF;) {
-				let t = this.parseNode();
+				let t = this.parseStatementLine();
 				t && e.push(t), this.skipNewlines();
 			}
 			return e;
@@ -9221,7 +9228,7 @@ var Qc = class {
 				let r = this.current();
 				if (r.type === a.RBRACE || r.type === a.EOF) break;
 				if (e !== "polygon") throw new o(`Unexpected token in ${e}: ${r.type}`, r.line, r.column);
-				(n ??= []).push(this.parsePathCommand("polygon")), this.skipNewlines();
+				(n ??= []).push(this.parsePathCommand("polygon")), this.expectEndOfStatement(), this.skipNewlines();
 			}
 		}), this.expect(a.RBRACE)), {
 			type: "shape",
@@ -9285,7 +9292,7 @@ var Qc = class {
 					let n;
 					if (this.current().type === a.LBRACE) n = this.parseBlock();
 					else for (n = []; this.current().type !== a.CASE && this.current().type !== a.ELSE && this.current().type !== a.RBRACE && this.current().type !== a.EOF;) {
-						let e = this.parseNode();
+						let e = this.parseStatementLine();
 						e && n.push(e), this.skipNewlines();
 					}
 					t.push({
@@ -9295,7 +9302,7 @@ var Qc = class {
 				} else if (this.current().type === a.ELSE) {
 					if (this.advance(), this.skipNewlines(), this.current().type === a.LBRACE) n = this.parseBlock();
 					else for (n = []; this.current().type !== a.CASE && this.current().type !== a.RBRACE && this.current().type !== a.EOF;) {
-						let e = this.parseNode();
+						let e = this.parseStatementLine();
 						e && n.push(e), this.skipNewlines();
 					}
 				} else this.skipNewlines(), this.current().type !== a.CASE && this.current().type !== a.ELSE && this.current().type !== a.RBRACE && this.advance();
@@ -9323,9 +9330,9 @@ var Qc = class {
 						type: "option",
 						name: e,
 						defaultValue: n
-					});
+					}), this.expectEndOfStatement();
 				} else {
-					let e = this.parseNode();
+					let e = this.parseStatementLine();
 					e && n.push(e);
 				}
 			}), this.expect(a.RBRACE), {
@@ -9370,7 +9377,7 @@ var Qc = class {
 			for (; this.current().type !== a.RBRACE && this.current().type !== a.EOF;) {
 				let t = this.current();
 				if (this.startsStatement(t)) {
-					let e = this.parseNode();
+					let e = this.parseStatementLine();
 					e && n.push(e);
 				} else if (r = this.parseVectorOrExpression(), this.skipNewlines(), this.current().type !== a.RBRACE) throw new o(`Function \`${e}\`: the expression it returns must be its last line`, this.current().line, this.current().column);
 				this.skipNewlines();
@@ -9452,7 +9459,7 @@ var Qc = class {
 			return e.lines.push(this.parseVectorOrExpression()), e;
 		}
 		return this.expect(a.LBRACE), this.skipNewlines(), this.scoped(() => {
-			for (; this.current().type !== a.RBRACE && this.current().type !== a.EOF;) this.parseTextLine(e), this.skipNewlines();
+			for (; this.current().type !== a.RBRACE && this.current().type !== a.EOF;) this.parseTextLine(e), this.expectEndOfStatement(), this.skipNewlines();
 		}), this.expect(a.RBRACE), e;
 	}
 	parseTextLine(e) {
@@ -9521,9 +9528,9 @@ var Qc = class {
 					a.ROTATION,
 					a.ORIENTATION
 				].includes(i.type)) Object.assign(t, this.parseProperties());
-				else if (this.isAlongOption(i)) r = this.parseAlong(e, r);
+				else if (this.isAlongOption(i)) r = this.parseAlong(e, r), this.expectEndOfStatement();
 				else {
-					let e = this.parseNode();
+					let e = this.parseStatementLine();
 					e && n.push(e);
 				}
 				this.skipNewlines();
@@ -9597,10 +9604,10 @@ var Qc = class {
 			let n = [];
 			for (; this.current().type !== a.RBRACE && this.current().type !== a.EOF;) {
 				if (t !== void 0 && this.parsePathProperty(t)) {
-					this.skipNewlines();
+					this.expectEndOfStatement(), this.skipNewlines();
 					continue;
 				}
-				n.push(this.parsePathCommand(e)), this.skipNewlines();
+				n.push(this.parsePathCommand(e)), this.expectEndOfStatement(), this.skipNewlines();
 			}
 			return n;
 		});
@@ -9661,7 +9668,7 @@ var Qc = class {
 			if (n === "angle" && t.type === a.IDENTIFIER) this.advance(), e.angle = this.parseExpression();
 			else if (t.type === a.POSITION || t.type === a.SIZE || t.type === a.ORIENTATION || t.type === a.ROTATION) this.advance(), e[t.type === a.ROTATION ? "orientation" : n] = this.parseVectorOrExpression();
 			else throw new o(`Unexpected token in arc: ${t.type}`, t.line, t.column);
-			this.skipNewlines();
+			this.expectEndOfStatement(), this.skipNewlines();
 		}
 		return this.expect(a.RBRACE), e;
 	}
@@ -9806,7 +9813,7 @@ var Qc = class {
 					Object.assign(t, e);
 				} else if (this.current().type === a.IDENTIFIER) {
 					let e = this.current().value;
-					this.advance(), t[e] = this.parseVectorOrExpression();
+					this.advance(), t[e] = this.parseVectorOrExpression(), this.expectEndOfStatement();
 				} else break;
 				this.skipNewlines();
 			}
@@ -9826,7 +9833,7 @@ var Qc = class {
 	parse() {
 		let e = [];
 		for (; this.current().type !== a.EOF;) {
-			let t = this.pos, n = this.parseNode();
+			let t = this.pos, n = this.parseStatementLine();
 			n && e.push(n), this.skipNewlines(), n === null && this.refuseStalledToken(t);
 		}
 		return e;
@@ -13492,26 +13499,46 @@ function hh(e) {
 	}
 	return n;
 }
-var gh = 3e4, _h = 8, vh = 12, yh = 4, bh = 1e-9, xh = class extends Error {
+var gh = "pathValue";
+function _h(e) {
+	return e.userData[gh] = !0, e;
+}
+function vh(e) {
+	return e.userData[gh] === !0;
+}
+var yh = /* @__PURE__ */ new Set([
+	"circle",
+	"square",
+	"roundrect",
+	"polygon"
+]);
+function bh(e) {
+	if (!vh(e)) throw Error("`loft` expects `path` cross-sections, not meshes — pass the path itself rather than a `fill` of it");
+	if (e.isMesh) return tl(e);
+	let t = hh(e);
+	if (t.length < 3) throw Error("A `loft` cross-section needs at least three points");
+	return t;
+}
+var xh = 3e4, Sh = 8, Ch = 12, wh = 4, Th = 1e-9, Eh = class extends Error {
 	constructor(e) {
 		super(e), this.name = "ShapeScriptLimitError";
 	}
 };
-function Sh(e) {
+function Dh(e) {
 	return {
 		...e,
 		color: e.color?.clone(),
 		glow: e.glow?.clone()
 	};
 }
-var Ch = 200, wh = 200;
-function Th(e) {
+var Oh = 200, kh = 200;
+function Ah(e) {
 	let t = e.getAttribute("position"), n = e.getIndex(), r = n?.count ?? t.count, i = new J(), a = new J(), o = new J(), s = 0;
 	for (let e = 0; e < r; e += 3) i.fromBufferAttribute(t, n ? n.getX(e) : e), a.fromBufferAttribute(t, n ? n.getX(e + 1) : e + 1), o.fromBufferAttribute(t, n ? n.getX(e + 2) : e + 2), s += i.dot(a.cross(o));
 	return s / 6;
 }
-function Eh(e) {
-	if (Th(e) >= 0) return e;
+function jh(e) {
+	if (Ah(e) >= 0) return e;
 	let t = e.getIndex();
 	if (t) {
 		for (let e = 0; e < t.count; e += 3) {
@@ -13527,10 +13554,10 @@ function Eh(e) {
 	}
 	return e;
 }
-function Dh(e) {
+function Mh(e) {
 	return Math.max(0, Math.round(Math.log2(Math.max(4, e))) - 2);
 }
-var Oh = class {
+var Nh = class {
 	options;
 	evaluator;
 	symbols;
@@ -13587,15 +13614,15 @@ var Oh = class {
 		this.chargeEstimate(r * n);
 	}
 	chargeEstimate(e) {
-		if (this.vertexCount + e > this.maxVertices) throw new xh(`ShapeScript exceeds ${this.maxVertices} vertices — lower \`detail\` or simplify the path`);
+		if (this.vertexCount + e > this.maxVertices) throw new Eh(`ShapeScript exceeds ${this.maxVertices} vertices — lower \`detail\` or simplify the path`);
 	}
 	makeMesh(e, t) {
-		if (this.vertexCount += e.getAttribute("position")?.count ?? 0, this.vertexCount > this.maxVertices) throw e.dispose(), t.dispose(), new xh(`ShapeScript exceeds ${this.maxVertices} vertices — lower \`detail\` or use fewer shapes`);
+		if (this.vertexCount += e.getAttribute("position")?.count ?? 0, this.vertexCount > this.maxVertices) throw e.dispose(), t.dispose(), new Eh(`ShapeScript exceeds ${this.maxVertices} vertices — lower \`detail\` or use fewer shapes`);
 		return new ti(e, t);
 	}
 	convertNode(e) {
-		if (this.nodeCount += 1, this.nodeCount > this.maxNodes) throw new xh(`ShapeScript produced more than ${this.maxNodes} objects — reduce the loop counts or the nesting`);
-		if (Date.now() - this.startedAt > this.maxDurationMs) throw new xh(`ShapeScript took longer than ${this.maxDurationMs}ms to build — simplify the model or use fewer boolean operations`);
+		if (this.nodeCount += 1, this.nodeCount > this.maxNodes) throw new Eh(`ShapeScript produced more than ${this.maxNodes} objects — reduce the loop counts or the nesting`);
+		if (Date.now() - this.startedAt > this.maxDurationMs) throw new Eh(`ShapeScript took longer than ${this.maxDurationMs}ms to build — simplify the model or use fewer boolean operations`);
 		switch (e.type) {
 			case "shape": return this.convertShape(e);
 			case "csg": return this.convertCSG(e);
@@ -13618,7 +13645,7 @@ var Oh = class {
 			case "material": return this.handleMaterialCommand(e), null;
 			case "smoothing": return this.currentTransform().material.smoothing = this.evaluateNumber(e.value), null;
 			case "background": return this.handleBackground(e.value), null;
-			case "print": return this.logs.length < Ch && this.logs.push(Fh(this.evaluator.evaluate(e.value))), null;
+			case "print": return this.logs.length < Oh && this.logs.push(Bh(this.evaluator.evaluate(e.value))), null;
 			case "assert":
 				if (!this.evaluator.evaluateToBoolean(e.value)) throw Error("Assertion failed");
 				return null;
@@ -13637,10 +13664,10 @@ var Oh = class {
 	convertPathProfile(e) {
 		return this.withPathDetail(() => {
 			let t = this.collectPathPoints(e), n = this.shapeFromPathPoints(t);
-			if (!mh(t)) return this.lineFromPath(e, n);
-			this.chargePathEstimate(n, vh), this.requireEnclosedArea(n, "path");
+			if (!mh(t)) return _h(this.lineFromPath(e, n));
+			this.chargePathEstimate(n, Ch), this.requireEnclosedArea(n, "path");
 			let r = this.makeMesh(this.placePath(new Qa(n), e), this.createMaterial({ properties: {} }));
-			return this.applyCurrentTransform(r), r;
+			return this.applyCurrentTransform(r), _h(r);
 		});
 	}
 	withPathDetail(e) {
@@ -13661,7 +13688,7 @@ var Oh = class {
 		return this.applyCurrentTransform(o), o;
 	}
 	warn(e) {
-		this.warningSet.has(e) || this.warnings.length >= wh || (this.warningSet.add(e), this.warnings.push(e));
+		this.warningSet.has(e) || this.warnings.length >= kh || (this.warningSet.add(e), this.warnings.push(e));
 	}
 	handleBackground(e) {
 		if (this.sceneDepth > 0) throw Error("`background` can only be used at the root of the script");
@@ -13730,7 +13757,10 @@ var Oh = class {
 		}
 	}
 	convertShape(e) {
-		return e.points === void 0 ? this.withShapeOptions(e.properties, () => this.finishMesh(this.createGeometry(e), e, !1)) : this.placeValue(this.polygonValue(e));
+		return e.points === void 0 ? this.withShapeOptions(e.properties, () => {
+			let t = this.finishMesh(this.createGeometry(e), e, !1);
+			return yh.has(e.primitive) ? _h(t) : t;
+		}) : this.placeValue(this.polygonValue(e));
 	}
 	captureValues(e, t) {
 		let n = this.valueSink;
@@ -13746,20 +13776,21 @@ var Oh = class {
 		if (_c(e) && e.kind === "mesh") return this.placeMesh(e);
 		if (_c(e) && e.kind === "polygon") return this.placePolygons([e]);
 		if (Array.isArray(e) && e.length > 0 && e.every((e) => _c(e) && (e.kind === "mesh" || e.kind === "polygon"))) {
-			let t = e.filter((e) => _c(e) && e.kind === "mesh"), n = e.filter((e) => _c(e) && e.kind === "polygon"), r = n.length ? Ms(n, n.some((e) => e.colors)) : void 0, i = Ph([...t.map((e) => e.geometry), ...r ? [r] : []]);
+			let t = e.filter((e) => _c(e) && e.kind === "mesh"), n = e.filter((e) => _c(e) && e.kind === "polygon"), r = n.length ? Ms(n, n.some((e) => e.colors)) : void 0, i = zh([...t.map((e) => e.geometry), ...r ? [r] : []]);
 			r?.dispose();
-			let a = this.placeMesh({
+			let a = n.length === 0 && t.every((e) => e.path), o = this.placeMesh({
 				kind: "mesh",
-				geometry: i
+				geometry: i,
+				...a ? { path: a } : {}
 			});
-			return i.dispose(), a;
+			return i.dispose(), o;
 		}
 		throw Error("Unused value — a statement that is not a shape does nothing here; use `define` or `print`");
 	}
 	transformedForCapture(e) {
 		let t = this.currentTransform().matrix, n = t.equals(new Y());
 		if (Array.isArray(e)) return n ? e : e.map((e) => this.transformedForCapture(e));
-		if (!jh(e) || n) return e;
+		if (!Ih(e) || n) return e;
 		if (e.kind === "polygon") return {
 			...e,
 			points: e.points.map((e) => new J(...e).applyMatrix4(t).toArray())
@@ -13781,7 +13812,7 @@ var Oh = class {
 	}
 	placeMesh(e) {
 		let t = e.geometry.clone(), n = this.makeMesh(t, this.createMaterial({ properties: {} }, void 0, t.hasAttribute("color")));
-		return e.name !== void 0 && (n.name = e.name), this.applyCurrentTransform(n), n;
+		return e.name !== void 0 && (n.name = e.name), e.path && _h(n), this.applyCurrentTransform(n), n;
 	}
 	placePolygons(e) {
 		let t = e.some((e) => e.colors !== void 0), n = Ms(e, t);
@@ -13799,31 +13830,32 @@ var Oh = class {
 			this.captureValues(r, () => this.inScope(n, () => {
 				this.currentTransform().matrix.identity(), this.addChildren(n, e), t?.(r);
 			}));
-			let i = this.meshesIn(n), a = i.map((e) => Mh(e).applyMatrix4(e.matrixWorld)), o = i.length === 1 ? i[0] : void 0, s = o?.geometry.userData.polygons, c = o && s ? s.map((e) => ({
+			let i = this.meshesIn(n), a = i.map((e) => Lh(e).applyMatrix4(e.matrixWorld)), o = i.length === 1 ? i[0] : void 0, s = o?.geometry.userData.polygons, c = o && s ? s.map((e) => ({
 				...e,
 				points: e.points.map((e) => new J(...e).applyMatrix4(o.matrixWorld).toArray())
-			})) : void 0;
+			})) : void 0, l = i.length > 0 && i.every(vh);
 			return {
 				captured: r,
 				geometries: a,
 				name: o?.name || void 0,
-				polygons: c
+				polygons: c,
+				path: l
 			};
 		} finally {
 			oh(n), this.vertexCount = i, this.vertexCount += this.retained.slice(a).reduce((e, t) => e + t.getAttribute("position").count, 0);
 		}
 	}
 	convertMesh(e) {
-		let { captured: t, geometries: n } = this.buildScratch(e.children), r = Ah(t).filter((e) => e.kind === "polygon"), i = Ah(t).filter((e) => e.kind === "mesh"), a = r.some((e) => e.colors !== void 0), o = [...r.length ? [Ms(r, a)] : [], ...n], s = [...o, ...i.map((e) => e.geometry)];
+		let { captured: t, geometries: n } = this.buildScratch(e.children), r = Fh(t).filter((e) => e.kind === "polygon"), i = Fh(t).filter((e) => e.kind === "mesh"), a = r.some((e) => e.colors !== void 0), o = [...r.length ? [Ms(r, a)] : [], ...n], s = [...o, ...i.map((e) => e.geometry)];
 		if (s.length === 0) throw Error("`mesh` needs at least one polygon");
-		let c = Ph(s);
+		let c = zh(s);
 		o.forEach((e) => e.dispose()), i.length === 0 && n.length === 0 && (c.userData = { polygons: r });
 		let l = this.makeMesh(c, this.createMaterial({ properties: {} }, void 0, c.hasAttribute("color")));
 		return this.applyCurrentTransform(l), l;
 	}
 	polygonValue(e) {
 		let t = [], n = [], r = e.properties.color === void 0 ? void 0 : this.evaluateRGBA(e.properties.color), i = r !== void 0, a = (e) => {
-			if (++this.pathCommandCount > this.maxLoopIterations) throw new xh(`ShapeScript polygon exceeds ${this.maxLoopIterations} commands`);
+			if (++this.pathCommandCount > this.maxLoopIterations) throw new Eh(`ShapeScript polygon exceeds ${this.maxLoopIterations} commands`);
 			switch (e.type) {
 				case "define":
 					this.handleDefine(e);
@@ -13891,29 +13923,31 @@ var Oh = class {
 		}), t;
 	}
 	shapeValue(e) {
-		let { captured: t, geometries: n, name: r, polygons: i } = this.buildScratch([e]);
+		let { captured: t, geometries: n, name: r, polygons: i, path: a } = this.buildScratch([e]);
 		if (n.length === 0) {
 			if (t.length === 1) return t[0];
 			if (t.length > 1) return t;
 			throw Error("The shape used as a value produced nothing");
 		}
-		let a = Ph(n);
-		return n.forEach((e) => e.dispose()), this.chargeRetained(a), {
+		let o = zh(n);
+		return n.forEach((e) => e.dispose()), this.chargeRetained(o), {
 			kind: "mesh",
-			geometry: a,
+			geometry: o,
 			...r === void 0 ? {} : { name: r },
-			...i === void 0 ? {} : { polygons: i }
+			...i === void 0 ? {} : { polygons: i },
+			...a ? { path: a } : {}
 		};
 	}
 	callShapeFunction(e, t) {
 		let { params: n = [], body: r = [], value: i, name: a } = e.definition;
 		return this.evaluator.withArguments(n, t, () => {
-			let { captured: e, geometries: t } = this.buildScratch(r, (e) => {
+			let { captured: e, geometries: t, path: n } = this.buildScratch(r, (e) => {
 				i !== void 0 && e.push(this.transformedForCapture(this.evaluator.evaluate(i)));
 			});
-			for (let n of t) this.chargeRetained(n), e.push({
+			for (let r of t) this.chargeRetained(r), e.push({
 				kind: "mesh",
-				geometry: n
+				geometry: r,
+				...n ? { path: n } : {}
 			});
 			if (e.length === 0) throw Error(`Function \`${a}\` produced no value`);
 			return e.length === 1 ? e[0] : e;
@@ -13927,7 +13961,7 @@ var Oh = class {
 		switch (e.primitive) {
 			case "cube": return this.requireExtent("cube", t), new Ai(t[0], t[1], t[2]);
 			case "sphere": return this.requireExtent("sphere", t), new eo(.5, this.detailLevel, this.detailLevel).scale(...t);
-			case "icosphere": return this.requireExtent("icosphere", t), js(.5, Dh(this.detailLevel)).geometry.scale(...t);
+			case "icosphere": return this.requireExtent("icosphere", t), js(.5, Mh(this.detailLevel)).geometry.scale(...t);
 			case "cylinder": {
 				let n = e.properties.radiusTop ? this.evaluateNumber(e.properties.radiusTop) : t[0] / 2, r = e.properties.radiusBottom ? this.evaluateNumber(e.properties.radiusBottom) : t[0] / 2, i = e.properties.height ? this.evaluateNumber(e.properties.height) : t[1];
 				return this.requireExtent("cylinder", [n || r, i]), new Mi(n, r, i, this.detailLevel);
@@ -13963,7 +13997,7 @@ var Oh = class {
 		return this.requireExtent("torus", [i, a]), new to(i, a, Math.max(3, Math.floor(this.detailLevel / 2)), this.detailLevel);
 	}
 	materialFor(e, t) {
-		let n = Sh(t);
+		let n = Dh(t);
 		return e.material !== void 0 && this.applyMaterialValue(n, this.evaluator.evaluate(e.material)), e.color !== void 0 && this.applyColor(n, this.evaluateRGBA(e.color)), e.opacity !== void 0 && (n.opacity *= this.evaluateNumber(e.opacity)), e.metallicity !== void 0 && (n.metallicity = this.evaluateNumber(e.metallicity)), e.roughness !== void 0 && (n.roughness = this.evaluateNumber(e.roughness)), e.glow !== void 0 && (n.glow = this.glowColor(this.evaluator.evaluate(e.glow))), e.texture !== void 0 && this.warnTexture(this.evaluator.evaluate(e.texture)), n;
 	}
 	applyColor(e, [t, n, r, i]) {
@@ -14085,7 +14119,7 @@ var Oh = class {
 		});
 	}
 	iterations(e) {
-		return Fc(this.evaluator.evaluate(e), this.maxLoopIterations, () => new xh(`ShapeScript loop exceeds ${this.maxLoopIterations} iterations — narrow the range or increase the step`));
+		return Fc(this.evaluator.evaluate(e), this.maxLoopIterations, () => new Eh(`ShapeScript loop exceeds ${this.maxLoopIterations} iterations — narrow the range or increase the step`));
 	}
 	convertIf(e) {
 		let t = new An(), n = this.evaluator.evaluateToBoolean(e.condition);
@@ -14103,7 +14137,7 @@ var Oh = class {
 	}
 	convertCustomShape(e) {
 		let t = this.symbols.get(e.name);
-		if (t !== void 0 && jh(t)) {
+		if (t !== void 0 && Ih(t)) {
 			let n = new An();
 			return this.inScope(n, () => {
 				this.applyPlacement(this.currentTransform().matrix, e.properties);
@@ -14124,7 +14158,7 @@ var Oh = class {
 				size: c
 			}), this.currentTransform().material = this.materialFor(u, this.currentTransform().material);
 			for (let e of n.options ?? []) this.symbols.set(e.name, this.evaluator.evaluate(e.defaultValue));
-			for (let [e, t] of Object.entries(u)) e in kh || this.symbols.set(e, this.evaluator.evaluate(t));
+			for (let [e, t] of Object.entries(u)) e in Ph || this.symbols.set(e, this.evaluator.evaluate(t));
 			l !== void 0 && (r.name = String(this.evaluator.evaluate(l))), this.withShapeOptions(u, () => this.addChildren(r, i));
 		});
 	}
@@ -14136,7 +14170,7 @@ var Oh = class {
 		let e = this.currentTransform();
 		this.transformStack.push({
 			matrix: e.matrix.clone(),
-			material: Sh(e.material)
+			material: Dh(e.material)
 		});
 	}
 	popTransform() {
@@ -14234,9 +14268,9 @@ var Oh = class {
 		n.matrix.multiply(r);
 	}
 	requireEnclosedArea(e, t) {
-		let n = e.getPoints(vh), r = Wa.area(n);
+		let n = e.getPoints(Ch), r = Wa.area(n);
 		if (!Number.isFinite(r)) throw Error(`\`${t}\` needs finite path coordinates — these overflow`);
-		if (n.length < 3 || Math.abs(r) < bh) throw Error(`\`${t}\` needs a path that encloses an area — this one has fewer than three distinct points, or they are collinear`);
+		if (n.length < 3 || Math.abs(r) < Th) throw Error(`\`${t}\` needs a path that encloses an area — this one has fewer than three distinct points, or they are collinear`);
 		return e;
 	}
 	extrudeProperties(e) {
@@ -14263,7 +14297,7 @@ var Oh = class {
 			let { depth: t, properties: n } = this.extrudeProperties(e);
 			return e.path ? this.withPathDetail(() => {
 				let r = e.path, i = this.collectPathPoints(r), a = this.shapeFromPathPoints(i), o = Math.max(1, Math.floor(this.detailLevel / 4));
-				this.chargePathEstimate(a, o, yh);
+				this.chargePathEstimate(a, o, wh);
 				let s = mh(i) ? new qa(this.requireEnclosedArea(a, "extrude"), {
 					depth: t,
 					bevelEnabled: !1,
@@ -14283,7 +14317,7 @@ var Oh = class {
 					curveSegments: 1
 				}).translate(0, 0, -t / 2)] : [], a = n.map((e) => ul(hh(e), t)), o = [...i, ...a];
 				for (let e of o) this.chargeEstimate(e.getAttribute("position").count);
-				let s = o.length === 1 ? o[0] : Ph(o);
+				let s = o.length === 1 ? o[0] : zh(o);
 				return o.length > 1 && o.forEach((e) => e.dispose()), s;
 			});
 		});
@@ -14302,7 +14336,7 @@ var Oh = class {
 			if (!n.length) throw Error("`extrude … along` needs a planar section to sweep");
 			let { points: r, closed: i } = this.sweepPathOf(t);
 			this.chargeEstimate(n.reduce((e, t) => e + t.length * r.length, 0));
-			let a = n.map((e) => al(ol(e, r, i), i)), o = a.length === 1 ? a[0] : Ph(a);
+			let a = n.map((e) => al(ol(e, r, i), i)), o = a.length === 1 ? a[0] : zh(a);
 			return a.length > 1 && a.forEach((e) => e.dispose()), o;
 		});
 	}
@@ -14342,7 +14376,7 @@ var Oh = class {
 		}, a = (e) => {
 			if (t.multiply(e), !t.elements.every(Number.isFinite)) throw Error("Path transform overflowed to a non-finite value — `translate`, `rotate` and `scale` accumulate inside a path");
 		}, o = (e) => {
-			if (++this.pathCommandCount > this.maxLoopIterations) throw new xh(`ShapeScript path exceeds ${this.maxLoopIterations} commands`);
+			if (++this.pathCommandCount > this.maxLoopIterations) throw new Eh(`ShapeScript path exceeds ${this.maxLoopIterations} commands`);
 			switch (e.type) {
 				case "define":
 					this.handleDefine(e);
@@ -14442,7 +14476,7 @@ var Oh = class {
 	requireLatheProfile(e) {
 		if (!e.every((e) => Number.isFinite(e.x) && Number.isFinite(e.y))) throw Error("`lathe` profile has non-finite coordinates — a curve control point or a path command overflowed");
 		let t = Math.max(...e.map((e) => Math.abs(e.x))), n = Math.max(...e.map((e) => e.y)) - Math.min(...e.map((e) => e.y));
-		if (t < bh || n < bh) throw Error("`lathe` needs a profile with both radius and height — one on the axis of rotation sweeps nothing");
+		if (t < Th || n < Th) throw Error("`lathe` needs a profile with both radius and height — one on the axis of rotation sweeps nothing");
 	}
 	buildLathe(e) {
 		let t = null;
@@ -14462,7 +14496,7 @@ var Oh = class {
 			if (r.length < 2) throw Error("Lathe path must have at least 2 points");
 			if (this.requireLatheProfile(r), r.every((e) => e.x <= uh)) for (let e of r) e.x = -e.x;
 			this.chargeEstimate(r.length * (this.detailLevel + 1));
-			let i = Eh(new Xa(r, this.detailLevel));
+			let i = jh(new Xa(r, this.detailLevel));
 			return this.finishMesh(i, e, !0, this.currentTransform().material);
 		});
 	}
@@ -14471,18 +14505,22 @@ var Oh = class {
 		this.operandDepth++;
 		try {
 			this.captureValues(null, () => this.inScope(e, () => {
-				this.currentTransform().matrix.identity(), this.addChildren(e, t), n = Sh(this.currentTransform().material);
+				this.currentTransform().matrix.identity(), this.addChildren(e, t), n = Dh(this.currentTransform().material);
 			}));
 		} finally {
 			this.operandDepth--;
 		}
 		e.updateMatrixWorld(!0);
-		let r = [], i = [];
+		let r = [], i = [], a = [];
 		return e.traverse((e) => {
-			e.isMesh ? r.push(e) : e.isLine && i.push(e);
+			if (e.isMesh) r.push(e);
+			else if (e.isLine) i.push(e);
+			else return;
+			a.push(e);
 		}), {
 			meshes: r,
 			lines: i,
+			operands: a,
 			material: n
 		};
 	}
@@ -14490,7 +14528,7 @@ var Oh = class {
 		let n = new An(), r = this.vertexCount, i, a;
 		try {
 			let r = this.buildOperands(n, e.children);
-			a = r.material, i = t(r.meshes, r.lines);
+			a = r.material, i = t(r.meshes, r.lines, r.operands);
 		} finally {
 			oh(n), this.vertexCount = r;
 		}
@@ -14500,9 +14538,9 @@ var Oh = class {
 		return this.withShapeOptions(e.properties, () => this.buildLoft(e));
 	}
 	buildLoft(e) {
-		return this.buildFromChildren(e, (e) => {
-			let t = e.map(tl), n = t.length * Math.max(0, ...t.map((e) => e.length));
-			return this.chargeEstimate(n), al(t);
+		return this.buildFromChildren(e, (e, t, n) => {
+			let r = n.map(bh), i = r.length * Math.max(0, ...r.map((e) => e.length));
+			return this.chargeEstimate(i), al(r);
 		});
 	}
 	planarShapes(e) {
@@ -14516,11 +14554,11 @@ var Oh = class {
 			let t = El(this.textOf(e), {
 				...e.wrapWidth === void 0 ? {} : { wrapWidth: this.textWrapWidth(e.wrapWidth) },
 				lineSpacing: e.lineSpacing === void 0 ? 0 : this.evaluateNumber(e.lineSpacing),
-				curveSegments: Math.max(1, Math.floor(this.detailLevel / _h))
+				curveSegments: Math.max(1, Math.floor(this.detailLevel / Sh))
 			});
 			t.missing.length && this.warn(`The built-in font has no glyph for ${[...new Set(t.missing)].map((e) => `"${e}"`).join(" ")} — drawn as "?"`);
 			let n = t.rings.reduce((e, t) => e + t.length, 0);
-			return t.shapes.length === 0 ? null : this.operandDepth > 0 || this.valueSink !== null ? (this.chargeEstimate(n), this.finishMesh(new Qa(t.shapes, 1), e, !0)) : this.textOutline(e, t, n);
+			return t.shapes.length === 0 ? null : this.operandDepth > 0 || this.valueSink !== null ? (this.chargeEstimate(n), _h(this.finishMesh(new Qa(t.shapes, 1), e, !0))) : this.textOutline(e, t, n);
 		});
 	}
 	textWrapWidth(e) {
@@ -14531,7 +14569,7 @@ var Oh = class {
 	textOf(e) {
 		let t = e.lines.map((e) => {
 			let t = this.evaluator.evaluate(e);
-			return Dl(Array.isArray(t) ? t : [t], (e) => Fh(e));
+			return Dl(Array.isArray(t) ? t : [t], (e) => Bh(e));
 		}).join("\n");
 		if (t.length > 2e3) throw Error(`\`text\` is limited to ${hl} characters`);
 		return t;
@@ -14568,7 +14606,7 @@ var Oh = class {
 				return new Qa(t, 1);
 			});
 			let n = this.buildPath(t);
-			this.chargePathEstimate(n, vh), this.requireEnclosedArea(n, "fill");
+			this.chargePathEstimate(n, Ch), this.requireEnclosedArea(n, "fill");
 			let r = this.placePath(new Qa(n), t);
 			return this.finishMesh(r, e);
 		});
@@ -14593,7 +14631,7 @@ var Oh = class {
 				throw r.dispose(), e;
 			}
 			this.chargeEstimate(r.getAttribute("position").count);
-			let a = Nh(t);
+			let a = Rh(t);
 			return a && r.setAttribute("color", new X(new Float32Array(r.getAttribute("position").count * 3).map((e, t) => a[t % 3]), 3)), r;
 		});
 	}
@@ -14668,7 +14706,7 @@ var Oh = class {
 		if (!e.every(Number.isFinite)) throw Error("Expected finite color channels");
 		return e;
 	}
-}, kh = {
+}, Ph = {
 	position: !0,
 	orientation: !0,
 	rotation: !0,
@@ -14683,23 +14721,23 @@ var Oh = class {
 	detail: !0,
 	smoothing: !0
 };
-function Ah(e) {
+function Fh(e) {
 	let t = [];
-	for (let n of e) Array.isArray(n) ? t.push(...Ah(n)) : jh(n) && t.push(n);
+	for (let n of e) Array.isArray(n) ? t.push(...Fh(n)) : Ih(n) && t.push(n);
 	return t;
 }
-function jh(e) {
+function Ih(e) {
 	return _c(e) && (e.kind === "mesh" || e.kind === "polygon");
 }
-function Mh(e) {
-	let t = e.geometry.clone(), n = Nh(e);
+function Lh(e) {
+	let t = e.geometry.clone(), n = Rh(e);
 	if (n && !t.hasAttribute("color")) {
 		let e = t.getAttribute("position").count;
 		t.setAttribute("color", new X(new Float32Array(e * 3).map((e, t) => n[t % 3]), 3));
 	}
 	return t;
 }
-function Nh(e) {
+function Rh(e) {
 	let t = Array.isArray(e.material) ? e.material[0] : e.material, n = e.geometry.getAttribute("color");
 	if (n && n.count > 0) {
 		let e = [
@@ -14716,7 +14754,7 @@ function Nh(e) {
 		t.color.b
 	];
 }
-function Ph(e) {
+function zh(e) {
 	let t = e.some((e) => e.hasAttribute("color")), n = e.map((e) => {
 		let n = e.index ? e.toNonIndexed() : e.clone();
 		n.hasAttribute("normal") || n.computeVertexNormals();
@@ -14733,11 +14771,11 @@ function Ph(e) {
 	if (!r) throw Error("Could not combine the shapes into one mesh");
 	return n.length > 1 && n.forEach((e) => e.dispose()), r;
 }
-function Fh(e) {
-	return Array.isArray(e) ? e.map((e) => Array.isArray(e) ? `(${Fh(e)})` : Fh(e)).join(" ") : typeof e == "object" ? e.kind === "range" ? `${e.from} to ${e.to} step ${e.step}` : `<${e.kind}>` : String(e);
+function Bh(e) {
+	return Array.isArray(e) ? e.map((e) => Array.isArray(e) ? `(${Bh(e)})` : Bh(e)).join(" ") : typeof e == "object" ? e.kind === "range" ? `${e.from} to ${e.to} step ${e.step}` : `<${e.kind}>` : String(e);
 }
-function Ih(e, t = {}) {
-	return new Oh(t).convert(e);
+function Vh(e, t = {}) {
+	return new Nh(t).convert(e);
 }
 //#endregion
-export { f as $, Me as $t, ki as A, G as An, se as At, _ as B, t as Bn, oe as Bt, en as C, Zt as Cn, me as Ct, Di as D, no as Dn, ve as Dt, P as E, Mn as En, _e as Et, bs as F, rt as Fn, H as Ft, jt as G, R as Gt, He as H, i as Hn, U as Ht, T as I, W as In, M as It, ti as J, F as Jt, Ft as K, fo as Kt, S as L, nt as Ln, De as Lt, w as M, oo as Mn, re as Mt, fi as N, et as Nn, B as Nt, Go as O, Qe as On, ye as Ot, qe as P, ro as Pn, V as Pt, d as Q, le as Qt, pn as R, o as Rn, Oe as Rt, tn as S, J as Sn, pe as St, ee as T, $t as Tn, ge as Tt, Ue as U, z as Ut, g as V, r as Vn, ne as Vt, s as W, L as Wt, mo as X, l as Xt, Ur as Y, I as Yt, ho as Z, it as Zt, Bt as _, C as _n, xe as _t, oh as a, uo as an, Za as at, Oi as b, x as bn, Te as bt, j as c, c as cn, ce as ct, Ai as d, br as dn, ke as dt, Ae as en, m as et, vr as f, so as fn, ue as ft, Ln as g, k as gn, be as gt, u as h, O as hn, Ce as ht, lh as i, zn as in, ci as it, X as j, Cs as jn, ie as jt, at as k, Ze as kn, Ee as kt, Ko as l, Xt as ln, lt, y as m, A as mn, te as mt, xh as n, Ve as nn, Uo as nt, ch as o, b as on, cs as ot, Mr as p, v as pn, N as pt, Y as q, Hr as qt, Ih as r, We as rn, Ho as rt, $c as s, ls as sn, Mt as st, gh as t, de as tn, p as tt, Xo as u, yr as un, je as ut, Ss as v, E as vn, Se as vt, ii as w, Je as wn, he as wt, Ei as x, q as xn, fe as xt, Yo as y, D as yn, we as yt, h as z, e as zn, ae as zt };
+export { d as $, le as $t, ki as A, Ze as An, Ee as At, h as B, e as Bn, ae as Bt, en as C, J as Cn, pe as Ct, Di as D, Mn as Dn, _e as Dt, P as E, $t as En, ge as Et, bs as F, ro as Fn, V as Ft, s as G, L as Gt, g as H, r as Hn, ne as Ht, An as I, rt as In, H as It, Y as J, Hr as Jt, jt as K, R as Kt, T as L, W as Ln, M as Lt, w as M, Cs as Mn, ie as Mt, fi as N, oo as Nn, re as Nt, Go as O, no as On, ve as Ot, qe as P, et as Pn, B as Pt, ho as Q, it as Qt, S as R, nt as Rn, De as Rt, tn as S, q as Sn, fe as St, ee as T, Je as Tn, he as Tt, He as U, i as Un, U as Ut, _ as V, t as Vn, oe as Vt, Ue as W, z as Wt, Ur as X, I as Xt, ti as Y, F as Yt, mo as Z, l as Zt, Bt as _, k as _n, be as _t, oh as a, zn as an, ci as at, Oi as b, D as bn, we as bt, j as c, ls as cn, Mt as ct, Ai as d, yr as dn, je as dt, Me as en, f as et, vr as f, br as fn, ke as ft, Ln as g, O as gn, Ce as gt, u as h, A as hn, te as ht, lh as i, We as in, Ho as it, X as j, G as jn, se as jt, at as k, Qe as kn, ye as kt, Ko as l, c as ln, ce as lt, y as m, v as mn, N as mt, Eh as n, de as nn, p as nt, ch as o, uo as on, Za as ot, Mr as p, so as pn, ue as pt, Ft as q, fo as qt, Vh as r, Ve as rn, Uo as rt, $c as s, b as sn, cs as st, xh as t, Ae as tn, m as tt, Xo as u, Xt as un, lt as ut, Ss as v, C as vn, xe as vt, ii as w, Zt as wn, me as wt, Ei as x, x as xn, Te as xt, Yo as y, E as yn, Se as yt, pn as z, o as zn, Oe as zt };