@cornerstonejs/adapters 3.5.2 → 3.6.0

package/dist/esm/adapters/Cornerstone/Angle.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Angle: TID300Angle
 } = utilities.TID300;
@@ -19,7 +16,8 @@ class Angle {
       NUMGroup,
       SCOORDGroup
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       rAngle: NUMGroup.MeasuredValueSequence.NumericValue,
       toolType: Angle.toolType,
       handles: {
@@ -34,7 +32,7 @@ class Angle {
           hasBoundingBox: true
         }
       }
-    });
+    };
     [state.handles.start.x, state.handles.start.y, state.handles.middle.x, state.handles.middle.y, state.handles.middle.x, state.handles.middle.y, state.handles.end.x, state.handles.end.y] = SCOORDGroup.GraphicData;
     return state;
   }

package/dist/esm/adapters/Cornerstone/ArrowAnnotate.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Point: TID300Point
 } = utilities.TID300;
@@ -21,7 +18,8 @@ class ArrowAnnotate {
     const {
       GraphicData
     } = SCOORDGroup;
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       toolType: ArrowAnnotate.toolType,
       active: false,
       handles: {
@@ -50,7 +48,7 @@ class ArrowAnnotate {
       invalidated: true,
       text,
       visible: true
-    });
+    };
     return state;
   }
   static getTID300RepresentationArguments(tool) {
@@ -63,7 +61,7 @@ class ArrowAnnotate {
     } = tool;
     const TID300RepresentationArguments = {
       points,
-      trackingIdentifierTextValue: "cornerstoneTools@^4.0.0:ArrowAnnotate",
+      trackingIdentifierTextValue: `cornerstoneTools@^4.0.0:ArrowAnnotate`,
       findingSites: findingSites || []
     };
 

package/dist/esm/adapters/Cornerstone/CircleRoi.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Circle: TID300Circle
 } = utilities.TID300;
@@ -28,7 +25,8 @@ class CircleRoi {
       x: GraphicData[2],
       y: GraphicData[3]
     };
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       toolType: CircleRoi.toolType,
       active: false,
       cachedStats: {
@@ -38,15 +36,17 @@ class CircleRoi {
         perimeter: 0
       },
       handles: {
-        end: _objectSpread(_objectSpread({}, end), {}, {
+        end: {
+          ...end,
           highlight: false,
           active: false
-        }),
+        },
         initialRotation: 0,
-        start: _objectSpread(_objectSpread({}, center), {}, {
+        start: {
+          ...center,
           highlight: false,
           active: false
-        }),
+        },
         textBox: {
           hasMoved: false,
           movesIndependently: false,
@@ -57,7 +57,7 @@ class CircleRoi {
       },
       invalidated: true,
       visible: true
-    });
+    };
     return state;
   }
 

package/dist/esm/adapters/Cornerstone/CobbAngle.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   CobbAngle: TID300CobbAngle
 } = utilities.TID300;
@@ -17,7 +14,8 @@ class CobbAngle {
       NUMGroup,
       SCOORDGroup
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       rAngle: NUMGroup.MeasuredValueSequence.NumericValue,
       toolType: CobbAngle.toolType,
       handles: {
@@ -39,7 +37,7 @@ class CobbAngle {
           hasBoundingBox: true
         }
       }
-    });
+    };
     [state.handles.start.x, state.handles.start.y, state.handles.end.x, state.handles.end.y, state.handles.start2.x, state.handles.start2.y, state.handles.end2.x, state.handles.end2.y] = SCOORDGroup.GraphicData;
     return state;
   }

package/dist/esm/adapters/Cornerstone/EllipticalRoi.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Ellipse: TID300Ellipse
 } = utilities.TID300;
@@ -55,7 +52,8 @@ class EllipticalRoi {
       x: majorAxis[1].x - minorAxisDirection.x * halfMinorAxisLength,
       y: majorAxis[1].y - minorAxisDirection.y * halfMinorAxisLength
     };
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       toolType: EllipticalRoi.toolType,
       active: false,
       cachedStats: {
@@ -85,7 +83,7 @@ class EllipticalRoi {
       },
       invalidated: true,
       visible: true
-    });
+    };
     return state;
   }
   static getTID300RepresentationArguments(tool) {

package/dist/esm/adapters/Cornerstone/FreehandRoi.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Polyline: TID300Polyline
 } = utilities.TID300;
