Merge upstream + 2025-update, add PR #280 UV support

.babelrc

@@ -1,8 +1,8 @@
 {
   "presets": [
-    "es2015"
+    "@babel/preset-env"
   ],
   "plugins": [
-    "transform-object-rest-spread"
+    "@babel/plugin-transform-object-rest-spread"
   ]
 }

.circleci/config.yml

@@ -1,66 +1,66 @@
-# version: 2
+version: 2
 
-# defaults: &defaults
-#   working_directory: ~/repo
-#   docker:
-#     - image: circleci/node:latest
+defaults: &defaults
+  working_directory: ~/repo
+  docker:
+    - image: circleci/node:latest
 
-# jobs:
-#   test:
-#     <<: *defaults
-#     steps:
-#       - checkout
-#       - restore_cache:
-#           keys:
-#             - v1-dependencies-{{ checksum "package.json" }}
-#             - v1-dependencies-
-#       - run: npm install
-#       - run: npm run build:ci
-#       - save_cache:
-#           paths:
-#             - node_modules
-#           key: v1-dependencies-{{ checksum "package.json" }}
-#       # TODO: Support for unit tests in status check
-#       # - run: npm run test
+jobs:
+  test:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+            - v1-dependencies-
+      - run: npm install
+      - run: npm run build:ci
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+      # TODO: Support for unit tests in status check
+      # - run: npm run test
 
-#   # Publish latest
-#   deploy:
-#     <<: *defaults
-#     steps:
-#       - checkout
-#       - restore_cache:
-#           keys:
-#             - v1-dependencies-{{ checksum "package.json" }}
-#             - v1-dependencies-
-#       - run: npm install
-#       - save_cache:
-#           paths:
-#             - node_modules
-#           key: v1-dependencies-{{ checksum "package.json" }}
-#       - run: npm run build:ci
-#       - run:
-#           name: Write NPM Token to ~/.npmrc
-#           command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
-#       - run:
-#           name: Publish package
-#           command: npx semantic-release@17.0.4
+  # Publish latest
+  deploy:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+            - v1-dependencies-
+      - run: npm install
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+      - run: npm run build:ci
+      - run:
+          name: Write NPM Token to ~/.npmrc
+          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
+      - run:
+          name: Publish package
+          command: npx semantic-release@17.0.4
 
-# workflows:
-#   version: 2
+workflows:
+  version: 2
 
-#   # PULL REQUEST
-#   test:
-#     jobs:
-#       - test:
-#           filters:
-#             branches:
-#               ignore:
-#                 - master
+  # PULL REQUEST
+  test:
+    jobs:
+      - test:
+          filters:
+            branches:
+              ignore:
+                - master
 
-#   # MERGE TO MASTER
-#   build-test-deploy:
-#     jobs:
-#       - deploy:
-#           filters:
-#             branches:
-#               only: master
+  # MERGE TO MASTER
+  build-test-deploy:
+    jobs:
+      - deploy:
+          filters:
+            branches:
+              only: master

README.md

@@ -4,16 +4,16 @@
 dicomParser
 ===========
 
-dicomParser is a lightweight library for parsing DICOM P10 byte streams in modern HTML5 based web browsers (IE10+),
+dicomParser is a lightweight library for parsing DICOM P10 byte streams, as well as raw (not encapsulated in part 10) byte streams, in modern HTML5 based web browsers (IE10+),
 Node.js and Meteor.  dicomParser is fast, easy to use and has no required external dependencies.
 
 Live Examples
 ---------------
 
 The best way to see the power of this library is to actually see it in use.  A number of live examples are
 included that are not only useful but also show how to use dicomParser.
