ducjs 3.2.2 → 3.4.0

package/dist/restore/restoreDataState.d.ts

@@ -144,7 +144,7 @@ export declare const isValidTextAlignValue: (value: TextAlign | undefined) => Te
 export declare const isValidDecimalPlacesValue: (value: number | undefined, fallback: number) => number;
 export declare const isValidScopeValue: (value: string | undefined, localState?: Readonly<Partial<DucLocalState>> | null, mainScope?: Scope) => Scope;
 export declare const isValidImageStatusValue: (value: ImageStatus | undefined) => ImageStatus;
-export declare const isValidDucHead: (value: DucHead | null | undefined, blocks: RestoredDataState["blocks"], elementScope: Scope, currentScope: Scope) => DucHead | null;
+export declare const isValidDucHead: (value: DucHead | null | undefined, blocks: RestoredDataState["blocks"]) => DucHead | null;
 export declare const isValidLineHeadValue: (value: LineHead | null | undefined) => LineHead | null;
 export declare const isValidZoomStepValue: (value: number | undefined) => number;
 export declare const isValidImageScaleValue: (value: [number, number] | undefined) => [number, number];

package/dist/restore/restoreDataState.js

@@ -710,18 +710,20 @@ export const isValidImageStatusValue = (value) => {
         return IMAGE_STATUS.PENDING;
     return value;
 };