@@ -15,7 +12,8 @@ class FreehandRoi {
       SCOORDGroup,
       NUMGroup
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       toolType: FreehandRoi.toolType,
       handles: {
         points: [],
@@ -33,7 +31,7 @@ class FreehandRoi {
       },
       color: undefined,
       invalidated: true
-    });
+    };
     const {
       GraphicData
     } = SCOORDGroup;

package/dist/esm/adapters/Cornerstone/Length.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Length: TID300Length
 } = utilities.TID300;
@@ -17,7 +14,8 @@ class Length {
       NUMGroup,
       SCOORDGroup
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       length: NUMGroup.MeasuredValueSequence.NumericValue,
       toolType: Length.toolType,
       handles: {
@@ -31,7 +29,7 @@ class Length {
           hasBoundingBox: true
         }
       }
-    });
+    };
     [state.handles.start.x, state.handles.start.y, state.handles.end.x, state.handles.end.y] = SCOORDGroup.GraphicData;
     return state;
   }

package/dist/esm/adapters/Cornerstone/MeasurementReport.js

@@ -250,7 +250,7 @@ class MeasurementReport {
       const toolClass = hooks.getToolClass ? hooks.getToolClass(measurementGroup, dataset, registeredToolClasses) : registeredToolClasses.find(tc => tc.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue));
       if (toolClass) {
         const measurement = toolClass.getMeasurementData(measurementGroup);
-        console.log("=== ".concat(toolClass.toolType, " ==="));
+        console.log(`=== ${toolClass.toolType} ===`);
         console.log(measurement);
         measurementData[toolClass.toolType].push(measurement);
       }

package/dist/esm/adapters/Cornerstone/ParametricMap.js

@@ -35,7 +35,7 @@ async function generateToolState(imageIds, arrayBuffer, metadataProvider) {
       Perpendicular: "orthogonal",
       Oblique: "oblique"
     };
