@mulmoclaude/shapescript-plugin 2.5.1 → 2.6.0

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

@@ -8893,7 +8893,7 @@ var Qc = class {
 	}
 	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);
+		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();
@@ -10454,8 +10454,7 @@ function _u(e, t, n, r, i = null, a = 0, o = 0) {
 			let e = w(p);
 			C = r(e, T(p) - e, !0, o + 1, a + p / 8, _);
 		} else C = S && _u(p, t, n, r, i, a, o + 1);
-		if (C) return !0;
-		return !1;
+		return !!C;
 		function w(e) {
 			let { uint16Array: t, uint32Array: n } = $, r = e * 2;
 			for (; !zl(r, t);) e = Hl(e), r = e * 2;
@@ -13573,6 +13572,7 @@ var Nh = class {
 	logs = [];
 	background;
 	sceneDepth = 0;
+	customShapeDepth = 0;
 	valueSink = null;
 	retained = [];
 	constructor(e = {}) {
@@ -13621,8 +13621,7 @@ var Nh = class {
 		return new ti(e, t);
 	}
 	convertNode(e) {
-		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`);
+		if (Ph.has(e.type) && this.chargeNode(), 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);
@@ -13645,7 +13644,7 @@ var Nh = 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 < Oh && this.logs.push(Bh(this.evaluator.evaluate(e.value))), null;
+			case "print": return this.logs.length < Oh && this.logs.push(Uh(this.evaluator.evaluate(e.value))), null;
 			case "assert":
 				if (!this.evaluator.evaluateToBoolean(e.value)) throw Error("Assertion failed");
 				return null;
@@ -13717,6 +13716,9 @@ var Nh = class {
 			this.sceneDepth--, this.popTransform(), this.symbols.popScope();
 		}
 	}
+	chargeNode() {
+		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`);
+	}
 	addChildren(e, t) {
 		for (let n of t) {
 			let t = this.convertNode(n);
@@ -13760,7 +13762,7 @@ var Nh = class {
 		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));
+		}) : this.placeValue(this.polygonValue(e), { charged: !0 });
 	}
 	captureValues(e, t) {
 		let n = this.valueSink;
@@ -13771,12 +13773,12 @@ var Nh = class {
 			this.valueSink = n;
 		}
 	}