-[Click here for a list of all live examples](https://rawgithub.com/cornerstonejs/dicomParser/master/examples/index.html)
-Make sure you try out the [DICOM Dump with Data Dictionary](https://rawgit.com/cornerstonejs/dicomParser/master/examples/dumpWithDataDictionary/index.html)
+[Click here for a list of all live examples](https://cornerstonejs.github.io/dicomParser/examples/index.html)
+Make sure you try out the [DICOM Dump with Data Dictionary](https://cornerstonejs.github.io/dicomParser/examples/dumpWithDataDictionary/index.html)
 which is a very useful tool and excellent example of most features.
 
 Community
@@ -44,16 +44,18 @@ the Deflated Explicit VR Little Endian transfer syntax
 Usage
 -----
 
-```
+```javascript
 // create a Uint8Array or node.js Buffer with the contents of the DICOM P10 byte stream
 // you want to parse (e.g. XMLHttpRequest to a WADO server)
 var arrayBuffer = new ArrayBuffer(bufferSize);
 var byteArray = new Uint8Array(arrayBuffer);
 
 try
 {
-   // Parse the byte array to get a DataSet object that has the parsed contents
-    var dataSet = dicomParser.parseDicom(byteArray/*, options */);
+    // Allow raw files
+    const options = { TransferSyntaxUID: '1.2.840.10008.1.2' };
+    // Parse the byte array to get a DataSet object that has the parsed contents
+    var dataSet = dicomParser.parseDicom(byteArray, options);
 
     // access a string element
     var studyInstanceUid = dataSet.string('x0020000d');
@@ -62,30 +64,34 @@ try
     var pixelDataElement = dataSet.elements.x7fe00010;
 
     // create a typed array on the pixel data (this example assumes 16 bit unsigned data)
-    var pixelData = new Uint16Array(dataSet.byteArray.buffer, pixelDataElement.dataOffset, pixelDataElement.length);
+    var pixelData = new Uint16Array(dataSet.byteArray.buffer, pixelDataElement.dataOffset, pixelDataElement.length / 2);
 }
 catch(ex)
 {
    console.log('Error parsing byte stream', ex);
 }
 ```
 
-[See the live examples for more in depth usage of the library](https://rawgithub.com/cornerstonejs/dicomParser/master/examples/index.html)
+[See the live examples for more in depth usage of the library](https://cornerstonejs.github.io/dicomParser/examples/index.html)
 
 Note that actually displaying DICOM images is quite complex due to the variety of pixel formats and compression
 algorithms that DICOM supports.  If you are interested in displaying images, please take a look at the
 [cornerstone library](https://github.com/cornerstonejs/cornerstone) and the
 [cornerstoneWADOImageLoader](https://github.com/cornerstonejs/cornerstoneWADOImageLoader) which uses this
 library to extract the pixel data from DICOM files and display the images with
 [cornerstone library](https://github.com/cornerstonejs/cornerstone).
-You can find the actual code that extracts grayscale pixel data using this library
-[here](https://github.com/cornerstonejs/cornerstoneWADOImageLoader/blob/master/src/makeGrayscaleImage.js).
+You can find the actual code that extracts pixel data using this library
+[here](https://github.com/cornerstonejs/cornerstoneWADOImageLoader/blob/master/src/imageLoader/createImage.js).
 
 Options
 -------
 
 ```dicomParser.parseDicom``` accepts an optional second argument that is an options object. The accepted properties are:
 
+#### TransferSyntaxUID
+A string value used as the default transfer syntax uid for parsing raw DICOM (not encapsualted in Part 10).
+For raw DICOM files, this value should be the LEI UID value.
+
 #### untilTag
 
 A tag in the form xggggeeee (where gggg is the hexadecimal group number and eeee is the hexadecimal element number,
@@ -163,10 +169,31 @@ Automatically running the build and unit tests after each source change:
 This library uses `semantic-release` to publish packages. The syntax of commits against the `master` branch
 determine how the new version calculated.
 
-> npm run build:ci
-> npx semantic-release@17.0.4 --no-ci
-
-Note: Ensure `GITHUB_TOKEN` for bioxydyn/dicomParser is set.
+<table>
+  <tr>
+    <th>Example Commit</th>
+    <th>Release Type</th>
+  </tr>
+  <tr>
+    <td>fix(pencil): stop graphite breaking when too much pressure applied</td>
+    <td>Patch Release</td>
+  </tr>
+  <tr>
+    <td>feat(pencil): add 'graphiteWidth' option</td>
+    <td>Feature Release</td>
+  </tr>
+  <tr>
+    <td>
+      perf(pencil): remove graphiteWidth option<br />
+      <br />
+      BREAKING CHANGE: The graphiteWidth option has been removed. 
+      The default graphite width of 10mm is always used for performance reasons.
+    </td>
+    <td>
+      Major Breaking Release
+    </td>
+  </tr>
+</table>
 
 
 Backlog

config/webpack/webpack-base.js

@@ -10,6 +10,10 @@ module.exports = {
   entry: {
     dicomParser: './index.js'
   },
+  externals: {
+    'zlib': 'zlib'
+  },
+  node: false,
   target: 'web',
   output: {
     filename: '[name].js',

config/webpack/webpack-dev.js

@@ -5,7 +5,9 @@ const baseConfig = require('./webpack-base');
 const devConfig = {
   devServer: {
     hot: true,
-    publicPath: '/dist/'
+    static: {
+      publicPath: '/dist/'
+    }
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin({})