ducjs 2.2.3 → 2.4.0

package/dist/utils/elements/newElement.d.ts

@@ -1,5 +1,5 @@
 import { Scope } from "../../types";
-import { DucArrowElement, DucDimensionElement, DucDocElement, DucElement, DucEllipseElement, DucEmbeddableElement, DucFeatureControlFrameElement, DucFrameElement, DucFreeDrawElement, DucGenericElement, DucImageElement, DucLeaderElement, DucLinearElement, DucMermaidElement, DucParametricElement, DucPdfElement, DucPlotElement, DucPolygonElement, DucTableElement, DucTextElement, DucViewportElement, DucXRayElement, ElementConstructorOpts, ElementUpdate, NonDeleted } from "../../types/elements";
+import { DucArrowElement, DucDimensionElement, DucDocElement, DucElement, DucEllipseElement, DucEmbeddableElement, DucFeatureControlFrameElement, DucFrameElement, DucFreeDrawElement, DucGenericElement, DucImageElement, DucLeaderElement, DucLinearElement, DucMermaidElement, DucModelElement, DucPdfElement, DucPlotElement, DucPolygonElement, DucTableElement, DucTextElement, DucViewportElement, DucXRayElement, ElementConstructorOpts, ElementUpdate, NonDeleted } from "../../types/elements";
 import { Mutable } from "../../types/utility-types";
 export declare const newElementWith: <TElement extends DucElement>(element: TElement, updates: ElementUpdate<TElement>, 
 /** pass `true` to always regenerate */
@@ -46,7 +46,7 @@ export declare const newXRayElement: (currentScope: Scope, opts: ElementConstruc
 export declare const newLeaderElement: (currentScope: Scope, opts: Partial<DucLeaderElement> & ElementConstructorOpts) => NonDeleted<DucLeaderElement>;
 export declare const newDimensionElement: (currentScope: Scope, opts: ElementConstructorOpts) => NonDeleted<DucDimensionElement>;
 export declare const newFeatureControlFrameElement: (currentScope: Scope, opts: ElementConstructorOpts) => NonDeleted<DucFeatureControlFrameElement>;
-export declare const newParametricElement: (currentScope: Scope, opts: ElementConstructorOpts) => NonDeleted<DucParametricElement>;
+export declare const newParametricElement: (currentScope: Scope, opts: ElementConstructorOpts) => NonDeleted<DucModelElement>;
 /**
  * Clones DucElement data structure. Does not regenerate id, nonce, or
  * any value. The purpose is to to break object references for immutability

package/dist/utils/elements/newElement.js

@@ -10,7 +10,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { getUpdatedTimestamp, getZoom } from "..";
-import { BLOCK_ATTACHMENT, COLUMN_TYPE, DATUM_BRACKET_STYLE, IMAGE_STATUS, LINE_SPACING_TYPE, PARAMETRIC_SOURCE_TYPE, STACKED_TEXT_ALIGN, TEXT_FLOW_DIRECTION, VERTICAL_ALIGN, VIEWPORT_SHADE_PLOT } from "../../flatbuffers/duc";
+import { BLOCK_ATTACHMENT, COLUMN_TYPE, DATUM_BRACKET_STYLE, IMAGE_STATUS, LINE_SPACING_TYPE, STACKED_TEXT_ALIGN, TEXT_FLOW_DIRECTION, VERTICAL_ALIGN, VIEWPORT_SHADE_PLOT } from "../../flatbuffers/duc";
 import { getPrecisionValueFromRaw } from "../../technical/scopes";
 import { DEFAULT_ELEMENT_PROPS, DEFAULT_ELLIPSE_ELEMENT, DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, DEFAULT_FREEDRAW_ELEMENT, DEFAULT_POLYGON_SIDES, DEFAULT_TEXT_ALIGN, DEFAULT_VERTICAL_ALIGN } from "../constants";
 import { randomId, randomInteger } from "../math/random";
@@ -123,13 +123,22 @@ export const newTextElement = (currentScope, opts) => {
     const textAlign = opts.textAlign || DEFAULT_TEXT_ALIGN;
     const verticalAlign = opts.verticalAlign || DEFAULT_VERTICAL_ALIGN;
     const offsets = getTextElementPositionOffsets({ textAlign, verticalAlign }, metrics);
+    // Minimum dimensions: at least 1px wide, at least one line high (NaN-safe)
+    const rawMinLineHeight = fontSize.value * lineHeight;
+    const minLineHeight = (Number.isFinite(rawMinLineHeight) && rawMinLineHeight > 0)
+        ? rawMinLineHeight
+        : DEFAULT_FONT_SIZE * lineHeight;
+    const finalWidth = (Number.isFinite(metrics.width) && metrics.width > 0) ? metrics.width : 1;
+    const finalHeight = (Number.isFinite(metrics.height) && metrics.height > 0)
+        ? Math.max(metrics.height, minLineHeight)
+        : minLineHeight;
     const x = getPrecisionValueFromRaw(opts.x.value - offsets.x, scope, currentScope);
     const y = getPrecisionValueFromRaw(opts.y.value - offsets.y, scope, currentScope);
     return Object.assign(Object.assign({}, _newElementBase("text", currentScope, Object.assign(Object.assign({}, opts), { x, y }))), { type: "text", text,
         fontSize,
         fontFamily,
         textAlign,
-        verticalAlign, width: getPrecisionValueFromRaw(metrics.width, scope, currentScope), height: getPrecisionValueFromRaw(metrics.height, scope, currentScope), containerId: opts.containerId || null, originalText: (_b = opts.originalText) !== null && _b !== void 0 ? _b : text, autoResize: (_c = opts.autoResize) !== null && _c !== void 0 ? _c : true, lineHeight, 
+        verticalAlign, width: getPrecisionValueFromRaw(finalWidth, scope, currentScope), height: getPrecisionValueFromRaw(finalHeight, scope, currentScope), containerId: opts.containerId || null, originalText: (_b = opts.originalText) !== null && _b !== void 0 ? _b : text, autoResize: (_c = opts.autoResize) !== null && _c !== void 0 ? _c : true, lineHeight, 
         // DucTextStyle properties
         isLtr: (_d = opts.isLtr) !== null && _d !== void 0 ? _d : true, bigFontFamily: opts.bigFontFamily || "sans-serif", lineSpacing: opts.lineSpacing || { type: LINE_SPACING_TYPE.MULTIPLE, value: lineHeight }, obliqueAngle: opts.obliqueAngle || 0, paperTextHeight: opts.paperTextHeight, widthFactor: opts.widthFactor || 1, isUpsideDown: (_e = opts.isUpsideDown) !== null && _e !== void 0 ? _e : false, isBackwards: (_f = opts.isBackwards) !== null && _f !== void 0 ? _f : false, dynamic: opts.dynamic || [] });
 };
@@ -153,11 +162,11 @@ export const newImageElement = (currentScope, opts) => {
 export const newTableElement = (currentScope, opts) => (Object.assign(Object.assign(Object.assign({}, _newElementBase("table", currentScope, opts)), getDefaultTableData(currentScope)), { type: "table" }));
 export const newDocElement = (currentScope, opts) => {
     var _a, _b, _c, _d;
-    return (Object.assign(Object.assign({}, _newElementBase("doc", currentScope, opts)), { type: "doc", text: opts.text || "", dynamic: opts.dynamic || [], flowDirection: opts.flowDirection || TEXT_FLOW_DIRECTION.TOP_TO_BOTTOM, columns: opts.columns || { type: COLUMN_TYPE.NO_COLUMNS, definitions: [], autoHeight: true }, autoResize: (_a = opts.autoResize) !== null && _a !== void 0 ? _a : true, 
+    return (Object.assign(Object.assign({}, _newElementBase("doc", currentScope, opts)), { type: "doc", text: opts.text || "", dynamic: opts.dynamic || [], flowDirection: opts.flowDirection || TEXT_FLOW_DIRECTION.TOP_TO_BOTTOM, columns: opts.columns || { type: COLUMN_TYPE.NO_COLUMNS, definitions: [], autoHeight: true }, autoResize: (_a = opts.autoResize) !== null && _a !== void 0 ? _a : true, fileId: null, gridConfig: { columns: 1, gapX: 0, gapY: 0, alignItems: 'start', firstPageAlone: false, scale: 1 }, 
         // DucDocStyle properties
         isLtr: (_b = opts.isLtr) !== null && _b !== void 0 ? _b : true, fontFamily: opts.fontFamily || DEFAULT_FONT_FAMILY, bigFontFamily: opts.bigFontFamily || "sans-serif", textAlign: opts.textAlign || DEFAULT_TEXT_ALIGN, verticalAlign: opts.verticalAlign || DEFAULT_VERTICAL_ALIGN, lineHeight: opts.lineHeight || 1.2, lineSpacing: opts.lineSpacing || { type: LINE_SPACING_TYPE.MULTIPLE, value: 1.2 }, obliqueAngle: opts.obliqueAngle || 0, fontSize: opts.fontSize || getPrecisionValueFromRaw(DEFAULT_FONT_SIZE, currentScope, currentScope), paperTextHeight: opts.paperTextHeight, widthFactor: opts.widthFactor || 1, isUpsideDown: (_c = opts.isUpsideDown) !== null && _c !== void 0 ? _c : false, isBackwards: (_d = opts.isBackwards) !== null && _d !== void 0 ? _d : false, paragraph: opts.paragraph || { firstLineIndent: getPrecisionValueFromRaw(0, currentScope, currentScope), hangingIndent: getPrecisionValueFromRaw(0, currentScope, currentScope), leftIndent: getPrecisionValueFromRaw(0, currentScope, currentScope), rightIndent: getPrecisionValueFromRaw(0, currentScope, currentScope), spaceBefore: getPrecisionValueFromRaw(0, currentScope, currentScope), spaceAfter: getPrecisionValueFromRaw(0, currentScope, currentScope), tabStops: [] }, stackFormat: opts.stackFormat || { autoStack: false, stackChars: [], properties: { upperScale: 0.7, lowerScale: 0.7, alignment: STACKED_TEXT_ALIGN.CENTER } } }));
 };
-export const newPdfElement = (currentScope, opts) => (Object.assign(Object.assign({ fileId: null }, _newElementBase("pdf", currentScope, opts)), { type: "pdf" }));
+export const newPdfElement = (currentScope, opts) => (Object.assign(Object.assign({ fileId: null, gridConfig: { columns: 1, gapX: 0, gapY: 0, alignItems: 'start', firstPageAlone: false, scale: 1 } }, _newElementBase("pdf", currentScope, opts)), { type: "pdf" }));
 export const newMermaidElement = (currentScope, opts) => (Object.assign(Object.assign({ source: "", theme: undefined, svgPath: null }, _newElementBase("mermaid", currentScope, opts)), { type: "mermaid" }));
 export const newXRayElement = (currentScope, opts) => (Object.assign(Object.assign({ origin: { x: getPrecisionValueFromRaw(0, currentScope, currentScope), y: getPrecisionValueFromRaw(0, currentScope, currentScope) }, direction: { x: getPrecisionValueFromRaw(1, currentScope, currentScope), y: getPrecisionValueFromRaw(0, currentScope, currentScope) }, startFromOrigin: false, color: '#FF00FF' }, _newElementBase("xray", currentScope, opts)), { type: "xray" }));
 export const newLeaderElement = (currentScope, opts) => {
@@ -179,7 +188,7 @@ export const newFeatureControlFrameElement = (currentScope, opts) => {
             bracketStyle: DATUM_BRACKET_STYLE.SQUARE
         } }, _newElementBase("featurecontrolframe", currentScope, opts)), { type: "featurecontrolframe" });
 };
-export const newParametricElement = (currentScope, opts) => (Object.assign(Object.assign({ source: { type: PARAMETRIC_SOURCE_TYPE.CODE, code: "" } }, _newElementBase("parametric", currentScope, opts)), { type: 'parametric' }));
+export const newParametricElement = (currentScope, opts) => (Object.assign(Object.assign({ source: "", svgPath: null, fileIds: [] }, _newElementBase("model", currentScope, opts)), { type: 'model' }));
 // Simplified deep clone for the purpose of cloning DucElement.
 //
 // Only clones plain objects and arrays. Doesn't clone Date, RegExp, Map, Set,

package/dist/utils/elements/textElement.d.ts

@@ -1,9 +1,9 @@
+import { SupportedMeasures } from "../../technical/scopes";
 import { DucLocalState, RawValue, Scope, ScopedValue } from "../../types";
 import { DucElement, DucElementType, DucTextContainer, DucTextElement, DucTextElementWithContainer, ElementsMap, FontFamilyValues, FontString, NonDeletedDucElement } from "../../types/elements";
 import { GeometricPoint } from "../../types/geometryTypes";
 import { ExtractSetType } from "../../types/utility-types";
 import { getBoundTextElementPosition } from "./linearElement";
-import { SupportedMeasures } from "../../technical/scopes";
 export declare const computeBoundTextPosition: (container: DucElement, boundTextElement: DucTextElementWithContainer, elementsMap: ElementsMap, currentScope: SupportedMeasures) => {
     x: ScopedValue;
     y: ScopedValue;
@@ -49,12 +49,12 @@ export declare const getMinTextElementWidth: (font: FontString, lineHeight: DucT
 /** retrieves text from text elements and concatenates to a single string */
 export declare const getTextFromElements: (elements: readonly DucElement[], separator?: string) => string;
 export declare const getFontFamilyString: ({ fontFamily, }: {
-    fontFamily: FontFamilyValues;
+    fontFamily: FontFamilyValues | string;
 }) => string;
 /** returns fontSize+fontFamily string for assignment to DOM elements */
 export declare const getFontString: ({ fontSize, fontFamily, }: {
     fontSize: DucTextElement["fontSize"];
-    fontFamily: FontFamilyValues;
+    fontFamily: FontFamilyValues | string;
 }) => FontString;
 /** computes element x/y offset based on textAlign/verticalAlign */
 export declare const getTextElementPositionOffsets: (opts: {

package/dist/utils/elements/textElement.js

@@ -1,11 +1,11 @@
 import { TEXT_ALIGN, VERTICAL_ALIGN } from "../../flatbuffers/duc";
+import { getPrecisionValueFromRaw, getScopedBezierPointFromDucPoint } from "../../technical/scopes";
 import { isArrowElement, isBoundToContainer, isTextElement } from "../../types/elements/typeChecks";
 import { getContainerElement, getElementAbsoluteCoords, getResizedElementAbsoluteCoords } from "../bounds";
-import { ARROW_LABEL_FONT_SIZE_TO_MIN_WIDTH_RATIO, ARROW_LABEL_WIDTH_FRACTION, BOUND_TEXT_PADDING, DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, FONT_FAMILY, WINDOWS_EMOJI_FALLBACK_FONT } from "../constants";
-import { getBoundTextElementPosition, getPointGlobalCoordinates, getPointsGlobalCoordinates, getSegmentMidPoint } from "./linearElement";
+import { ARROW_LABEL_FONT_SIZE_TO_MIN_WIDTH_RATIO, ARROW_LABEL_WIDTH_FRACTION, BOUND_TEXT_PADDING, DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, LEGACY_FONT_ID_TO_NAME, WINDOWS_EMOJI_FALLBACK_FONT } from "../constants";
 import { adjustXYWithRotation } from "../math";
 import { normalizeText } from "../normalize";
-import { getPrecisionValueFromRaw, getScopedBezierPointFromDucPoint } from "../../technical/scopes";
+import { getBoundTextElementPosition, getPointGlobalCoordinates, getPointsGlobalCoordinates, getSegmentMidPoint } from "./linearElement";
 export const computeBoundTextPosition = (container, boundTextElement, elementsMap, currentScope) => {
     if (isArrowElement(container)) {
         const coords = getBoundTextElementPosition(container, boundTextElement, elementsMap, currentScope);
@@ -54,10 +54,19 @@ export const measureText = (text, font, lineHeight, currentScope) => {
         // lines would be stripped from computation
         .map((x) => x || " ")
         .join("\n");
-    const fontSize = getPrecisionValueFromRaw(parseFloat(font), currentScope, currentScope);
+    const parsedFontSize = parseFloat(font);
+    // Guard: if font string produced an unparseable size (NaN) or zero,
+    // fall back to DEFAULT_FONT_SIZE so measurements are never degenerate.
+    const safeFontSize = (Number.isFinite(parsedFontSize) && parsedFontSize > 0)
+        ? parsedFontSize
+        : DEFAULT_FONT_SIZE;
+    const fontSize = getPrecisionValueFromRaw(safeFontSize, currentScope, currentScope);
     const height = getTextHeight(text, fontSize, lineHeight);
     const width = getTextWidth(text, font);
-    return { width, height };
+    // Defensive: ensure we never return 0 or NaN dimensions
+    const safeWidth = (Number.isFinite(width) && width > 0) ? width : 1;
+    const safeHeight = (Number.isFinite(height) && height > 0) ? height : (safeFontSize * lineHeight);
+    return { width: safeWidth, height: safeHeight };
 };
 /**
  * We calculate the line height from the font size and the unitless line height,
@@ -104,15 +113,15 @@ const getLineWidth = (text, font, forceAdvanceWidth, isTestEnv) => {
         // fallback to advance width if the actual width is zero, i.e. on text editing start
         // or when actual width does not respect whitespace chars, i.e. spaces
         // otherwise actual width should always be bigger
-        return Math.max(actualWidth, advanceWidth);
+        return Math.ceil(Math.max(actualWidth, advanceWidth));
     }
     // since in test env the canvas measureText algo
     // doesn't measure text and instead just returns number of
     // characters hence we assume that each letteris 10px
     if (isTestEnv) {
-        return advanceWidth * 10;
+        return Math.ceil(advanceWidth * 10);
     }
-    return advanceWidth;
+    return Math.ceil(advanceWidth);
 };
 export const getTextWidth = (text, font, forceAdvanceWidth) => {
     const lines = splitIntoLines(text);
@@ -470,14 +479,20 @@ export const getTextFromElements = (elements, separator = "\n\n") => {
     return text;
 };
 export const getFontFamilyString = ({ fontFamily, }) => {
-    // Handle both number and string fontFamily values
-    const fontFamilyNum = typeof fontFamily === 'string' ? parseInt(fontFamily, 10) : fontFamily;
-    for (const [fontFamilyString, id] of Object.entries(FONT_FAMILY)) {
-        if (id === fontFamilyNum) {
-            return `${fontFamilyString}, ${WINDOWS_EMOJI_FALLBACK_FONT}`;
-        }
-    }
-    return WINDOWS_EMOJI_FALLBACK_FONT;
+    // Handle legacy numeric font IDs from old files
+    if (typeof fontFamily === "number") {
+        const name = LEGACY_FONT_ID_TO_NAME[fontFamily];
+        if (name)
+            return `${name}, ${WINDOWS_EMOJI_FALLBACK_FONT}`;
+        return WINDOWS_EMOJI_FALLBACK_FONT;
+    }
+    // Handle stringified numeric IDs (e.g. "10")
+    const parsed = Number(fontFamily);
+    if (!Number.isNaN(parsed) && LEGACY_FONT_ID_TO_NAME[parsed]) {
+        return `${LEGACY_FONT_ID_TO_NAME[parsed]}, ${WINDOWS_EMOJI_FALLBACK_FONT}`;
+    }
+    // New path: fontFamily is already a string name
+    return `${fontFamily}, ${WINDOWS_EMOJI_FALLBACK_FONT}`;
 };
 /** returns fontSize+fontFamily string for assignment to DOM elements */
 export const getFontString = ({ fontSize, fontFamily, }) => {
@@ -504,6 +519,18 @@ export const refreshTextDimensions = (textElement, container, elementsMap, curre
             : textElement.width.scoped);
     }
     const dimensions = getAdjustedDimensions(textElement, elementsMap, text, currentScope);
+    // Defensive minimums — ensure height is always at least one line.
+    // Use negated >= to also catch NaN (NaN < x is always false).
+    const rawMinLineHeight = textElement.fontSize.value * textElement.lineHeight;
+    const minLineHeight = (Number.isFinite(rawMinLineHeight) && rawMinLineHeight > 0)
+        ? rawMinLineHeight
+        : DEFAULT_FONT_SIZE * textElement.lineHeight;
+    if (!(dimensions.height >= minLineHeight)) {
+        dimensions.height = minLineHeight;
+    }
+    if (!(dimensions.width > 0)) {
+        dimensions.width = (textElement.autoResize ? 1 : textElement.width.value);
+    }
     return Object.assign({ text }, dimensions);
 };
 export const splitIntoLines = (text) => {

package/dist/utils/state/index.js

@@ -78,7 +78,7 @@ export const getDefaultGlobalState = () => {
     return {
         name: null,
         viewBackgroundColor: typeof window !== "undefined" ? (window.matchMedia("(prefers-color-scheme: dark)").matches ? COLOR_PALETTE.night : COLOR_PALETTE.white) : COLOR_PALETTE.white,
-        scopeExponentThreshold: 2,
+        scopeExponentThreshold: 3,
         mainScope: NEUTRAL_SCOPE,
         dashSpacingScale: 1,
         isDashSpacingAffectedByViewportScale: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ducjs",
-  "version": "2.2.3",
+  "version": "2.4.0",
   "description": "The duc 2D CAD file format is a cornerstone of our advanced design system, conceived to cater to professionals seeking precision and efficiency in their design work.",
   "type": "module",
   "main": "dist/index.js",