@chestnutlabs/gcode-dialects 0.14.0 → 0.16.0

package/dist/cura.js

@@ -17,8 +17,8 @@ const TYPE_MAP = {
     support: FeatureRole.Support,
     'support-interface': FeatureRole.Support,
     skirt: FeatureRole.Skirt,
-    raft: FeatureRole.Brim,
-    'prime-tower': FeatureRole.Custom,
+    raft: FeatureRole.Raft,
+    'prime-tower': FeatureRole.PrimeTower,
     bridge: FeatureRole.Bridge
 };
 const state = new WeakMap();

package/dist/ideamaker.d.ts

@@ -0,0 +1,3 @@
+import type { DialectAdapter } from './contracts.js';
+export declare function ideaMaker(): DialectAdapter;
+//# sourceMappingURL=ideamaker.d.ts.map

package/dist/ideamaker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ideamaker.d.ts","sourceRoot":"","sources":["../src/ideamaker.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAmCrE,wBAAgB,SAAS,IAAI,cAAc,CA6C1C"}

package/dist/ideamaker.js

@@ -0,0 +1,80 @@
+/**
+ * ideaMaker dialect adapter (DD-026 T1, RR-007 §5.6).
+ *
+ * Annotates `;TYPE:` feature roles (ideaMaker's UPPERCASE vocabulary) and object membership from the
+ * `;PRINTING: <name>` + `;PRINTING_ID: <n>` STATE channel — `PRINTING_ID: -1` (with `PRINTING:
+ * NON-OBJECT`) is housekeeping, `PRINTING_ID: <n≥0>` is model — → `object` channel + `objects:'known'`.
+ * ideaMaker emits Marlin-flavoured motion; the marlin firmware adapter composes for firmware identity.
+ */
+import { FeatureRole } from '@chestnutlabs/toolpath-core';
+import { applyMarkerRanges } from './annotate.js';
+import { PrintingObjectTracker } from './object-markers.js';
+/** ideaMaker `;TYPE:` names → DD-001 FeatureRole (unknown names → Custom, honestly generic). */
+const TYPE_MAP = {
+    'wall-outer': FeatureRole.ExternalPerimeter,
+    'wall-inner': FeatureRole.Perimeter,
+    fill: FeatureRole.Infill,
+    'solid-fill': FeatureRole.SolidInfill,
+    support: FeatureRole.Support,
+    skirt: FeatureRole.Skirt,
+    raft: FeatureRole.Raft,
+    'wipe-tower': FeatureRole.WipeTower,
+    bridge: FeatureRole.Bridge
+};
+const state = new WeakMap();
+function stateFor(sink) {
+    let s = state.get(sink);
+    if (s === undefined) {
+        s = { markers: [], objectTracker: new PrintingObjectTracker() };
+        state.set(sink, s);
+    }
+    return s;
+}
+export function ideaMaker() {
+    return {
+        id: 'ideamaker',
+        displayName: 'ideaMaker',
+        kind: 'slicer',
+        detect(input) {
+            const m = /Sliced by (ideaMaker[^\n\r]*)/.exec(input.headText);
+            if (m !== null) {
+                return { dialectId: 'ideamaker', kind: 'slicer', confidence: 'known', evidence: `header: ${m[1].trim()}` };
+            }
+            return null;
+        },
+        onComment(comment, srcByte, sink) {
+            const s = stateFor(sink);
+            const trimmed = comment.trim();
+            if (trimmed.startsWith('TYPE:')) {
+                const role = TYPE_MAP[trimmed.slice(5).trim().toLowerCase()];
+                s.markers.push({ srcByte, value: role ?? FeatureRole.Custom });
+                return;
+            }
+            // Object membership STATE channel. `;PRINTING:` names the object (or NON-OBJECT), then
+            // `;PRINTING_ID:<n>` opens object n (n≥0) or closes to housekeeping (n<0).
+            if (trimmed.startsWith('PRINTING_ID:')) {
+                const id = trimmed.slice('PRINTING_ID:'.length).trim();
+                if (/^\d+$/.test(id)) {
+                    s.objectTracker.markStart(id, s.pendingName, srcByte);
+                }
+                else {
+                    s.objectTracker.markEnd(srcByte); // `-1` (NON-OBJECT) or any non-numeric → close
+                }
+                s.pendingName = undefined;
+                return;
+            }
+            if (trimmed.startsWith('PRINTING:')) {
+                const name = trimmed.slice('PRINTING:'.length).trim();
+                s.pendingName = /^non-object$/i.test(name) ? undefined : name;
+                return;
+            }
+        },
+        finalize(ir, sink) {
+            const s = stateFor(sink);
+            const applied = applyMarkerRanges(ir, s.markers, (a, b, v) => sink.setFeature(a, b, v));
+            if (applied > 0)
+                sink.upgradeCapability('featureRoles', 'known');
+            s.objectTracker.apply(ir, sink);
+        }
+    };
+}

