Merge branch 'master' of https://github.com/elalish/manifold.git into development

Author: madhephaestus

.github/workflows/check_format.yml

@@ -15,7 +15,6 @@ jobs:
     - uses: DoozyX/clang-format-lint-action@v0.20
       with:
         source: '.'
-        exclude: '*/third_party'
         extensions: 'h,cpp,js,ts,html'
         clangFormatVersion: 20
     - uses: actions/setup-python@v5

.github/workflows/publish_npm.yml

@@ -13,11 +13,14 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
-        node-version: 20
+        node-version: 25
         registry-url: 'https://registry.npmjs.org'
 
+    - name: Update npm # Ensure npm 11.5.1 or later for trusted publishing
+      run: npm install -g npm@latest
+
     - name: Download built examples
       uses: dawidd6/action-download-artifact@v6
       with:

bindings/wasm/examples/editor/editor-examples.js

@@ -4,6 +4,7 @@ import godelEscherBach from '../../test/examples/godel-escher-bach.ts?raw';
 import gyroidModule from '../../test/examples/gyroid-module.ts?raw';
 import heart from '../../test/examples/heart.mjs?raw';
 import importManifold from '../../test/examples/import-manifold.ts?raw';
+import importModel from '../../test/examples/import-model.ts?raw';
 import intro from '../../test/examples/intro.mjs?raw';
 import involuteGearLibrary from '../../test/examples/involute-gear-library.ts?raw';
 import mengerSponge from '../../test/examples/menger-sponge.mjs?raw';
@@ -28,6 +29,7 @@ examples.set('Gyroid Module', gyroidModule);
 examples.set('Gear Bearing', gearBearing);
 examples.set('involute-gear-library', involuteGearLibrary);
 examples.set('Voronoi', voronoi);
+examples.set('Import Model', importModel);
 examples.set('Import Manifold', importManifold);
 examples.set('Gödel, Escher, Bach', godelEscherBach)
 

bindings/wasm/examples/editor/editor.js

@@ -17,7 +17,7 @@
 import esbuildWasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 import ManifoldWorker from 'manifold-3d/lib/worker.bundled.js?worker';
 import manifoldWasmUrl from 'manifold-3d/manifold.wasm?url';
-import {AutoTypings, LocalStorageCache} from 'monaco-editor-auto-typings';
+import {AutoTypings, JsDelivrSourceResolver, LocalStorageCache} from 'monaco-editor-auto-typings';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.main';
 // '?worker' is vite convention to load a module as a web worker.
 import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
@@ -28,8 +28,13 @@ const CODE_START = '<code>';
 const exampleFunctions = self.examples;
 
 if (navigator.serviceWorker) {
-  navigator.serviceWorker.register(
-      '/service-worker.js', {scope: './index.html'});
+  // Resolve against the current page URL so production asset paths don't
+  // redirect registration into /assets.
+  const serviceWorkerUrl = new URL('./service-worker.js', window.location.href);
+  navigator.serviceWorker.register(serviceWorkerUrl, {scope: './'})
+      .catch(error => {
+        console.error('Service worker registration failed:', error);
+      });
 }
 
 let editor = undefined;
@@ -307,6 +312,7 @@ async function createEditor() {
   editor = monaco.editor.create(document.getElementById('editor'), {
     language: 'typescript',
     automaticLayout: true,
+    minimap: {enabled: false},
   });
 
   monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
@@ -316,15 +322,20 @@ async function createEditor() {
   });
 
   // Make sure `manifold-3d/manifoldCAD` types are available for import.
+  const manifoldCADTypesUrl =
+      new URL('./manifoldCAD.d.ts', window.location.href);
+  const manifoldCADGlobalsTypesUrl =
+      new URL('./manifoldCADGlobals.d.ts', window.location.href);
+
   monaco.languages.typescript.typescriptDefaults.addExtraLib(
-      await (await fetch('/manifoldCAD.d.ts')).text(),
+      await (await fetch(manifoldCADTypesUrl)).text(),
       'inmemory://model/node_modules/manifold-3d/manifoldCAD.d.ts');
 
   // Types in the global namespace for top-level scripts.
   // This could be improved in the future.  API-Extractor intentionally doesn't
   // global variables, so another tool may be a better fit.
   monaco.languages.typescript.typescriptDefaults.addExtraLib(
-      (await (await fetch('/manifoldCADGlobals.d.ts')).text())
+      (await (await fetch(manifoldCADGlobalsTypesUrl)).text())
           .replace(/^export /gm, ''));
 
   // Load up all scripts so that monaco can check types of multi-file models.
@@ -333,16 +344,39 @@ async function createEditor() {
   }
 
   // Initialize auto typing on monaco editor.
