@cornerstonejs/metadata 5.8.2 → 5.10.3

package/dist/esm/metaData.js

@@ -1,4 +1,6 @@
 import { getAddModuleType } from './enums/index.js';
+import { logging as cornerstoneLogging } from '@cornerstonejs/utils';
+const cs3dLogger = cornerstoneLogging.metadataLog.getLogger('metaData');
 const providers = [];
 const typedProviderValueMap = new Map();
 const typedProviderMap = new Map();
@@ -150,7 +152,7 @@ export function getNormalized(imageId, types, metaDataProvider = getMetaData) {
             }
         }
         catch (error) {
-            console.error(`Error retrieving ${t} data:`, error);
+            cs3dLogger.error(`Error retrieving ${t} data:`, error);
         }
     }
     return result;

package/dist/esm/utilities/Tags.js

@@ -1,6 +1,8 @@
 import * as metaData from '../metaData.js';
 import dcmjs from 'dcmjs';
 import { moduleDefinitions, USRegionChild, CLINICAL_TRIAL, RadiopharmaceuticalInfoModule, } from './modules/index.js';
+import { logging as cornerstoneLogging } from '@cornerstonejs/utils';
+const cs3dLogger = cornerstoneLogging.metadataLog.getLogger('utilities.Tags');
 const dicomDictionary = dcmjs.data.DicomMetaDictionary.dictionary;
 const nameMap = dcmjs.data.DicomMetaDictionary.nameMap;
 export { USRegionChild, CLINICAL_TRIAL, RadiopharmaceuticalInfoModule };
