Build with better svg2pdf.js

Author: linev

build/jsroot.js

@@ -156197,84 +156197,84 @@ jsPDF.API.PDFObject = (function() {
  */
 
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    if (typeof b !== "function" && b !== null)
-        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    if (typeof b !== "function" && b !== null)
+        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+}
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types */
@@ -158586,7 +158586,7 @@ var GeometryNode = /** @class */ (function (_super) {
                 if (prev instanceof MoveTo || prev instanceof LineTo || prev instanceof CurveTo) {
                     if (curr instanceof CurveTo) {
                         hasStartMarker &&
-                            markers.addMarker(new Marker(markerStart, [prev.x, prev.y], 
+                            markers.addMarker(new Marker(markerStart, [prev.x, prev.y],
                             // @ts-ignore
                             getAngle(last_1 ? [last_1.x, last_1.y] : [prev.x, prev.y], [curr.x1, curr.y1]), true));
                         hasEndMarker &&
@@ -159304,7 +159304,7 @@ var TextNode = /** @class */ (function (_super) {
                     textChunks = [];
                     currentTextSegment = new TextChunk(this, context.attributeState.textAnchor, textX + dx, textY + dy);
                     textChunks.push({ type: '', chunk: currentTextSegment });
-                    initialSpace = this.processTSpans(this, this.element, context, textChunks, currentTextSegment, 
+                    initialSpace = this.processTSpans(this, this.element, context, textChunks, currentTextSegment,
                     // Set prevText to ' ' so any spaces on left of <text> are trimmed
                     { prevText: ' ', prevContext: context });
                     lengthAdjustment = initialSpace ? 0 : 1;
@@ -161586,7 +161586,7 @@ var Anchor = /** @class */ (function (_super) {
                             box = this.getBoundingBox(context);
                             scale = context.pdf.internal.scaleFactor;
                             ph = context.pdf.internal.pageSize.getHeight();
-                            context.pdf.link(scale * (box[0] * context.transform.sx + context.transform.tx), ph - scale * (box[1] * context.transform.sy + context.transform.ty), scale * box[2], scale * box[3], { url: href });
+                            context.pdf.link(scale * (box[0] * context.transform.sx + context.transform.tx), scale * (ph - box[1] * context.transform.sy - context.transform.ty), scale * context.transform.sx * box[2], scale * context.transform.sy * box[3], { url: href });
                         }
                         return [2 /*return*/];
                 }
@@ -175277,8 +175277,14 @@ class RBufferReader {
 
   // Move to a specific position in the buffer
   seek(position) {
+  if (typeof position === 'bigint') {
+    if (position > BigInt(Number.MAX_SAFE_INTEGER))
+      throw new Error(`Offset too large to seek safely: ${position}`);
+    this.offset = Number(position); 
+  } else 
     this.offset = position;
-  }
+}
+
 
   // Read unsigned 8-bit integer (1 BYTE)
   readU8() {
@@ -175618,23 +175624,138 @@ _readClusterGroups(reader) {
     const clusterRecordSize = reader.readS64(),
     minEntry = reader.readU64(),
     entrySpan = reader.readU64(),
-    numClusters = reader.readU32();
+    numClusters = reader.readU32(),
+    pageListLength = reader.readU64();
 
     console.log(`Cluster Record Size: ${clusterRecordSize}`);
-    console.log(`Min Entry: ${minEntry}, Entry Span: ${entrySpan}, Num Clusters: ${numClusters}`);
+    
+    // Locator method to get the page list locator offset
+    const pageListLocator = this._readLocator(reader);
+
+    console.log('Page Length', pageListLength);
+  console.log(`Page List Locator Offset (hex): 0x${pageListLocator.offset.toString(16).toUpperCase()}`);
+
+ const group = {
+  minEntry,
+  entrySpan,
+  numClusters,
+  pageListLocator,
+  pageListLength
+    }; 
+    clusterGroups.push(group);
+  }
+  this.clusterGroups = clusterGroups;
+}
 
-    clusterGroups.push({
-      minEntry,
-      entrySpan,
-      numClusters,
-    });
+_readLocator(reader) {
+  const sizeAndType = reader.readU32();           // 4 bytes: size + T bit
+  if ((sizeAndType | 0) < 0)  // | makes the sizeAndType as signed
+    throw new Error('Non-standard locators (T=1) not supported yet');
+  const size = sizeAndType,            
+  offset = reader.readU64();               // 8 bytes: offset
+  return {
+    size,
+    offset
+  };
+}
+deserializePageList(page_list_blob){
+    if (!page_list_blob)         
+      throw new Error('deserializePageList: received an invalid or empty page list blob');
+
+  const reader = new RBufferReader(page_list_blob);  
+  this._readEnvelopeMetadata(reader);
+  // Page list checksum (64-bit xxhash3)
+  const pageListHeaderChecksum = reader.readU64();
+  if (pageListHeaderChecksum !== this.headerEnvelopeChecksum)
+    throw new Error('RNTuple corrupted: header checksum does not match Page List Header checksum.');
+  
+
+  // Read cluster summaries list frame
+  const clusterSummaryListSize = reader.readS64();
+  if (clusterSummaryListSize>=0) 
+    throw new Error('Expected a list frame for cluster summaries');
+  const clusterSummaryCount = reader.readU32(),
+
+  clusterSummaries = [];
+
+  for (let i = 0; i < clusterSummaryCount; ++i) {
+  const clusterSummaryRecordSize = reader.readS64(), 
+  firstEntry = reader.readU64(),
+  combined = reader.readU64(),
+  flags = combined >> 56n;
+  if (flags & 0x01n)
+    throw new Error('Cluster summary uses unsupported sharded flag (0x01)');
+  const numEntries = Number(combined & 0x00FFFFFFFFFFFFFFn);
+  console.log(`Cluster Summary Record Size : ${clusterSummaryRecordSize}`);
+  clusterSummaries.push({
+    firstEntry,
+    numEntries,
+    flags
+  });
+}
+this.clusterSummaries = clusterSummaries;
+this._readNestedFrames(reader);
+
+const checksumPagelist = reader.readU64();
+console.log('Page List Checksum', checksumPagelist);
+}
+
+_readNestedFrames(reader) {
+  const clusterPageLocations = [],
+ numListClusters = reader.readS64();
+ if (numListClusters>=0)
+  throw new Error('Expected list frame for clusters');
+const numRecordCluster = reader.readU32();
+
+  for (let i = 0; i < numRecordCluster; ++i) {
+    const outerListSize = reader.readS64();
+    if (outerListSize >= 0)
+      throw new Error('Expected outer list frame for columns');
+
+    const numColumns = reader.readU32(),
+    columns = [];
+
+    for (let c = 0; c < numColumns; ++c) {
+      const innerListSize = reader.readS64();
+      if (innerListSize >= 0)     
+        throw new Error('Expected inner list frame for pages');
+
+      const numPages = reader.readU32();
+      console.log(`Column ${c} has ${numPages} page(s)`);
+     const pages = [];
+
+      for (let p = 0; p < numPages; ++p) {
+        const numElementsWithBit = reader.readS32(),
+        hasChecksum = numElementsWithBit < 0,
+        numElements = BigInt(Math.abs(Number(numElementsWithBit))),
+
+        locator = this._readLocator(reader);
+         console.log(`Page ${p} → elements: ${numElements}, checksum: ${hasChecksum}, locator offset: ${locator.offset}, size: ${locator.size}`);
+        pages.push({ numElements, hasChecksum, locator });
+      }
+
+      const elementOffset = reader.readS64(),
+      isSuppressed = elementOffset < 0;
+
+      let compression = null;
+      if (!isSuppressed) {
+        compression = reader.readU32();
+        console.log(`Column ${c} is NOT suppressed, offset: ${elementOffset}, compression: ${compression}`);
+      } else 
+        console.log(`Column ${c} is suppressed, offset: ${elementOffset}`);
+
+      columns.push({ pages, elementOffset, isSuppressed, compression });
+    }
+
+    clusterPageLocations.push(columns);
   }
 
-  this.clusterGroups = clusterGroups;
+  this.pageLocations = clusterPageLocations;
 }
 
 }
 
+
 /** @summary Very preliminary function to read header/footer from RNTuple
   * @private */
 async function readHeaderFooter(tuple) {
@@ -175664,8 +175785,30 @@ async function readHeaderFooter(tuple) {
 
          tuple.builder.deserializeFooter(footer_blob);
 
-         return true;
+         const group = tuple.builder.clusterGroups?.[0];
+         if (!group || !group.pageListLocator)
+            throw new Error('No valid cluster group or page list locator found');
+
+         const offset = Number(group.pageListLocator.offset),
+               size = Number(group.pageListLocator.size),
+               uncompressedSize = Number(group.pageListLength);
+
+         return tuple.$file.readBuffer([offset, size]).then(page_list_blob => {
+            if (!(page_list_blob instanceof DataView))
+               throw new Error(`Expected DataView from readBuffer, got ${Object.prototype.toString.call(page_list_blob)}`);
+
+            return R__unzip(page_list_blob, uncompressedSize).then(unzipped_blob => {
+               if (!(unzipped_blob instanceof DataView))
+                  throw new Error(`Unzipped page list is not a DataView, got ${Object.prototype.toString.call(unzipped_blob)}`);
+
+               tuple.builder.deserializePageList(unzipped_blob);
+               return true;
+            });
+         });
       });
+   }).catch(err => {
+      console.error('Error during readHeaderFooter execution:', err);
+      throw err;
    });
 }
 

changes.md

@@ -16,6 +16,7 @@
 1. Fix - ticks size and labels with kMoreLogLabels axis bit
 1. Fix - reading TLeafC leafs
 1. Fix - support BigInt in object inspector
+1. Fix - svg2pdf.js URL bounding box
 
 
 ## Changes in 7.9.1