+  const typeIndicator = document.getElementById('type-indicator');
   self.window.typecache = new LocalStorageCache();
+
+  // We inject manifold-3d typings locally above, so avoid extra CDN probes for
+  // that package path. This prevents noisy 404s in production logs.
+  const jsDelivrResolver = new JsDelivrSourceResolver();
+  const sourceResolver = {
+    resolvePackageJson: async (packageName, version, subPath) => {
+      if (packageName === 'manifold-3d') return '';
+      return jsDelivrResolver.resolvePackageJson(packageName, version, subPath);
+    },
+    resolveSourceFile: async (packageName, version, path) => {
+      if (packageName === 'manifold-3d') return '';
+      return jsDelivrResolver.resolveSourceFile(packageName, version, path);
+    }
+  };
+
   const autoTypings = await AutoTypings.create(editor, {
+    sourceResolver,
     sourceCache: self.window.typecache,
-    onError: e => {console.error(e)},
-    onUpdate: (update, text) => {console.debug(text)},
+    onError: e => {
+      console.error(e);
+      if (typeIndicator) typeIndicator.textContent = '';
+    },
+    onUpdate: (_, text) => {
+      if (typeIndicator) typeIndicator.textContent = 'Fetching types...';
+      console.debug(text);
+    },
     onUpdateVersions: (versions) => {
-      console.debug(versions)
+      if (typeIndicator) typeIndicator.textContent = '';
+      console.debug(versions);
     }
   });
-
   for (const [name] of exampleFunctions) {
     const button = createDropdownItem(name);
     fileDropdown.appendChild(button.parentElement);
@@ -609,7 +643,7 @@ runButton.onclick = function() {
   }
 };
 
-function clickSave(saveButton, filename, outputName) {
+function clickSave(saveButton, extension, outputName) {
   const container = saveButton.parentElement;
   return () => {
     const oldSave = saveContainer.firstElementChild;
@@ -619,14 +653,17 @@ function clickSave(saveButton, filename, outputName) {
       container.appendChild(saveArrow.parentElement);
     }
     const link = document.createElement('a');
-    link.download = filename;
+
+    link.download =
+        `${currentFileElement.textContent.trim() || 'manifold'}.${extension}`;
+
     link.href = output[outputName];
     link.click();
   };
 }
 
 const glbButton = document.querySelector('#glb');
-glbButton.onclick = clickSave(glbButton, 'manifold.glb', 'glbURL');
+glbButton.onclick = clickSave(glbButton, 'glb', 'glbURL');
 
 const threemfButton = document.querySelector('#threemf');
-threemfButton.onclick = clickSave(threemfButton, 'manifold.3mf', 'threeMFURL');
+threemfButton.onclick = clickSave(threemfButton, '3mf', 'threeMFURL');

bindings/wasm/examples/editor/index.html

@@ -15,7 +15,7 @@
   <meta property="og:image:width" content="850">
   <meta property="og:image:height" content="850">
   <link rel="shortcut icon" type="image/png" href="https://elalish.github.io/manifold/samples/models/favicon.png">
-  <link rel="manifest" href="/manifest.json">
+  <link rel="manifest" href="./manifest.json">
   <link type="text/css" href="editor.css" rel="stylesheet">
   <script type="application/ld+json">
     {
@@ -39,13 +39,14 @@
   <div class="page">
     <div class="container header" style="background-color: #A288B3;">
       <p style="flex: 2;"><a target="_blank" href="https://github.com/elalish/manifold">Manifold</a>CAD
-        &nbsp;&nbsp;<span class="top-edit blue">
-          <button type="button" id="undo" class="top-icon undo squish"></button>
-          <button type="button" id="redo" class="top-icon redo squish"></button>
-          <button type="button" id="format" class="top-icon star squish"></button>
-          <button type="button" id="share" class="top-icon share squish"></button>
-          <a target="_blank" href="https://manifoldcad.org/docs/jsuser/" class="top-icon docs"></a>
+       &nbsp;&nbsp;<span class="top-edit blue">
+          <button type="button" id="undo" class="top-icon undo squish" title="Undo"></button>
+          <button type="button" id="redo" class="top-icon redo squish" title="Redo"></button>
+          <button type="button" id="format" class="top-icon star squish" title="Format Code"></button>
+          <button type="button" id="share" class="top-icon share squish" title="Copy Shareable Link"></button>
+          <a target="_blank" href="https://manifoldcad.org/docs/jsuser/" class="top-icon docs" title="Documentation"></a>
         </span>
+        <span id="type-indicator" style="font-size: 14px; margin-left: 12px; font-weight: normal; opacity: 0.8;"></span>
       </p>
       <div class="margin" id="file-margin">
         <button type="button" id="file" class="blue item"><b class="uparrow"></b>&nbsp;&nbsp;<span