@@ -105,7 +107,7 @@ for (const [moduleName, keywords] of moduleDefinitions) {
 }
 for (const [keyword, { hex, groups }] of tagGroups) {
     if (!hex) {
-        console.warn(`Tags: keyword "${keyword}" not found in dcmjs nameMap`);
+        cs3dLogger.warn(`Tags: keyword "${keyword}" not found in dcmjs nameMap`);
         continue;
     }
     addTag(keyword, createTagEntry(hex, ...groups));

package/dist/esm/utilities/definedAttributesOf.d.ts

@@ -0,0 +1,2 @@
+export declare function definedAttributesOf<T extends object>(source: T | null | undefined): Partial<T>;
+export default definedAttributesOf;

package/dist/esm/utilities/definedAttributesOf.js

@@ -0,0 +1,14 @@
+export function definedAttributesOf(source) {
+    const result = {};
+    if (!source) {
+        return result;
+    }
+    for (const key of Object.keys(source)) {
+        const value = source[key];
+        if (value !== undefined) {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+export default definedAttributesOf;

package/dist/esm/utilities/getPixelSpacingInformation.js

@@ -1,5 +1,7 @@
 import { isEqual } from './isEqual.js';
 import { CalibrationTypes } from '../enums/index.js';
+import { logging as cornerstoneLogging } from '@cornerstonejs/utils';
+const cs3dLogger = cornerstoneLogging.metadataLog.getLogger('utilities.getPixelSpacingInformation');
 const projectionRadiographSOPClassUIDs = new Set([
     '1.2.840.10008.5.1.4.1.1.1',
     '1.2.840.10008.5.1.4.1.1.1.1',
@@ -31,7 +33,7 @@ export function calculateRadiographicPixelSpacing(instance) {
     const isProjection = true;
     if (PixelSpacing && PixelSpacingCalibrationType === 'GEOMETRY') {
         if (isEqual(PixelSpacing, ImagerPixelSpacing)) {
-            console.warn('Calibration type is geometry, but pixel spacing and imager pixel spacing identical', PixelSpacing, ImagerPixelSpacing);
+            cs3dLogger.warn('Calibration type is geometry, but pixel spacing and imager pixel spacing identical', PixelSpacing, ImagerPixelSpacing);
         }
         return {
             PixelSpacing,
@@ -64,7 +66,7 @@ export function calculateRadiographicPixelSpacing(instance) {
             };
         }
         if (ermf) {
-            console.error('Illegal ERMF value:', ermf);
+            cs3dLogger.error('Illegal ERMF value:', ermf);
         }
         return {
             PixelSpacing: PixelSpacing || ImagerPixelSpacing,

package/dist/esm/utilities/index.d.ts

@@ -1,4 +1,5 @@
 export { getSingleBufferFromArray } from './bulkDataFromArray.js';
+export { definedAttributesOf } from './definedAttributesOf.js';
 export { toNumber, toFiniteNumber } from './toNumber.js';
 export { default as toNumberDefault } from './toNumber.js';
 export { default as isVideoTransferSyntax, videoUIDs, } from './isVideoTransferSyntax.js';

package/dist/esm/utilities/index.js

@@ -1,4 +1,5 @@
 export { getSingleBufferFromArray } from './bulkDataFromArray.js';
+export { definedAttributesOf } from './definedAttributesOf.js';
 export { toNumber, toFiniteNumber } from './toNumber.js';
 export { default as toNumberDefault } from './toNumber.js';
 export { default as isVideoTransferSyntax, videoUIDs, } from './isVideoTransferSyntax.js';

package/dist/esm/utilities/logging.d.ts

@@ -1,3 +1,4 @@
 import { logging } from '@cornerstonejs/utils';
-export declare const getRootLogger: typeof logging.getRootLogger, getLogger: typeof logging.getLogger, cs3dLog: logging.Logger, metadataLog: logging.Logger, coreLog: logging.Logger, toolsLog: logging.Logger, loaderLog: logging.Logger, aiLog: logging.Logger, examplesLog: logging.Logger, workerLog: logging.Logger, dicomConsistencyLog: logging.Logger, imageConsistencyLog: logging.Logger, log: any;
+export declare const getRootLogger: typeof logging.getRootLogger, getLogger: typeof logging.getLogger, cs3dLog: logging.Logger, metadataLog: logging.Logger, coreLog: logging.Logger, toolsLog: logging.Logger, adaptersLog: logging.Logger, loaderLog: logging.Logger, niftiVolumeLoaderLog: logging.Logger, polySegLog: logging.Logger, labelmapInterpolationLog: logging.Logger, aiLog: logging.Logger, examplesLog: logging.Logger, dicomConsistencyLog: logging.Logger, imageConsistencyLog: logging.Logger, log: any;
+export declare const workerLog: logging.Logger;
 export type Logger = logging.Logger;

package/dist/esm/utilities/logging.js

@@ -1,2 +1,3 @@
 import { logging } from '@cornerstonejs/utils';
-export const { getRootLogger, getLogger, cs3dLog, metadataLog, coreLog, toolsLog, loaderLog, aiLog, examplesLog, workerLog, dicomConsistencyLog, imageConsistencyLog, log, } = logging;
+export const { getRootLogger, getLogger, cs3dLog, metadataLog, coreLog, toolsLog, adaptersLog, loaderLog, niftiVolumeLoaderLog, polySegLog, labelmapInterpolationLog, aiLog, examplesLog, dicomConsistencyLog, imageConsistencyLog, log, } = logging;
+export const { workerLog } = logging;

package/dist/esm/utilities/metadataProvider/cacheData.js

@@ -1,6 +1,8 @@
 import { getAddModuleType, MetadataModules } from '../../enums/index.js';
 import { addAddProvider, addTypedProvider, clear, clearQuery, getMetaData, } from '../../metaData.js';
 import { BASE_IMAGE_ID, FRAME_IMAGE_IDS } from './imageIdsProviders.js';
+import { logging as cornerstoneLogging } from '@cornerstonejs/utils';
+const cs3dLogger = cornerstoneLogging.metadataLog.getLogger('utilities.metadataProvider.cacheData');
 export class CacheData {
     static setCacheDataInternal(type, query, value) {
         let valueMap = this.mapCacheData.get(type);
@@ -142,7 +144,7 @@ export function createTypeWritableCacheProvider(type) {
     return (next, query, data, options) => {
         const cachedValue = CacheData.getCacheData(type, query);
         if (cachedValue !== undefined) {
-            console.warn(`Metadata add skipped for "${type}" at query "${query}" because cache already has a value.`);
+            cs3dLogger.warn(`Metadata add skipped for "${type}" at query "${query}" because cache already has a value.`);
             return cachedValue;
         }
         const addCachedValue = CacheData.getCacheData(addType, query);

package/dist/esm/utilities/metadataProvider/compressedFrameData.js

@@ -1,5 +1,7 @@
 import { MetadataModules } from '../../enums/index.js';
 import { addTypedProvider } from '../../metaData.js';
+import { logging as cornerstoneLogging } from '@cornerstonejs/utils';
+const cs3dLogger = cornerstoneLogging.metadataLog.getLogger('utilities.metadataProvider.compressedFrameData');
 const PIXEL_DATA_KEYS = [
     'PixelData',
     'FramePixelData',
@@ -78,7 +80,7 @@ function getFramePixelDataFromSingleBuffer(pixelDataTag, frameIndex, numberOfFra
     if (offset + frameSize > totalLength) {
         return undefined;
     }
-    console.warn('[compressedFrameData] Splitting single-buffer pixel data by numberOfFrames for paramap-type image; frameIndex=', frameIndex, ', numberOfFrames=', numberOfFrames, ', frameSize=', frameSize);
+    cs3dLogger.warn('[compressedFrameData] Splitting single-buffer pixel data by numberOfFrames for paramap-type image; frameIndex=', frameIndex, ', numberOfFrames=', numberOfFrames, ', frameSize=', frameSize);
     const u8 = view instanceof Uint8Array
         ? view
         : new Uint8Array(view.buffer, view.byteOffset, view.byteLength);

package/dist/esm/utilities/metadataProvider/ecgFromInstance.js

@@ -1,5 +1,7 @@
 import { addTypedProvider } from '../../metaData.js';
 import { MetadataModules } from '../../enums/index.js';
+import { logging as cornerstoneLogging } from '@cornerstonejs/utils';
+const cs3dLogger = cornerstoneLogging.metadataLog.getLogger('utilities.metadataProvider.ecgFromInstance');
 function base64ToUint8Array(base64) {
     const binaryString = atob(base64);
     const bytes = new Uint8Array(binaryString.length);
@@ -163,7 +165,7 @@ export function buildEcgModuleFromInstance(instance, imageId) {
                 : buffer;
             return convertBuffer(decoded, numberOfChannels, numberOfSamples, bitsAllocated, sampleInterpretation);
         }
-        console.warn('[ecgFromInstance] No waveform data source found. group keys:', Object.keys(group), 'waveformData keys:', Object.keys(waveformData));
+        cs3dLogger.warn('[ecgFromInstance] No waveform data source found. group keys:', Object.keys(group), 'waveformData keys:', Object.keys(waveformData));
         throw new Error('[ecgFromInstance] No waveform data source found');
     };
     return {

package/dist/esm/utilities/splitImageIdsBy4DTags.js

@@ -1,5 +1,7 @@
 import * as metaData from '../metaData.js';
 import { toFiniteNumber } from './toNumber.js';
+import { logging as cornerstoneLogging } from '@cornerstonejs/utils';
+const cs3dLogger = cornerstoneLogging.metadataLog.getLogger('utilities.splitImageIdsBy4DTags');
 function generateFrameImageId(baseImageId, frameNumber) {
     const framePattern = /\/frames\/\d+/;
     const queryFramePattern = /([?&])frame=\d+/;
@@ -32,17 +34,17 @@ function handleMultiframe4D(imageIds) {
     const sliceVector = instance.SliceVector;
     const numberOfSlices = instance.NumberOfSlices;
     if (timeSlotVector.length !== numberOfFrames) {
-        console.warn('TimeSlotVector length does not match NumberOfFrames:', timeSlotVector.length, 'vs', numberOfFrames);
+        cs3dLogger.warn('TimeSlotVector length does not match NumberOfFrames:', timeSlotVector.length, 'vs', numberOfFrames);
         return null;
     }
     if (sliceVector) {
         if (!Array.isArray(sliceVector)) {
-            console.warn('SliceVector exists but is not an array. Expected length:', numberOfFrames);
+            cs3dLogger.warn('SliceVector exists but is not an array. Expected length:', numberOfFrames);
             return null;
         }
         if (sliceVector.length !== numberOfFrames ||
             sliceVector.some((val) => val === undefined)) {
-            console.warn('SliceVector exists but has invalid length or undefined entries. Expected length:', numberOfFrames, 'Actual length:', sliceVector.length);
+            cs3dLogger.warn('SliceVector exists but has invalid length or undefined entries. Expected length:', numberOfFrames, 'Actual length:', sliceVector.length);
             return null;
         }
     }
@@ -64,7 +66,7 @@ function handleMultiframe4D(imageIds) {
     const expectedSlicesPerTimeSlot = numberOfSlices || imageIdGroups[0]?.length;
     const allGroupsHaveSameLength = imageIdGroups.every((group) => group.length === expectedSlicesPerTimeSlot);
     if (!allGroupsHaveSameLength) {
-        console.warn('Multiframe 4D split resulted in uneven time slot groups. Expected', expectedSlicesPerTimeSlot, 'slices per time slot.');
+        cs3dLogger.warn('Multiframe 4D split resulted in uneven time slot groups. Expected', expectedSlicesPerTimeSlot, 'slices per time slot.');
     }
     return {
         imageIdGroups,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.8.2";
+export declare const version = "5.10.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.8.2';
+export const version = '5.10.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/metadata",
-  "version": "5.8.2",
+  "version": "5.10.3",
   "description": "Cornerstone3D Metadata Foundation - Provider chain, DICOM stream parsing, tag modules, and series splitting",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -81,7 +81,7 @@
   },
   "dependencies": {
     "@cornerstonejs/calculate-suv": "1.0.3",
-    "@cornerstonejs/utils": "5.8.2",
+    "@cornerstonejs/utils": "5.10.3",
     "dcmjs": "0.52.0",
     "gl-matrix": "3.4.3"
   },
@@ -95,6 +95,5 @@
   "funding": {
     "type": "individual",
     "url": "https://ohif.org/donate"
-  },
-  "gitHead": "7034957b10f5e91ad8f4d7978591ef688e262d26"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Open Health Imaging Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.