package/dist/index.d.ts

@@ -14,6 +14,8 @@ export { BufferedAnnotationSink } from './sink.js';
 export { prusaSlicer } from './prusaslicer.js';
 export { orcaBambu } from './orca-bambu.js';
 export { cura } from './cura.js';
+export { ideaMaker } from './ideamaker.js';
+export { simplify3d } from './simplify3d.js';
 export { klipper, marlin, repRap } from './firmware.js';
 export { grblLaser, grblMill, linuxCnc } from './cnc.js';
 export type { ValidationTier, MachineClass } from './cnc.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACzG,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzD,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,aAAa,EACb,YAAY,EACZ,kBAAkB,EACnB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACzG,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzD,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,aAAa,EACb,YAAY,EACZ,kBAAkB,EACnB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -3,6 +3,8 @@ export { BufferedAnnotationSink } from './sink.js';
 export { prusaSlicer } from './prusaslicer.js';
 export { orcaBambu } from './orca-bambu.js';
 export { cura } from './cura.js';
+export { ideaMaker } from './ideamaker.js';
+export { simplify3d } from './simplify3d.js';
 export { klipper, marlin, repRap } from './firmware.js';
 export { grblLaser, grblMill, linuxCnc } from './cnc.js';
 export { segAtOrAfterByte, applyMarkerRanges, parseKeyValue, parseAreaPoints, bedFromPoints, decodeBase64, ThumbnailCollector } from './annotate.js';

package/dist/object-markers.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Shared parsing for slicer object-membership comments (`; printing object …` / `; stop printing
+ * object …`), used by every Prusa/Orca/Bambu-lineage adapter. Grounded in the real marker formats
+ * catalogued in RR-007 §5:
+ *   - Bambu Studio: `start printing object, unique label id: 89` (name may follow as `name: …`)
+ *   - OrcaSlicer:   `printing object <name> id:729618461984033312` (no "start"; id can exceed Uint32)
+ *   - Anycubic / Prusa-lineage: `printing object "<name>" id:0 copy 0`
+ *
+ * The `object` channel is a `Uint32Array` (0 = none); raw slicer ids can exceed 2^32 and repeat per
+ * layer, so each DISTINCT id is mapped to a sequential 1-based channel value, reused across
+ * re-bracketing of the same object.
+ */
+import type { ToolpathIR } from '@chestnutlabs/toolpath-core';
+import type { AnnotationSink } from './contracts.js';
+/**
+ * Match an object-start comment (the leading `; ` is already stripped) across all lineage formats,
+ * returning the raw object id (stable per object) + optional name, or null.
+ */
+export declare function matchPrintingObjectStart(trimmed: string): {
+    id: string;
+    name?: string;
+} | null;
+/**
+ * Collects `; printing object` / `; stop printing object` markers during a parse and applies them as
+ * object-channel ranges at finalize. One instance per parse (per adapter state).
+ */
+export declare class PrintingObjectTracker {
+    private readonly markers;
+    private readonly idToValue;
+    private readonly names;
+    private counter;
+    /** Try to consume a `; printing object` / `; stop printing object` comment; true if it was one. */
+    handle(trimmed: string, srcByte: number): boolean;
+    /**
+     * Open (or reopen) an object range by its stable slicer id — for adapters whose membership uses a
+     * non-comment marker convention (e.g. ideaMaker's `;PRINTING_ID:<n>` state). The id maps to a
+     * sequential 1-based channel value, reused if seen before.
+     */
+    markStart(id: string, name: string | undefined, srcByte: number): void;
+    /** Close the current object range (back to "no object"). */
+    markEnd(srcByte: number): void;
+    /** Apply the collected object ranges + names; upgrades the `objects` capability if any resolved. */
+    apply(ir: ToolpathIR, sink: AnnotationSink): number;
+}
+//# sourceMappingURL=object-markers.d.ts.map