-export const isValidDucHead = (value, blocks, elementScope, currentScope) => {
+export const isValidDucHead = (value, blocks) => {
     if (value === undefined || value === null)
         return null;
     const type = isValidLineHeadValue(value.type);
-    // blockId can be null - only reject if type is invalid
     if (type === null)
         return null;
     const blockId = isValidBlockId(value.blockId, blocks);
+    const size = typeof value.size === "number" && Number.isFinite(value.size) && value.size > 0
+        ? value.size
+        : 1;
     return {
         type,
         blockId,
-        size: restorePrecisionValue(value.size, elementScope, currentScope),
+        size,
     };
 };
 export const isValidLineHeadValue = (value) => {
@@ -944,9 +946,20 @@ export const isValidUint8Array = (value) => {
     if (value instanceof Uint8Array) {
         return value.byteLength > 0 ? value : undefined;
     }
+    if (ArrayBuffer.isView(value)) {
+        const bytes = new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+        return bytes.byteLength > 0 ? bytes : undefined;
+    }
     if (value instanceof ArrayBuffer) {
         return value.byteLength > 0 ? new Uint8Array(value) : undefined;
     }
+    if (Array.isArray(value)) {
+        if (value.length === 0 || !value.every((entry) => typeof entry === "number")) {
+            return undefined;
+        }
+        const bytes = new Uint8Array(value);
+        return bytes.byteLength > 0 ? bytes : undefined;
+    }
     if (typeof value === "string") {
         let base64String = value;
         if (value.startsWith("data:")) {
@@ -976,6 +989,13 @@ export const isValidUint8Array = (value) => {
             return undefined;
         }
     }
+    if (value && typeof value === "object") {
+        const entries = Object.values(value);
+        if (entries.length > 0 && entries.every((entry) => typeof entry === "number")) {
+            const bytes = new Uint8Array(entries);
+            return bytes.byteLength > 0 ? bytes : undefined;
+        }
+    }
     return undefined;
 };
 /**

package/dist/restore/restoreElements.js

@@ -746,7 +746,7 @@ const repairBinding = (element, binding, currentScope, restoredBlocks) => {
             },
         }
         : { point: null };
-    return Object.assign({ elementId: binding.elementId || "", focus: typeof binding.focus === "number" ? binding.focus : 0, gap: restorePrecisionValue(typeof binding.gap === "number" ? Math.max(0, binding.gap) : 0, elementScope, currentScope), head: isValidDucHead(binding.head, restoredBlocks, elementScope, currentScope), fixedPoint: element && isElbowArrow(element)
+    return Object.assign({ elementId: binding.elementId || "", focus: typeof binding.focus === "number" ? binding.focus : 0, gap: restorePrecisionValue(typeof binding.gap === "number" ? Math.max(0, binding.gap) : 0, elementScope, currentScope), head: isValidDucHead(binding.head, restoredBlocks), fixedPoint: element && isElbowArrow(element)
             ? normalizeFixedPoint((_a = binding.fixedPoint) !== null && _a !== void 0 ? _a : { x: 0.5, y: 0.5 })
             : null }, pointData);
 };
@@ -830,7 +830,7 @@ const createHeadOnlyBinding = (head, restoredBlocks, currentScope) => {
         gap: getPrecisionValueFromRaw(0, currentScope, currentScope),
         fixedPoint: null,
         point: null,
-        head: isValidDucHead(head, restoredBlocks, currentScope, currentScope),
+        head: isValidDucHead(head, restoredBlocks),
     };
 };
 const validateDeprecatedElementContent = (color, defaultContent) => {

package/dist/serialize.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { restore } from "./restore";
+import { isValidUint8Array, restore } from "./restore";
 import { transformToRust } from "./transform";
 import { ensureWasm, wasmGetCurrentSchemaVersion, wasmSerializeDuc } from "./wasm";
 const getSchemaVersionFromEnv = () => {
@@ -111,28 +111,24 @@ function prepareVersionGraphForSerialization(vg) {
     if (!vg || typeof vg !== "object")
         return undefined;
     const checkpoints = Array.isArray(vg.checkpoints)
-        ? vg.checkpoints.filter((cp) => {
-            const data = cp === null || cp === void 0 ? void 0 : cp.data;
-            if (data instanceof Uint8Array)
-                return data.byteLength > 0;
-            if (data instanceof ArrayBuffer)
-                return data.byteLength > 0;
-            // Accept base64 strings (from JSON imports)
-            if (typeof data === "string" && data.length > 0)
-                return true;
-            return false;
+        ? vg.checkpoints.flatMap((checkpoint) => {
+            const data = isValidUint8Array(checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.data);
+            if (!(data === null || data === void 0 ? void 0 : data.byteLength)) {
+                return [];
+            }
+            return [Object.assign(Object.assign({}, checkpoint), { data })];
         })
         : [];
+    const validCheckpointIds = new Set(checkpoints
+        .map((checkpoint) => checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.id)
+        .filter((checkpointId) => typeof checkpointId === "string" && checkpointId.length > 0));
     const deltas = Array.isArray(vg.deltas)
-        ? vg.deltas.filter((d) => {
-            const payload = d === null || d === void 0 ? void 0 : d.payload;
-            if (payload instanceof Uint8Array)
-                return payload.byteLength > 0;
-            if (payload instanceof ArrayBuffer)
-                return payload.byteLength > 0;
-            if (typeof payload === "string" && payload.length > 0)
-                return true;
-            return false;
+        ? vg.deltas.flatMap((delta) => {
+            const payload = isValidUint8Array(delta === null || delta === void 0 ? void 0 : delta.payload);
+            if (!(payload === null || payload === void 0 ? void 0 : payload.byteLength) || typeof (delta === null || delta === void 0 ? void 0 : delta.baseCheckpointId) !== "string" || !validCheckpointIds.has(delta.baseCheckpointId)) {
+                return [];
+            }
+            return [Object.assign(Object.assign({}, delta), { payload })];
         })
         : [];
     return Object.assign(Object.assign({}, vg), { checkpoints,

package/dist/types/elements/index.d.ts

@@ -522,7 +522,7 @@ export type DucPointBinding = {
 export type DucHead = {
     type: LineHead;
     blockId: string | null;
-    size: PrecisionValue;
+    size: number;
 };
 export interface DucPointPosition {
     x: PrecisionValue;

package/dist/utils/elements/freedrawElement.js

@@ -35,10 +35,16 @@ function buildStrokeOptions(element) {
         last: !!element.lastCommittedPoint,
     };
 }
+const normalizeStrokePressure = (pressure) => {
+    if (!Number.isFinite(pressure) || pressure === undefined || pressure <= 0) {
+        return 0.5;
+    }
+    return Math.min(1, Math.max(0.05, pressure));
+};
 function buildInputPoints(element) {
     return element.simulatePressure
-        ? element.points.map(({ x, y }, i) => [x.scoped, y.scoped, element.pressures[i]])
-        : element.points.map(({ x, y }) => [x.scoped, y.scoped]);
+        ? element.points.map(({ x, y }) => [x.scoped, y.scoped])
+        : element.points.map(({ x, y }, i) => [x.scoped, y.scoped, normalizeStrokePressure(element.pressures[i])]);
 }
 export function getFreeDrawSvgPath(element) {
     if (element.points.length === 0) {

package/dist/utils/elements/newElement.js

@@ -140,9 +140,21 @@ export const newArrowElement = (currentScope, opts) => {
     var _a;
     return (Object.assign(Object.assign({}, _newElementBase("arrow", currentScope, opts)), { type: "arrow", points: opts.points || [], lines: opts.lines || [], pathOverrides: opts.pathOverrides || [], lastCommittedPoint: null, startBinding: null, endBinding: null, elbowed: (_a = opts.elbowed) !== null && _a !== void 0 ? _a : true }));
 };
+const withDisabledContentVisibility = (items, fallback) => {
+    const source = (items === null || items === void 0 ? void 0 : items.length) ? items : [fallback];
+    return source.map((item) => (Object.assign(Object.assign({}, item), { content: Object.assign(Object.assign({}, item.content), { visible: false }) })));
+};
+const getMediaElementStyle = (opts) => ({
+    stroke: withDisabledContentVisibility(opts.stroke, DEFAULT_ELEMENT_PROPS.stroke),
+    background: withDisabledContentVisibility(opts.background, DEFAULT_ELEMENT_PROPS.background),
+});
+const getDocumentElementStyle = (opts) => ({
+    stroke: withDisabledContentVisibility(opts.stroke, DEFAULT_ELEMENT_PROPS.stroke),
+    background: withDisabledContentVisibility(opts.background, DEFAULT_ELEMENT_PROPS.background),
+});
 export const newImageElement = (currentScope, opts) => {
     var _a, _b, _c;
-    return (Object.assign(Object.assign({}, _newElementBase("image", currentScope, opts)), { type: "image", status: (_a = opts.status) !== null && _a !== void 0 ? _a : IMAGE_STATUS.PENDING, fileId: (_b = opts.fileId) !== null && _b !== void 0 ? _b : null, scaleFlip: (_c = opts.scaleFlip) !== null && _c !== void 0 ? _c : [1, 1], crop: null, filter: null }));
+    return (Object.assign(Object.assign({}, _newElementBase("image", currentScope, Object.assign(Object.assign({}, opts), getMediaElementStyle(opts)))), { type: "image", status: (_a = opts.status) !== null && _a !== void 0 ? _a : IMAGE_STATUS.PENDING, fileId: (_b = opts.fileId) !== null && _b !== void 0 ? _b : null, scaleFlip: (_c = opts.scaleFlip) !== null && _c !== void 0 ? _c : [1, 1], crop: null, filter: null }));
 };
 export const newTableElement = (currentScope, opts) => {
     var _a;
@@ -150,7 +162,7 @@ export const newTableElement = (currentScope, opts) => {
 };
 export const newDocElement = (currentScope, opts) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    return (Object.assign(Object.assign({}, _newElementBase("doc", currentScope, opts)), { type: "doc", text: opts.text || "", fileId: (_a = opts.fileId) !== null && _a !== void 0 ? _a : null, gridConfig: {
+    return (Object.assign(Object.assign({}, _newElementBase("doc", currentScope, Object.assign(Object.assign({}, opts), getDocumentElementStyle(opts)))), { type: "doc", text: opts.text || "", fileId: (_a = opts.fileId) !== null && _a !== void 0 ? _a : null, gridConfig: {
             columns: (_c = (_b = opts.gridConfig) === null || _b === void 0 ? void 0 : _b.columns) !== null && _c !== void 0 ? _c : 1,
             gapX: (_e = (_d = opts.gridConfig) === null || _d === void 0 ? void 0 : _d.gapX) !== null && _e !== void 0 ? _e : 0,
             gapY: (_g = (_f = opts.gridConfig) === null || _f === void 0 ? void 0 : _f.gapY) !== null && _g !== void 0 ? _g : 0,
@@ -158,8 +170,14 @@ export const newDocElement = (currentScope, opts) => {
             scale: (_l = (_k = opts.gridConfig) === null || _k === void 0 ? void 0 : _k.scale) !== null && _l !== void 0 ? _l : 1,
         } }));
 };
-export const newPdfElement = (currentScope, opts) => (Object.assign(Object.assign({ fileId: null, gridConfig: { columns: 1, gapX: 0, gapY: 0, firstPageAlone: false, scale: 1 } }, _newElementBase("pdf", currentScope, opts)), { type: "pdf" }));
-export const newModelElement = (currentScope, opts) => (Object.assign(Object.assign({ modelType: null, code: null, thumbnail: null, fileIds: [], viewerState: null }, _newElementBase("model", currentScope, opts)), { type: 'model' }));
+export const newPdfElement = (currentScope, opts) => (Object.assign(Object.assign({ fileId: null, gridConfig: { columns: 1, gapX: 0, gapY: 0, firstPageAlone: false, scale: 1 } }, _newElementBase("pdf", currentScope, Object.assign(Object.assign({}, opts), getDocumentElementStyle(opts)))), { type: "pdf" }));
+export const newModelElement = (currentScope, opts) => {
+    const modelStyle = {
+        stroke: withDisabledContentVisibility(opts.stroke, DEFAULT_ELEMENT_PROPS.stroke),
+        background: withDisabledContentVisibility(opts.background, DEFAULT_ELEMENT_PROPS.background),
+    };
+    return Object.assign(Object.assign({ modelType: null, code: null, thumbnail: null, fileIds: [], viewerState: null }, _newElementBase("model", currentScope, Object.assign(Object.assign({}, opts), modelStyle))), { type: 'model' });
+};
 // Simplified deep clone for the purpose of cloning DucElement.
 //
 // Only clones plain objects and arrays. Doesn't clone Date, RegExp, Map, Set,
@@ -205,7 +223,8 @@ const _deepCopyElement = (val, depth = 0) => {
     // we're not cloning non-array & non-plain-object objects because we
     // don't support them on excalidraw elements yet. If we do, we need to make
     // sure we start cloning them, so let's warn about it.
-    if (import.meta.env.DEV) {
+    const importMetaEnv = import.meta.env;
+    if (importMetaEnv === null || importMetaEnv === void 0 ? void 0 : importMetaEnv.DEV) {
         if (objectType !== "[object Object]" &&
             objectType !== "[object Array]" &&
             objectType.startsWith("[object ")) {

package/dist/wasm.js

@@ -10,15 +10,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import init, { applyDeltaChangeset as _applyDeltaChangeset, createDeltaChangeset as _createDeltaChangeset, getCurrentSchemaVersion as _getCurrentSchemaVersion, getExternalFile as _getExternalFile, listExternalFiles as _listExternalFiles, listVersions as _listVersions, parseDuc as _parseDuc, parseDucLazy as _parseDucLazy, readVersionGraph as _readVersionGraph, restoreCheckpoint as _restoreCheckpoint, restoreVersion as _restoreVersion, revertToVersion as _revertToVersion, serializeDuc as _serializeDuc, } from "../dist/ducjs_wasm";
 let initialized = false;
 let initPromise = null;
+const DEFAULT_WASM_URL = new URL("../dist/ducjs_wasm_bg.wasm", import.meta.url);
+const isNodeRuntime = () => { var _a; return typeof process !== "undefined" && typeof ((_a = process.versions) === null || _a === void 0 ? void 0 : _a.node) === "string"; };
+const loadNodeFsPromises = () => __awaiter(void 0, void 0, void 0, function* () {
+    const dynamicImport = new Function("specifier", "return import(specifier)");
+    return dynamicImport(["node", "fs/promises"].join(":"));
+});
+const resolveDefaultWasmInput = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (!isNodeRuntime()) {
+        return DEFAULT_WASM_URL;
+    }
+    const { readFile } = yield loadNodeFsPromises();
+    const bytes = yield readFile(DEFAULT_WASM_URL);
+    return new Uint8Array(bytes);
+});
 export function ensureWasm(wasmUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         if (initialized)
             return;
         if (!initPromise) {
-            const arg = wasmUrl !== undefined ? { module_or_path: wasmUrl } : undefined;
-            initPromise = init(arg).then(() => {
+            initPromise = (() => __awaiter(this, void 0, void 0, function* () {
+                const moduleOrPath = wasmUrl !== null && wasmUrl !== void 0 ? wasmUrl : yield resolveDefaultWasmInput();
+                yield init({ module_or_path: moduleOrPath });
                 initialized = true;
-            });
+            }))();
         }
         return initPromise;
     });
@@ -31,8 +46,12 @@ export function ensureWasm(wasmUrl) {
  */
 export function getWasmBinary() {
     return __awaiter(this, void 0, void 0, function* () {
-        const url = new URL('../dist/ducjs_wasm_bg.wasm', import.meta.url);
-        const resp = yield fetch(url);
+        if (isNodeRuntime()) {
+            const { readFile } = yield loadNodeFsPromises();
+            const bytes = yield readFile(DEFAULT_WASM_URL);
+            return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
+        }
+        const resp = yield fetch(DEFAULT_WASM_URL);
         if (!resp.ok) {
             throw new Error(`Failed to fetch WASM binary: ${resp.status} ${resp.statusText}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ducjs",
-  "version": "3.2.2",
+  "version": "3.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",
@@ -8,11 +8,15 @@
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     },
     "./*": {
+      "types": [
+        "./dist/*.d.ts",
+        "./dist/*/index.d.ts"
+      ],
       "import": [
         "./dist/*.js",
         "./dist/*/index.js"
@@ -20,10 +24,6 @@
       "require": [
         "./dist/*.js",
         "./dist/*/index.js"
-      ],
-      "types": [
-        "./dist/*.d.ts",
-        "./dist/*/index.d.ts"
       ]
     }
   },