-    throw new Error("Parametric maps ".concat(orientationText[orientation], " to the acquisition plane of the source data are not yet supported."));
+    throw new Error(`Parametric maps ${orientationText[orientation]} to the acquisition plane of the source data are not yet supported.`);
   }
   const imageIdMaps = imageIds.reduce((acc, curr, index) => {
     acc.indices[curr] = index;
@@ -81,9 +81,8 @@ function getPixelData(multiframe) {
   let TypedArrayClass;
   let data;
   if (multiframe.PixelData) {
-    var _multiframe$PixelRepr;
     const validTypedArrays = multiframe.BitsAllocated === 16 ? [Uint16Array, Int16Array] : [Uint32Array, Int32Array];
-    TypedArrayClass = validTypedArrays[(_multiframe$PixelRepr = multiframe.PixelRepresentation) !== null && _multiframe$PixelRepr !== void 0 ? _multiframe$PixelRepr : 0];
+    TypedArrayClass = validTypedArrays[multiframe.PixelRepresentation ?? 0];
     data = multiframe.PixelData;
   } else if (multiframe.FloatPixelData) {
     TypedArrayClass = Float32Array;

package/dist/esm/adapters/Cornerstone/RectangleRoi.js

@@ -1,10 +1,7 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import CORNERSTONE_4_TAG from './cornerstone4Tag.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Polyline: TID300Polyline
 } = utilities.TID300;
@@ -15,7 +12,8 @@ class RectangleRoi {
       SCOORDGroup,
       NUMGroup
     } = MeasurementReport.getSetupMeasurementData(MeasurementGroup);
-    const state = _objectSpread(_objectSpread({}, defaultState), {}, {
+    const state = {
+      ...defaultState,
       toolType: RectangleRoi.toolType,
       handles: {
         start: {},
@@ -35,7 +33,7 @@ class RectangleRoi {
       },
       color: undefined,
       invalidated: true
-    });
+    };
     const intermediate = {};
     [state.handles.start.x, state.handles.start.y, intermediate.x, intermediate.y, state.handles.end.x, state.handles.end.y] = SCOORDGroup.GraphicData;
     return state;

package/dist/esm/adapters/Cornerstone/Segmentation.js

@@ -21,7 +21,7 @@ function generateSegmentation(images, labelmaps3DorBrushData) {
   if (cornerstoneToolsVersion === 3) {
     return Segmentation$1.generateSegmentation(images, labelmaps3DorBrushData, options);
   }
-  console.warn("No generateSegmentation adapter for cornerstone version ".concat(cornerstoneToolsVersion, ", exiting."));
+  console.warn(`No generateSegmentation adapter for cornerstone version ${cornerstoneToolsVersion}, exiting.`);
 }
 
 /**
@@ -48,7 +48,7 @@ function generateToolState(imageIds, arrayBuffer, metadataProvider) {
   if (cornerstoneToolsVersion === 3) {
     return Segmentation$1.generateToolState(imageIds, arrayBuffer, metadataProvider);
   }
-  console.warn("No generateToolState adapter for cornerstone version ".concat(cornerstoneToolsVersion, ", exiting."));
+  console.warn(`No generateToolState adapter for cornerstone version ${cornerstoneToolsVersion}, exiting.`);
 }
 
 /**
@@ -67,7 +67,7 @@ function fillSegmentation(segmentation, inputLabelmaps3D) {
   if (cornerstoneToolsVersion === 4) {
     return Segmentation.fillSegmentation(segmentation, inputLabelmaps3D, options);
   }
-  console.warn("No generateSegmentation adapter for cornerstone version ".concat(cornerstoneToolsVersion, ", exiting."));
+  console.warn(`No generateSegmentation adapter for cornerstone version ${cornerstoneToolsVersion}, exiting.`);
 }
 
 export { fillSegmentation, generateSegmentation, generateToolState };

package/dist/esm/adapters/Cornerstone3D/Angle.js

@@ -33,7 +33,7 @@ class Angle extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
         }
       },
@@ -76,7 +76,7 @@ class Angle extends BaseAdapter3D {
     };
     const {
       angle
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    } = cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       point1,
       point2,

package/dist/esm/adapters/Cornerstone3D/BaseAdapter3D.js

@@ -5,23 +5,23 @@ class BaseAdapter3D {
   static init(toolType, representation, options) {
     this.toolType = toolType;
     if (BaseAdapter3D.toolType) {
-      throw new Error("Base adapter tool type set to ".concat(this.toolType, " while setting ").concat(toolType));
+      throw new Error(`Base adapter tool type set to ${this.toolType} while setting ${toolType}`);
     }
-    this.parentType = options === null || options === void 0 ? void 0 : options.parentType;
+    this.parentType = options?.parentType;
     this.trackingIdentifiers = new Set();
     this.TID300Representation = representation;
     if (this.parentType) {
-      this.trackingIdentifierTextValue = "".concat(CORNERSTONE_3D_TAG, ":").concat(this.parentType, ":").concat(this.toolType);
-      const alternateTrackingIdentifier = "".concat(CORNERSTONE_3D_TAG, ":").concat(this.toolType);
+      this.trackingIdentifierTextValue = `${CORNERSTONE_3D_TAG}:${this.parentType}:${this.toolType}`;
+      const alternateTrackingIdentifier = `${CORNERSTONE_3D_TAG}:${this.toolType}`;
       this.trackingIdentifiers.add(alternateTrackingIdentifier);
     } else {
-      this.trackingIdentifierTextValue = "".concat(CORNERSTONE_3D_TAG, ":").concat(toolType);
+      this.trackingIdentifierTextValue = `${CORNERSTONE_3D_TAG}:${toolType}`;
     }
     this.trackingIdentifiers.add(this.trackingIdentifierTextValue);
     MeasurementReport.registerTool(this);
   }
   static registerLegacy() {
-    this.trackingIdentifiers.add("cornerstoneTools@^4.0.0:".concat(this.toolType));
+    this.trackingIdentifiers.add(`cornerstoneTools@^4.0.0:${this.toolType}`);
   }
   static registerSubType(adapter, toolType, replace) {
     const subAdapter = Object.create(adapter);
@@ -48,7 +48,7 @@ class BaseAdapter3D {
     state.annotation.data = {
       cachedStats: {},
       frameNumber: ReferencedFrameNumber,
-      seriesLevel: (trackingIdentifier === null || trackingIdentifier === void 0 ? void 0 : trackingIdentifier.indexOf(":Series")) > 0
+      seriesLevel: trackingIdentifier?.indexOf(":Series") > 0
     };
     return state;
   }

package/dist/esm/adapters/Cornerstone3D/Bidirectional.js

@@ -44,7 +44,7 @@ class Bidirectional extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           length: longAxisNUMGroup.MeasuredValueSequence.NumericValue,
           width: shortAxisNUMGroup.MeasuredValueSequence.NumericValue
         }
@@ -73,7 +73,7 @@ class Bidirectional extends BaseAdapter3D {
     const {
       length,
       width
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    } = cachedStats[`imageId:${referencedImageId}`] || {};
     const {
       points
     } = handles;

package/dist/esm/adapters/Cornerstone3D/CircleROI.js

@@ -33,7 +33,7 @@ class CircleROI extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0,
           radius: 0,
           perimeter: 0
@@ -74,7 +74,7 @@ class CircleROI extends BaseAdapter3D {
     const {
       area,
       radius
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    } = cachedStats[`imageId:${referencedImageId}`] || {};
     const perimeter = 2 * Math.PI * radius;
     return {
       area,

package/dist/esm/adapters/Cornerstone3D/CobbAngle.js

@@ -33,7 +33,7 @@ class CobbAngle extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           angle: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
         }
       },
@@ -80,7 +80,7 @@ class CobbAngle extends BaseAdapter3D {
     };
     const {
       angle
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    } = cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       point1,
       point2,

package/dist/esm/adapters/Cornerstone3D/EllipticalROI.js

@@ -65,7 +65,7 @@ class EllipticalROI extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
         }
       },
@@ -143,7 +143,7 @@ class EllipticalROI extends BaseAdapter3D {
     }
     const {
       area
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    } = cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       area,
       points,

package/dist/esm/adapters/Cornerstone3D/KeyImage.js

@@ -42,8 +42,8 @@ _KeyImage = KeyImage;
 _KeyImage.init("KeyImage", TID300Point, {
   parentType: Probe.toolType
 });
-_KeyImage.trackingSeriesIdentifier = "".concat(_KeyImage.trackingIdentifierTextValue, ":Series");
-_KeyImage.trackingPointIdentifier = "".concat(_KeyImage.trackingIdentifierTextValue, ":Point");
-_KeyImage.trackingSeriesPointIdentifier = "".concat(_KeyImage.trackingIdentifierTextValue, ":SeriesPoint");
+_KeyImage.trackingSeriesIdentifier = `${_KeyImage.trackingIdentifierTextValue}:Series`;
+_KeyImage.trackingPointIdentifier = `${_KeyImage.trackingIdentifierTextValue}:Point`;
+_KeyImage.trackingSeriesPointIdentifier = `${_KeyImage.trackingIdentifierTextValue}:SeriesPoint`;
 
 export { KeyImage, KeyImage as default };

package/dist/esm/adapters/Cornerstone3D/Length.js

@@ -34,7 +34,7 @@ class Length extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           length: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : 0
         }
       },
@@ -71,7 +71,7 @@ class Length extends BaseAdapter3D {
     };
     const {
       length: distance
-    } = cachedStats["imageId:".concat(referencedImageId)] || {};
+    } = cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       point1,
       point2,

package/dist/esm/adapters/Cornerstone3D/MeasurementReport.js

@@ -1,4 +1,3 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities, derivations, normalizers, data } from 'dcmjs';
 import CORNERSTONE_3D_TAG from './cornerstone3DTag.js';
 import { toArray } from '../helpers/toArray.js';
@@ -7,8 +6,6 @@ import 'buffer';
 import CodingScheme from './CodingScheme.js';
 
 var _MeasurementReport;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   TID1500,
   addAccessors
@@ -188,9 +185,10 @@ class MeasurementReport {
       TID1501MeasurementGroups: allMeasurementGroups
     }, options);
     const report = new StructuredReport(derivationSourceDatasets, options);
-    const contentItem = tid1500MeasurementReport.contentItem(derivationSourceDatasets, _objectSpread(_objectSpread({}, options), {}, {
+    const contentItem = tid1500MeasurementReport.contentItem(derivationSourceDatasets, {
+      ...options,
       sopInstanceUIDsToSeriesInstanceUIDMap
-    }));
+    });
     report.dataset = Object.assign(report.dataset, contentItem);
     report.dataset._meta = _meta;
     report.SpecificCharacterSet = "ISO_IR 192";
@@ -209,22 +207,20 @@ class MeasurementReport {
     const measurementData = {};
     measurementGroups.forEach(measurementGroup => {
       try {
-        var _hooks$getToolClass;
         const measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
         const trackingIdentifierGroup = measurementGroupContentSequence.find(contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER);
         const {
           TextValue: trackingIdentifierValue
         } = trackingIdentifierGroup;
         const trackingUniqueIdentifierGroup = measurementGroupContentSequence.find(contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_UNIQUE_IDENTIFIER);
-        const trackingUniqueIdentifierValue = trackingUniqueIdentifierGroup === null || trackingUniqueIdentifierGroup === void 0 ? void 0 : trackingUniqueIdentifierGroup.UID;
-        const toolAdapter = (hooks === null || hooks === void 0 || (_hooks$getToolClass = hooks.getToolClass) === null || _hooks$getToolClass === void 0 ? void 0 : _hooks$getToolClass.call(hooks, measurementGroup, dataset, this.measurementAdapterByToolType)) || this.getAdapterForTrackingIdentifier(trackingIdentifierValue);
+        const trackingUniqueIdentifierValue = trackingUniqueIdentifierGroup?.UID;
+        const toolAdapter = hooks?.getToolClass?.(measurementGroup, dataset, this.measurementAdapterByToolType) || this.getAdapterForTrackingIdentifier(trackingIdentifierValue);
         if (toolAdapter) {
-          var _toolAdapter$toolType;
           const measurement = toolAdapter.getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata, trackingIdentifierValue);
           measurement.TrackingUniqueIdentifier = trackingUniqueIdentifierValue;
-          console.log("=== ".concat(toolAdapter.toolType, " ==="));
+          console.log(`=== ${toolAdapter.toolType} ===`);
           console.log(measurement);
-          measurementData[_toolAdapter$toolType = toolAdapter.toolType] || (measurementData[_toolAdapter$toolType] = []);
+          measurementData[toolAdapter.toolType] ||= [];
           measurementData[toolAdapter.toolType].push(measurement);
         }
       } catch (e) {
@@ -238,7 +234,7 @@ class MeasurementReport {
     const registerName = toolAdapter.toolType;
     if (this.measurementAdapterByToolType.has(registerName)) {
       if (!replace) {
-        throw new Error("The registered tool name ".concat(registerName, " already exists in adapters, use a different toolType or use replace"));
+        throw new Error(`The registered tool name ${registerName} already exists in adapters, use a different toolType or use replace`);
       }
       if (typeof replace === "function") {
         replace(this.measurementAdapterByToolType.get(registerName));
@@ -290,10 +286,11 @@ _MeasurementReport.generateDerivationSourceDataset = instance => {
     PixelData: "OW"
   };
   const _meta = _MeasurementReport.generateDatasetMeta();
-  const derivationSourceDataset = _objectSpread(_objectSpread({}, instance), {}, {
+  const derivationSourceDataset = {
+    ...instance,
     _meta: _meta,
     _vrMap: _vrMap
-  });
+  };
   return derivationSourceDataset;
 };
 

package/dist/esm/adapters/Cornerstone3D/PlanarFreehandROI.js

@@ -48,7 +48,7 @@ class PlanarFreehandROI extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
         }
       },
@@ -87,7 +87,7 @@ class PlanarFreehandROI extends BaseAdapter3D {
       mean,
       max,
       stdDev
-    } = data.cachedStats["imageId:".concat(referencedImageId)] || {};
+    } = data.cachedStats[`imageId:${referencedImageId}`] || {};
     return {
       points,
       area,

package/dist/esm/adapters/Cornerstone3D/Probe.js

@@ -1,11 +1,8 @@
-import _defineProperty from '../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from 'dcmjs';
 import MeasurementReport from './MeasurementReport.js';
 import BaseAdapter3D from './BaseAdapter3D.js';
 
 var _Probe;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Point: TID300Point
 } = utilities.TID300;
@@ -25,7 +22,8 @@ class Probe extends BaseAdapter3D {
       const point = imageToWorldCoords(referencedImageId, [GraphicData[i], GraphicData[i + 1]]);
       worldCoords.push(point);
     }
-    state.annotation.data = _objectSpread(_objectSpread({}, state.annotation.data), {}, {
+    state.annotation.data = {
+      ...state.annotation.data,
       handles: {
         points: worldCoords,
         activeHandleIndex: null,
@@ -33,7 +31,7 @@ class Probe extends BaseAdapter3D {
           hasMoved: false
         }
       }
-    });
+    };
     return state;
   }
 }

package/dist/esm/adapters/Cornerstone3D/RTStruct/RTSS.js

@@ -1,4 +1,3 @@
-import _defineProperty from '../../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { utilities } from '@cornerstonejs/tools';
 import dcmjs from 'dcmjs';
 import getPatientModule from './utilities/getPatientModule.js';
@@ -8,8 +7,6 @@ import getRTROIObservationsSequence from './utilities/getRTROIObservationsSequen
 import getRTSeriesModule from './utilities/getRTSeriesModule.js';
 import getStructureSetModule from './utilities/getStructureSetModule.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   generateContourSetsFromLabelmap,
   AnnotationToPointData
@@ -56,7 +53,7 @@ function generateRTSSFromSegmentations(segmentations, metadataProvider, DicomMet
           });
         });
       });
-      const segLabel = contourSet.label || "Segment ".concat(segIndex + 1);
+      const segLabel = contourSet.label || `Segment ${segIndex + 1}`;
       const ROIContour = {
         name: segLabel,
         description: segLabel,
@@ -156,13 +153,14 @@ function _initializeDataset(rtMetadata, imgMetadata, metadataProvider) {
   } = metadataProvider.get("generalSeriesModule", imageId);
   const patientModule = getPatientModule(imageId, metadataProvider);
   const rtSeriesModule = getRTSeriesModule(DicomMetaDictionary);
-  return _objectSpread(_objectSpread(_objectSpread({
+  return {
     StructureSetROISequence: [],
     ROIContourSequence: [],
     RTROIObservationsSequence: [],
     ReferencedSeriesSequence: [],
-    ReferencedFrameOfReferenceSequence: []
-  }, patientModule), rtSeriesModule), {}, {
+    ReferencedFrameOfReferenceSequence: [],
+    ...patientModule,
+    ...rtSeriesModule,
     StudyInstanceUID: studyInstanceUID,
     SOPClassUID: "1.2.840.10008.5.1.4.1.1.481.3",
     SOPInstanceUID: rtSOPInstanceUID,
@@ -177,7 +175,7 @@ function _initializeDataset(rtMetadata, imgMetadata, metadataProvider) {
     StructureSetDate: DicomMetaDictionary.date(),
     StructureSetTime: DicomMetaDictionary.time(),
     _meta: null
-  });
+  };
 }
 
 export { generateRTSSFromAnnotations, generateRTSSFromSegmentations };

package/dist/esm/adapters/Cornerstone3D/RTStruct/utilities/getStructureSetModule.js

@@ -4,8 +4,8 @@ function getStructureSetModule(contour, index) {
   } = contour.metadata;
   return {
     ROINumber: index + 1,
-    ROIName: contour.name || "Todo: name ".concat(index + 1),
-    ROIDescription: "Todo: description ".concat(index + 1),
+    ROIName: contour.name || `Todo: name ${index + 1}`,
+    ROIDescription: `Todo: description ${index + 1}`,
     ROIGenerationAlgorithm: "Todo: algorithm",
     ReferencedFrameOfReferenceUID: FrameOfReferenceUID
   };

package/dist/esm/adapters/Cornerstone3D/RectangleROI.js

@@ -33,7 +33,7 @@ class RectangleROI extends BaseAdapter3D {
         }
       },
       cachedStats: {
-        ["imageId:".concat(referencedImageId)]: {
+        [`imageId:${referencedImageId}`]: {
           area: NUMGroup ? NUMGroup.MeasuredValueSequence.NumericValue : null
         }
       },

package/dist/esm/adapters/Cornerstone3D/Segmentation/generateSegmentation.js

@@ -1,9 +1,6 @@
-import _defineProperty from '../../../node_modules/@babel/runtime/helpers/esm/defineProperty.js';
 import { normalizers, derivations } from 'dcmjs';
 import { fillSegmentation } from '../../Cornerstone/Segmentation_4X.js';
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Normalizer
 } = normalizers;
@@ -18,7 +15,9 @@ function generateSegmentation(images, labelmaps, metadata) {
 function _createMultiframeSegmentationFromReferencedImages(images, metadata, options) {
   const datasets = images.map(image => {
     const instance = metadata.get("instance", image.imageId);
-    return _objectSpread(_objectSpread(_objectSpread({}, image), instance), {}, {
+    return {
+      ...image,
+      ...instance,
       SOPClassUID: instance.SopClassUID || instance.SOPClassUID,
       SOPInstanceUID: instance.SopInstanceUID || instance.SOPInstanceUID,
       PixelData: image.voxelManager.getScalarData(),
@@ -26,7 +25,7 @@ function _createMultiframeSegmentationFromReferencedImages(images, metadata, opt
         PixelData: "OW"
       },
       _meta: {}
-    });
+    };
   });
   const multiframe = Normalizer.normalizeToDataset(datasets);
   if (!multiframe) {

package/dist/esm/adapters/helpers/getDatasetsFromImages.js

@@ -26,7 +26,7 @@ function getDatasetsFromImages(images, isMultiframe, options) {
       datasets.push(dataset);
     }
   }
-  if (options !== null && options !== void 0 && options.SpecificCharacterSet) {
+  if (options?.SpecificCharacterSet) {
     datasets.forEach(dataset => dataset.SpecificCharacterSet = options.SpecificCharacterSet);
   }
   return Normalizer.normalizeToDataset(datasets);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "3.5.2",
+    "version": "3.6.0",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -84,8 +84,8 @@
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^3.5.2",
-        "@cornerstonejs/tools": "^3.5.2"
+        "@cornerstonejs/core": "^3.6.0",
+        "@cornerstonejs/tools": "^3.6.0"
     },
-    "gitHead": "bbf8e8efa2b12e573cfceb501930dbb07e30ff32"
+    "gitHead": "480e48c2a25ce79a4a90be6fe180d1bcdd1b831e"
 }

package/dist/esm/node_modules/@babel/runtime/helpers/esm/defineProperty.js

@@ -1,18 +0,0 @@
-import _toPropertyKey from './toPropertyKey.js';
-
-function _defineProperty(obj, key, value) {
-  key = _toPropertyKey(key);
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-
-export { _defineProperty as default };

package/dist/esm/node_modules/@babel/runtime/helpers/esm/toPrimitive.js

@@ -1,14 +0,0 @@
-import _typeof from './typeof.js';
-
-function _toPrimitive(input, hint) {
-  if (_typeof(input) !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (_typeof(res) !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-
-export { _toPrimitive as default };

package/dist/esm/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js

@@ -1,9 +0,0 @@
-import _typeof from './typeof.js';
-import _toPrimitive from './toPrimitive.js';
-
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return _typeof(key) === "symbol" ? key : String(key);
-}
-
-export { _toPropertyKey as default };

package/dist/esm/node_modules/@babel/runtime/helpers/esm/typeof.js

@@ -1,11 +0,0 @@
-function _typeof(obj) {
-  "@babel/helpers - typeof";
-
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, _typeof(obj);
-}
-
-export { _typeof as default };