-	placeValue(e) {
+	placeValue(e, { charged: t = !1 } = {}) {
 		if (this.valueSink) return this.valueSink.push(this.transformedForCapture(e)), null;
-		if (_c(e) && e.kind === "mesh") return this.placeMesh(e);
+		if (!t && Rh(e) && this.chargeNode(), _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 = zh([...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 = Hh([...t.map((e) => e.geometry), ...r ? [r] : []]);
 			r?.dispose();
 			let a = n.length === 0 && t.every((e) => e.path), o = this.placeMesh({
 				kind: "mesh",
@@ -13790,7 +13792,7 @@ var Nh = class {
 	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 (!Ih(e) || n) return e;
+		if (!zh(e) || n) return e;
 		if (e.kind === "polygon") return {
 			...e,
 			points: e.points.map((e) => new J(...e).applyMatrix4(t).toArray())
@@ -13830,7 +13832,7 @@ var Nh = 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) => Lh(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) => Bh(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, l = i.length > 0 && i.every(vh);
@@ -13846,9 +13848,9 @@ var Nh = class {
 		}
 	}
 	convertMesh(e) {
-		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)];
+		let { captured: t, geometries: n } = this.buildScratch(e.children), r = Lh(t).filter((e) => e.kind === "polygon"), i = Lh(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 = zh(s);
+		let c = Hh(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;
@@ -13929,7 +13931,7 @@ var Nh = class {
 			if (t.length > 1) return t;
 			throw Error("The shape used as a value produced nothing");
 		}
-		let o = zh(n);
+		let o = Hh(n);
 		return n.forEach((e) => e.dispose()), this.chargeRetained(o), {
 			kind: "mesh",
 			geometry: o,
@@ -14137,7 +14139,7 @@ var Nh = class {
 	}
 	convertCustomShape(e) {
 		let t = this.symbols.get(e.name);
-		if (t !== void 0 && Ih(t)) {
+		if (t !== void 0 && zh(t)) {
 			let n = new An();
 			return this.inScope(n, () => {
 				this.applyPlacement(this.currentTransform().matrix, e.properties);
@@ -14149,18 +14151,27 @@ var Nh = class {
 		if (typeof t != "object" || Array.isArray(t) || !("type" in t)) return this.placeValue(t);
 		let n = t;
 		if (!n.body) throw Error(`Custom shape '${e.name}' has no body`);
-		let r = new An(), i = n.body, { position: a, orientation: o, rotation: s, size: c, name: l, ...u } = e.properties;
-		return this.inScope(r, () => {
-			this.applyPlacement(this.currentTransform().matrix, {
-				position: a,
-				orientation: o,
-				rotation: s,
-				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 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));
-		});
+		if (this.customShapeDepth >= Fh) throw Error(`Custom shape \`${e.name}\` recursed more than ${Fh} levels deep`);
+		let r = new An(), i = n.body, { position: a, orientation: o, rotation: s, size: c, name: l, ...u } = e.properties, d = this.evaluateOptionOverrides(u);
+		this.customShapeDepth++;
+		try {
+			return this.inScope(r, () => {
+				this.applyPlacement(this.currentTransform().matrix, {
+					position: a,
+					orientation: o,
+					rotation: s,
+					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 d) this.symbols.set(e, t);
+				l !== void 0 && (r.name = String(this.evaluator.evaluate(l))), this.withShapeOptions(u, () => this.addChildren(r, i));
+			});
+		} finally {
+			this.customShapeDepth--;
+		}
+	}
+	evaluateOptionOverrides(e) {
+		return Object.entries(e).filter(([e]) => !(e in Ih)).map(([e, t]) => [e, this.evaluator.evaluate(t)]);
 	}
 	applyPlacement(e, t) {
 		let n = t.position ? new J(...this.evaluateVector3(t.position)) : new J(), r = t.orientation ?? t.rotation, i = r ? this.rotationOf(r) : new Mt(), a = t.size ? new J(...this.evaluateSize(t.size)) : new J(1, 1, 1);
@@ -14317,7 +14328,7 @@ var Nh = 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] : zh(o);
+				let s = o.length === 1 ? o[0] : Hh(o);
 				return o.length > 1 && o.forEach((e) => e.dispose()), s;
 			});
 		});
@@ -14336,7 +14347,7 @@ var Nh = 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] : zh(a);
+			let a = n.map((e) => al(ol(e, r, i), i)), o = a.length === 1 ? a[0] : Hh(a);
 			return a.length > 1 && a.forEach((e) => e.dispose()), o;
 		});
 	}
@@ -14569,7 +14580,7 @@ var Nh = class {
 	textOf(e) {
 		let t = e.lines.map((e) => {
 			let t = this.evaluator.evaluate(e);
-			return Dl(Array.isArray(t) ? t : [t], (e) => Bh(e));
+			return Dl(Array.isArray(t) ? t : [t], (e) => Uh(e));
 		}).join("\n");
 		if (t.length > 2e3) throw Error(`\`text\` is limited to ${hl} characters`);
 		return t;
@@ -14631,7 +14642,7 @@ var Nh = class {
 				throw r.dispose(), e;
 			}
 			this.chargeEstimate(r.getAttribute("position").count);
-			let a = Rh(t);
+			let a = Vh(t);
 			return a && r.setAttribute("color", new X(new Float32Array(r.getAttribute("position").count * 3).map((e, t) => a[t % 3]), 3)), r;
 		});
 	}
@@ -14706,7 +14717,19 @@ var Nh = class {
 		if (!e.every(Number.isFinite)) throw Error("Expected finite color channels");
 		return e;
 	}
-}, Ph = {
+}, Ph = /* @__PURE__ */ new Set([
+	"shape",
+	"csg",
+	"extrude",
+	"loft",
+	"lathe",
+	"fill",
+	"hull",
+	"minkowski",
+	"text",
+	"mesh",
+	"path"
+]), Fh = 256, Ih = {
 	position: !0,
 	orientation: !0,
 	rotation: !0,
@@ -14721,23 +14744,26 @@ var Nh = class {
 	detail: !0,
 	smoothing: !0
 };
-function Fh(e) {
+function Lh(e) {
 	let t = [];
-	for (let n of e) Array.isArray(n) ? t.push(...Fh(n)) : Ih(n) && t.push(n);
+	for (let n of e) Array.isArray(n) ? t.push(...Lh(n)) : zh(n) && t.push(n);
 	return t;
 }
-function Ih(e) {
+function Rh(e) {
+	return zh(e) || Array.isArray(e) && e.length > 0 && e.every(zh);
+}
+function zh(e) {
 	return _c(e) && (e.kind === "mesh" || e.kind === "polygon");
 }
-function Lh(e) {
-	let t = e.geometry.clone(), n = Rh(e);
+function Bh(e) {
+	let t = e.geometry.clone(), n = Vh(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 Rh(e) {
+function Vh(e) {
 	let t = Array.isArray(e.material) ? e.material[0] : e.material, n = e.geometry.getAttribute("color");
 	if (n && n.count > 0) {
 		let e = [
@@ -14754,7 +14780,7 @@ function Rh(e) {
 		t.color.b
 	];
 }
-function zh(e) {
+function Hh(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();
@@ -14771,11 +14797,11 @@ function zh(e) {
 	if (!r) throw Error("Could not combine the shapes into one mesh");
 	return n.length > 1 && n.forEach((e) => e.dispose()), r;
 }
-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 Uh(e) {
+	return Array.isArray(e) ? e.map((e) => Array.isArray(e) ? `(${Uh(e)})` : Uh(e)).join(" ") : typeof e == "object" ? e.kind === "range" ? `${e.from} to ${e.to} step ${e.step}` : `<${e.kind}>` : String(e);
 }
-function Vh(e, t = {}) {
+function Wh(e, t = {}) {
 	return new Nh(t).convert(e);
 }
 //#endregion
-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 };
+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, Wh 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 };