three-slicer 0.1.2 → 0.1.3

package/engine/src/data.js

@@ -1,4 +1,4 @@
-// The single import site for the 4 extracted JSON files.
+// The single import site for the extracted JSON files.
 //
 // Why funnel them through one module: JSON requires `with { type: 'json' }` in Node 22+ ESM, but
 // Vite/esbuild strip that attribute from bundle output (neither build.target nor importAttributesKey
@@ -10,3 +10,9 @@ export { default as schema } from 'three-slicer/data/config-schema.json' with {
 export { default as uiTree } from 'three-slicer/data/ui-tree.json' with { type: 'json' }
 export { default as toggleRules } from 'three-slicer/data/toggle-rules.json' with { type: 'json' }
 export { default as invalidationMap } from 'three-slicer/data/invalidation-map.json' with { type: 'json' }
+export { default as printers } from 'three-slicer/data/printers.json' with { type: 'json' }
+// processes is the largest artifact (~800 KB) and is only needed once a printer is picked, so it stays a dynamic
+// import. It is generated as a JS module rather than JSON precisely because of the attribute problem above, in its
+// other direction: a dynamic JSON import needs the attribute in Node, and that same attribute makes browsers
+// reject the text/javascript response a dev server gives for .json.
+export const loadProcesses = () => import('three-slicer/data/processes.js').then(m => m.default)

package/engine/src/settings.js

@@ -1,7 +1,7 @@
 // Maps the actual values of the (editable) right-hand settings panel -> kernel slice parameters.
 //  - Settings state is a sparse map (key->value): only edited keys are stored, otherwise the config-schema default.
 //  - For vector types (coFloats/coInts, …) only the first element is used/edited (simplification).
-import { schema } from './data.js'
+import { schema, printers, loadProcesses } from './data.js'
 
 export function schemaDefault(key) { return schema[key]?.default }
 export function settingRaw(settings, key) { return (settings && key in settings) ? settings[key] : schemaDefault(key) }
@@ -13,6 +13,82 @@ const KERNEL_PATTERNS = ['rectilinear', 'grid', 'triangles', 'zigzag', 'gyroid',
   'honeycomb', '3dhoneycomb', 'crosshatch', 'concentric']
 const KERNEL_SEAMS = ['nearest', 'aligned', 'back', 'random']
 
+// Machine limits (the "Motion ability" printer page) -> kernel time-estimate parameters.
+//  Declarative on purpose: the kernel collapses X/Y into one axis, so the mapping cannot be a plain pass-through,
+//  but adding a limit stays a data row instead of code. The fallback is the kernel's own default, so an unedited
+//  profile produces exactly the previous estimate. Upstream leaves machine_max_*_x/y/z/e without a schema default
+//  (they only ever come from a printer preset), hence the explicit fallbacks here.
+const MACHINE_LIMITS = {
+  machine_max_speed_xy: ['machine_max_speed_x', 500],
+  machine_max_speed_z:  ['machine_max_speed_z', 12],
+  machine_max_speed_e:  ['machine_max_speed_e', 30],
+  machine_max_accel_xy: ['machine_max_acceleration_x', 5000],
+  machine_max_accel_z:  ['machine_max_acceleration_z', 500],
+  machine_max_accel_e:  ['machine_max_acceleration_e', 5000],
+  machine_jerk_xy:      ['machine_max_jerk_x', 9],
+  machine_jerk_z:       ['machine_max_jerk_z', 0.4],
+  machine_jerk_e:       ['machine_max_jerk_e', 2.5],
+  machine_accel_print:  ['default_acceleration', 5000],
+  machine_accel_travel: ['travel_acceleration', 5000],
+  machine_accel_retract: ['machine_max_acceleration_retracting', 5000],
+}
+// The schema keys the machine limits are read from — for UI that has to show "which printer characteristics are in play"
+// without hardcoding key strings of its own.
+export const machineLimitKeys = Object.values(MACHINE_LIMITS).map(([key]) => key)
+
+// ---- Printer profiles -------------------------------------------------------
+// printers.json is stored column-oriented (see its .d.ts). These two hide that layout so no consumer decodes it.
+
+/** Every option key a printer profile can set — what to clear before applying a different printer. */
+export const printerKeys = printers.keys
+
+/** Vendor -> profile name -> `[nozzle, setIndex, model]`, straight from the data (for building a picker). */
+export const printersByVendor = printers.byVendor
+
+// Process (print) presets live in the ~800 KB processes.json, so they load on demand — the first call fetches,
+//  later ones reuse the same promise. Returns a small facade so no caller has to know the column layout.
+let processesPromise = null
+export function processPresets() {
+  processesPromise ??= loadProcesses().then(data => ({
+    /** Every key a process preset can set — clear these before applying a different one */
+    keys: data.keys,
+    /** Preset names compatible with a printer profile, in upstream order */
+    listFor: (printerProfileName) =>
+      (data.byPrinter[printerProfileName] ?? []).map(i => data.presets[i][0]),
+    /** The settings a preset applies, ready to merge. `null` when unknown. */
+    settingsFor: (presetName) => {
+      const preset = data.presets.find(([name]) => name === presetName)
+      if (!preset) return null
+      const row = data.sets[preset[1]], out = {}
+      data.keys.forEach((key, i) => { if (row[i] != null) out[key] = row[i] })
+      return out
+    },
+  }))
+  return processesPromise
+}
+
+function printerEntry(profileName) {
+  for (const models of Object.values(printers.byVendor)) {
+    const entry = models[profileName]
+    if (entry) return entry
+  }
+  return null
+}
+
+/** The settings a printer profile applies, ready to merge into the settings map. `null` when unknown. */
+export function printerSettings(profileName) {
+  const entry = printerEntry(profileName)
+  if (!entry) return null
+  const row = printers.sets[entry[1]]
+  const out = {}
+  printers.keys.forEach((key, i) => { if (row[i] != null) out[key] = row[i] })
+  return out
+}
+
+/** The vendor's recommended process preset for a printer, or '' when the profile names none. */
+export function printerDefaultPreset(profileName) { return printerEntry(profileName)?.[3] ?? '' }
+
+
 // Right-panel settings values -> kernel parameters (derived from schema keys)
 export function deriveKernelParams(settings) {
   const S = k => settingScalar(settings, k)
@@ -49,8 +125,12 @@ export function deriveKernelParams(settings) {
                    'sparse_infill_line_width','internal_solid_infill_line_width','initial_layer_line_width']) {
     const v = S(k); if (v != null && v !== '') widths[k] = v
   }
+  const machine = {}
+  for (const [param, [key, fallback]] of Object.entries(MACHINE_LIMITS)) machine[param] = num(key, fallback)
+
   return {
     ...widths,
+    ...machine,
     layer_height: num('layer_height', 0.2),
     first_layer_height: num('initial_layer_print_height', 0.2),
     line_width,
@@ -80,6 +160,11 @@ export function deriveKernelParams(settings) {
     nozzle_temp: num('nozzle_temperature', 200),
     bed_temp: num('hot_plate_temp', 45),                        // no bed_temperature key -> hot_plate_temp
     bed_width, bed_depth,
+    bed_height: num('printable_height', 0),                    // 0 = profile states no ceiling -> kernel skips the check
+    // Explicitly-set only: the schema default here is upstream's generic "G28 / G1 Z5" preamble, and falling back
+    //  to it would rewrite the emitted G-code for every caller. The kernel keeps its own preamble when these are empty.
+    machine_start_gcode: String(settings?.machine_start_gcode ?? ''),
+    machine_end_gcode: String(settings?.machine_end_gcode ?? ''),
     enable_support: bool('enable_support', false),
     support_threshold_angle: num('support_threshold_angle', 30),
     support_top_z_distance: num('support_top_z_distance', 0.2),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-slicer",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Browser/WASM 3D-printing slicer reverse-engineered from OrcaSlicer: slicing engine (Arachne walls, tree/grid supports, multi-material), React viewer with GPU toolpath preview, and schema-driven settings UI.",
   "license": "AGPL-3.0-or-later",
   "type": "module",
@@ -78,6 +78,8 @@
     "data/ui-tree.json",
     "data/toggle-rules.json",
     "data/invalidation-map.json",
+    "data/printers.json",
+    "data/processes.js",
     "README.md",
     "LICENSE.txt"
   ],
@@ -86,7 +88,7 @@
     "url": "git+https://github.com/kimgh06/Web_Three_Slicer.git",
     "directory": "packages"
   },
-  "homepage": "https://github.com/kimgh06/Web_Three_Slicer#readme",
+  "homepage": "https://slicer.kimgh06.com",
   "keywords": [
     "3d-printing",
     "slicer",

package/types/data/printers.json.d.ts

@@ -0,0 +1,23 @@
+// printers.json — per-printer settings extracted from OrcaSlicer's resources/profiles/<Vendor>/machine/.
+// Column layout: `keys` names the columns once and each entry in `sets` is a positional row, because
+// repeating the key names per printer costs more than all the values together. Rows are deduplicated —
+// a printer's nozzle variants usually share one row — so a printer holds an index rather than its own copy.
+// Prefer `printerSettings()` from three-slicer/settings over decoding this by hand.
+
+/** A positional row aligned to `keys`; `null` where the profile chain never set that option. */
+export type PrinterRow = (unknown | null)[]
+
+/** `[nozzle diameter, index into sets, model name without the nozzle suffix]` */
+export type PrinterEntry = [string, number, string]
+
+export interface PrinterData {
+  /** Option keys, in column order — the same keys the settings panel edits */
+  keys: string[]
+  /** Deduplicated value rows */
+  sets: PrinterRow[]
+  /** Vendor -> printer profile name -> entry */
+  byVendor: Record<string, Record<string, PrinterEntry>>
+}
+
+declare const printers: PrinterData
+export default printers

package/types/data/processes.js.d.ts

@@ -0,0 +1,21 @@
+// processes.js — print (process) presets extracted from OrcaSlicer's resources/profiles/<Vendor>/process/.
+// Emitted as a JS module rather than JSON because it is loaded dynamically: see engine/src/data.js for why.
+// Column layout, same as printers.json — `keys` names the columns once and each row in `sets` is positional.
+// Prefer `processPresets()` from three-slicer/settings over decoding this by hand.
+
+/** A positional row aligned to `keys`; `null` where the profile chain never set that option. */
+export type ProcessRow = (unknown | null)[]
+
+export interface ProcessData {
+  /** Option keys, in column order — the keys the kernel consumes, read out of engine/src/settings.js */
+  keys: string[]
+  /** Deduplicated value rows */
+  sets: ProcessRow[]
+  /** `[preset name, index into sets]`, indexed by the numbers in `byPrinter` */
+  presets: [string, number][]
+  /** Printer profile name -> indices into `presets` */
+  byPrinter: Record<string, number[]>
+}
+
+declare const processes: ProcessData
+export default processes

package/types/data.d.ts

@@ -1,11 +1,12 @@
-// three-slicer/data — the 4 extracted JSON files. Prefer this over importing the raw JSON:
+// three-slicer/data — the extracted JSON files. Prefer this over importing the raw JSON:
 // the import attribute (`with { type: 'json' }`) is already applied, so it works in Node and bundlers alike.
 import type { ConfigOption } from './data/config-schema.json.d.ts'
 import type { UIPage } from './data/ui-tree.json.d.ts'
 import type { ToggleGroup } from './data/toggle-rules.json.d.ts'
 import type { InvalidationRule } from './data/invalidation-map.json.d.ts'
+import type { PrinterData, PrinterRow, PrinterEntry } from './data/printers.json.d.ts'
 
-export type { ConfigOption, UIPage, ToggleGroup, InvalidationRule }
+export type { ConfigOption, UIPage, ToggleGroup, InvalidationRule, PrinterData, PrinterRow, PrinterEntry }
 
 /** The 907 option definitions */
 export const schema: Record<string, ConfigOption>
@@ -15,3 +16,5 @@ export const uiTree: Record<string, UIPage[]>
 export const toggleRules: Record<string, ToggleGroup>
 /** Setting key change -> invalidated steps */
 export const invalidationMap: Record<string, InvalidationRule[]>
+/** Machine limits per printer, from the upstream vendor profiles */
+export const printers: PrinterData

package/types/settings-keys.d.ts

@@ -1,5 +1,5 @@
 // AUTO-GENERATED by types/gen_settings_types.mjs — DO NOT EDIT.
-// Source: data/config-schema.json (907 keys)
+// Source: data/config-schema.json (906 keys)
 
  /** [x, y] — coPoint family */
 export type Point = [number, number]
@@ -831,6 +831,7 @@ export interface SlicerSettings {
   machine_hotend_change_time?: number
   /** Filament load time — (s) — Time to load new filament when switch filament. It's usually applicable for single-extruder multi-material machines. For tool changers or multi-tool machines, it's typically 0. For statistics only. */
   machine_load_filament_time?: number
+  /** (mm/s²) — Maximum acceleration of the E axis */
   machine_max_acceleration_e?: number[] | number
   /** (mm/s²) — Maximum acceleration for extruding (M204 P) */
   machine_max_acceleration_extruding?: number[] | number
@@ -838,22 +839,33 @@ export interface SlicerSettings {
   machine_max_acceleration_retracting?: number[] | number
   /** (mm/s²) — Maximum acceleration for travel (M204 T), it only applies to Marlin 2. */
   machine_max_acceleration_travel?: number[] | number
+  /** (mm/s²) — Maximum acceleration of the X axis */
   machine_max_acceleration_x?: number[] | number
+  /** (mm/s²) — Maximum acceleration of the Y axis */
   machine_max_acceleration_y?: number[] | number
+  /** (mm/s²) — Maximum acceleration of the Z axis */
   machine_max_acceleration_z?: number[] | number
   /** (N) — The allowed maximum output force of Y axis */
   machine_max_force_Y?: number
+  /** (mm/s) — Maximum jerk of the E axis */
   machine_max_jerk_e?: number[] | number
+  /** (mm/s) — Maximum jerk of the X axis */
   machine_max_jerk_x?: number[] | number
+  /** (mm/s) — Maximum jerk of the Y axis */
   machine_max_jerk_y?: number[] | number
+  /** (mm/s) — Maximum jerk of the Z axis */
   machine_max_jerk_z?: number[] | number
   /** (mm) — Maximum junction deviation (M205 J, only apply if JD > 0 for Marlin Firmware If your Marlin 2 printer uses Classic Jerk set this value to 0.) */
   machine_max_junction_deviation?: number[] | number
   /** (g) — The allowed max printed mass on a plate */
   machine_max_printed_mass?: number
+  /** (mm/s) — Maximum speed of E axis */
   machine_max_speed_e?: number[] | number
+  /** (mm/s) — Maximum speed of X axis */
   machine_max_speed_x?: number[] | number
+  /** (mm/s) — Maximum speed of Y axis */
   machine_max_speed_y?: number[] | number
+  /** (mm/s) — Maximum speed of Z axis */
   machine_max_speed_z?: number[] | number
   /** (mm/s) — Minimum speed for extruding (M205 S) */
   machine_min_extruding_rate?: number[] | number
@@ -1056,8 +1068,6 @@ export interface SlicerSettings {
   physical_printer_preset?: string
   /** Send progress to pipe — Send progress to pipe. */
   pipe?: string
-  /** Capabilities — Configuration for the plugin capabilities this preset uses, overriding the global Capabilities configuration. Stored as a raw JSON array and edited through the dialog behind the button, never typed in directly. */
-  plugin_config_overrides?: string
   /** Plugins Used — Plugin capabilities referenced by this preset, stored as name;uuid;capability. */
   plugins?: string[] | string
   /** Position — Position of the extruder at the beginning of the custom G-code block. If the custom G-code travels somewhere else, it should write to this variable so OrcaSlicer knows where it travels from when it gets control back. */
@@ -1074,6 +1084,7 @@ export interface SlicerSettings {
   preheat_steps?: number
   /** Preheat time — (s) — To reduce the waiting time after tool change, Orca can preheat the next tool while the current tool is still in use. This setting specifies the time in seconds to preheat the next tool. Orca will insert a M104 command to preheat the tool in advance. */
   preheat_time?: number
+  /** Capabilities — Configuration for the plugin capabilities this preset uses, overriding the global Capabilities configuration. Stored as a raw JSON array and edited through the dialog behind the button, never typed in directly. */
   preset_name?: string
   /** Printer preset names — Names of presets related to the physical printer. */
   preset_names?: string[] | string

package/viewer/styles.css

@@ -147,6 +147,27 @@
   text-shadow: 0 1px 2px #000; pointer-events: none; }
 /* ---- Slice status display (viewport overlay) ---- */
 .slice-warn { color: #f0c060; margin: 4px 0; }
+/* Basis line under the print-time estimate — the machine limits the kernel reported using */
+.sc-sub { font-size: 10.5px; opacity: .62; margin: 1px 0 3px; }
+/* Collapsible card section holding an injected settings page (printer motion ability) */
+.sc-fold > summary { display: flex; justify-content: space-between; align-items: center; font-size: 12px;
+  color: #5a6069; padding: 2px 0; cursor: pointer; list-style: none; }
+.sc-fold > summary::-webkit-details-marker { display: none; }
+.sc-fold-lbl::before { content: '▸'; display: inline-block; width: 10px; font-size: 9px; opacity: .5; }
+.sc-fold[open] .sc-fold-lbl::before { content: '▾'; }
+.sc-fold > summary b { color: #24282e; }
+.sc-fold[open] > summary { border-bottom: 1px solid #e3e6ea; margin-bottom: 4px; }
+/* The injected page is a full settings form — keep it from stretching the card unboundedly */
+.sc-fold-body { max-height: 320px; overflow-y: auto; }
+.sc-model { max-width: 62%; font-size: 11.5px; padding: 1px 2px; }
+/* Support helpers grouped under the "Generate support" toggle */
+.support-tools { display: flex; align-items: center; justify-content: space-between; gap: 8px;
+  margin: 2px 0 2px 16px; padding-left: 6px; border-left: 2px solid #e3e6ea; }
+.sup-style { margin-left: 16px; padding-left: 6px; border-left: 2px solid #e3e6ea; }
+.sup-paint { font-size: 11px; padding: 2px 8px; border: 1px solid #c9ced6; border-radius: 5px;
+  background: #fff; color: #24282e; cursor: pointer; white-space: nowrap; }
+.sup-paint.on { background: #2b6cff; border-color: #2b6cff; color: #fff; }
+.sup-paint:disabled { opacity: .45; cursor: not-allowed; }
 .slice-btn { width: 100%; margin-top: 6px; padding: 7px; border: 0; border-radius: 7px;
   background: #00ae42; color: #fff; font-weight: 700; cursor: pointer; }
 .slice-btn:disabled { background: #3a4650; color: #8b98a2; cursor: not-allowed; }