three-slicer-viewer 0.3.0 → 0.3.2

package/dist/gcode_parse.js

@@ -1,190 +1,234 @@
-const it = {
+import { D as Lt, a as Nt } from "./viewer_defaults-B7UUZ582.js";
+import { R as t, e as Z } from "./toolpath_encoding-BuYs95qZ.js";
+import { T as ft } from "./toolpath_palette-B8xEl-qa.js";
+const F = 1e-6, Rt = 254, It = /^(filament|extruder)_colour\s*=\s*(.*)$/i, ut = (i) => i.split(/[;,]/).map((r) => {
+  const s = /^"?#?([0-9a-f]{6})(?:[0-9a-f]{2})?"?$/i.exec(r.trim());
+  return s ? "#" + s[1].toUpperCase() : null;
+}), At = (i) => "#" + ft[i % ft.length].map((r) => Math.round(r * 255).toString(16).padStart(2, "0")).join("");
+function gt(i, r) {
+  let s = [];
+  Array.isArray(i?.colors) && (s = i.colors);
+  const g = r ?? [], u = Math.max(s.length, g.length, i?.filament_mm_by_tool?.length ?? 0);
+  return Array.from({ length: u }, (m, c) => s[c] || g[c] || At(c));
+}
+function wt(i, r) {
+  return dt(i.gcode, gt(i.stats, r));
+}
+function dt(i, r) {
+  const s = String(i ?? ""), g = [r].flat().filter(Boolean);
+  if (!g.length || /^;\s*filament_colour\s*=/mi.test(s)) return s;
+  const u = "; filament_colour = " + g.join(";") + `
+`, m = s.lastIndexOf(`
+; CONFIG_BLOCK_END`);
+  if (m >= 0) return s.slice(0, m + 1) + u + s.slice(m + 1);
+  let c = `
+`;
+  return (!s || s.endsWith(`
+`)) && (c = ""), s + c + u;
+}
+const St = {
   // OrcaSlicer / PrusaSlicer ;TYPE: names
-  "outer wall": 1,
-  "external perimeter": 1,
-  "inner wall": 1,
-  perimeter: 1,
-  "internal perimeter": 1,
-  "overhang wall": 1,
-  "overhang perimeter": 1,
-  "sparse infill": 2,
-  "internal infill": 2,
-  "solid infill": 3,
-  "internal solid infill": 3,
-  "top solid infill": 3,
-  "top surface": 3,
-  "bottom surface": 3,
-  skirt: 4,
-  brim: 4,
-  "skirt/brim": 4,
-  support: 5,
-  "support material": 5,
-  "support material interface": 5,
-  "support interface": 5,
-  "support transition": 5,
-  raft: 6,
-  "gap fill": 7,
-  "gap infill": 7,
-  "thin wall": 8,
-  bridge: 9,
-  "bridge infill": 9,
-  "internal bridge": 9,
-  "internal bridge infill": 9,
-  ironing: 10,
-  "prime tower": 11,
-  "wipe tower": 11,
-  custom: 1,
+  "outer wall": t.WALL,
+  "external perimeter": t.WALL,
+  "inner wall": t.WALL,
+  perimeter: t.WALL,
+  "internal perimeter": t.WALL,
+  "overhang wall": t.WALL,
+  "overhang perimeter": t.WALL,
+  "sparse infill": t.SPARSE,
+  "internal infill": t.SPARSE,
+  "solid infill": t.SOLID,
+  "internal solid infill": t.SOLID,
+  "top solid infill": t.SOLID,
+  "top surface": t.SOLID,
+  "bottom surface": t.SOLID,
+  skirt: t.SKIRT,
+  brim: t.SKIRT,
+  "skirt/brim": t.SKIRT,
+  support: t.SUPPORT,
+  "support material": t.SUPPORT,
+  "support material interface": t.SUPPORT,
+  "support interface": t.SUPPORT,
+  "support transition": t.SUPPORT,
+  raft: t.RAFT,
+  "gap fill": t.GAP,
+  "gap infill": t.GAP,
+  "thin wall": t.THIN,
+  bridge: t.BRIDGE,
+  "bridge infill": t.BRIDGE,
+  "internal bridge": t.BRIDGE,
+  "internal bridge infill": t.BRIDGE,
+  ironing: t.IRONING,
+  "prime tower": t.PRIME,
+  "wipe tower": t.PRIME,
+  custom: t.WALL,
   // Cura ;TYPE: names
-  "wall-outer": 1,
-  "wall-inner": 1,
-  fill: 2,
-  skin: 3,
-  "support-interface": 5,
-  "prime-tower": 11
-}, nt = [
-  ["skirt/brim", 4],
-  ["skirt", 4],
-  ["walls", 1],
-  ["thin-wall", 8],
-  ["gap-fill", 7],
-  ["bridge", 9],
-  ["ironing", 10],
-  ["support", 5],
-  ["prime tower", 11],
-  ["wipe_tower_real", 11]
-], st = (w, c) => w === c || c.length < w.length && " (:/".includes(w[c.length]) && w.startsWith(c), at = {
-  1: 1,
-  2: 1,
-  3: 1,
-  4: 2,
-  5: 3,
-  6: 3,
-  7: 3,
-  8: 10,
-  9: 9,
-  10: 9,
-  11: 7,
-  12: 4,
-  13: 4,
-  14: 5,
-  15: 5,
-  16: 5,
-  17: 11
+  "wall-outer": t.WALL,
+  "wall-inner": t.WALL,
+  fill: t.SPARSE,
+  skin: t.SOLID,
+  "support-interface": t.SUPPORT,
+  "prime-tower": t.PRIME
+}, Pt = [
+  ["skirt/brim", t.SKIRT],
+  ["skirt", t.SKIRT],
+  ["walls", t.WALL],
+  ["thin-wall", t.THIN],
+  ["gap-fill", t.GAP],
+  ["bridge", t.BRIDGE],
+  ["ironing", t.IRONING],
+  ["support", t.SUPPORT],
+  ["prime tower", t.PRIME],
+  ["wipe_tower_real", t.PRIME]
+], Et = (i, r) => i === r || r.length < i.length && " (:/".includes(i[r.length]) && i.startsWith(r), Ot = {
+  1: t.WALL,
+  2: t.WALL,
+  3: t.WALL,
+  4: t.SPARSE,
+  5: t.SOLID,
+  6: t.SOLID,
+  7: t.SOLID,
+  8: t.IRONING,
+  9: t.BRIDGE,
+  10: t.BRIDGE,
+  11: t.GAP,
+  12: t.SKIRT,
+  13: t.SKIRT,
+  14: t.SUPPORT,
+  15: t.SUPPORT,
+  16: t.SUPPORT,
+  17: t.PRIME
 };
-function rt(w, c = {}) {
-  const V = Math.PI / 4 * (c.filamentDiameter > 0 ? c.filamentDiameter : 1.75) ** 2, tt = c.defaultLayerHeight > 0 ? c.defaultLayerHeight : 0.2;
-  let f = 0, u = 0, m = 0, L = 0, x = !0, v = !0, E = 0, P = 1, S = 0, p = null;
-  const g = [];
-  let z = !1, I = !0, R = NaN, q = 0, H = 0, O = 0;
-  const j = /* @__PURE__ */ new Set([0]), W = (s) => {
-    p = { z: s, p: [], w: [] }, g.push(p), I = !1, R = NaN, P = 1, S = 0;
-  }, et = () => g.length > 1 ? g[g.length - 2].z : 0, C = (s, o, d, b, N, e, t) => {
-    const a = Math.hypot(b - s, N - o, e - d);
-    if (!(a < 1e-6))
-      if (t > 1e-6) {
-        O += t, I ? W(Number.isNaN(R) ? e : R) : !z && e > p.z + 1e-3 && W(e);
-        const r = P + E * 16;
-        p.p.push(s, o, d, r, b, N, e, r);
-        const i = Math.max(0.02, p.z - et() || tt), F = S > 0 ? S : t * V / (a * i) + i * (1 - Math.PI / 4);
-        p.w.push(Math.min(3, Math.max(0.05, F))), q++;
-      } else p && (p.p.push(s, o, d, E * 16, b, N, e, E * 16), p.w.push(0), H++);
+function Gt(i, r = {}) {
+  const s = Math.PI / 4 * (r.filamentDiameter > 0 ? r.filamentDiameter : Lt) ** 2, g = r.defaultLayerHeight > 0 ? r.defaultLayerHeight : Nt;
+  let u = 0, m = 0, c = 0, b = 0, _ = !0, W = !0, d = 0, w = t.WALL, y = 0, R = null;
+  const E = [];
+  let D = !1, x = !0, K = NaN, q = 0, X = 0, $ = 0;
+  const v = /* @__PURE__ */ new Set([0]), H = [];
+  let z = [], k = [], j = !1;
+  const V = () => {
+    w = t.WALL, y = 0;
+  }, U = (o, a = !1) => {
+    R = { z: o, p: [], w: [] }, E.push(R), x = !1, K = NaN, (a || !j) && V();
+  }, mt = () => E.length > 1 ? E[E.length - 2].z : 0, J = (o, a, S, P, A, n, e) => {
+    const p = Math.hypot(P - o, A - a, n - S);
+    if (!(p < F))
+      if (e > F) {
+        $ += e, H[d] = (H[d] ?? 0) + e, x ? U(Number.isNaN(K) ? n : K) : !D && n > R.z + 1e-3 && U(n);
+        const h = Z(w, d);
+        R.p.push(o, a, S, h, P, A, n, h);
+        const f = Math.max(0.02, R.z - mt() || g), L = y > 0 ? y : e * s / (p * f) + f * (1 - Math.PI / 4);
+        R.w.push(Math.min(3, Math.max(0.05, L))), q++;
+      } else R && (R.p.push(o, a, S, Z(t.TRAVEL, d), P, A, n, Z(t.TRAVEL, d)), R.w.push(0), X++);
   };
-  for (const s of w.split(`
+  for (const o of i.split(`
 `)) {
-    const o = s.indexOf(";"), d = (o < 0 ? s : s.slice(0, o)).trim(), b = o < 0 ? "" : s.slice(o + 1).trim();
-    if (b && !d) {
-      const t = b.toLowerCase();
-      if (t.startsWith("type:")) {
-        P = it[t.slice(5).trim()] ?? 1;
+    const a = o.indexOf(";"), S = (a < 0 ? o : o.slice(0, a)).trim(), P = a < 0 ? "" : o.slice(a + 1).trim();
+    if (P && !S) {
+      const e = P.toLowerCase(), p = It.exec(P);
+      if (p) {
+        p[1].toLowerCase() === "filament" ? z = ut(p[2]) : k = ut(p[2]);
+        continue;
+      }
+      if (e.startsWith("type:")) {
+        w = St[e.slice(5).trim()] ?? t.WALL, j = !0;
         continue;
       }
-      if (t.startsWith("_extrusion_role:")) {
-        P = at[parseInt(t.slice(16), 10)] ?? 1;
+      if (e.startsWith("_extrusion_role:")) {
+        w = Ot[parseInt(e.slice(16), 10)] ?? t.WALL, j = !0;
         continue;
       }
-      if (t.startsWith("width:")) {
-        const i = parseFloat(t.slice(6));
-        S = i > 0 ? i : 0;
+      if (e.startsWith("width:")) {
+        const L = parseFloat(e.slice(6));
+        y = L > 0 ? L : 0;
         continue;
       }
-      if (t.startsWith("layer_change") || t.startsWith("layer:")) {
-        z = !0, I = !0;
+      if (e.startsWith("layer_change") || e.startsWith("layer:")) {
+        D = !0, x = !0, V();
         continue;
       }
-      if (t.startsWith("z:")) {
-        const i = parseFloat(t.slice(2));
-        I && i > 0 && (z = !0, W(i));
+      if (e.startsWith("z:")) {
+        const L = parseFloat(e.slice(2));
+        x && L > 0 && (D = !0, U(L));
         continue;
       }
-      const a = /^layer \d+ z([-\d.]+)/.exec(t);
-      if (a) {
-        z = !0, W(parseFloat(a[1]));
+      const h = /^layer \d+ z([-\d.]+)/.exec(e);
+      if (h) {
+        D = !0, U(parseFloat(h[1]), !0);
         continue;
       }
-      const r = nt.find(([i]) => st(t, i));
-      r && (P = r[1]);
+      const f = Pt.find(([L]) => Et(e, L));
+      f && (w = f[1]);
       continue;
     }
-    if (!d) continue;
-    const N = d.split(/\s+/), e = N[0].toUpperCase();
-    if (e === "G90") {
-      x = !0;
+    if (!S) continue;
+    const A = S.split(/\s+/), n = A[0].toUpperCase();
+    if (n === "G90") {
+      _ = !0;
       continue;
     }
-    if (e === "G91") {
-      x = !1;
+    if (n === "G91") {
+      _ = !1;
       continue;
     }
-    if (e === "M82") {
-      v = !0;
+    if (n === "M82") {
+      W = !0;
       continue;
     }
-    if (e === "M83") {
-      v = !1;
+    if (n === "M83") {
+      W = !1;
       continue;
     }
-    if (/^T\d+$/.test(e)) {
-      E = parseInt(e.slice(1), 10), j.add(E);
+    if (/^T\d+$/.test(n)) {
+      const e = parseInt(n.slice(1), 10);
+      e <= Rt && (d = e, v.add(d));
       continue;
     }
-    if (e === "G92" || e === "G0" || e === "G1" || e === "G2" || e === "G3") {
-      let t = NaN, a = NaN, r = NaN, i = NaN, F = 0, D = 0;
-      for (let h = 1; h < N.length; h++) {
-        const n = N[h][0], l = parseFloat(N[h].slice(1));
-        Number.isNaN(l) || (n === "X" || n === "x" ? t = l : n === "Y" || n === "y" ? a = l : n === "Z" || n === "z" ? r = l : n === "E" || n === "e" ? i = l : n === "I" || n === "i" ? F = l : (n === "J" || n === "j") && (D = l));
+    if (n === "G92" || n === "G0" || n === "G1" || n === "G2" || n === "G3") {
+      let e = NaN, p = NaN, h = NaN, f = NaN, L = 0, tt = 0;
+      for (let I = 1; I < A.length; I++) {
+        const l = A[I][0], N = parseFloat(A[I].slice(1));
+        Number.isNaN(N) || (l === "X" || l === "x" ? e = N : l === "Y" || l === "y" ? p = N : l === "Z" || l === "z" ? h = N : l === "E" || l === "e" ? f = N : l === "I" || l === "i" ? L = N : (l === "J" || l === "j") && (tt = N));
       }
-      if (e === "G92") {
-        Number.isNaN(t) || (f = t), Number.isNaN(a) || (u = a), Number.isNaN(r) || (m = r), Number.isNaN(i) || (L = i);
+      if (n === "G92") {
+        Number.isNaN(e) || (u = e), Number.isNaN(p) || (m = p), Number.isNaN(h) || (c = h), Number.isNaN(f) || (b = f);
         continue;
       }
-      const k = Number.isNaN(t) ? f : x ? t : f + t, A = Number.isNaN(a) ? u : x ? a : u + a, Z = Number.isNaN(r) ? m : x ? r : m + r, K = Number.isNaN(i) ? 0 : v ? i - L : i;
-      if (e === "G2" || e === "G3") {
-        const h = f + F, n = u + D, l = Math.hypot(f - h, u - n), _ = Math.atan2(u - n, f - h);
-        let M = Math.atan2(A - n, k - h);
-        const T = e === "G3";
-        T && M <= _ + 1e-6 && (M += 2 * Math.PI), !T && M >= _ - 1e-6 && (M -= 2 * Math.PI);
-        const y = Math.max(1, Math.min(360, Math.ceil(Math.abs(M - _) * l / 0.3)));
-        let X = f, Y = u, J = m;
-        for (let G = 1; G <= y; G++) {
-          const U = _ + (M - _) * G / y, $ = G === y ? k : h + l * Math.cos(U), B = G === y ? A : n + l * Math.sin(U), Q = m + (Z - m) * G / y;
-          C(X, Y, J, $, B, Q, K / y), X = $, Y = B, J = Q;
+      const C = Number.isNaN(e) ? u : _ ? e : u + e, B = Number.isNaN(p) ? m : _ ? p : m + p, Y = Number.isNaN(h) ? c : _ ? h : c + h, et = Number.isNaN(f) ? 0 : W ? f - b : f;
+      if (n === "G2" || n === "G3") {
+        const I = u + L, l = m + tt, N = Math.hypot(u - I, m - l), G = Math.atan2(m - l, u - I);
+        let O = Math.atan2(B - l, C - I);
+        const nt = n === "G3";
+        nt && O <= G + F && (O += 2 * Math.PI), !nt && O >= G - F && (O -= 2 * Math.PI);
+        const M = Math.max(1, Math.min(360, Math.ceil(Math.abs(O - G) * N / 0.3)));
+        let it = u, rt = m, ot = c;
+        for (let T = 1; T <= M; T++) {
+          const st = G + (O - G) * T / M, at = T === M ? C : I + N * Math.cos(st), lt = T === M ? B : l + N * Math.sin(st), ct = c + (Y - c) * T / M;
+          J(it, rt, ot, at, lt, ct, et / M), it = at, rt = lt, ot = ct;
         }
       } else
-        C(f, u, m, k, A, Z, K);
-      f = k, u = A, m = Z, Number.isNaN(i) || (L = v ? i : L + i);
+        J(u, m, c, C, B, Y, et);
+      u = C, m = B, c = Y, Number.isNaN(f) || (b = W ? f : b + f);
     }
   }
+  const pt = Math.max(z.length, k.length), Q = Array.from({ length: pt }, (o, a) => k[a] || z[a] || null), ht = Array.from({ length: Math.max(...v) + 1 }, (o, a) => H[a] || 0);
   return {
-    layers: g.map((s) => ({ z: s.z, paths: Float32Array.from(s.p), widths: Float32Array.from(s.w) })),
+    layers: E.map((o) => ({ z: o.z, paths: Float32Array.from(o.p), widths: Float32Array.from(o.w) })),
     stats: {
-      layers: g.length,
+      layers: E.length,
       path_segments: q,
-      travel_segments: H,
-      filament_mm: O,
-      tools: [...j].sort((s, o) => s - o)
+      travel_segments: X,
+      filament_mm: $,
+      tools: [...v].sort((o, a) => o - a),
+      // The kernel's own stat name, so the Filament-view switch and the stats card's per-tool split work unchanged.
+      filament_mm_by_tool: ht,
+      ...Q.some(Boolean) && { colors: Q }
     }
   };
 }
 export {
-  rt as parseGcode
+  wt as exportedGcode,
+  Gt as parseGcode,
+  gt as resultToolColors,
+  dt as withFilamentColours
 };