package/dist/object-markers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"object-markers.d.ts","sourceRoot":"","sources":["../src/object-markers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgB9F;AAED;;;GAGG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6B;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,OAAO,CAAC,OAAO,CAAK;IAEpB,mGAAmG;IACnG,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO;IAajD;;;;OAIG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAUtE,4DAA4D;IAC5D,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI9B,oGAAoG;IACpG,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM;CAQpD"}

package/dist/object-markers.js

@@ -0,0 +1,78 @@
+import { applyMarkerRanges } from './annotate.js';
+/**
+ * Match an object-start comment (the leading `; ` is already stripped) across all lineage formats,
+ * returning the raw object id (stable per object) + optional name, or null.
+ */
+export function matchPrintingObjectStart(trimmed) {
+    if (!/^(?:start\s+)?printing object\b/i.test(trimmed))
+        return null;
+    const idm = /\bid:?\s*(\d+)/i.exec(trimmed);
+    if (idm === null)
+        return null;
+    // Name: prefer an explicit `name:<…>` suffix (Bambu), else a quoted or bare name BEFORE the id
+    // (OrcaSlicer / Anycubic), rejecting `unique` / `unique label` filler.
+    let name = '';
+    const suffix = /\bname:\s*(.+?)\s*$/i.exec(trimmed);
+    if (suffix !== null) {
+        name = suffix[1].trim();
+    }
+    else {
+        const pre = /printing object[,:]?\s*(?:"([^"]*)"|(.+?))\s+(?:unique\s+(?:label\s+)?)?id:?/i.exec(trimmed);
+        name = (pre?.[1] ?? pre?.[2] ?? '').trim();
+        if (/^unique(\s+label)?$/i.test(name))
+            name = '';
+    }
+    return { id: idm[1], name: name.length > 0 ? name : undefined };
+}
+/**
+ * Collects `; printing object` / `; stop printing object` markers during a parse and applies them as
+ * object-channel ranges at finalize. One instance per parse (per adapter state).
+ */
+export class PrintingObjectTracker {
+    markers = [];
+    idToValue = new Map();
+    names = new Map();
+    counter = 0;
+    /** Try to consume a `; printing object` / `; stop printing object` comment; true if it was one. */
+    handle(trimmed, srcByte) {
+        const start = matchPrintingObjectStart(trimmed);
+        if (start !== null) {
+            this.markStart(start.id, start.name, srcByte);
+            return true;
+        }
+        if (/^stop printing object/i.test(trimmed)) {
+            this.markEnd(srcByte);
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Open (or reopen) an object range by its stable slicer id — for adapters whose membership uses a
+     * non-comment marker convention (e.g. ideaMaker's `;PRINTING_ID:<n>` state). The id maps to a
+     * sequential 1-based channel value, reused if seen before.
+     */
+    markStart(id, name, srcByte) {
+        let value = this.idToValue.get(id);
+        if (value === undefined) {
+            value = ++this.counter;
+            this.idToValue.set(id, value);
+            if (name !== undefined)
+                this.names.set(value, name);
+        }
+        this.markers.push({ srcByte, value });
+    }
+    /** Close the current object range (back to "no object"). */
+    markEnd(srcByte) {
+        this.markers.push({ srcByte, value: 0 });
+    }
+    /** Apply the collected object ranges + names; upgrades the `objects` capability if any resolved. */
+    apply(ir, sink) {
+        const applied = applyMarkerRanges(ir, this.markers, (a, b, v) => sink.setObject(a, b, v));
+        if (applied > 0) {
+            for (const [value, name] of this.names)
+                sink.defineObject(value, name);
+            sink.upgradeCapability('objects', 'known');
+        }
+        return applied;
+    }
+}

package/dist/orca-bambu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orca-bambu.d.ts","sourceRoot":"","sources":["../src/orca-bambu.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAmErE,wBAAgB,SAAS,IAAI,cAAc,CAiH1C"}
+{"version":3,"file":"orca-bambu.d.ts","sourceRoot":"","sources":["../src/orca-bambu.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAoErE,wBAAgB,SAAS,IAAI,cAAc,CA2G1C"}

package/dist/orca-bambu.js

@@ -1,8 +1,11 @@
 /**
  * OrcaSlicer / Bambu Studio dialect adapter (DD-005 phase 3, issue #75).
  *
- * Annotates: `; FEATURE:` roles (→ `featureRoles: 'known'`), Bambu object
- * start/stop comments (→ `object` channel + `objects: 'known'`), bed geometry
+ * Annotates: feature roles from `; FEATURE:` (Bambu Studio) **or** `;TYPE:`
+ * (real OrcaSlicer / AnycubicSlicerNext — same vocabulary, different prefix;
+ * RR-007 §5.8) → `featureRoles: 'known'`; object start/stop comments across all
+ * lineage formats (Bambu `start printing object, unique label id:`, Orca
+ * `printing object <name> id:<id>`) → `object` channel + `objects: 'known'`; bed geometry
  * from `printable_area` config comments (bare .gcode files — inside a
  * `.gcode.3mf` the container's machine config already provides `known`
  * geometry and outranks this), and printer identity. Detection also accepts
@@ -10,6 +13,7 @@
  */
 import { FeatureRole } from '@chestnutlabs/toolpath-core';
 import { parseFilamentTotals, parseHmsToSeconds } from './prusaslicer.js';
+import { PrintingObjectTracker } from './object-markers.js';
 import { ThumbnailCollector, applyMarkerRanges, applyWipeRanges, bedFromPoints, matchWipeComment, parseAreaPoints, parseKeyValue } from './annotate.js';
 /** Orca/Bambu `; FEATURE:` names → DD-001 FeatureRole. */
 const FEATURE_MAP = {
@@ -27,8 +31,10 @@ const FEATURE_MAP = {
     'support transition': FeatureRole.Support,
     skirt: FeatureRole.Skirt,
     brim: FeatureRole.Brim,
-    'prime tower': FeatureRole.Custom,
+    raft: FeatureRole.Raft,
+    'prime tower': FeatureRole.PrimeTower,
     'gap infill': FeatureRole.Infill,
+    'internal bridge': FeatureRole.Bridge,
     custom: FeatureRole.Custom
 };
 const state = new WeakMap();
@@ -37,9 +43,8 @@ function stateFor(sink) {
     if (s === undefined) {
         s = {
             features: [],
-            objects: [],
             wipes: [],
-            objectNames: new Map(),
+            objectTracker: new PrintingObjectTracker(),
             bedPoints: null,
             thumbs: new ThumbnailCollector()
         };
@@ -70,23 +75,21 @@ export function orcaBambu() {
         onComment(comment, srcByte, sink) {
             const s = stateFor(sink);
             const trimmed = comment.trim();
-            if (trimmed.startsWith('FEATURE:')) {
-                const role = FEATURE_MAP[trimmed.slice(8).trim().toLowerCase()];
+            // Feature roles: Bambu Studio emits `; FEATURE:<vocab>`; real OrcaSlicer / AnycubicSlicerNext
+            // emit `;TYPE:<vocab>` — the same Orca vocabulary, different prefix (RR-007 §5.8). Accept both.
+            const featureName = trimmed.startsWith('FEATURE:')
+                ? trimmed.slice(8)
+                : trimmed.startsWith('TYPE:')
+                    ? trimmed.slice(5)
+                    : null;
+            if (featureName !== null) {
+                const role = FEATURE_MAP[featureName.trim().toLowerCase()];
                 s.features.push({ srcByte, value: role ?? FeatureRole.Custom });
                 return;
             }
-            const start = /^start printing object,?\s*(?:unique\s+)?id:?\s*(\d+)(?:\s+name:\s*(.+))?/i.exec(trimmed);
-            if (start !== null) {
-                const value = parseInt(start[1]) + 1; // object channel is 1-based (0 = none)
-                s.objects.push({ srcByte, value });
-                if (start[2] !== undefined)
-                    s.objectNames.set(value, start[2].trim());
+            // Object membership across all lineage formats (shared object-marker parser).
+            if (s.objectTracker.handle(trimmed, srcByte))
                 return;
-            }
-            if (/^stop printing object/i.test(trimmed)) {
-                s.objects.push({ srcByte, value: 0 }); // range terminator
-                return;
-            }
             const wipe = matchWipeComment(comment);
             if (wipe !== null) {
                 s.wipes.push({ srcByte, open: wipe === 'start' });
@@ -137,12 +140,7 @@ export function orcaBambu() {
             const features = applyMarkerRanges(ir, s.features, (a, b, v) => sink.setFeature(a, b, v));
             if (features > 0)
                 sink.upgradeCapability('featureRoles', 'known');
-            const objects = applyMarkerRanges(ir, s.objects, (a, b, v) => sink.setObject(a, b, v));
-            if (objects > 0) {
-                for (const [value, name] of s.objectNames)
-                    sink.defineObject(value, name);
-                sink.upgradeCapability('objects', 'known');
-            }
+            s.objectTracker.apply(ir, sink);
             if (applyWipeRanges(ir, s.wipes, sink) > 0)
                 sink.upgradeCapability('wipeMoves', 'known');
             if (s.bedPoints !== null) {

package/dist/prusaslicer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prusaslicer.d.ts","sourceRoot":"","sources":["../src/prusaslicer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAgCrE,sGAAsG;AACtG,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK7D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,cAAc,GACnB,OAAO,CAkBT;AAuBD,wBAAgB,WAAW,IAAI,cAAc,CAmF5C"}
+{"version":3,"file":"prusaslicer.d.ts","sourceRoot":"","sources":["../src/prusaslicer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAkCrE,sGAAsG;AACtG,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK7D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,cAAc,GACnB,OAAO,CAkBT;AA8BD,wBAAgB,WAAW,IAAI,cAAc,CAuF5C"}

package/dist/prusaslicer.js

@@ -8,6 +8,7 @@
  */
 import { FeatureRole } from '@chestnutlabs/toolpath-core';
 import { ThumbnailCollector, applyMarkerRanges, applyWipeRanges, bedFromPoints, matchWipeComment, parseAreaPoints, parseKeyValue } from './annotate.js';
+import { PrintingObjectTracker } from './object-markers.js';
 /** Prusa `;TYPE:` names → DD-001 FeatureRole (unknown names → Custom, honestly generic). */
 const TYPE_MAP = {
     perimeter: FeatureRole.Perimeter,
@@ -23,7 +24,8 @@ const TYPE_MAP = {
     'skirt/brim': FeatureRole.Skirt,
     skirt: FeatureRole.Skirt,
     brim: FeatureRole.Brim,
-    'wipe tower': FeatureRole.Custom,
+    raft: FeatureRole.Raft,
+    'wipe tower': FeatureRole.WipeTower,
     custom: FeatureRole.Custom
 };
 /** Parse PrusaSlicer/Orca `<h>h <m>m <s>s` (any part optional) → seconds; null when zero/unparsed. */
@@ -62,7 +64,13 @@ const state = new WeakMap();
 function stateFor(sink) {
     let s = state.get(sink);
     if (s === undefined) {
-        s = { markers: [], wipes: [], bedPoints: null, thumbs: new ThumbnailCollector() };
+        s = {
+            markers: [],
+            wipes: [],
+            objectTracker: new PrintingObjectTracker(),
+            bedPoints: null,
+            thumbs: new ThumbnailCollector()
+        };
         state.set(sink, s);
     }
     return s;
@@ -90,6 +98,10 @@ export function prusaSlicer() {
                 s.markers.push({ srcByte, value: role ?? FeatureRole.Custom });
                 return;
             }
+            // Object membership (`; printing object …` / `; stop printing object …`) when Label objects is
+            // enabled — RR-007 §5.1 / DD-026 T1. The comment retains a leading space, so trim for the parser.
+            if (s.objectTracker.handle(comment.trim(), srcByte))
+                return;
             const wipe = matchWipeComment(comment);
             if (wipe !== null) {
                 s.wipes.push({ srcByte, open: wipe === 'start' });
@@ -135,6 +147,7 @@ export function prusaSlicer() {
             const applied = applyMarkerRanges(ir, s.markers, (a, b, v) => sink.setFeature(a, b, v));
             if (applied > 0)
                 sink.upgradeCapability('featureRoles', 'known');
+            s.objectTracker.apply(ir, sink);
             if (applyWipeRanges(ir, s.wipes, sink) > 0)
                 sink.upgradeCapability('wipeMoves', 'known');
             if (s.bedPoints !== null) {

package/dist/simplify3d.d.ts

@@ -0,0 +1,3 @@
+import type { DialectAdapter } from './contracts.js';
+export declare function simplify3d(): DialectAdapter;
+//# sourceMappingURL=simplify3d.d.ts.map

package/dist/simplify3d.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simplify3d.d.ts","sourceRoot":"","sources":["../src/simplify3d.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAsCrE,wBAAgB,UAAU,IAAI,cAAc,CA6B3C"}

package/dist/simplify3d.js

@@ -0,0 +1,71 @@
+/**
+ * Simplify3D dialect adapter (DD-026 T1, RR-007 §5.5).
+ *
+ * Annotates `; feature <lowercase token>` roles — Simplify3D's lowercase feature vocabulary. There is
+ * NO object-membership channel in Simplify3D output (RR-007 §5.5): the prime line is arbitrary
+ * Starting-Script geometry and the prime pillar / ooze shield are feature roles, not object brackets.
+ * So `objects` stays honestly `unavailable` and framing falls back to feature-role classification
+ * (DD-026 T2), never a fabricated membership. Simplify3D emits Marlin-flavoured motion; the marlin
+ * firmware adapter composes for firmware identity.
+ */
+import { FeatureRole } from '@chestnutlabs/toolpath-core';
+import { applyMarkerRanges } from './annotate.js';
+/** Simplify3D `; feature <token>` names → DD-001 FeatureRole (unknown names → Custom, honestly generic). */
+const FEATURE_MAP = {
+    skirt: FeatureRole.Skirt,
+    brim: FeatureRole.Brim,
+    raft: FeatureRole.Raft,
+    'outer perimeter': FeatureRole.ExternalPerimeter,
+    'inner perimeter': FeatureRole.Perimeter,
+    perimeter: FeatureRole.Perimeter,
+    infill: FeatureRole.Infill,
+    'solid layer': FeatureRole.SolidInfill,
+    'gap fill': FeatureRole.SolidInfill,
+    support: FeatureRole.Support,
+    'dense support': FeatureRole.Support,
+    bridge: FeatureRole.Bridge,
+    'prime pillar': FeatureRole.PrimeTower,
+    // Ooze shield is an unmapped housekeeping wall — kept as generic `Custom` (stays in-frame, the safe
+    // direction per DD-026 §13) rather than guessed into a tower/purge role.
+    'ooze shield': FeatureRole.Custom
+};
+const state = new WeakMap();
+function stateFor(sink) {
+    let s = state.get(sink);
+    if (s === undefined) {
+        s = { markers: [] };
+        state.set(sink, s);
+    }
+    return s;
+}
+export function simplify3d() {
+    return {
+        id: 'simplify3d',
+        displayName: 'Simplify3D',
+        kind: 'slicer',
+        detect(input) {
+            const m = /generated by (Simplify3D[^\n\r]*)/i.exec(input.headText);
+            if (m !== null) {
+                return { dialectId: 'simplify3d', kind: 'slicer', confidence: 'known', evidence: `header: ${m[1].trim()}` };
+            }
+            return null;
+        },
+        onComment(comment, srcByte, sink) {
+            const s = stateFor(sink);
+            // Space-prefixed lowercase feature comment: `; feature outer perimeter`. The leading space is
+            // already stripped by the parser before onComment, so `comment` begins `feature `.
+            const trimmed = comment.trim();
+            if (/^feature\b/i.test(trimmed)) {
+                const token = trimmed.slice('feature'.length).trim().toLowerCase();
+                const role = FEATURE_MAP[token];
+                s.markers.push({ srcByte, value: role ?? FeatureRole.Custom });
+            }
+        },
+        finalize(ir, sink) {
+            const s = stateFor(sink);
+            const applied = applyMarkerRanges(ir, s.markers, (a, b, v) => sink.setFeature(a, b, v));
+            if (applied > 0)
+                sink.upgradeCapability('featureRoles', 'known');
+        }
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chestnutlabs/gcode-dialects",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "Slicer/firmware dialect adapters for ToolpathIR annotation (DD-005). Adapters annotate metadata and optional channels — they can never alter geometry.",
   "keywords": [
     "gcode",
@@ -45,6 +45,6 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@chestnutlabs/toolpath-core": "0.14.0"
+    "@chestnutlabs/toolpath-core": "0.16.0"
   }
 }