three-text 0.4.3 → 0.4.5

package/README.md

@@ -195,6 +195,12 @@ self.onmessage = (e) => {
 
 The library will prioritize the buffer if both a path and a buffer have been set
 
+#### Platform-specific notes
+
+**NW.js with CommonJS:** If using `require()` to load the CJS build in NW.js, use Option 2 (buffer-based loading). NW.js's [dual-context architecture](https://docs.nwjs.io/For%20Users/Advanced/JavaScript%20Contexts%20in%20NW.js/#separate-context-mode) causes path resolution issues in this specific scenario. ESM imports and bundled code work normally
+
+**Electron with `file://` protocol:** If loading HTML directly from the filesystem (not via a dev server), use Option 2 (buffer-based loading) or enable `nodeIntegration` in your BrowserWindow
+
 ### Hyphenation patterns
 
 **For ES Modules (recommended):** Import and register only the languages you need:

package/dist/index.cjs

@@ -1,5 +1,5 @@
 /*!
- * three-text v0.4.3
+ * three-text v0.4.5
  * Copyright (C) 2025 Countertype LLC
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -557,6 +557,31 @@ class LineBreak {
                 currentIndex += token.length;
             }
             else {
+                if (lineWidth && token.includes('-') && !token.includes('\u00AD')) {
+                    const tokenWidth = measureText(token);
+                    if (tokenWidth > lineWidth) {
+                        // Break long hyphenated tokens into characters (break-all behavior)
+                        const chars = Array.from(token);
+                        for (let i = 0; i < chars.length; i++) {
+                            items.push({
+                                type: ItemType.BOX,
+                                width: measureText(chars[i]),
+                                text: chars[i],
+                                originIndex: tokenStartIndex + i
+                            });
+                            if (i < chars.length - 1) {
+                                items.push({
+                                    type: ItemType.PENALTY,
+                                    width: 0,
+                                    penalty: 5000,
+                                    originIndex: tokenStartIndex + i + 1
+                                });
+                            }
+                        }
+                        currentIndex += token.length;
+                        continue;
+                    }
+                }
                 const segments = token.split(/(-)/);
                 let segmentIndex = tokenStartIndex;
                 for (const segment of segments) {
@@ -2187,7 +2212,6 @@ async function loadPattern(language, patternsPath) {
     }
 }
 
-// Bector and bounding box types for core
 // 2D Vector
 class Vec2 {
     constructor(x = 0, y = 0) {
@@ -2569,7 +2593,8 @@ class Tessellator {
                 vertices: triangleResult.vertices,
                 indices: triangleResult.indices || []
             },
-            contours: extrusionContours
+            contours: extrusionContours,
+            contoursAreBoundary: removeOverlaps
         };
     }
     tessellateContours(contours, removeOverlaps, isCFF, needsExtrusionContours) {
@@ -2631,7 +2656,8 @@ class Tessellator {
                 vertices: triangleResult.vertices,
                 indices: triangleResult.indices || []
             },
-            contours: extrusionContours
+            contours: extrusionContours,
+            contoursAreBoundary: removeOverlaps
         };
     }
     pathsToContours(paths, reversePoints = false) {
@@ -2827,14 +2853,15 @@ class Extruder {
         const points = geometry.triangles.vertices;
         const triangleIndices = geometry.triangles.indices;
         const contours = geometry.contours;
+        const contoursAreBoundary = geometry.contoursAreBoundary === true;
         const pointLen = points.length;
         const numPoints = pointLen / 2;
-        // Prefer contours for side walls; fall back to triangle edges
+        // Use boundary contours for side walls when available
         let boundaryEdges = [];
         let sideEdgeCount = 0;
         let useContours = false;
         if (depth !== 0) {
-            if (contours.length > 0) {
+            if (contoursAreBoundary && contours.length > 0) {
                 useContours = true;
                 for (const contour of contours) {
                     const contourPointCount = contour.length >> 1;
@@ -4783,6 +4810,41 @@ class TextShaper {
     }
 }
 
+// Fetch with fs fallback for Electron file:// and Node.js environments
+async function loadBinary(filePath) {
+    try {
+        const res = await fetch(filePath);
+        if (!res.ok) {
+            throw new Error(`HTTP ${res.status}`);
+        }
+        return await res.arrayBuffer();
+    }
+    catch (fetchError) {
+        const req = globalThis.require;
+        if (typeof req !== 'function') {
+            throw new Error(`Failed to fetch ${filePath}: ${fetchError}`);
+        }
+        try {
+            const fs = req('fs');
+            const nodePath = req('path');
+            // file:// URLs need path resolution relative to the HTML document
+            let resolvedPath = filePath;
+            if (typeof window !== 'undefined' &&
+                window.location?.protocol === 'file:') {
+                const dir = nodePath.dirname(window.location.pathname);
+                resolvedPath = nodePath.join(dir, filePath);
+            }
+            const buffer = fs.readFileSync(resolvedPath);
+            if (buffer instanceof ArrayBuffer)
+                return buffer;
+            return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+        }
+        catch (fsError) {
+            throw new Error(`Failed to load ${filePath}: fetch failed (${fetchError}), fs.readFileSync failed (${fsError})`);
+        }
+    }
+}
+
 var hb = {exports: {}};
 
 var fs = {};
@@ -5373,11 +5435,9 @@ try {
 var hbjsExports = hbjs$2.exports;
 var hbjs$1 = /*@__PURE__*/getDefaultExportFromCjs(hbjsExports);
 
-// These will be bundled by Rollup
-// @ts-expect-error - no declarations for harfbuzzjs/hb.js
 let harfbuzzPromise = null;
 let wasmPath = null;
-let wasmBuffer = null; // Add buffer option
+let wasmBuffer = null;
 const HarfBuzzLoader = {
     setWasmPath(path) {
         wasmPath = path;
@@ -5400,12 +5460,7 @@ const HarfBuzzLoader = {
                     moduleConfig.wasmBinary = wasmBuffer;
                 }
                 else if (wasmPath) {
-                    moduleConfig.locateFile = (path, scriptDirectory) => {
-                        if (path.endsWith('.wasm')) {
-                            return wasmPath;
-                        }
-                        return scriptDirectory + path;
-                    };
+                    moduleConfig.wasmBinary = await loadBinary(wasmPath);
                 }
                 else {
                     throw new Error('HarfBuzz WASM path or buffer must be set before initialization.');
@@ -5702,14 +5757,7 @@ class Text {
             Text.hbInitPromise = HarfBuzzLoader.getHarfBuzz();
         }
         await Text.hbInitPromise;
-        const fontBuffer = typeof fontSrc === 'string'
-            ? await fetch(fontSrc).then((res) => {
-                if (!res.ok) {
-                    throw new Error(`Failed to load font from ${fontSrc}: HTTP ${res.status} ${res.statusText}`);
-                }
-                return res.arrayBuffer();
-            })
-            : fontSrc;
+        const fontBuffer = typeof fontSrc === 'string' ? await loadBinary(fontSrc) : fontSrc;
         try {
             if (this.loadedFont) {
                 this.destroy();

package/dist/index.d.ts

@@ -149,6 +149,7 @@ interface Triangles {
 interface ProcessedGeometry {
     triangles: Triangles;
     contours: number[][];
+    contoursAreBoundary?: boolean;
 }
 interface GlyphData {
     geometry: ProcessedGeometry;

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * three-text v0.4.3
+ * three-text v0.4.5
  * Copyright (C) 2025 Countertype LLC
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -554,6 +554,31 @@ class LineBreak {
                 currentIndex += token.length;
             }
             else {
+                if (lineWidth && token.includes('-') && !token.includes('\u00AD')) {
+                    const tokenWidth = measureText(token);
+                    if (tokenWidth > lineWidth) {
+                        // Break long hyphenated tokens into characters (break-all behavior)
+                        const chars = Array.from(token);
+                        for (let i = 0; i < chars.length; i++) {
+                            items.push({
+                                type: ItemType.BOX,
+                                width: measureText(chars[i]),
+                                text: chars[i],
+                                originIndex: tokenStartIndex + i
+                            });
+                            if (i < chars.length - 1) {
+                                items.push({
+                                    type: ItemType.PENALTY,
+                                    width: 0,
+                                    penalty: 5000,
+                                    originIndex: tokenStartIndex + i + 1
+                                });
+                            }
+                        }
+                        currentIndex += token.length;
+                        continue;
+                    }
+                }
                 const segments = token.split(/(-)/);
                 let segmentIndex = tokenStartIndex;
                 for (const segment of segments) {
@@ -2184,7 +2209,6 @@ async function loadPattern(language, patternsPath) {
     }
 }
 
-// Bector and bounding box types for core
 // 2D Vector
 class Vec2 {
     constructor(x = 0, y = 0) {
@@ -2566,7 +2590,8 @@ class Tessellator {
                 vertices: triangleResult.vertices,
                 indices: triangleResult.indices || []
             },
-            contours: extrusionContours
+            contours: extrusionContours,
+            contoursAreBoundary: removeOverlaps
         };
     }
     tessellateContours(contours, removeOverlaps, isCFF, needsExtrusionContours) {
@@ -2628,7 +2653,8 @@ class Tessellator {
                 vertices: triangleResult.vertices,
                 indices: triangleResult.indices || []
             },
-            contours: extrusionContours
+            contours: extrusionContours,
+            contoursAreBoundary: removeOverlaps
         };
     }
     pathsToContours(paths, reversePoints = false) {
@@ -2824,14 +2850,15 @@ class Extruder {
         const points = geometry.triangles.vertices;
         const triangleIndices = geometry.triangles.indices;
         const contours = geometry.contours;
+        const contoursAreBoundary = geometry.contoursAreBoundary === true;
         const pointLen = points.length;
         const numPoints = pointLen / 2;
-        // Prefer contours for side walls; fall back to triangle edges
+        // Use boundary contours for side walls when available
         let boundaryEdges = [];
         let sideEdgeCount = 0;
         let useContours = false;
         if (depth !== 0) {
-            if (contours.length > 0) {
+            if (contoursAreBoundary && contours.length > 0) {
                 useContours = true;
                 for (const contour of contours) {
                     const contourPointCount = contour.length >> 1;
@@ -4780,6 +4807,41 @@ class TextShaper {
     }
 }
 
+// Fetch with fs fallback for Electron file:// and Node.js environments
+async function loadBinary(filePath) {
+    try {
+        const res = await fetch(filePath);
+        if (!res.ok) {
+            throw new Error(`HTTP ${res.status}`);
+        }
+        return await res.arrayBuffer();
+    }
+    catch (fetchError) {
+        const req = globalThis.require;
+        if (typeof req !== 'function') {
+            throw new Error(`Failed to fetch ${filePath}: ${fetchError}`);
+        }
+        try {
+            const fs = req('fs');
+            const nodePath = req('path');
+            // file:// URLs need path resolution relative to the HTML document
+            let resolvedPath = filePath;
+            if (typeof window !== 'undefined' &&
+                window.location?.protocol === 'file:') {
+                const dir = nodePath.dirname(window.location.pathname);
+                resolvedPath = nodePath.join(dir, filePath);
+            }
+            const buffer = fs.readFileSync(resolvedPath);
+            if (buffer instanceof ArrayBuffer)
+                return buffer;
+            return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+        }
+        catch (fsError) {
+            throw new Error(`Failed to load ${filePath}: fetch failed (${fetchError}), fs.readFileSync failed (${fsError})`);
+        }
+    }
+}
+
 var hb = {exports: {}};
 
 var fs = {};
@@ -5370,11 +5432,9 @@ try {
 var hbjsExports = hbjs$2.exports;
 var hbjs$1 = /*@__PURE__*/getDefaultExportFromCjs(hbjsExports);
 
-// These will be bundled by Rollup
-// @ts-expect-error - no declarations for harfbuzzjs/hb.js
 let harfbuzzPromise = null;
 let wasmPath = null;
-let wasmBuffer = null; // Add buffer option
+let wasmBuffer = null;
 const HarfBuzzLoader = {
     setWasmPath(path) {
         wasmPath = path;
@@ -5397,12 +5457,7 @@ const HarfBuzzLoader = {
                     moduleConfig.wasmBinary = wasmBuffer;
                 }
                 else if (wasmPath) {
-                    moduleConfig.locateFile = (path, scriptDirectory) => {
-                        if (path.endsWith('.wasm')) {
-                            return wasmPath;
-                        }
-                        return scriptDirectory + path;
-                    };
+                    moduleConfig.wasmBinary = await loadBinary(wasmPath);
                 }
                 else {
                     throw new Error('HarfBuzz WASM path or buffer must be set before initialization.');
@@ -5699,14 +5754,7 @@ class Text {
             Text.hbInitPromise = HarfBuzzLoader.getHarfBuzz();
         }
         await Text.hbInitPromise;
-        const fontBuffer = typeof fontSrc === 'string'
-            ? await fetch(fontSrc).then((res) => {
-                if (!res.ok) {
-                    throw new Error(`Failed to load font from ${fontSrc}: HTTP ${res.status} ${res.statusText}`);
-                }
-                return res.arrayBuffer();
-            })
-            : fontSrc;
+        const fontBuffer = typeof fontSrc === 'string' ? await loadBinary(fontSrc) : fontSrc;
         try {
             if (this.loadedFont) {
                 this.destroy();